Merge pull request #571 from vphilippon/respect-plaform-wheel-for-dep…

…endencies

Respect platform's wheels for dependencies (Fixes #558)

CHANGELOG.md

@@ -1,3 +1,8 @@
+# 1.10.2 (UNRELEASED)
+
+Bug Fixes:
+- Fixed bug causing dependencies from invalid wheels for the current platform to be included ([#571](https://github.com/jazzband/pip-tools/pull/571)).
+
 # 1.10.1 (2017-09-27)
 
 Bug Fixes:

piptools/repositories/base.py

@@ -3,6 +3,7 @@
                         unicode_literals)
 
 from abc import ABCMeta, abstractmethod
+from contextlib import contextmanager
 
 from six import add_metaclass
 
@@ -38,3 +39,10 @@ def get_hashes(self, ireq):
         all of the files for a given requirement. It is not acceptable for an
         editable or unpinned requirement to be passed to this function.
         """
+
+    @abstractmethod
+    @contextmanager
+    def allow_all_wheels(self):
+        """
+        Monkey patches pip.Wheel to allow wheels from all platforms and Python versions.
+        """

piptools/repositories/local.py

@@ -2,6 +2,8 @@
 from __future__ import (absolute_import, division, print_function,
                         unicode_literals)
 
+from contextlib import contextmanager
+
 from piptools.utils import as_tuple, key_from_req, make_install_requirement
 from .base import BaseRepository
 
@@ -63,3 +65,8 @@ def get_dependencies(self, ireq):
 
     def get_hashes(self, ireq):
         return self.repository.get_hashes(ireq)
+
+    @contextmanager
+    def allow_all_wheels(self):
+        with self.repository.allow_all_wheels():
+            yield

piptools/repositories/pypi.py

@@ -28,24 +28,6 @@
     from .._compat import TemporaryDirectory
 
 
-# Monkey patch pip's Wheel class to support all platform tags. This allows
-# pip-tools to generate hashes for all available distributions, not only the
-# one for the current platform.
-
-def _wheel_supported(self, tags=None):
-    # Ignore current platform. Support everything.
-    return True
-
-
-def _wheel_support_index_min(self, tags=None):
-    # All wheels are equal priority for sorting.
-    return 0
-
-
-Wheel.supported = _wheel_supported
-Wheel.support_index_min = _wheel_support_index_min
-
-
 class PyPIRepository(BaseRepository):
     DEFAULT_INDEX_URL = 'https://pypi.python.org/simple'
 
@@ -182,7 +164,7 @@ def get_hashes(self, ireq):
 
         # We need to get all of the candidates that match our current version
         # pin, these will represent all of the files that could possibly
-        # satisify this constraint.
+        # satisfy this constraint.
         all_candidates = self.find_all_candidates(ireq.name)
         candidates_by_version = lookup_table(all_candidates, key=lambda c: c.version)
         matching_versions = list(
@@ -201,6 +183,37 @@ def _get_file_hash(self, location):
                 h.update(chunk)
         return ":".join([FAVORITE_HASH, h.hexdigest()])
 
+    @contextmanager
+    def allow_all_wheels(self):
+        """
+        Monkey patches pip.Wheel to allow wheels from all platforms and Python versions.
+
+        This also saves the candidate cache and set a new one, or else the results from the
+        previous non-patched calls will interfere.
+        """
+        def _wheel_supported(self, tags=None):
+            # Ignore current platform. Support everything.
+            return True
+
+        def _wheel_support_index_min(self, tags=None):
+            # All wheels are equal priority for sorting.
+            return 0
+
+        original_wheel_supported = Wheel.supported
+        original_support_index_min = Wheel.support_index_min
+        original_cache = self._available_candidates_cache
+
+        Wheel.supported = _wheel_supported
+        Wheel.support_index_min = _wheel_support_index_min
+        self._available_candidates_cache = {}
+
+        try:
+            yield
+        finally:
+            Wheel.supported = original_wheel_supported
+            Wheel.support_index_min = original_support_index_min
+            self._available_candidates_cache = original_cache
+
 
 @contextmanager
 def open_local_or_remote_file(link, session):

piptools/resolver.py

@@ -68,7 +68,8 @@ def resolve_hashes(self, ireqs):
         """
         Finds acceptable hashes for all of the given InstallRequirements.
         """
-        return {ireq: self.repository.get_hashes(ireq) for ireq in ireqs}
+        with self.repository.allow_all_wheels():
+            return {ireq: self.repository.get_hashes(ireq) for ireq in ireqs}
 
     def resolve(self, max_rounds=10):
         """

tests/conftest.py

@@ -1,4 +1,5 @@
 import json
+from contextlib import contextmanager
 from functools import partial
 
 from pip._vendor.packaging.version import Version
@@ -49,6 +50,11 @@ def get_dependencies(self, ireq):
         dependencies = [dep for extra in extras for dep in self.index[name][version][extra]]
         return [InstallRequirement.from_line(dep, constraint=ireq.constraint) for dep in dependencies]
 
+    @contextmanager
+    def allow_all_wheels(self):
+        # No need to do an actual pip.Wheel mock here.
+        yield
+
 
 class FakeInstalledDistribution(object):
     def __init__(self, line, deps=None):

tests/test_repository_pypi.py

@@ -52,7 +52,8 @@ def test_generate_hashes_all_platforms(from_line):
     session = pip_command._build_session(pip_options)
     repository = PyPIRepository(pip_options, session)
     ireq = from_line('cffi==1.9.1')
-    assert repository.get_hashes(ireq) == expected
+    with repository.allow_all_wheels():
+        assert repository.get_hashes(ireq) == expected
 
 
 def test_generate_hashes_without_interfering_with_each_other(from_line):