Merge pull request pypa#702 from qwcode/link_sort2

put back finder link priority (with tests)

Author: pnasrat

pip/index.py

@@ -101,6 +101,7 @@ def sort_path(path):
         return files, urls
 
     def find_requirement(self, req, upgrade):
+
         def mkurl_pypi_url(url):
             loc = posixpath.join(url, url_name)
             # For maximum compatibility with easy_install, ensure the path
@@ -165,21 +166,23 @@ def mkurl_pypi_url(url):
         if not found_versions and not page_versions and not dependency_versions and not file_versions:
             logger.fatal('Could not find any downloads that satisfy the requirement %s' % req)
             raise DistributionNotFound('No distributions at all found for %s' % req)
+        installed_version = []
         if req.satisfied_by is not None:
-            found_versions.append((req.satisfied_by.parsed_version, InfLink, req.satisfied_by.version))
+            installed_version = [(req.satisfied_by.parsed_version, InfLink, req.satisfied_by.version)]
         if file_versions:
             file_versions.sort(reverse=True)
             logger.info('Local files found: %s' % ', '.join([url_to_path(link.url) for parsed, link, version in file_versions]))
-            found_versions = file_versions + found_versions
-        all_versions = found_versions + page_versions + dependency_versions
+        #this is an intentional priority ordering
+        all_versions = installed_version + file_versions + found_versions + page_versions + dependency_versions
         applicable_versions = []
         for (parsed_version, link, version) in all_versions:
             if version not in req.req:
                 logger.info("Ignoring link %s, version %s doesn't match %s"
                             % (link, version, ','.join([''.join(s) for s in req.req.specs])))
                 continue
             applicable_versions.append((parsed_version, link, version))
-        applicable_versions = sorted(applicable_versions, reverse=True)
+        #bring the latest version to the front, but maintains the priority ordering as secondary
+        applicable_versions = sorted(applicable_versions, key=lambda v: v[0], reverse=True)
         existing_applicable = bool([link for parsed_version, link, version in applicable_versions if link is InfLink])
         if not upgrade and existing_applicable:
             if applicable_versions[0][1] is InfLink:
@@ -191,7 +194,7 @@ def mkurl_pypi_url(url):
             return None
         if not applicable_versions:
             logger.fatal('Could not find a version that satisfies the requirement %s (from versions: %s)'
-                         % (req, ', '.join([version for parsed_version, link, version in found_versions])))
+                         % (req, ', '.join([version for parsed_version, link, version in all_versions])))
             raise DistributionNotFound('No distributions matching the version for %s' % req)
         if applicable_versions[0][1] is InfLink:
             # We have an existing version, and its the best version
@@ -675,7 +678,7 @@ def show_url(self):
         return posixpath.basename(self.url.split('#', 1)[0].split('?', 1)[0])
 
 #An "Infinite Link" that compares greater than other links
-InfLink = Link(Inf)
+InfLink = Link(Inf) #this object is not currently used as a sortable
 
 
 def get_requirement_from_url(url):

pip/util.py

@@ -161,7 +161,8 @@ def __ge__(self, other):
     def __repr__(self):
         return 'Inf'
 
-Inf = _Inf()
+
+Inf = _Inf() #this object is not currently used as a sortable in our code
 del _Inf
 
 

tests/test_finder.py

@@ -75,3 +75,38 @@ def test_finder_detects_latest_already_satisfied_pypi_links():
     req.satisfied_by = satisfied_by
     finder = PackageFinder([], ["http://pypi.python.org/simple"])
     assert_raises(BestVersionAlreadyInstalled, finder.find_requirement, req, True)
+
+
+def test_finder_priority_file_over_page():
+    """Test PackageFinder prefers file links over equivalent page links"""
+    req = InstallRequirement.from_line('gmpy==1.15', None)
+    finder = PackageFinder([find_links], ["http://pypi.python.org/simple"])
+    link = finder.find_requirement(req, False)
+    assert link.url.startswith("file://")
+
+
+def test_finder_priority_page_over_deplink():
+    """Test PackageFinder prefers page links over equivalent dependency links"""
+    req = InstallRequirement.from_line('gmpy==1.15', None)
+    finder = PackageFinder([], ["http://pypi.python.org/simple"])
+    finder.add_dependency_links(['http://c.pypi.python.org/simple/gmpy/'])
+    link = finder.find_requirement(req, False)
+    assert link.url.startswith("http://pypi")
+
+
+def test_finder_priority_nonegg_over_eggfragments():
+    """Test PackageFinder prefers non-egg links over "#egg=" links"""
+    req = InstallRequirement.from_line('bar==1.0', None)
+    links = ['http://foo/bar.py#egg=bar-1.0', 'http://foo/bar-1.0.tar.gz']
+
+    finder = PackageFinder(links, [])
+    link = finder.find_requirement(req, False)
+    assert link.url.endswith('tar.gz')
+
+    links.reverse()
+    finder = PackageFinder(links, [])
+    link = finder.find_requirement(req, False)
+    assert link.url.endswith('tar.gz')
+
+
+