From b9b365bf6b932cdf14c900f55c75f99ab65cde68 Mon Sep 17 00:00:00 2001 From: Dodge York Date: Thu, 18 Mar 2021 14:12:46 -0400 Subject: [PATCH 1/4] add --pre as an argument --- pipenv/utils.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pipenv/utils.py b/pipenv/utils.py index abf7b13af0..fdfcad86b8 100644 --- a/pipenv/utils.py +++ b/pipenv/utils.py @@ -697,7 +697,7 @@ def pip_command(self): self._pip_command = self._get_pip_command() return self._pip_command - def prepare_pip_args(self, use_pep517=False, build_isolation=True): + def prepare_pip_args(self, use_pep517=False, build_isolation=True, pre=False): pip_args = [] if self.sources: pip_args = prepare_pip_source_args(self.sources, pip_args) @@ -705,16 +705,19 @@ def prepare_pip_args(self, use_pep517=False, build_isolation=True): pip_args.append("--no-use-pep517") if build_isolation is False: pip_args.append("--no-build-isolation") + if pre is True: + pip_args.append("--pre") pip_args.extend(["--cache-dir", environments.PIPENV_CACHE_DIR]) return pip_args @property def pip_args(self): + pre = self.pre use_pep517 = environments.get_from_env("USE_PEP517", prefix="PIP") build_isolation = environments.get_from_env("BUILD_ISOLATION", prefix="PIP") if self._pip_args is None: self._pip_args = self.prepare_pip_args( - use_pep517=use_pep517, build_isolation=build_isolation + use_pep517=use_pep517, build_isolation=build_isolation, pre=pre ) return self._pip_args From 517db751b7354fadd7696590debe96ac6974eabb Mon Sep 17 00:00:00 2001 From: Dodge York Date: Thu, 18 Mar 2021 14:17:11 -0400 Subject: [PATCH 2/4] add the news update --- news/4642.bugfix.rst | 1 + 1 file changed, 1 insertion(+) create mode 100644 news/4642.bugfix.rst diff --git a/news/4642.bugfix.rst b/news/4642.bugfix.rst new file mode 100644 index 0000000000..7a102c7fec --- /dev/null +++ b/news/4642.bugfix.rst @@ -0,0 +1 @@ +Fix bug preventing use of pipenv lock --pre From c7879affd9dd9ecf05638924702b96795b96b6f4 Mon Sep 17 00:00:00 2001 From: nid5 Date: Fri, 19 Mar 2021 10:38:11 -0400 Subject: [PATCH 3/4] Update pipenv/utils.py Co-authored-by: Tzu-ping Chung --- pipenv/utils.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pipenv/utils.py b/pipenv/utils.py index fdfcad86b8..a436c332f1 100644 --- a/pipenv/utils.py +++ b/pipenv/utils.py @@ -705,7 +705,7 @@ def prepare_pip_args(self, use_pep517=False, build_isolation=True, pre=False): pip_args.append("--no-use-pep517") if build_isolation is False: pip_args.append("--no-build-isolation") - if pre is True: + if self.pre: pip_args.append("--pre") pip_args.extend(["--cache-dir", environments.PIPENV_CACHE_DIR]) return pip_args From 4130f898d40400b5e4bcc9a276c550dcef2315b8 Mon Sep 17 00:00:00 2001 From: Dodge York Date: Fri, 19 Mar 2021 10:50:56 -0400 Subject: [PATCH 4/4] use the pre already available --- pipenv/utils.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pipenv/utils.py b/pipenv/utils.py index a436c332f1..61e5f683c7 100644 --- a/pipenv/utils.py +++ b/pipenv/utils.py @@ -697,7 +697,7 @@ def pip_command(self): self._pip_command = self._get_pip_command() return self._pip_command - def prepare_pip_args(self, use_pep517=False, build_isolation=True, pre=False): + def prepare_pip_args(self, use_pep517=False, build_isolation=True): pip_args = [] if self.sources: pip_args = prepare_pip_source_args(self.sources, pip_args) @@ -712,12 +712,11 @@ def prepare_pip_args(self, use_pep517=False, build_isolation=True, pre=False): @property def pip_args(self): - pre = self.pre use_pep517 = environments.get_from_env("USE_PEP517", prefix="PIP") build_isolation = environments.get_from_env("BUILD_ISOLATION", prefix="PIP") if self._pip_args is None: self._pip_args = self.prepare_pip_args( - use_pep517=use_pep517, build_isolation=build_isolation, pre=pre + use_pep517=use_pep517, build_isolation=build_isolation ) return self._pip_args