From 4911dac36fa2187af525a36963a41036a306180a Mon Sep 17 00:00:00 2001
From: Charles Cooper <cooper.charles.m@gmail.com>
Date: Sat, 16 Mar 2024 10:58:11 -0400
Subject: [PATCH 01/17] roll memory mock tests into the main tests job

---
 .github/workflows/test.yml | 38 ++++++++++----------------------------
 tox.ini                    |  8 --------
 2 files changed, 10 insertions(+), 36 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 7030cf45bc..4a6cce8805 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -87,6 +87,14 @@ jobs:
           #  opt-mode: gas
           #  evm-version: cancun
 
+          # run with `--memorymock`, but only need to do it one configuration
+          # TODO: consider removing the memorymock tests
+          - python-version: ["3.11", "311"]
+            opt-mode: gas
+            debug: false
+            evm-version: shanghai
+            memorymock: true
+
           # run across other python versions. we don't really need to run all
           # modes across all python versions - one is enough
           - python-version: ["3.10", "310"]
@@ -97,7 +105,7 @@ jobs:
           # TODO 3.12 doesn't work yet, investigate - may be hypothesis issue
           #- python-version: ["3.12", "312"]
 
-    name: py${{ matrix.python-version[1] }}-opt-${{ matrix.opt-mode }}${{ matrix.debug && '-debug' || '' }}-${{ matrix.evm-version }}
+    name: py${{ matrix.python-version[1] }}-opt-${{ matrix.opt-mode }}${{ matrix.debug && '-debug' || '' }}-${{ matrix.memorymock && '-memorymock' || '' }}-${{ matrix.evm-version }}
 
     steps:
     - uses: actions/checkout@v4
@@ -121,6 +129,7 @@ jobs:
           --optimize ${{ matrix.opt-mode }} \
           --evm-version ${{ matrix.evm-version }} \
           ${{ matrix.debug && '--enable-compiler-debug-mode' || '' }} \
+          ${{ matrix.memorymock && '--memorymock' || '' }} \
           --showlocals -r aR \
           tests/
 
@@ -190,30 +199,3 @@ jobs:
       - name: Check slow tests all succeeded
         if: ${{ needs.fuzzing.result != 'success' }}
         run: exit 1
-
-  memory:
-    runs-on: ubuntu-latest
-
-    steps:
-    - uses: actions/checkout@v4
-      with:
-          # need to fetch unshallow so that setuptools_scm can infer the version
-          fetch-depth: 0
-
-    - name: Set up Python 3.11
-      uses: actions/setup-python@v5
-      with:
-        python-version: "3.11"
-        cache: "pip"
-
-    - name: Install Tox
-      run: pip install tox
-
-    - name: Run Tox
-      run: TOXENV=memory tox -r
-
-    - name: Upload Coverage
-      uses: codecov/codecov-action@v4
-      with:
-        token: ${{ secrets.CODECOV_TOKEN }}
-        file: ./coverage.xml
diff --git a/tox.ini b/tox.ini
index 40b08f2d5c..42a7c230d9 100644
--- a/tox.ini
+++ b/tox.ini
@@ -19,11 +19,3 @@ commands =
 extras =
     test
 whitelist_externals = make
-
-[testenv:memory]
-basepython = python3
-commands =
-    pytest --memorymock {posargs:tests/}
-extras =
-    test
-whitelist_externals = make

From e156fd9e4a613efb2f1bd482985c00640361bb99 Mon Sep 17 00:00:00 2001
From: Charles Cooper <cooper.charles.m@gmail.com>
Date: Sat, 16 Mar 2024 11:01:15 -0400
Subject: [PATCH 02/17] fix name

---
 .github/workflows/test.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 4a6cce8805..03681bcdd4 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -105,7 +105,7 @@ jobs:
           # TODO 3.12 doesn't work yet, investigate - may be hypothesis issue
           #- python-version: ["3.12", "312"]
 
-    name: py${{ matrix.python-version[1] }}-opt-${{ matrix.opt-mode }}${{ matrix.debug && '-debug' || '' }}-${{ matrix.memorymock && '-memorymock' || '' }}-${{ matrix.evm-version }}
+    name: py${{ matrix.python-version[1] }}-opt-${{ matrix.opt-mode }}${{ matrix.debug && '-debug' || '' }}${{ matrix.memorymock && '-memorymock' || '' }}-${{ matrix.evm-version }}
 
     steps:
     - uses: actions/checkout@v4

From 10921d0d707cb6e413a10768f561970bea5f2d31 Mon Sep 17 00:00:00 2001
From: Charles Cooper <cooper.charles.m@gmail.com>
Date: Sat, 16 Mar 2024 11:09:44 -0400
Subject: [PATCH 03/17] rewrite fuzz test job to use gh actions only, not tox

---
 .github/workflows/test.yml | 20 +++++++++++++-------
 tox.ini                    |  8 --------
 2 files changed, 13 insertions(+), 15 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 03681bcdd4..4cf63c8a08 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -164,23 +164,29 @@ jobs:
     steps:
     - uses: actions/checkout@v4
 
-    - name: Set up Python 3.11
+    - name: Set up python
       uses: actions/setup-python@v5
       with:
-        python-version: "3.11"
+        python-version: "python3.11"
         cache: "pip"
 
-    - name: Install Tox
-      run: pip install tox
+    - name: Install dependencies
+      run: pip install .[test]
 
     # fetch test durations
     # NOTE: if the tests get poorly distributed, run this and commit the resulting `.test_durations` file to the `vyper-test-durations` repo.
-    # `TOXENV=fuzzing tox -r -- --store-durations -r aR tests/`
+    # `pytest -m "fuzzing" --store-durations -r aR tests/`
     - name: Fetch test-durations
       run: curl --location "https://raw.githubusercontent.com/vyperlang/vyper-test-durations/5982755ee8459f771f2e8622427c36494646e1dd/test_durations" -o .test_durations
 
-    - name: Run Tox
-      run: TOXENV=fuzzing tox -r -- --splits 60 --group ${{ matrix.group }} --splitting-algorithm least_duration -r aR tests/
+    - name: Run tests
+      run: |
+        pytest \
+          -m "fuzzing" \
+          --splits 60 \
+          --group ${{ matrix.group }} \
+          --splitting-algorithm least_duration \
+          -r aR tests/
 
     - name: Upload Coverage
       uses: codecov/codecov-action@v4
diff --git a/tox.ini b/tox.ini
index 42a7c230d9..fb5d488a0a 100644
--- a/tox.ini
+++ b/tox.ini
@@ -11,11 +11,3 @@ deps =
     sphinx-copybutton
 commands =
     sphinx-build {posargs:-E} -b html docs dist/docs -n -q --color
-
-[testenv:fuzzing]
-basepython = python3
-commands =
-    pytest -m fuzzing {posargs:tests/}
-extras =
-    test
-whitelist_externals = make

From 3ec936ebc2cafb2a7b0528e7dde669f9fafea8da Mon Sep 17 00:00:00 2001
From: Charles Cooper <cooper.charles.m@gmail.com>
Date: Sat, 16 Mar 2024 11:13:15 -0400
Subject: [PATCH 04/17] update eth-stdlib

---
 setup.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setup.py b/setup.py
index 0f9a1e1dfc..cee27734a0 100644
--- a/setup.py
+++ b/setup.py
@@ -20,7 +20,7 @@
         "tox>=3.15,<4.0",
         "lark==1.1.9",
         "hypothesis[lark]>=5.37.1,<6.0",
-        "eth-stdlib==0.2.6",
+        "eth-stdlib==0.2.7",
     ],
     "lint": [
         "black==23.12.0",

From 3ad5600c14e67c607f6f8b47f797c03f2a0f5d54 Mon Sep 17 00:00:00 2001
From: Charles Cooper <cooper.charles.m@gmail.com>
Date: Sat, 16 Mar 2024 13:41:00 -0400
Subject: [PATCH 05/17] fix python version

---
 .github/workflows/test.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 4cf63c8a08..ee03094018 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -164,10 +164,10 @@ jobs:
     steps:
     - uses: actions/checkout@v4
 
-    - name: Set up python
+    - name: Set up Python 3.11
       uses: actions/setup-python@v5
       with:
-        python-version: "python3.11"
+        python-version: "3.11"
         cache: "pip"
 
     - name: Install dependencies

From 36e775551275c7df36f8331e2fa0bbabb12c8407 Mon Sep 17 00:00:00 2001
From: Charles Cooper <cooper.charles.m@gmail.com>
Date: Sat, 16 Mar 2024 14:07:39 -0400
Subject: [PATCH 06/17] improve yaml formatting

---
 .github/workflows/test.yml | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index ee03094018..08e65bafcc 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -123,14 +123,14 @@ jobs:
       run: pip install .[test]
 
     - name: Run tests
-      run: |
-        pytest \
-          -m "not fuzzing" \
-          --optimize ${{ matrix.opt-mode }} \
-          --evm-version ${{ matrix.evm-version }} \
-          ${{ matrix.debug && '--enable-compiler-debug-mode' || '' }} \
-          ${{ matrix.memorymock && '--memorymock' || '' }} \
-          --showlocals -r aR \
+      run: >
+        pytest
+          -m "not fuzzing"
+          --optimize ${{ matrix.opt-mode }}
+          --evm-version ${{ matrix.evm-version }}
+          ${{ matrix.debug && '--enable-compiler-debug-mode' || '' }}
+          ${{ matrix.memorymock && '--memorymock' || '' }}
+          --showlocals -r aR
           tests/
 
     - name: Upload Coverage
@@ -180,12 +180,12 @@ jobs:
       run: curl --location "https://raw.githubusercontent.com/vyperlang/vyper-test-durations/5982755ee8459f771f2e8622427c36494646e1dd/test_durations" -o .test_durations
 
     - name: Run tests
-      run: |
-        pytest \
-          -m "fuzzing" \
-          --splits 60 \
-          --group ${{ matrix.group }} \
-          --splitting-algorithm least_duration \
+      run: >
+        pytest
+          -m "fuzzing"
+          --splits 60
+          --group ${{ matrix.group }}
+          --splitting-algorithm least_duration
           -r aR tests/
 
     - name: Upload Coverage

From 16421b5d214717cef78f176a386772ffa2c3c09d Mon Sep 17 00:00:00 2001
From: Charles Cooper <cooper.charles.m@gmail.com>
Date: Sat, 16 Mar 2024 14:27:59 -0400
Subject: [PATCH 07/17] Revert "improve yaml formatting"

This reverts commit 36e775551275c7df36f8331e2fa0bbabb12c8407.
---
 .github/workflows/test.yml | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 08e65bafcc..ee03094018 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -123,14 +123,14 @@ jobs:
       run: pip install .[test]
 
     - name: Run tests
-      run: >
-        pytest
-          -m "not fuzzing"
-          --optimize ${{ matrix.opt-mode }}
-          --evm-version ${{ matrix.evm-version }}
-          ${{ matrix.debug && '--enable-compiler-debug-mode' || '' }}
-          ${{ matrix.memorymock && '--memorymock' || '' }}
-          --showlocals -r aR
+      run: |
+        pytest \
+          -m "not fuzzing" \
+          --optimize ${{ matrix.opt-mode }} \
+          --evm-version ${{ matrix.evm-version }} \
+          ${{ matrix.debug && '--enable-compiler-debug-mode' || '' }} \
+          ${{ matrix.memorymock && '--memorymock' || '' }} \
+          --showlocals -r aR \
           tests/
 
     - name: Upload Coverage
@@ -180,12 +180,12 @@ jobs:
       run: curl --location "https://raw.githubusercontent.com/vyperlang/vyper-test-durations/5982755ee8459f771f2e8622427c36494646e1dd/test_durations" -o .test_durations
 
     - name: Run tests
-      run: >
-        pytest
-          -m "fuzzing"
-          --splits 60
-          --group ${{ matrix.group }}
-          --splitting-algorithm least_duration
+      run: |
+        pytest \
+          -m "fuzzing" \
+          --splits 60 \
+          --group ${{ matrix.group }} \
+          --splitting-algorithm least_duration \
           -r aR tests/
 
     - name: Upload Coverage

From c60b1166f4de2beb04a6616d99c3d55c2cbb34c3 Mon Sep 17 00:00:00 2001
From: Charles Cooper <cooper.charles.m@gmail.com>
Date: Sat, 16 Mar 2024 14:33:55 -0400
Subject: [PATCH 08/17] simplify some rules

---
 .github/workflows/test.yml | 23 ++++++++++-------------
 1 file changed, 10 insertions(+), 13 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index ee03094018..c1126133ee 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -68,31 +68,29 @@ jobs:
 
         # https://docs.github.com/en/actions/using-jobs/using-a-matrix-for-your-jobs#expanding-or-adding-matrix-configurations
         include:
-          # test default settings with 3.11 across all supported evm versions
-          - python-version: ["3.11", "311"]
-            debug: false
+          # test default settings with default python across all supported evm
+          # versions
+          - debug: false
             opt-mode: gas
             evm-version: london
-          - python-version: ["3.11", "311"]
-            debug: false
+          - debug: false
             opt-mode: gas
             evm-version: paris
-          - python-version: ["3.11", "311"]
-            debug: false
+
+          # redundant shanghai rule, for clarity
+          - debug: false
             opt-mode: gas
             evm-version: shanghai
           # enable when py-evm makes it work:
-          #- python-version: ["3.11", "311"]
+          #-
           #  debug: false
           #  opt-mode: gas
           #  evm-version: cancun
 
           # run with `--memorymock`, but only need to do it one configuration
-          # TODO: consider removing the memorymock tests
-          - python-version: ["3.11", "311"]
-            opt-mode: gas
+          # TODO: consider removing the memorymock tests entirely
+          - opt-mode: gas
             debug: false
-            evm-version: shanghai
             memorymock: true
 
           # run across other python versions. we don't really need to run all
@@ -100,7 +98,6 @@ jobs:
           - python-version: ["3.10", "310"]
             opt-mode: gas
             debug: false
-            evm-version: shanghai
 
           # TODO 3.12 doesn't work yet, investigate - may be hypothesis issue
           #- python-version: ["3.12", "312"]

From 7aa5f82abbbefd0d2ffd8f20d2ae34b7a312dd99 Mon Sep 17 00:00:00 2001
From: Charles Cooper <cooper.charles.m@gmail.com>
Date: Sat, 16 Mar 2024 14:39:25 -0400
Subject: [PATCH 09/17] remove tox altogether

---
 .github/workflows/test.yml | 27 +++++++++++++++------------
 tox.ini                    | 13 -------------
 2 files changed, 15 insertions(+), 25 deletions(-)
 delete mode 100644 tox.ini

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index c1126133ee..153b7cfcc5 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -50,11 +50,12 @@ jobs:
           python-version: "3.11"
           cache: "pip"
 
-      - name: Install Tox
-        run: pip install tox
+      - name: Install deps
+        # TODO these should really be in setup.py
+        run: pip install shibuya sphinx sphinx-copybutton
 
-      - name: Run Tox
-        run: TOXENV=docs tox -r
+      - name: Run docs
+        run: sphinx-build -E -b html docs dist/docs -n -q --color
 
   # "Regular"/core tests.
   tests:
@@ -70,17 +71,19 @@ jobs:
         include:
           # test default settings with default python across all supported evm
           # versions
-          - debug: false
+          - evm-version: london
+            debug: false
             opt-mode: gas
-            evm-version: london
-          - debug: false
+
+          - evm-version: paris
+            debug: false
             opt-mode: gas
-            evm-version: paris
 
           # redundant shanghai rule, for clarity
-          - debug: false
+          - evm-version: shanghai
+            debug: false
             opt-mode: gas
-            evm-version: shanghai
+
           # enable when py-evm makes it work:
           #-
           #  debug: false
@@ -89,9 +92,9 @@ jobs:
 
           # run with `--memorymock`, but only need to do it one configuration
           # TODO: consider removing the memorymock tests entirely
-          - opt-mode: gas
+          - memorymock: true
             debug: false
-            memorymock: true
+            opt-mode: gas
 
           # run across other python versions. we don't really need to run all
           # modes across all python versions - one is enough
diff --git a/tox.ini b/tox.ini
deleted file mode 100644
index fb5d488a0a..0000000000
--- a/tox.ini
+++ /dev/null
@@ -1,13 +0,0 @@
-[tox]
-envlist =
-    py{310,311}
-    docs
-
-[testenv:docs]
-basepython=python3
-deps =
-    shibuya
-    sphinx
-    sphinx-copybutton
-commands =
-    sphinx-build {posargs:-E} -b html docs dist/docs -n -q --color

From d24df7df3af61a08692936b0f880ff2644341e0e Mon Sep 17 00:00:00 2001
From: Charles Cooper <cooper.charles.m@gmail.com>
Date: Sat, 16 Mar 2024 14:41:29 -0400
Subject: [PATCH 10/17] add back shanghai

---
 .github/workflows/test.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 153b7cfcc5..6a6392df7b 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -101,6 +101,7 @@ jobs:
           - python-version: ["3.10", "310"]
             opt-mode: gas
             debug: false
+            evm-version: shanghai
 
           # TODO 3.12 doesn't work yet, investigate - may be hypothesis issue
           #- python-version: ["3.12", "312"]

From 9a34d592865d82dccdecb85c40c7d233699a1211 Mon Sep 17 00:00:00 2001
From: Charles Cooper <cooper.charles.m@gmail.com>
Date: Sat, 16 Mar 2024 14:46:09 -0400
Subject: [PATCH 11/17] Revert "simplify some rules"

This reverts commit c60b1166f4de2beb04a6616d99c3d55c2cbb34c3.
---
 .github/workflows/test.yml | 25 ++++++++++++++-----------
 1 file changed, 14 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 6a6392df7b..585ab7d2cd 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -69,32 +69,35 @@ jobs:
 
         # https://docs.github.com/en/actions/using-jobs/using-a-matrix-for-your-jobs#expanding-or-adding-matrix-configurations
         include:
-          # test default settings with default python across all supported evm
-          # versions
-          - evm-version: london
+          # test default settings with 3.11 across all supported evm versions
+          - python-version: ["3.11", "311"]
             debug: false
             opt-mode: gas
-
-          - evm-version: paris
+            evm-version: london
+          - python-version: ["3.11", "311"]
             debug: false
             opt-mode: gas
+            evm-version: paris
 
-          # redundant shanghai rule, for clarity
-          - evm-version: shanghai
+          # redundant rule, for clarity
+          - python-version: ["3.11", "311"]
             debug: false
             opt-mode: gas
+            evm-version: shanghai
 
           # enable when py-evm makes it work:
-          #-
+          #- python-version: ["3.11", "311"]
           #  debug: false
           #  opt-mode: gas
           #  evm-version: cancun
 
           # run with `--memorymock`, but only need to do it one configuration
-          # TODO: consider removing the memorymock tests entirely
-          - memorymock: true
-            debug: false
+          # TODO: consider removing the memorymock tests
+          - python-version: ["3.11", "311"]
             opt-mode: gas
+            debug: false
+            evm-version: shanghai
+            memorymock: true
 
           # run across other python versions. we don't really need to run all
           # modes across all python versions - one is enough

From 3b8c31a49322a2d3b36ec15820ab815dcf98f986 Mon Sep 17 00:00:00 2001
From: Charles Cooper <cooper.charles.m@gmail.com>
Date: Sat, 16 Mar 2024 15:03:36 -0400
Subject: [PATCH 12/17] add masking rule

---
 .github/workflows/test.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 585ab7d2cd..6c08b29881 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -66,6 +66,7 @@ jobs:
         opt-mode: ["gas", "none", "codesize"]
         evm-version: [shanghai]
         debug: [true, false]
+        memorymock: [false]
 
         # https://docs.github.com/en/actions/using-jobs/using-a-matrix-for-your-jobs#expanding-or-adding-matrix-configurations
         include:

From 8900978e11e19cd87ca421cd903c29bf507a812e Mon Sep 17 00:00:00 2001
From: Charles Cooper <cooper.charles.m@gmail.com>
Date: Sat, 16 Mar 2024 16:33:40 -0400
Subject: [PATCH 13/17] update latest test durations

---
 .github/workflows/test.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 6c08b29881..7b8924ae44 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -182,7 +182,7 @@ jobs:
     # NOTE: if the tests get poorly distributed, run this and commit the resulting `.test_durations` file to the `vyper-test-durations` repo.
     # `pytest -m "fuzzing" --store-durations -r aR tests/`
     - name: Fetch test-durations
-      run: curl --location "https://raw.githubusercontent.com/vyperlang/vyper-test-durations/5982755ee8459f771f2e8622427c36494646e1dd/test_durations" -o .test_durations
+      run: curl --location "https://raw.githubusercontent.com/vyperlang/vyper-test-durations/eda92714f3551093e59141bf900a940a610f4a3d/test_durations" -o .test_durations
 
     - name: Run tests
       run: |

From 6efc89c9eeb1e87e247b6cb420ec70953833680b Mon Sep 17 00:00:00 2001
From: Charles Cooper <cooper.charles.m@gmail.com>
Date: Sat, 16 Mar 2024 17:06:30 -0400
Subject: [PATCH 14/17] update pytest-cov (quash some warnings)

---
 setup.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setup.py b/setup.py
index b0f7ef15f2..10642ef659 100644
--- a/setup.py
+++ b/setup.py
@@ -9,7 +9,7 @@
 extras_require = {
     "test": [
         "pytest>=8.0,<9.0",
-        "pytest-cov>=2.10,<3.0",
+        "pytest-cov>=4.1,<5.0",
         "pytest-instafail>=0.4,<1.0",
         "pytest-xdist>=2.5,<3.0",
         "pytest-split>=0.7.0,<1.0",

From 928d71db944fb60d2f21f597becb9754552eb377 Mon Sep 17 00:00:00 2001
From: Charles Cooper <cooper.charles.m@gmail.com>
Date: Sun, 17 Mar 2024 14:49:33 -0400
Subject: [PATCH 15/17] use vyper-test-durations master

---
 .github/workflows/test.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 7d742c83cb..c028fbd2cb 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -189,7 +189,7 @@ jobs:
     # NOTE: if the tests get poorly distributed, run this and commit the resulting `.test_durations` file to the `vyper-test-durations` repo.
     # `pytest -m "fuzzing" --store-durations -r aR tests/`
     - name: Fetch test-durations
-      run: curl --location "https://raw.githubusercontent.com/vyperlang/vyper-test-durations/eda92714f3551093e59141bf900a940a610f4a3d/test_durations" -o .test_durations
+      run: curl --location "https://raw.githubusercontent.com/vyperlang/vyper-test-durations/master/test_durations" -o .test_durations
 
     - name: Run tests
       run: |

From e823455e8350705159751dd761d691517158297a Mon Sep 17 00:00:00 2001
From: Charles Cooper <cooper.charles.m@gmail.com>
Date: Sun, 17 Mar 2024 15:22:16 -0400
Subject: [PATCH 16/17] remove tox dependency

---
 setup.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/setup.py b/setup.py
index 10642ef659..b69f478326 100644
--- a/setup.py
+++ b/setup.py
@@ -17,7 +17,6 @@
         "eth_abi>=4.0.0,<5.0.0",
         "py-evm>=0.7.0a1,<0.8",
         "web3==6.0.0",
-        "tox>=3.15,<4.0",
         "lark==1.1.9",
         "hypothesis[lark]>=6.0,<7.0",
         "eth-stdlib==0.2.7",

From 2d98a292b80b1b70266d6611dee48a7c8c8e1c89 Mon Sep 17 00:00:00 2001
From: Charles Cooper <cooper.charles.m@gmail.com>
Date: Sun, 17 Mar 2024 15:28:55 -0400
Subject: [PATCH 17/17] remove more references to tox

---
 .pre-commit-config.yaml                                   | 2 +-
 pyproject.toml                                            | 1 -
 setup.cfg                                                 | 1 -
 tests/functional/codegen/test_selector_table_stability.py | 2 +-
 4 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index b943b5d31d..349feb21ce 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -22,7 +22,7 @@ repos:
     -   id: mypy
         additional_dependencies:
           - "types-setuptools"
-        args:  # settings from tox.ini
+        args:  # settings from Makefile
           - --install-types
           - --non-interactive
           - --follow-imports=silent
diff --git a/pyproject.toml b/pyproject.toml
index af87f2b5cd..86dc93be1a 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -13,7 +13,6 @@ exclude = '''
   | \.git
   | \.hg
   | \.mypy_cache
-  | \.tox
   | \.venv
   | _build
   | buck-out
diff --git a/setup.cfg b/setup.cfg
index dd4a32a3ac..1d159fb17a 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -9,7 +9,6 @@ extend-ignore = E203
 max-line-length = 100
 exclude =
 	venv*
-	.tox
 	docs
 	build
 per-file-ignores =
diff --git a/tests/functional/codegen/test_selector_table_stability.py b/tests/functional/codegen/test_selector_table_stability.py
index 27f82416d6..e3469f6915 100644
--- a/tests/functional/codegen/test_selector_table_stability.py
+++ b/tests/functional/codegen/test_selector_table_stability.py
@@ -13,7 +13,7 @@ def test_dense_jumptable_stability():
     )
 
     # test that the selector table data is stable across different runs
-    # (tox should provide different PYTHONHASHSEEDs).
+    # (xdist should provide different PYTHONHASHSEEDs).
     expected_asm = """{ DATA _sym_BUCKET_HEADERS b\'\\x0bB\' _sym_bucket_0 b\'\\n\' b\'+\\x8d\' _sym_bucket_1 b\'\\x0c\' b\'\\x00\\x85\' _sym_bucket_2 b\'\\x08\' } { DATA _sym_bucket_1 b\'\\xd8\\xee\\xa1\\xe8\' _sym_external 6 foo6()3639517672 b\'\\x05\' b\'\\xd2\\x9e\\xe0\\xf9\' _sym_external 0 foo0()3533627641 b\'\\x05\' b\'\\x05\\xf1\\xe0_\' _sym_external 2 foo2()99737695 b\'\\x05\' b\'\\x91\\t\\xb4{\' _sym_external 23 foo23()2433332347 b\'\\x05\' b\'np3\\x7f\' _sym_external 11 foo11()1852846975 b\'\\x05\' b\'&\\xf5\\x96\\xf9\' _sym_external 13 foo13()653629177 b\'\\x05\' b\'\\x04ga\\xeb\' _sym_external 14 foo14()73884139 b\'\\x05\' b\'\\x89\\x06\\xad\\xc6\' _sym_external 17 foo17()2298916294 b\'\\x05\' b\'\\xe4%\\xac\\xd1\' _sym_external 4 foo4()3827674321 b\'\\x05\' b\'yj\\x01\\xac\' _sym_external 7 foo7()2036990380 b\'\\x05\' b\'\\xf1\\xe6K\\xe5\' _sym_external 29 foo29()4058401765 b\'\\x05\' b\'\\xd2\\x89X\\xb8\' _sym_external 3 foo3()3532216504 b\'\\x05\' } { DATA _sym_bucket_2 b\'\\x06p\\xffj\' _sym_external 25 foo25()108068714 b\'\\x05\' b\'\\x964\\x99I\' _sym_external 24 foo24()2520029513 b\'\\x05\' b\'s\\x81\\xe7\\xc1\' _sym_external 10 foo10()1937893313 b\'\\x05\' b\'\\x85\\xad\\xc11\' _sym_external 28 foo28()2242756913 b\'\\x05\' b\'\\xfa"\\xb1\\xed\' _sym_external 5 foo5()4196577773 b\'\\x05\' b\'A\\xe7[\\x05\' _sym_external 22 foo22()1105681157 b\'\\x05\' b\'\\xd3\\x89U\\xe8\' _sym_external 1 foo1()3548993000 b\'\\x05\' b\'hL\\xf8\\xf3\' _sym_external 20 foo20()1749874931 b\'\\x05\' } { DATA _sym_bucket_0 b\'\\xee\\xd9\\x1d\\xe3\' _sym_external 9 foo9()4007206371 b\'\\x05\' b\'a\\xbc\\x1ch\' _sym_external 16 foo16()1639717992 b\'\\x05\' b\'\\xd3*\\xa7\\x0c\' _sym_external 21 foo21()3542787852 b\'\\x05\' b\'\\x18iG\\xd9\' _sym_external 19 foo19()409552857 b\'\\x05\' b\'\\n\\xf1\\xf9\\x7f\' _sym_external 18 foo18()183630207 b\'\\x05\' b\')\\xda\\xd7`\' _sym_external 27 foo27()702207840 b\'\\x05\' b\'2\\xf6\\xaa\\xda\' _sym_external 12 foo12()855026394 b\'\\x05\' b\'\\xbe\\xb5\\x05\\xf5\' _sym_external 15 foo15()3199534581 b\'\\x05\' b\'\\xfc\\xa7_\\xe6\' _sym_external 8 foo8()4238827494 b\'\\x05\' b\'\\x1b\\x12C8\' _sym_external 26 foo26()454181688 b\'\\x05\' } }"""  # noqa: E501
     assert expected_asm in output["asm"]