From 7e486f25428d73ed5051fa557cea20b369ebd766 Mon Sep 17 00:00:00 2001 From: Kaitlyn Alphonse Date: Mon, 20 Apr 2026 14:23:38 -0400 Subject: [PATCH 1/2] bump: github actions and python versions in workflows --- .github/workflows/cd.yml | 4 ++-- .github/workflows/ci.yml | 4 ++-- .github/workflows/docs.yml | 4 ++-- .github/workflows/guard.yml | 2 +- .github/workflows/super-linter.yml | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml index a931fc9..b4e4272 100644 --- a/.github/workflows/cd.yml +++ b/.github/workflows/cd.yml @@ -19,12 +19,12 @@ environment: production steps: - name: Check out the code - uses: actions/checkout@v4 + uses: actions/checkout@v6 - name: Set up Python uses: actions/setup-python@v4 with: - python-version: '3.12' + python-version: '3.13' - name: Install dependencies run: | diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 1b2cc5a..b3e79f0 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -24,12 +24,12 @@ jobs: steps: - name: Checkout code - uses: actions/checkout@v3 + uses: actions/checkout@v6 - name: Set up Python uses: actions/setup-python@v4 with: - python-version: '3.12' + python-version: '3.13' - name: Install dependencies run: | diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml index 66113ca..d975b97 100644 --- a/.github/workflows/docs.yml +++ b/.github/workflows/docs.yml @@ -26,12 +26,12 @@ jobs: echo "🔎 The branch is ${{ github.ref_name }} in ${{ github.repository }}." - name: Check out repository code - uses: actions/checkout@v4 + uses: actions/checkout@v6 - name: Set up Python uses: actions/setup-python@v4 with: - python-version: '3.11' + python-version: '3.13' cache: 'pip' - name: Install Python dependencies diff --git a/.github/workflows/guard.yml b/.github/workflows/guard.yml index 1ba723f..64a44dd 100644 --- a/.github/workflows/guard.yml +++ b/.github/workflows/guard.yml @@ -19,7 +19,7 @@ echo "🎉 A $EVENT triggered a ${{ runner.os }} job." echo "🔎 The branch is $BRANCH in $REPO." - name: Check out repository code - uses: actions/checkout@v4 + uses: actions/checkout@v6 - name: Guard the main branch if: ${{ env.HEAD != 'staging' && env.HEAD != ''}} run: | diff --git a/.github/workflows/super-linter.yml b/.github/workflows/super-linter.yml index 69b531f..adba8bf 100644 --- a/.github/workflows/super-linter.yml +++ b/.github/workflows/super-linter.yml @@ -19,7 +19,7 @@ runs-on: ubuntu-latest steps: - name: Checkout code - uses: actions/checkout@v4 + uses: actions/checkout@v6 with: # Full git history is needed to get a proper # list of changed files within `super-linter` From d2a08080d4ef7b46ef0ad47478127f1258e1e125 Mon Sep 17 00:00:00 2001 From: Kaitlyn Alphonse Date: Mon, 20 Apr 2026 14:58:29 -0400 Subject: [PATCH 2/2] fix: update Python 3.13 dependencies and guard workflow --- .github/workflows/guard.yml | 6 +++--- requirements.txt | 4 ++-- requirements/production.txt | 4 ++-- requirements/staging.txt | 4 ++-- requirements/testing.txt | 4 ++-- 5 files changed, 11 insertions(+), 11 deletions(-) diff --git a/.github/workflows/guard.yml b/.github/workflows/guard.yml index 64a44dd..ba56f9b 100644 --- a/.github/workflows/guard.yml +++ b/.github/workflows/guard.yml @@ -16,12 +16,12 @@ steps: - name: Preamble run: | - echo "🎉 A $EVENT triggered a ${{ runner.os }} job." - echo "🔎 The branch is $BRANCH in $REPO." + echo "🎉 A ${{ github.event_name }} triggered a ${{ runner.os }} job." + echo "🔎 The branch is ${{ github.ref_name }} in ${{ github.repository }}." - name: Check out repository code uses: actions/checkout@v6 - name: Guard the main branch - if: ${{ env.HEAD != 'staging' && env.HEAD != ''}} + if: ${{ github.event_name == 'pull_request' && github.head_ref != 'staging' }} run: | echo "🚫 The main branch is protected." echo "🚫 Pull requests to main must come from staging branch." diff --git a/requirements.txt b/requirements.txt index 5678a43..9d9cf87 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,10 +1,10 @@ basemap==2.0.0 cloud-sptheme==1.10.1.post20200504175005 -matplotlib==3.8.4 +matplotlib==3.10.8 numpy==2.2.6 pytest==8.3.2 pytest-cov==5.0.0 -scipy==1.14.0 +scipy==1.17.1 seaborn==0.13.2 sphinx==7.3.7 sphinx-autoapi==3.1.2 diff --git a/requirements/production.txt b/requirements/production.txt index cdf928a..90f1bb4 100644 --- a/requirements/production.txt +++ b/requirements/production.txt @@ -1,10 +1,10 @@ basemap==2.0.0 cloud-sptheme==1.10.1.post20200504175005 -matplotlib==3.8.4 +matplotlib==3.10.8 numpy==2.2.6 pytest==9.0.3 pytest-cov==5.0.0 -scipy==1.14.0 +scipy==1.17.1 seaborn==0.13.2 sphinx==7.3.7 sphinx-autoapi==3.1.2 diff --git a/requirements/staging.txt b/requirements/staging.txt index cdf928a..90f1bb4 100644 --- a/requirements/staging.txt +++ b/requirements/staging.txt @@ -1,10 +1,10 @@ basemap==2.0.0 cloud-sptheme==1.10.1.post20200504175005 -matplotlib==3.8.4 +matplotlib==3.10.8 numpy==2.2.6 pytest==9.0.3 pytest-cov==5.0.0 -scipy==1.14.0 +scipy==1.17.1 seaborn==0.13.2 sphinx==7.3.7 sphinx-autoapi==3.1.2 diff --git a/requirements/testing.txt b/requirements/testing.txt index cdf928a..90f1bb4 100644 --- a/requirements/testing.txt +++ b/requirements/testing.txt @@ -1,10 +1,10 @@ basemap==2.0.0 cloud-sptheme==1.10.1.post20200504175005 -matplotlib==3.8.4 +matplotlib==3.10.8 numpy==2.2.6 pytest==9.0.3 pytest-cov==5.0.0 -scipy==1.14.0 +scipy==1.17.1 seaborn==0.13.2 sphinx==7.3.7 sphinx-autoapi==3.1.2