Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Support numpy>=1.17.3 #1204

Merged
merged 1 commit into from
Jun 14, 2022
Merged

Support numpy>=1.17.3 #1204

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 8 additions & 11 deletions .circleci/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -254,7 +254,7 @@ jobs:
parameters:
python-version:
type: string
numpy-version:
dependencies:
type: string

docker:
Expand All @@ -269,9 +269,8 @@ jobs:
command: |
python -m venv env
. env/bin/activate
pip install -r requirements.txt
pip install dimod --no-index -f dist/ --force-reinstall --no-deps
pip install 'numpy<< parameters.numpy-version >>' --upgrade --only-binary=numpy
pip install << parameters.dependencies >> --upgrade --only-binary=numpy
- run: &unix-run-tests
name: run tests
command: |
Expand Down Expand Up @@ -410,20 +409,18 @@ workflows:
- test-codecov
- test-doctest
- test-linux:
name: test-linux-numpy<< matrix.numpy-version >>-py<< matrix.python-version >>
name: test-linux-<< matrix.dependencies >>-py<< matrix.python-version >>
requires:
- build-linux
matrix:
parameters:
# test the lowest numpy version and the highest minor of each
# currently deployed
numpy-version: [==1.20.0, ~=1.21.0, ~=1.22.0]
# test the lowest supported numpy and the latest
dependencies: [oldest-supported-numpy, numpy]
python-version: *python-versions
exclude:
- numpy-version: ==1.20.0 # NumPy 1.20 does not support 3.10
python-version: 3.10.0
- numpy-version: ~=1.22.0 # NumPy 1.22 does not support 3.7
python-version: 3.7.9
# we don't support 1.14.5, the oldest version for Python 3.7.9
- python-version: 3.7.9
dependencies: oldest-supported-numpy
- test-linux-cpp11
- test-osx:
name: test-osx-py<< matrix.python-version >>
Expand Down
4 changes: 4 additions & 0 deletions releasenotes/notes/loosen-numpy-ae59b80981918338.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
---
features:
- |
Expand supported NumPy version range to ``numpy>=1.17.3,<2.0.0``
4 changes: 3 additions & 1 deletion setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,9 @@ def finalize_options(self):
'dimod/include/',
],
install_requires=[
'numpy>=1.20.0,<2.0.0',
# this is the oldest supported NumPy on Python 3.8, we cannot
# support the oldest for 3.7, 1.14.5
'numpy>=1.17.3,<2.0.0',
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I also think we should lift the 2.0 upper bound, but we can discuss that and/or do it in a separate PR.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Agree it's a bit pointless, we should probably either lift it altogether or tighten it down to 1.n+2.0. But yeah, followup PR.

],
# we use the generic 'all' so that in the future we can add or remove
# packages without breaking things
Expand Down