Skip to content

Commit 6ee4355

Browse files
authored
2 parents fa5cf5b + 1ad7e3f commit 6ee4355

File tree

1 file changed

+7
-23
lines changed

1 file changed

+7
-23
lines changed

Diff for: .circleci/config.yml

+7-23
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,14 @@ _machine_defaults: &machine_defaults
44
TZ: "/usr/share/zoneinfo/America/Los_Angeles"
55
SCRATCH: "/scratch"
66
machine:
7-
image: ubuntu-2204:2023.04.2
7+
image: default
88
docker_layer_caching: true
99
working_directory: /tmp/src/fmriprep
1010
resource_class: large
1111

1212
_python_defaults: &python_defaults
1313
docker:
14-
- image: cimg/python:3.10.9
14+
- image: cimg/python:3.12
1515
working_directory: /tmp/src/fmriprep
1616

1717
_docker_auth: &docker_auth
@@ -80,9 +80,7 @@ _check_skip_job: &check_skip_job
8080
_setup_fmriprep_docker: &setup_fmriprep_docker
8181
name: Install fMRIPrep's docker wrapper
8282
command: |
83-
export PY3=$(pyenv versions | grep '3\.' |
84-
sed -e 's/.* 3\./3./' -e 's/ .*//')
85-
pyenv local $PY3
83+
pyenv local 3
8684
pip install --upgrade pip
8785
pip install --upgrade /tmp/src/fmriprep/wrapper/
8886
@@ -132,9 +130,7 @@ jobs:
132130
name: Build Docker image
133131
no_output_timeout: 60m
134132
command: |
135-
export PY3=$(pyenv versions | grep '3\.' |
136-
sed -e 's/.* 3\./3./' -e 's/ .*//')
137-
pyenv local $PY3
133+
pyenv local 3
138134
pip install hatch
139135
# Get version, update files
140136
THISVERSION=$( hatch version )
@@ -174,9 +170,7 @@ jobs:
174170
name: Build Docker image
175171
no_output_timeout: 60m
176172
command: |
177-
export PY3=$(pyenv versions | grep '3\.' |
178-
sed -e 's/.* 3\./3./' -e 's/ .*//')
179-
pyenv local $PY3
173+
pyenv local 3
180174
pip install hatch
181175
# Get version, update files.
182176
THISVERSION=$( hatch version )
@@ -199,9 +193,6 @@ jobs:
199193
- run:
200194
name: Check Docker image
201195
command: |
202-
export PY3=$(pyenv versions | grep '3\.' |
203-
sed -e 's/.* 3\./3./' -e 's/ .*//')
204-
pyenv local $PY3
205196
# Get version, update files.
206197
THISVERSION=$( hatch version )
207198
BUILT_VERSION=$( docker run --rm nipreps/fmriprep:latest --version )
@@ -384,17 +375,12 @@ jobs:
384375
- run:
385376
name: Build fmriprep-docker wheel
386377
command: |
387-
export PY3=$(pyenv versions | grep '3\.' |
388-
sed -e 's/.* 3\./3./' -e 's/ .*//')
389-
pyenv local $PY3
378+
pyenv local 3
390379
pip install --upgrade pip build
391380
python -m build wrapper/
392381
- run:
393382
name: Install and test fmriprep-docker (Python 3)
394383
command: |
395-
export PY3=$(pyenv versions | grep '3\.' |
396-
sed -e 's/.* 3\./3./' -e 's/ .*//')
397-
pyenv local $PY3
398384
echo -n "Python version: "
399385
python --version
400386
pip install --upgrade wrapper/
@@ -405,9 +391,7 @@ jobs:
405391
- run:
406392
name: Install and test fmriprep-docker (Python 2)
407393
command: |
408-
export PY2=$(pyenv versions | grep '2\.' |
409-
sed -e 's/.* 2\./2./' -e 's/ .*//')
410-
pyenv local $PY2
394+
pyenv local 2.7
411395
echo -n "Python version: "
412396
python --version
413397
pip install --upgrade "pip<21"

0 commit comments

Comments
 (0)