From 36acde6fe383f5832bbc5fa11a37f30325063ec2 Mon Sep 17 00:00:00 2001 From: Steffen Graber Date: Wed, 19 Jun 2024 10:48:34 +0200 Subject: [PATCH] Fix problems with numpy v2 (#3) * Fix problems with numpy 2 * MNT: Re-rendered with conda-build 24.5.0, conda-smithy 3.36.2, and conda-forge-pinning 2024.06.19.07.02.43 --- .azure-pipelines/azure-pipelines-linux.yml | 24 +++++----- .azure-pipelines/azure-pipelines-osx.yml | 24 +++++----- ...l => linux_64_python3.10.____cpython.yaml} | 4 -- ...l => linux_64_python3.11.____cpython.yaml} | 4 -- ...l => linux_64_python3.12.____cpython.yaml} | 4 -- ...ml => linux_64_python3.8.____cpython.yaml} | 4 -- ...ml => linux_64_python3.9.____73_pypy.yaml} | 4 -- ...ml => linux_64_python3.9.____cpython.yaml} | 4 -- ...aml => osx_64_python3.10.____cpython.yaml} | 5 -- ...aml => osx_64_python3.11.____cpython.yaml} | 5 -- ...aml => osx_64_python3.12.____cpython.yaml} | 5 -- ...yaml => osx_64_python3.8.____cpython.yaml} | 5 -- ...yaml => osx_64_python3.9.____73_pypy.yaml} | 5 -- ...yaml => osx_64_python3.9.____cpython.yaml} | 5 -- .scripts/build_steps.sh | 7 +++ .scripts/run_osx_build.sh | 7 +++ README.md | 48 +++++++++---------- recipe/meta.yaml | 6 +-- 18 files changed, 65 insertions(+), 105 deletions(-) rename .ci_support/{linux_64_numpy1.22python3.10.____cpython.yaml => linux_64_python3.10.____cpython.yaml} (92%) rename .ci_support/{linux_64_numpy1.23python3.11.____cpython.yaml => linux_64_python3.11.____cpython.yaml} (92%) rename .ci_support/{linux_64_numpy1.26python3.12.____cpython.yaml => linux_64_python3.12.____cpython.yaml} (92%) rename .ci_support/{linux_64_numpy1.22python3.8.____cpython.yaml => linux_64_python3.8.____cpython.yaml} (92%) rename .ci_support/{linux_64_numpy1.22python3.9.____73_pypy.yaml => linux_64_python3.9.____73_pypy.yaml} (92%) rename .ci_support/{linux_64_numpy1.22python3.9.____cpython.yaml => linux_64_python3.9.____cpython.yaml} (92%) rename .ci_support/{osx_64_numpy1.22python3.10.____cpython.yaml => osx_64_python3.10.____cpython.yaml} (90%) rename .ci_support/{osx_64_numpy1.23python3.11.____cpython.yaml => osx_64_python3.11.____cpython.yaml} (90%) rename .ci_support/{osx_64_numpy1.26python3.12.____cpython.yaml => osx_64_python3.12.____cpython.yaml} (90%) rename .ci_support/{osx_64_numpy1.22python3.8.____cpython.yaml => osx_64_python3.8.____cpython.yaml} (90%) rename .ci_support/{osx_64_numpy1.22python3.9.____73_pypy.yaml => osx_64_python3.9.____73_pypy.yaml} (90%) rename .ci_support/{osx_64_numpy1.22python3.9.____cpython.yaml => osx_64_python3.9.____cpython.yaml} (90%) diff --git a/.azure-pipelines/azure-pipelines-linux.yml b/.azure-pipelines/azure-pipelines-linux.yml index 12e7506..025660f 100755 --- a/.azure-pipelines/azure-pipelines-linux.yml +++ b/.azure-pipelines/azure-pipelines-linux.yml @@ -8,28 +8,28 @@ 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.8.____cpython: - CONFIG: linux_64_numpy1.22python3.8.____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.22python3.9.____73_pypy: - CONFIG: linux_64_numpy1.22python3.9.____73_pypy + 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.22python3.9.____cpython: - CONFIG: linux_64_numpy1.22python3.9.____cpython + linux_64_python3.8.____cpython: + CONFIG: linux_64_python3.8.____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.9.____73_pypy: + CONFIG: linux_64_python3.9.____73_pypy 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 timeoutInMinutes: 360 diff --git a/.azure-pipelines/azure-pipelines-osx.yml b/.azure-pipelines/azure-pipelines-osx.yml index 2b7fc27..2e68ebf 100755 --- a/.azure-pipelines/azure-pipelines-osx.yml +++ b/.azure-pipelines/azure-pipelines-osx.yml @@ -8,23 +8,23 @@ 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.8.____cpython: - CONFIG: osx_64_numpy1.22python3.8.____cpython + osx_64_python3.11.____cpython: + CONFIG: osx_64_python3.11.____cpython UPLOAD_PACKAGES: 'True' - osx_64_numpy1.22python3.9.____73_pypy: - CONFIG: osx_64_numpy1.22python3.9.____73_pypy + osx_64_python3.12.____cpython: + CONFIG: osx_64_python3.12.____cpython UPLOAD_PACKAGES: 'True' - osx_64_numpy1.22python3.9.____cpython: - CONFIG: osx_64_numpy1.22python3.9.____cpython + osx_64_python3.8.____cpython: + CONFIG: osx_64_python3.8.____cpython UPLOAD_PACKAGES: 'True' - osx_64_numpy1.23python3.11.____cpython: - CONFIG: osx_64_numpy1.23python3.11.____cpython + osx_64_python3.9.____73_pypy: + CONFIG: osx_64_python3.9.____73_pypy 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' 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 92% rename from .ci_support/linux_64_numpy1.22python3.10.____cpython.yaml rename to .ci_support/linux_64_python3.10.____cpython.yaml index 44aa78e..be822f9 100644 --- a/.ci_support/linux_64_numpy1.22python3.10.____cpython.yaml +++ b/.ci_support/linux_64_python3.10.____cpython.yaml @@ -18,8 +18,6 @@ gsl: - '2.7' libcblas: - 3.9 *netlib -numpy: -- '1.22' pin_run_as_build: python: min_pin: x.x @@ -31,5 +29,3 @@ target_platform: zip_keys: - - c_stdlib_version - cdt_name -- - python - - numpy diff --git a/.ci_support/linux_64_numpy1.23python3.11.____cpython.yaml b/.ci_support/linux_64_python3.11.____cpython.yaml similarity index 92% rename from .ci_support/linux_64_numpy1.23python3.11.____cpython.yaml rename to .ci_support/linux_64_python3.11.____cpython.yaml index b6e94d0..ab4d9b9 100644 --- a/.ci_support/linux_64_numpy1.23python3.11.____cpython.yaml +++ b/.ci_support/linux_64_python3.11.____cpython.yaml @@ -18,8 +18,6 @@ gsl: - '2.7' libcblas: - 3.9 *netlib -numpy: -- '1.23' pin_run_as_build: python: min_pin: x.x @@ -31,5 +29,3 @@ target_platform: zip_keys: - - c_stdlib_version - cdt_name -- - python - - numpy diff --git a/.ci_support/linux_64_numpy1.26python3.12.____cpython.yaml b/.ci_support/linux_64_python3.12.____cpython.yaml similarity index 92% rename from .ci_support/linux_64_numpy1.26python3.12.____cpython.yaml rename to .ci_support/linux_64_python3.12.____cpython.yaml index 06e628d..b026072 100644 --- a/.ci_support/linux_64_numpy1.26python3.12.____cpython.yaml +++ b/.ci_support/linux_64_python3.12.____cpython.yaml @@ -18,8 +18,6 @@ gsl: - '2.7' libcblas: - 3.9 *netlib -numpy: -- '1.26' pin_run_as_build: python: min_pin: x.x @@ -31,5 +29,3 @@ target_platform: zip_keys: - - c_stdlib_version - cdt_name -- - python - - numpy diff --git a/.ci_support/linux_64_numpy1.22python3.8.____cpython.yaml b/.ci_support/linux_64_python3.8.____cpython.yaml similarity index 92% rename from .ci_support/linux_64_numpy1.22python3.8.____cpython.yaml rename to .ci_support/linux_64_python3.8.____cpython.yaml index 2b43bde..96b5843 100644 --- a/.ci_support/linux_64_numpy1.22python3.8.____cpython.yaml +++ b/.ci_support/linux_64_python3.8.____cpython.yaml @@ -18,8 +18,6 @@ gsl: - '2.7' libcblas: - 3.9 *netlib -numpy: -- '1.22' pin_run_as_build: python: min_pin: x.x @@ -31,5 +29,3 @@ target_platform: zip_keys: - - c_stdlib_version - cdt_name -- - python - - numpy diff --git a/.ci_support/linux_64_numpy1.22python3.9.____73_pypy.yaml b/.ci_support/linux_64_python3.9.____73_pypy.yaml similarity index 92% rename from .ci_support/linux_64_numpy1.22python3.9.____73_pypy.yaml rename to .ci_support/linux_64_python3.9.____73_pypy.yaml index f3f8cb2..8621d72 100644 --- a/.ci_support/linux_64_numpy1.22python3.9.____73_pypy.yaml +++ b/.ci_support/linux_64_python3.9.____73_pypy.yaml @@ -18,8 +18,6 @@ gsl: - '2.7' libcblas: - 3.9 *netlib -numpy: -- '1.22' pin_run_as_build: python: min_pin: x.x @@ -31,5 +29,3 @@ target_platform: zip_keys: - - c_stdlib_version - cdt_name -- - python - - numpy diff --git a/.ci_support/linux_64_numpy1.22python3.9.____cpython.yaml b/.ci_support/linux_64_python3.9.____cpython.yaml similarity index 92% rename from .ci_support/linux_64_numpy1.22python3.9.____cpython.yaml rename to .ci_support/linux_64_python3.9.____cpython.yaml index 673d0c9..94db1f9 100644 --- a/.ci_support/linux_64_numpy1.22python3.9.____cpython.yaml +++ b/.ci_support/linux_64_python3.9.____cpython.yaml @@ -18,8 +18,6 @@ gsl: - '2.7' libcblas: - 3.9 *netlib -numpy: -- '1.22' pin_run_as_build: python: min_pin: x.x @@ -31,5 +29,3 @@ target_platform: zip_keys: - - c_stdlib_version - cdt_name -- - python - - numpy diff --git a/.ci_support/osx_64_numpy1.22python3.10.____cpython.yaml b/.ci_support/osx_64_python3.10.____cpython.yaml similarity index 90% rename from .ci_support/osx_64_numpy1.22python3.10.____cpython.yaml rename to .ci_support/osx_64_python3.10.____cpython.yaml index 99bf9cf..b497fd9 100644 --- a/.ci_support/osx_64_numpy1.22python3.10.____cpython.yaml +++ b/.ci_support/osx_64_python3.10.____cpython.yaml @@ -20,8 +20,6 @@ libcblas: - 3.9 *netlib macos_machine: - x86_64-apple-darwin13.4.0 -numpy: -- '1.22' pin_run_as_build: python: min_pin: x.x @@ -30,6 +28,3 @@ python: - 3.10.* *_cpython target_platform: - osx-64 -zip_keys: -- - python - - numpy diff --git a/.ci_support/osx_64_numpy1.23python3.11.____cpython.yaml b/.ci_support/osx_64_python3.11.____cpython.yaml similarity index 90% rename from .ci_support/osx_64_numpy1.23python3.11.____cpython.yaml rename to .ci_support/osx_64_python3.11.____cpython.yaml index 1b922de..bc45f1e 100644 --- a/.ci_support/osx_64_numpy1.23python3.11.____cpython.yaml +++ b/.ci_support/osx_64_python3.11.____cpython.yaml @@ -20,8 +20,6 @@ libcblas: - 3.9 *netlib macos_machine: - x86_64-apple-darwin13.4.0 -numpy: -- '1.23' pin_run_as_build: python: min_pin: x.x @@ -30,6 +28,3 @@ python: - 3.11.* *_cpython target_platform: - osx-64 -zip_keys: -- - python - - numpy diff --git a/.ci_support/osx_64_numpy1.26python3.12.____cpython.yaml b/.ci_support/osx_64_python3.12.____cpython.yaml similarity index 90% rename from .ci_support/osx_64_numpy1.26python3.12.____cpython.yaml rename to .ci_support/osx_64_python3.12.____cpython.yaml index 220cf4b..42a9139 100644 --- a/.ci_support/osx_64_numpy1.26python3.12.____cpython.yaml +++ b/.ci_support/osx_64_python3.12.____cpython.yaml @@ -20,8 +20,6 @@ libcblas: - 3.9 *netlib macos_machine: - x86_64-apple-darwin13.4.0 -numpy: -- '1.26' pin_run_as_build: python: min_pin: x.x @@ -30,6 +28,3 @@ python: - 3.12.* *_cpython target_platform: - osx-64 -zip_keys: -- - python - - numpy diff --git a/.ci_support/osx_64_numpy1.22python3.8.____cpython.yaml b/.ci_support/osx_64_python3.8.____cpython.yaml similarity index 90% rename from .ci_support/osx_64_numpy1.22python3.8.____cpython.yaml rename to .ci_support/osx_64_python3.8.____cpython.yaml index 980b55e..459a7bf 100644 --- a/.ci_support/osx_64_numpy1.22python3.8.____cpython.yaml +++ b/.ci_support/osx_64_python3.8.____cpython.yaml @@ -20,8 +20,6 @@ libcblas: - 3.9 *netlib macos_machine: - x86_64-apple-darwin13.4.0 -numpy: -- '1.22' pin_run_as_build: python: min_pin: x.x @@ -30,6 +28,3 @@ python: - 3.8.* *_cpython target_platform: - osx-64 -zip_keys: -- - python - - numpy diff --git a/.ci_support/osx_64_numpy1.22python3.9.____73_pypy.yaml b/.ci_support/osx_64_python3.9.____73_pypy.yaml similarity index 90% rename from .ci_support/osx_64_numpy1.22python3.9.____73_pypy.yaml rename to .ci_support/osx_64_python3.9.____73_pypy.yaml index 51742ed..f6f3f91 100644 --- a/.ci_support/osx_64_numpy1.22python3.9.____73_pypy.yaml +++ b/.ci_support/osx_64_python3.9.____73_pypy.yaml @@ -20,8 +20,6 @@ libcblas: - 3.9 *netlib macos_machine: - x86_64-apple-darwin13.4.0 -numpy: -- '1.22' pin_run_as_build: python: min_pin: x.x @@ -30,6 +28,3 @@ python: - 3.9.* *_73_pypy target_platform: - osx-64 -zip_keys: -- - python - - numpy diff --git a/.ci_support/osx_64_numpy1.22python3.9.____cpython.yaml b/.ci_support/osx_64_python3.9.____cpython.yaml similarity index 90% rename from .ci_support/osx_64_numpy1.22python3.9.____cpython.yaml rename to .ci_support/osx_64_python3.9.____cpython.yaml index ed01231..112a19c 100644 --- a/.ci_support/osx_64_numpy1.22python3.9.____cpython.yaml +++ b/.ci_support/osx_64_python3.9.____cpython.yaml @@ -20,8 +20,6 @@ libcblas: - 3.9 *netlib macos_machine: - x86_64-apple-darwin13.4.0 -numpy: -- '1.22' pin_run_as_build: python: min_pin: x.x @@ -30,6 +28,3 @@ python: - 3.9.* *_cpython target_platform: - osx-64 -zip_keys: -- - python - - numpy diff --git a/.scripts/build_steps.sh b/.scripts/build_steps.sh index 2f3df6c..97dc8d9 100755 --- a/.scripts/build_steps.sh +++ b/.scripts/build_steps.sh @@ -69,6 +69,13 @@ else --suppress-variables ${EXTRA_CB_OPTIONS:-} \ --clobber-file "${CI_SUPPORT}/clobber_${CONFIG}.yaml" \ --extra-meta flow_run_id="${flow_run_id:-}" remote_url="${remote_url:-}" sha="${sha:-}" + + ( startgroup "Inspecting artifacts" ) 2> /dev/null + + # inspect_artifacts was only added in conda-forge-ci-setup 4.6.0 + command -v inspect_artifacts >/dev/null 2>&1 && inspect_artifacts || echo "inspect_artifacts needs conda-forge-ci-setup >=4.6.0" + + ( endgroup "Inspecting artifacts" ) 2> /dev/null ( startgroup "Validating outputs" ) 2> /dev/null validate_recipe_outputs "${FEEDSTOCK_NAME}" diff --git a/.scripts/run_osx_build.sh b/.scripts/run_osx_build.sh index 165fa51..0c9e992 100755 --- a/.scripts/run_osx_build.sh +++ b/.scripts/run_osx_build.sh @@ -81,6 +81,13 @@ else --suppress-variables ${EXTRA_CB_OPTIONS:-} \ --clobber-file ./.ci_support/clobber_${CONFIG}.yaml \ --extra-meta flow_run_id="$flow_run_id" remote_url="$remote_url" sha="$sha" + + ( startgroup "Inspecting artifacts" ) 2> /dev/null + + # inspect_artifacts was only added in conda-forge-ci-setup 4.6.0 + command -v inspect_artifacts >/dev/null 2>&1 && inspect_artifacts || echo "inspect_artifacts needs conda-forge-ci-setup >=4.6.0" + + ( endgroup "Inspecting artifacts" ) 2> /dev/null ( startgroup "Validating outputs" ) 2> /dev/null validate_recipe_outputs "${FEEDSTOCK_NAME}" diff --git a/README.md b/README.md index c9e2529..080b67f 100644 --- a/README.md +++ b/README.md @@ -27,87 +27,87 @@ Current build status - + - + - + - + - + - + - + - + - + - + - + - + diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 1bde8bb..5433a6a 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -11,7 +11,7 @@ source: build: script: {{ PYTHON }} -m pip install . -vv --no-deps --no-build-isolation - number: 1 + number: 2 skip: true # [win or py<38] requirements: @@ -25,13 +25,13 @@ requirements: - libcblas - setuptools - wheel - - numpy + - numpy <2.0dev0 - pip - gsl run: - python - gsl - - numpy + - numpy <2.0dev0 test: imports:
VariantStatus
linux_64_numpy1.22python3.10.____cpythonlinux_64_python3.10.____cpython - variant + variant
linux_64_numpy1.22python3.8.____cpythonlinux_64_python3.11.____cpython - variant + variant
linux_64_numpy1.22python3.9.____73_pypylinux_64_python3.12.____cpython - variant + variant
linux_64_numpy1.22python3.9.____cpythonlinux_64_python3.8.____cpython - variant + variant
linux_64_numpy1.23python3.11.____cpythonlinux_64_python3.9.____73_pypy - variant + variant
linux_64_numpy1.26python3.12.____cpythonlinux_64_python3.9.____cpython - variant + variant
osx_64_numpy1.22python3.10.____cpythonosx_64_python3.10.____cpython - variant + variant
osx_64_numpy1.22python3.8.____cpythonosx_64_python3.11.____cpython - variant + variant
osx_64_numpy1.22python3.9.____73_pypyosx_64_python3.12.____cpython - variant + variant
osx_64_numpy1.22python3.9.____cpythonosx_64_python3.8.____cpython - variant + variant
osx_64_numpy1.23python3.11.____cpythonosx_64_python3.9.____73_pypy - variant + variant
osx_64_numpy1.26python3.12.____cpythonosx_64_python3.9.____cpython - variant + variant