From 30f1f05b240671493586c74ffae7fb9551659414 Mon Sep 17 00:00:00 2001 From: mathiasg Date: Mon, 4 Mar 2024 12:28:48 -0500 Subject: [PATCH] CI: Simplify pyenv usage --- .circleci/config.yml | 28 ++++++---------------------- 1 file changed, 6 insertions(+), 22 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index ae9e80ab5..97f2f3b8c 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -11,7 +11,7 @@ _machine_defaults: &machine_defaults _python_defaults: &python_defaults docker: - - image: cimg/python:3.10.9 + - image: cimg/python:3.12 working_directory: /tmp/src/fmriprep _docker_auth: &docker_auth @@ -80,9 +80,7 @@ _check_skip_job: &check_skip_job _setup_fmriprep_docker: &setup_fmriprep_docker name: Install fMRIPrep's docker wrapper command: | - export PY3=$(pyenv versions | grep '3\.' | - sed -e 's/.* 3\./3./' -e 's/ .*//') - pyenv local $PY3 + pyenv local 3 pip install --upgrade pip pip install --upgrade /tmp/src/fmriprep/wrapper/ @@ -132,9 +130,7 @@ jobs: name: Build Docker image no_output_timeout: 60m command: | - export PY3=$(pyenv versions | grep '3\.' | - sed -e 's/.* 3\./3./' -e 's/ .*//') - pyenv local $PY3 + pyenv local 3 pip install hatch # Get version, update files THISVERSION=$( hatch version ) @@ -174,9 +170,7 @@ jobs: name: Build Docker image no_output_timeout: 60m command: | - export PY3=$(pyenv versions | grep '3\.' | - sed -e 's/.* 3\./3./' -e 's/ .*//') - pyenv local $PY3 + pyenv local 3 pip install hatch # Get version, update files. THISVERSION=$( hatch version ) @@ -199,9 +193,6 @@ jobs: - run: name: Check Docker image command: | - export PY3=$(pyenv versions | grep '3\.' | - sed -e 's/.* 3\./3./' -e 's/ .*//') - pyenv local $PY3 # Get version, update files. THISVERSION=$( hatch version ) BUILT_VERSION=$( docker run --rm nipreps/fmriprep:latest --version ) @@ -384,17 +375,12 @@ jobs: - run: name: Build fmriprep-docker wheel command: | - export PY3=$(pyenv versions | grep '3\.' | - sed -e 's/.* 3\./3./' -e 's/ .*//') - pyenv local $PY3 + pyenv local 3 pip install --upgrade pip build python -m build wrapper/ - run: name: Install and test fmriprep-docker (Python 3) command: | - export PY3=$(pyenv versions | grep '3\.' | - sed -e 's/.* 3\./3./' -e 's/ .*//') - pyenv local $PY3 echo -n "Python version: " python --version pip install --upgrade wrapper/ @@ -405,9 +391,7 @@ jobs: - run: name: Install and test fmriprep-docker (Python 2) command: | - export PY2=$(pyenv versions | grep '2\.' | - sed -e 's/.* 2\./2./' -e 's/ .*//') - pyenv local $PY2 + pyenv local 2.7 echo -n "Python version: " python --version pip install --upgrade "pip<21"