From d046c029101aa30b32b9705bd97437d4efab4d5d Mon Sep 17 00:00:00 2001
From: fselmo <fselmo2@gmail.com>
Date: Mon, 12 Aug 2024 20:36:54 -0600
Subject: [PATCH] Add pypy py-evm CI jobs; refactor testenvs in ``tox.ini``.

---
 .circleci/config.yml |  8 ++++++--
 tox.ini              | 17 +++++++----------
 2 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 3e5b05dc5f..4776c921a3 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -203,7 +203,7 @@ jobs:
     docker:
       - image: cimg/python:3.<< parameters.python_minor_version >>
     environment:
-      TOXENV: pypy3-<< parameters.tox_env >>
+      TOXENV: pypy3<< parameters.python_minor_version >>-<< parameters.tox_env >>
 
   geth:
     parameters:
@@ -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
index bcb0b1dcc1..7a3ec11d5e 100644
--- 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