Merge remote-tracking branch 'upstream/master'

Author: Patrik Kopkan

.azure-pipelines/jobs/package.yml

@@ -15,13 +15,13 @@ jobs:
     inputs:
       versionSpec: '3'
 
-  - bash: pip install setuptools tox wheel invoke towncrier requests
+  - bash: pip install tox nox setuptools wheel
     displayName: Install dependencies
 
-  - bash: invoke generate.authors
+  - bash: nox -s generate_authors
     displayName: Generate AUTHORS.txt
 
-  - bash: invoke generate.news --yes
+  - bash: nox -s generate_news -- --yes
     displayName: Generate NEWS.rst
 
   - bash: tox -e packaging

.gitignore

@@ -18,7 +18,7 @@ docs/build/
 .mypy_cache/
 
 # Unit test / coverage reports
-.tox/
+.[nt]ox/
 htmlcov/
 .coverage
 .coverage.*

MANIFEST.in

@@ -17,6 +17,7 @@ exclude .appveyor.yml
 exclude .travis.yml
 exclude .readthedocs.yml
 exclude tox.ini
+exclude noxfile.py
 
 recursive-include src/pip/_vendor *.pem
 recursive-include docs Makefile *.rst *.py *.bat

docs/html/development/release-process.rst

@@ -80,14 +80,13 @@ Creating a new release
 ----------------------
 
 #. Checkout the current pip ``master`` branch.
-#. Ensure you have the latest ``wheel``, ``setuptools``, ``twine``, ``invoke``
-   and ``towncrier`` packages installed.
-#. Generate a new ``AUTHORS.txt`` (``invoke generate.authors``) and commit the
+#. Ensure you have the latest ``wheel``, ``setuptools``, ``twine`` and ``nox`` packages installed.
+#. Generate a new ``AUTHORS.txt`` (``nox -s generate_authors``) and commit the
    results.
 #. Bump the version in ``pip/__init__.py`` to the release version and commit
    the results. Usually this involves dropping just the ``.devN`` suffix on the
    version.
-#. Generate a new ``NEWS.rst`` (``invoke generate.news``) and commit the
+#. Generate a new ``NEWS.rst`` (``nox -s generate_news``) and commit the
    results.
 #. Create a tag at the current commit, of the form ``YY.N``
    (``git tag YY.N``).

news/6763.bugfix

@@ -0,0 +1,2 @@
+Switch to new ``distlib`` wheel script template. This should be functionally
+equivalent for end users.

news/6924.bugfix

@@ -0,0 +1 @@
+Don't fail installation using pip.exe on Windows when pip wouldn't be upgraded.

noxfile.py

@@ -0,0 +1,55 @@
+"""Release time helpers, executed using nox.
+"""
+
+import io
+import subprocess
+
+import nox
+
+
+def get_author_list():
+    """Get the list of authors from Git commits.
+    """
+    # subprocess because session.run doesn't give us stdout
+    result = subprocess.run(
+        ["git", "log", "--use-mailmap", "--format=%aN <%aE>"],
+        capture_output=True,
+        encoding="utf-8",
+    )
+
+    # Create a unique list.
+    authors = []
+    seen_authors = set()
+    for author in result.stdout.splitlines():
+        author = author.strip()
+        if author.lower() not in seen_authors:
+            seen_authors.add(author.lower())
+            authors.append(author)
+
+    # Sort our list of Authors by their case insensitive name
+    return sorted(authors, key=lambda x: x.lower())
+
+
+# -----------------------------------------------------------------------------
+# Commands used during the release process
+# -----------------------------------------------------------------------------
+@nox.session
+def generate_authors(session):
+    # Get our list of authors
+    session.log("Collecting author names")
+    authors = get_author_list()
+
+    # Write our authors to the AUTHORS file
+    session.log("Writing AUTHORS")
+    with io.open("AUTHORS.txt", "w", encoding="utf-8") as fp:
+        fp.write(u"\n".join(authors))
+        fp.write(u"\n")
+
+
+@nox.session
+def generate_news(session):
+    session.log("Generating NEWS")
+    session.install("towncrier")
+
+    # You can pass 2 possible arguments: --draft, --yes
+    session.run("towncrier", *session.posargs)

setup.cfg

@@ -1,6 +1,7 @@
 [isort]
 skip =
     ./build,
+    .nox,
     .tox,
     .scratch,
     _vendor,
@@ -17,6 +18,7 @@ include_trailing_comma = true
 [flake8]
 exclude =
     ./build,
+    .nox,
     .tox,
     .scratch,
     _vendor,

src/pip/_internal/cli/base_command.py

@@ -11,6 +11,7 @@
 import traceback
 
 from pip._internal.cli import cmdoptions
+from pip._internal.cli.command_context import CommandContextMixIn
 from pip._internal.cli.parser import (
     ConfigOptionParser,
     UpdatingDefaultsHelpFormatter,
@@ -44,12 +45,13 @@
 logger = logging.getLogger(__name__)
 
 
-class Command(object):
+class Command(CommandContextMixIn):
     usage = None  # type: str
     ignore_require_venv = False  # type: bool
 
     def __init__(self, name, summary, isolated=False):
         # type: (str, str, bool) -> None
+        super(Command, self).__init__()
         parser_kw = {
             'usage': self.usage,
             'prog': '%s %s' % (get_prog(), name),
@@ -95,6 +97,14 @@ def parse_args(self, args):
         return self.parser.parse_args(args)
 
     def main(self, args):
+        # type: (List[str]) -> int
+        try:
+            with self.main_context():
+                return self._main(args)
+        finally:
+            logging.shutdown()
+
+    def _main(self, args):
         # type: (List[str]) -> int
         options, args = self.parse_args(args)
 
@@ -180,7 +190,4 @@ def main(self, args):
         finally:
             self.handle_pip_version_check(options)
 
-            # Shutdown the logging module
-            logging.shutdown()
-
         return SUCCESS

src/pip/_internal/cli/command_context.py

@@ -0,0 +1,26 @@
+from contextlib import contextmanager
+
+from pip._vendor.contextlib2 import ExitStack
+
+
+class CommandContextMixIn(object):
+    def __init__(self):
+        super(CommandContextMixIn, self).__init__()
+        self._in_main_context = False
+        self._main_context = ExitStack()
+
+    @contextmanager
+    def main_context(self):
+        assert not self._in_main_context
+
+        self._in_main_context = True
+        try:
+            with self._main_context:
+                yield
+        finally:
+            self._in_main_context = False
+
+    def enter_context(self, context_provider):
+        assert self._in_main_context
+
+        return self._main_context.enter_context(context_provider)

src/pip/_internal/cli/req_command.py

@@ -6,9 +6,11 @@
 """
 
 import os
+from functools import partial
 
 from pip._internal.cli.base_command import Command
 from pip._internal.cli.cmdoptions import make_search_scope
+from pip._internal.cli.command_context import CommandContextMixIn
 from pip._internal.download import PipSession
 from pip._internal.exceptions import CommandError
 from pip._internal.index import PackageFinder
@@ -18,6 +20,7 @@
 from pip._internal.req.constructors import (
     install_req_from_editable,
     install_req_from_line,
+    install_req_from_req_string,
 )
 from pip._internal.req.req_file import parse_requirements
 from pip._internal.utils.misc import normalize_path
@@ -34,11 +37,14 @@
     from pip._internal.utils.temp_dir import TempDirectory
 
 
-class SessionCommandMixin(object):
+class SessionCommandMixin(CommandContextMixIn):
 
     """
     A class mixin for command classes needing _build_session().
     """
+    def __init__(self):
+        super(SessionCommandMixin, self).__init__()
+        self._session = None  # Optional[PipSession]
 
     @classmethod
     def _get_index_urls(cls, options):
@@ -54,6 +60,13 @@ def _get_index_urls(cls, options):
         # Return None rather than an empty list
         return index_urls or None
 
+    def get_default_session(self, options):
+        # type: (Values) -> PipSession
+        """Get a default-managed session."""
+        if self._session is None:
+            self._session = self.enter_context(self._build_session(options))
+        return self._session
+
     def _build_session(self, options, retries=None, timeout=None):
         # type: (Values, Optional[int], Optional[int]) -> PipSession
         session = PipSession(
@@ -93,7 +106,7 @@ def _build_session(self, options, retries=None, timeout=None):
         return session
 
 
-class IndexGroupCommand(SessionCommandMixin, Command):
+class IndexGroupCommand(Command, SessionCommandMixin):
 
     """
     Abstract base class for commands with the index_group options.
@@ -167,19 +180,23 @@ def make_resolver(
         """
         Create a Resolver instance for the given parameters.
         """
+        make_install_req = partial(
+            install_req_from_req_string,
+            isolated=options.isolated_mode,
+            wheel_cache=wheel_cache,
+            use_pep517=use_pep517,
+        )
         return Resolver(
             preparer=preparer,
             session=session,
             finder=finder,
-            wheel_cache=wheel_cache,
+            make_install_req=make_install_req,
             use_user_site=use_user_site,
             ignore_dependencies=options.ignore_dependencies,
             ignore_installed=ignore_installed,
             ignore_requires_python=ignore_requires_python,
             force_reinstall=force_reinstall,
-            isolated=options.isolated_mode,
             upgrade_strategy=upgrade_strategy,
-            use_pep517=use_pep517,
             py_version_info=py_version_info
         )