From 7534f4577a120ef7e1fe6777d91db234aed788d6 Mon Sep 17 00:00:00 2001 From: Denis Yuen Date: Wed, 7 Oct 2026 12:03:33 -0400 Subject: [PATCH 1/3] Upgrade CI and cwlpack to Python 3.12 pytest 9 requires Python >=3.10, so the Dependabot bump failed on 3.8. Move CI, the Lambda runtime and test/function dependencies to 3.12. Co-Authored-By: Claude Sonnet 5.5 --- .github/workflows/maven.yml | 4 ++-- cwlpack/.pylintrc | 4 ++-- cwlpack/cwl_pack_function/requirements.txt | 4 ++-- cwlpack/template.yaml | 2 +- cwlpack/tests/requirements.txt | 8 ++++---- 5 files changed, 11 insertions(+), 11 deletions(-) diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index e4de33ec..7dae4c9a 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -20,9 +20,9 @@ jobs: steps: - uses: actions/checkout@v6 - name: Set up Python - uses: actions/setup-python@v2 + uses: actions/setup-python@v5 with: - python-version: 3.8 + python-version: "3.12" - name: Install dependencies run: | python -m pip install --upgrade pip diff --git a/cwlpack/.pylintrc b/cwlpack/.pylintrc index c6d73d8f..e7c50f9d 100644 --- a/cwlpack/.pylintrc +++ b/cwlpack/.pylintrc @@ -1,2 +1,2 @@ -[MASTER] -init-hook="from pylint.config import find_pylintrc; import os, sys; sys.path.append(os.path.dirname(find_pylintrc()))" +[MAIN] +init-hook="import os, sys; sys.path.append(os.getcwd())" diff --git a/cwlpack/cwl_pack_function/requirements.txt b/cwlpack/cwl_pack_function/requirements.txt index e075405d..62dd882b 100644 --- a/cwlpack/cwl_pack_function/requirements.txt +++ b/cwlpack/cwl_pack_function/requirements.txt @@ -1,3 +1,3 @@ requests==2.32.2 -pygit2==1.7.0 -sbpack==2021.10.7 +pygit2==1.20.1 +sbpack==2024.12.17 diff --git a/cwlpack/template.yaml b/cwlpack/template.yaml index 74bb4628..bbef05ca 100644 --- a/cwlpack/template.yaml +++ b/cwlpack/template.yaml @@ -16,7 +16,7 @@ Resources: Properties: CodeUri: cwl_pack_function/ Handler: app.lambda_handler - Runtime: python3.8 + Runtime: python3.12 Events: HelloWorld: Type: Api # More info about API Event Source: https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#api diff --git a/cwlpack/tests/requirements.txt b/cwlpack/tests/requirements.txt index c69fa476..81896752 100644 --- a/cwlpack/tests/requirements.txt +++ b/cwlpack/tests/requirements.txt @@ -1,4 +1,4 @@ -pytest==6.2.5 -pytest-mock==3.6.1 -boto3==1.19.0 -pylint==2.11.1 \ No newline at end of file +pytest==9.0.3 +pytest-mock==3.15.1 +boto3==1.40.0 +pylint==3.3.8 From 1dd60e048da2465d56cc53c987db64e2cd6bf600 Mon Sep 17 00:00:00 2001 From: Denis Yuen Date: Wed, 7 Oct 2026 13:02:44 -0400 Subject: [PATCH 2/3] Harden CI installs and bump checkout/setup-node Use npm ci --ignore-scripts, pip --only-binary :all:, pin aws-sam-cli, and bump actions/checkout and actions/setup-node. Co-Authored-By: Claude Sonnet 5.5 --- .github/workflows/maven.yml | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index 7dae4c9a..4b202d13 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -8,12 +8,12 @@ jobs: linterWithESLint: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v6 - name: Use Node.js - uses: actions/setup-node@v1 + uses: actions/setup-node@v7 with: node-version: 12.x - - run: npm install + - run: npm ci --ignore-scripts - run: npm run lint testWithSAMCLI: runs-on: ubuntu-latest @@ -25,8 +25,7 @@ jobs: python-version: "3.12" - name: Install dependencies run: | - python -m pip install --upgrade pip - pip install aws-sam-cli + pip install --only-binary :all: aws-sam-cli==1.167.0 - name: Set up JDK uses: actions/setup-java@v5 with: @@ -61,8 +60,8 @@ jobs: - name: Test CWL packing with pytest working-directory: ./cwlpack run: | - pip install -r tests/requirements.txt --user - pip install -r cwl_pack_function/requirements.txt --user + pip install --only-binary :all: -r tests/requirements.txt --user + pip install --only-binary :all: -r cwl_pack_function/requirements.txt --user python -m pytest tests/unit -v pylint cwl_pack_function pylint tests From e30956c14f0a239a08b3edd02ae748822b39c04d Mon Sep 17 00:00:00 2001 From: Denis Yuen Date: Wed, 7 Oct 2026 13:15:29 -0400 Subject: [PATCH 3/3] Pin runners to ubuntu-26.04 and bump setup-python to v6 Co-Authored-By: Claude Sonnet 5.5 --- .github/workflows/codeql.yml | 2 +- .github/workflows/maven.yml | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml index a5826544..404567a8 100644 --- a/.github/workflows/codeql.yml +++ b/.github/workflows/codeql.yml @@ -9,7 +9,7 @@ on: jobs: analyze: name: Analyze - runs-on: ubuntu-latest + runs-on: ubuntu-26.04 permissions: actions: read contents: read diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index 4b202d13..515c5e72 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -6,7 +6,7 @@ name: Node.js CI with SAM on: [push, pull_request] jobs: linterWithESLint: - runs-on: ubuntu-latest + runs-on: ubuntu-26.04 steps: - uses: actions/checkout@v6 - name: Use Node.js @@ -16,11 +16,11 @@ jobs: - run: npm ci --ignore-scripts - run: npm run lint testWithSAMCLI: - runs-on: ubuntu-latest + runs-on: ubuntu-26.04 steps: - uses: actions/checkout@v6 - name: Set up Python - uses: actions/setup-python@v5 + uses: actions/setup-python@v6 with: python-version: "3.12" - name: Install dependencies