From 5e214c349208ea2b7dd15979c37b3887dc56993a Mon Sep 17 00:00:00 2001 From: Rohan Weeden Date: Wed, 25 Jun 2025 13:29:06 -0400 Subject: [PATCH 1/4] Fix changelog for v20.1.2 release --- CHANGELOG.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 34e539c2..5a5af738 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,7 +1,8 @@ # CHANGELOG -## Unreleased +## v20.1.2.0 +* Upgrade to [Cumulus v20.1.2](https://github.com/nasa/cumulus/releases/tag/v20.1.2) * Update default GitHub branch name to 'main' ## v20.1.1.0 From 101e9abb395d7fba64daabc043551227ddfe87fc Mon Sep 17 00:00:00 2001 From: Rohan Weeden Date: Wed, 25 Jun 2025 13:29:17 -0400 Subject: [PATCH 2/4] Update python version to 3.11 --- .github/workflows/deploy.yml | 6 +++--- CHANGELOG.md | 5 +++++ workflows/locals.tf | 2 +- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 894b6362..78011ee0 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -52,7 +52,7 @@ on: default: asfadmin/CIRRUS-core CORE_REF: description: The CIRRUS-core git ref to checkout - default: v20.1.2.0 + default: v20.1.2.1 concurrency: # group: -- @@ -84,13 +84,13 @@ jobs: AWS_REGION: us-west-2 DASHBOARD_TARGET: '' JOB_NAME: CIRRUS-DAAC - PYTHON_VER: 'python3' + PYTHON_VER: 'python3.11' # Defaults with overrides DASHBOARD_REPO: ${{ github.event.inputs.DASHBOARD_REPO || 'nasa/cumulus-dashboard' }} DASHBOARD_REF : ${{ github.event.inputs.DASHBOARD_REF || 'v13.1.0' }} DEPLOY_NAME: ${{ github.event.inputs.DEPLOY_NAME || 'daac' }} CORE_REPO: ${{ github.event.inputs.CORE_REPO || 'asfadmin/CIRRUS-core' }} - CORE_REF: ${{ github.event.inputs.CORE_REF || 'v20.1.2.0' }} + CORE_REF: ${{ github.event.inputs.CORE_REF || 'v20.1.2.1' }} MAKE_TARGET: ${{ github.event.inputs.MAKE_TARGET || 'workflows' }} API_ROOT: ${{ github.event.inputs.DASHBOARD_API_ROOT || '' }} MATURITY: ${{ github.event.inputs.MATURITY || 'sbx' }} diff --git a/CHANGELOG.md b/CHANGELOG.md index 5a5af738..483292be 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,11 @@ # CHANGELOG +## Unreleased + +## v20.1.2.1 +* Update Lambda runtime to Python3.11 + ## v20.1.2.0 * Upgrade to [Cumulus v20.1.2](https://github.com/nasa/cumulus/releases/tag/v20.1.2) * Update default GitHub branch name to 'main' diff --git a/workflows/locals.tf b/workflows/locals.tf index daf447bf..8d23e0f0 100644 --- a/workflows/locals.tf +++ b/workflows/locals.tf @@ -12,5 +12,5 @@ locals { region = data.aws_region.current.name } - python_version = "python3.9" + python_version = "python3.11" } From e6d35f1b6d356c1a151781323af3dbfe6dd21cc3 Mon Sep 17 00:00:00 2001 From: Rohan Weeden Date: Wed, 25 Jun 2025 13:34:58 -0400 Subject: [PATCH 3/4] Update requirements.txt --- workflows/requirements.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/workflows/requirements.txt b/workflows/requirements.txt index cfeaf548..9d53fdb3 100644 --- a/workflows/requirements.txt +++ b/workflows/requirements.txt @@ -1,3 +1,3 @@ -cumulus-message-adapter-python==2.2.0 -cumulus-message-adapter==2.0.3 -cumulus_process==1.3.0 \ No newline at end of file +cumulus-message-adapter-python==2.3.0 +cumulus-message-adapter==2.0.4 +cumulus-process==1.4.0 From 13333ad192435eebedf2a13335e92e53617a3bfb Mon Sep 17 00:00:00 2001 From: Rohan Weeden Date: Thu, 26 Jun 2025 13:16:20 -0400 Subject: [PATCH 4/4] Remove `rds_connection_heartbeat` This was removed from CIRRUS-core in release v9.7.0.0 --- cumulus/variables/sbx.tfvars | 4 ---- 1 file changed, 4 deletions(-) diff --git a/cumulus/variables/sbx.tfvars b/cumulus/variables/sbx.tfvars index c83da638..c063db4b 100644 --- a/cumulus/variables/sbx.tfvars +++ b/cumulus/variables/sbx.tfvars @@ -22,7 +22,3 @@ launchpad_certificate = "launchpad.pfx" # Uncomment to specify an AMI; if not specifed, the default will be the latest image_id_ecs_amz2 # ecs_cluster_instance_image_id = "ami-0e77b9f8830138cd2" - - -#Per variable definition, set this to true if using a serverless RDS -rds_connection_heartbeat = true