Skip to content

Commit

Permalink
Merge pull request #94 from regro-cf-autotick-bot/rebuild-numpy2-0-1_…
Browse files Browse the repository at this point in the history
…h3a7d21

Rebuild for numpy 2.0
  • Loading branch information
SylvainCorlay authored Aug 6, 2024
2 parents 9490ffa + ba1b4fc commit 8f310a3
Show file tree
Hide file tree
Showing 33 changed files with 320 additions and 155 deletions.
21 changes: 11 additions & 10 deletions .azure-pipelines/azure-pipelines-linux.yml

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

37 changes: 19 additions & 18 deletions .azure-pipelines/azure-pipelines-osx.yml

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

20 changes: 10 additions & 10 deletions .azure-pipelines/azure-pipelines-win.yml

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

8 changes: 7 additions & 1 deletion .ci_support/linux_64_numpy1.22python3.8.____cpython.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
c_stdlib:
- sysroot
c_stdlib_version:
- '2.17'
cdt_name:
- cos6
- cos7
channel_sources:
- conda-forge
channel_targets:
Expand All @@ -21,5 +25,7 @@ python:
target_platform:
- linux-64
zip_keys:
- - c_stdlib_version
- cdt_name
- - python
- numpy
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
c_stdlib:
- sysroot
c_stdlib_version:
- '2.17'
cdt_name:
- cos6
- cos7
channel_sources:
- conda-forge
channel_targets:
Expand All @@ -11,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 All @@ -21,5 +25,7 @@ python:
target_platform:
- linux-64
zip_keys:
- - c_stdlib_version
- cdt_name
- - python
- numpy
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
c_stdlib:
- sysroot
c_stdlib_version:
- '2.17'
cdt_name:
- cos6
- cos7
channel_sources:
- conda-forge
channel_targets:
Expand All @@ -11,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 All @@ -21,5 +25,7 @@ python:
target_platform:
- linux-64
zip_keys:
- - c_stdlib_version
- cdt_name
- - python
- numpy
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
c_stdlib:
- sysroot
c_stdlib_version:
- '2.17'
cdt_name:
- cos6
- cos7
channel_sources:
- conda-forge
channel_targets:
Expand All @@ -11,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 All @@ -21,5 +25,7 @@ python:
target_platform:
- linux-64
zip_keys:
- - c_stdlib_version
- cdt_name
- - python
- numpy
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
c_stdlib:
- sysroot
c_stdlib_version:
- '2.17'
cdt_name:
- cos6
- cos7
channel_sources:
- conda-forge
channel_targets:
Expand All @@ -11,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 All @@ -21,5 +25,7 @@ python:
target_platform:
- linux-64
zip_keys:
- - c_stdlib_version
- cdt_name
- - python
- numpy
48 changes: 48 additions & 0 deletions .ci_support/migrations/numpy2.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
__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
60 changes: 28 additions & 32 deletions .ci_support/migrations/python312.yaml
Original file line number Diff line number Diff line change
@@ -1,40 +1,36 @@
migrator_ts: 1695046563
__migrator:
migration_number: 1
operation: key_add
primary_key: python
ordering:
python:
- 3.6.* *_cpython
- 3.7.* *_cpython
- 3.8.* *_cpython
- 3.9.* *_cpython
- 3.10.* *_cpython
- 3.11.* *_cpython
- 3.12.* *_cpython # new entry
- 3.6.* *_73_pypy
- 3.7.* *_73_pypy
- 3.8.* *_73_pypy
- 3.9.* *_73_pypy
paused: false
longterm: True
pr_limit: 60
max_solver_attempts: 3 # this will make the bot retry "not solvable" stuff 12 times
exclude:
# this shouldn't attempt to modify the python feedstocks
- python
- pypy3.6
- pypy-meta
- cross-python
- python_abi
exclude_pinned_pkgs: false
additional_zip_keys:
- channel_sources
migration_number: 1
operation: key_add
primary_key: python
ordering:
python:
- 3.6.* *_cpython
- 3.7.* *_cpython
- 3.8.* *_cpython
- 3.9.* *_cpython
- 3.10.* *_cpython
- 3.11.* *_cpython
- 3.12.* *_cpython # new entry
- 3.6.* *_73_pypy
- 3.7.* *_73_pypy
- 3.8.* *_73_pypy
- 3.9.* *_73_pypy
paused: false
longterm: True
pr_limit: 5
max_solver_attempts: 6 # this will make the bot retry "not solvable" stuff 6 times
exclude:
# this shouldn't attempt to modify the python feedstocks
- python
- pypy3.6
- pypy-meta
- cross-python
- python_abi
exclude_pinned_pkgs: false

python:
- 3.12.* *_cpython
channel_sources:
- conda-forge/label/python_rc,conda-forge
# additional entries to add for zip_keys
numpy:
- 1.26
Expand Down
8 changes: 7 additions & 1 deletion .ci_support/osx_64_numpy1.22python3.8.____cpython.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,11 @@
MACOSX_DEPLOYMENT_TARGET:
- '10.9'
- '10.13'
MACOSX_SDK_VERSION:
- '10.13'
c_stdlib:
- macosx_deployment_target
c_stdlib_version:
- '10.13'
channel_sources:
- conda-forge
channel_targets:
Expand Down
Loading

0 comments on commit 8f310a3

Please sign in to comment.