From 74598cb90afa7bbfcee0dfef633ed73721167448 Mon Sep 17 00:00:00 2001
From: James Gaboardi <jgaboardi@gmail.com>
Date: Sat, 8 Jun 2024 13:59:23 -0400
Subject: [PATCH] fix #22 - update min req & boost CI suite #20

---
 .github/workflows/testing.yml  | 10 ++++++++++
 ci/py310-oldest.yaml           | 10 ++++++++++
 ci/py311-latest.yaml           |  9 +++++++++
 ci/py312-dev.yaml              | 16 ++++++++++++++++
 ci/py312-latest.yaml           |  3 +--
 fastpair/test/test_fastpair.py |  3 +--
 pyproject.toml                 |  3 ++-
 7 files changed, 49 insertions(+), 5 deletions(-)
 create mode 100644 ci/py310-oldest.yaml
 create mode 100644 ci/py311-latest.yaml
 create mode 100644 ci/py312-dev.yaml

diff --git a/.github/workflows/testing.yml b/.github/workflows/testing.yml
index 45165df..15d3ec5 100644
--- a/.github/workflows/testing.yml
+++ b/.github/workflows/testing.yml
@@ -25,8 +25,18 @@
        matrix:
          os: [ubuntu-latest]
          environment-file: [
+            ci/py310-oldest.yaml,
+            ci/py311-latest.yaml,
             ci/py312-latest.yaml,
+            ci/py312-dev.yaml,
          ]
+       include:
+         - environment-file: ci/py312-latest.yaml
+           os: macos-latest
+         - environment-file: ci/py312-latest.yaml
+           os: macos-14 # Apple Silicon
+         - environment-file: ci/py312-latest.yaml
+           os: windows-latest
        fail-fast: false
 
      defaults:
diff --git a/ci/py310-oldest.yaml b/ci/py310-oldest.yaml
new file mode 100644
index 0000000..3f799f6
--- /dev/null
+++ b/ci/py310-oldest.yaml
@@ -0,0 +1,10 @@
+name: py310-oldest
+channels:
+  - conda-forge
+dependencies:
+  - python=3.10
+  - numpy=1.24
+  - scipy=1.10
+  # testing
+  - pytest
+  - pytest-cov
diff --git a/ci/py311-latest.yaml b/ci/py311-latest.yaml
new file mode 100644
index 0000000..8e8f3cd
--- /dev/null
+++ b/ci/py311-latest.yaml
@@ -0,0 +1,9 @@
+name: py311-latest
+channels:
+  - conda-forge
+dependencies:
+  - python=3.12
+  - scipy
+  # testing
+  - pytest
+  - pytest-cov
diff --git a/ci/py312-dev.yaml b/ci/py312-dev.yaml
new file mode 100644
index 0000000..1664a5e
--- /dev/null
+++ b/ci/py312-dev.yaml
@@ -0,0 +1,16 @@
+name: py312-dev
+channels:
+  - conda-forge
+dependencies:
+  - python=3.12
+  - pip
+  # testing
+  - pytest
+  - pytest-cov
+  - pip:
+    # nightly builds
+    - --pre \
+      --index-url https://pypi.anaconda.org/scientific-python-nightly-wheels/simple  \
+      --extra-index-url https://pypi.org/simple
+    - numpy
+    - scipy
diff --git a/ci/py312-latest.yaml b/ci/py312-latest.yaml
index 0c3972a..d5c5642 100644
--- a/ci/py312-latest.yaml
+++ b/ci/py312-latest.yaml
@@ -1,10 +1,9 @@
 name: py312-latest
 channels:
   - conda-forge
-  - nodefaults
 dependencies:
   - python=3.12
-  - scipy=1.11
+  - scipy
   # testing
   - pytest
   - pytest-cov
diff --git a/fastpair/test/test_fastpair.py b/fastpair/test/test_fastpair.py
index 11d6e80..19b1287 100644
--- a/fastpair/test/test_fastpair.py
+++ b/fastpair/test/test_fastpair.py
@@ -15,7 +15,6 @@
 
 import numpy as np
 import pytest
-from scipy import array, mean
 
 from fastpair import FastPair
 
@@ -70,7 +69,7 @@ def rand_tuple(dim=2):
 
 def interact(u, v):
     """Compute element-wise mean(s) from two arrays."""
-    return tuple(mean(array([u, v]), axis=0))
+    return tuple(np.mean(np.array([u, v]), axis=0))
 
 
 # Setup fixtures
diff --git a/pyproject.toml b/pyproject.toml
index 80f35db..f099652 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -33,7 +33,8 @@ classifiers = [
 
 requires-python = ">=3.10"
 dependencies = [
-    "scipy>=1.10,<1.12",
+    "numpy>=1.24",
+    "scipy>=1.10",
 ]
 
 [project.urls]