From 34cbf0ca8bc059fd7b7c5746ad703e111519f88c Mon Sep 17 00:00:00 2001
From: Daniel Smith <dgasmith@icloud.com>
Date: Sat, 11 May 2024 10:47:25 -0400
Subject: [PATCH] Moves to an include matrix

---
 .github/workflows/Tests.yml                   | 10 ++++++----
 devtools/conda-envs/full-environment.yaml     |  2 +-
 devtools/conda-envs/min-deps-environment.yaml |  2 +-
 devtools/conda-envs/min-ver-environment.yaml  |  4 ++--
 pyproject.toml                                |  2 +-
 5 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/Tests.yml b/.github/workflows/Tests.yml
index efb65df..035b59c 100644
--- a/.github/workflows/Tests.yml
+++ b/.github/workflows/Tests.yml
@@ -12,13 +12,15 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: [3.9, 3.12]
-        environment: ["min-deps", "full", "min-ver"]
-        exclude:
+        include:
          - python-version: 3.9
-           environment: "full"
+           environment: "min-deps"
          - python-version: 3.12
+           environment: "min-deps"
+         - python-version: 3.9
            environment: "min-ver"
+         - python-version: 3.11
+           environment: "full"
 
     runs-on: ubuntu-latest
 
diff --git a/devtools/conda-envs/full-environment.yaml b/devtools/conda-envs/full-environment.yaml
index 94872a5..a69311b 100644
--- a/devtools/conda-envs/full-environment.yaml
+++ b/devtools/conda-envs/full-environment.yaml
@@ -3,7 +3,7 @@ channels:
   - conda-forge
 dependencies:
     # Base depends
-  - python ==3.11
+  - python >=3.9
   - numpy >=1.23
   - nomkl
 
diff --git a/devtools/conda-envs/min-deps-environment.yaml b/devtools/conda-envs/min-deps-environment.yaml
index 31acf7f..e6ea382 100644
--- a/devtools/conda-envs/min-deps-environment.yaml
+++ b/devtools/conda-envs/min-deps-environment.yaml
@@ -3,7 +3,7 @@ channels:
   - conda-forge
 dependencies:
     # Base depends
-  - python
+  - python >=3.9
   - numpy >=1.23
   - nomkl
 
diff --git a/devtools/conda-envs/min-ver-environment.yaml b/devtools/conda-envs/min-ver-environment.yaml
index 04d3000..17778c1 100644
--- a/devtools/conda-envs/min-ver-environment.yaml
+++ b/devtools/conda-envs/min-ver-environment.yaml
@@ -3,12 +3,12 @@ channels:
   - conda-forge
 dependencies:
     # Base depends
-  - python >=3.8
+  - python >=3.9
   - numpy >=1.23
   - nomkl
 
     # Backends
-  - tensorflow ==2.10.*
+  - tensorflow-cpu ==2.10.*
   - dask ==2021.*
 
     # Testing
diff --git a/pyproject.toml b/pyproject.toml
index 4e42573..f83c639 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -1,3 +1,3 @@
 [tool.black]
 line-length = 120
-target-version = ['py38']
+target-version = ['py39']