Refactor geth steps to pip install correct py-geth version

- Make sure pip is up to date - Use quotes for pip install with minimum version ``pip install --user "py-geth>={version}"`` (https://pip.pypa.io/en/stable/cli/pip_install/#examples)
ethereum · Mar 28, 2023 · c092b96 · c092b96
1 parent 7592e98
commit c092b96
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -76,12 +76,14 @@ geth_steps: &geth_steps
           - cache-{{ .Environment.CIRCLE_JOB }}-{{ checksum "setup.py" }}-{{ checksum "tox.ini" }}
     - run:
         name: install dependencies
-        command: pip install --user tox
+        command: |
+          pip install --upgrade pip
+          pip install --user tox
     - run:
         name: build geth if missing
         command: |
           mkdir -p $HOME/.ethash
-          pip install --user py-geth>=<< pipeline.parameters.pygeth_version >>
+          pip install --user "py-geth>=<< pipeline.parameters.pygeth_version >>"
           export GOROOT=/usr/local/go
           echo << pipeline.parameters.geth_version >>
           export GETH_BINARY="$HOME/.py-geth/geth-<< pipeline.parameters.geth_version >>/bin/geth"
@@ -109,7 +111,7 @@ geth_steps: &geth_steps
           - ./eggs
           - ~/.ethash
           - ~/.py-geth
-        key: cache-{{ .Environment.CIRCLE_JOB }}-{{ checksum "setup.py" }}-{{ checksum "tox.ini" }}
+        key: cache-v1-{{ .Environment.CIRCLE_JOB }}-{{ checksum "setup.py" }}-{{ checksum "tox.ini" }}
 
 geth_custom_steps: &geth_custom_steps
   working_directory: ~/repo

diff --git a/newsfragments/2898.internal.rst b/newsfragments/2898.internal.rst
@@ -0,0 +1,2 @@
+Update ``geth_steps`` in CircleCI builds to pip install the proper version of ``py-geth``.gs
+
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		Update ``geth_steps`` in CircleCI builds to pip install the proper version of ``py-geth``.gs