Merge branch 'master' into release_19.3.1

and drop master news file already included in 19.3.1

Author: xavfernandez

docs/html/development/getting-started.rst

@@ -40,6 +40,13 @@ To run tests locally, run:
 
     $ tox -e py36
 
+Generally, it can take a long time to run pip's test suite. To run tests in parallel,
+which is faster, run:
+
+.. code-block:: console
+
+    $ tox -e py36 -- -n auto
+
 The example above runs tests against Python 3.6. You can also use other
 versions like ``py27`` and ``pypy3``.
 

docs/html/installing.rst

@@ -18,12 +18,14 @@ Just make sure to :ref:`upgrade pip <Upgrading pip>`.
 Installing with get-pip.py
 --------------------------
 
-To install pip, securely download `get-pip.py
-<https://bootstrap.pypa.io/get-pip.py>`_. [1]_::
+To install pip, securely [1]_ download ``get-pip.py`` by following
+this link: `get-pip.py
+<https://bootstrap.pypa.io/get-pip.py>`_. Alternatively, use ``curl``::
 
  curl https://bootstrap.pypa.io/get-pip.py -o get-pip.py
 
-Then run the following::
+Then run the following command in the folder where you
+have downloaded ``get-pip.py``::
 
  python get-pip.py
 

news/7146.feature

@@ -0,0 +1 @@
+Display CA information in ``pip debug``.

news/7191.bugfix

@@ -0,0 +1 @@
+Change method from shutil.remove to shutil.rmtree in noxfile.py.

news/7193.bugfix

@@ -0,0 +1 @@
+Skip running tests which require subversion, when svn isn't installed

news/7199.trivial

@@ -0,0 +1 @@
+adding line in trivial file to avoid linter issues.

news/7222.doc

@@ -0,0 +1 @@
+Add more clear installation instructions

news/7225.feature

@@ -0,0 +1 @@
+Show only the filename (instead of full URL), when downloading from PyPI.

noxfile.py

@@ -76,7 +76,7 @@ def should_update_common_wheels():
 
     # Clear the stale cache.
     if need_to_repopulate:
-        shutil.remove(LOCATIONS["common-wheels"], ignore_errors=True)
+        shutil.rmtree(LOCATIONS["common-wheels"], ignore_errors=True)
 
     return need_to_repopulate
 

setup.py

@@ -76,8 +76,8 @@ def find_version(*file_paths):
     entry_points={
         "console_scripts": [
             "pip=pip._internal.main:main",
-            "pip%s=pip._internal.main:main" % sys.version_info[:1],
-            "pip%s.%s=pip._internal.main:main" % sys.version_info[:2],
+            "pip{}=pip._internal.main:main".format(sys.version_info[0]),
+            "pip{}.{}=pip._internal.main:main".format(*sys.version_info[:2]),
         ],
     },
 

src/pip/_internal/commands/debug.py

@@ -5,8 +5,11 @@
 
 import locale
 import logging
+import os
 import sys
 
+from pip._vendor.certifi import where
+
 from pip._internal.cli import cmdoptions
 from pip._internal.cli.base_command import Command
 from pip._internal.cli.cmdoptions import make_target_python
@@ -17,14 +20,14 @@
 from pip._internal.wheel import format_tag
 
 if MYPY_CHECK_RUNNING:
-    from typing import Any, List
+    from typing import Any, List, Optional
     from optparse import Values
 
 logger = logging.getLogger(__name__)
 
 
 def show_value(name, value):
-    # type: (str, str) -> None
+    # type: (str, Optional[str]) -> None
     logger.info('{}: {}'.format(name, value))
 
 
@@ -75,6 +78,25 @@ def show_tags(options):
             logger.info(msg)
 
 
+def ca_bundle_info(config):
+    levels = set()
+    for key, value in config.items():
+        levels.add(key.split('.')[0])
+
+    if not levels:
+        return "Not specified"
+
+    levels_that_override_global = ['install', 'wheel', 'download']
+    global_overriding_level = [
+        level for level in levels if level in levels_that_override_global
+    ]
+    if not global_overriding_level:
+        return 'global'
+
+    levels.remove('global')
+    return ", ".join(levels)
+
+
 class DebugCommand(Command):
     """
     Display debug information.
@@ -90,6 +112,7 @@ def __init__(self, *args, **kw):
         cmd_opts = self.cmd_opts
         cmdoptions.add_target_python_options(cmd_opts)
         self.parser.insert_option_group(0, cmd_opts)
+        self.parser.config.load()
 
     def run(self, options, args):
         # type: (Values, List[Any]) -> int
@@ -110,6 +133,11 @@ def run(self, options, args):
         show_value('sys.platform', sys.platform)
         show_sys_implementation()
 
+        show_value("'cert' config value", ca_bundle_info(self.parser.config))
+        show_value("REQUESTS_CA_BUNDLE", os.environ.get('REQUESTS_CA_BUNDLE'))
+        show_value("CURL_CA_BUNDLE", os.environ.get('CURL_CA_BUNDLE'))
+        show_value("pip._vendor.certifi.where()", where())
+
         show_tags(options)
 
         return SUCCESS

src/pip/_internal/download.py

@@ -180,8 +180,6 @@ def _download_url(
     else:
         show_progress = False
 
-    show_url = link.show_url
-
     def resp_read(chunk_size):
         try:
             # Special case for urllib3.
@@ -226,8 +224,8 @@ def written_chunks(chunks):
 
     progress_indicator = _progress_indicator
 
-    if link.netloc == PyPI.netloc:
-        url = show_url
+    if link.netloc == PyPI.file_storage_domain:
+        url = link.show_url
     else:
         url = link.url_without_fragment
 

src/pip/_internal/req/req_install.py

@@ -73,6 +73,32 @@
 logger = logging.getLogger(__name__)
 
 
+def _get_dist(metadata_directory):
+    # type: (str) -> Distribution
+    """Return a pkg_resources.Distribution for the provided
+    metadata directory.
+    """
+    dist_dir = metadata_directory.rstrip(os.sep)
+
+    # Determine the correct Distribution object type.
+    if dist_dir.endswith(".egg-info"):
+        dist_cls = pkg_resources.Distribution
+    else:
+        assert dist_dir.endswith(".dist-info")
+        dist_cls = pkg_resources.DistInfoDistribution
+
+    # Build a PathMetadata object, from path to metadata. :wink:
+    base_dir, dist_dir_name = os.path.split(dist_dir)
+    dist_name = os.path.splitext(dist_dir_name)[0]
+    metadata = pkg_resources.PathMetadata(base_dir, dist_dir)
+
+    return dist_cls(
+        base_dir,
+        project_name=dist_name,
+        metadata=metadata,
+    )
+
+
 class InstallRequirement(object):
     """
     Represents something that may be installed later on, may have information
@@ -619,26 +645,7 @@ def metadata(self):
 
     def get_dist(self):
         # type: () -> Distribution
-        """Return a pkg_resources.Distribution for this requirement"""
-        dist_dir = self.metadata_directory.rstrip(os.sep)
-
-        # Determine the correct Distribution object type.
-        if dist_dir.endswith(".egg-info"):
-            dist_cls = pkg_resources.Distribution
-        else:
-            assert dist_dir.endswith(".dist-info")
-            dist_cls = pkg_resources.DistInfoDistribution
-
-        # Build a PathMetadata object, from path to metadata. :wink:
-        base_dir, dist_dir_name = os.path.split(dist_dir)
-        dist_name = os.path.splitext(dist_dir_name)[0]
-        metadata = pkg_resources.PathMetadata(base_dir, dist_dir)
-
-        return dist_cls(
-            base_dir,
-            project_name=dist_name,
-            metadata=metadata,
-        )
+        return _get_dist(self.metadata_directory)
 
     def assert_source_matches_version(self):
         # type: () -> None

tests/functional/test_debug.py

@@ -10,6 +10,11 @@
     'locale.getpreferredencoding: ',
     'sys.platform: ',
     'sys.implementation:',
+    '\'cert\' config value: ',
+    'REQUESTS_CA_BUNDLE: ',
+    'CURL_CA_BUNDLE: ',
+    'pip._vendor.certifi.where(): ',
+
 ])
 def test_debug(script, expected_text):
     """

tests/functional/test_freeze.py

@@ -12,6 +12,7 @@
     _git_commit,
     need_bzr,
     need_mercurial,
+    need_svn,
     path_to_url,
 )
 
@@ -169,7 +170,7 @@ def test_freeze_editable_git_with_no_remote(script, tmpdir, deprecated_python):
     _check_output(result.stdout, expected)
 
 
-@pytest.mark.svn
+@need_svn
 def test_freeze_svn(script, tmpdir):
     """Test freezing a svn checkout"""
 

tests/functional/test_install.py

@@ -21,6 +21,7 @@
     create_test_package_with_setup,
     need_bzr,
     need_mercurial,
+    need_svn,
     path_to_url,
     pyversion,
     pyversion_tuple,
@@ -225,7 +226,7 @@ def test_basic_install_from_pypi(script):
     """
     Test installing a package from PyPI.
     """
-    result = script.pip('install', '-vvv', 'INITools==0.2')
+    result = script.pip('install', 'INITools==0.2')
     egg_info_folder = (
         script.site_packages / 'INITools-0.2-py%s.egg-info' % pyversion
     )
@@ -237,6 +238,13 @@ def test_basic_install_from_pypi(script):
     assert "Looking in indexes: " not in result.stdout
     assert "Looking in links: " not in result.stdout
 
+    # Ensure that we don't print the full URL.
+    #    The URL should be trimmed to only the last part of the path in it,
+    #    when installing from PyPI. The assertion here only checks for
+    #    `https://` since that's likely to show up if we're not trimming in
+    #    the correct circumstances.
+    assert "https://" not in result.stdout
+
 
 def test_basic_editable_install(script):
     """
@@ -251,7 +259,7 @@ def test_basic_editable_install(script):
     assert not result.files_updated
 
 
-@pytest.mark.svn
+@need_svn
 def test_basic_install_editable_from_svn(script):
     """
     Test checking out from svn.

tests/functional/test_install_reqs.py

@@ -5,6 +5,7 @@
 
 from tests.lib import (
     _create_test_package_with_subdirectory,
+    need_svn,
     path_to_url,
     pyversion,
     requirements_file,
@@ -100,7 +101,7 @@ def test_relative_requirements_file(script, data):
 
 
 @pytest.mark.network
-@pytest.mark.svn
+@need_svn
 def test_multiple_requirements_files(script, tmpdir):
     """
     Test installing from multiple nested requirements files.

tests/functional/test_install_user.py

@@ -6,7 +6,7 @@
 
 import pytest
 
-from tests.lib import pyversion
+from tests.lib import need_svn, pyversion
 from tests.lib.local_repos import local_checkout
 
 
@@ -41,7 +41,7 @@ def test_reset_env_system_site_packages_usersite(self, script):
         assert 'INITools' == project_name, project_name
 
     @pytest.mark.network
-    @pytest.mark.svn
+    @need_svn
     def test_install_subversion_usersite_editable_with_distribute(
             self, script, tmpdir):
         """

tests/functional/test_uninstall.py

@@ -13,7 +13,11 @@
 
 from pip._internal.req.constructors import install_req_from_line
 from pip._internal.utils.misc import rmtree
-from tests.lib import assert_all_changes, create_test_package_with_setup
+from tests.lib import (
+    assert_all_changes,
+    create_test_package_with_setup,
+    need_svn,
+)
 from tests.lib.local_repos import local_checkout, local_repo
 
 
@@ -289,6 +293,7 @@ def test_uninstall_easy_installed_console_scripts(script):
 
 
 @pytest.mark.network
+@need_svn
 def test_uninstall_editable_from_svn(script, tmpdir):
     """
     Test uninstalling an editable installation from svn.
@@ -352,7 +357,7 @@ def _test_uninstall_editable_with_source_outside_venv(
 
 
 @pytest.mark.network
-@pytest.mark.svn
+@need_svn
 def test_uninstall_from_reqs_file(script, tmpdir):
     """
     Test uninstall from a requirements file.

tests/lib/__init__.py

@@ -1037,6 +1037,12 @@ def need_bzr(fn):
     )(fn))
 
 
+def need_svn(fn):
+    return pytest.mark.svn(need_executable(
+        'Subversion', ('svn', '--version')
+    )(fn))
+
+
 def need_mercurial(fn):
     return pytest.mark.mercurial(need_executable(
         'Mercurial', ('hg', 'version')

tests/unit/test_vcs.py

@@ -13,7 +13,7 @@
 from pip._internal.vcs.mercurial import Mercurial
 from pip._internal.vcs.subversion import Subversion
 from pip._internal.vcs.versioncontrol import RevOptions, VersionControl
-from tests.lib import is_svn_installed, pyversion
+from tests.lib import is_svn_installed, need_svn, pyversion
 
 if pyversion >= '3':
     VERBOSE_FALSE = False
@@ -411,7 +411,7 @@ def test_subversion__init_use_interactive(
     assert svn.use_interactive == expected
 
 
-@pytest.mark.svn
+@need_svn
 def test_subversion__call_vcs_version():
     """
     Test Subversion.call_vcs_version() against local ``svn``.