From cb2cd2a2044a5848e7a8f5597b6f825ce4836de9 Mon Sep 17 00:00:00 2001
From: Trevor James Smith <10819524+Zeitsperre@users.noreply.github.com>
Date: Tue, 10 Sep 2024 13:53:15 -0400
Subject: [PATCH] update CI

---
 .github/workflows/main.yml | 26 +++++++++++---------------
 tox.ini                    | 24 ++++++++++++------------
 2 files changed, 23 insertions(+), 27 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 464862983..68e8e5162 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -32,16 +32,12 @@ permissions:
 
 jobs:
   lint:
-    name: Lint (Python${{ matrix.python-version }})
+    name: Lint
     runs-on: ubuntu-latest
     if: |
       (github.event.action != 'labeled') ||
       (github.event.review.state == 'approved') ||
       (github.event_name == 'push')
-    strategy:
-      matrix:
-        python-version:
-          - "3.9"
     steps:
       - name: Harden Runner
         uses: step-security/harden-runner@5c7944e73c4c2a096b17a9cb74d65b6c2bbafbde # v2.9.1
@@ -54,10 +50,10 @@ jobs:
             pypi.org:443
       - name: Checkout Repository
         uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
-      - name: Set up Python${{ matrix.python-version }}
+      - name: Set up Python3
         uses: actions/setup-python@f677139bbe7f9c59b41e40162b753c062f5d49a3 # v5.2.0
         with:
-          python-version: ${{ matrix.python-version }}
+          python-version: "3.x"
       - name: Install CI libraries
         run: |
           python -m pip install --require-hashes -r CI/requirements_ci.txt
@@ -75,7 +71,7 @@ jobs:
     strategy:
       matrix:
         python-version:
-          - "3.9"
+          - "3.10"
     steps:
       - name: Harden Runner
         uses: step-security/harden-runner@5c7944e73c4c2a096b17a9cb74d65b6c2bbafbde # v2.9.1
@@ -120,30 +116,30 @@ jobs:
           # Linux builds
           - os: ubuntu-latest
             markers: -m 'not slow'
-            python-version: "3.10"
+            python-version: "3.11"
             tox-env: standard
           - os: ubuntu-latest
             markers: -m 'not slow'
-            python-version: "3.11"
+            python-version: "3.12"
             tox-env: standard
           - os: ubuntu-latest
             markers: -m 'not slow'
-            python-version: "3.12"
+            python-version: "3.12-dev.1"
             tox-env: standard
           # Windows builds
           - os: windows-latest
             markers: -m 'not slow'
-            python-version: "3.9"
+            python-version: "3.10"
             tox-env: py39-coverage-prefetch  # Test data prefetch is needed for Windows
           # macOS builds
           - os: macos-latest
-            python-version: "3.10"
+            python-version: "3.11"
             markers: ''  # Slow tests
             tox-env: py310-coverage-extras
           # Specialized tests
           - os: ubuntu-latest
             markers: -m 'not requires_internet and not slow'
-            python-version: "3.9"
+            python-version: "3.13-dev.1"
             tox-env: py39-coverage-offline-prefetch
           - os: ubuntu-latest
             markers: ''
@@ -213,7 +209,7 @@ jobs:
     strategy:
       matrix:
         os: [ ubuntu-latest ]
-        python-version: [ "3.9", "3.12" ]
+        python-version: [ "3.10", "3.12" ]
     defaults:
       run:
         shell: bash -l {0}
diff --git a/tox.ini b/tox.ini
index d88f67ca9..d7084bd7a 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,29 +1,29 @@
 [tox]
-min_version = 4.16.0
+min_version = 4.18.1
 env_list =
     lint
     docs
     notebooks
     doctests
-    py39
-    py310-extras-numpy
-    py311-extras-sbck
-    py312-extras-lmoments
+    py310
+    py311-extras-numpy
+    py312-extras-sbck
+    py313-extras-lmoments
 labels =
     static = lint
-    test = py39, py310-extras-numpy, py311-extras-sbck, py312-extras-lmoments
+    test = py310, py311-extras-numpy, py312-extras-sbck, py313-extras-lmoments
     special = docs, notebooks, doctests
 requires =
     pip >= 24.0
-    flit >=3.9
+    flit >=3.9,<4.0
 opts = -vv
 
 [gh]
 python =
-    3.9 = py39-coverage
-    3.10 = py310-coverage-extras-numpy
-    3.11 = py311-coverage-extras-sbck
-    3.12 = py312-coverage-extras-lmoments
+    3.10 = py310-coverage
+    3.11 = py311-coverage-extras-numpy
+    3.12 = py312-coverage-extras-sbck
+    3.13 = py313-coverage-extras-lmoments
 
 [testenv:lint]
 description = Run code quality compliance tests under {basepython}
@@ -117,7 +117,7 @@ extras =
     extras: extras
 deps =
     lmoments: lmoments3
-    numpy: numpy>=1.20,<2.0
+    numpy: numpy>=1.23,<2.0
     numpy: pint>=0.18,<0.24.0
     sbck: pybind11
     upstream: -r CI/requirements_upstream.txt