From 937ff56884b2042bf08db10dbe2317fa71c3eb01 Mon Sep 17 00:00:00 2001
From: "Christopher J. Markiewicz" <markiewicz@stanford.edu>
Date: Wed, 13 Oct 2021 11:06:31 -0400
Subject: [PATCH 1/4] CI: Acknowledge images are built with 3.8

---
 .circleci/config.yml | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 26369371b1..11487a072e 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -43,15 +43,15 @@ _get_base_image: &get_base_image
       exit 1
     fi
 
-_build_main_image_py36: &build_main_image_py36
-  name: Build main image (py36)
+_build_main_image_py38: &build_main_image_py38
+  name: Build main image (py38)
   no_output_timeout: 60m
   command: |
     tools/retry_cmd.sh -n 5 -s 15 \
       docker build \
         --rm=false \
         --tag nipype/nipype:latest \
-        --tag nipype/nipype:py36 \
+        --tag nipype/nipype:py38 \
         $(test -z "${CIRCLE_TAG}" || echo --tag nipype/nipype:"${CIRCLE_TAG}") \
         --build-arg BUILD_DATE="$(date -u +"%Y-%m-%dT%H:%M:%SZ")" \
         --build-arg VCS_REF="$(git rev-parse --short HEAD)" \
@@ -146,7 +146,7 @@ jobs:
       - run: *generate_dockerfiles
       - run: *modify_nipype_version
       - run: *get_base_image
-      - run: *build_main_image_py36
+      - run: *build_main_image_py38
       - run: *_get_codecov
       - run: *_download_test_data
       - run: *prepare_working_directory
@@ -165,8 +165,8 @@ jobs:
             if [ "$CIRCLE_BRANCH" = "master" -a -z "$CIRCLE_PULL_REQUEST" ]; then
               docker save nipype/nipype:base \
                           nipype/nipype:latest \
-                          nipype/nipype:py36 | gzip -1 > /tmp/docker/nipype-base-latest-py36.tar.gz \
-              && du -h /tmp/docker/nipype-base-latest-py36.tar.gz
+                          nipype/nipype:py38 | gzip -1 > /tmp/docker/nipype-base-latest-py38.tar.gz \
+              && du -h /tmp/docker/nipype-base-latest-py38.tar.gz
             fi
       - persist_to_workspace:
           root: /tmp
@@ -184,7 +184,7 @@ jobs:
           name: Load saved Docker images.
           no_output_timeout: 60m
           command: |
-            docker load < /tmp/docker/nipype-base-latest-py36.tar.gz
+            docker load < /tmp/docker/nipype-base-latest-py38.tar.gz
       - run:
           name: Push to DockerHub
           no_output_timeout: 120m
@@ -192,7 +192,7 @@ jobs:
             echo "$DOCKER_PASS" | docker login -u "$DOCKER_USER" --password-stdin
             docker push nipype/nipype:base
             docker push nipype/nipype:latest
-            docker push nipype/nipype:py36
+            docker push nipype/nipype:py38
             test -z "${CIRCLE_TAG}" || docker push nipype/nipype:"${CIRCLE_TAG}"
       - run:
           name: Move pruned Dockerfile to /tmp/docker/cache directory

From 2cef7dedde927c28cf5ee0c5c6b47f8a9890b72b Mon Sep 17 00:00:00 2001
From: "Christopher J. Markiewicz" <markiewicz@stanford.edu>
Date: Wed, 13 Oct 2021 11:13:48 -0400
Subject: [PATCH 2/4] CI: Use cimg/docker:3.9.7 for Python tasks

---
 .circleci/config.yml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 11487a072e..2658f0d133 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -1,5 +1,5 @@
-_machine_kwds: &machine_kwds
-  image: circleci/classic:201808-01
+_docker_kwds: &docker_kwds
+  - image: cimg/python:3.9.7
 
 _store_artifacts_kwds: &store_artifacts_kwds
   path: /home/circleci/work/tests
@@ -135,7 +135,7 @@ jobs:
             - docker/get_base_image.sh
 
   test_pytest:
-    machine: *machine_kwds
+    docker: *docker_kwds
     working_directory: /home/circleci/nipype
     steps:
       - checkout:
@@ -205,7 +205,7 @@ jobs:
           key: dockerfile-cache-v1-{{ .Branch }}-{{ checksum "/tmp/docker/cache/Dockerfile.base-pruned" }}
 
   update_feedstock:
-    machine: *machine_kwds
+    docker: *docker_kwds
     working_directory: /home/circleci/nipype
     steps:
       - checkout:

From a4b7898837378fff53f088eb91758013406d250f Mon Sep 17 00:00:00 2001
From: "Christopher J. Markiewicz" <markiewicz@stanford.edu>
Date: Wed, 13 Oct 2021 13:01:20 -0400
Subject: [PATCH 3/4] Revert "CI: Use cimg/docker:3.9.7 for Python tasks"

This reverts commit 2cef7dedde927c28cf5ee0c5c6b47f8a9890b72b.
---
 .circleci/config.yml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 2658f0d133..11487a072e 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -1,5 +1,5 @@
-_docker_kwds: &docker_kwds
-  - image: cimg/python:3.9.7
+_machine_kwds: &machine_kwds
+  image: circleci/classic:201808-01
 
 _store_artifacts_kwds: &store_artifacts_kwds
   path: /home/circleci/work/tests
@@ -135,7 +135,7 @@ jobs:
             - docker/get_base_image.sh
 
   test_pytest:
-    docker: *docker_kwds
+    machine: *machine_kwds
     working_directory: /home/circleci/nipype
     steps:
       - checkout:
@@ -205,7 +205,7 @@ jobs:
           key: dockerfile-cache-v1-{{ .Branch }}-{{ checksum "/tmp/docker/cache/Dockerfile.base-pruned" }}
 
   update_feedstock:
-    docker: *docker_kwds
+    machine: *machine_kwds
     working_directory: /home/circleci/nipype
     steps:
       - checkout:

From cbc714f8ca32fa8edf5ee70dc671fcb7e9633954 Mon Sep 17 00:00:00 2001
From: "Christopher J. Markiewicz" <markiewicz@stanford.edu>
Date: Wed, 13 Oct 2021 13:02:05 -0400
Subject: [PATCH 4/4] CI: Try ubuntu-2004 machine

---
 .circleci/config.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 11487a072e..0afcb62533 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -1,5 +1,5 @@
 _machine_kwds: &machine_kwds
-  image: circleci/classic:201808-01
+  image: ubuntu-2004:202107-02
 
 _store_artifacts_kwds: &store_artifacts_kwds
   path: /home/circleci/work/tests