From 17644c28aec9ab795202a178a83e29a08d97c09f Mon Sep 17 00:00:00 2001 From: Vincent Philippon Date: Wed, 21 Mar 2018 18:47:04 -0400 Subject: [PATCH] Remove now obsolete pip version check due to vendoring --- piptools/repositories/local.py | 5 +---- piptools/repositories/pypi.py | 13 +++---------- piptools/scripts/compile.py | 6 +----- piptools/scripts/sync.py | 5 +---- piptools/utils.py | 26 ++++---------------------- 5 files changed, 10 insertions(+), 45 deletions(-) diff --git a/piptools/repositories/local.py b/piptools/repositories/local.py index 1a5fe0a22..8f6f0280a 100644 --- a/piptools/repositories/local.py +++ b/piptools/repositories/local.py @@ -6,10 +6,7 @@ from piptools.utils import as_tuple, key_from_req, make_install_requirement from .base import BaseRepository -try: - from pip.utils.hashes import FAVORITE_HASH -except ImportError: - FAVORITE_HASH = 'sha256' +from pip.utils.hashes import FAVORITE_HASH def ireq_satisfied_by_existing_pin(ireq, existing_pin): diff --git a/piptools/repositories/pypi.py b/piptools/repositories/pypi.py index 3d2d48384..d3b7fe75a 100644 --- a/piptools/repositories/pypi.py +++ b/piptools/repositories/pypi.py @@ -11,16 +11,13 @@ from pip.index import PackageFinder from pip.req.req_set import RequirementSet from pip.wheel import Wheel -try: - from pip.utils.hashes import FAVORITE_HASH -except ImportError: - FAVORITE_HASH = 'sha256' +from pip.utils.hashes import FAVORITE_HASH from .._compat import TemporaryDirectory from ..cache import CACHE_DIR from ..exceptions import NoCandidateFound from ..utils import (fs_str, is_pinned_requirement, lookup_table, - make_install_requirement, pip_version_info) + make_install_requirement) from .base import BaseRepository @@ -87,11 +84,7 @@ def clear_caches(self): def find_all_candidates(self, req_name): if req_name not in self._available_candidates_cache: - # pip 8 changed the internal API, making this a public method - if pip_version_info >= (8, 0): - candidates = self.finder.find_all_candidates(req_name) - else: - candidates = self.finder._find_all_versions(req_name) + candidates = self.finder.find_all_candidates(req_name) self._available_candidates_cache[req_name] = candidates return self._available_candidates_cache[req_name] diff --git a/piptools/scripts/compile.py b/piptools/scripts/compile.py index 59128cc6a..5235c45d3 100755 --- a/piptools/scripts/compile.py +++ b/piptools/scripts/compile.py @@ -15,13 +15,9 @@ from ..logging import log from ..repositories import LocalRequirementsRepository, PyPIRepository from ..resolver import Resolver -from ..utils import (assert_compatible_pip_version, dedup, is_pinned_requirement, - key_from_req, UNSAFE_PACKAGES) +from ..utils import (dedup, is_pinned_requirement, key_from_req, UNSAFE_PACKAGES) from ..writer import OutputWriter -# Make sure we're using a compatible version of pip -assert_compatible_pip_version() - DEFAULT_REQUIREMENTS_FILE = 'requirements.in' diff --git a/piptools/scripts/sync.py b/piptools/scripts/sync.py index e1d7f5e53..b37d5d918 100755 --- a/piptools/scripts/sync.py +++ b/piptools/scripts/sync.py @@ -10,10 +10,7 @@ from .. import click, sync from ..exceptions import PipToolsError from ..logging import log -from ..utils import assert_compatible_pip_version, flat_map - -# Make sure we're using a compatible version of pip -assert_compatible_pip_version() +from ..utils import flat_map DEFAULT_REQUIREMENTS_FILE = 'requirements.txt' diff --git a/piptools/utils.py b/piptools/utils.py index 0ae1eb061..c67d1b567 100644 --- a/piptools/utils.py +++ b/piptools/utils.py @@ -6,7 +6,6 @@ from itertools import chain, groupby from collections import OrderedDict -import pip from pip.req import InstallRequirement from first import first @@ -14,26 +13,9 @@ from .click import style -def safeint(s): - try: - return int(s) - except ValueError: - return 0 - - -pip_version_info = tuple(safeint(digit) for digit in pip.__version__.split('.')) - UNSAFE_PACKAGES = {'setuptools', 'distribute', 'pip'} -def assert_compatible_pip_version(): - # Make sure we're using a reasonably modern version of pip - if not pip_version_info >= (8, 0): - print('pip-compile requires at least version 8.0 of pip ({} found), ' - 'perhaps run `pip install --upgrade pip`?'.format(pip.__version__)) - sys.exit(4) - - def key_from_ireq(ireq): """Get a standardized key for an InstallRequirement.""" if ireq.req is None and ireq.link is not None: @@ -45,10 +27,10 @@ def key_from_ireq(ireq): def key_from_req(req): """Get an all-lowercase version of the requirement's name.""" if hasattr(req, 'key'): - # pip 8.1.1 or below, using pkg_resources + # from pkg_resources, such as installed dists for pip-sync key = req.key else: - # pip 8.1.2 or above, using packaging + # from packaging, such as install requirements from requirements.txt key = req.name key = key.replace('_', '-').lower() @@ -221,10 +203,10 @@ def dedup(iterable): def name_from_req(req): """Get the name of the requirement""" if hasattr(req, 'project_name'): - # pip 8.1.1 or below, using pkg_resources + # from pkg_resources, such as installed dists for pip-sync return req.project_name else: - # pip 8.1.2 or above, using packaging + # from packaging, such as install requirements from requirements.txt return req.name