From d68116f137aa67aa5241b7c740b2b9740a78418a Mon Sep 17 00:00:00 2001
From: Janet Dewar <jdewar@broadinstitute.org>
Date: Mon, 9 Dec 2024 15:15:35 -0500
Subject: [PATCH] AN-301 Update certifi (#795)

* Update certifi

* Update circleci base image

* Update circleci base image in more places

* Update to newer git secrets

* Try installing python 3.10

* Apt update

* Use pyenv

* Set pyenv

* Explanatory comment

* Test out Ubuntu 24.04
---
 .circleci/config.yml              | 20 +++++++++++++++-----
 servers/cromwell/requirements.txt |  2 +-
 2 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 3ba28bff..ffd27775 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -19,7 +19,12 @@ run_secret_setup: &run_secret_setup
     command: |
       git clone https://github.com/awslabs/git-secrets.git
       pushd git-secrets >/dev/null
-      git checkout ad82d68ee924906a0401dfd48de5057731a9bc84
+
+      # 2024-12-09 updated to a new version of git-secrets, the old one
+      # relied `say` command which is unavailable in new CircleCI base image
+      # https://github.com/awslabs/git-secrets/issues/220
+      git checkout 5357e18bc27b42a827b6780564ea873a72ca1f01
+
       popd >/dev/null
       ./minnie-kenny.sh -f
 
@@ -27,8 +32,8 @@ jobs:
   ui:
     <<: *job_defaults
     machine:
-      # latest pinned 20.04 version https://circleci.com/developer/machine/image/ubuntu-2004
-      image: ubuntu-2004:202201-02
+      # latest pinned 24.04 version https://circleci.com/developer/machine/image/ubuntu-2404
+      image: ubuntu-2404:2024.11.1
     steps:
       - checkout
       - <<: *run_env_setup
@@ -107,7 +112,7 @@ jobs:
   backends:
     <<: *job_defaults
     machine:
-      image: ubuntu-2004:202201-02
+      image: ubuntu-2404:2024.11.1
     environment:
       - GOOGLE_APPLICATION_CREDENTIALS: /home/circleci/gcloud-service-key.json
     steps:
@@ -127,6 +132,11 @@ jobs:
           command: |
             python3 --version
             which python3
+      - run:
+          name: Install Python 3.10
+          command: |
+            pyenv install 3.10
+            pyenv global 3.10
       - run:
           name: Install tox and yapf
           # tox (and detox) fail with older versions of more-itertools: https://github.com/pytest-dev/pytest/issues/4770
@@ -157,7 +167,7 @@ jobs:
   secrets:
     <<: *job_defaults
     machine:
-      image: ubuntu-2004:202201-02
+      image: ubuntu-2404:2024.11.1
     steps:
       - checkout
       - <<: *run_env_setup
diff --git a/servers/cromwell/requirements.txt b/servers/cromwell/requirements.txt
index 08f6f6ff..e67b3b82 100644
--- a/servers/cromwell/requirements.txt
+++ b/servers/cromwell/requirements.txt
@@ -1,4 +1,4 @@
-certifi==2022.12.7
+certifi==2024.7.4
 chardet==3.0.4
 click==8.1.3
 clickclick==1.2.2