Refactor tox.ini environments to remove Cartesian product

It's tedious to maintain the Cartesian product of Python versions
and pytest versions in tox.ini. Instead of having tox derive the
Python version from the environment name, we can just pass it in
as an override.

Author: ramosbugs

.github/workflows/ci.yaml

@@ -57,7 +57,7 @@ jobs:
           python -m build
 
   pytest_integration_tests:
-    name: "PyTest Integration Tests: ${{ matrix.tox_env }}-${{ matrix.os }}"
+    name: "PyTest Integration Tests: py${{ matrix.python }}-${{ matrix.tox_env }}-${{ matrix.os }}"
     runs-on: ${{ matrix.os }}
     needs:
       # Don't incur the cost of the test matrix if the basic build fails.
@@ -66,56 +66,16 @@ jobs:
       fail-fast: false
       matrix:
         os: [ubuntu-latest, windows-latest]
+        python:
+          - "3.7"
+          - "3.8"
+          - "3.9"
+          - "3.10"
         tox_env:
-          - py37-pytest62
-          - py37-pytest70
-          - py37-pytest71
-          - py37-pytest72
-          - py38-pytest62
-          - py38-pytest70
-          - py38-pytest71
-          - py38-pytest72
-          - py39-pytest62
-          - py39-pytest70
-          - py39-pytest71
-          - py39-pytest72
-          - py310-pytest62
-          - py310-pytest70
-          - py310-pytest71
-          - py310-pytest72
-        include:
-          - tox_env: "py37-pytest62"
-            python: "3.7"
-          - tox_env: "py37-pytest70"
-            python: "3.7"
-          - tox_env: "py37-pytest71"
-            python: "3.7"
-          - tox_env: "py37-pytest72"
-            python: "3.7"
-          - tox_env: "py38-pytest62"
-            python: "3.8"
-          - tox_env: "py38-pytest70"
-            python: "3.8"
-          - tox_env: "py38-pytest71"
-            python: "3.8"
-          - tox_env: "py38-pytest72"
-            python: "3.8"
-          - tox_env: "py39-pytest62"
-            python: "3.9"
-          - tox_env: "py39-pytest70"
-            python: "3.9"
-          - tox_env: "py39-pytest71"
-            python: "3.9"
-          - tox_env: "py39-pytest72"
-            python: "3.9"
-          - tox_env: "py310-pytest62"
-            python: "3.10"
-          - tox_env: "py310-pytest70"
-            python: "3.10"
-          - tox_env: "py310-pytest71"
-            python: "3.10"
-          - tox_env: "py310-pytest72"
-            python: "3.10"
+          - pytest62
+          - pytest70
+          - pytest71
+          - pytest72
 
     steps:
       - uses: actions/checkout@v3
@@ -133,7 +93,10 @@ jobs:
       - name: Test
         run: |
           UNFLAKABLE_API_KEY=${{ secrets.UNFLAKABLE_API_KEY }} \
-          tox -e ${{ matrix.tox_env }} --override testenv.pass_env=UNFLAKABLE_API_KEY -- \
+          tox -e ${{ matrix.tox_env }} \
+            --override testenv.pass_env=UNFLAKABLE_API_KEY \
+            --override testenv.basepython=python${{ matrix.python }} \
+            -- \
             --enable-unflakable \
             --test-suite-id 2AT4xgduQdwkVKSaO0qJ2Dqm2JY \
             -s \

tox.ini

@@ -1,87 +1,27 @@
 # For more information about tox, see https://tox.readthedocs.io/en/latest/
 [tox]
-envlist = py37-pytest{62,70,71,72},py38-pytest{62,70,71,72},py39-pytest{62,70,71,72},py310-pytest{62,70,71,72},flake8,mypy,pycodestyle
+envlist = pytest{62,70,71,72},flake8,mypy,pycodestyle
 
 [testenv]
 extras = dev
 commands = pytest {posargs:tests}
 
-[testenv:py37-pytest62]
+[testenv:pytest62]
 deps =
     pytest>=6.2.0,<6.3.0
     pytest-xdist==2.3.0
 
-[testenv:py37-pytest70]
+[testenv:pytest70]
 deps =
     pytest>=7.0.0,<7.1.0
     pytest-xdist==2.4.0
 
-[testenv:py37-pytest71]
+[testenv:pytest71]
 deps =
     pytest>=7.1.0,<7.2.0
     pytest-xdist==2.5.0
 
-[testenv:py37-pytest72]
-deps =
-    pytest>=7.2.0,<7.3.0
-    pytest-xdist==2.5.0
-
-[testenv:py38-pytest62]
-deps =
-    pytest>=6.2.0,<6.3.0
-    pytest-xdist==2.3.0
-
-[testenv:py38-pytest70]
-deps =
-    pytest>=7.0.0,<7.1.0
-    pytest-xdist==2.4.0
-
-[testenv:py38-pytest71]
-deps =
-    pytest>=7.1.0,<7.2.0
-    pytest-xdist==2.5.0
-
-[testenv:py38-pytest72]
-deps =
-    pytest>=7.2.0,<7.3.0
-    pytest-xdist==2.5.0
-
-[testenv:py39-pytest62]
-deps =
-    pytest>=6.2.0,<6.3.0
-    pytest-xdist==2.3.0
-
-[testenv:py39-pytest70]
-deps =
-    pytest>=7.0.0,<7.1.0
-    pytest-xdist==2.4.0
-
-[testenv:py39-pytest71]
-deps =
-    pytest>=7.1.0,<7.2.0
-    pytest-xdist==2.5.0
-
-[testenv:py39-pytest72]
-deps =
-    pytest>=7.2.0,<7.3.0
-    pytest-xdist==2.5.0
-
-[testenv:py310-pytest62]
-deps =
-    pytest>=6.2.0,<6.3.0
-    pytest-xdist==2.3.0
-
-[testenv:py310-pytest70]
-deps =
-    pytest>=7.0.0,<7.1.0
-    pytest-xdist==2.4.0
-
-[testenv:py310-pytest71]
-deps =
-    pytest>=7.1.0,<7.2.0
-    pytest-xdist==2.5.0
-
-[testenv:py310-pytest72]
+[testenv:pytest72]
 deps =
     pytest>=7.2.0,<7.3.0
     pytest-xdist==2.5.0