From db778f57a3ae05a422ac9d36263264a415393dcd Mon Sep 17 00:00:00 2001 From: Dan Ryan Date: Sat, 19 May 2018 15:44:54 -0400 Subject: [PATCH] Update vendored libraries Signed-off-by: Dan Ryan --- pipenv/patched/safety/cli.py | 4 ++-- pipenv/vendor/pipdeptree.py | 6 +++--- pipenv/vendor/requirements/fragment.py | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pipenv/patched/safety/cli.py b/pipenv/patched/safety/cli.py index d2140193..9ebd9e8a 100644 --- a/pipenv/patched/safety/cli.py +++ b/pipenv/patched/safety/cli.py @@ -12,10 +12,10 @@ from safety.errors import DatabaseFetchError, DatabaseFileNotFoundError, Invalid try: # pip 9 - from notpip import get_installed_distributions + from pipenv.patched.notpip import get_installed_distributions except ImportError: # pip 10 - from notpip._internal.utils.misc import get_installed_distributions + from pipenv.patched.notpip._internal.utils.misc import get_installed_distributions @click.group() diff --git a/pipenv/vendor/pipdeptree.py b/pipenv/vendor/pipdeptree.py index 6020a422..b3c564ef 100644 --- a/pipenv/vendor/pipdeptree.py +++ b/pipenv/vendor/pipdeptree.py @@ -14,10 +14,10 @@ except ImportError: from ordereddict import OrderedDict try: - from notpip._internal import get_installed_distributions - from notpip._internal.operations.freeze import FrozenRequirement + from pipenv.patched.notpip._internal import get_installed_distributions + from pipenv.patched.notpip._internal.operations.freeze import FrozenRequirement except ImportError: - from notpip import get_installed_distributions, FrozenRequirement + from pipenv.patched.notpip import get_installed_distributions, FrozenRequirement import pkg_resources # inline: diff --git a/pipenv/vendor/requirements/fragment.py b/pipenv/vendor/requirements/fragment.py index 028e1871..2c29ad66 100644 --- a/pipenv/vendor/requirements/fragment.py +++ b/pipenv/vendor/requirements/fragment.py @@ -1,6 +1,6 @@ import re -# Copied from notpip +# Copied from pipenv.patched.notpip # https://github.com/pypa/pip/blob/281eb61b09d87765d7c2b92f6982b3fe76ccb0af/pip/index.py#L947 HASH_ALGORITHMS = set(['sha1', 'sha224', 'sha384', 'sha256', 'sha512', 'md5'])