Add shanghai test run to tox and circleci config

ethereum · Feb 27, 2023 · eb5ac84 · eb5ac84
1 parent 5872c05
commit eb5ac84
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 3 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -135,6 +135,12 @@ jobs:
       - image: cimg/python:3.9
         environment:
           TOXENV: py39-native-blockchain-transition
+  py39-native-blockchain-shanghai:
+    <<: *common
+    docker:
+      - image: cimg/python:3.9
+        environment:
+          TOXENV: py39-native-blockchain-shanghai
 
   py39-docs:
     <<: *common
@@ -270,6 +276,7 @@ workflows:
       - py39-native-blockchain-tangerine_whistle
       - py39-native-blockchain-spurious_dragon
       - py39-native-blockchain-transition
+      - py39-native-blockchain-shanghai
       - py37-vm
       - py38-vm
       - py39-vm

diff --git a/tox.ini b/tox.ini
@@ -1,7 +1,11 @@
 [tox]
 envlist=
     py{37,38,39}-{core,database,difficulty,transactions,vm}
-    py39-native-blockchain-{metropolis,transition,frontier,homestead,tangerine_whistle,spurious_dragon,byzantium,constantinople,petersburg,istanbul,berlin,london,merge}
+    py39-native-blockchain-{ \
+        metropolis, transition, frontier, homestead, tangerine_whistle, \
+        spurious_dragon, byzantium, constantinople, petersburg, istanbul, \
+        berlin, london, merge, shanghai \
+    }
     py{37,38,39}-lint
     py39-docs
 
@@ -26,6 +30,8 @@ commands=
     difficulty: pytest {posargs:tests/json-fixtures/test_difficulty.py}
     transactions: pytest {posargs:tests/json-fixtures/test_transactions.py}
     vm: pytest {posargs:tests/json-fixtures/test_virtual_machine.py}
+    native-blockchain-metropolis: pytest {posargs:tests/json-fixtures/blockchain/test_blockchain.py --fork Metropolis}
+    native-blockchain-transition: pytest {posargs:tests/json-fixtures/blockchain/test_blockchain.py -k TransitionTests --tx '2*popen//execmodel=eventlet'}
     native-blockchain-frontier: pytest {posargs:tests/json-fixtures/blockchain/test_blockchain.py --fork Frontier}
     native-blockchain-homestead: pytest {posargs:tests/json-fixtures/blockchain/test_blockchain.py --fork Homestead}
     native-blockchain-tangerine_whistle: pytest {posargs:tests/json-fixtures/blockchain/test_blockchain.py --fork EIP150}
@@ -37,8 +43,9 @@ commands=
     native-blockchain-berlin: pytest {posargs:tests/json-fixtures/blockchain/test_blockchain.py --fork Berlin}
     native-blockchain-london: pytest {posargs:tests/json-fixtures/blockchain/test_blockchain.py --fork London}
     native-blockchain-merge: pytest {posargs:tests/json-fixtures/blockchain/test_blockchain.py --fork Merge}
-    native-blockchain-metropolis: pytest {posargs:tests/json-fixtures/blockchain/test_blockchain.py --fork Metropolis}
-    native-blockchain-transition: pytest {posargs:tests/json-fixtures/blockchain/test_blockchain.py -k TransitionTests --tx '2*popen//execmodel=eventlet'}
+    # TODO: Add EOF support and remove the `-k "not EOF"` filter
+    native-blockchain-shanghai: pytest {posargs:tests/json-fixtures/blockchain/test_blockchain.py --fork Shanghai -k "not EOF"}
+
 
 deps =
     .[eth-extra,test]