Merge branch 'master' into remove_legacy_resolver

Author: MrMino

.github/ISSUE_TEMPLATE/bug-report.yml

@@ -4,27 +4,30 @@ about: Something is not working correctly.
 title: ""
 labels: "S: needs triage, type: bug"
 issue_body: true  # default: true, adds a classic WSYWIG textarea, if on
-inputs:
-- type: description
+body:
+- type: markdown
   attributes:
     value: |
       ⚠
       If you're reporting an issue for `--use-feature=2020-resolver`,
       use the "Dependency resolver failures / errors" template instead.
-- type: description
+- type: markdown
   attributes:
     value: "**Environment**"
 - type: input
   attributes:
     label: pip version
+  validations:
     required: true
 - type: input
   attributes:
     label: Python version
+  validations:
     required: true
 - type: input
   attributes:
     label: OS
+  validations:
     required: true
 - type: textarea
   attributes:
@@ -72,7 +75,7 @@ inputs:
       Read the [PSF Code of Conduct][CoC] first.
 
       [CoC]: https://github.com/pypa/.github/blob/main/CODE_OF_CONDUCT.md
-    choices:
+    options:
     - label: I agree to follow the PSF Code of Conduct
       required: true
 ...

.pre-commit-config.yaml

@@ -23,16 +23,12 @@ repos:
     exclude: |
       (?x)
         ^docs/|
-        ^src/pip/_internal/cli|
         ^src/pip/_internal/commands|
-        ^src/pip/_internal/distributions|
         ^src/pip/_internal/index|
         ^src/pip/_internal/models|
         ^src/pip/_internal/network|
         ^src/pip/_internal/operations|
         ^src/pip/_internal/req|
-        ^src/pip/_internal/resolution|
-        ^src/pip/_internal/utils|
         ^src/pip/_internal/vcs|
         ^src/pip/_internal/\w+\.py$|
         ^src/pip/__main__.py$|
@@ -47,7 +43,6 @@ repos:
         ^tests/functional/test_install|
         # Files in the root of the repository
         ^setup.py|
-        ^noxfile.py|
         # A blank ignore, to avoid merge conflicts later.
         ^$
 
@@ -74,6 +69,7 @@ repos:
   - id: mypy
     exclude: docs|tests
     args: ["--pretty"]
+    additional_dependencies: ['nox==2020.12.31']
 
 - repo: https://github.com/pre-commit/pygrep-hooks
   rev: v1.7.0

docs/docs_feedback_sphinxext.py

@@ -3,13 +3,9 @@
 from __future__ import annotations
 
 from itertools import chain
-from typing import TYPE_CHECKING
-
-if TYPE_CHECKING:
-    from typing import Dict, List, Union
-
-    from sphinx.application import Sphinx
+from typing import Dict, List, Union
 
+from sphinx.application import Sphinx
 
 DEFAULT_DOC_LINES_THRESHOLD = 250
 RST_INDENT = 4

docs/html/reference/pip_install.rst

@@ -808,7 +808,15 @@ You can install local projects by specifying the project path to pip:
 During regular installation, pip will copy the entire project directory to a
 temporary location and install from there. The exception is that pip will
 exclude .tox and .nox directories present in the top level of the project from
-being copied.
+being copied. This approach is the cause of several performance and correctness
+issues, so it is planned that pip 21.3 will change to install directly from the
+local project directory. Depending on the build backend used by the project,
+this may generate secondary build artifacts in the project directory, such as
+the ``.egg-info`` and ``build`` directories in the case of the setuptools
+backend.
+
+To opt in to the future behavior, specify the ``--use-feature=in-tree-build``
+option in pip's command line.
 
 
 .. _`editable-installs`:

docs/pip_sphinxext.py

@@ -50,10 +50,10 @@ class PipOptions(rst.Directive):
 
     def _format_option(self, option, cmd_name=None):
         bookmark_line = (
-            ".. _`{cmd_name}_{option._long_opts[0]}`:"
+            f".. _`{cmd_name}_{option._long_opts[0]}`:"
             if cmd_name else
-            ".. _`{option._long_opts[0]}`:"
-        ).format(**locals())
+            f".. _`{option._long_opts[0]}`:"
+        )
         line = ".. option:: "
         if option._short_opts:
             line += option._short_opts[0]