From 60b4f598a285d71e33391919d0018f33d316f00a Mon Sep 17 00:00:00 2001 From: John Blischak Date: Thu, 12 Sep 2024 16:08:25 -0400 Subject: [PATCH 1/3] Bump to 0.32.0 --- recipe/meta.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 3fbef98b..a7d6fc76 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -1,6 +1,6 @@ {% set name = "tiledb" %} -{% set version = "0.31.1" %} -{% set sha256 = "7b9ddd32c4c7437111764645d8a042d603102a813c8b89addaf9a15bd40dd939" %} +{% set version = "0.32.0" %} +{% set sha256 = "15c30c4e1baf5104bd18b83ab884d7dd9ae03f4e2bf04193113313f0b9b92aac" %} package: name: tiledb-py @@ -34,7 +34,7 @@ requirements: - cython >=3.0 - numpy - pybind11 - - tiledb >=2.25.0,<2.26 + - tiledb >=2.26.0,<2.27 run: - python - {{ pin_compatible('numpy') }} From e33574c8a416ce61453cef50d663ca4900b86b39 Mon Sep 17 00:00:00 2001 From: John Blischak Date: Thu, 12 Sep 2024 16:09:46 -0400 Subject: [PATCH 2/3] MNT: Re-rendered with conda-build 24.5.1, conda-smithy 3.39.1, and conda-forge-pinning 2024.09.12.08.18.46 --- .azure-pipelines/azure-pipelines-linux.yml | 8 ---- .azure-pipelines/azure-pipelines-osx.yml | 6 --- .azure-pipelines/azure-pipelines-win.yml | 5 +-- ...ux_64_numpy1.22python3.10.____cpython.yaml | 4 +- ...nux_64_numpy1.22python3.8.____cpython.yaml | 36 ----------------- ...nux_64_numpy1.22python3.9.____cpython.yaml | 4 +- ...ux_64_numpy1.23python3.11.____cpython.yaml | 4 +- ...ux_64_numpy1.26python3.12.____cpython.yaml | 4 +- ...rch64_numpy1.22python3.10.____cpython.yaml | 4 +- ...arch64_numpy1.22python3.8.____cpython.yaml | 40 ------------------- ...arch64_numpy1.22python3.9.____cpython.yaml | 4 +- ...rch64_numpy1.23python3.11.____cpython.yaml | 4 +- ...rch64_numpy1.26python3.12.____cpython.yaml | 4 +- ...sx_64_numpy1.22python3.10.____cpython.yaml | 4 +- ...osx_64_numpy1.22python3.8.____cpython.yaml | 36 ----------------- ...osx_64_numpy1.22python3.9.____cpython.yaml | 4 +- ...sx_64_numpy1.23python3.11.____cpython.yaml | 4 +- ...sx_64_numpy1.26python3.12.____cpython.yaml | 4 +- ...arm64_numpy1.22python3.10.____cpython.yaml | 4 +- ..._arm64_numpy1.22python3.8.____cpython.yaml | 36 ----------------- ..._arm64_numpy1.22python3.9.____cpython.yaml | 4 +- ...arm64_numpy1.23python3.11.____cpython.yaml | 4 +- ...arm64_numpy1.26python3.12.____cpython.yaml | 4 +- ...in_64_numpy1.22python3.10.____cpython.yaml | 2 +- ...win_64_numpy1.22python3.8.____cpython.yaml | 26 ------------ ...win_64_numpy1.22python3.9.____cpython.yaml | 2 +- ...in_64_numpy1.23python3.11.____cpython.yaml | 2 +- ...in_64_numpy1.26python3.12.____cpython.yaml | 2 +- .scripts/run_osx_build.sh | 2 +- README.md | 35 ---------------- build-locally.py | 9 +++-- 31 files changed, 44 insertions(+), 267 deletions(-) delete mode 100644 .ci_support/linux_64_numpy1.22python3.8.____cpython.yaml delete mode 100644 .ci_support/linux_aarch64_numpy1.22python3.8.____cpython.yaml delete mode 100644 .ci_support/osx_64_numpy1.22python3.8.____cpython.yaml delete mode 100644 .ci_support/osx_arm64_numpy1.22python3.8.____cpython.yaml delete mode 100644 .ci_support/win_64_numpy1.22python3.8.____cpython.yaml diff --git a/.azure-pipelines/azure-pipelines-linux.yml b/.azure-pipelines/azure-pipelines-linux.yml index d854fc94..a2a28b62 100755 --- a/.azure-pipelines/azure-pipelines-linux.yml +++ b/.azure-pipelines/azure-pipelines-linux.yml @@ -12,10 +12,6 @@ jobs: CONFIG: linux_64_numpy1.22python3.10.____cpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_64_numpy1.22python3.8.____cpython: - CONFIG: linux_64_numpy1.22python3.8.____cpython - UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 linux_64_numpy1.22python3.9.____cpython: CONFIG: linux_64_numpy1.22python3.9.____cpython UPLOAD_PACKAGES: 'True' @@ -32,10 +28,6 @@ jobs: CONFIG: linux_aarch64_numpy1.22python3.10.____cpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_aarch64_numpy1.22python3.8.____cpython: - CONFIG: linux_aarch64_numpy1.22python3.8.____cpython - UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 linux_aarch64_numpy1.22python3.9.____cpython: CONFIG: linux_aarch64_numpy1.22python3.9.____cpython UPLOAD_PACKAGES: 'True' diff --git a/.azure-pipelines/azure-pipelines-osx.yml b/.azure-pipelines/azure-pipelines-osx.yml index d5e39500..820e7151 100755 --- a/.azure-pipelines/azure-pipelines-osx.yml +++ b/.azure-pipelines/azure-pipelines-osx.yml @@ -11,9 +11,6 @@ jobs: osx_64_numpy1.22python3.10.____cpython: CONFIG: osx_64_numpy1.22python3.10.____cpython UPLOAD_PACKAGES: 'True' - osx_64_numpy1.22python3.8.____cpython: - CONFIG: osx_64_numpy1.22python3.8.____cpython - UPLOAD_PACKAGES: 'True' osx_64_numpy1.22python3.9.____cpython: CONFIG: osx_64_numpy1.22python3.9.____cpython UPLOAD_PACKAGES: 'True' @@ -26,9 +23,6 @@ jobs: osx_arm64_numpy1.22python3.10.____cpython: CONFIG: osx_arm64_numpy1.22python3.10.____cpython UPLOAD_PACKAGES: 'True' - osx_arm64_numpy1.22python3.8.____cpython: - CONFIG: osx_arm64_numpy1.22python3.8.____cpython - UPLOAD_PACKAGES: 'True' osx_arm64_numpy1.22python3.9.____cpython: CONFIG: osx_arm64_numpy1.22python3.9.____cpython UPLOAD_PACKAGES: 'True' diff --git a/.azure-pipelines/azure-pipelines-win.yml b/.azure-pipelines/azure-pipelines-win.yml index ffb38f25..41bb8c85 100755 --- a/.azure-pipelines/azure-pipelines-win.yml +++ b/.azure-pipelines/azure-pipelines-win.yml @@ -11,9 +11,6 @@ jobs: win_64_numpy1.22python3.10.____cpython: CONFIG: win_64_numpy1.22python3.10.____cpython UPLOAD_PACKAGES: 'True' - win_64_numpy1.22python3.8.____cpython: - CONFIG: win_64_numpy1.22python3.8.____cpython - UPLOAD_PACKAGES: 'True' win_64_numpy1.22python3.9.____cpython: CONFIG: win_64_numpy1.22python3.9.____cpython UPLOAD_PACKAGES: 'True' @@ -36,7 +33,7 @@ jobs: scriptSource: inline script: | import urllib.request - url = 'https://github.com/conda-forge/miniforge/releases/latest/download/Mambaforge-Windows-x86_64.exe' + url = 'https://github.com/conda-forge/miniforge/releases/latest/download/Miniforge3-Windows-x86_64.exe' path = r"$(Build.ArtifactStagingDirectory)/Miniforge.exe" urllib.request.urlretrieve(url, path) diff --git a/.ci_support/linux_64_numpy1.22python3.10.____cpython.yaml b/.ci_support/linux_64_numpy1.22python3.10.____cpython.yaml index 8c3bf0ad..62631747 100644 --- a/.ci_support/linux_64_numpy1.22python3.10.____cpython.yaml +++ b/.ci_support/linux_64_numpy1.22python3.10.____cpython.yaml @@ -11,7 +11,7 @@ channel_targets: cxx_compiler: - gxx cxx_compiler_version: -- '12' +- '13' docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 numpy: @@ -27,7 +27,7 @@ python_impl: target_platform: - linux-64 tiledb: -- '2.24' +- '2.25' zip_keys: - - c_stdlib_version - cdt_name diff --git a/.ci_support/linux_64_numpy1.22python3.8.____cpython.yaml b/.ci_support/linux_64_numpy1.22python3.8.____cpython.yaml deleted file mode 100644 index 3d6cae5e..00000000 --- a/.ci_support/linux_64_numpy1.22python3.8.____cpython.yaml +++ /dev/null @@ -1,36 +0,0 @@ -c_stdlib: -- sysroot -c_stdlib_version: -- '2.17' -cdt_name: -- cos7 -channel_sources: -- conda-forge -channel_targets: -- conda-forge main -cxx_compiler: -- gxx -cxx_compiler_version: -- '12' -docker_image: -- quay.io/condaforge/linux-anvil-cos7-x86_64 -numpy: -- '1.22' -pin_run_as_build: - python: - min_pin: x.x - max_pin: x.x -python: -- 3.8.* *_cpython -python_impl: -- cpython -target_platform: -- linux-64 -tiledb: -- '2.24' -zip_keys: -- - c_stdlib_version - - cdt_name -- - python - - numpy - - python_impl diff --git a/.ci_support/linux_64_numpy1.22python3.9.____cpython.yaml b/.ci_support/linux_64_numpy1.22python3.9.____cpython.yaml index 438720af..f082fe06 100644 --- a/.ci_support/linux_64_numpy1.22python3.9.____cpython.yaml +++ b/.ci_support/linux_64_numpy1.22python3.9.____cpython.yaml @@ -11,7 +11,7 @@ channel_targets: cxx_compiler: - gxx cxx_compiler_version: -- '12' +- '13' docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 numpy: @@ -27,7 +27,7 @@ python_impl: target_platform: - linux-64 tiledb: -- '2.24' +- '2.25' zip_keys: - - c_stdlib_version - cdt_name diff --git a/.ci_support/linux_64_numpy1.23python3.11.____cpython.yaml b/.ci_support/linux_64_numpy1.23python3.11.____cpython.yaml index 5d0daa9c..4e4b55c1 100644 --- a/.ci_support/linux_64_numpy1.23python3.11.____cpython.yaml +++ b/.ci_support/linux_64_numpy1.23python3.11.____cpython.yaml @@ -11,7 +11,7 @@ channel_targets: cxx_compiler: - gxx cxx_compiler_version: -- '12' +- '13' docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 numpy: @@ -27,7 +27,7 @@ python_impl: target_platform: - linux-64 tiledb: -- '2.24' +- '2.25' zip_keys: - - c_stdlib_version - cdt_name diff --git a/.ci_support/linux_64_numpy1.26python3.12.____cpython.yaml b/.ci_support/linux_64_numpy1.26python3.12.____cpython.yaml index 6df815b7..306fd39a 100644 --- a/.ci_support/linux_64_numpy1.26python3.12.____cpython.yaml +++ b/.ci_support/linux_64_numpy1.26python3.12.____cpython.yaml @@ -11,7 +11,7 @@ channel_targets: cxx_compiler: - gxx cxx_compiler_version: -- '12' +- '13' docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 numpy: @@ -27,7 +27,7 @@ python_impl: target_platform: - linux-64 tiledb: -- '2.24' +- '2.25' zip_keys: - - c_stdlib_version - cdt_name diff --git a/.ci_support/linux_aarch64_numpy1.22python3.10.____cpython.yaml b/.ci_support/linux_aarch64_numpy1.22python3.10.____cpython.yaml index 8b07dae5..bf50f5de 100644 --- a/.ci_support/linux_aarch64_numpy1.22python3.10.____cpython.yaml +++ b/.ci_support/linux_aarch64_numpy1.22python3.10.____cpython.yaml @@ -15,7 +15,7 @@ channel_targets: cxx_compiler: - gxx cxx_compiler_version: -- '12' +- '13' docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 numpy: @@ -31,7 +31,7 @@ python_impl: target_platform: - linux-aarch64 tiledb: -- '2.24' +- '2.25' zip_keys: - - c_stdlib_version - cdt_name diff --git a/.ci_support/linux_aarch64_numpy1.22python3.8.____cpython.yaml b/.ci_support/linux_aarch64_numpy1.22python3.8.____cpython.yaml deleted file mode 100644 index aab7f9e6..00000000 --- a/.ci_support/linux_aarch64_numpy1.22python3.8.____cpython.yaml +++ /dev/null @@ -1,40 +0,0 @@ -BUILD: -- aarch64-conda_cos7-linux-gnu -c_stdlib: -- sysroot -c_stdlib_version: -- '2.17' -cdt_arch: -- aarch64 -cdt_name: -- cos7 -channel_sources: -- conda-forge -channel_targets: -- conda-forge main -cxx_compiler: -- gxx -cxx_compiler_version: -- '12' -docker_image: -- quay.io/condaforge/linux-anvil-cos7-x86_64 -numpy: -- '1.22' -pin_run_as_build: - python: - min_pin: x.x - max_pin: x.x -python: -- 3.8.* *_cpython -python_impl: -- cpython -target_platform: -- linux-aarch64 -tiledb: -- '2.24' -zip_keys: -- - c_stdlib_version - - cdt_name -- - python - - numpy - - python_impl diff --git a/.ci_support/linux_aarch64_numpy1.22python3.9.____cpython.yaml b/.ci_support/linux_aarch64_numpy1.22python3.9.____cpython.yaml index d866600c..3aa50dcd 100644 --- a/.ci_support/linux_aarch64_numpy1.22python3.9.____cpython.yaml +++ b/.ci_support/linux_aarch64_numpy1.22python3.9.____cpython.yaml @@ -15,7 +15,7 @@ channel_targets: cxx_compiler: - gxx cxx_compiler_version: -- '12' +- '13' docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 numpy: @@ -31,7 +31,7 @@ python_impl: target_platform: - linux-aarch64 tiledb: -- '2.24' +- '2.25' zip_keys: - - c_stdlib_version - cdt_name diff --git a/.ci_support/linux_aarch64_numpy1.23python3.11.____cpython.yaml b/.ci_support/linux_aarch64_numpy1.23python3.11.____cpython.yaml index 99d99822..30ab0aa0 100644 --- a/.ci_support/linux_aarch64_numpy1.23python3.11.____cpython.yaml +++ b/.ci_support/linux_aarch64_numpy1.23python3.11.____cpython.yaml @@ -15,7 +15,7 @@ channel_targets: cxx_compiler: - gxx cxx_compiler_version: -- '12' +- '13' docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 numpy: @@ -31,7 +31,7 @@ python_impl: target_platform: - linux-aarch64 tiledb: -- '2.24' +- '2.25' zip_keys: - - c_stdlib_version - cdt_name diff --git a/.ci_support/linux_aarch64_numpy1.26python3.12.____cpython.yaml b/.ci_support/linux_aarch64_numpy1.26python3.12.____cpython.yaml index 149fb03d..dabf7c89 100644 --- a/.ci_support/linux_aarch64_numpy1.26python3.12.____cpython.yaml +++ b/.ci_support/linux_aarch64_numpy1.26python3.12.____cpython.yaml @@ -15,7 +15,7 @@ channel_targets: cxx_compiler: - gxx cxx_compiler_version: -- '12' +- '13' docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 numpy: @@ -31,7 +31,7 @@ python_impl: target_platform: - linux-aarch64 tiledb: -- '2.24' +- '2.25' zip_keys: - - c_stdlib_version - cdt_name diff --git a/.ci_support/osx_64_numpy1.22python3.10.____cpython.yaml b/.ci_support/osx_64_numpy1.22python3.10.____cpython.yaml index d945e817..cd5e833b 100644 --- a/.ci_support/osx_64_numpy1.22python3.10.____cpython.yaml +++ b/.ci_support/osx_64_numpy1.22python3.10.____cpython.yaml @@ -13,7 +13,7 @@ channel_targets: cxx_compiler: - clangxx cxx_compiler_version: -- '16' +- '17' macos_machine: - x86_64-apple-darwin13.4.0 numpy: @@ -29,7 +29,7 @@ python_impl: target_platform: - osx-64 tiledb: -- '2.24' +- '2.25' zip_keys: - - python - numpy diff --git a/.ci_support/osx_64_numpy1.22python3.8.____cpython.yaml b/.ci_support/osx_64_numpy1.22python3.8.____cpython.yaml deleted file mode 100644 index 4e77a68f..00000000 --- a/.ci_support/osx_64_numpy1.22python3.8.____cpython.yaml +++ /dev/null @@ -1,36 +0,0 @@ -MACOSX_DEPLOYMENT_TARGET: -- '10.14' -MACOSX_SDK_VERSION: -- '10.14' -c_stdlib: -- macosx_deployment_target -c_stdlib_version: -- '10.14' -channel_sources: -- conda-forge -channel_targets: -- conda-forge main -cxx_compiler: -- clangxx -cxx_compiler_version: -- '16' -macos_machine: -- x86_64-apple-darwin13.4.0 -numpy: -- '1.22' -pin_run_as_build: - python: - min_pin: x.x - max_pin: x.x -python: -- 3.8.* *_cpython -python_impl: -- cpython -target_platform: -- osx-64 -tiledb: -- '2.24' -zip_keys: -- - python - - numpy - - python_impl diff --git a/.ci_support/osx_64_numpy1.22python3.9.____cpython.yaml b/.ci_support/osx_64_numpy1.22python3.9.____cpython.yaml index db8849b2..d0a97c6b 100644 --- a/.ci_support/osx_64_numpy1.22python3.9.____cpython.yaml +++ b/.ci_support/osx_64_numpy1.22python3.9.____cpython.yaml @@ -13,7 +13,7 @@ channel_targets: cxx_compiler: - clangxx cxx_compiler_version: -- '16' +- '17' macos_machine: - x86_64-apple-darwin13.4.0 numpy: @@ -29,7 +29,7 @@ python_impl: target_platform: - osx-64 tiledb: -- '2.24' +- '2.25' zip_keys: - - python - numpy diff --git a/.ci_support/osx_64_numpy1.23python3.11.____cpython.yaml b/.ci_support/osx_64_numpy1.23python3.11.____cpython.yaml index fbd911d5..5caaa432 100644 --- a/.ci_support/osx_64_numpy1.23python3.11.____cpython.yaml +++ b/.ci_support/osx_64_numpy1.23python3.11.____cpython.yaml @@ -13,7 +13,7 @@ channel_targets: cxx_compiler: - clangxx cxx_compiler_version: -- '16' +- '17' macos_machine: - x86_64-apple-darwin13.4.0 numpy: @@ -29,7 +29,7 @@ python_impl: target_platform: - osx-64 tiledb: -- '2.24' +- '2.25' zip_keys: - - python - numpy diff --git a/.ci_support/osx_64_numpy1.26python3.12.____cpython.yaml b/.ci_support/osx_64_numpy1.26python3.12.____cpython.yaml index d8b2f8a6..4e3cbb6d 100644 --- a/.ci_support/osx_64_numpy1.26python3.12.____cpython.yaml +++ b/.ci_support/osx_64_numpy1.26python3.12.____cpython.yaml @@ -13,7 +13,7 @@ channel_targets: cxx_compiler: - clangxx cxx_compiler_version: -- '16' +- '17' macos_machine: - x86_64-apple-darwin13.4.0 numpy: @@ -29,7 +29,7 @@ python_impl: target_platform: - osx-64 tiledb: -- '2.24' +- '2.25' zip_keys: - - python - numpy diff --git a/.ci_support/osx_arm64_numpy1.22python3.10.____cpython.yaml b/.ci_support/osx_arm64_numpy1.22python3.10.____cpython.yaml index 5c0a8aee..30e4c9f3 100644 --- a/.ci_support/osx_arm64_numpy1.22python3.10.____cpython.yaml +++ b/.ci_support/osx_arm64_numpy1.22python3.10.____cpython.yaml @@ -13,7 +13,7 @@ channel_targets: cxx_compiler: - clangxx cxx_compiler_version: -- '16' +- '17' macos_machine: - arm64-apple-darwin20.0.0 numpy: @@ -29,7 +29,7 @@ python_impl: target_platform: - osx-arm64 tiledb: -- '2.24' +- '2.25' zip_keys: - - python - numpy diff --git a/.ci_support/osx_arm64_numpy1.22python3.8.____cpython.yaml b/.ci_support/osx_arm64_numpy1.22python3.8.____cpython.yaml deleted file mode 100644 index 6045f607..00000000 --- a/.ci_support/osx_arm64_numpy1.22python3.8.____cpython.yaml +++ /dev/null @@ -1,36 +0,0 @@ -MACOSX_DEPLOYMENT_TARGET: -- '11.0' -MACOSX_SDK_VERSION: -- '11.0' -c_stdlib: -- macosx_deployment_target -c_stdlib_version: -- '11.0' -channel_sources: -- conda-forge -channel_targets: -- conda-forge main -cxx_compiler: -- clangxx -cxx_compiler_version: -- '16' -macos_machine: -- arm64-apple-darwin20.0.0 -numpy: -- '1.22' -pin_run_as_build: - python: - min_pin: x.x - max_pin: x.x -python: -- 3.8.* *_cpython -python_impl: -- cpython -target_platform: -- osx-arm64 -tiledb: -- '2.24' -zip_keys: -- - python - - numpy - - python_impl diff --git a/.ci_support/osx_arm64_numpy1.22python3.9.____cpython.yaml b/.ci_support/osx_arm64_numpy1.22python3.9.____cpython.yaml index 512f850c..8261cb84 100644 --- a/.ci_support/osx_arm64_numpy1.22python3.9.____cpython.yaml +++ b/.ci_support/osx_arm64_numpy1.22python3.9.____cpython.yaml @@ -13,7 +13,7 @@ channel_targets: cxx_compiler: - clangxx cxx_compiler_version: -- '16' +- '17' macos_machine: - arm64-apple-darwin20.0.0 numpy: @@ -29,7 +29,7 @@ python_impl: target_platform: - osx-arm64 tiledb: -- '2.24' +- '2.25' zip_keys: - - python - numpy diff --git a/.ci_support/osx_arm64_numpy1.23python3.11.____cpython.yaml b/.ci_support/osx_arm64_numpy1.23python3.11.____cpython.yaml index 370edd1d..49447c25 100644 --- a/.ci_support/osx_arm64_numpy1.23python3.11.____cpython.yaml +++ b/.ci_support/osx_arm64_numpy1.23python3.11.____cpython.yaml @@ -13,7 +13,7 @@ channel_targets: cxx_compiler: - clangxx cxx_compiler_version: -- '16' +- '17' macos_machine: - arm64-apple-darwin20.0.0 numpy: @@ -29,7 +29,7 @@ python_impl: target_platform: - osx-arm64 tiledb: -- '2.24' +- '2.25' zip_keys: - - python - numpy diff --git a/.ci_support/osx_arm64_numpy1.26python3.12.____cpython.yaml b/.ci_support/osx_arm64_numpy1.26python3.12.____cpython.yaml index 5bdf0ac7..ed3060e0 100644 --- a/.ci_support/osx_arm64_numpy1.26python3.12.____cpython.yaml +++ b/.ci_support/osx_arm64_numpy1.26python3.12.____cpython.yaml @@ -13,7 +13,7 @@ channel_targets: cxx_compiler: - clangxx cxx_compiler_version: -- '16' +- '17' macos_machine: - arm64-apple-darwin20.0.0 numpy: @@ -29,7 +29,7 @@ python_impl: target_platform: - osx-arm64 tiledb: -- '2.24' +- '2.25' zip_keys: - - python - numpy diff --git a/.ci_support/win_64_numpy1.22python3.10.____cpython.yaml b/.ci_support/win_64_numpy1.22python3.10.____cpython.yaml index e15cb71e..cc922738 100644 --- a/.ci_support/win_64_numpy1.22python3.10.____cpython.yaml +++ b/.ci_support/win_64_numpy1.22python3.10.____cpython.yaml @@ -19,7 +19,7 @@ python_impl: target_platform: - win-64 tiledb: -- '2.24' +- '2.25' zip_keys: - - python - numpy diff --git a/.ci_support/win_64_numpy1.22python3.8.____cpython.yaml b/.ci_support/win_64_numpy1.22python3.8.____cpython.yaml deleted file mode 100644 index d7ea1f65..00000000 --- a/.ci_support/win_64_numpy1.22python3.8.____cpython.yaml +++ /dev/null @@ -1,26 +0,0 @@ -c_stdlib: -- vs -channel_sources: -- conda-forge -channel_targets: -- conda-forge main -cxx_compiler: -- vs2019 -numpy: -- '1.22' -pin_run_as_build: - python: - min_pin: x.x - max_pin: x.x -python: -- 3.8.* *_cpython -python_impl: -- cpython -target_platform: -- win-64 -tiledb: -- '2.24' -zip_keys: -- - python - - numpy - - python_impl diff --git a/.ci_support/win_64_numpy1.22python3.9.____cpython.yaml b/.ci_support/win_64_numpy1.22python3.9.____cpython.yaml index 336733ff..0a32647f 100644 --- a/.ci_support/win_64_numpy1.22python3.9.____cpython.yaml +++ b/.ci_support/win_64_numpy1.22python3.9.____cpython.yaml @@ -19,7 +19,7 @@ python_impl: target_platform: - win-64 tiledb: -- '2.24' +- '2.25' zip_keys: - - python - numpy diff --git a/.ci_support/win_64_numpy1.23python3.11.____cpython.yaml b/.ci_support/win_64_numpy1.23python3.11.____cpython.yaml index 6a3d22e1..7e335972 100644 --- a/.ci_support/win_64_numpy1.23python3.11.____cpython.yaml +++ b/.ci_support/win_64_numpy1.23python3.11.____cpython.yaml @@ -19,7 +19,7 @@ python_impl: target_platform: - win-64 tiledb: -- '2.24' +- '2.25' zip_keys: - - python - numpy diff --git a/.ci_support/win_64_numpy1.26python3.12.____cpython.yaml b/.ci_support/win_64_numpy1.26python3.12.____cpython.yaml index 8e255842..6d530836 100644 --- a/.ci_support/win_64_numpy1.26python3.12.____cpython.yaml +++ b/.ci_support/win_64_numpy1.26python3.12.____cpython.yaml @@ -19,7 +19,7 @@ python_impl: target_platform: - win-64 tiledb: -- '2.24' +- '2.25' zip_keys: - - python - numpy diff --git a/.scripts/run_osx_build.sh b/.scripts/run_osx_build.sh index ba0c8791..420f051c 100755 --- a/.scripts/run_osx_build.sh +++ b/.scripts/run_osx_build.sh @@ -11,7 +11,7 @@ MINIFORGE_HOME=${MINIFORGE_HOME:-${HOME}/miniforge3} ( startgroup "Installing a fresh version of Miniforge" ) 2> /dev/null MINIFORGE_URL="https://github.com/conda-forge/miniforge/releases/latest/download" -MINIFORGE_FILE="Mambaforge-MacOSX-$(uname -m).sh" +MINIFORGE_FILE="Miniforge3-MacOSX-$(uname -m).sh" curl -L -O "${MINIFORGE_URL}/${MINIFORGE_FILE}" rm -rf ${MINIFORGE_HOME} bash $MINIFORGE_FILE -b -p ${MINIFORGE_HOME} diff --git a/README.md b/README.md index 2a05296f..e7c31404 100644 --- a/README.md +++ b/README.md @@ -44,13 +44,6 @@ Current build status variant - - linux_64_numpy1.22python3.8.____cpython - - - variant - - linux_64_numpy1.22python3.9.____cpython @@ -79,13 +72,6 @@ Current build status variant - - linux_aarch64_numpy1.22python3.8.____cpython - - - variant - - linux_aarch64_numpy1.22python3.9.____cpython @@ -114,13 +100,6 @@ Current build status variant - - osx_64_numpy1.22python3.8.____cpython - - - variant - - osx_64_numpy1.22python3.9.____cpython @@ -149,13 +128,6 @@ Current build status variant - - osx_arm64_numpy1.22python3.8.____cpython - - - variant - - osx_arm64_numpy1.22python3.9.____cpython @@ -184,13 +156,6 @@ Current build status variant - - win_64_numpy1.22python3.8.____cpython - - - variant - - win_64_numpy1.22python3.9.____cpython diff --git a/build-locally.py b/build-locally.py index e0d408d0..8ac9b846 100755 --- a/build-locally.py +++ b/build-locally.py @@ -1,13 +1,16 @@ -#!/usr/bin/env python3 +#!/bin/sh +"""exec' "python3" "$0" "$@" #""" # fmt: off # fmt: on # # This file has been generated by conda-smithy in order to build the recipe # locally. # -import os +# The line above this comment is a bash / sh / zsh guard +# to stop people from running it with the wrong interpreter import glob +import os +import platform import subprocess from argparse import ArgumentParser -import platform def setup_environment(ns): From 6ec7aea911a63e9d41d6855e91c7c2ff2bbbecfc Mon Sep 17 00:00:00 2001 From: John Blischak Date: Thu, 12 Sep 2024 16:41:41 -0400 Subject: [PATCH 3/3] Manually migrate to numpy 2 during 0.32.0 update --- .azure-pipelines/azure-pipelines-linux.yml | 32 ++++---- .azure-pipelines/azure-pipelines-osx.yml | 32 ++++---- .azure-pipelines/azure-pipelines-win.yml | 16 ++-- ...l => linux_64_python3.10.____cpython.yaml} | 2 +- ...l => linux_64_python3.11.____cpython.yaml} | 2 +- ...l => linux_64_python3.12.____cpython.yaml} | 2 +- ...ml => linux_64_python3.9.____cpython.yaml} | 2 +- ...linux_aarch64_python3.10.____cpython.yaml} | 2 +- ...linux_aarch64_python3.11.____cpython.yaml} | 2 +- ...linux_aarch64_python3.12.____cpython.yaml} | 2 +- ... linux_aarch64_python3.9.____cpython.yaml} | 2 +- .ci_support/migrations/numpy2.yaml | 47 +++++++++++ ...aml => osx_64_python3.10.____cpython.yaml} | 2 +- ...aml => osx_64_python3.11.____cpython.yaml} | 2 +- ...aml => osx_64_python3.12.____cpython.yaml} | 2 +- ...yaml => osx_64_python3.9.____cpython.yaml} | 2 +- ... => osx_arm64_python3.10.____cpython.yaml} | 2 +- ... => osx_arm64_python3.11.____cpython.yaml} | 2 +- ... => osx_arm64_python3.12.____cpython.yaml} | 2 +- ...l => osx_arm64_python3.9.____cpython.yaml} | 2 +- ...aml => win_64_python3.10.____cpython.yaml} | 2 +- ...aml => win_64_python3.11.____cpython.yaml} | 2 +- ...aml => win_64_python3.12.____cpython.yaml} | 2 +- ...yaml => win_64_python3.9.____cpython.yaml} | 2 +- README.md | 80 +++++++++---------- recipe/meta.yaml | 1 - 26 files changed, 147 insertions(+), 101 deletions(-) rename .ci_support/{linux_64_numpy1.22python3.10.____cpython.yaml => linux_64_python3.10.____cpython.yaml} (98%) rename .ci_support/{linux_64_numpy1.23python3.11.____cpython.yaml => linux_64_python3.11.____cpython.yaml} (98%) rename .ci_support/{linux_64_numpy1.26python3.12.____cpython.yaml => linux_64_python3.12.____cpython.yaml} (98%) rename .ci_support/{linux_64_numpy1.22python3.9.____cpython.yaml => linux_64_python3.9.____cpython.yaml} (98%) rename .ci_support/{linux_aarch64_numpy1.22python3.10.____cpython.yaml => linux_aarch64_python3.10.____cpython.yaml} (98%) rename .ci_support/{linux_aarch64_numpy1.23python3.11.____cpython.yaml => linux_aarch64_python3.11.____cpython.yaml} (98%) rename .ci_support/{linux_aarch64_numpy1.26python3.12.____cpython.yaml => linux_aarch64_python3.12.____cpython.yaml} (98%) rename .ci_support/{linux_aarch64_numpy1.22python3.9.____cpython.yaml => linux_aarch64_python3.9.____cpython.yaml} (98%) create mode 100644 .ci_support/migrations/numpy2.yaml rename .ci_support/{osx_64_numpy1.22python3.10.____cpython.yaml => osx_64_python3.10.____cpython.yaml} (98%) rename .ci_support/{osx_64_numpy1.23python3.11.____cpython.yaml => osx_64_python3.11.____cpython.yaml} (98%) rename .ci_support/{osx_64_numpy1.26python3.12.____cpython.yaml => osx_64_python3.12.____cpython.yaml} (98%) rename .ci_support/{osx_64_numpy1.22python3.9.____cpython.yaml => osx_64_python3.9.____cpython.yaml} (98%) rename .ci_support/{osx_arm64_numpy1.22python3.10.____cpython.yaml => osx_arm64_python3.10.____cpython.yaml} (98%) rename .ci_support/{osx_arm64_numpy1.23python3.11.____cpython.yaml => osx_arm64_python3.11.____cpython.yaml} (98%) rename .ci_support/{osx_arm64_numpy1.26python3.12.____cpython.yaml => osx_arm64_python3.12.____cpython.yaml} (98%) rename .ci_support/{osx_arm64_numpy1.22python3.9.____cpython.yaml => osx_arm64_python3.9.____cpython.yaml} (98%) rename .ci_support/{win_64_numpy1.22python3.10.____cpython.yaml => win_64_python3.10.____cpython.yaml} (97%) rename .ci_support/{win_64_numpy1.23python3.11.____cpython.yaml => win_64_python3.11.____cpython.yaml} (97%) rename .ci_support/{win_64_numpy1.26python3.12.____cpython.yaml => win_64_python3.12.____cpython.yaml} (97%) rename .ci_support/{win_64_numpy1.22python3.9.____cpython.yaml => win_64_python3.9.____cpython.yaml} (97%) diff --git a/.azure-pipelines/azure-pipelines-linux.yml b/.azure-pipelines/azure-pipelines-linux.yml index a2a28b62..f58b7d60 100755 --- a/.azure-pipelines/azure-pipelines-linux.yml +++ b/.azure-pipelines/azure-pipelines-linux.yml @@ -8,36 +8,36 @@ jobs: vmImage: ubuntu-latest strategy: matrix: - linux_64_numpy1.22python3.10.____cpython: - CONFIG: linux_64_numpy1.22python3.10.____cpython + linux_64_python3.10.____cpython: + CONFIG: linux_64_python3.10.____cpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_64_numpy1.22python3.9.____cpython: - CONFIG: linux_64_numpy1.22python3.9.____cpython + linux_64_python3.11.____cpython: + CONFIG: linux_64_python3.11.____cpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_64_numpy1.23python3.11.____cpython: - CONFIG: linux_64_numpy1.23python3.11.____cpython + linux_64_python3.12.____cpython: + CONFIG: linux_64_python3.12.____cpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_64_numpy1.26python3.12.____cpython: - CONFIG: linux_64_numpy1.26python3.12.____cpython + linux_64_python3.9.____cpython: + CONFIG: linux_64_python3.9.____cpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_aarch64_numpy1.22python3.10.____cpython: - CONFIG: linux_aarch64_numpy1.22python3.10.____cpython + linux_aarch64_python3.10.____cpython: + CONFIG: linux_aarch64_python3.10.____cpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_aarch64_numpy1.22python3.9.____cpython: - CONFIG: linux_aarch64_numpy1.22python3.9.____cpython + linux_aarch64_python3.11.____cpython: + CONFIG: linux_aarch64_python3.11.____cpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_aarch64_numpy1.23python3.11.____cpython: - CONFIG: linux_aarch64_numpy1.23python3.11.____cpython + linux_aarch64_python3.12.____cpython: + CONFIG: linux_aarch64_python3.12.____cpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_aarch64_numpy1.26python3.12.____cpython: - CONFIG: linux_aarch64_numpy1.26python3.12.____cpython + linux_aarch64_python3.9.____cpython: + CONFIG: linux_aarch64_python3.9.____cpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 timeoutInMinutes: 360 diff --git a/.azure-pipelines/azure-pipelines-osx.yml b/.azure-pipelines/azure-pipelines-osx.yml index 820e7151..49fe09ae 100755 --- a/.azure-pipelines/azure-pipelines-osx.yml +++ b/.azure-pipelines/azure-pipelines-osx.yml @@ -8,29 +8,29 @@ jobs: vmImage: macOS-12 strategy: matrix: - osx_64_numpy1.22python3.10.____cpython: - CONFIG: osx_64_numpy1.22python3.10.____cpython + osx_64_python3.10.____cpython: + CONFIG: osx_64_python3.10.____cpython UPLOAD_PACKAGES: 'True' - osx_64_numpy1.22python3.9.____cpython: - CONFIG: osx_64_numpy1.22python3.9.____cpython + osx_64_python3.11.____cpython: + CONFIG: osx_64_python3.11.____cpython UPLOAD_PACKAGES: 'True' - osx_64_numpy1.23python3.11.____cpython: - CONFIG: osx_64_numpy1.23python3.11.____cpython + osx_64_python3.12.____cpython: + CONFIG: osx_64_python3.12.____cpython UPLOAD_PACKAGES: 'True' - osx_64_numpy1.26python3.12.____cpython: - CONFIG: osx_64_numpy1.26python3.12.____cpython + osx_64_python3.9.____cpython: + CONFIG: osx_64_python3.9.____cpython UPLOAD_PACKAGES: 'True' - osx_arm64_numpy1.22python3.10.____cpython: - CONFIG: osx_arm64_numpy1.22python3.10.____cpython + osx_arm64_python3.10.____cpython: + CONFIG: osx_arm64_python3.10.____cpython UPLOAD_PACKAGES: 'True' - osx_arm64_numpy1.22python3.9.____cpython: - CONFIG: osx_arm64_numpy1.22python3.9.____cpython + osx_arm64_python3.11.____cpython: + CONFIG: osx_arm64_python3.11.____cpython UPLOAD_PACKAGES: 'True' - osx_arm64_numpy1.23python3.11.____cpython: - CONFIG: osx_arm64_numpy1.23python3.11.____cpython + osx_arm64_python3.12.____cpython: + CONFIG: osx_arm64_python3.12.____cpython UPLOAD_PACKAGES: 'True' - osx_arm64_numpy1.26python3.12.____cpython: - CONFIG: osx_arm64_numpy1.26python3.12.____cpython + osx_arm64_python3.9.____cpython: + CONFIG: osx_arm64_python3.9.____cpython UPLOAD_PACKAGES: 'True' timeoutInMinutes: 360 variables: {} diff --git a/.azure-pipelines/azure-pipelines-win.yml b/.azure-pipelines/azure-pipelines-win.yml index 41bb8c85..fa9734f3 100755 --- a/.azure-pipelines/azure-pipelines-win.yml +++ b/.azure-pipelines/azure-pipelines-win.yml @@ -8,17 +8,17 @@ jobs: vmImage: windows-2022 strategy: matrix: - win_64_numpy1.22python3.10.____cpython: - CONFIG: win_64_numpy1.22python3.10.____cpython + win_64_python3.10.____cpython: + CONFIG: win_64_python3.10.____cpython UPLOAD_PACKAGES: 'True' - win_64_numpy1.22python3.9.____cpython: - CONFIG: win_64_numpy1.22python3.9.____cpython + win_64_python3.11.____cpython: + CONFIG: win_64_python3.11.____cpython UPLOAD_PACKAGES: 'True' - win_64_numpy1.23python3.11.____cpython: - CONFIG: win_64_numpy1.23python3.11.____cpython + win_64_python3.12.____cpython: + CONFIG: win_64_python3.12.____cpython UPLOAD_PACKAGES: 'True' - win_64_numpy1.26python3.12.____cpython: - CONFIG: win_64_numpy1.26python3.12.____cpython + win_64_python3.9.____cpython: + CONFIG: win_64_python3.9.____cpython UPLOAD_PACKAGES: 'True' timeoutInMinutes: 360 variables: diff --git a/.ci_support/linux_64_numpy1.22python3.10.____cpython.yaml b/.ci_support/linux_64_python3.10.____cpython.yaml similarity index 98% rename from .ci_support/linux_64_numpy1.22python3.10.____cpython.yaml rename to .ci_support/linux_64_python3.10.____cpython.yaml index 62631747..c8441f34 100644 --- a/.ci_support/linux_64_numpy1.22python3.10.____cpython.yaml +++ b/.ci_support/linux_64_python3.10.____cpython.yaml @@ -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 diff --git a/.ci_support/linux_64_numpy1.23python3.11.____cpython.yaml b/.ci_support/linux_64_python3.11.____cpython.yaml similarity index 98% rename from .ci_support/linux_64_numpy1.23python3.11.____cpython.yaml rename to .ci_support/linux_64_python3.11.____cpython.yaml index 4e4b55c1..cd3573c7 100644 --- a/.ci_support/linux_64_numpy1.23python3.11.____cpython.yaml +++ b/.ci_support/linux_64_python3.11.____cpython.yaml @@ -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 diff --git a/.ci_support/linux_64_numpy1.26python3.12.____cpython.yaml b/.ci_support/linux_64_python3.12.____cpython.yaml similarity index 98% rename from .ci_support/linux_64_numpy1.26python3.12.____cpython.yaml rename to .ci_support/linux_64_python3.12.____cpython.yaml index 306fd39a..ced0fe04 100644 --- a/.ci_support/linux_64_numpy1.26python3.12.____cpython.yaml +++ b/.ci_support/linux_64_python3.12.____cpython.yaml @@ -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 diff --git a/.ci_support/linux_64_numpy1.22python3.9.____cpython.yaml b/.ci_support/linux_64_python3.9.____cpython.yaml similarity index 98% rename from .ci_support/linux_64_numpy1.22python3.9.____cpython.yaml rename to .ci_support/linux_64_python3.9.____cpython.yaml index f082fe06..45c390d4 100644 --- a/.ci_support/linux_64_numpy1.22python3.9.____cpython.yaml +++ b/.ci_support/linux_64_python3.9.____cpython.yaml @@ -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 diff --git a/.ci_support/linux_aarch64_numpy1.22python3.10.____cpython.yaml b/.ci_support/linux_aarch64_python3.10.____cpython.yaml similarity index 98% rename from .ci_support/linux_aarch64_numpy1.22python3.10.____cpython.yaml rename to .ci_support/linux_aarch64_python3.10.____cpython.yaml index bf50f5de..9a684823 100644 --- a/.ci_support/linux_aarch64_numpy1.22python3.10.____cpython.yaml +++ b/.ci_support/linux_aarch64_python3.10.____cpython.yaml @@ -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 diff --git a/.ci_support/linux_aarch64_numpy1.23python3.11.____cpython.yaml b/.ci_support/linux_aarch64_python3.11.____cpython.yaml similarity index 98% rename from .ci_support/linux_aarch64_numpy1.23python3.11.____cpython.yaml rename to .ci_support/linux_aarch64_python3.11.____cpython.yaml index 30ab0aa0..80962cf7 100644 --- a/.ci_support/linux_aarch64_numpy1.23python3.11.____cpython.yaml +++ b/.ci_support/linux_aarch64_python3.11.____cpython.yaml @@ -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 diff --git a/.ci_support/linux_aarch64_numpy1.26python3.12.____cpython.yaml b/.ci_support/linux_aarch64_python3.12.____cpython.yaml similarity index 98% rename from .ci_support/linux_aarch64_numpy1.26python3.12.____cpython.yaml rename to .ci_support/linux_aarch64_python3.12.____cpython.yaml index dabf7c89..7fae5475 100644 --- a/.ci_support/linux_aarch64_numpy1.26python3.12.____cpython.yaml +++ b/.ci_support/linux_aarch64_python3.12.____cpython.yaml @@ -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 diff --git a/.ci_support/linux_aarch64_numpy1.22python3.9.____cpython.yaml b/.ci_support/linux_aarch64_python3.9.____cpython.yaml similarity index 98% rename from .ci_support/linux_aarch64_numpy1.22python3.9.____cpython.yaml rename to .ci_support/linux_aarch64_python3.9.____cpython.yaml index 3aa50dcd..6085ea2f 100644 --- a/.ci_support/linux_aarch64_numpy1.22python3.9.____cpython.yaml +++ b/.ci_support/linux_aarch64_python3.9.____cpython.yaml @@ -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 diff --git a/.ci_support/migrations/numpy2.yaml b/.ci_support/migrations/numpy2.yaml new file mode 100644 index 00000000..98b5bb65 --- /dev/null +++ b/.ci_support/migrations/numpy2.yaml @@ -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 diff --git a/.ci_support/osx_64_numpy1.22python3.10.____cpython.yaml b/.ci_support/osx_64_python3.10.____cpython.yaml similarity index 98% rename from .ci_support/osx_64_numpy1.22python3.10.____cpython.yaml rename to .ci_support/osx_64_python3.10.____cpython.yaml index cd5e833b..dfbcfbb8 100644 --- a/.ci_support/osx_64_numpy1.22python3.10.____cpython.yaml +++ b/.ci_support/osx_64_python3.10.____cpython.yaml @@ -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 diff --git a/.ci_support/osx_64_numpy1.23python3.11.____cpython.yaml b/.ci_support/osx_64_python3.11.____cpython.yaml similarity index 98% rename from .ci_support/osx_64_numpy1.23python3.11.____cpython.yaml rename to .ci_support/osx_64_python3.11.____cpython.yaml index 5caaa432..feefc413 100644 --- a/.ci_support/osx_64_numpy1.23python3.11.____cpython.yaml +++ b/.ci_support/osx_64_python3.11.____cpython.yaml @@ -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 diff --git a/.ci_support/osx_64_numpy1.26python3.12.____cpython.yaml b/.ci_support/osx_64_python3.12.____cpython.yaml similarity index 98% rename from .ci_support/osx_64_numpy1.26python3.12.____cpython.yaml rename to .ci_support/osx_64_python3.12.____cpython.yaml index 4e3cbb6d..14a1d4e1 100644 --- a/.ci_support/osx_64_numpy1.26python3.12.____cpython.yaml +++ b/.ci_support/osx_64_python3.12.____cpython.yaml @@ -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 diff --git a/.ci_support/osx_64_numpy1.22python3.9.____cpython.yaml b/.ci_support/osx_64_python3.9.____cpython.yaml similarity index 98% rename from .ci_support/osx_64_numpy1.22python3.9.____cpython.yaml rename to .ci_support/osx_64_python3.9.____cpython.yaml index d0a97c6b..7640aec1 100644 --- a/.ci_support/osx_64_numpy1.22python3.9.____cpython.yaml +++ b/.ci_support/osx_64_python3.9.____cpython.yaml @@ -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 diff --git a/.ci_support/osx_arm64_numpy1.22python3.10.____cpython.yaml b/.ci_support/osx_arm64_python3.10.____cpython.yaml similarity index 98% rename from .ci_support/osx_arm64_numpy1.22python3.10.____cpython.yaml rename to .ci_support/osx_arm64_python3.10.____cpython.yaml index 30e4c9f3..039bc060 100644 --- a/.ci_support/osx_arm64_numpy1.22python3.10.____cpython.yaml +++ b/.ci_support/osx_arm64_python3.10.____cpython.yaml @@ -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 diff --git a/.ci_support/osx_arm64_numpy1.23python3.11.____cpython.yaml b/.ci_support/osx_arm64_python3.11.____cpython.yaml similarity index 98% rename from .ci_support/osx_arm64_numpy1.23python3.11.____cpython.yaml rename to .ci_support/osx_arm64_python3.11.____cpython.yaml index 49447c25..6ffd799e 100644 --- a/.ci_support/osx_arm64_numpy1.23python3.11.____cpython.yaml +++ b/.ci_support/osx_arm64_python3.11.____cpython.yaml @@ -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 diff --git a/.ci_support/osx_arm64_numpy1.26python3.12.____cpython.yaml b/.ci_support/osx_arm64_python3.12.____cpython.yaml similarity index 98% rename from .ci_support/osx_arm64_numpy1.26python3.12.____cpython.yaml rename to .ci_support/osx_arm64_python3.12.____cpython.yaml index ed3060e0..644458ca 100644 --- a/.ci_support/osx_arm64_numpy1.26python3.12.____cpython.yaml +++ b/.ci_support/osx_arm64_python3.12.____cpython.yaml @@ -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 diff --git a/.ci_support/osx_arm64_numpy1.22python3.9.____cpython.yaml b/.ci_support/osx_arm64_python3.9.____cpython.yaml similarity index 98% rename from .ci_support/osx_arm64_numpy1.22python3.9.____cpython.yaml rename to .ci_support/osx_arm64_python3.9.____cpython.yaml index 8261cb84..3ef5a773 100644 --- a/.ci_support/osx_arm64_numpy1.22python3.9.____cpython.yaml +++ b/.ci_support/osx_arm64_python3.9.____cpython.yaml @@ -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 diff --git a/.ci_support/win_64_numpy1.22python3.10.____cpython.yaml b/.ci_support/win_64_python3.10.____cpython.yaml similarity index 97% rename from .ci_support/win_64_numpy1.22python3.10.____cpython.yaml rename to .ci_support/win_64_python3.10.____cpython.yaml index cc922738..c4701d9d 100644 --- a/.ci_support/win_64_numpy1.22python3.10.____cpython.yaml +++ b/.ci_support/win_64_python3.10.____cpython.yaml @@ -7,7 +7,7 @@ channel_targets: cxx_compiler: - vs2019 numpy: -- '1.22' +- '2.0' pin_run_as_build: python: min_pin: x.x diff --git a/.ci_support/win_64_numpy1.23python3.11.____cpython.yaml b/.ci_support/win_64_python3.11.____cpython.yaml similarity index 97% rename from .ci_support/win_64_numpy1.23python3.11.____cpython.yaml rename to .ci_support/win_64_python3.11.____cpython.yaml index 7e335972..c0a7f209 100644 --- a/.ci_support/win_64_numpy1.23python3.11.____cpython.yaml +++ b/.ci_support/win_64_python3.11.____cpython.yaml @@ -7,7 +7,7 @@ channel_targets: cxx_compiler: - vs2019 numpy: -- '1.23' +- '2.0' pin_run_as_build: python: min_pin: x.x diff --git a/.ci_support/win_64_numpy1.26python3.12.____cpython.yaml b/.ci_support/win_64_python3.12.____cpython.yaml similarity index 97% rename from .ci_support/win_64_numpy1.26python3.12.____cpython.yaml rename to .ci_support/win_64_python3.12.____cpython.yaml index 6d530836..e1f021b2 100644 --- a/.ci_support/win_64_numpy1.26python3.12.____cpython.yaml +++ b/.ci_support/win_64_python3.12.____cpython.yaml @@ -7,7 +7,7 @@ channel_targets: cxx_compiler: - vs2019 numpy: -- '1.26' +- '2.0' pin_run_as_build: python: min_pin: x.x diff --git a/.ci_support/win_64_numpy1.22python3.9.____cpython.yaml b/.ci_support/win_64_python3.9.____cpython.yaml similarity index 97% rename from .ci_support/win_64_numpy1.22python3.9.____cpython.yaml rename to .ci_support/win_64_python3.9.____cpython.yaml index 0a32647f..135498c6 100644 --- a/.ci_support/win_64_numpy1.22python3.9.____cpython.yaml +++ b/.ci_support/win_64_python3.9.____cpython.yaml @@ -7,7 +7,7 @@ channel_targets: cxx_compiler: - vs2019 numpy: -- '1.22' +- '2.0' pin_run_as_build: python: min_pin: x.x diff --git a/README.md b/README.md index e7c31404..26b72ece 100644 --- a/README.md +++ b/README.md @@ -38,143 +38,143 @@ Current build status - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + diff --git a/recipe/meta.yaml b/recipe/meta.yaml index a7d6fc76..6adf99d3 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -37,7 +37,6 @@ requirements: - tiledb >=2.26.0,<2.27 run: - python - - {{ pin_compatible('numpy') }} - packaging {% if python_impl != 'pypy' %}
VariantStatus
linux_64_numpy1.22python3.10.____cpythonlinux_64_python3.10.____cpython - variant + variant
linux_64_numpy1.22python3.9.____cpythonlinux_64_python3.11.____cpython - variant + variant
linux_64_numpy1.23python3.11.____cpythonlinux_64_python3.12.____cpython - variant + variant
linux_64_numpy1.26python3.12.____cpythonlinux_64_python3.9.____cpython - variant + variant
linux_aarch64_numpy1.22python3.10.____cpythonlinux_aarch64_python3.10.____cpython - variant + variant
linux_aarch64_numpy1.22python3.9.____cpythonlinux_aarch64_python3.11.____cpython - variant + variant
linux_aarch64_numpy1.23python3.11.____cpythonlinux_aarch64_python3.12.____cpython - variant + variant
linux_aarch64_numpy1.26python3.12.____cpythonlinux_aarch64_python3.9.____cpython - variant + variant
osx_64_numpy1.22python3.10.____cpythonosx_64_python3.10.____cpython - variant + variant
osx_64_numpy1.22python3.9.____cpythonosx_64_python3.11.____cpython - variant + variant
osx_64_numpy1.23python3.11.____cpythonosx_64_python3.12.____cpython - variant + variant
osx_64_numpy1.26python3.12.____cpythonosx_64_python3.9.____cpython - variant + variant
osx_arm64_numpy1.22python3.10.____cpythonosx_arm64_python3.10.____cpython - variant + variant
osx_arm64_numpy1.22python3.9.____cpythonosx_arm64_python3.11.____cpython - variant + variant
osx_arm64_numpy1.23python3.11.____cpythonosx_arm64_python3.12.____cpython - variant + variant
osx_arm64_numpy1.26python3.12.____cpythonosx_arm64_python3.9.____cpython - variant + variant
win_64_numpy1.22python3.10.____cpythonwin_64_python3.10.____cpython - variant + variant
win_64_numpy1.22python3.9.____cpythonwin_64_python3.11.____cpython - variant + variant
win_64_numpy1.23python3.11.____cpythonwin_64_python3.12.____cpython - variant + variant
win_64_numpy1.26python3.12.____cpythonwin_64_python3.9.____cpython - variant + variant