From ac6708039bc6da2626654c25992eff34cb9d569b Mon Sep 17 00:00:00 2001
From: Mark Mercado <mmercado@digitalocean.com>
Date: Tue, 26 Mar 2024 13:39:04 -0400
Subject: [PATCH] Default to Python 3.8 (remove 3.6)

---
 .circle/exit_on_py3_checks                        | 2 +-
 .circleci/config.yml                              | 2 +-
 .github/workflows/enable-pack-build-and-test.yaml | 2 +-
 .github/workflows/index-update.yaml               | 4 ++--
 .github/workflows/pack-bootstrap_repo.yaml        | 4 ++--
 .github/workflows/pack-build_and_test.yaml        | 6 +++---
 .github/workflows/pack-repo_meta.yaml             | 2 +-
 .github/workflows/pack-tag_release.yaml           | 2 +-
 utils/.circleci/config.yml                        | 4 ++--
 9 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/.circle/exit_on_py3_checks b/.circle/exit_on_py3_checks
index 85ab8b4c..2c438541 100755
--- a/.circle/exit_on_py3_checks
+++ b/.circle/exit_on_py3_checks
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-# Script which checks exit code of "test" script under Python 3.6 environment
+# Script which checks exit code of "test" script under Python 3.8 environment
 # and exists with an appropriate code
 if [[ $# -lt 1 ]] ; then
     echo "Usage: $0 <test script exit code>"
diff --git a/.circleci/config.yml b/.circleci/config.yml
index 95642fcc..76d2217a 100755
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -6,7 +6,7 @@ version: 2
 jobs:
   test_py36:
     docker:
-      - image: circleci/python:3.6
+      - image: circleci/python:3.8
 
     working_directory: ~/ci
 
diff --git a/.github/workflows/enable-pack-build-and-test.yaml b/.github/workflows/enable-pack-build-and-test.yaml
index 4c438a77..3827a952 100644
--- a/.github/workflows/enable-pack-build-and-test.yaml
+++ b/.github/workflows/enable-pack-build-and-test.yaml
@@ -31,7 +31,7 @@ permissions:
 
 jobs:
   enable_pack_build_and_test_workflow:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     name: Enable Pack Build and Test workflow
 
     steps:
diff --git a/.github/workflows/index-update.yaml b/.github/workflows/index-update.yaml
index 70a539df..bb5a085d 100644
--- a/.github/workflows/index-update.yaml
+++ b/.github/workflows/index-update.yaml
@@ -42,11 +42,11 @@ on:
       python-version:
         required: false
         type: string
-        default: "3.6"
+        default: "3.8"
 
 jobs:
   regenerate_index:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     # When parent workflow is named "Update Index" this shows up as:
     #   "Update Index / Regenerate"
     name: Regenerate
diff --git a/.github/workflows/pack-bootstrap_repo.yaml b/.github/workflows/pack-bootstrap_repo.yaml
index 9c34c24e..bdcbcc66 100644
--- a/.github/workflows/pack-bootstrap_repo.yaml
+++ b/.github/workflows/pack-bootstrap_repo.yaml
@@ -45,7 +45,7 @@ on:
       required_check_context:
         type: string
         required: false
-        default: "Build and Test / Python 3.6"
+        default: "Build and Test / Python 3.8"
       required_check_app_id:
         type: string
         required: false
@@ -61,7 +61,7 @@ on:
 
 jobs:
   bootstrap_pack_repo:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     name: 'Bootstrap Repo'
     env:
       # GH_TOKEN used by `gh` command
diff --git a/.github/workflows/pack-build_and_test.yaml b/.github/workflows/pack-build_and_test.yaml
index 8d02e1bf..b83a7b27 100644
--- a/.github/workflows/pack-build_and_test.yaml
+++ b/.github/workflows/pack-build_and_test.yaml
@@ -14,7 +14,7 @@ on:
       python-version:
         required: false
         type: string
-        default: '["3.6","3.8","3.9"]'
+        default: '["3.8","3.9"]'
       enable-common-libs:
         description: |
           When true, use an st2.conf that sets packs.enable_common_libs=true
@@ -37,9 +37,9 @@ on:
 
 jobs:
   build_and_test:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     # When parent workflow is named "Build and Test" this shows up as:
-    #   "Build and Test / Python 3.6,3.8,3.9"
+    #   "Build and Test / Python 3.8,3.9"
     name: 'Python ${{ matrix.python-version }}'
     strategy:
       matrix:
diff --git a/.github/workflows/pack-repo_meta.yaml b/.github/workflows/pack-repo_meta.yaml
index c34bf41f..add871c1 100644
--- a/.github/workflows/pack-repo_meta.yaml
+++ b/.github/workflows/pack-repo_meta.yaml
@@ -23,7 +23,7 @@ on:
 
 jobs:
   repo_meta:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     name: 'Repo Metadata'
 
     outputs:
diff --git a/.github/workflows/pack-tag_release.yaml b/.github/workflows/pack-tag_release.yaml
index f69e7263..d63f33f3 100644
--- a/.github/workflows/pack-tag_release.yaml
+++ b/.github/workflows/pack-tag_release.yaml
@@ -15,7 +15,7 @@ on:
 
 jobs:
   tag_release:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     name: 'Tag Release'
 
     outputs:
diff --git a/utils/.circleci/config.yml b/utils/.circleci/config.yml
index 2fd9634b..79a1c0db 100755
--- a/utils/.circleci/config.yml
+++ b/utils/.circleci/config.yml
@@ -50,7 +50,7 @@ jobs:
   # not considered fatal
   build_and_test_python36:
     docker:
-      - image: circleci/python:3.6
+      - image: circleci/python:3.8
       - image: rabbitmq:3
       - image: mongo:3.4
 
@@ -77,7 +77,7 @@ jobs:
             git clone -b master git://github.com/stackstorm-exchange/ci.git ~/ci
             ~/ci/.circle/dependencies ; ~/ci/.circle/exit_on_py3_checks $?
       - run:
-          name: Run tests (Python 3.6)
+          name: Run tests (Python 3.8)
           # NOTE: We don't want to use default "-e" option because this means
           # step will fail immediately on one of the commands failures and we
           # can't intercept the error and cause non-fatal exit in case pack