From f600728dd5b000063e83e6249c87dff70910098e Mon Sep 17 00:00:00 2001
From: Justin Traglia <jtraglia@pm.me>
Date: Thu, 22 Aug 2024 08:07:48 -0500
Subject: [PATCH 1/5] Fix the install_pyspec_test CI check

---
 .circleci/config.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 94dcefdb6..d53e0c47e 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -80,7 +80,7 @@ jobs:
             - ~/specs-repo
   install_pyspec_test:
     docker:
-      - image: ethpandaops/circleci-python-rust:latest
+      - image: cimg/python:3.12.4
     working_directory: ~/specs-repo
     steps:
       - restore_cache:
@@ -88,7 +88,7 @@ jobs:
       - restore_pyspec_cached_venv
       - run:
           name: Install pyspec requirements
-          command: make install_test && make preinstallation
+          command: make install_test
       - save_pyspec_cached_venv
   test-phase0:
     docker:

From a9a1d9ad04a40f7f58a84dfdae1164b78a873459 Mon Sep 17 00:00:00 2001
From: Justin Traglia <jtraglia@pm.me>
Date: Thu, 22 Aug 2024 08:22:24 -0500
Subject: [PATCH 2/5] Try no restore/save cache

---
 .circleci/config.yml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index d53e0c47e..5a5ec5627 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -83,13 +83,13 @@ jobs:
       - image: cimg/python:3.12.4
     working_directory: ~/specs-repo
     steps:
-      - restore_cache:
-          key: v3-specs-repo-{{ .Branch }}-{{ .Revision }}
-      - restore_pyspec_cached_venv
+      #- restore_cache:
+      #    key: v3-specs-repo-{{ .Branch }}-{{ .Revision }}
+      #- restore_pyspec_cached_venv
       - run:
           name: Install pyspec requirements
           command: make install_test
-      - save_pyspec_cached_venv
+      #- save_pyspec_cached_venv
   test-phase0:
     docker:
       - image: cimg/python:3.12.4

From 92a801a7411310ada765c3baf5da205bc21272ff Mon Sep 17 00:00:00 2001
From: Justin Traglia <jtraglia@pm.me>
Date: Thu, 22 Aug 2024 08:26:00 -0500
Subject: [PATCH 3/5] Only disable restore_pyspec_cached_venv

---
 .circleci/config.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 5a5ec5627..0dd4c61e1 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -83,13 +83,13 @@ jobs:
       - image: cimg/python:3.12.4
     working_directory: ~/specs-repo
     steps:
-      #- restore_cache:
-      #    key: v3-specs-repo-{{ .Branch }}-{{ .Revision }}
+      - restore_cache:
+          key: v3-specs-repo-{{ .Branch }}-{{ .Revision }}
       #- restore_pyspec_cached_venv
       - run:
           name: Install pyspec requirements
           command: make install_test
-      #- save_pyspec_cached_venv
+      - save_pyspec_cached_venv
   test-phase0:
     docker:
       - image: cimg/python:3.12.4

From 4850a2801e436e34990693e126230d5425fd06a3 Mon Sep 17 00:00:00 2001
From: Justin Traglia <jtraglia@pm.me>
Date: Thu, 22 Aug 2024 09:14:17 -0500
Subject: [PATCH 4/5] Remove line to pull new py_arkworks wheel

---
 .circleci/config.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 0dd4c61e1..cae1892d3 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -85,7 +85,6 @@ jobs:
     steps:
       - restore_cache:
           key: v3-specs-repo-{{ .Branch }}-{{ .Revision }}
-      #- restore_pyspec_cached_venv
       - run:
           name: Install pyspec requirements
           command: make install_test

From 562798de9ef5bd07af4536554d9f44603170df22 Mon Sep 17 00:00:00 2001
From: Justin Traglia <jtraglia@pm.me>
Date: Thu, 22 Aug 2024 09:17:05 -0500
Subject: [PATCH 5/5] Update cache version and add back line

---
 .circleci/config.yml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index cae1892d3..7ac281dea 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -35,13 +35,13 @@ commands:
     description: "Restore the cache with pyspec keys"
     steps:
       - restore_cached_venv:
-          venv_name: v24-pyspec
+          venv_name: v25-pyspec
           reqs_checksum: cache-{{ checksum "setup.py" }}-{{ checksum "requirements_preinstallation.txt" }}
   save_pyspec_cached_venv:
     description: Save a venv into a cache with pyspec keys"
     steps:
       - save_cached_venv:
-          venv_name: v24-pyspec
+          venv_name: v25-pyspec
           reqs_checksum: cache-{{ checksum "setup.py" }}-{{ checksum "requirements_preinstallation.txt" }}
           venv_path: ./venv
   restore_deposit_contract_tester_cached_venv:
@@ -85,6 +85,7 @@ jobs:
     steps:
       - restore_cache:
           key: v3-specs-repo-{{ .Branch }}-{{ .Revision }}
+      - restore_pyspec_cached_venv
       - run:
           name: Install pyspec requirements
           command: make install_test