Merge remote-tracking branch 'pypa/develop' into refactor_req_file

Conflicts:
	pip/req/req_file.py

Author: qwcode

docs/reference/pip_install.rst

@@ -453,6 +453,7 @@ the project path.  This is one advantage over just using ``setup.py develop``,
 which creates the "egg-info" directly relative the current working directory.
 
 
+.. _`controlling-setup-requires`:
 
 Controlling setup_requires
 ++++++++++++++++++++++++++

docs/user_guide.rst

@@ -535,7 +535,7 @@ From within a real python, where ``SomePackage`` *is* installed globally, and is
 Ensuring Repeatability
 **********************
 
-Three things are required to fully guarantee a repeatable installation using requirements files.
+Four things are required to fully guarantee a repeatable installation using requirements files.
 
 1. The requirements file was generated by ``pip freeze`` or you're sure it only
    contains requirements that specify a specific version.
@@ -544,15 +544,14 @@ Three things are required to fully guarantee a repeatable installation using req
    This guarantees that only what is explicitly listed in the requirements file is
    installed.
 
-3. The installation is performed against an index or find-links location that is
+3. None of the packages to be installed utilize the setup_requires keyword. See
+   :ref:`Controlling setup_requires<controlling-setup-requires>`.
+
+4. The installation is performed against an index or find-links location that is
    guaranteed to *not* allow archives to be changed and updated without a
-   version increase.  Unfortunately, this is *not* true on PyPI. It is possible
-   for the same pypi distribution to have a different hash over time. Project
-   authors are allowed to delete a distribution, and then upload a new one with
-   the same name and version, but a different hash. See `Issue #1175
-   <https://github.com/pypa/pip/issues/1175>`_ for plans to add hash
-   confirmation to pip, or a new "lock file" notion, but for now, know that the `peep
-   project <https://pypi.python.org/pypi/peep>`_ offers this feature on top of pip
+   version increase.  While this is safe on PyPI, it may not be safe for other
+   indices. If you are working with an unsafe index, consider the `peep project
+   <https://pypi.python.org/pypi/peep>`_ which offers this feature on top of pip
    using requirements file comments.
 
 
@@ -576,4 +575,4 @@ Once you have a bundle, you can then install it using::
 
     $ tempdir=$(mktemp -d /tmp/wheelhouse-XXXXX)
     $ (cd $tempdir; tar -xvf /path/to/bundled.tar.bz2)
-    $ pip install --force-reinstall --ignore-installed --upgrade --no-index --use-wheel --no-deps $tempdir/*
+    $ pip install --force-reinstall --ignore-installed --upgrade --no-index --no-deps $tempdir/*

pip/basecommand.py

@@ -109,7 +109,12 @@ def main(self, args):
         options, args = self.parse_args(args)
 
         if options.quiet:
-            level = "WARNING"
+            if options.quiet == 1:
+                level = "WARNING"
+            if options.quiet == 2:
+                level = "ERROR"
+            else:
+                level = "CRITICAL"
         elif options.verbose:
             level = "DEBUG"
         else:
@@ -281,15 +286,15 @@ class RequirementCommand(Command):
 
     @staticmethod
     def populate_requirement_set(requirement_set, args, options, finder,
-                                 session, name):
+                                 session, name, wheel_cache):
         """
         Marshal cmd line args into a requirement set.
         """
         for name in args:
             requirement_set.add_requirement(
                 InstallRequirement.from_line(
                     name, None, isolated=options.isolated_mode,
-                    cache_root=options.cache_dir
+                    wheel_cache=wheel_cache
                 )
             )
 
@@ -299,14 +304,15 @@ def populate_requirement_set(requirement_set, args, options, finder,
                     name,
                     default_vcs=options.default_vcs,
                     isolated=options.isolated_mode,
-                    cache_root=options.cache_dir
+                    wheel_cache=wheel_cache
                 )
             )
 
         for filename in options.requirements:
             for req in parse_requirements(
                     filename,
-                    finder=finder, options=options, session=session):
+                    finder=finder, options=options, session=session,
+                    wheel_cache=wheel_cache):
                 requirement_set.add_requirement(req)
 
         if not requirement_set.has_requirements:

pip/commands/freeze.py

@@ -4,6 +4,7 @@
 
 from pip.basecommand import Command
 from pip.operations.freeze import freeze
+from pip.wheel import WheelCache
 
 
 class FreezeCommand(Command):
@@ -54,14 +55,15 @@ def __init__(self, *args, **kw):
         self.parser.insert_option_group(0, self.cmd_opts)
 
     def run(self, options, args):
+        wheel_cache = WheelCache(options.cache_dir)
         freeze_kwargs = dict(
             requirement=options.requirement,
             find_links=options.find_links,
             local_only=options.local,
             user_only=options.user,
             skip_regex=options.skip_requirements_regex,
             isolated=options.isolated_mode,
-            cache_root=options.cache_dir)
+            wheel_cache=wheel_cache)
 
         for line in freeze(**freeze_kwargs):
             sys.stdout.write(line + '\n')

pip/commands/install.py

@@ -22,7 +22,7 @@
 from pip.utils import ensure_dir
 from pip.utils.build import BuildDirectory
 from pip.utils.deprecation import RemovedInPip8Warning
-from pip.wheel import WheelBuilder
+from pip.wheel import WheelCache, WheelBuilder
 
 
 logger = logging.getLogger(__name__)
@@ -239,11 +239,11 @@ def run(self, options, args):
 
             finder = self._build_package_finder(options, index_urls, session)
             build_delete = (not (options.no_clean or options.build_dir))
+            wheel_cache = WheelCache(options.cache_dir)
             with BuildDirectory(options.build_dir,
                                 delete=build_delete) as build_dir:
                 requirement_set = RequirementSet(
                     build_dir=build_dir,
-                    cache_root=options.cache_dir,
                     src_dir=options.src_dir,
                     download_dir=options.download_dir,
                     upgrade=options.upgrade,
@@ -256,10 +256,12 @@ def run(self, options, args):
                     session=session,
                     pycompile=options.compile,
                     isolated=options.isolated_mode,
+                    wheel_cache=wheel_cache,
                 )
 
                 self.populate_requirement_set(
                     requirement_set, args, options, finder, session, self.name,
+                    wheel_cache
                 )
 
                 if not requirement_set.has_requirements:

pip/commands/list.py

@@ -2,11 +2,14 @@
 
 import logging
 
+from pip._vendor import pkg_resources
+
 from pip.basecommand import Command
 from pip.exceptions import DistributionNotFound
-from pip.index import PackageFinder
+from pip.index import PackageFinder, Search
 from pip.req import InstallRequirement
 from pip.utils import get_installed_distributions, dist_is_editable
+from pip.wheel import WheelCache
 from pip.cmdoptions import make_option_group, index_group
 
 
@@ -128,10 +131,11 @@ def find_packages_latest_versions(self, options):
                 user_only=options.user,
                 include_editables=False,
             )
+            wheel_cache = WheelCache(options.cache_dir)
             for dist in installed_packages:
                 req = InstallRequirement.from_line(
                     dist.key, None, isolated=options.isolated_mode,
-                    cache_root=options.cache_dir,
+                    wheel_cache=wheel_cache
                 )
                 typ = 'unknown'
                 try:
@@ -144,9 +148,12 @@ def find_packages_latest_versions(self, options):
                 except DistributionNotFound:
                     continue
                 else:
+                    search = Search(
+                        req.name,
+                        pkg_resources.safe_name(req.name).lower(),
+                        ["source", "binary"])
                     remote_version = finder._link_package_versions(
-                        link, req.name
-                    ).version
+                        link, search).version
                     if link.is_wheel:
                         typ = 'wheel'
                     else:

pip/commands/uninstall.py

@@ -1,5 +1,6 @@
 from __future__ import absolute_import
 
+from pip.wheel import WheelCache
 from pip.req import InstallRequirement, RequirementSet, parse_requirements
 from pip.basecommand import Command
 from pip.exceptions import InstallationError
@@ -42,28 +43,28 @@ def __init__(self, *args, **kw):
 
     def run(self, options, args):
         with self._build_session(options) as session:
-
+            wheel_cache = WheelCache(options.cache_dir)
             requirement_set = RequirementSet(
                 build_dir=None,
-                cache_root=options.cache_dir,
                 src_dir=None,
                 download_dir=None,
                 isolated=options.isolated_mode,
                 session=session,
+                wheel_cache=wheel_cache,
             )
             for name in args:
                 requirement_set.add_requirement(
                     InstallRequirement.from_line(
                         name, isolated=options.isolated_mode,
-                        cache_root=options.cache_dir,
+                        wheel_cache=wheel_cache
                     )
                 )
             for filename in options.requirements:
                 for req in parse_requirements(
                         filename,
                         options=options,
                         session=session,
-                        cache_root=options.cache_dir):
+                        wheel_cache=wheel_cache):
                     requirement_set.add_requirement(req)
             if not requirement_set.has_requirements:
                 raise InstallationError(

pip/commands/wheel.py

@@ -12,7 +12,7 @@
 from pip.utils import import_or_raise, normalize_path
 from pip.utils.build import BuildDirectory
 from pip.utils.deprecation import RemovedInPip8Warning
-from pip.wheel import WheelBuilder
+from pip.wheel import WheelCache, WheelBuilder
 from pip import cmdoptions
 
 DEFAULT_WHEEL_DIR = os.path.join(normalize_path(os.curdir), 'wheelhouse')
@@ -155,22 +155,24 @@ def run(self, options, args):
             )
 
             build_delete = (not (options.no_clean or options.build_dir))
+            wheel_cache = WheelCache(options.cache_dir)
             with BuildDirectory(options.build_dir,
                                 delete=build_delete) as build_dir:
                 requirement_set = RequirementSet(
                     build_dir=build_dir,
-                    cache_root=options.cache_dir,
                     src_dir=options.src_dir,
                     download_dir=None,
                     ignore_dependencies=options.ignore_dependencies,
                     ignore_installed=True,
                     isolated=options.isolated_mode,
                     session=session,
+                    wheel_cache=wheel_cache,
                     wheel_download_dir=options.wheel_dir
                 )
 
                 self.populate_requirement_set(
                     requirement_set, args, options, finder, session, self.name,
+                    wheel_cache
                 )
 
                 if not requirement_set.has_requirements: