merge pypa/develop

Author: qwcode

.travis.yml

@@ -18,5 +18,6 @@ branches:
     - wheel_build
 matrix:
   allow_failures:
+    - python: 3.1
 env:
   - PIP_USE_MIRRORS=true

AUTHORS.txt

@@ -4,6 +4,8 @@ Alexandre Conrad
 Andrey Bulgakov
 Antti Kaihola
 Armin Ronacher
+Aziz Köksal
+Ben Rosser
 Brian Rosner
 Carl Meyer
 Chris McDonough

docs/configuration.txt

@@ -84,7 +84,8 @@ Location
 The names and locations of the configuration files vary slightly across
 platforms.
 
-On Unix and Mac OS X the configuration file is: :file:`$HOME/.pip/pip.conf`
+On Unix and Mac OS X the configuration file is: 
+:file:`$HOME/.config/pip/pip.conf`
 
 And on Windows, the configuration file is: :file:`%HOME%\\pip\\pip.ini`
 

docs/news.txt

@@ -17,6 +17,8 @@ develop (unreleased)
 * Pip now has experimental "wheel" support.  Thanks Daniel Holth, Paul Moore,
   and Michele Lacchia.
 
+* --user/--upgrade install options now work together; thanks eevee.
+
 * Added check in ``install --download`` to prevent re-downloading if the target
   file already exists. Thanks Andrey Bulgakov.
 
@@ -57,7 +59,10 @@ develop (unreleased)
   Hsiaoming Yang and Markus Hametner.
 
 * Use a temporary directory as the default build location outside of a
-  virtualenv. Fixes issues #339 and #381. Thanks TC01.
+  virtualenv. Fixes issues #339 and #381. Thanks Ben Rosser.
+
+* Moved pip configuration data to ~/.config/pip, the XDG standard for config
+  files on Unix/Linux systems. Thanks Ben Rosser.
 
 * Added support for specifying extras with local editables. Thanks Nick
   Stenning.

pip/index.py

@@ -104,12 +104,23 @@ 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
+            # ends in a trailing slash.  Although this isn't in the spec
+            # (and PyPI can handle it without the slash) some other index
+            # implementations might break if they relied on easy_install's behavior.
+            if not loc.endswith('/'):
+                loc = loc + '/'
+            return loc
+
         url_name = req.url_name
         # Only check main index if index URL is given:
         main_index_url = None
         if self.index_urls:
             # Check that we have the url_name correctly spelled:
-            main_index_url = Link(posixpath.join(self.index_urls[0], url_name))
+            main_index_url = Link(mkurl_pypi_url(self.index_urls[0]))
             # This will also cache the page, so it's okay that we get it again later:
             page = self._get_page(main_index_url, req)
             if page is None:
@@ -119,15 +130,6 @@ def find_requirement(self, req, upgrade):
         # adding more index URLs from requirements files
         all_index_urls = self.index_urls + self.mirror_urls
 
-        def mkurl_pypi_url(url):
-            loc = posixpath.join(url, url_name)
-            # For maximum compatibility with easy_install, ensure the path
-            # ends in a trailing slash.  Although this isn't in the spec
-            # (and PyPI can handle it without the slash) some other index
-            # implementations might break if they relied on easy_install's behavior.
-            if not loc.endswith('/'):
-                loc = loc + '/'
-            return loc
         if url_name is not None:
             locations = [
                 mkurl_pypi_url(url)
@@ -167,21 +169,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:
@@ -193,7 +197,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
@@ -227,7 +231,7 @@ def _find_url_name(self, index_url, url_name, req):
 
     def _get_pages(self, locations, req):
         """Yields (page, page_url) from the given locations, skipping
-        locations that have errors, and adding download/homepage links"""
+        locations that have errors, and adding homepage links"""
         pending_queue = Queue()
         for location in locations:
             pending_queue.put(location)
@@ -258,7 +262,7 @@ def _get_queued_page(self, req, pending_queue, done, seen):
             if page is None:
                 continue
             done.append(page)
-            for link in page.rel_links():
+            for link in page.rel_links(rels=('homepage',)):
                 pending_queue.put(link)
 
     _egg_fragment_re = re.compile(r'#egg=([^&]*)')
@@ -568,8 +572,8 @@ def links(self):
             url = self.clean_link(urlparse.urljoin(self.base_url, url))
             yield Link(url, self)
 
-    def rel_links(self):
-        for url in self.explicit_rel_links():
+    def rel_links(self, rels=('homepage', 'download')):
+        for url in self.explicit_rel_links(rels):
             yield url
         for url in self.scraped_rel_links():
             yield url
@@ -703,7 +707,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/locations.py

@@ -3,6 +3,7 @@
 import sys
 import site
 import os
+import shutil
 import tempfile
 from pip.backwardcompat import get_python_lib
 
@@ -60,9 +61,29 @@ def virtualenv_no_global():
     default_log_file = os.path.join(default_storage_dir, 'pip.log')
 else:
     bin_py = os.path.join(sys.prefix, 'bin')
-    default_storage_dir = os.path.join(user_dir, '.pip')
+
+    # Use XDG_CONFIG_HOME instead of the ~/.pip
+    # On some systems, we may have to create this, on others it probably exists
+    xdg_dir = os.path.join(user_dir, '.config')
+    xdg_dir = os.environ.get('XDG_CONFIG_HOME', xdg_dir)
+    if not os.path.exists(xdg_dir):
+        os.mkdir(xdg_dir)
+    default_storage_dir = os.path.join(xdg_dir, 'pip')
     default_config_file = os.path.join(default_storage_dir, 'pip.conf')
     default_log_file = os.path.join(default_storage_dir, 'pip.log')
+    
+    # Migration path for users- move things from the old dir if it exists
+    # If the new dir exists and has no pip.conf and the old dir does, move it
+    # When these checks are finished, delete the old directory
+    old_storage_dir = os.path.join(user_dir, '.pip')
+    old_config_file = os.path.join(old_storage_dir, 'pip.conf')
+    if os.path.exists(old_storage_dir):
+        if not os.path.exists(default_storage_dir):
+            shutil.copytree(old_storage_dir, default_storage_dir)
+        elif os.path.exists(old_config_file) and not os.path.exists(default_config_file):
+            shutil.copy2(old_config_file, default_config_file)
+        shutil.rmtree(old_storage_dir)
+    
     # Forcing to use /usr/local/bin for standard Mac OS X framework installs
     # Also log to ~/Library/Logs/ for use with the Console.app log viewer
     if sys.platform[:6] == 'darwin' and sys.prefix[:16] == '/System/Library/':

pip/req.py

@@ -97,7 +97,7 @@ def from_line(cls, name, comes_from=None):
             link = Link(name)
         elif os.path.isdir(path) and (os.path.sep in name or name.startswith('.')):
             if not is_installable_dir(path):
-                raise InstallationError("Directory %r is not installable. File 'setup.py' not found.", name)
+                raise InstallationError("Directory %r is not installable. File 'setup.py' not found." % name)
             link = Link(path_to_url(name))
         elif is_archive_file(path):
             if not os.path.isfile(path):
@@ -922,7 +922,9 @@ def locate_files(self):
                 req_to_install.check_if_exists()
                 if req_to_install.satisfied_by:
                     if self.upgrade:
-                        req_to_install.conflicts_with = req_to_install.satisfied_by
+                        #don't uninstall conflict if user install and and conflict is not user install
+                        if not (self.use_user_site and not dist_in_usersite(req_to_install.satisfied_by)):
+                            req_to_install.conflicts_with = req_to_install.satisfied_by
                         req_to_install.satisfied_by = None
                     else:
                         install_needed = False
@@ -974,7 +976,9 @@ def prepare_files(self, finder, force_root_egg_info=False, bundle=False):
                                 req_to_install.url = url.url
 
                         if not best_installed:
-                            req_to_install.conflicts_with = req_to_install.satisfied_by
+                            #don't uninstall conflict if user install and conflict is not user install
+                            if not (self.use_user_site and not dist_in_usersite(req_to_install.satisfied_by)):
+                                req_to_install.conflicts_with = req_to_install.satisfied_by
                             req_to_install.satisfied_by = None
                     else:
                         install = False
@@ -1090,7 +1094,9 @@ def prepare_files(self, finder, force_root_egg_info=False, bundle=False):
                         req_to_install.check_if_exists()
                         if req_to_install.satisfied_by:
                             if self.upgrade or self.ignore_installed:
-                                req_to_install.conflicts_with = req_to_install.satisfied_by
+                                #don't uninstall conflict if user install and and conflict is not user install
+                                if not (self.use_user_site and not dist_in_usersite(req_to_install.satisfied_by)):
+                                    req_to_install.conflicts_with = req_to_install.satisfied_by
                                 req_to_install.satisfied_by = None
                             else:
                                 install = False
@@ -1392,7 +1398,7 @@ def parse_editable(editable_req, default_vcs=None):
 
     if os.path.isdir(url_no_extras):
         if not os.path.exists(os.path.join(url_no_extras, 'setup.py')):
-            raise InstallationError("Directory %r is not installable. File 'setup.py' not found.", url_no_extras)
+            raise InstallationError("Directory %r is not installable. File 'setup.py' not found." % url_no_extras)
         # Treating it as code that has already been checked out
         url_no_extras = path_to_url(url_no_extras)
 

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

@@ -95,3 +95,35 @@ def test_find_wheel(mock_get_supported):
     found = finder.find_requirement(req, True)
     assert found.url.endswith("simple.dist-0.1-py2.py3-none-any.whl"), found
 
+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')
+
+

tests/test_index.py

@@ -33,6 +33,30 @@ def test_html_page_should_be_able_to_scrap_rel_links():
     assert len(links) == 1
     assert links[0].url == 'http://supervisord.org/'
 
+
+def test_html_page_should_be_able_to_filter_links_by_rel():
+    """
+    Test selecting links by the rel attribute
+    """
+    page = HTMLPage("""
+        <a href="http://example.com/page.html">Some page</a>
+        <a href="http://example.com/archive-1.2.3.tar.gz" rel="download">Download URL</a>
+        <a href="http://example.com/home.html" rel="homepage">Homepage</a>
+        """, "archive")
+
+    links = list(page.rel_links())
+    urls = [l.url for l in links]
+    hlinks = list(page.rel_links(('homepage',)))
+    dlinks = list(page.rel_links(('download',)))
+    assert len(links) == 2
+    assert 'http://example.com/archive-1.2.3.tar.gz' in urls
+    assert 'http://example.com/home.html' in urls
+    assert len(hlinks) == 1
+    assert hlinks[0].url == 'http://example.com/home.html'
+    assert len(dlinks) == 1
+    assert dlinks[0].url == 'http://example.com/archive-1.2.3.tar.gz'
+
+
 @patch('socket.gethostbyname_ex')
 def test_get_mirrors(mock_gethostbyname_ex):
     # Test when the expected result comes back

tests/test_requirements.py

@@ -80,20 +80,23 @@ def test_multiple_requirements_files():
 def test_respect_order_in_requirements_file():
     env = reset_env()
     write_file('frameworks-req.txt', textwrap.dedent("""\
-        bidict
-        ordereddict
-        initools
+        parent
+        child
+        simple
         """))
-    result = run_pip('install', '-r', env.scratch_path / 'frameworks-req.txt')
+
+    find_links = 'file://' + os.path.join(here, 'packages')
+    result = run_pip('install', '--no-index', '-f', find_links, '-r', env.scratch_path / 'frameworks-req.txt')
+
     downloaded = [line for line in result.stdout.split('\n')
                   if 'Downloading/unpacking' in line]
 
-    assert 'bidict' in downloaded[0], 'First download should ' \
-            'be "bidict" but was "%s"' % downloaded[0]
-    assert 'ordereddict' in downloaded[1], 'Second download should ' \
-            'be "ordereddict" but was "%s"' % downloaded[1]
-    assert 'initools' in downloaded[2], 'Third download should ' \
-            'be "initools" but was "%s"' % downloaded[2]
+    assert 'parent' in downloaded[0], 'First download should ' \
+            'be "parent" but was "%s"' % downloaded[0]
+    assert 'child' in downloaded[1], 'Second download should ' \
+            'be "child" but was "%s"' % downloaded[1]
+    assert 'simple' in downloaded[2], 'Third download should ' \
+            'be "simple" but was "%s"' % downloaded[2]
 
 
 def test_requirements_data_structure_keeps_order():