From d7de2d8433a6a984e879fac5cc44c958b716d6f3 Mon Sep 17 00:00:00 2001 From: David Stansby Date: Mon, 12 Aug 2024 10:52:13 +0100 Subject: [PATCH 01/16] Try rebuilding 0.12.1 --- recipe/meta.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 7965051..2272c65 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -10,7 +10,7 @@ source: sha256: 05d91a433733e7eef268d7e80ec226a0232da244289614a8f3826901aec1098e build: - number: 1 + number: 2 script_env: - DISABLE_NUMCODECS_AVX2="" - DISABLE_NUMCODECS_SSE2="" # [not x86] From 410af9bba97e7bf98a41affdbe81625187371375 Mon Sep 17 00:00:00 2001 From: David Stansby Date: Mon, 12 Aug 2024 11:29:53 +0100 Subject: [PATCH 02/16] Add min Python version --- recipe/meta.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 2272c65..a643150 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -18,6 +18,8 @@ build: - export CFLAGS="${CFLAGS} -pthread" # [aarch64 or ppc64le] - {{ PYTHON }} -m pip install . -vv + skip: true # [py<310] + requirements: build: - python # [build_platform != target_platform] From b87bb99cdcb1f998bc87ccfb2b5eb8084c73592a Mon Sep 17 00:00:00 2001 From: "conda-forge-webservices[bot]" <91080706+conda-forge-webservices[bot]@users.noreply.github.com> Date: Mon, 12 Aug 2024 10:44:51 +0000 Subject: [PATCH 03/16] MNT: Re-rendered with conda-build 24.7.1, conda-smithy 3.38.0, and conda-forge-pinning 2024.08.12.10.11.48 --- .azure-pipelines/azure-pipelines-linux.yml | 24 ------ .azure-pipelines/azure-pipelines-osx.yml | 12 --- .azure-pipelines/azure-pipelines-win.yml | 8 +- .../linux_64_python3.10.____cpython.yaml | 4 +- .../linux_64_python3.11.____cpython.yaml | 4 +- .../linux_64_python3.12.____cpython.yaml | 4 +- .../linux_64_python3.8.____cpython.yaml | 33 -------- .../linux_64_python3.9.____cpython.yaml | 33 -------- .../linux_aarch64_python3.8.____cpython.yaml | 37 -------- .../linux_aarch64_python3.9.____cpython.yaml | 37 -------- .../linux_ppc64le_python3.8.____cpython.yaml | 33 -------- .../linux_ppc64le_python3.9.____cpython.yaml | 33 -------- .../osx_64_python3.10.____cpython.yaml | 2 + .../osx_64_python3.11.____cpython.yaml | 2 + .../osx_64_python3.12.____cpython.yaml | 2 + .ci_support/osx_64_python3.8.____cpython.yaml | 31 ------- .ci_support/osx_64_python3.9.____cpython.yaml | 31 ------- .../osx_arm64_python3.10.____cpython.yaml | 2 + .../osx_arm64_python3.11.____cpython.yaml | 2 + .../osx_arm64_python3.12.____cpython.yaml | 2 + .../osx_arm64_python3.8.____cpython.yaml | 31 ------- .../osx_arm64_python3.9.____cpython.yaml | 31 ------- .ci_support/win_64_python3.8.____cpython.yaml | 18 ---- .ci_support/win_64_python3.9.____cpython.yaml | 18 ---- .gitattributes | 4 +- .scripts/build_steps.sh | 6 ++ .scripts/run_osx_build.sh | 9 +- .scripts/run_win_build.bat | 5 ++ README.md | 84 ------------------- build-locally.py | 4 +- 30 files changed, 42 insertions(+), 504 deletions(-) delete mode 100644 .ci_support/linux_64_python3.8.____cpython.yaml delete mode 100644 .ci_support/linux_64_python3.9.____cpython.yaml delete mode 100644 .ci_support/linux_aarch64_python3.8.____cpython.yaml delete mode 100644 .ci_support/linux_aarch64_python3.9.____cpython.yaml delete mode 100644 .ci_support/linux_ppc64le_python3.8.____cpython.yaml delete mode 100644 .ci_support/linux_ppc64le_python3.9.____cpython.yaml delete mode 100644 .ci_support/osx_64_python3.8.____cpython.yaml delete mode 100644 .ci_support/osx_64_python3.9.____cpython.yaml delete mode 100644 .ci_support/osx_arm64_python3.8.____cpython.yaml delete mode 100644 .ci_support/osx_arm64_python3.9.____cpython.yaml delete mode 100644 .ci_support/win_64_python3.8.____cpython.yaml delete mode 100644 .ci_support/win_64_python3.9.____cpython.yaml diff --git a/.azure-pipelines/azure-pipelines-linux.yml b/.azure-pipelines/azure-pipelines-linux.yml index 9ea7b4f..5bce94e 100755 --- a/.azure-pipelines/azure-pipelines-linux.yml +++ b/.azure-pipelines/azure-pipelines-linux.yml @@ -20,14 +20,6 @@ jobs: CONFIG: linux_64_python3.12.____cpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - 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_python3.9.____cpython: - CONFIG: linux_64_python3.9.____cpython - UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 linux_aarch64_python3.10.____cpython: CONFIG: linux_aarch64_python3.10.____cpython UPLOAD_PACKAGES: 'True' @@ -40,14 +32,6 @@ jobs: CONFIG: linux_aarch64_python3.12.____cpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_aarch64_python3.8.____cpython: - CONFIG: linux_aarch64_python3.8.____cpython - UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_aarch64_python3.9.____cpython: - CONFIG: linux_aarch64_python3.9.____cpython - UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 linux_ppc64le_python3.10.____cpython: CONFIG: linux_ppc64le_python3.10.____cpython UPLOAD_PACKAGES: 'True' @@ -60,14 +44,6 @@ jobs: CONFIG: linux_ppc64le_python3.12.____cpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_ppc64le_python3.8.____cpython: - CONFIG: linux_ppc64le_python3.8.____cpython - UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_ppc64le_python3.9.____cpython: - CONFIG: linux_ppc64le_python3.9.____cpython - UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 timeoutInMinutes: 360 variables: {} diff --git a/.azure-pipelines/azure-pipelines-osx.yml b/.azure-pipelines/azure-pipelines-osx.yml index 79030d5..90a84b3 100755 --- a/.azure-pipelines/azure-pipelines-osx.yml +++ b/.azure-pipelines/azure-pipelines-osx.yml @@ -17,12 +17,6 @@ jobs: osx_64_python3.12.____cpython: CONFIG: osx_64_python3.12.____cpython UPLOAD_PACKAGES: 'True' - osx_64_python3.8.____cpython: - CONFIG: osx_64_python3.8.____cpython - UPLOAD_PACKAGES: 'True' - osx_64_python3.9.____cpython: - CONFIG: osx_64_python3.9.____cpython - UPLOAD_PACKAGES: 'True' osx_arm64_python3.10.____cpython: CONFIG: osx_arm64_python3.10.____cpython UPLOAD_PACKAGES: 'True' @@ -32,12 +26,6 @@ jobs: osx_arm64_python3.12.____cpython: CONFIG: osx_arm64_python3.12.____cpython UPLOAD_PACKAGES: 'True' - osx_arm64_python3.8.____cpython: - CONFIG: osx_arm64_python3.8.____cpython - UPLOAD_PACKAGES: 'True' - 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 d707372..65f8109 100755 --- a/.azure-pipelines/azure-pipelines-win.yml +++ b/.azure-pipelines/azure-pipelines-win.yml @@ -17,12 +17,6 @@ jobs: win_64_python3.12.____cpython: CONFIG: win_64_python3.12.____cpython UPLOAD_PACKAGES: 'True' - win_64_python3.8.____cpython: - CONFIG: win_64_python3.8.____cpython - UPLOAD_PACKAGES: 'True' - win_64_python3.9.____cpython: - CONFIG: win_64_python3.9.____cpython - UPLOAD_PACKAGES: 'True' timeoutInMinutes: 360 variables: CONDA_BLD_PATH: D:\\bld\\ @@ -36,7 +30,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_python3.10.____cpython.yaml b/.ci_support/linux_64_python3.10.____cpython.yaml index a199b6d..30d84e0 100644 --- a/.ci_support/linux_64_python3.10.____cpython.yaml +++ b/.ci_support/linux_64_python3.10.____cpython.yaml @@ -5,9 +5,9 @@ c_compiler_version: c_stdlib: - sysroot c_stdlib_version: -- '2.12' +- '2.17' cdt_name: -- cos6 +- cos7 channel_sources: - conda-forge channel_targets: diff --git a/.ci_support/linux_64_python3.11.____cpython.yaml b/.ci_support/linux_64_python3.11.____cpython.yaml index 9a7f7fd..4926889 100644 --- a/.ci_support/linux_64_python3.11.____cpython.yaml +++ b/.ci_support/linux_64_python3.11.____cpython.yaml @@ -5,9 +5,9 @@ c_compiler_version: c_stdlib: - sysroot c_stdlib_version: -- '2.12' +- '2.17' cdt_name: -- cos6 +- cos7 channel_sources: - conda-forge channel_targets: diff --git a/.ci_support/linux_64_python3.12.____cpython.yaml b/.ci_support/linux_64_python3.12.____cpython.yaml index 3e16f75..c5079da 100644 --- a/.ci_support/linux_64_python3.12.____cpython.yaml +++ b/.ci_support/linux_64_python3.12.____cpython.yaml @@ -5,9 +5,9 @@ c_compiler_version: c_stdlib: - sysroot c_stdlib_version: -- '2.12' +- '2.17' cdt_name: -- cos6 +- cos7 channel_sources: - conda-forge channel_targets: diff --git a/.ci_support/linux_64_python3.8.____cpython.yaml b/.ci_support/linux_64_python3.8.____cpython.yaml deleted file mode 100644 index ec63229..0000000 --- a/.ci_support/linux_64_python3.8.____cpython.yaml +++ /dev/null @@ -1,33 +0,0 @@ -c_compiler: -- gcc -c_compiler_version: -- '12' -c_stdlib: -- sysroot -c_stdlib_version: -- '2.12' -cdt_name: -- cos6 -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 -pin_run_as_build: - python: - min_pin: x.x - max_pin: x.x -python: -- 3.8.* *_cpython -target_platform: -- linux-64 -zip_keys: -- - c_compiler_version - - cxx_compiler_version -- - c_stdlib_version - - cdt_name diff --git a/.ci_support/linux_64_python3.9.____cpython.yaml b/.ci_support/linux_64_python3.9.____cpython.yaml deleted file mode 100644 index 4616cf2..0000000 --- a/.ci_support/linux_64_python3.9.____cpython.yaml +++ /dev/null @@ -1,33 +0,0 @@ -c_compiler: -- gcc -c_compiler_version: -- '12' -c_stdlib: -- sysroot -c_stdlib_version: -- '2.12' -cdt_name: -- cos6 -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 -pin_run_as_build: - python: - min_pin: x.x - max_pin: x.x -python: -- 3.9.* *_cpython -target_platform: -- linux-64 -zip_keys: -- - c_compiler_version - - cxx_compiler_version -- - c_stdlib_version - - cdt_name diff --git a/.ci_support/linux_aarch64_python3.8.____cpython.yaml b/.ci_support/linux_aarch64_python3.8.____cpython.yaml deleted file mode 100644 index 4a61a79..0000000 --- a/.ci_support/linux_aarch64_python3.8.____cpython.yaml +++ /dev/null @@ -1,37 +0,0 @@ -BUILD: -- aarch64-conda_cos7-linux-gnu -c_compiler: -- gcc -c_compiler_version: -- '12' -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 -pin_run_as_build: - python: - min_pin: x.x - max_pin: x.x -python: -- 3.8.* *_cpython -target_platform: -- linux-aarch64 -zip_keys: -- - c_compiler_version - - cxx_compiler_version -- - c_stdlib_version - - cdt_name diff --git a/.ci_support/linux_aarch64_python3.9.____cpython.yaml b/.ci_support/linux_aarch64_python3.9.____cpython.yaml deleted file mode 100644 index 6d73311..0000000 --- a/.ci_support/linux_aarch64_python3.9.____cpython.yaml +++ /dev/null @@ -1,37 +0,0 @@ -BUILD: -- aarch64-conda_cos7-linux-gnu -c_compiler: -- gcc -c_compiler_version: -- '12' -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 -pin_run_as_build: - python: - min_pin: x.x - max_pin: x.x -python: -- 3.9.* *_cpython -target_platform: -- linux-aarch64 -zip_keys: -- - c_compiler_version - - cxx_compiler_version -- - c_stdlib_version - - cdt_name diff --git a/.ci_support/linux_ppc64le_python3.8.____cpython.yaml b/.ci_support/linux_ppc64le_python3.8.____cpython.yaml deleted file mode 100644 index c5437ab..0000000 --- a/.ci_support/linux_ppc64le_python3.8.____cpython.yaml +++ /dev/null @@ -1,33 +0,0 @@ -c_compiler: -- gcc -c_compiler_version: -- '12' -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 -pin_run_as_build: - python: - min_pin: x.x - max_pin: x.x -python: -- 3.8.* *_cpython -target_platform: -- linux-ppc64le -zip_keys: -- - c_compiler_version - - cxx_compiler_version -- - c_stdlib_version - - cdt_name diff --git a/.ci_support/linux_ppc64le_python3.9.____cpython.yaml b/.ci_support/linux_ppc64le_python3.9.____cpython.yaml deleted file mode 100644 index e537e43..0000000 --- a/.ci_support/linux_ppc64le_python3.9.____cpython.yaml +++ /dev/null @@ -1,33 +0,0 @@ -c_compiler: -- gcc -c_compiler_version: -- '12' -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 -pin_run_as_build: - python: - min_pin: x.x - max_pin: x.x -python: -- 3.9.* *_cpython -target_platform: -- linux-ppc64le -zip_keys: -- - c_compiler_version - - cxx_compiler_version -- - c_stdlib_version - - cdt_name diff --git a/.ci_support/osx_64_python3.10.____cpython.yaml b/.ci_support/osx_64_python3.10.____cpython.yaml index 9223d38..80b9b8f 100644 --- a/.ci_support/osx_64_python3.10.____cpython.yaml +++ b/.ci_support/osx_64_python3.10.____cpython.yaml @@ -1,5 +1,7 @@ MACOSX_DEPLOYMENT_TARGET: - '10.13' +MACOSX_SDK_VERSION: +- '10.13' c_compiler: - clang c_compiler_version: diff --git a/.ci_support/osx_64_python3.11.____cpython.yaml b/.ci_support/osx_64_python3.11.____cpython.yaml index 64012d0..e07a33c 100644 --- a/.ci_support/osx_64_python3.11.____cpython.yaml +++ b/.ci_support/osx_64_python3.11.____cpython.yaml @@ -1,5 +1,7 @@ MACOSX_DEPLOYMENT_TARGET: - '10.13' +MACOSX_SDK_VERSION: +- '10.13' c_compiler: - clang c_compiler_version: diff --git a/.ci_support/osx_64_python3.12.____cpython.yaml b/.ci_support/osx_64_python3.12.____cpython.yaml index dc55489..aa501a7 100644 --- a/.ci_support/osx_64_python3.12.____cpython.yaml +++ b/.ci_support/osx_64_python3.12.____cpython.yaml @@ -1,5 +1,7 @@ MACOSX_DEPLOYMENT_TARGET: - '10.13' +MACOSX_SDK_VERSION: +- '10.13' c_compiler: - clang c_compiler_version: diff --git a/.ci_support/osx_64_python3.8.____cpython.yaml b/.ci_support/osx_64_python3.8.____cpython.yaml deleted file mode 100644 index e6fe15a..0000000 --- a/.ci_support/osx_64_python3.8.____cpython.yaml +++ /dev/null @@ -1,31 +0,0 @@ -MACOSX_DEPLOYMENT_TARGET: -- '10.13' -c_compiler: -- clang -c_compiler_version: -- '16' -c_stdlib: -- macosx_deployment_target -c_stdlib_version: -- '10.13' -channel_sources: -- conda-forge -channel_targets: -- conda-forge main -cxx_compiler: -- clangxx -cxx_compiler_version: -- '16' -macos_machine: -- x86_64-apple-darwin13.4.0 -pin_run_as_build: - python: - min_pin: x.x - max_pin: x.x -python: -- 3.8.* *_cpython -target_platform: -- osx-64 -zip_keys: -- - c_compiler_version - - cxx_compiler_version diff --git a/.ci_support/osx_64_python3.9.____cpython.yaml b/.ci_support/osx_64_python3.9.____cpython.yaml deleted file mode 100644 index 4f5a934..0000000 --- a/.ci_support/osx_64_python3.9.____cpython.yaml +++ /dev/null @@ -1,31 +0,0 @@ -MACOSX_DEPLOYMENT_TARGET: -- '10.13' -c_compiler: -- clang -c_compiler_version: -- '16' -c_stdlib: -- macosx_deployment_target -c_stdlib_version: -- '10.13' -channel_sources: -- conda-forge -channel_targets: -- conda-forge main -cxx_compiler: -- clangxx -cxx_compiler_version: -- '16' -macos_machine: -- x86_64-apple-darwin13.4.0 -pin_run_as_build: - python: - min_pin: x.x - max_pin: x.x -python: -- 3.9.* *_cpython -target_platform: -- osx-64 -zip_keys: -- - c_compiler_version - - cxx_compiler_version diff --git a/.ci_support/osx_arm64_python3.10.____cpython.yaml b/.ci_support/osx_arm64_python3.10.____cpython.yaml index 29539ed..0d50040 100644 --- a/.ci_support/osx_arm64_python3.10.____cpython.yaml +++ b/.ci_support/osx_arm64_python3.10.____cpython.yaml @@ -1,5 +1,7 @@ MACOSX_DEPLOYMENT_TARGET: - '11.0' +MACOSX_SDK_VERSION: +- '11.0' c_compiler: - clang c_compiler_version: diff --git a/.ci_support/osx_arm64_python3.11.____cpython.yaml b/.ci_support/osx_arm64_python3.11.____cpython.yaml index a20a71c..2ee862d 100644 --- a/.ci_support/osx_arm64_python3.11.____cpython.yaml +++ b/.ci_support/osx_arm64_python3.11.____cpython.yaml @@ -1,5 +1,7 @@ MACOSX_DEPLOYMENT_TARGET: - '11.0' +MACOSX_SDK_VERSION: +- '11.0' c_compiler: - clang c_compiler_version: diff --git a/.ci_support/osx_arm64_python3.12.____cpython.yaml b/.ci_support/osx_arm64_python3.12.____cpython.yaml index 7d8e84d..2ff359e 100644 --- a/.ci_support/osx_arm64_python3.12.____cpython.yaml +++ b/.ci_support/osx_arm64_python3.12.____cpython.yaml @@ -1,5 +1,7 @@ MACOSX_DEPLOYMENT_TARGET: - '11.0' +MACOSX_SDK_VERSION: +- '11.0' c_compiler: - clang c_compiler_version: diff --git a/.ci_support/osx_arm64_python3.8.____cpython.yaml b/.ci_support/osx_arm64_python3.8.____cpython.yaml deleted file mode 100644 index 0c79645..0000000 --- a/.ci_support/osx_arm64_python3.8.____cpython.yaml +++ /dev/null @@ -1,31 +0,0 @@ -MACOSX_DEPLOYMENT_TARGET: -- '11.0' -c_compiler: -- clang -c_compiler_version: -- '16' -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 -pin_run_as_build: - python: - min_pin: x.x - max_pin: x.x -python: -- 3.8.* *_cpython -target_platform: -- osx-arm64 -zip_keys: -- - c_compiler_version - - cxx_compiler_version diff --git a/.ci_support/osx_arm64_python3.9.____cpython.yaml b/.ci_support/osx_arm64_python3.9.____cpython.yaml deleted file mode 100644 index d3c85a1..0000000 --- a/.ci_support/osx_arm64_python3.9.____cpython.yaml +++ /dev/null @@ -1,31 +0,0 @@ -MACOSX_DEPLOYMENT_TARGET: -- '11.0' -c_compiler: -- clang -c_compiler_version: -- '16' -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 -pin_run_as_build: - python: - min_pin: x.x - max_pin: x.x -python: -- 3.9.* *_cpython -target_platform: -- osx-arm64 -zip_keys: -- - c_compiler_version - - cxx_compiler_version diff --git a/.ci_support/win_64_python3.8.____cpython.yaml b/.ci_support/win_64_python3.8.____cpython.yaml deleted file mode 100644 index 1d867f0..0000000 --- a/.ci_support/win_64_python3.8.____cpython.yaml +++ /dev/null @@ -1,18 +0,0 @@ -c_compiler: -- vs2019 -c_stdlib: -- vs -channel_sources: -- conda-forge -channel_targets: -- conda-forge main -cxx_compiler: -- vs2019 -pin_run_as_build: - python: - min_pin: x.x - max_pin: x.x -python: -- 3.8.* *_cpython -target_platform: -- win-64 diff --git a/.ci_support/win_64_python3.9.____cpython.yaml b/.ci_support/win_64_python3.9.____cpython.yaml deleted file mode 100644 index 9cd5096..0000000 --- a/.ci_support/win_64_python3.9.____cpython.yaml +++ /dev/null @@ -1,18 +0,0 @@ -c_compiler: -- vs2019 -c_stdlib: -- vs -channel_sources: -- conda-forge -channel_targets: -- conda-forge main -cxx_compiler: -- vs2019 -pin_run_as_build: - python: - min_pin: x.x - max_pin: x.x -python: -- 3.9.* *_cpython -target_platform: -- win-64 diff --git a/.gitattributes b/.gitattributes index 7f32763..18f114a 100644 --- a/.gitattributes +++ b/.gitattributes @@ -20,8 +20,8 @@ bld.bat text eol=crlf .travis.yml linguist-generated=true .scripts/* linguist-generated=true .woodpecker.yml linguist-generated=true -LICENSE.txt linguist-generated=true -README.md linguist-generated=true +/LICENSE.txt linguist-generated=true +/README.md linguist-generated=true azure-pipelines.yml linguist-generated=true build-locally.py linguist-generated=true shippable.yml linguist-generated=true diff --git a/.scripts/build_steps.sh b/.scripts/build_steps.sh index 899ba03..ba4b251 100755 --- a/.scripts/build_steps.sh +++ b/.scripts/build_steps.sh @@ -72,6 +72,12 @@ 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 07dff21..420f051 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} @@ -85,6 +85,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_win_build.bat b/.scripts/run_win_build.bat index 6d54697..65650bf 100755 --- a/.scripts/run_win_build.bat +++ b/.scripts/run_win_build.bat @@ -58,6 +58,11 @@ echo Building recipe conda-build.exe "recipe" -m .ci_support\%CONFIG%.yaml --suppress-variables %EXTRA_CB_OPTIONS% if !errorlevel! neq 0 exit /b !errorlevel! +call :start_group "Inspecting artifacts" +:: inspect_artifacts was only added in conda-forge-ci-setup 4.6.0 +WHERE inspect_artifacts >nul 2>nul && inspect_artifacts || echo "inspect_artifacts needs conda-forge-ci-setup >=4.6.0" +call :end_group + :: Prepare some environment variables for the upload step if /i "%CI%" == "github_actions" ( set "FEEDSTOCK_NAME=%GITHUB_REPOSITORY:*/=%" diff --git a/README.md b/README.md index b189905..5d82684 100644 --- a/README.md +++ b/README.md @@ -47,20 +47,6 @@ Current build status variant - - linux_64_python3.8.____cpython - - - variant - - - - linux_64_python3.9.____cpython - - - variant - - linux_aarch64_python3.10.____cpython @@ -82,20 +68,6 @@ Current build status variant - - linux_aarch64_python3.8.____cpython - - - variant - - - - linux_aarch64_python3.9.____cpython - - - variant - - linux_ppc64le_python3.10.____cpython @@ -117,20 +89,6 @@ Current build status variant - - linux_ppc64le_python3.8.____cpython - - - variant - - - - linux_ppc64le_python3.9.____cpython - - - variant - - osx_64_python3.10.____cpython @@ -152,20 +110,6 @@ Current build status variant - - osx_64_python3.8.____cpython - - - variant - - - - osx_64_python3.9.____cpython - - - variant - - osx_arm64_python3.10.____cpython @@ -187,20 +131,6 @@ Current build status variant - - osx_arm64_python3.8.____cpython - - - variant - - - - osx_arm64_python3.9.____cpython - - - variant - - win_64_python3.10.____cpython @@ -222,20 +152,6 @@ Current build status variant - - win_64_python3.8.____cpython - - - variant - - - - win_64_python3.9.____cpython - - - variant - - diff --git a/build-locally.py b/build-locally.py index e0d408d..d78427b 100755 --- a/build-locally.py +++ b/build-locally.py @@ -3,11 +3,11 @@ # This file has been generated by conda-smithy in order to build the recipe # locally. # -import os import glob +import os +import platform import subprocess from argparse import ArgumentParser -import platform def setup_environment(ns): From 3220a6f1ee71e9d3e2f2e697fad06b7108b065e3 Mon Sep 17 00:00:00 2001 From: David Stansby Date: Mon, 12 Aug 2024 12:21:02 +0100 Subject: [PATCH 04/16] Bump version --- recipe/meta.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index a643150..b10aabd 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -1,5 +1,5 @@ {% set name = "numcodecs" %} -{% set version = "0.12.1" %} +{% set version = "0.13.0" %} package: name: {{ name|lower }} @@ -7,10 +7,10 @@ package: source: url: https://pypi.io/packages/source/{{ name[0] }}/{{ name }}/{{ name }}-{{ version }}.tar.gz - sha256: 05d91a433733e7eef268d7e80ec226a0232da244289614a8f3826901aec1098e + sha256: ba4fac7036ea5a078c7afe1d4dffeb9685080d42f19c9c16b12dad866703aa2e build: - number: 2 + number: 0 script_env: - DISABLE_NUMCODECS_AVX2="" - DISABLE_NUMCODECS_SSE2="" # [not x86] From 03dd3a9cbe296daaddc4142b1ae7a5633e64bb93 Mon Sep 17 00:00:00 2001 From: David Stansby Date: Mon, 12 Aug 2024 12:44:27 +0100 Subject: [PATCH 05/16] Add numpy build requirement --- recipe/meta.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index b10aabd..4c7b677 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -36,10 +36,11 @@ requirements: - setuptools_scm >=6.2 - tomli - py-cpuinfo + - numpy run: - python - - numpy >=1.7 - msgpack-python + - {{ pin_compatible('numpy') }} test: requires: From 23643717337c0b79ad1229bda3547f2ba782830d Mon Sep 17 00:00:00 2001 From: "conda-forge-webservices[bot]" <91080706+conda-forge-webservices[bot]@users.noreply.github.com> Date: Mon, 12 Aug 2024 11:46:27 +0000 Subject: [PATCH 06/16] MNT: Re-rendered with conda-build 24.7.1, conda-smithy 3.38.0, and conda-forge-pinning 2024.08.12.10.11.48 --- .azure-pipelines/azure-pipelines-linux.yml | 36 +++++----- .azure-pipelines/azure-pipelines-osx.yml | 24 +++---- .azure-pipelines/azure-pipelines-win.yml | 12 ++-- ...x_64_numpy1.22python3.10.____cpython.yaml} | 4 ++ ...x_64_numpy1.23python3.11.____cpython.yaml} | 4 ++ ...x_64_numpy1.26python3.12.____cpython.yaml} | 4 ++ ...ch64_numpy1.22python3.10.____cpython.yaml} | 4 ++ ...ch64_numpy1.23python3.11.____cpython.yaml} | 4 ++ ...ch64_numpy1.26python3.12.____cpython.yaml} | 4 ++ ...64le_numpy1.22python3.10.____cpython.yaml} | 4 ++ ...64le_numpy1.23python3.11.____cpython.yaml} | 4 ++ ...64le_numpy1.26python3.12.____cpython.yaml} | 4 ++ ...x_64_numpy1.22python3.10.____cpython.yaml} | 4 ++ ...x_64_numpy1.23python3.11.____cpython.yaml} | 4 ++ ...x_64_numpy1.26python3.12.____cpython.yaml} | 4 ++ ...rm64_numpy1.22python3.10.____cpython.yaml} | 4 ++ ...rm64_numpy1.23python3.11.____cpython.yaml} | 4 ++ ...rm64_numpy1.26python3.12.____cpython.yaml} | 4 ++ ...n_64_numpy1.22python3.10.____cpython.yaml} | 5 ++ ...n_64_numpy1.23python3.11.____cpython.yaml} | 5 ++ ...n_64_numpy1.26python3.12.____cpython.yaml} | 5 ++ README.md | 72 +++++++++---------- 22 files changed, 147 insertions(+), 72 deletions(-) rename .ci_support/{linux_64_python3.10.____cpython.yaml => linux_64_numpy1.22python3.10.____cpython.yaml} (93%) rename .ci_support/{linux_64_python3.11.____cpython.yaml => linux_64_numpy1.23python3.11.____cpython.yaml} (93%) rename .ci_support/{linux_64_python3.12.____cpython.yaml => linux_64_numpy1.26python3.12.____cpython.yaml} (93%) rename .ci_support/{linux_aarch64_python3.10.____cpython.yaml => linux_aarch64_numpy1.22python3.10.____cpython.yaml} (93%) rename .ci_support/{linux_aarch64_python3.11.____cpython.yaml => linux_aarch64_numpy1.23python3.11.____cpython.yaml} (93%) rename .ci_support/{linux_aarch64_python3.12.____cpython.yaml => linux_aarch64_numpy1.26python3.12.____cpython.yaml} (93%) rename .ci_support/{linux_ppc64le_python3.10.____cpython.yaml => linux_ppc64le_numpy1.22python3.10.____cpython.yaml} (93%) rename .ci_support/{linux_ppc64le_python3.11.____cpython.yaml => linux_ppc64le_numpy1.23python3.11.____cpython.yaml} (93%) rename .ci_support/{linux_ppc64le_python3.12.____cpython.yaml => linux_ppc64le_numpy1.26python3.12.____cpython.yaml} (93%) rename .ci_support/{osx_64_python3.10.____cpython.yaml => osx_64_numpy1.22python3.10.____cpython.yaml} (93%) rename .ci_support/{osx_64_python3.11.____cpython.yaml => osx_64_numpy1.23python3.11.____cpython.yaml} (93%) rename .ci_support/{osx_64_python3.12.____cpython.yaml => osx_64_numpy1.26python3.12.____cpython.yaml} (93%) rename .ci_support/{osx_arm64_python3.10.____cpython.yaml => osx_arm64_numpy1.22python3.10.____cpython.yaml} (93%) rename .ci_support/{osx_arm64_python3.11.____cpython.yaml => osx_arm64_numpy1.23python3.11.____cpython.yaml} (93%) rename .ci_support/{osx_arm64_python3.12.____cpython.yaml => osx_arm64_numpy1.26python3.12.____cpython.yaml} (93%) rename .ci_support/{win_64_python3.10.____cpython.yaml => win_64_numpy1.22python3.10.____cpython.yaml} (83%) rename .ci_support/{win_64_python3.11.____cpython.yaml => win_64_numpy1.23python3.11.____cpython.yaml} (83%) rename .ci_support/{win_64_python3.12.____cpython.yaml => win_64_numpy1.26python3.12.____cpython.yaml} (83%) diff --git a/.azure-pipelines/azure-pipelines-linux.yml b/.azure-pipelines/azure-pipelines-linux.yml index 5bce94e..e8056f1 100755 --- a/.azure-pipelines/azure-pipelines-linux.yml +++ b/.azure-pipelines/azure-pipelines-linux.yml @@ -8,40 +8,40 @@ jobs: vmImage: ubuntu-latest strategy: matrix: - linux_64_python3.10.____cpython: - CONFIG: linux_64_python3.10.____cpython + linux_64_numpy1.22python3.10.____cpython: + CONFIG: linux_64_numpy1.22python3.10.____cpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_64_python3.11.____cpython: - CONFIG: linux_64_python3.11.____cpython + linux_64_numpy1.23python3.11.____cpython: + CONFIG: linux_64_numpy1.23python3.11.____cpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_64_python3.12.____cpython: - CONFIG: linux_64_python3.12.____cpython + linux_64_numpy1.26python3.12.____cpython: + CONFIG: linux_64_numpy1.26python3.12.____cpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_aarch64_python3.10.____cpython: - CONFIG: linux_aarch64_python3.10.____cpython + linux_aarch64_numpy1.22python3.10.____cpython: + CONFIG: linux_aarch64_numpy1.22python3.10.____cpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_aarch64_python3.11.____cpython: - CONFIG: linux_aarch64_python3.11.____cpython + linux_aarch64_numpy1.23python3.11.____cpython: + CONFIG: linux_aarch64_numpy1.23python3.11.____cpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_aarch64_python3.12.____cpython: - CONFIG: linux_aarch64_python3.12.____cpython + linux_aarch64_numpy1.26python3.12.____cpython: + CONFIG: linux_aarch64_numpy1.26python3.12.____cpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_ppc64le_python3.10.____cpython: - CONFIG: linux_ppc64le_python3.10.____cpython + linux_ppc64le_numpy1.22python3.10.____cpython: + CONFIG: linux_ppc64le_numpy1.22python3.10.____cpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_ppc64le_python3.11.____cpython: - CONFIG: linux_ppc64le_python3.11.____cpython + linux_ppc64le_numpy1.23python3.11.____cpython: + CONFIG: linux_ppc64le_numpy1.23python3.11.____cpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_ppc64le_python3.12.____cpython: - CONFIG: linux_ppc64le_python3.12.____cpython + linux_ppc64le_numpy1.26python3.12.____cpython: + CONFIG: linux_ppc64le_numpy1.26python3.12.____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 90a84b3..a3383f4 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_python3.10.____cpython: - CONFIG: osx_64_python3.10.____cpython + osx_64_numpy1.22python3.10.____cpython: + CONFIG: osx_64_numpy1.22python3.10.____cpython UPLOAD_PACKAGES: 'True' - osx_64_python3.11.____cpython: - CONFIG: osx_64_python3.11.____cpython + osx_64_numpy1.23python3.11.____cpython: + CONFIG: osx_64_numpy1.23python3.11.____cpython UPLOAD_PACKAGES: 'True' - osx_64_python3.12.____cpython: - CONFIG: osx_64_python3.12.____cpython + osx_64_numpy1.26python3.12.____cpython: + CONFIG: osx_64_numpy1.26python3.12.____cpython UPLOAD_PACKAGES: 'True' - osx_arm64_python3.10.____cpython: - CONFIG: osx_arm64_python3.10.____cpython + osx_arm64_numpy1.22python3.10.____cpython: + CONFIG: osx_arm64_numpy1.22python3.10.____cpython UPLOAD_PACKAGES: 'True' - osx_arm64_python3.11.____cpython: - CONFIG: osx_arm64_python3.11.____cpython + osx_arm64_numpy1.23python3.11.____cpython: + CONFIG: osx_arm64_numpy1.23python3.11.____cpython UPLOAD_PACKAGES: 'True' - osx_arm64_python3.12.____cpython: - CONFIG: osx_arm64_python3.12.____cpython + osx_arm64_numpy1.26python3.12.____cpython: + CONFIG: osx_arm64_numpy1.26python3.12.____cpython UPLOAD_PACKAGES: 'True' timeoutInMinutes: 360 variables: {} diff --git a/.azure-pipelines/azure-pipelines-win.yml b/.azure-pipelines/azure-pipelines-win.yml index 65f8109..4223d72 100755 --- a/.azure-pipelines/azure-pipelines-win.yml +++ b/.azure-pipelines/azure-pipelines-win.yml @@ -8,14 +8,14 @@ jobs: vmImage: windows-2022 strategy: matrix: - win_64_python3.10.____cpython: - CONFIG: win_64_python3.10.____cpython + win_64_numpy1.22python3.10.____cpython: + CONFIG: win_64_numpy1.22python3.10.____cpython UPLOAD_PACKAGES: 'True' - win_64_python3.11.____cpython: - CONFIG: win_64_python3.11.____cpython + win_64_numpy1.23python3.11.____cpython: + CONFIG: win_64_numpy1.23python3.11.____cpython UPLOAD_PACKAGES: 'True' - win_64_python3.12.____cpython: - CONFIG: win_64_python3.12.____cpython + win_64_numpy1.26python3.12.____cpython: + CONFIG: win_64_numpy1.26python3.12.____cpython UPLOAD_PACKAGES: 'True' timeoutInMinutes: 360 variables: diff --git a/.ci_support/linux_64_python3.10.____cpython.yaml b/.ci_support/linux_64_numpy1.22python3.10.____cpython.yaml similarity index 93% rename from .ci_support/linux_64_python3.10.____cpython.yaml rename to .ci_support/linux_64_numpy1.22python3.10.____cpython.yaml index 30d84e0..3895d3b 100644 --- a/.ci_support/linux_64_python3.10.____cpython.yaml +++ b/.ci_support/linux_64_numpy1.22python3.10.____cpython.yaml @@ -18,6 +18,8 @@ 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 @@ -31,3 +33,5 @@ zip_keys: - cxx_compiler_version - - c_stdlib_version - cdt_name +- - python + - numpy diff --git a/.ci_support/linux_64_python3.11.____cpython.yaml b/.ci_support/linux_64_numpy1.23python3.11.____cpython.yaml similarity index 93% rename from .ci_support/linux_64_python3.11.____cpython.yaml rename to .ci_support/linux_64_numpy1.23python3.11.____cpython.yaml index 4926889..9cdfc27 100644 --- a/.ci_support/linux_64_python3.11.____cpython.yaml +++ b/.ci_support/linux_64_numpy1.23python3.11.____cpython.yaml @@ -18,6 +18,8 @@ cxx_compiler_version: - '12' docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 +numpy: +- '1.23' pin_run_as_build: python: min_pin: x.x @@ -31,3 +33,5 @@ zip_keys: - cxx_compiler_version - - c_stdlib_version - cdt_name +- - python + - numpy diff --git a/.ci_support/linux_64_python3.12.____cpython.yaml b/.ci_support/linux_64_numpy1.26python3.12.____cpython.yaml similarity index 93% rename from .ci_support/linux_64_python3.12.____cpython.yaml rename to .ci_support/linux_64_numpy1.26python3.12.____cpython.yaml index c5079da..896a6f1 100644 --- a/.ci_support/linux_64_python3.12.____cpython.yaml +++ b/.ci_support/linux_64_numpy1.26python3.12.____cpython.yaml @@ -18,6 +18,8 @@ cxx_compiler_version: - '12' docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 +numpy: +- '1.26' pin_run_as_build: python: min_pin: x.x @@ -31,3 +33,5 @@ zip_keys: - cxx_compiler_version - - c_stdlib_version - cdt_name +- - python + - numpy diff --git a/.ci_support/linux_aarch64_python3.10.____cpython.yaml b/.ci_support/linux_aarch64_numpy1.22python3.10.____cpython.yaml similarity index 93% rename from .ci_support/linux_aarch64_python3.10.____cpython.yaml rename to .ci_support/linux_aarch64_numpy1.22python3.10.____cpython.yaml index 54c6f5f..a6c0c5b 100644 --- a/.ci_support/linux_aarch64_python3.10.____cpython.yaml +++ b/.ci_support/linux_aarch64_numpy1.22python3.10.____cpython.yaml @@ -22,6 +22,8 @@ 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 @@ -35,3 +37,5 @@ zip_keys: - cxx_compiler_version - - c_stdlib_version - cdt_name +- - python + - numpy diff --git a/.ci_support/linux_aarch64_python3.11.____cpython.yaml b/.ci_support/linux_aarch64_numpy1.23python3.11.____cpython.yaml similarity index 93% rename from .ci_support/linux_aarch64_python3.11.____cpython.yaml rename to .ci_support/linux_aarch64_numpy1.23python3.11.____cpython.yaml index a07dd33..4f575f5 100644 --- a/.ci_support/linux_aarch64_python3.11.____cpython.yaml +++ b/.ci_support/linux_aarch64_numpy1.23python3.11.____cpython.yaml @@ -22,6 +22,8 @@ cxx_compiler_version: - '12' docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 +numpy: +- '1.23' pin_run_as_build: python: min_pin: x.x @@ -35,3 +37,5 @@ zip_keys: - cxx_compiler_version - - c_stdlib_version - cdt_name +- - python + - numpy diff --git a/.ci_support/linux_aarch64_python3.12.____cpython.yaml b/.ci_support/linux_aarch64_numpy1.26python3.12.____cpython.yaml similarity index 93% rename from .ci_support/linux_aarch64_python3.12.____cpython.yaml rename to .ci_support/linux_aarch64_numpy1.26python3.12.____cpython.yaml index 6d3d055..2f548d2 100644 --- a/.ci_support/linux_aarch64_python3.12.____cpython.yaml +++ b/.ci_support/linux_aarch64_numpy1.26python3.12.____cpython.yaml @@ -22,6 +22,8 @@ cxx_compiler_version: - '12' docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 +numpy: +- '1.26' pin_run_as_build: python: min_pin: x.x @@ -35,3 +37,5 @@ zip_keys: - cxx_compiler_version - - c_stdlib_version - cdt_name +- - python + - numpy diff --git a/.ci_support/linux_ppc64le_python3.10.____cpython.yaml b/.ci_support/linux_ppc64le_numpy1.22python3.10.____cpython.yaml similarity index 93% rename from .ci_support/linux_ppc64le_python3.10.____cpython.yaml rename to .ci_support/linux_ppc64le_numpy1.22python3.10.____cpython.yaml index 113739f..9f79a54 100644 --- a/.ci_support/linux_ppc64le_python3.10.____cpython.yaml +++ b/.ci_support/linux_ppc64le_numpy1.22python3.10.____cpython.yaml @@ -18,6 +18,8 @@ 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 @@ -31,3 +33,5 @@ zip_keys: - cxx_compiler_version - - c_stdlib_version - cdt_name +- - python + - numpy diff --git a/.ci_support/linux_ppc64le_python3.11.____cpython.yaml b/.ci_support/linux_ppc64le_numpy1.23python3.11.____cpython.yaml similarity index 93% rename from .ci_support/linux_ppc64le_python3.11.____cpython.yaml rename to .ci_support/linux_ppc64le_numpy1.23python3.11.____cpython.yaml index 7fa928b..a97bf29 100644 --- a/.ci_support/linux_ppc64le_python3.11.____cpython.yaml +++ b/.ci_support/linux_ppc64le_numpy1.23python3.11.____cpython.yaml @@ -18,6 +18,8 @@ cxx_compiler_version: - '12' docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 +numpy: +- '1.23' pin_run_as_build: python: min_pin: x.x @@ -31,3 +33,5 @@ zip_keys: - cxx_compiler_version - - c_stdlib_version - cdt_name +- - python + - numpy diff --git a/.ci_support/linux_ppc64le_python3.12.____cpython.yaml b/.ci_support/linux_ppc64le_numpy1.26python3.12.____cpython.yaml similarity index 93% rename from .ci_support/linux_ppc64le_python3.12.____cpython.yaml rename to .ci_support/linux_ppc64le_numpy1.26python3.12.____cpython.yaml index 54bca3a..bcd318c 100644 --- a/.ci_support/linux_ppc64le_python3.12.____cpython.yaml +++ b/.ci_support/linux_ppc64le_numpy1.26python3.12.____cpython.yaml @@ -18,6 +18,8 @@ cxx_compiler_version: - '12' docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 +numpy: +- '1.26' pin_run_as_build: python: min_pin: x.x @@ -31,3 +33,5 @@ zip_keys: - cxx_compiler_version - - c_stdlib_version - cdt_name +- - python + - numpy diff --git a/.ci_support/osx_64_python3.10.____cpython.yaml b/.ci_support/osx_64_numpy1.22python3.10.____cpython.yaml similarity index 93% rename from .ci_support/osx_64_python3.10.____cpython.yaml rename to .ci_support/osx_64_numpy1.22python3.10.____cpython.yaml index 80b9b8f..06541b4 100644 --- a/.ci_support/osx_64_python3.10.____cpython.yaml +++ b/.ci_support/osx_64_numpy1.22python3.10.____cpython.yaml @@ -20,6 +20,8 @@ cxx_compiler_version: - '16' macos_machine: - x86_64-apple-darwin13.4.0 +numpy: +- '1.22' pin_run_as_build: python: min_pin: x.x @@ -31,3 +33,5 @@ target_platform: zip_keys: - - c_compiler_version - cxx_compiler_version +- - python + - numpy diff --git a/.ci_support/osx_64_python3.11.____cpython.yaml b/.ci_support/osx_64_numpy1.23python3.11.____cpython.yaml similarity index 93% rename from .ci_support/osx_64_python3.11.____cpython.yaml rename to .ci_support/osx_64_numpy1.23python3.11.____cpython.yaml index e07a33c..b4d1b27 100644 --- a/.ci_support/osx_64_python3.11.____cpython.yaml +++ b/.ci_support/osx_64_numpy1.23python3.11.____cpython.yaml @@ -20,6 +20,8 @@ cxx_compiler_version: - '16' macos_machine: - x86_64-apple-darwin13.4.0 +numpy: +- '1.23' pin_run_as_build: python: min_pin: x.x @@ -31,3 +33,5 @@ target_platform: zip_keys: - - c_compiler_version - cxx_compiler_version +- - python + - numpy diff --git a/.ci_support/osx_64_python3.12.____cpython.yaml b/.ci_support/osx_64_numpy1.26python3.12.____cpython.yaml similarity index 93% rename from .ci_support/osx_64_python3.12.____cpython.yaml rename to .ci_support/osx_64_numpy1.26python3.12.____cpython.yaml index aa501a7..e8df64b 100644 --- a/.ci_support/osx_64_python3.12.____cpython.yaml +++ b/.ci_support/osx_64_numpy1.26python3.12.____cpython.yaml @@ -20,6 +20,8 @@ cxx_compiler_version: - '16' macos_machine: - x86_64-apple-darwin13.4.0 +numpy: +- '1.26' pin_run_as_build: python: min_pin: x.x @@ -31,3 +33,5 @@ target_platform: zip_keys: - - c_compiler_version - cxx_compiler_version +- - python + - numpy diff --git a/.ci_support/osx_arm64_python3.10.____cpython.yaml b/.ci_support/osx_arm64_numpy1.22python3.10.____cpython.yaml similarity index 93% rename from .ci_support/osx_arm64_python3.10.____cpython.yaml rename to .ci_support/osx_arm64_numpy1.22python3.10.____cpython.yaml index 0d50040..404bb84 100644 --- a/.ci_support/osx_arm64_python3.10.____cpython.yaml +++ b/.ci_support/osx_arm64_numpy1.22python3.10.____cpython.yaml @@ -20,6 +20,8 @@ cxx_compiler_version: - '16' macos_machine: - arm64-apple-darwin20.0.0 +numpy: +- '1.22' pin_run_as_build: python: min_pin: x.x @@ -31,3 +33,5 @@ target_platform: zip_keys: - - c_compiler_version - cxx_compiler_version +- - python + - numpy diff --git a/.ci_support/osx_arm64_python3.11.____cpython.yaml b/.ci_support/osx_arm64_numpy1.23python3.11.____cpython.yaml similarity index 93% rename from .ci_support/osx_arm64_python3.11.____cpython.yaml rename to .ci_support/osx_arm64_numpy1.23python3.11.____cpython.yaml index 2ee862d..6b6fe86 100644 --- a/.ci_support/osx_arm64_python3.11.____cpython.yaml +++ b/.ci_support/osx_arm64_numpy1.23python3.11.____cpython.yaml @@ -20,6 +20,8 @@ cxx_compiler_version: - '16' macos_machine: - arm64-apple-darwin20.0.0 +numpy: +- '1.23' pin_run_as_build: python: min_pin: x.x @@ -31,3 +33,5 @@ target_platform: zip_keys: - - c_compiler_version - cxx_compiler_version +- - python + - numpy diff --git a/.ci_support/osx_arm64_python3.12.____cpython.yaml b/.ci_support/osx_arm64_numpy1.26python3.12.____cpython.yaml similarity index 93% rename from .ci_support/osx_arm64_python3.12.____cpython.yaml rename to .ci_support/osx_arm64_numpy1.26python3.12.____cpython.yaml index 2ff359e..d0b139a 100644 --- a/.ci_support/osx_arm64_python3.12.____cpython.yaml +++ b/.ci_support/osx_arm64_numpy1.26python3.12.____cpython.yaml @@ -20,6 +20,8 @@ cxx_compiler_version: - '16' macos_machine: - arm64-apple-darwin20.0.0 +numpy: +- '1.26' pin_run_as_build: python: min_pin: x.x @@ -31,3 +33,5 @@ target_platform: zip_keys: - - c_compiler_version - cxx_compiler_version +- - python + - numpy diff --git a/.ci_support/win_64_python3.10.____cpython.yaml b/.ci_support/win_64_numpy1.22python3.10.____cpython.yaml similarity index 83% rename from .ci_support/win_64_python3.10.____cpython.yaml rename to .ci_support/win_64_numpy1.22python3.10.____cpython.yaml index 2406cbf..f32a724 100644 --- a/.ci_support/win_64_python3.10.____cpython.yaml +++ b/.ci_support/win_64_numpy1.22python3.10.____cpython.yaml @@ -8,6 +8,8 @@ channel_targets: - conda-forge main cxx_compiler: - vs2019 +numpy: +- '1.22' pin_run_as_build: python: min_pin: x.x @@ -16,3 +18,6 @@ python: - 3.10.* *_cpython target_platform: - win-64 +zip_keys: +- - python + - numpy diff --git a/.ci_support/win_64_python3.11.____cpython.yaml b/.ci_support/win_64_numpy1.23python3.11.____cpython.yaml similarity index 83% rename from .ci_support/win_64_python3.11.____cpython.yaml rename to .ci_support/win_64_numpy1.23python3.11.____cpython.yaml index 25ebdff..f2e4ab2 100644 --- a/.ci_support/win_64_python3.11.____cpython.yaml +++ b/.ci_support/win_64_numpy1.23python3.11.____cpython.yaml @@ -8,6 +8,8 @@ channel_targets: - conda-forge main cxx_compiler: - vs2019 +numpy: +- '1.23' pin_run_as_build: python: min_pin: x.x @@ -16,3 +18,6 @@ python: - 3.11.* *_cpython target_platform: - win-64 +zip_keys: +- - python + - numpy diff --git a/.ci_support/win_64_python3.12.____cpython.yaml b/.ci_support/win_64_numpy1.26python3.12.____cpython.yaml similarity index 83% rename from .ci_support/win_64_python3.12.____cpython.yaml rename to .ci_support/win_64_numpy1.26python3.12.____cpython.yaml index c768642..ebc0cea 100644 --- a/.ci_support/win_64_python3.12.____cpython.yaml +++ b/.ci_support/win_64_numpy1.26python3.12.____cpython.yaml @@ -8,6 +8,8 @@ channel_targets: - conda-forge main cxx_compiler: - vs2019 +numpy: +- '1.26' pin_run_as_build: python: min_pin: x.x @@ -16,3 +18,6 @@ python: - 3.12.* *_cpython target_platform: - win-64 +zip_keys: +- - python + - numpy diff --git a/README.md b/README.md index 5d82684..75e5c31 100644 --- a/README.md +++ b/README.md @@ -27,129 +27,129 @@ Current build status - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + From f2bd6bc80da4936864ec841058c75f60cf066d68 Mon Sep 17 00:00:00 2001 From: David Stansby Date: Mon, 12 Aug 2024 13:05:00 +0100 Subject: [PATCH 07/16] Add numpy as build dep for cross compiling --- recipe/meta.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 4c7b677..0fe1907 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -28,6 +28,7 @@ requirements: - {{ stdlib('c') }} - {{ compiler('c') }} - {{ compiler('cxx') }} + - numpy # [build_platform != target_platform] host: - python - pip From 1057acb96a3f9658f1242409f914a529c825ad9f Mon Sep 17 00:00:00 2001 From: David Stansby Date: Mon, 19 Aug 2024 20:03:43 +0100 Subject: [PATCH 08/16] Patch to change way assembly files are included --- recipe/meta.yaml | 3 +++ recipe/patches/including_assmembly.patch | 19 +++++++++++++++++++ 2 files changed, 22 insertions(+) create mode 100644 recipe/patches/including_assmembly.patch diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 0fe1907..08f1a2b 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -8,6 +8,9 @@ package: source: url: https://pypi.io/packages/source/{{ name[0] }}/{{ name }}/{{ name }}-{{ version }}.tar.gz sha256: ba4fac7036ea5a078c7afe1d4dffeb9685080d42f19c9c16b12dad866703aa2e + patches: + # Fix the way assembly files are included on x86_64 + - patches/including_assmembly.patch build: number: 0 diff --git a/recipe/patches/including_assmembly.patch b/recipe/patches/including_assmembly.patch new file mode 100644 index 0000000..7339b37 --- /dev/null +++ b/recipe/patches/including_assmembly.patch @@ -0,0 +1,19 @@ +diff --git a/setup.py b/setup.py +index e594a20..815224a 100644 +--- a/setup.py ++++ b/setup.py +@@ -8,6 +8,7 @@ from setuptools import Extension, setup + from setuptools.errors import CCompilerError, ExecError, PlatformError + from distutils import ccompiler + from distutils.command.clean import clean ++from distutils.sysconfig import customize_compiler + + # determine CPU support for SSE2 and AVX2 + cpu_info = cpuinfo.get_cpu_info() +@@ -325,6 +326,7 @@ class ve_build_ext(build_ext): + if cpuinfo.platform.machine() == 'x86_64': + S_files = glob('c-blosc/internal-complibs/zstd*/decompress/*amd64.S') + compiler = ccompiler.new_compiler() ++ customize_compiler(compiler) + compiler.src_extensions.append('.S') + compiler.compile(S_files) From e4cd89b834f1848f3ac3a7e40053ca75b9bde133 Mon Sep 17 00:00:00 2001 From: jakirkham Date: Mon, 19 Aug 2024 12:31:36 -0700 Subject: [PATCH 09/16] Add NumPy 2 migrator --- .ci_support/migrations/numpy2.yaml | 53 ++++++++++++++++++++++++++++++ 1 file changed, 53 insertions(+) create mode 100644 .ci_support/migrations/numpy2.yaml diff --git a/.ci_support/migrations/numpy2.yaml b/.ci_support/migrations/numpy2.yaml new file mode 100644 index 0000000..137dd09 --- /dev/null +++ b/.ci_support/migrations/numpy2.yaml @@ -0,0 +1,53 @@ +__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, you will still need to add the lower bound for the numpy version, + in line with what the upstream package requires. The default lower bound from + the run-export is `>=1.19`; if your package needs a newer version than that, + please add `numpy >=x.y` under `run:`. + + Finally, 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, double-check their supported numpy versions. + * If upstream requires a minimum numpy version newer than 1.19, you need to 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 From b7e81b066a68cfc04f7afe56a9d94b9893c9fbe5 Mon Sep 17 00:00:00 2001 From: "conda-forge-webservices[bot]" <91080706+conda-forge-webservices[bot]@users.noreply.github.com> Date: Mon, 19 Aug 2024 19:34:49 +0000 Subject: [PATCH 10/16] MNT: Re-rendered with conda-build 24.7.1, conda-smithy 3.38.0, and conda-forge-pinning 2024.08.19.18.48.04 --- .azure-pipelines/azure-pipelines-linux.yml | 36 +++++----- .azure-pipelines/azure-pipelines-osx.yml | 24 +++---- .azure-pipelines/azure-pipelines-win.yml | 12 ++-- ...ux_64_numpy2.0python3.10.____cpython.yaml} | 2 +- ...ux_64_numpy2.0python3.11.____cpython.yaml} | 2 +- ...ux_64_numpy2.0python3.12.____cpython.yaml} | 2 +- ...rch64_numpy2.0python3.10.____cpython.yaml} | 2 +- ...rch64_numpy2.0python3.11.____cpython.yaml} | 2 +- ...rch64_numpy2.0python3.12.____cpython.yaml} | 2 +- ...c64le_numpy2.0python3.10.____cpython.yaml} | 2 +- ...c64le_numpy2.0python3.11.____cpython.yaml} | 2 +- ...c64le_numpy2.0python3.12.____cpython.yaml} | 2 +- ...sx_64_numpy2.0python3.10.____cpython.yaml} | 2 +- ...sx_64_numpy2.0python3.11.____cpython.yaml} | 2 +- ...sx_64_numpy2.0python3.12.____cpython.yaml} | 2 +- ...arm64_numpy2.0python3.10.____cpython.yaml} | 2 +- ...arm64_numpy2.0python3.11.____cpython.yaml} | 2 +- ...arm64_numpy2.0python3.12.____cpython.yaml} | 2 +- ...in_64_numpy2.0python3.10.____cpython.yaml} | 2 +- ...in_64_numpy2.0python3.11.____cpython.yaml} | 2 +- ...in_64_numpy2.0python3.12.____cpython.yaml} | 2 +- README.md | 72 +++++++++---------- 22 files changed, 90 insertions(+), 90 deletions(-) rename .ci_support/{linux_64_numpy1.22python3.10.____cpython.yaml => linux_64_numpy2.0python3.10.____cpython.yaml} (98%) rename .ci_support/{linux_64_numpy1.23python3.11.____cpython.yaml => linux_64_numpy2.0python3.11.____cpython.yaml} (98%) rename .ci_support/{linux_64_numpy1.26python3.12.____cpython.yaml => linux_64_numpy2.0python3.12.____cpython.yaml} (98%) rename .ci_support/{linux_aarch64_numpy1.22python3.10.____cpython.yaml => linux_aarch64_numpy2.0python3.10.____cpython.yaml} (98%) rename .ci_support/{linux_aarch64_numpy1.23python3.11.____cpython.yaml => linux_aarch64_numpy2.0python3.11.____cpython.yaml} (98%) rename .ci_support/{linux_aarch64_numpy1.26python3.12.____cpython.yaml => linux_aarch64_numpy2.0python3.12.____cpython.yaml} (98%) rename .ci_support/{linux_ppc64le_numpy1.22python3.10.____cpython.yaml => linux_ppc64le_numpy2.0python3.10.____cpython.yaml} (98%) rename .ci_support/{linux_ppc64le_numpy1.23python3.11.____cpython.yaml => linux_ppc64le_numpy2.0python3.11.____cpython.yaml} (98%) rename .ci_support/{linux_ppc64le_numpy1.26python3.12.____cpython.yaml => linux_ppc64le_numpy2.0python3.12.____cpython.yaml} (98%) rename .ci_support/{osx_64_numpy1.22python3.10.____cpython.yaml => osx_64_numpy2.0python3.10.____cpython.yaml} (98%) rename .ci_support/{osx_64_numpy1.23python3.11.____cpython.yaml => osx_64_numpy2.0python3.11.____cpython.yaml} (98%) rename .ci_support/{osx_64_numpy1.26python3.12.____cpython.yaml => osx_64_numpy2.0python3.12.____cpython.yaml} (98%) rename .ci_support/{osx_arm64_numpy1.22python3.10.____cpython.yaml => osx_arm64_numpy2.0python3.10.____cpython.yaml} (98%) rename .ci_support/{osx_arm64_numpy1.23python3.11.____cpython.yaml => osx_arm64_numpy2.0python3.11.____cpython.yaml} (98%) rename .ci_support/{osx_arm64_numpy1.26python3.12.____cpython.yaml => osx_arm64_numpy2.0python3.12.____cpython.yaml} (98%) rename .ci_support/{win_64_numpy1.22python3.10.____cpython.yaml => win_64_numpy2.0python3.10.____cpython.yaml} (96%) rename .ci_support/{win_64_numpy1.23python3.11.____cpython.yaml => win_64_numpy2.0python3.11.____cpython.yaml} (96%) rename .ci_support/{win_64_numpy1.26python3.12.____cpython.yaml => win_64_numpy2.0python3.12.____cpython.yaml} (96%) diff --git a/.azure-pipelines/azure-pipelines-linux.yml b/.azure-pipelines/azure-pipelines-linux.yml index e8056f1..bb1dd02 100755 --- a/.azure-pipelines/azure-pipelines-linux.yml +++ b/.azure-pipelines/azure-pipelines-linux.yml @@ -8,40 +8,40 @@ jobs: vmImage: ubuntu-latest strategy: matrix: - linux_64_numpy1.22python3.10.____cpython: - CONFIG: linux_64_numpy1.22python3.10.____cpython + linux_64_numpy2.0python3.10.____cpython: + CONFIG: linux_64_numpy2.0python3.10.____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_numpy2.0python3.11.____cpython: + CONFIG: linux_64_numpy2.0python3.11.____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_numpy2.0python3.12.____cpython: + CONFIG: linux_64_numpy2.0python3.12.____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_numpy2.0python3.10.____cpython: + CONFIG: linux_aarch64_numpy2.0python3.10.____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_numpy2.0python3.11.____cpython: + CONFIG: linux_aarch64_numpy2.0python3.11.____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_numpy2.0python3.12.____cpython: + CONFIG: linux_aarch64_numpy2.0python3.12.____cpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_ppc64le_numpy1.22python3.10.____cpython: - CONFIG: linux_ppc64le_numpy1.22python3.10.____cpython + linux_ppc64le_numpy2.0python3.10.____cpython: + CONFIG: linux_ppc64le_numpy2.0python3.10.____cpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_ppc64le_numpy1.23python3.11.____cpython: - CONFIG: linux_ppc64le_numpy1.23python3.11.____cpython + linux_ppc64le_numpy2.0python3.11.____cpython: + CONFIG: linux_ppc64le_numpy2.0python3.11.____cpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_ppc64le_numpy1.26python3.12.____cpython: - CONFIG: linux_ppc64le_numpy1.26python3.12.____cpython + linux_ppc64le_numpy2.0python3.12.____cpython: + CONFIG: linux_ppc64le_numpy2.0python3.12.____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 a3383f4..e8e2708 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_numpy2.0python3.10.____cpython: + CONFIG: osx_64_numpy2.0python3.10.____cpython UPLOAD_PACKAGES: 'True' - osx_64_numpy1.23python3.11.____cpython: - CONFIG: osx_64_numpy1.23python3.11.____cpython + osx_64_numpy2.0python3.11.____cpython: + CONFIG: osx_64_numpy2.0python3.11.____cpython UPLOAD_PACKAGES: 'True' - osx_64_numpy1.26python3.12.____cpython: - CONFIG: osx_64_numpy1.26python3.12.____cpython + osx_64_numpy2.0python3.12.____cpython: + CONFIG: osx_64_numpy2.0python3.12.____cpython UPLOAD_PACKAGES: 'True' - osx_arm64_numpy1.22python3.10.____cpython: - CONFIG: osx_arm64_numpy1.22python3.10.____cpython + osx_arm64_numpy2.0python3.10.____cpython: + CONFIG: osx_arm64_numpy2.0python3.10.____cpython UPLOAD_PACKAGES: 'True' - osx_arm64_numpy1.23python3.11.____cpython: - CONFIG: osx_arm64_numpy1.23python3.11.____cpython + osx_arm64_numpy2.0python3.11.____cpython: + CONFIG: osx_arm64_numpy2.0python3.11.____cpython UPLOAD_PACKAGES: 'True' - osx_arm64_numpy1.26python3.12.____cpython: - CONFIG: osx_arm64_numpy1.26python3.12.____cpython + osx_arm64_numpy2.0python3.12.____cpython: + CONFIG: osx_arm64_numpy2.0python3.12.____cpython UPLOAD_PACKAGES: 'True' timeoutInMinutes: 360 variables: {} diff --git a/.azure-pipelines/azure-pipelines-win.yml b/.azure-pipelines/azure-pipelines-win.yml index 4223d72..f8c66f0 100755 --- a/.azure-pipelines/azure-pipelines-win.yml +++ b/.azure-pipelines/azure-pipelines-win.yml @@ -8,14 +8,14 @@ jobs: vmImage: windows-2022 strategy: matrix: - win_64_numpy1.22python3.10.____cpython: - CONFIG: win_64_numpy1.22python3.10.____cpython + win_64_numpy2.0python3.10.____cpython: + CONFIG: win_64_numpy2.0python3.10.____cpython UPLOAD_PACKAGES: 'True' - win_64_numpy1.23python3.11.____cpython: - CONFIG: win_64_numpy1.23python3.11.____cpython + win_64_numpy2.0python3.11.____cpython: + CONFIG: win_64_numpy2.0python3.11.____cpython UPLOAD_PACKAGES: 'True' - win_64_numpy1.26python3.12.____cpython: - CONFIG: win_64_numpy1.26python3.12.____cpython + win_64_numpy2.0python3.12.____cpython: + CONFIG: win_64_numpy2.0python3.12.____cpython UPLOAD_PACKAGES: 'True' timeoutInMinutes: 360 variables: diff --git a/.ci_support/linux_64_numpy1.22python3.10.____cpython.yaml b/.ci_support/linux_64_numpy2.0python3.10.____cpython.yaml similarity index 98% rename from .ci_support/linux_64_numpy1.22python3.10.____cpython.yaml rename to .ci_support/linux_64_numpy2.0python3.10.____cpython.yaml index 3895d3b..7598a3e 100644 --- a/.ci_support/linux_64_numpy1.22python3.10.____cpython.yaml +++ b/.ci_support/linux_64_numpy2.0python3.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_64_numpy1.23python3.11.____cpython.yaml b/.ci_support/linux_64_numpy2.0python3.11.____cpython.yaml similarity index 98% rename from .ci_support/linux_64_numpy1.23python3.11.____cpython.yaml rename to .ci_support/linux_64_numpy2.0python3.11.____cpython.yaml index 9cdfc27..90e287e 100644 --- a/.ci_support/linux_64_numpy1.23python3.11.____cpython.yaml +++ b/.ci_support/linux_64_numpy2.0python3.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_64_numpy1.26python3.12.____cpython.yaml b/.ci_support/linux_64_numpy2.0python3.12.____cpython.yaml similarity index 98% rename from .ci_support/linux_64_numpy1.26python3.12.____cpython.yaml rename to .ci_support/linux_64_numpy2.0python3.12.____cpython.yaml index 896a6f1..dcf1660 100644 --- a/.ci_support/linux_64_numpy1.26python3.12.____cpython.yaml +++ b/.ci_support/linux_64_numpy2.0python3.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.10.____cpython.yaml b/.ci_support/linux_aarch64_numpy2.0python3.10.____cpython.yaml similarity index 98% rename from .ci_support/linux_aarch64_numpy1.22python3.10.____cpython.yaml rename to .ci_support/linux_aarch64_numpy2.0python3.10.____cpython.yaml index a6c0c5b..c6b92fb 100644 --- a/.ci_support/linux_aarch64_numpy1.22python3.10.____cpython.yaml +++ b/.ci_support/linux_aarch64_numpy2.0python3.10.____cpython.yaml @@ -23,7 +23,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_numpy2.0python3.11.____cpython.yaml similarity index 98% rename from .ci_support/linux_aarch64_numpy1.23python3.11.____cpython.yaml rename to .ci_support/linux_aarch64_numpy2.0python3.11.____cpython.yaml index 4f575f5..ec5850d 100644 --- a/.ci_support/linux_aarch64_numpy1.23python3.11.____cpython.yaml +++ b/.ci_support/linux_aarch64_numpy2.0python3.11.____cpython.yaml @@ -23,7 +23,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_numpy2.0python3.12.____cpython.yaml similarity index 98% rename from .ci_support/linux_aarch64_numpy1.26python3.12.____cpython.yaml rename to .ci_support/linux_aarch64_numpy2.0python3.12.____cpython.yaml index 2f548d2..900d817 100644 --- a/.ci_support/linux_aarch64_numpy1.26python3.12.____cpython.yaml +++ b/.ci_support/linux_aarch64_numpy2.0python3.12.____cpython.yaml @@ -23,7 +23,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_ppc64le_numpy1.22python3.10.____cpython.yaml b/.ci_support/linux_ppc64le_numpy2.0python3.10.____cpython.yaml similarity index 98% rename from .ci_support/linux_ppc64le_numpy1.22python3.10.____cpython.yaml rename to .ci_support/linux_ppc64le_numpy2.0python3.10.____cpython.yaml index 9f79a54..6114e74 100644 --- a/.ci_support/linux_ppc64le_numpy1.22python3.10.____cpython.yaml +++ b/.ci_support/linux_ppc64le_numpy2.0python3.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_ppc64le_numpy1.23python3.11.____cpython.yaml b/.ci_support/linux_ppc64le_numpy2.0python3.11.____cpython.yaml similarity index 98% rename from .ci_support/linux_ppc64le_numpy1.23python3.11.____cpython.yaml rename to .ci_support/linux_ppc64le_numpy2.0python3.11.____cpython.yaml index a97bf29..6ea1d00 100644 --- a/.ci_support/linux_ppc64le_numpy1.23python3.11.____cpython.yaml +++ b/.ci_support/linux_ppc64le_numpy2.0python3.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_ppc64le_numpy1.26python3.12.____cpython.yaml b/.ci_support/linux_ppc64le_numpy2.0python3.12.____cpython.yaml similarity index 98% rename from .ci_support/linux_ppc64le_numpy1.26python3.12.____cpython.yaml rename to .ci_support/linux_ppc64le_numpy2.0python3.12.____cpython.yaml index bcd318c..69cd6ef 100644 --- a/.ci_support/linux_ppc64le_numpy1.26python3.12.____cpython.yaml +++ b/.ci_support/linux_ppc64le_numpy2.0python3.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/osx_64_numpy1.22python3.10.____cpython.yaml b/.ci_support/osx_64_numpy2.0python3.10.____cpython.yaml similarity index 98% rename from .ci_support/osx_64_numpy1.22python3.10.____cpython.yaml rename to .ci_support/osx_64_numpy2.0python3.10.____cpython.yaml index 06541b4..0588715 100644 --- a/.ci_support/osx_64_numpy1.22python3.10.____cpython.yaml +++ b/.ci_support/osx_64_numpy2.0python3.10.____cpython.yaml @@ -21,7 +21,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_numpy2.0python3.11.____cpython.yaml similarity index 98% rename from .ci_support/osx_64_numpy1.23python3.11.____cpython.yaml rename to .ci_support/osx_64_numpy2.0python3.11.____cpython.yaml index b4d1b27..ba94b88 100644 --- a/.ci_support/osx_64_numpy1.23python3.11.____cpython.yaml +++ b/.ci_support/osx_64_numpy2.0python3.11.____cpython.yaml @@ -21,7 +21,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_numpy2.0python3.12.____cpython.yaml similarity index 98% rename from .ci_support/osx_64_numpy1.26python3.12.____cpython.yaml rename to .ci_support/osx_64_numpy2.0python3.12.____cpython.yaml index e8df64b..14576b3 100644 --- a/.ci_support/osx_64_numpy1.26python3.12.____cpython.yaml +++ b/.ci_support/osx_64_numpy2.0python3.12.____cpython.yaml @@ -21,7 +21,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_arm64_numpy1.22python3.10.____cpython.yaml b/.ci_support/osx_arm64_numpy2.0python3.10.____cpython.yaml similarity index 98% rename from .ci_support/osx_arm64_numpy1.22python3.10.____cpython.yaml rename to .ci_support/osx_arm64_numpy2.0python3.10.____cpython.yaml index 404bb84..2d3ca25 100644 --- a/.ci_support/osx_arm64_numpy1.22python3.10.____cpython.yaml +++ b/.ci_support/osx_arm64_numpy2.0python3.10.____cpython.yaml @@ -21,7 +21,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_numpy2.0python3.11.____cpython.yaml similarity index 98% rename from .ci_support/osx_arm64_numpy1.23python3.11.____cpython.yaml rename to .ci_support/osx_arm64_numpy2.0python3.11.____cpython.yaml index 6b6fe86..b4e88ae 100644 --- a/.ci_support/osx_arm64_numpy1.23python3.11.____cpython.yaml +++ b/.ci_support/osx_arm64_numpy2.0python3.11.____cpython.yaml @@ -21,7 +21,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_numpy2.0python3.12.____cpython.yaml similarity index 98% rename from .ci_support/osx_arm64_numpy1.26python3.12.____cpython.yaml rename to .ci_support/osx_arm64_numpy2.0python3.12.____cpython.yaml index d0b139a..c155d83 100644 --- a/.ci_support/osx_arm64_numpy1.26python3.12.____cpython.yaml +++ b/.ci_support/osx_arm64_numpy2.0python3.12.____cpython.yaml @@ -21,7 +21,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/win_64_numpy1.22python3.10.____cpython.yaml b/.ci_support/win_64_numpy2.0python3.10.____cpython.yaml similarity index 96% rename from .ci_support/win_64_numpy1.22python3.10.____cpython.yaml rename to .ci_support/win_64_numpy2.0python3.10.____cpython.yaml index f32a724..644a184 100644 --- a/.ci_support/win_64_numpy1.22python3.10.____cpython.yaml +++ b/.ci_support/win_64_numpy2.0python3.10.____cpython.yaml @@ -9,7 +9,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_numpy2.0python3.11.____cpython.yaml similarity index 96% rename from .ci_support/win_64_numpy1.23python3.11.____cpython.yaml rename to .ci_support/win_64_numpy2.0python3.11.____cpython.yaml index f2e4ab2..e73b71f 100644 --- a/.ci_support/win_64_numpy1.23python3.11.____cpython.yaml +++ b/.ci_support/win_64_numpy2.0python3.11.____cpython.yaml @@ -9,7 +9,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_numpy2.0python3.12.____cpython.yaml similarity index 96% rename from .ci_support/win_64_numpy1.26python3.12.____cpython.yaml rename to .ci_support/win_64_numpy2.0python3.12.____cpython.yaml index ebc0cea..afb1384 100644 --- a/.ci_support/win_64_numpy1.26python3.12.____cpython.yaml +++ b/.ci_support/win_64_numpy2.0python3.12.____cpython.yaml @@ -9,7 +9,7 @@ channel_targets: cxx_compiler: - vs2019 numpy: -- '1.26' +- '2.0' pin_run_as_build: python: min_pin: x.x diff --git a/README.md b/README.md index 75e5c31..7d51b04 100644 --- a/README.md +++ b/README.md @@ -27,129 +27,129 @@ Current build status
VariantStatus
linux_64_python3.10.____cpythonlinux_64_numpy1.22python3.10.____cpython - variant + variant
linux_64_python3.11.____cpythonlinux_64_numpy1.23python3.11.____cpython - variant + variant
linux_64_python3.12.____cpythonlinux_64_numpy1.26python3.12.____cpython - variant + variant
linux_aarch64_python3.10.____cpythonlinux_aarch64_numpy1.22python3.10.____cpython - variant + variant
linux_aarch64_python3.11.____cpythonlinux_aarch64_numpy1.23python3.11.____cpython - variant + variant
linux_aarch64_python3.12.____cpythonlinux_aarch64_numpy1.26python3.12.____cpython - variant + variant
linux_ppc64le_python3.10.____cpythonlinux_ppc64le_numpy1.22python3.10.____cpython - variant + variant
linux_ppc64le_python3.11.____cpythonlinux_ppc64le_numpy1.23python3.11.____cpython - variant + variant
linux_ppc64le_python3.12.____cpythonlinux_ppc64le_numpy1.26python3.12.____cpython - variant + variant
osx_64_python3.10.____cpythonosx_64_numpy1.22python3.10.____cpython - variant + variant
osx_64_python3.11.____cpythonosx_64_numpy1.23python3.11.____cpython - variant + variant
osx_64_python3.12.____cpythonosx_64_numpy1.26python3.12.____cpython - variant + variant
osx_arm64_python3.10.____cpythonosx_arm64_numpy1.22python3.10.____cpython - variant + variant
osx_arm64_python3.11.____cpythonosx_arm64_numpy1.23python3.11.____cpython - variant + variant
osx_arm64_python3.12.____cpythonosx_arm64_numpy1.26python3.12.____cpython - variant + variant
win_64_python3.10.____cpythonwin_64_numpy1.22python3.10.____cpython - variant + variant
win_64_python3.11.____cpythonwin_64_numpy1.23python3.11.____cpython - variant + variant
win_64_python3.12.____cpythonwin_64_numpy1.26python3.12.____cpython - variant + variant
- + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + From e0c522f39f8b95c6196e51d038f688a9b03d5629 Mon Sep 17 00:00:00 2001 From: David Stansby Date: Mon, 19 Aug 2024 22:06:30 +0100 Subject: [PATCH 11/16] Minor cleanups to recipe --- recipe/meta.yaml | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 08f1a2b..dcef47a 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -9,11 +9,15 @@ source: url: https://pypi.io/packages/source/{{ name[0] }}/{{ name }}/{{ name }}-{{ version }}.tar.gz sha256: ba4fac7036ea5a078c7afe1d4dffeb9685080d42f19c9c16b12dad866703aa2e patches: - # Fix the way assembly files are included on x86_64 + # Fix compiling assembly files + # Can be removed when https://github.com/zarr-developers/numcodecs/pull/562 + # is in a numcodecs release - patches/including_assmembly.patch build: number: 0 + skip: true # [py<310] + script_env: - DISABLE_NUMCODECS_AVX2="" - DISABLE_NUMCODECS_SSE2="" # [not x86] @@ -21,8 +25,6 @@ build: - export CFLAGS="${CFLAGS} -pthread" # [aarch64 or ppc64le] - {{ PYTHON }} -m pip install . -vv - skip: true # [py<310] - requirements: build: - python # [build_platform != target_platform] @@ -44,7 +46,7 @@ requirements: run: - python - msgpack-python - - {{ pin_compatible('numpy') }} + - numpy >=1.7 test: requires: From d0cae103c2a286f66aec4fcb9a162f92ecafc8e3 Mon Sep 17 00:00:00 2001 From: jakirkham Date: Mon, 19 Aug 2024 15:05:24 -0700 Subject: [PATCH 12/16] Drop blank line --- recipe/meta.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index dcef47a..84560a0 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -17,7 +17,6 @@ source: build: number: 0 skip: true # [py<310] - script_env: - DISABLE_NUMCODECS_AVX2="" - DISABLE_NUMCODECS_SSE2="" # [not x86] From 5b18bc57fe33094077af71c0f8114c6001953e74 Mon Sep 17 00:00:00 2001 From: jakirkham Date: Mon, 19 Aug 2024 15:10:10 -0700 Subject: [PATCH 13/16] Configure `osx_arm64` to build on default provider --- conda-forge.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/conda-forge.yml b/conda-forge.yml index 18da1f4..6c92a02 100644 --- a/conda-forge.yml +++ b/conda-forge.yml @@ -11,5 +11,6 @@ github: provider: linux_aarch64: default linux_ppc64le: default + osx_arm64: default win: azure test: native_and_emulated From 7a59ea7f925a30cbee7a0ed25d2fad1b0da29fcc Mon Sep 17 00:00:00 2001 From: jakirkham Date: Mon, 19 Aug 2024 15:10:39 -0700 Subject: [PATCH 14/16] Check for overlinking errors in final package --- conda-forge.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/conda-forge.yml b/conda-forge.yml index 6c92a02..6cb839e 100644 --- a/conda-forge.yml +++ b/conda-forge.yml @@ -3,6 +3,7 @@ build_platform: linux_ppc64le: linux_64 osx_arm64: osx_64 conda_build: + error_overlinking: true pkg_format: '2' conda_forge_output_validation: true github: From 9470dcde4244d7d3e2338e4cd5d0f0052453543f Mon Sep 17 00:00:00 2001 From: jakirkham Date: Mon, 19 Aug 2024 15:11:04 -0700 Subject: [PATCH 15/16] Configure Grayskull for package updates --- conda-forge.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/conda-forge.yml b/conda-forge.yml index 6cb839e..c674ff0 100644 --- a/conda-forge.yml +++ b/conda-forge.yml @@ -1,3 +1,5 @@ +bot: + inspection: update-grayskull build_platform: linux_aarch64: linux_64 linux_ppc64le: linux_64 From 8ba58d7b0508d815cec0be60419c84e832dece25 Mon Sep 17 00:00:00 2001 From: jakirkham Date: Mon, 19 Aug 2024 15:13:19 -0700 Subject: [PATCH 16/16] Note `msgpack-python` is an option dependency --- recipe/meta.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 84560a0..6bd45cc 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -44,8 +44,9 @@ requirements: - numpy run: - python - - msgpack-python - numpy >=1.7 + # Optional dependecy included for ease of use + - msgpack-python test: requires:
VariantStatus
linux_64_numpy1.22python3.10.____cpythonlinux_64_numpy2.0python3.10.____cpython - variant + variant
linux_64_numpy1.23python3.11.____cpythonlinux_64_numpy2.0python3.11.____cpython - variant + variant
linux_64_numpy1.26python3.12.____cpythonlinux_64_numpy2.0python3.12.____cpython - variant + variant
linux_aarch64_numpy1.22python3.10.____cpythonlinux_aarch64_numpy2.0python3.10.____cpython - variant + variant
linux_aarch64_numpy1.23python3.11.____cpythonlinux_aarch64_numpy2.0python3.11.____cpython - variant + variant
linux_aarch64_numpy1.26python3.12.____cpythonlinux_aarch64_numpy2.0python3.12.____cpython - variant + variant
linux_ppc64le_numpy1.22python3.10.____cpythonlinux_ppc64le_numpy2.0python3.10.____cpython - variant + variant
linux_ppc64le_numpy1.23python3.11.____cpythonlinux_ppc64le_numpy2.0python3.11.____cpython - variant + variant
linux_ppc64le_numpy1.26python3.12.____cpythonlinux_ppc64le_numpy2.0python3.12.____cpython - variant + variant
osx_64_numpy1.22python3.10.____cpythonosx_64_numpy2.0python3.10.____cpython - variant + variant
osx_64_numpy1.23python3.11.____cpythonosx_64_numpy2.0python3.11.____cpython - variant + variant
osx_64_numpy1.26python3.12.____cpythonosx_64_numpy2.0python3.12.____cpython - variant + variant
osx_arm64_numpy1.22python3.10.____cpythonosx_arm64_numpy2.0python3.10.____cpython - variant + variant
osx_arm64_numpy1.23python3.11.____cpythonosx_arm64_numpy2.0python3.11.____cpython - variant + variant
osx_arm64_numpy1.26python3.12.____cpythonosx_arm64_numpy2.0python3.12.____cpython - variant + variant
win_64_numpy1.22python3.10.____cpythonwin_64_numpy2.0python3.10.____cpython - variant + variant
win_64_numpy1.23python3.11.____cpythonwin_64_numpy2.0python3.11.____cpython - variant + variant
win_64_numpy1.26python3.12.____cpythonwin_64_numpy2.0python3.12.____cpython - variant + variant