From b58f902a190fc714ad21de7d6a4b3ff65c552e8d Mon Sep 17 00:00:00 2001 From: Dan Ryan Date: Sun, 7 Oct 2018 17:01:32 -0400 Subject: [PATCH] Fix pipdeptree patch Signed-off-by: Dan Ryan --- .../patches/vendor/pipdeptree-local-pip.patch | 18 ------------------ .../vendor/pipdeptree-updated-pip18.patch | 2 +- 2 files changed, 1 insertion(+), 19 deletions(-) delete mode 100644 tasks/vendoring/patches/vendor/pipdeptree-local-pip.patch diff --git a/tasks/vendoring/patches/vendor/pipdeptree-local-pip.patch b/tasks/vendoring/patches/vendor/pipdeptree-local-pip.patch deleted file mode 100644 index a3210177..00000000 --- a/tasks/vendoring/patches/vendor/pipdeptree-local-pip.patch +++ /dev/null @@ -1,18 +0,0 @@ -diff --git a/pipenv/vendor/pipdeptree.py b/pipenv/vendor/pipdeptree.py -index a62badf7..a2ea83fd 100644 ---- a/pipenv/vendor/pipdeptree.py -+++ b/pipenv/vendor/pipdeptree.py -@@ -14,10 +14,10 @@ except ImportError: - from ordereddict import OrderedDict - - try: -- from pipenv.patched.notpip._internal import get_installed_distributions -- from pipenv.patched.notpip._internal.operations.freeze import FrozenRequirement -+ from pip._internal import get_installed_distributions -+ from pip._internal.operations.freeze import FrozenRequirement - except ImportError: -- from pipenv.patched.notpip import get_installed_distributions, FrozenRequirement -+ from pip import get_installed_distributions, FrozenRequirement - - import pkg_resources - # inline: diff --git a/tasks/vendoring/patches/vendor/pipdeptree-updated-pip18.patch b/tasks/vendoring/patches/vendor/pipdeptree-updated-pip18.patch index 1e447c61..20e04f34 100644 --- a/tasks/vendoring/patches/vendor/pipdeptree-updated-pip18.patch +++ b/tasks/vendoring/patches/vendor/pipdeptree-updated-pip18.patch @@ -1,5 +1,5 @@ diff --git a/pipenv/vendor/pipdeptree.py b/pipenv/vendor/pipdeptree.py -index 7820aa5d..9cce0325 100644 +index 7820aa5..9cce032 100644 --- a/pipenv/vendor/pipdeptree.py +++ b/pipenv/vendor/pipdeptree.py @@ -13,11 +13,7 @@ try: