Skip to content

Commit 9acab7e

Browse files
authored
Numpy v2 support (#188)
* build: remove requirement to use numpy<2.0.0 * build: remove python 3.8 from GA * build: temporarely remove mac from GA
1 parent 7140c96 commit 9acab7e

File tree

10 files changed

+38
-40
lines changed

10 files changed

+38
-40
lines changed

.github/workflows/build.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,18 +6,18 @@ jobs:
66
build:
77
strategy:
88
matrix:
9-
platform: [ ubuntu-latest, macos-latest ]
10-
python-version: ["3.8", "3.9", "3.10", "3.11"]
9+
platform: [ ubuntu-latest ] # temporarily removed macos-latest because of different behavior with numpy v2
10+
python-version: ["3.9", "3.10", "3.11"]
1111

1212
runs-on: ${{ matrix.platform }}
1313
steps:
14-
- uses: actions/checkout@v3
14+
- uses: actions/checkout@v4
1515
- name: Get history and tags for SCM versioning to work
1616
run: |
1717
git fetch --prune --unshallow
1818
git fetch --depth=1 origin +refs/tags/*:refs/tags/*
1919
- name: Set up Python ${{ matrix.python-version }}
20-
uses: actions/setup-python@v4
20+
uses: actions/setup-python@v5
2121
with:
2222
python-version: ${{ matrix.python-version }}
2323
- name: Install dependencies

.readthedocs.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,6 @@ sphinx:
1818
# Declare the Python requirements required to build your docs
1919
python:
2020
install:
21-
- requirements: requirements-dev.txt
21+
- requirements: requirements-doc.txt
2222
- method: pip
2323
path: .

.travis.yml

Lines changed: 0 additions & 22 deletions
This file was deleted.

azure-pipelines.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525
# steps:
2626
# - task: UsePythonVersion@0
2727
# inputs:
28-
# versionSpec: '3.8'
28+
# versionSpec: '3.9'
2929
# architecture: 'x64'
3030
#
3131
# - script: |
@@ -54,7 +54,7 @@ jobs:
5454
steps:
5555
- task: UsePythonVersion@0
5656
inputs:
57-
versionSpec: '3.8'
57+
versionSpec: '3.9'
5858
architecture: 'x64'
5959

6060
- script: |
@@ -83,7 +83,7 @@ jobs:
8383
steps:
8484
- task: UsePythonVersion@0
8585
inputs:
86-
versionSpec: '3.8'
86+
versionSpec: '3.9'
8787
architecture: 'x64'
8888

8989
- script: |

environment-dev-arm.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ channels:
55
- numba
66
dependencies:
77
- python>=3.8.12
8-
- numpy>=1.15.0, <2.0.0
9-
- scipy>=1.8.0
8+
- numpy>=1.21.0
9+
- scipy>=1.11.0
1010
- pylops>=2.0.0
1111
- scikit-image
1212
- matplotlib

environment-dev.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ channels:
55
- numba
66
dependencies:
77
- python>=3.8.12
8-
- numpy>=1.15.0, <2.0.0
9-
- scipy>=1.8.0
8+
- numpy>=1.21.0
9+
- scipy>=1.11.0
1010
- pylops>=2.0.0
1111
- scikit-image
1212
- matplotlib

environment.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,6 @@ channels:
33
- defaults
44
dependencies:
55
- python>=3.8.12
6-
- numpy>=1.15.0, <2.0.0
7-
- scipy>=1.8.0
6+
- numpy>=1.21.0
7+
- scipy>=1.11.0
88
- pylops>=2.0.0

pyproject.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@ classifiers = [
3030
"Topic :: Scientific/Engineering :: Mathematics",
3131
]
3232
dependencies = [
33-
"numpy >= 1.15.0, <2.0.0",
34-
"scipy >= 1.8.0",
33+
"numpy >= 1.21.0",
34+
"scipy >= 1.11.0",
3535
"pylops >= 2.0.0",
3636
]
3737
dynamic = ["version"]

requirements-dev.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
numpy>=1.15.0, <2.0.0
2-
scipy>=1.8.0
1+
numpy>=1.21.0
2+
scipy>=1.11.0
33
pylops>=2.0.0
44
numba
55
scikit-image

requirements-doc.txt

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
numpy>=1.21.0
2+
scipy>=1.11.0
3+
pylops>=2.0.0
4+
numba
5+
scikit-image
6+
matplotlib
7+
ipython
8+
bm4d<4.2.4 # temporary as gclib problem arises in readthedocs
9+
bm3d<4.0.2 # temporary as gclib problem arises in readthedocs
10+
pytest
11+
pytest-runner
12+
setuptools_scm
13+
docutils<0.18
14+
Sphinx
15+
sphinx-gallery
16+
pydata-sphinx-theme
17+
numpydoc
18+
nbsphinx
19+
image
20+
sphinxemoji

0 commit comments

Comments
 (0)