fix CI

.github/workflows/dev.yaml

@@ -15,8 +15,8 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [ubuntu-20.04, windows-2022, macos-11]
-        python-version: ["3.11"]
+        os: [ubuntu-24.04, windows-2022, macos-14]
+        python-version: ["3.12"]
 
     steps:
       - name: checkout

.github/workflows/docs.yaml

@@ -25,8 +25,8 @@ jobs:
       - name: Install dependencies
         run: |
           pip install --upgrade pip
-          pip install -r requirements/minimal.txt
-          pip install -r requirements/docs.txt
+          pip install -r requirements_minimal_CI.txt
+          pip install -r requirements_docs_CI.txt
           python -m pip install build packaging
 
       - name: Build package
@@ -40,7 +40,7 @@ jobs:
           make
 
       - name: Checkout docs site
-        if: (!github.event.pull_request)
+      # if: (!github.event.pull_request)
         uses: actions/checkout@v3
         with:
           repository: popsim-consortium/demes-docs

.github/workflows/tests.yaml

@@ -8,7 +8,7 @@ on:
 
 jobs:
   canceller:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-24.04
     steps:
       - name: cancel previous runs
         uses: styfle/[email protected]
@@ -24,8 +24,8 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [ubuntu-20.04, windows-2022, macos-11]
-        python-version: [3.7, "3.11"]
+        os: [ubuntu-24.04, windows-2022, macos-14]
+        python-version: ["3.12"]
     env:
       OS: ${{ matrix.os }}
       PYTHON: ${{ matrix.python-version }}
@@ -43,8 +43,8 @@ jobs:
 
       - name: install dependencies
         run: |
-          pip install -r requirements/minimal.txt
-          pip install -r requirements/tests.txt
+          pip install -r requirements_minimal_CI.txt
+          pip install -r requirements_tests_CI.txt
 
       # Check that demes installs as expected.
       # Also check the "demes" CLI entry point.

requirements/docs.txt

@@ -1,5 +1,5 @@
-demesdraw==0.4.0
-jupyter-book==0.15.1
-piccolo_theme==0.19.0
-sphinx_issues==3.0.1
-sphinxcontrib-programoutput==0.17
+demesdraw
+jupyter-book
+piccolo_theme
+sphinx_issues
+sphinxcontrib-programoutput

requirements/lint.txt

@@ -1,3 +1,3 @@
-black==23.11.0
-flake8==6.1.0
-mypy==1.9.0
+black
+flake8
+mypy

requirements/minimal.txt

@@ -1,2 +1,2 @@
-attrs==23.2.0
-ruamel.yaml==0.18.6
+attrs
+ruamel.yaml

requirements/tests.txt

@@ -1,5 +1,5 @@
-numpy; python_version=='3.7'
-numpy==1.26.3; python_version>='3.8'
-pytest==7.4.3
-pytest-cov==4.1.0
-pytest-xdist==3.5.0
+numpy
+numpy
+pytest
+pytest-cov
+pytest-xdist