fix: clean up environment cache

nipy · May 16, 2024 · 2285211 · 2285211
1 parent 7cef99c
commit 2285211
Showing 1 changed file with 7 additions and 13 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -12,9 +12,9 @@ jobs:
       - checkout
       - restore_cache:
           keys:
-            - env-v3-{{ .Branch }}-
-            - env-v3-master-
-            - env-v3-
+            - env-v4-{{ .Branch }}-
+            - env-v4-master-
+            - env-v4-
       - run:
           name: Setup git-annex
           command: |
@@ -29,17 +29,14 @@ jobs:
       - run:
           name: Setup DataLad
           command: |
-              export PY3=$(pyenv versions | grep '3\.' |
-                           sed -e 's/.* 3\./3./' -e 's/ .*//')
-              pyenv local $PY3
-              python -m pip install --no-cache-dir -U pip "setuptools >= 45.0" "setuptools_scm[toml] >= 3.4"
-              python -m pip install --no-cache-dir -U datalad datalad-osf
+              python3 -m pip install --no-cache-dir -U pip "setuptools >= 45.0" "setuptools_scm[toml] >= 3.4"
+              python3 -m pip install --no-cache-dir -U datalad datalad-osf
 
       - save_cache:
-          key: env-v3-{{ .Branch }}-{{ .BuildNum }}
+          key: env-v4-{{ .Branch }}-{{ .BuildNum }}
           paths:
             - /opt/circleci/git-annex.linux
-            - /opt/circleci/.pyenv/versions/3.9.4
+            - /opt/circleci/
 
       - restore_cache:
           keys:
@@ -49,9 +46,6 @@ jobs:
       - run:
           name: Install test data from GIN
           command: |
-              export PY3=$(pyenv versions | grep '3\.' |
-                           sed -e 's/.* 3\./3./' -e 's/ .*//')
-              pyenv local $PY3
               export PATH=/opt/circleci/git-annex.linux:$PATH
               mkdir -p /tmp/data
               cd /tmp/data