remove tox-gh

ethereum · Dec 20, 2023 · bf2c3a5 · bf2c3a5
1 parent 3a203b3
commit bf2c3a5
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 9 deletions.
diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
@@ -31,16 +31,21 @@ jobs:
           python-version: ${{ matrix.py }}
 
       - name: Install Tox and any other packages
-        run: pip install tox-gh>=1.3 requests
+        run: "pip install 'tox>=4.11,<5' requests"
 
       - name: Download Geth and add to $PATH
         run: |
           mkdir -p $GITHUB_WORKSPACE/bin
           $GITHUB_WORKSPACE/scripts/download_geth_linux.py --dir $GITHUB_WORKSPACE/bin
           echo $GITHUB_WORKSPACE/bin >> $GITHUB_PATH
 
-      - name: Run Tox
-        run: tox
+      - name: Run Tox (CPython)
+        if: "${{ !startsWith(matrix.py, 'pypy') }}"
+        run: tox -e static,optimized,py3
+
+      - name: Run Tox (PyPy)
+        if: "${{ startsWith(matrix.py, 'pypy') }}"
+        run: tox -e pypy3
         env:
           PYPY_GC_MAX: "6G"
 

diff --git a/tox.ini b/tox.ini
@@ -2,12 +2,6 @@
 min_version = 2.0
 envlist = py3,pypy3,static
 
-[gh]
-python =
-    3.10 = py3, optimized, static
-    3.x = py3, optimized, static
-    pypy3.10 = pypy3
-
 [testenv:static]
 extras =
     lint