New Python versions in tests

Author: frenzymadness

.github/workflows/main.yaml

@@ -21,20 +21,22 @@ jobs:
         tox_env:
         # This information is repeated in tox.ini
         # (see https://github.com/fedora-python/tox-github-action/issues/8)
-        - py36-tox315
-        - py37-tox315
-        - py38-tox315
-        - py39-tox315
-
+        # Generate it by: tox -l | sed "s/^/- /"
         - py36-toxrelease
-        - py37-toxrelease
-        - py38-toxrelease
-        - py39-toxrelease
-
         - py36-toxmaster
+        - py36-toxtox315
+        - py37-toxrelease
         - py37-toxmaster
+        - py37-toxtox315
+        - py38-toxrelease
         - py38-toxmaster
+        - py38-toxtox315
+        - py39-toxrelease
         - py39-toxmaster
+        - py39-toxtox315
+        - py310-toxrelease
+        - py310-toxmaster
+        - py310-toxtox315
 
     # Use GitHub's Linux Docker host
     runs-on: ubuntu-latest

README.rst

@@ -280,8 +280,8 @@ or send Pull Requests.
 Tests
 ~~~~~
 
-In order to run the tests, you'll need ``tox`` and Python 3.6, 3.7, 3.8 and 3.9 installed.
-The integration tests assume all four are available.
+In order to run the tests, you'll need ``tox`` and Python from 3.6 to 3.10 installed.
+The integration tests assume all of them are available.
 On Fedora, you just need to ``dnf install tox``.
 
 Run ``tox`` to invoke the tests.

setup.py

@@ -34,6 +34,7 @@ def long_description():
         "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",
         "Topic :: Software Development :: Testing",
     ],

tests/fixtures/tox.ini

@@ -1,5 +1,5 @@
 [tox]
-envlist = py36,py37,py38,py39
+envlist = py36,py37,py38,py39,py310
 
 [testenv]
 deps =

tests/test_integration.py

@@ -16,6 +16,7 @@
 
 
 NATIVE_TOXENV = f"py{sys.version_info[0]}{sys.version_info[1]}"
+NATIVE_SITE_PACKAGES = f"lib/python{sys.version_info[0]}.{sys.version_info[1]}/site-packages"
 NATIVE_EXECUTABLE = str(pathlib.Path(sys.executable).resolve())
 FIXTURES_DIR = pathlib.Path(__file__).parent / "fixtures"
 DOT_TOX = pathlib.Path("./.tox")
@@ -100,9 +101,9 @@ def is_available(python):
     return True
 
 
-needs_py36789 = pytest.mark.skipif(
-    not all((is_available(f"python3.{x}") for x in range(6, 10))),
-    reason="This test needs python3.6, 3.7, 3.8 and 3.9 available in $PATH",
+needs_py3678910 = pytest.mark.skipif(
+    not all((is_available(f"python3.{x}") for x in range(6, 12))),
+    reason="This test needs python3.6, 3.7, 3.8, 3.9 and 3.10 available in $PATH",
 )
 
 
@@ -113,7 +114,7 @@ def test_native_toxenv_current_env():
     assert not (DOT_TOX / NATIVE_TOXENV / "lib").is_dir()
 
 
-@needs_py36789
+@needs_py3678910
 def test_all_toxenv_current_env():
     result = tox("--current-env", check=False)
     assert NATIVE_EXEC_PREFIX_MSG in result.stdout.splitlines()
@@ -132,7 +133,7 @@ def test_missing_toxenv_current_env(python):
     assert result.returncode > 0
 
 
-@needs_py36789
+@needs_py3678910
 def test_all_toxenv_current_env_skip_missing():
     result = tox("--current-env", "--skip-missing-interpreters", check=False)
     assert "InterpreterMismatch:" in result.stdout
@@ -255,11 +256,14 @@ def test_allenvs_print_deps(print_deps_stdout_arg):
         py
         six
         py
+        six
+        py
         ___________________________________ summary ____________________________________
           py36: commands succeeded
           py37: commands succeeded
           py38: commands succeeded
           py39: commands succeeded
+          py310: commands succeeded
           congratulations :)
         """
     ).lstrip()
@@ -278,18 +282,21 @@ def test_allenvs_print_extras(print_extras_stdout_arg):
         full
         dev
         full
+        dev
+        full
         ___________________________________ summary ____________________________________
           py36: commands succeeded
           py37: commands succeeded
           py38: commands succeeded
           py39: commands succeeded
+          py310: commands succeeded
           congratulations :)
         """
     ).lstrip()
     assert result.stdout == expected
 
 
-@pytest.mark.parametrize("toxenv", ["py36", "py37", "py38", "py39"])
+@pytest.mark.parametrize("toxenv", ["py36", "py37", "py38", "py39", "py310"])
 def test_print_deps_to_file(toxenv, tmp_path):
     depspath = tmp_path / "deps"
     result = tox("-e", toxenv, "--print-deps-to", str(depspath))
@@ -304,7 +311,7 @@ def test_print_deps_to_file(toxenv, tmp_path):
     assert result.stdout == expected
 
 
-@pytest.mark.parametrize("toxenv", ["py36", "py37", "py38", "py39"])
+@pytest.mark.parametrize("toxenv", ["py36", "py37", "py38", "py39", "py310"])
 def test_print_extras_to_file(toxenv, tmp_path):
     extraspath = tmp_path / "extras"
     result = tox("-e", toxenv, "--print-extras-to", str(extraspath))
@@ -323,14 +330,15 @@ def test_print_extras_to_file(toxenv, tmp_path):
 def test_allenvs_print_deps_to_file(tmp_path, option):
     depspath = tmp_path / "deps"
     result = tox(option, str(depspath))
-    assert depspath.read_text().splitlines() == ["six", "py"] * 4
+    assert depspath.read_text().splitlines() == ["six", "py"] * 5
     expected = textwrap.dedent(
         """
         ___________________________________ summary ____________________________________
           py36: commands succeeded
           py37: commands succeeded
           py38: commands succeeded
           py39: commands succeeded
+          py310: commands succeeded
           congratulations :)
         """
     ).lstrip()
@@ -341,14 +349,15 @@ def test_allenvs_print_deps_to_file(tmp_path, option):
 def test_allenvs_print_extras_to_file(tmp_path, option):
     extraspath = tmp_path / "extras"
     result = tox(option, str(extraspath))
-    assert extraspath.read_text().splitlines() == ["dev", "full"] * 4
+    assert extraspath.read_text().splitlines() == ["dev", "full"] * 5
     expected = textwrap.dedent(
         """
         ___________________________________ summary ____________________________________
           py36: commands succeeded
           py37: commands succeeded
           py38: commands succeeded
           py39: commands succeeded
+          py310: commands succeeded
           congratulations :)
         """
     ).lstrip()
@@ -447,16 +456,17 @@ def test_print_deps_only_print_deps_to_file_are_mutually_exclusive():
     assert "cannot be used together" in result.stderr
 
 
-@needs_py36789
+@needs_py3678910
 def test_regular_run():
     result = tox()
-    lines = sorted(result.stdout.splitlines()[:4])
+    lines = result.stdout.splitlines()[:5]
     assert "/.tox/py36 is the exec_prefix" in lines[0]
     assert "/.tox/py37 is the exec_prefix" in lines[1]
     assert "/.tox/py38 is the exec_prefix" in lines[2]
     assert "/.tox/py39 is the exec_prefix" in lines[3]
+    assert "/.tox/py310 is the exec_prefix" in lines[4]
     assert "congratulations" in result.stdout
-    for y in 6, 7, 8, 9:
+    for y in 6, 7, 8, 9, 10:
         for pkg in "py", "six", "test":
             sitelib = DOT_TOX / f"py3{y}/lib/python3.{y}/site-packages"
             assert sitelib.is_dir()
@@ -470,7 +480,7 @@ def test_regular_run_native_toxenv():
     assert "congratulations" in result.stdout
     for pkg in "py", "six", "test":
         sitelib = (
-            DOT_TOX / f"{NATIVE_TOXENV}/lib/python3.{NATIVE_TOXENV[-1]}/site-packages"
+            DOT_TOX / f"{NATIVE_TOXENV}/{NATIVE_SITE_PACKAGES}"
         )
         assert sitelib.is_dir()
         assert len(list(sitelib.glob(f"{pkg}-*.dist-info"))) == 1
@@ -565,7 +575,7 @@ def test_regular_recreate_after_print_deps(print_deps_stdout_arg):
 
     result = tox("-re", NATIVE_TOXENV)
     assert result.stdout.splitlines()[0] != NATIVE_EXEC_PREFIX_MSG
-    sitelib = DOT_TOX / f"{NATIVE_TOXENV}/lib/python3.{NATIVE_TOXENV[-1]}/site-packages"
+    sitelib = DOT_TOX / f"{NATIVE_TOXENV}/{NATIVE_SITE_PACKAGES}"
     assert sitelib.is_dir()
     assert len(list(sitelib.glob("test-*.dist-info"))) == 1
 

tox.ini

@@ -2,7 +2,7 @@
 
 # This information is repeated in .github/workflows/main.yaml
 # (see https://github.com/fedora-python/tox-github-action/issues/8)
-envlist = {py36,py37,py38,py39}-tox{release,master,tox315}
+envlist = {py36,py37,py38,py39,py310}-tox{release,master,tox315}
 
 [testenv]
 deps=