Add pypy py-evm CI jobs; refactor testenvs in tox.ini.

ethereum · Aug 13, 2024 · be0c96f · be0c96f
1 parent f3af885
commit be0c96f
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 11 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -312,7 +312,11 @@ workflows:
                 "core-eels",
                 "core-eels_async",
                 "ens-eels",
-                "integration-ethtester-eels"
+                "integration-ethtester-eels",
+                "core-pyevm",
+                "core-pyevm_async",
+                "ens-pyevm",
+                "integration-ethtester-pyevm"
               ]
           python_exec: "pypy3"
           name: "pypy3<< matrix.python_minor_version >>-<< matrix.tox_env >>"

diff --git a/tox.ini b/tox.ini
@@ -1,15 +1,12 @@
 [tox]
 envlist=
-    py{310,311,312}-ens-eels
-    pypy312-{ens,core,integration-ethtester}-eels
-    py{310,311,312}-core-eels
-    py{38,39,310,311,312}-ens-pyevm
-    py{38,39,310,311,312}-core-pyevm
-    py{38,39,310,311,312}-integration-goethereum
-    py{38,39,310,311,312}-integration-integration-ethtester-pyevm
-    py{310,311,312}-integration-integration-ethtester-eels
-    py{38,39,310,311,312}-lint
-    py{38,39,310,311,312}-wheel
+    pypy310-{ens,core,integration}-{pyevm,eels}
+    py3{8,9,10,11,12}-{ens,core}-pyevm
+    py3{10,11,12}-{ens,core}-eels
+    py3{8,9,10,11,12}-integration-goethereum
+    py3{8,9,10,11,12}-integration-ethtester-pyevm
+    py3{10,11,12}-integration-ethtester-eels
+    py3{8,9,10,11,12}-{lint,wheel}
     docs
     benchmark
     windows-wheel