Merge pull request #10164 from pradyunsg/python-3.10

Author: uranusjr

.github/workflows/ci.yml

@@ -96,6 +96,7 @@ jobs:
           - 3.7
           - 3.8
           - 3.9
+          - "3.10.0-alpha - 3.10"
 
     steps:
       - uses: actions/checkout@v2
@@ -137,6 +138,7 @@ jobs:
           # - 3.7
           # - 3.8
           - 3.9
+          - "3.10.0-alpha - 3.10"
         group: [1, 2]
 
     steps:

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

noxfile.py

@@ -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():

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",
     ],

tests/functional/test_warning.py

@@ -1,3 +1,4 @@
+import sys
 import textwrap
 
 import pytest
@@ -44,6 +45,10 @@ def test_flag_does_nothing_if_python_version_is_not_2(script):
     script.pip("list", "--no-python-version-warning")
 
 
+@pytest.mark.skipif(
+    sys.version_info >= (3, 10),
+    reason="distutils is deprecated in 3.10+"
+)
 def test_pip_works_with_warnings_as_errors(script):
     script.environ['PYTHONWARNINGS'] = 'error'
     script.pip("--version")

tests/lib/test_lib.py

@@ -45,7 +45,7 @@ def test_correct_pip_version(script):
     # distribution
     pip_folder_outputed = re.match(
         r"pip \d+(\.[\d]+)+(\.?(b|rc|dev|pre|post)\d+)? from (.*) "
-        r"\(python \d(.[\d])+\)$",
+        r"\(python \d+(\.[\d]+)+\)$",
         result.stdout,
     ).group(4)
     pip_folder = join(SRC_DIR, "src", "pip")

tox.ini

@@ -2,7 +2,7 @@
 minversion = 3.4.0
 envlist =
     docs, packaging, lint, vendoring,
-    py36, py37, py38, py39, pypy3
+    py36, py37, py38, py39, py310, pypy3
 
 [helpers]
 # Wrapper for calls to pip that make sure the version being used is the