Skip to content

Commit

Permalink
require pre-numpy 2.0 (#4789)
Browse files Browse the repository at this point in the history
* require pre-numpy 2.0

* need to build against this for final release

* Apply suggestions from code review

Co-authored-by: Tito Dal Canton <tito@dalcanton.it>

* update version strings

* update version strings

* update

* try this

* debug

* debug

* test

* hmmm.

* more debug

* try this again?

* update

* no idea

* maybe?

* no external bash

* do this

* update

* why not mac?

* revert

* remove debug statement

* remove tmate now

---------

Co-authored-by: Tito Dal Canton <tito@dalcanton.it>
  • Loading branch information
ahnitz and titodalcanton authored Jun 24, 2024
1 parent fa0c248 commit 28e8686
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 5 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/distribution.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:
with:
python-version: 3.8
- name: Install cibuildwheel
run: python -m pip install cibuildwheel==2.3.1
run: python -m pip install cibuildwheel
- name: Build wheels
run: python -m cibuildwheel --output-dir wheelhouse
env:
Expand Down
5 changes: 3 additions & 2 deletions pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,12 +1,13 @@
[build-system]
requires = ["setuptools",
"wheel",
"cython>=0.29.21",
"cython>=3.0.0",
"numpy==1.16.0; python_version <= '3.7'",
"numpy==1.17.3; python_version == '3.8'",
"numpy==1.19.3; python_version == '3.9'",
"numpy==1.21.4; python_version =='3.10'",
"numpy; python_version >= '3.11'",
"numpy==1.23.4; python_version=='3.11'",
"numpy; python_version >= '3.12'",
]

# To ensure the best compatibility, try to match the numpy reqs
Expand Down
2 changes: 1 addition & 1 deletion requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ astropy>=2.0.3,!=4.2.1,!=4.0.5
Mako>=1.0.1
scipy>=0.16.0
matplotlib>=2.0.0
numpy>=1.16.0,!=1.19.0
numpy>=1.16.0,!=1.19.0,<2.0.0
pillow
h5py>=3.0.0,!=3.7.0
jinja2
Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
setup_requires = ['numpy>=1.16.0']
install_requires = setup_requires + [
'cython>=0.29',
'numpy>=1.16.0,!=1.19.0',
'numpy>=1.16.0,!=1.19.0,<2.0.0',
'scipy>=0.16.0',
'astropy>=2.0.3,!=4.2.1,!=4.0.5',
'matplotlib>=1.5.1',
Expand Down

0 comments on commit 28e8686

Please sign in to comment.