Skip to content

Commit f5bc373

Browse files
authored
Merge pull request #342 from mgxd/ci/pyenv-versions
FIX: Easier pyenv usage
2 parents 4f01490 + 44b1710 commit f5bc373

File tree

1 file changed

+12
-28
lines changed

1 file changed

+12
-28
lines changed

.circleci/config.yml

Lines changed: 12 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ _machine_defaults: &machine_defaults
1010

1111
_python_defaults: &python_defaults
1212
docker:
13-
- image: cimg/python:3.10.9
13+
- image: cimg/python:3.12.1
1414
auth:
1515
username: $DOCKER_USER
1616
password: $DOCKER_PAT
@@ -105,10 +105,7 @@ jobs:
105105
name: Build Docker image
106106
no_output_timeout: 60m
107107
command: |
108-
export PY3=$(pyenv versions | grep '3\.' |
109-
sed -e 's/.* 3\./3./' -e 's/ .*//')
110-
pyenv local $PY3
111-
# Get version, update files.
108+
pyenv local 3
112109
python -m pip install -U pip hatch
113110
THISVERSION=$( python -m hatch version )
114111
if [[ ${THISVERSION:0:1} == "0" ]] ; then
@@ -131,10 +128,6 @@ jobs:
131128
- run:
132129
name: Check Docker image
133130
command: |
134-
export PY3=$(pyenv versions | grep '3\.' |
135-
sed -e 's/.* 3\./3./' -e 's/ .*//')
136-
pyenv local $PY3
137-
# Get version, update files.
138131
python -m pip install -U pip hatch
139132
THISVERSION=$( python -m hatch version )
140133
BUILT_VERSION=$( docker run --rm nipreps/nibabies:dev --version )
@@ -168,7 +161,7 @@ jobs:
168161

169162
get_data:
170163
docker:
171-
- image: cimg/python:3.10.9
164+
- image: cimg/python:3.12.1
172165
working_directory: /home/circleci/data
173166
steps:
174167
- restore_cache:
@@ -259,33 +252,25 @@ jobs:
259252
- run:
260253
name: Build nibabies-wrapper wheel
261254
command: |
262-
export PY3=$(pyenv versions | grep '3\.' |
263-
sed -e 's/.* 3\./3./' -e 's/ .*//')
264-
pyenv local $PY3
255+
pyenv local 3
256+
python --version
265257
pip install --upgrade pip build
266258
python -m build wrapper/
267259
- run:
268-
name: Test nibabies-wrapper (Python 2)
260+
name: Test nibabies-wrapper (Python 3)
269261
command: |
270-
export PY2=$(pyenv versions | grep '2\.' |
271-
sed -e 's/.* 2\./2./' -e 's/ .*//')
272-
pyenv local $PY2
273-
echo -n "Python version: "
274262
python --version
275-
pip install --upgrade "pip<21"
263+
pip install --upgrade pip
276264
pip install wrapper/dist/*.whl
277265
which nibabies-wrapper
278266
nibabies-wrapper --help
279267
nibabies-wrapper --version
280268
- run:
281-
name: Test nibabies-wrapper (Python 3)
269+
name: Test nibabies-wrapper (Python 2)
282270
command: |
283-
export PY3=$(pyenv versions | grep '3\.' |
284-
sed -e 's/.* 3\./3./' -e 's/ .*//')
285-
pyenv local $PY3
286-
echo -n "Python version: "
271+
pyenv local 2.7
287272
python --version
288-
pip install --upgrade pip
273+
pip install --upgrade "pip<21"
289274
pip install wrapper/dist/*.whl
290275
which nibabies-wrapper
291276
nibabies-wrapper --help
@@ -329,9 +314,8 @@ jobs:
329314
- run:
330315
name: Setting up test
331316
command: |
332-
export PY3=$(pyenv versions | grep '3\.' |
333-
sed -e 's/.* 3\./3./' -e 's/ .*//')
334-
pyenv local $PY3
317+
pyenv local 3
318+
python --version
335319
mkdir -p /tmp/${DATASET}/derivatives
336320
pip install --upgrade pip
337321
pip install --upgrade wrapper/

0 commit comments

Comments
 (0)