Skip to content

Commit

Permalink
Manually migrate to numpy 2 during 0.32.0 update
Browse files Browse the repository at this point in the history
  • Loading branch information
jdblischak committed Sep 12, 2024
1 parent e33574c commit 6ec7aea
Show file tree
Hide file tree
Showing 26 changed files with 147 additions and 101 deletions.
32 changes: 16 additions & 16 deletions .azure-pipelines/azure-pipelines-linux.yml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

32 changes: 16 additions & 16 deletions .azure-pipelines/azure-pipelines-osx.yml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

16 changes: 8 additions & 8 deletions .azure-pipelines/azure-pipelines-win.yml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ cxx_compiler_version:
docker_image:
- quay.io/condaforge/linux-anvil-cos7-x86_64
numpy:
- '1.22'
- '2.0'
pin_run_as_build:
python:
min_pin: x.x
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ cxx_compiler_version:
docker_image:
- quay.io/condaforge/linux-anvil-cos7-x86_64
numpy:
- '1.23'
- '2.0'
pin_run_as_build:
python:
min_pin: x.x
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ cxx_compiler_version:
docker_image:
- quay.io/condaforge/linux-anvil-cos7-x86_64
numpy:
- '1.26'
- '2.0'
pin_run_as_build:
python:
min_pin: x.x
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ cxx_compiler_version:
docker_image:
- quay.io/condaforge/linux-anvil-cos7-x86_64
numpy:
- '1.22'
- '2.0'
pin_run_as_build:
python:
min_pin: x.x
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ cxx_compiler_version:
docker_image:
- quay.io/condaforge/linux-anvil-cos7-x86_64
numpy:
- '1.22'
- '2.0'
pin_run_as_build:
python:
min_pin: x.x
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ cxx_compiler_version:
docker_image:
- quay.io/condaforge/linux-anvil-cos7-x86_64
numpy:
- '1.23'
- '2.0'
pin_run_as_build:
python:
min_pin: x.x
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ cxx_compiler_version:
docker_image:
- quay.io/condaforge/linux-anvil-cos7-x86_64
numpy:
- '1.26'
- '2.0'
pin_run_as_build:
python:
min_pin: x.x
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ cxx_compiler_version:
docker_image:
- quay.io/condaforge/linux-anvil-cos7-x86_64
numpy:
- '1.22'
- '2.0'
pin_run_as_build:
python:
min_pin: x.x
Expand Down
47 changes: 47 additions & 0 deletions .ci_support/migrations/numpy2.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
__migrator:
build_number: 1
kind: version
commit_message: |
Rebuild for numpy 2.0
TL;DR: The way we build against numpy has changed as of numpy 2.0. This bot
PR has updated the recipe to account for the changes (see below for details).
The biggest change is that we no longer need to use the oldest available numpy
version at build time in order to support old numpy version at runtime - numpy
will by default use a compatible ABI for the oldest still-supported numpy versions.
Additionally, we no longer need to use `{{ pin_compatible("numpy") }}` as a
run requirement - this has been handled for more than two years now by a
run-export on the numpy package itself. The migrator will therefore remove
any occurrences of this.
However, by default, building against numpy 2.0 will assume that the package
is compatible with numpy 2.0, which is not necessarily the case. You should
check that the upstream package explicitly supports numpy 2.0, otherwise you
need to add a `- numpy <2.0dev0` run requirement until that happens (check numpy
issue 26191 for an overview of the most important packages).
### To-Dos:
* [ ] Match run-requirements for numpy (i.e. check upstream `pyproject.toml` or however the project specifies numpy compatibility)
* If upstream is not yet compatible with numpy 2.0, add `numpy <2.0dev0` upper bound under `run:`.
* If upstream is already compatible with numpy 2.0, nothing else should be necessary in most cases.
* If upstream requires a minimum numpy version newer than 1.19, you can add `numpy >=x.y` under `run:`.
* [ ] Remove any remaining occurrences of `{{ pin_compatible("numpy") }}` that the bot may have missed.
PS. If the build does not compile anymore, this is almost certainly a sign that
the upstream project is not yet ready for numpy 2.0; do not close this PR until
a version compatible with numpy 2.0 has been released upstream and on this
feedstock (in the meantime, you can keep the bot from reopening this PR in
case of git conflicts by marking it as a draft).
migration_number: 1

# needs to match length of zip {python, python_impl, numpy}
# as it is in global CBC in order to override it
numpy:
- 1.22 # no py38 support for numpy 2.0
- 2.0
- 2.0
- 2.0
- 2.0
migrator_ts: 1713572489.295986
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ cxx_compiler_version:
macos_machine:
- x86_64-apple-darwin13.4.0
numpy:
- '1.22'
- '2.0'
pin_run_as_build:
python:
min_pin: x.x
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ cxx_compiler_version:
macos_machine:
- x86_64-apple-darwin13.4.0
numpy:
- '1.23'
- '2.0'
pin_run_as_build:
python:
min_pin: x.x
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ cxx_compiler_version:
macos_machine:
- x86_64-apple-darwin13.4.0
numpy:
- '1.26'
- '2.0'
pin_run_as_build:
python:
min_pin: x.x
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ cxx_compiler_version:
macos_machine:
- x86_64-apple-darwin13.4.0
numpy:
- '1.22'
- '2.0'
pin_run_as_build:
python:
min_pin: x.x
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ cxx_compiler_version:
macos_machine:
- arm64-apple-darwin20.0.0
numpy:
- '1.22'
- '2.0'
pin_run_as_build:
python:
min_pin: x.x
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ cxx_compiler_version:
macos_machine:
- arm64-apple-darwin20.0.0
numpy:
- '1.23'
- '2.0'
pin_run_as_build:
python:
min_pin: x.x
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ cxx_compiler_version:
macos_machine:
- arm64-apple-darwin20.0.0
numpy:
- '1.26'
- '2.0'
pin_run_as_build:
python:
min_pin: x.x
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ cxx_compiler_version:
macos_machine:
- arm64-apple-darwin20.0.0
numpy:
- '1.22'
- '2.0'
pin_run_as_build:
python:
min_pin: x.x
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ channel_targets:
cxx_compiler:
- vs2019
numpy:
- '1.22'
- '2.0'
pin_run_as_build:
python:
min_pin: x.x
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ channel_targets:
cxx_compiler:
- vs2019
numpy:
- '1.23'
- '2.0'
pin_run_as_build:
python:
min_pin: x.x
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ channel_targets:
cxx_compiler:
- vs2019
numpy:
- '1.26'
- '2.0'
pin_run_as_build:
python:
min_pin: x.x
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ channel_targets:
cxx_compiler:
- vs2019
numpy:
- '1.22'
- '2.0'
pin_run_as_build:
python:
min_pin: x.x
Expand Down
Loading

0 comments on commit 6ec7aea

Please sign in to comment.