Skip to content

Commit

Permalink
Numpy v2 support (#188)
Browse files Browse the repository at this point in the history
* build: remove requirement to use numpy<2.0.0

* build: remove python 3.8 from GA

* build: temporarely remove mac from GA
  • Loading branch information
mrava87 authored Sep 13, 2024
1 parent 7140c96 commit 9acab7e
Show file tree
Hide file tree
Showing 10 changed files with 38 additions and 40 deletions.
8 changes: 4 additions & 4 deletions .github/workflows/build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,18 +6,18 @@ jobs:
build:
strategy:
matrix:
platform: [ ubuntu-latest, macos-latest ]
python-version: ["3.8", "3.9", "3.10", "3.11"]
platform: [ ubuntu-latest ] # temporarily removed macos-latest because of different behavior with numpy v2
python-version: ["3.9", "3.10", "3.11"]

runs-on: ${{ matrix.platform }}
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Get history and tags for SCM versioning to work
run: |
git fetch --prune --unshallow
git fetch --depth=1 origin +refs/tags/*:refs/tags/*
- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v4
uses: actions/setup-python@v5
with:
python-version: ${{ matrix.python-version }}
- name: Install dependencies
Expand Down
2 changes: 1 addition & 1 deletion .readthedocs.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,6 @@ sphinx:
# Declare the Python requirements required to build your docs
python:
install:
- requirements: requirements-dev.txt
- requirements: requirements-doc.txt
- method: pip
path: .
22 changes: 0 additions & 22 deletions .travis.yml

This file was deleted.

6 changes: 3 additions & 3 deletions azure-pipelines.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ jobs:
# steps:
# - task: UsePythonVersion@0
# inputs:
# versionSpec: '3.8'
# versionSpec: '3.9'
# architecture: 'x64'
#
# - script: |
Expand Down Expand Up @@ -54,7 +54,7 @@ jobs:
steps:
- task: UsePythonVersion@0
inputs:
versionSpec: '3.8'
versionSpec: '3.9'
architecture: 'x64'

- script: |
Expand Down Expand Up @@ -83,7 +83,7 @@ jobs:
steps:
- task: UsePythonVersion@0
inputs:
versionSpec: '3.8'
versionSpec: '3.9'
architecture: 'x64'

- script: |
Expand Down
4 changes: 2 additions & 2 deletions environment-dev-arm.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ channels:
- numba
dependencies:
- python>=3.8.12
- numpy>=1.15.0, <2.0.0
- scipy>=1.8.0
- numpy>=1.21.0
- scipy>=1.11.0
- pylops>=2.0.0
- scikit-image
- matplotlib
Expand Down
4 changes: 2 additions & 2 deletions environment-dev.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ channels:
- numba
dependencies:
- python>=3.8.12
- numpy>=1.15.0, <2.0.0
- scipy>=1.8.0
- numpy>=1.21.0
- scipy>=1.11.0
- pylops>=2.0.0
- scikit-image
- matplotlib
Expand Down
4 changes: 2 additions & 2 deletions environment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@ channels:
- defaults
dependencies:
- python>=3.8.12
- numpy>=1.15.0, <2.0.0
- scipy>=1.8.0
- numpy>=1.21.0
- scipy>=1.11.0
- pylops>=2.0.0
4 changes: 2 additions & 2 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,8 @@ classifiers = [
"Topic :: Scientific/Engineering :: Mathematics",
]
dependencies = [
"numpy >= 1.15.0, <2.0.0",
"scipy >= 1.8.0",
"numpy >= 1.21.0",
"scipy >= 1.11.0",
"pylops >= 2.0.0",
]
dynamic = ["version"]
Expand Down
4 changes: 2 additions & 2 deletions requirements-dev.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
numpy>=1.15.0, <2.0.0
scipy>=1.8.0
numpy>=1.21.0
scipy>=1.11.0
pylops>=2.0.0
numba
scikit-image
Expand Down
20 changes: 20 additions & 0 deletions requirements-doc.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
numpy>=1.21.0
scipy>=1.11.0
pylops>=2.0.0
numba
scikit-image
matplotlib
ipython
bm4d<4.2.4 # temporary as gclib problem arises in readthedocs
bm3d<4.0.2 # temporary as gclib problem arises in readthedocs
pytest
pytest-runner
setuptools_scm
docutils<0.18
Sphinx
sphinx-gallery
pydata-sphinx-theme
numpydoc
nbsphinx
image
sphinxemoji

0 comments on commit 9acab7e

Please sign in to comment.