Merge branch 'main' into release/21.2.4

.github/workflows/ci.yml

@@ -30,7 +30,6 @@ jobs:
             tests:
               # Anything that's touching testable stuff
               - ".github/workflows/ci.yml"
-              - "tools/requirements/tests.txt"
               - "src/**"
               - "tests/**"
         if: github.event_name == 'pull_request'
@@ -97,6 +96,7 @@ jobs:
           - 3.7
           - 3.8
           - 3.9
+          - "3.10.0-alpha - 3.10"
 
     steps:
       - uses: actions/checkout@v2
@@ -138,6 +138,7 @@ jobs:
           # - 3.7
           # - 3.8
           - 3.9
+          - "3.10.0-alpha - 3.10"
         group: [1, 2]
 
     steps:

.pre-commit-config.yaml

@@ -17,16 +17,13 @@ repos:
     exclude: .patch
 
 - repo: https://github.com/psf/black
-  rev: 20.8b1
+  rev: 21.7b0
   hooks:
   - id: black
     exclude: |
       (?x)
-        ^src/pip/_internal/commands|
-        ^src/pip/_internal/index|
         ^src/pip/_internal/models|
         ^src/pip/_internal/operations|
-        ^src/pip/_internal/req|
         ^src/pip/_internal/vcs|
         ^src/pip/_internal/\w+\.py$|
         # Tests
@@ -54,12 +51,17 @@ repos:
     files: \.py$
 
 - repo: https://github.com/pre-commit/mirrors-mypy
-  rev: v0.800
+  rev: v0.910
   hooks:
   - id: mypy
     exclude: tests
-    args: ["--pretty"]
-    additional_dependencies: ['nox==2020.12.31']
+    args: ["--pretty", "--show-error-codes"]
+    additional_dependencies: [
+        'keyring==23.0.1',
+        'nox==2020.12.31',
+        'types-docutils==0.1.8',
+        'types-six==0.1.9',
+    ]
 
 - repo: https://github.com/pre-commit/pygrep-hooks
   rev: v1.7.0

.readthedocs.yml

@@ -7,4 +7,4 @@ sphinx:
 python:
   version: 3.8
   install:
-    - requirements: tools/requirements/docs.txt
+    - requirements: docs/requirements.txt

MANIFEST.in

@@ -10,6 +10,7 @@ recursive-include  src/pip/_vendor *LICENSE*
 recursive-include  src/pip/_vendor *COPYING*
 
 include docs/docutils.conf
+include docs/requirements.txt
 
 exclude .coveragerc
 exclude .mailmap

docs/html/cli/pip.rst

@@ -47,7 +47,7 @@ verbosity log will be kept.  This option is empty by default. This log appends
 to previous logging.
 
 Like all pip options, ``--log`` can also be set as an environment variable, or
-placed into the pip config file.  See the :ref:`Configuration` section.
+placed into the pip config file. See the :doc:`../topics/configuration` section.
 
 .. _`exists-action`:
 

docs/html/cli/pip_install.rst

@@ -413,14 +413,14 @@ overridden by using ``--cert`` option or by using ``PIP_CERT``,
 Caching
 -------
 
-This is now covered in :doc:`../topics/caching`
+This is now covered in :doc:`../topics/caching`.
 
 .. _`Wheel cache`:
 
 Wheel Cache
 ^^^^^^^^^^^
 
-This is now covered in :doc:`../topics/caching`
+This is now covered in :doc:`../topics/caching`.
 
 .. _`hash-checking mode`:
 

docs/html/development/release-process.rst

@@ -116,15 +116,17 @@ Release Process
 Creating a new release
 ----------------------
 
-#. Checkout the current pip ``main`` branch.
 #. Ensure you have the latest ``nox`` installed.
+#. Create a new ``release/YY.N`` branch off ``main`` and switch to it.
 #. Prepare for release using ``nox -s prepare-release -- YY.N``.
    This will update the relevant files and tag the correct commit.
+#. Submit the ``release/YY.N`` branch as a pull request and ensure CI passes.
+   Merge the changes back into ``main`` and pull them back locally.
 #. Build the release artifacts using ``nox -s build-release -- YY.N``.
    This will checkout the tag, generate the distribution files to be
    uploaded and checkout the main branch again.
 #. Upload the release to PyPI using ``nox -s upload-release -- YY.N``.
-#. Push all of the changes including the tag.
+#. Push the tag created by ``prepare-release``.
 #. Regenerate the ``get-pip.py`` script in the `get-pip repository`_ (as
    documented there) and commit the results.
 #. Submit a Pull Request to `CPython`_ adding the new version of pip (and upgrading
@@ -168,7 +170,7 @@ order to create one of these the changes should already be merged into the
 #. Push the ``release/YY.N.Z+1`` branch to github and submit a PR for it against
    the ``main`` branch and wait for the tests to run.
 #. Once tests run, merge the ``release/YY.N.Z+1`` branch into ``main``, and
-   follow the above release process starting with step 4.
+   follow the above release process starting with step 5.
 
 .. _`get-pip repository`: https://github.com/pypa/get-pip
 .. _`psf-salt repository`: https://github.com/python/psf-salt

docs/html/installation.md

@@ -67,7 +67,7 @@ distro community, cloud provider support channels, etc).
 The current version of pip works on:
 
 - Windows, Linux and MacOS.
-- CPython 3.6, 3.7, 3.8, 3.9 and latest PyPy3.
+- CPython 3.6, 3.7, 3.8, 3.9, 3.10 and latest PyPy3.
 
 pip is tested to work on the latest patch version of the Python interpreter,
 for each of the minor versions listed above. Previous patch versions are

docs/pip_sphinxext.py

@@ -127,8 +127,7 @@ def _format_option(
             line += f" <{metavar.lower()}>"
         # fix defaults
         assert option.help is not None
-        # https://github.com/python/typeshed/pull/5080
-        opt_help = option.help.replace("%default", str(option.default))  # type: ignore
+        opt_help = option.help.replace("%default", str(option.default))
         # fix paths with sys.prefix
         opt_help = opt_help.replace(sys.prefix, "<sys.prefix>")
         return [bookmark_line, "", line, "", "    " + opt_help, ""]

tools/requirements/docs.txt → docs/requirements.txt

@@ -1,4 +1,4 @@
-sphinx == 3.2.1
+sphinx ~= 4.1.0
 towncrier
 furo
 myst_parser

news/10128.removal.rst

@@ -0,0 +1 @@
+Improve deprecation warning regarding the copying of source trees when installing from a local directory.

news/10165.trivial.rst

@@ -0,0 +1,4 @@
+Add a ``feature_flag`` optional kwarg to the ``deprecated()`` function
+``pip._internal.utils.deprecation:deprecated``. Also formulate a corresponding canned
+message which suggests using the ``--use-feature={feature_flag}`` to test upcoming
+behavior.

news/10233.bugfix.rst

@@ -0,0 +1,3 @@
+New resolver: When a package is specified with extras in constraints, and with
+extras in non-constraint requirements, the resolver now correctly identifies the
+constraint's existence and avoids backtracking.

news/10252.bugfix.rst

@@ -0,0 +1,2 @@
+Modify the ``sysconfig.get_preferred_scheme`` function check to be
+compatible with CPython 3.10’s alphareleases.

news/10280.bugfix.rst

@@ -0,0 +1 @@
+Fix 3.6.0 compatibility in link comparison logic.

noxfile.py

@@ -24,9 +24,9 @@
     "protected-pip": "tools/tox_pip.py",
 }
 REQUIREMENTS = {
-    "docs": "tools/requirements/docs.txt",
-    "tests": "tools/requirements/tests.txt",
-    "common-wheels": "tools/requirements/tests-common_wheels.txt",
+    "docs": "docs/requirements.txt",
+    "tests": "tests/requirements.txt",
+    "common-wheels": "tests/requirements-common_wheels.txt",
 }
 
 AUTHORS_FILE = "AUTHORS.txt"
@@ -70,7 +70,7 @@ def should_update_common_wheels() -> bool:
 #   completely to nox for all our automation. Contributors should prefer using
 #   `tox -e ...` until this note is removed.
 # -----------------------------------------------------------------------------
-@nox.session(python=["3.6", "3.7", "3.8", "3.9", "pypy3"])
+@nox.session(python=["3.6", "3.7", "3.8", "3.9", "3.10", "pypy3"])
 def test(session: nox.Session) -> None:
     # Get the common wheels.
     if should_update_common_wheels():
@@ -123,8 +123,7 @@ def docs(session: nox.Session) -> None:
     session.install("-e", ".")
     session.install("-r", REQUIREMENTS["docs"])
 
-    def get_sphinx_build_command(kind):
-        # type: (str) -> List[str]
+    def get_sphinx_build_command(kind: str) -> List[str]:
         # Having the conf.py in the docs/html is weird but needed because we
         # can not use a different configuration directory vs source directory
         # on RTD currently. So, we'll pass "-c docs/html" here.
@@ -180,8 +179,7 @@ def vendoring(session: nox.Session) -> None:
         session.run("vendoring", "sync", ".", "-v")
         return
 
-    def pinned_requirements(path):
-        # type: (Path) -> Iterator[Tuple[str, str]]
+    def pinned_requirements(path: Path) -> Iterator[Tuple[str, str]]:
         for line in path.read_text().splitlines(keepends=False):
             one, sep, two = line.partition("==")
             if not sep:

setup.py

@@ -41,6 +41,7 @@ def get_version(rel_path: str) -> str:
         "Programming Language :: Python :: 3.7",
         "Programming Language :: Python :: 3.8",
         "Programming Language :: Python :: 3.9",
+        "Programming Language :: Python :: 3.10",
         "Programming Language :: Python :: Implementation :: CPython",
         "Programming Language :: Python :: Implementation :: PyPy",
     ],