Use tox4-style factors

pytest-dev · Jul 23, 2023 · f93f400 · f93f400
1 parent 0236cbf
commit f93f400
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 20 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -12,23 +12,23 @@ jobs:
       matrix:
         include:
           - python-version: "3.8"
-            toxfactor: py38
+            toxfactor: py3.8
             ignore-typecheck-outcome: true
             ignore-test-outcome: false
           - python-version: "3.9"
-            toxfactor: py39
+            toxfactor: py3.9
             ignore-typecheck-outcome: true
             ignore-test-outcome: false
           - python-version: "3.10"
-            toxfactor: py310
+            toxfactor: py31.0
             ignore-typecheck-outcome: true
             ignore-test-outcome: false
           - python-version: "3.11"
-            toxfactor: py311
+            toxfactor: py3.11
             ignore-typecheck-outcome: true
             ignore-test-outcome: false
           - python-version: "3.12-dev"
-            toxfactor: py312
+            toxfactor: py3.12
             ignore-typecheck-outcome: true
             ignore-test-outcome: false
 

diff --git a/tox.ini b/tox.ini
@@ -1,7 +1,7 @@
 [tox]
 distshare = {homedir}/.tox/distshare
-envlist = py{38,39}-pytest{50,51,52,53,54,60,61,62,70,71,72,73,74latest,main}
-          py{310,311,312}-pytest{62,70,71,72,73,latest,main}
+envlist = py{3.8,3.9}-pytest{5.0,5.1,5.2,5.3,5.4,6.0,6.1,6.2,7.0,7.1,7.2,7.3,7.4,latest,main}
+          py{3.10,3.11,3.12}-pytest{6.2,7.0,7.1,7.2,7.3,7.4,latest,main}
           mypy
 
 
@@ -11,19 +11,19 @@ commands = coverage run -m pytest {posargs:tests}
 deps =
     pytestlatest: pytest
     pytestmain: git+https://github.com/pytest-dev/pytest.git@main
-    pytest74: pytest~=7.4.0
-    pytest73: pytest~=7.3.0
-    pytest72: pytest~=7.2.0
-    pytest71: pytest~=7.1.0
-    pytest70: pytest~=7.0.0
-    pytest62: pytest~=6.2.0
-    pytest61: pytest~=6.1.0
-    pytest60: pytest~=6.0.0
-    pytest54: pytest~=5.4.0
-    pytest53: pytest~=5.3.0
-    pytest52: pytest~=5.2.0
-    pytest51: pytest~=5.1.0
-    pytest50: pytest~=5.0.0
+    pytest7.4: pytest~=7.4.0
+    pytest7.3: pytest~=7.3.0
+    pytest7.2: pytest~=7.2.0
+    pytest7.1: pytest~=7.1.0
+    pytest7.0: pytest~=7.0.0
+    pytest6.2: pytest~=6.2.0
+    pytest6.1: pytest~=6.1.0
+    pytest6.0: pytest~=6.0.0
+    pytest5.4: pytest~=5.4.0
+    pytest5.3: pytest~=5.3.0
+    pytest5.2: pytest~=5.2.0
+    pytest5.1: pytest~=5.1.0
+    pytest5.0: pytest~=5.0.0
 
     coverage[toml]