Revert "Experiment: move Python environment list from tox into GitHub Actions matrix strategy"

jayaddison · jayaddison · commit 86f80bc4ec1d · 2021-01-12T23:21:05.000Z
This reverts commit 8dee9f0.
diff --git a/.github/workflows/python-tox.yml b/.github/workflows/python-tox.yml
@@ -5,16 +5,31 @@ jobs:
     # Credit: https://github.community/t/duplicate-checks-on-push-and-pull-request-simultaneous-event/18012
     if: github.event.push || github.event.pull_request.head.repo.full_name != github.repository
     runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        python: [2.7, 3.5, 3.6, 3.7, 3.8, pypy-2.7, pypy3
     steps:
       - uses: actions/checkout@v2
         with:
           submodules: true
       - uses: actions/setup-python@v2
         with:
-          python-version: ${{ matrix.python }}
+          python-version: 2.7
+      - uses: actions/setup-python@v2
+        with:
+          python-version: 3.5
+      - uses: actions/setup-python@v2
+        with:
+          python-version: 3.6
+      - uses: actions/setup-python@v2
+        with:
+          python-version: 3.7
+      - uses: actions/setup-python@v2
+        with:
+          python-version: 3.8
+      - uses: actions/setup-python@v2
+        with:
+          python-version: pypy-2.7
+      - uses: actions/setup-python@v2
+        with:
+          python-version: pypy3
       - run: pip install tox
       - run: tox --parallel
         env:
diff --git a/tox.ini b/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = py-{base,six19,optional}
+envlist = py{27,35,36,37,38,py,py3}-{base,six19,optional}
 
 [testenv]
 parallel_show_output = True
