fixup! flail: attempt testing EOL pythons in workflow

dairiki · Sep 4, 2024 · 68a13c7 · 68a13c7
1 parent d7741c3
commit 68a13c7
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 36 deletions.
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -8,41 +8,39 @@ on:
 
 jobs:
   tests:
-    name: Python ${{ matrix.python-version }} (${{ matrix.runner }})
-    runs-on: ${{ matrix.runner }}
+    name: Python ${{ matrix.python }} ${{ matrix.os }}
+    runs-on: ${{ matrix.os || 'ubuntu-latest' }}
     strategy:
       fail-fast: false
       matrix:
-        runner: [ubuntu-latest]
-        python-version: ["3.7", "3.8", "3.9", "3.10", "3.11", "3.12", pypy-2.7, pypy-3.8, pypy-3.10]
         include:
-          - python-version: "3.6"
-            runner: ubuntu-20.04
-            eol: true
-          - python-version: "3.7"
-            eol: true
-          - python-version: pypy-2.7
-            eol: true
-
+          - {python: "3.6", os: ubuntu-20.04, tox3: true}
+          - {python: "3.7", tox3: true}
+          - {python: "3.8"}
+          - {python: "3.9"}
+          - {python: "3.10"}
+          - {python: "3.11"}
+          - {python: "3.12"}
+          - {python: pypy-2.7, toxenv: pypy27, tox3: true}
+          - {python: pypy-3.8, toxenv: pypy38}
+          - {python: pypy-3.10, toxenv: pypy310}
     steps:
     - uses: actions/checkout@v3
     - uses: actions/setup-python@v4
       id: setup-python
       with:
-        python-version: ${{ matrix.python-version }}
+        python-version: ${{ matrix.python }}
 
+    - run: python -m pip install --upgrade pip setuptools
     - name: Install tox4
-      if: ${{ ! matrix.eol }}
-      run: |
-        python -m pip install --upgrade pip setuptools
-        pip install tox tox-gh-actions
+      run: pip install tox
+      if: ${{ ! matrix.tox3 }}
     - name: Install tox3
-      if: ${{ matrix.eol }}
-      run: |
-        python -m pip install --upgrade pip setuptools
-        pip install 'tox<4' 'tox-gh-actions<3' 'virtualenv<20.22.0'
+      run: pip install 'tox<4' 'virtualenv<20.22.0'
+      if: ${{ matrix.tox3 }}
+
     - name: Test with tox
-      run: tox -vv
+      run: tox -e ${{ matrix.toxenv || format('py{0}', matrix.python) }}
 
     - uses: actions/upload-artifact@v3
       with:

diff --git a/tox.ini b/tox.ini
@@ -10,20 +10,6 @@ envlist =
 labels =
     eol = eol_py{27,36,37,py27}
 
-[gh-actions]
-python =
-    2.7: py27
-    3.6: py36
-    3.7: py37
-    3.8: py38
-    3.9: py39
-    3.10: py310
-    3.11: py311
-    3.12: py312
-    pypy-2.7: pypy27
-    pypy-3.8: pypy38
-    pypy-3.10: pypy310
-
 [testenv]
 deps =
     coverage[toml]