Skip to content

Commit

Permalink
fix carsonfarmer#22 - update min req & boost CI suite carsonfarmer#20 (
Browse files Browse the repository at this point in the history
…carsonfarmer#33)

* fix carsonfarmer#22 - update min req & boost CI suite carsonfarmer#20

* fix indent in testing.yml

* Update ci/py311-latest.yaml
  • Loading branch information
jGaboardi authored Jun 10, 2024
1 parent 7d3566e commit 9cc73fb
Show file tree
Hide file tree
Showing 7 changed files with 49 additions and 5 deletions.
10 changes: 10 additions & 0 deletions .github/workflows/testing.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
10 changes: 10 additions & 0 deletions ci/py310-oldest.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
name: py310-oldest
channels:
- conda-forge
dependencies:
- python=3.10
- numpy=1.24
- scipy=1.10
# testing
- pytest
- pytest-cov
9 changes: 9 additions & 0 deletions ci/py311-latest.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
name: py311-latest
channels:
- conda-forge
dependencies:
- python=3.11
- scipy
# testing
- pytest
- pytest-cov
16 changes: 16 additions & 0 deletions ci/py312-dev.yaml
Original file line number Diff line number Diff line change
@@ -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
3 changes: 1 addition & 2 deletions ci/py312-latest.yaml
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
name: py312-latest
channels:
- conda-forge
- nodefaults
dependencies:
- python=3.12
- scipy=1.11
- scipy
# testing
- pytest
- pytest-cov
3 changes: 1 addition & 2 deletions fastpair/test/test_fastpair.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@

import numpy as np
import pytest
from scipy import array, mean

from fastpair import FastPair

Expand Down Expand Up @@ -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
Expand Down
3 changes: 2 additions & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,8 @@ classifiers = [

requires-python = ">=3.10"
dependencies = [
"scipy>=1.10,<1.12",
"numpy>=1.24",
"scipy>=1.10",
]

[project.urls]
Expand Down

0 comments on commit 9cc73fb

Please sign in to comment.