Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 19 additions & 13 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
piplist: "numpy matplotlib"
- python-version: "3.10"
os: ubuntu-20.04
piplist: "numpy matplotlib spacepy"
- python-version: "3.12"
os: ubuntu-24.04
piplist: "setuptools numpy matplotlib"
- python-version: "3.13"
os: ubuntu-24.04
piplist: "setuptools numpy matplotlib spacepy"
- python-version: "3.14"
os: ubuntu-24.04
piplist: "setuptools numpy matplotlib"
- python-version: "3.14"
os: ubuntu-24.04
piplist: "setuptools 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
Expand All @@ -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: |
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion COPYRIGHT.md
Original file line number Diff line number Diff line change
@@ -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
Expand Down
4 changes: 2 additions & 2 deletions tests/test_verify.py
Original file line number Diff line number Diff line change
Expand Up @@ -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'''
Expand Down