From e25e1439e5aa141830bc501b2f3a06b902773714 Mon Sep 17 00:00:00 2001 From: Kenneth Reitz Date: Tue, 9 Oct 2018 07:44:59 -0400 Subject: [PATCH 1/3] fix --- pipenv/patched/crayons.py | 1 + 1 file changed, 1 insertion(+) diff --git a/pipenv/patched/crayons.py b/pipenv/patched/crayons.py index bb4b3d97..79512840 100644 --- a/pipenv/patched/crayons.py +++ b/pipenv/patched/crayons.py @@ -39,6 +39,7 @@ if ( os.environ.get("CMDER_ROOT") or os.environ.get("VSCODE_PID") or os.environ.get("TERM_PROGRAM") == "Hyper" + or "VSCODE_CWD" in os.environ ): is_native_powershell = False else: From b57d0ddcf12d1b9bb9e4014acff81b916a07be87 Mon Sep 17 00:00:00 2001 From: Dan Ryan Date: Tue, 9 Oct 2018 12:14:26 -0400 Subject: [PATCH 2/3] Update vistir imports Signed-off-by: Dan Ryan --- pipenv/vendor/vistir/compat.py | 4 ++-- .../patches/vendor/vistir-imports.patch | 22 +++++++++++++++++++ 2 files changed, 24 insertions(+), 2 deletions(-) create mode 100644 tasks/vendoring/patches/vendor/vistir-imports.patch diff --git a/pipenv/vendor/vistir/compat.py b/pipenv/vendor/vistir/compat.py index 1f1b7a96..0c865fe6 100644 --- a/pipenv/vendor/vistir/compat.py +++ b/pipenv/vendor/vistir/compat.py @@ -30,7 +30,7 @@ else: from pathlib2 import Path if sys.version_info < (3, 3): - from backports.shutil_get_terminal_size import get_terminal_size + from pipenv.vendor.backports.shutil_get_terminal_size import get_terminal_size from .backports.tempfile import NamedTemporaryFile else: from tempfile import NamedTemporaryFile @@ -39,7 +39,7 @@ else: try: from weakref import finalize except ImportError: - from backports.weakref import finalize + from pipenv.vendor.backports.weakref import finalize try: from functools import partialmethod diff --git a/tasks/vendoring/patches/vendor/vistir-imports.patch b/tasks/vendoring/patches/vendor/vistir-imports.patch new file mode 100644 index 00000000..68b14da0 --- /dev/null +++ b/tasks/vendoring/patches/vendor/vistir-imports.patch @@ -0,0 +1,22 @@ +diff --git a/pipenv/vendor/vistir/compat.py b/pipenv/vendor/vistir/compat.py +index 1f1b7a96..0c865fe6 100644 +--- a/pipenv/vendor/vistir/compat.py ++++ b/pipenv/vendor/vistir/compat.py +@@ -30,7 +30,7 @@ else: + from pathlib2 import Path + + if sys.version_info < (3, 3): +- from backports.shutil_get_terminal_size import get_terminal_size ++ from pipenv.vendor.backports.shutil_get_terminal_size import get_terminal_size + from .backports.tempfile import NamedTemporaryFile + else: + from tempfile import NamedTemporaryFile +@@ -39,7 +39,7 @@ else: + try: + from weakref import finalize + except ImportError: +- from backports.weakref import finalize ++ from pipenv.vendor.backports.weakref import finalize + + try: + from functools import partialmethod From 160cb13584aabb7722126258b982086f9bcdd770 Mon Sep 17 00:00:00 2001 From: Dan Ryan Date: Tue, 9 Oct 2018 12:23:54 -0400 Subject: [PATCH 3/3] Fix broken imports - Add tempfile patch and news - Fixes #2950 - Fixes #2955 - Fixes #2961 - Closes #2967 Signed-off-by: Dan Ryan --- news/2950.bugfix | 1 + news/2955.bugfix | 1 + news/2961.bugfix | 1 + pipenv/vendor/vistir/backports/tempfile.py | 2 +- tasks/vendoring/patches/vendor/vistir-imports.patch | 13 +++++++++++++ 5 files changed, 17 insertions(+), 1 deletion(-) create mode 100644 news/2950.bugfix create mode 100644 news/2955.bugfix create mode 100644 news/2961.bugfix diff --git a/news/2950.bugfix b/news/2950.bugfix new file mode 100644 index 00000000..ac6fcb6a --- /dev/null +++ b/news/2950.bugfix @@ -0,0 +1 @@ +Fix broken backport imports for vendored vistir. diff --git a/news/2955.bugfix b/news/2955.bugfix new file mode 100644 index 00000000..ac6fcb6a --- /dev/null +++ b/news/2955.bugfix @@ -0,0 +1 @@ +Fix broken backport imports for vendored vistir. diff --git a/news/2961.bugfix b/news/2961.bugfix new file mode 100644 index 00000000..ac6fcb6a --- /dev/null +++ b/news/2961.bugfix @@ -0,0 +1 @@ +Fix broken backport imports for vendored vistir. diff --git a/pipenv/vendor/vistir/backports/tempfile.py b/pipenv/vendor/vistir/backports/tempfile.py index 483a479a..43470a6e 100644 --- a/pipenv/vendor/vistir/backports/tempfile.py +++ b/pipenv/vendor/vistir/backports/tempfile.py @@ -13,7 +13,7 @@ import six try: from weakref import finalize except ImportError: - from backports.weakref import finalize + from pipenv.vendor.backports.weakref import finalize __all__ = ["finalize", "NamedTemporaryFile"] diff --git a/tasks/vendoring/patches/vendor/vistir-imports.patch b/tasks/vendoring/patches/vendor/vistir-imports.patch index 68b14da0..f93e7959 100644 --- a/tasks/vendoring/patches/vendor/vistir-imports.patch +++ b/tasks/vendoring/patches/vendor/vistir-imports.patch @@ -20,3 +20,16 @@ index 1f1b7a96..0c865fe6 100644 try: from functools import partialmethod +diff --git a/pipenv/vendor/vistir/backports/tempfile.py b/pipenv/vendor/vistir/backports/tempfile.py +index 483a479a..43470a6e 100644 +--- a/pipenv/vendor/vistir/backports/tempfile.py ++++ b/pipenv/vendor/vistir/backports/tempfile.py +@@ -13,7 +13,7 @@ import six + try: + from weakref import finalize + except ImportError: +- from backports.weakref import finalize ++ from pipenv.vendor.backports.weakref import finalize + + + __all__ = ["finalize", "NamedTemporaryFile"]