Skip to content

Commit d3eadff

Browse files
authored
Merge pull request #141 from dudoslav/db/sc-58590/numpy2
Update TileDB-VCF to 0.36.0
2 parents 4703e8f + bd18ae1 commit d3eadff

14 files changed

+172
-85
lines changed

.azure-pipelines/azure-pipelines-osx.yml

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.azure-pipelines/azure-pipelines-win.yml

+2-17
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.ci_support/linux_64_.yaml

+6-8
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
c_compiler:
22
- gcc
33
c_compiler_version:
4-
- '12'
4+
- '13'
55
c_stdlib:
66
- sysroot
77
c_stdlib_version:
@@ -15,15 +15,14 @@ channel_targets:
1515
cxx_compiler:
1616
- gxx
1717
cxx_compiler_version:
18-
- '12'
18+
- '13'
1919
docker_image:
2020
- quay.io/condaforge/linux-anvil-cos7-x86_64
2121
numpy:
22-
- '1.22'
23-
- '1.23'
24-
- '1.26'
25-
- '1.22'
26-
- '1.22'
22+
- '2.0'
23+
- '2.0'
24+
- '2.0'
25+
- '2.0'
2726
pin_run_as_build:
2827
python:
2928
min_pin: x.x
@@ -32,7 +31,6 @@ python:
3231
- 3.10.* *_cpython
3332
- 3.11.* *_cpython
3433
- 3.12.* *_cpython
35-
- 3.8.* *_cpython
3634
- 3.9.* *_cpython
3735
target_platform:
3836
- linux-64

.ci_support/migrations/numpy2.yaml

+47
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,47 @@
1+
__migrator:
2+
build_number: 1
3+
kind: version
4+
commit_message: |
5+
Rebuild for numpy 2.0
6+
7+
TL;DR: The way we build against numpy has changed as of numpy 2.0. This bot
8+
PR has updated the recipe to account for the changes (see below for details).
9+
10+
The biggest change is that we no longer need to use the oldest available numpy
11+
version at build time in order to support old numpy version at runtime - numpy
12+
will by default use a compatible ABI for the oldest still-supported numpy versions.
13+
14+
Additionally, we no longer need to use `{{ pin_compatible("numpy") }}` as a
15+
run requirement - this has been handled for more than two years now by a
16+
run-export on the numpy package itself. The migrator will therefore remove
17+
any occurrences of this.
18+
19+
However, by default, building against numpy 2.0 will assume that the package
20+
is compatible with numpy 2.0, which is not necessarily the case. You should
21+
check that the upstream package explicitly supports numpy 2.0, otherwise you
22+
need to add a `- numpy <2.0dev0` run requirement until that happens (check numpy
23+
issue 26191 for an overview of the most important packages).
24+
25+
### To-Dos:
26+
* [ ] Match run-requirements for numpy (i.e. check upstream `pyproject.toml` or however the project specifies numpy compatibility)
27+
* If upstream is not yet compatible with numpy 2.0, add `numpy <2.0dev0` upper bound under `run:`.
28+
* If upstream is already compatible with numpy 2.0, nothing else should be necessary in most cases.
29+
* If upstream requires a minimum numpy version newer than 1.19, you can add `numpy >=x.y` under `run:`.
30+
* [ ] Remove any remaining occurrences of `{{ pin_compatible("numpy") }}` that the bot may have missed.
31+
32+
PS. If the build does not compile anymore, this is almost certainly a sign that
33+
the upstream project is not yet ready for numpy 2.0; do not close this PR until
34+
a version compatible with numpy 2.0 has been released upstream and on this
35+
feedstock (in the meantime, you can keep the bot from reopening this PR in
36+
case of git conflicts by marking it as a draft).
37+
migration_number: 1
38+
39+
# needs to match length of zip {python, python_impl, numpy}
40+
# as it is in global CBC in order to override it
41+
numpy:
42+
- 1.22 # no py38 support for numpy 2.0
43+
- 2.0
44+
- 2.0
45+
- 2.0
46+
- 2.0
47+
migrator_ts: 1713572489.295986

.ci_support/osx_64_.yaml

+4-6
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,10 @@ cxx_compiler_version:
2121
macos_machine:
2222
- x86_64-apple-darwin13.4.0
2323
numpy:
24-
- '1.22'
25-
- '1.23'
26-
- '1.26'
27-
- '1.22'
28-
- '1.22'
24+
- '2.0'
25+
- '2.0'
26+
- '2.0'
27+
- '2.0'
2928
pin_run_as_build:
3029
python:
3130
min_pin: x.x
@@ -34,7 +33,6 @@ python:
3433
- 3.10.* *_cpython
3534
- 3.11.* *_cpython
3635
- 3.12.* *_cpython
37-
- 3.8.* *_cpython
3836
- 3.9.* *_cpython
3937
target_platform:
4038
- osx-64

.ci_support/osx_arm64_.yaml

+4-6
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,10 @@ cxx_compiler_version:
2121
macos_machine:
2222
- arm64-apple-darwin20.0.0
2323
numpy:
24-
- '1.22'
25-
- '1.23'
26-
- '1.26'
27-
- '1.22'
28-
- '1.22'
24+
- '2.0'
25+
- '2.0'
26+
- '2.0'
27+
- '2.0'
2928
pin_run_as_build:
3029
python:
3130
min_pin: x.x
@@ -34,7 +33,6 @@ python:
3433
- 3.10.* *_cpython
3534
- 3.11.* *_cpython
3635
- 3.12.* *_cpython
37-
- 3.8.* *_cpython
3836
- 3.9.* *_cpython
3937
target_platform:
4038
- osx-arm64

.ci_support/win_64_.yaml

+4-6
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,10 @@ channel_targets:
99
cxx_compiler:
1010
- vs2019
1111
numpy:
12-
- '1.22'
13-
- '1.23'
14-
- '1.26'
15-
- '1.22'
16-
- '1.22'
12+
- '2.0'
13+
- '2.0'
14+
- '2.0'
15+
- '2.0'
1716
pin_run_as_build:
1817
python:
1918
min_pin: x.x
@@ -22,7 +21,6 @@ python:
2221
- 3.10.* *_cpython
2322
- 3.11.* *_cpython
2423
- 3.12.* *_cpython
25-
- 3.8.* *_cpython
2624
- 3.9.* *_cpython
2725
target_platform:
2826
- win-64

.scripts/build_steps.sh

+9-7
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.scripts/run_osx_build.sh

+27-16
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.scripts/run_win_build.bat

+30-11
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)