From 86ab711fddcc555bddf97471abb2b19412f70498 Mon Sep 17 00:00:00 2001 From: Steve Morley Date: Thu, 21 May 2026 15:00:16 -0600 Subject: [PATCH 1/4] Update CI workflow Move run onto Ubuntu 24.04 and v6 of checkout and setup-python --- .github/workflows/ci.yml | 28 +++++++++++++++++----------- 1 file changed, 17 insertions(+), 11 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 826292a..7ca2c18 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -16,22 +16,28 @@ jobs: fail-fast: false matrix: include: - - python-version: "3.8" - os: ubuntu-20.04 + - python-version: "3.10" + os: ubuntu-24.04 piplist: "numpy matplotlib" - - python-version: "3.9" - os: ubuntu-20.04 + - python-version: "3.11" + os: ubuntu-24.04 piplist: "numpy matplotlib" dep-strategy: "oldest" - - python-version: "3.10" - os: ubuntu-20.04 + - python-version: "3.12" + os: ubuntu-24.04 piplist: "numpy matplotlib" - - python-version: "3.10" - os: ubuntu-20.04 + - python-version: "3.13" + os: ubuntu-24.04 + piplist: "numpy matplotlib spacepy" + - python-version: "3.14" + os: ubuntu-24.04 + piplist: "numpy matplotlib" + - python-version: "3.14" + os: ubuntu-24.04 piplist: "numpy matplotlib spacepy" steps: - name: Set up Python ${{ matrix.python-version }} - uses: actions/setup-python@v2 + uses: actions/setup-python@v6 with: python-version: ${{ matrix.python-version }} - name: Install dependencies @@ -45,7 +51,7 @@ jobs: # Per https://github.com/actions/checkout/issues/15, this gets the MERGE # commit of the PR, not just the tip of the PR. - name: checkout - uses: actions/checkout@v2 + uses: actions/checkout@v6 - name: Install and run tests working-directory: ${{ github.workspace }} run: | @@ -55,7 +61,7 @@ jobs: all-tests: name: All tests if: ${{ always() }} - runs-on: ubuntu-20.04 + runs-on: ubuntu-24.04 needs: test steps: - name: Check test matrix status From 7154cf85639a607d4b31deac406332ee9986bb6c Mon Sep 17 00:00:00 2001 From: Steve Morley Date: Thu, 21 May 2026 15:09:40 -0600 Subject: [PATCH 2/4] COPYRIGHT: Update year span I needed something to hopefully trigger a new CI run --- COPYRIGHT.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/COPYRIGHT.md b/COPYRIGHT.md index ac11717..53451f6 100644 --- a/COPYRIGHT.md +++ b/COPYRIGHT.md @@ -1,4 +1,4 @@ -Copyright (c) 2017, Triad National Security, LLC +Copyright (c) 2017-2026, Triad National Security, LLC All rights reserved. This software was produced under U.S. Government contract 89233218CNA000001 for From 2f148c4fef0e7aee6ef3bc95508df54c8b05fb3c Mon Sep 17 00:00:00 2001 From: Steve Morley Date: Thu, 21 May 2026 15:12:38 -0600 Subject: [PATCH 3/4] test_verify: remove deprecated np.float, replace with python float --- tests/test_verify.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/test_verify.py b/tests/test_verify.py index 13a279b..66c47ae 100644 --- a/tests/test_verify.py +++ b/tests/test_verify.py @@ -42,8 +42,8 @@ def test_direct_array(self): def test_direct_array_floats(self): '''check construction direct from rates as array, force floats''' - ctab = verify.Contingency2x2(np.asarray(self.res), dtype=np.float) - npt.assert_array_equal(np.asarray(self.res, dtype=np.float), ctab) + ctab = verify.Contingency2x2(np.asarray(self.res), dtype=float) + npt.assert_array_equal(np.asarray(self.res, dtype=float), ctab) def test_direct_array3D_raises(self): '''check construction raises when given rates from non-2D array''' From dce05c841b1f6fb44a8a8bc8cd306bbbdc772324 Mon Sep 17 00:00:00 2001 From: Steve Morley Date: Thu, 21 May 2026 15:16:12 -0600 Subject: [PATCH 4/4] ci: explicit setuptools install for CI --- .github/workflows/ci.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 7ca2c18..e8a5a9d 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -25,16 +25,16 @@ jobs: dep-strategy: "oldest" - python-version: "3.12" os: ubuntu-24.04 - piplist: "numpy matplotlib" + piplist: "setuptools numpy matplotlib" - python-version: "3.13" os: ubuntu-24.04 - piplist: "numpy matplotlib spacepy" + piplist: "setuptools numpy matplotlib spacepy" - python-version: "3.14" os: ubuntu-24.04 - piplist: "numpy matplotlib" + piplist: "setuptools numpy matplotlib" - python-version: "3.14" os: ubuntu-24.04 - piplist: "numpy matplotlib spacepy" + piplist: "setuptools numpy matplotlib spacepy" steps: - name: Set up Python ${{ matrix.python-version }} uses: actions/setup-python@v6