Merge pull request #10641 from hugovk/rm-3.6

pypa · Nov 12, 2021 · 71151fa · 71151fa
2 parents d81c65a + 7c9da5f
commit 71151fa
Show file tree

Hide file tree

Showing 13 changed files with 40 additions and 234 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -102,11 +102,10 @@ jobs:
       matrix:
         os: [Ubuntu, MacOS]
         python:
-          - 3.6
           - 3.7
           - 3.8
           - 3.9
-          - "3.10.0-alpha - 3.10"
+          - "3.10"
 
     steps:
       - uses: actions/checkout@v2
@@ -151,12 +150,11 @@ jobs:
       matrix:
         os: [Windows]
         python:
-          - 3.6
+          - 3.7
           # Commented out, since Windows tests are expensively slow.
-          # - 3.7
           # - 3.8
           - 3.9
-          - "3.10.0-alpha - 3.10"
+          - "3.10"
         group: [1, 2]
 
     steps:

diff --git a/docs/html/development/ci.rst b/docs/html/development/ci.rst
@@ -18,17 +18,17 @@ Supported interpreters
 
 pip support a variety of Python interpreters:
 
-- CPython 3.6
 - CPython 3.7
 - CPython 3.8
 - CPython 3.9
+- CPython 3.10
 - Latest PyPy3
 
 on different operating systems:
 
 - Linux
 - Windows
-- MacOS
+- macOS
 
 and on different architectures:
 
@@ -77,9 +77,9 @@ Developer tasks
 ======== =============== ================ ================== =============
    OS          docs            lint           vendoring        packaging
 ======== =============== ================ ================== =============
-Linux         Github           Github           Github           Github
-Windows       Github           Github           Github           Github
-MacOS         Github           Github           Github           Github
+Linux         GitHub           GitHub           GitHub           GitHub
+Windows       GitHub           GitHub           GitHub           GitHub
+macOS         GitHub           GitHub           GitHub           GitHub
 ======== =============== ================ ================== =============
 
 Actual testing
@@ -88,28 +88,26 @@ Actual testing
 +------------------------------+---------------+-----------------+
 |       **interpreter**        |   **unit**    | **integration** |
 +-----------+----------+-------+---------------+-----------------+
-|           |          | CP3.6 |               |                 |
-|           |          +-------+---------------+-----------------+
 |           |   x86    | CP3.7 |               |                 |
 |           |          +-------+---------------+-----------------+
 |           |          | CP3.8 |               |                 |
 |           |          +-------+---------------+-----------------+
 |           |          | CP3.9 |               |                 |
 |           |          +-------+---------------+-----------------+
+|           |          | CP3.10|               |                 |
+|           |          +-------+---------------+-----------------+
 |           |          | PyPy3 |               |                 |
 |  Windows  +----------+-------+---------------+-----------------+
-|           |          | CP3.6 |   Github      |   Github        |
-|           |          +-------+---------------+-----------------+
-|           |   x64    | CP3.7 |               |                 |
+|           |   x64    | CP3.7 |   GitHub      |   GitHub        |
 |           |          +-------+---------------+-----------------+
 |           |          | CP3.8 |               |                 |
 |           |          +-------+---------------+-----------------+
-|           |          | CP3.9 |   Github      |   Github        |
+|           |          | CP3.9 |   GitHub      |   GitHub        |
+|           |          +-------+---------------+-----------------+
+|           |          | CP3.10|   GitHub      |   GitHub        |
 |           |          +-------+---------------+-----------------+
 |           |          | PyPy3 |               |                 |
 +-----------+----------+-------+---------------+-----------------+
-|           |          | CP3.6 |               |                 |
-|           |          +-------+---------------+-----------------+
 |           |   x86    | CP3.7 |               |                 |
 |           |          +-------+---------------+-----------------+
 |           |          | CP3.8 |               |                 |
@@ -118,33 +116,33 @@ Actual testing
 |           |          +-------+---------------+-----------------+
 |           |          | PyPy3 |               |                 |
 |   Linux   +----------+-------+---------------+-----------------+
-|           |          | CP3.6 |   Github      |   Github        |
+|           |   x64    | CP3.7 |   GitHub      |   GitHub        |
 |           |          +-------+---------------+-----------------+
-|           |   x64    | CP3.7 |   Github      |   Github        |
+|           |          | CP3.8 |   GitHub      |   GitHub        |
 |           |          +-------+---------------+-----------------+
-|           |          | CP3.8 |   Github      |   Github        |
+|           |          | CP3.9 |   GitHub      |   GitHub        |
 |           |          +-------+---------------+-----------------+
-|           |          | CP3.9 |   Github      |   Github        |
+|           |          | CP3.10|   GitHub      |   GitHub        |
 |           |          +-------+---------------+-----------------+
 |           |          | PyPy3 |               |                 |
 +-----------+----------+-------+---------------+-----------------+
-|           |          | CP3.6 |               |                 |
-|           |          +-------+---------------+-----------------+
 |           |   x86    | CP3.7 |               |                 |
 |           |          +-------+---------------+-----------------+
 |           |          | CP3.8 |               |                 |
 |           |          +-------+---------------+-----------------+
 |           |          | CP3.9 |               |                 |
 |           |          +-------+---------------+-----------------+
+|           |          | CP3.10|               |                 |
+|           |          +-------+---------------+-----------------+
 |           |          | PyPy3 |               |                 |
-|   MacOS   +----------+-------+---------------+-----------------+
-|           |          | CP3.6 |   Github      |   Github        |
+|   macOS   +----------+-------+---------------+-----------------+
+|           |   x64    | CP3.7 |   GitHub      |   GitHub        |
 |           |          +-------+---------------+-----------------+
-|           |   x64    | CP3.7 |   Github      |   Github        |
+|           |          | CP3.8 |   GitHub      |   GitHub        |
 |           |          +-------+---------------+-----------------+
-|           |          | CP3.8 |   Github      |   Github        |
+|           |          | CP3.9 |   GitHub      |   GitHub        |
 |           |          +-------+---------------+-----------------+
-|           |          | CP3.9 |   Github      |   Github        |
+|           |          | CP3.10|   GitHub      |   GitHub        |
 |           |          +-------+---------------+-----------------+
 |           |          | PyPy3 |               |                 |
 +-----------+----------+-------+---------------+-----------------+
diff --git a/docs/html/development/getting-started.rst b/docs/html/development/getting-started.rst
@@ -70,15 +70,15 @@ To run tests:
 
 .. code-block:: console
 
-    $ tox -e py36 -- -n auto
+    $ tox -e py310 -- -n auto
 
 To run tests without parallelization, run:
 
 .. code-block:: console
 
-    $ tox -e py36
+    $ tox -e py310
 
-The example above runs tests against Python 3.6. You can also use other
+The example above runs tests against Python 3.10. You can also use other
 versions like ``py39`` and ``pypy3``.
 
 ``tox`` has been configured to forward any additional arguments it is given to
@@ -88,11 +88,11 @@ can select tests using the various ways that pytest provides:
 .. code-block:: console
 
     $ # Using file name
-    $ tox -e py36 -- tests/functional/test_install.py
+    $ tox -e py310 -- tests/functional/test_install.py
     $ # Using markers
-    $ tox -e py36 -- -m unit
+    $ tox -e py310 -- -m unit
     $ # Using keywords
-    $ tox -e py36 -- -k "install and not wheel"
+    $ tox -e py310 -- -k "install and not wheel"
 
 Running pip's entire test suite requires supported version control tools
 (subversion, bazaar, git, and mercurial) to be installed. If you are missing
@@ -101,8 +101,8 @@ explicitly tell pytest to skip those tests:
 
 .. code-block:: console
 
-    $ tox -e py36 -- -k "not svn"
-    $ tox -e py36 -- -k "not (svn or git)"
+    $ tox -e py310 -- -k "not svn"
+    $ tox -e py310 -- -k "not (svn or git)"
 
 
 Running Linters

diff --git a/docs/html/installation.md b/docs/html/installation.md
@@ -75,7 +75,7 @@ $ pip install --upgrade pip
 The current version of pip works on:
 
 - Windows, Linux and MacOS.
-- CPython 3.6, 3.7, 3.8, 3.9, 3.10 and latest PyPy3.
+- CPython 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

diff --git a/news/10641.removal.rst b/news/10641.removal.rst
@@ -0,0 +1 @@
+Drop support for Python 3.6.
diff --git a/noxfile.py b/noxfile.py
@@ -69,7 +69,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", "3.10", "pypy3"])
+@nox.session(python=["3.7", "3.8", "3.9", "3.10", "pypy3"])
 def test(session: nox.Session) -> None:
     # Get the common wheels.
     if should_update_common_wheels():

diff --git a/setup.cfg b/setup.cfg
@@ -107,8 +107,6 @@ exclude_lines =
     pragma: no cover
     # This excludes typing-specific code, which will be validated by mypy anyway.
     if TYPE_CHECKING
-    # Can be set to exclude e.g. `if PY2:` on Python 3
-    ${PIP_CI_COVERAGE_EXCLUDES}
 
 [metadata]
 license_file = LICENSE.txt
diff --git a/setup.py b/setup.py
@@ -37,7 +37,6 @@ def get_version(rel_path: str) -> str:
         "Programming Language :: Python",
         "Programming Language :: Python :: 3",
         "Programming Language :: Python :: 3 :: Only",
-        "Programming Language :: Python :: 3.6",
         "Programming Language :: Python :: 3.7",
         "Programming Language :: Python :: 3.8",
         "Programming Language :: Python :: 3.9",
@@ -81,5 +80,5 @@ def get_version(rel_path: str) -> str:
         ],
     },
     zip_safe=False,
-    python_requires=">=3.6",
+    python_requires=">=3.7",
 )
diff --git a/src/pip/_internal/build_env.py b/src/pip/_internal/build_env.py
@@ -197,14 +197,7 @@ def install_requirements(
         if not requirements:
             return
         with contextlib.ExitStack() as ctx:
-            # TODO: Remove this block when dropping 3.6 support. Python 3.6
-            # lacks importlib.resources and pep517 has issues loading files in
-            # a zip, so we fallback to the "old" method by adding the current
-            # pip directory to the child process's sys.path.
-            if sys.version_info < (3, 7):
-                pip_runnable = os.path.dirname(pip_location)
-            else:
-                pip_runnable = ctx.enter_context(_create_standalone_pip())
+            pip_runnable = ctx.enter_context(_create_standalone_pip())
             self._install_requirements(
                 pip_runnable,
                 finder,

diff --git a/src/pip/_internal/commands/list.py b/src/pip/_internal/commands/list.py
@@ -16,7 +16,6 @@
 from pip._internal.network.session import PipSession
 from pip._internal.utils.compat import stdlib_pkgs
 from pip._internal.utils.misc import tabulate, write_output
-from pip._internal.utils.parallel import map_multithread
 
 if TYPE_CHECKING:
     from pip._internal.metadata.base import DistributionVersion
@@ -254,7 +253,7 @@ def latest_info(
                 dist.latest_filetype = typ
                 return dist
 
-            for dist in map_multithread(latest_info, packages):
+            for dist in map(latest_info, packages):
                 if dist is not None:
                     yield dist
 

diff --git a/src/pip/_internal/utils/parallel.py b/src/pip/_internal/utils/parallel.py