Merge branch 'master' into labels

handley-lab · Jan 17, 2023 · d6ae643 · d6ae643
2 parents 6f22c93 + fffa42e
commit d6ae643
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 5 deletions.
diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml
@@ -31,9 +31,16 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        os: [ubuntu-latest, macos-latest, windows-latest]
-        python-version: [3.8, '3.10']
+        os: [ubuntu-latest]
+        python-version: ['3.8', '3.9', '3.10']
         extras: [true, false]
+        include:
+          - os: macos-latest
+            python-version: '3.10'
+            extras: true
+          - os: windows-latest
+            python-version: '3.10'
+            extras: true
 
     steps:
     - uses: actions/checkout@v2
@@ -62,8 +69,13 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        os: [ubuntu-latest, macos-latest, windows-latest]
-        python-version: [3.8, '3.10']
+        os: [ubuntu-latest]
+        python-version: ['3.8', '3.9', '3.10']
+        include:
+          - os: macos-latest
+            python-version: '3.10'
+          - os: windows-latest
+            python-version: '3.10'
 
     steps:
     - uses: actions/checkout@v2

diff --git a/.readthedocs.yml b/.readthedocs.yml
@@ -14,7 +14,7 @@ formats: all
 
 # Optionally set the version of Python and requirements required to build your docs
 python:
-  version: 3.7
+  version: 3.8
   install:
     - requirements: docs/requirements.txt
     - requirements: requirements.txt