From 3316370335c0df43114acfffb2782eda84e8b494 Mon Sep 17 00:00:00 2001 From: regro-cf-autotick-bot <36490558+regro-cf-autotick-bot@users.noreply.github.com> Date: Sun, 8 Sep 2024 17:59:34 +0000 Subject: [PATCH 01/10] Rebuild for python 3.13 --- .ci_support/migrations/python313.yaml | 44 +++++++++++++++++++++++++++ recipe/meta.yaml | 2 +- 2 files changed, 45 insertions(+), 1 deletion(-) create mode 100644 .ci_support/migrations/python313.yaml diff --git a/.ci_support/migrations/python313.yaml b/.ci_support/migrations/python313.yaml new file mode 100644 index 0000000..92cc90b --- /dev/null +++ b/.ci_support/migrations/python313.yaml @@ -0,0 +1,44 @@ +migrator_ts: 1724712607 +__migrator: + commit_message: Rebuild for python 3.13 + migration_number: 1 + operation: key_add + primary_key: python + ordering: + python: + - 3.6.* *_cpython + - 3.7.* *_cpython + - 3.8.* *_cpython + - 3.9.* *_cpython + - 3.10.* *_cpython + - 3.11.* *_cpython + - 3.12.* *_cpython + - 3.13.* *_cp313 # new entry + - 3.6.* *_73_pypy + - 3.7.* *_73_pypy + - 3.8.* *_73_pypy + - 3.9.* *_73_pypy + paused: false + longterm: true + pr_limit: 20 + max_solver_attempts: 3 # this will make the bot retry "not solvable" stuff 12 times + exclude: + # this shouldn't attempt to modify the python feedstocks + - python + - pypy3.6 + - pypy-meta + - cross-python + - python_abi + exclude_pinned_pkgs: false + additional_zip_keys: + - channel_sources + +python: +- 3.13.* *_cp313 +channel_sources: +- conda-forge/label/python_rc,conda-forge +# additional entries to add for zip_keys +numpy: +- 2 +python_impl: +- cpython diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 6bd45cc..6e7e62a 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -15,7 +15,7 @@ source: - patches/including_assmembly.patch build: - number: 0 + number: 1 skip: true # [py<310] script_env: - DISABLE_NUMCODECS_AVX2="" From 1091822fc9fbe66cd349bdee0bf492061ab72914 Mon Sep 17 00:00:00 2001 From: regro-cf-autotick-bot <36490558+regro-cf-autotick-bot@users.noreply.github.com> Date: Sun, 8 Sep 2024 18:00:28 +0000 Subject: [PATCH 02/10] MNT: Re-rendered with conda-build 24.7.1, conda-smithy 3.39.1, and conda-forge-pinning 2024.09.07.19.33.02 --- .azure-pipelines/azure-pipelines-linux.yml | 12 ++++++ .azure-pipelines/azure-pipelines-osx.yml | 6 +++ .azure-pipelines/azure-pipelines-win.yml | 3 ++ ...nux_64_numpy2.0python3.10.____cpython.yaml | 5 ++- ...nux_64_numpy2.0python3.11.____cpython.yaml | 5 ++- ...nux_64_numpy2.0python3.12.____cpython.yaml | 5 ++- .../linux_64_numpy2python3.13.____cp313.yaml | 38 +++++++++++++++++ ...arch64_numpy2.0python3.10.____cpython.yaml | 5 ++- ...arch64_numpy2.0python3.11.____cpython.yaml | 5 ++- ...arch64_numpy2.0python3.12.____cpython.yaml | 5 ++- ...ux_aarch64_numpy2python3.13.____cp313.yaml | 42 +++++++++++++++++++ ...pc64le_numpy2.0python3.10.____cpython.yaml | 5 ++- ...pc64le_numpy2.0python3.11.____cpython.yaml | 5 ++- ...pc64le_numpy2.0python3.12.____cpython.yaml | 5 ++- ...ux_ppc64le_numpy2python3.13.____cp313.yaml | 38 +++++++++++++++++ ...osx_64_numpy2.0python3.10.____cpython.yaml | 5 ++- ...osx_64_numpy2.0python3.11.____cpython.yaml | 5 ++- ...osx_64_numpy2.0python3.12.____cpython.yaml | 5 ++- .../osx_64_numpy2python3.13.____cp313.yaml | 38 +++++++++++++++++ ..._arm64_numpy2.0python3.10.____cpython.yaml | 5 ++- ..._arm64_numpy2.0python3.11.____cpython.yaml | 5 ++- ..._arm64_numpy2.0python3.12.____cpython.yaml | 5 ++- .../osx_arm64_numpy2python3.13.____cp313.yaml | 38 +++++++++++++++++ ...win_64_numpy2.0python3.10.____cpython.yaml | 1 + ...win_64_numpy2.0python3.11.____cpython.yaml | 1 + ...win_64_numpy2.0python3.12.____cpython.yaml | 1 + .../win_64_numpy2python3.13.____cp313.yaml | 24 +++++++++++ README.md | 42 +++++++++++++++++++ build-locally.py | 5 ++- 29 files changed, 333 insertions(+), 31 deletions(-) create mode 100644 .ci_support/linux_64_numpy2python3.13.____cp313.yaml create mode 100644 .ci_support/linux_aarch64_numpy2python3.13.____cp313.yaml create mode 100644 .ci_support/linux_ppc64le_numpy2python3.13.____cp313.yaml create mode 100644 .ci_support/osx_64_numpy2python3.13.____cp313.yaml create mode 100644 .ci_support/osx_arm64_numpy2python3.13.____cp313.yaml create mode 100644 .ci_support/win_64_numpy2python3.13.____cp313.yaml diff --git a/.azure-pipelines/azure-pipelines-linux.yml b/.azure-pipelines/azure-pipelines-linux.yml index bb1dd02..eaf8bd1 100755 --- a/.azure-pipelines/azure-pipelines-linux.yml +++ b/.azure-pipelines/azure-pipelines-linux.yml @@ -20,6 +20,10 @@ jobs: CONFIG: linux_64_numpy2.0python3.12.____cpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 + linux_64_numpy2python3.13.____cp313: + CONFIG: linux_64_numpy2python3.13.____cp313 + UPLOAD_PACKAGES: 'True' + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 linux_aarch64_numpy2.0python3.10.____cpython: CONFIG: linux_aarch64_numpy2.0python3.10.____cpython UPLOAD_PACKAGES: 'True' @@ -32,6 +36,10 @@ jobs: CONFIG: linux_aarch64_numpy2.0python3.12.____cpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 + linux_aarch64_numpy2python3.13.____cp313: + CONFIG: linux_aarch64_numpy2python3.13.____cp313 + UPLOAD_PACKAGES: 'True' + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 linux_ppc64le_numpy2.0python3.10.____cpython: CONFIG: linux_ppc64le_numpy2.0python3.10.____cpython UPLOAD_PACKAGES: 'True' @@ -44,6 +52,10 @@ jobs: CONFIG: linux_ppc64le_numpy2.0python3.12.____cpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 + linux_ppc64le_numpy2python3.13.____cp313: + CONFIG: linux_ppc64le_numpy2python3.13.____cp313 + 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 e8e2708..69eacb1 100755 --- a/.azure-pipelines/azure-pipelines-osx.yml +++ b/.azure-pipelines/azure-pipelines-osx.yml @@ -17,6 +17,9 @@ jobs: osx_64_numpy2.0python3.12.____cpython: CONFIG: osx_64_numpy2.0python3.12.____cpython UPLOAD_PACKAGES: 'True' + osx_64_numpy2python3.13.____cp313: + CONFIG: osx_64_numpy2python3.13.____cp313 + UPLOAD_PACKAGES: 'True' osx_arm64_numpy2.0python3.10.____cpython: CONFIG: osx_arm64_numpy2.0python3.10.____cpython UPLOAD_PACKAGES: 'True' @@ -26,6 +29,9 @@ jobs: osx_arm64_numpy2.0python3.12.____cpython: CONFIG: osx_arm64_numpy2.0python3.12.____cpython UPLOAD_PACKAGES: 'True' + osx_arm64_numpy2python3.13.____cp313: + CONFIG: osx_arm64_numpy2python3.13.____cp313 + UPLOAD_PACKAGES: 'True' timeoutInMinutes: 360 variables: {} diff --git a/.azure-pipelines/azure-pipelines-win.yml b/.azure-pipelines/azure-pipelines-win.yml index f8c66f0..369d51f 100755 --- a/.azure-pipelines/azure-pipelines-win.yml +++ b/.azure-pipelines/azure-pipelines-win.yml @@ -17,6 +17,9 @@ jobs: win_64_numpy2.0python3.12.____cpython: CONFIG: win_64_numpy2.0python3.12.____cpython UPLOAD_PACKAGES: 'True' + win_64_numpy2python3.13.____cp313: + CONFIG: win_64_numpy2python3.13.____cp313 + UPLOAD_PACKAGES: 'True' timeoutInMinutes: 360 variables: CONDA_BLD_PATH: D:\\bld\\ diff --git a/.ci_support/linux_64_numpy2.0python3.10.____cpython.yaml b/.ci_support/linux_64_numpy2.0python3.10.____cpython.yaml index 7598a3e..5cd140f 100644 --- a/.ci_support/linux_64_numpy2.0python3.10.____cpython.yaml +++ b/.ci_support/linux_64_numpy2.0python3.10.____cpython.yaml @@ -1,7 +1,7 @@ c_compiler: - gcc c_compiler_version: -- '12' +- '13' c_stdlib: - sysroot c_stdlib_version: @@ -15,7 +15,7 @@ channel_targets: cxx_compiler: - gxx cxx_compiler_version: -- '12' +- '13' docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 numpy: @@ -35,3 +35,4 @@ zip_keys: - cdt_name - - python - numpy + - channel_sources diff --git a/.ci_support/linux_64_numpy2.0python3.11.____cpython.yaml b/.ci_support/linux_64_numpy2.0python3.11.____cpython.yaml index 90e287e..7070405 100644 --- a/.ci_support/linux_64_numpy2.0python3.11.____cpython.yaml +++ b/.ci_support/linux_64_numpy2.0python3.11.____cpython.yaml @@ -1,7 +1,7 @@ c_compiler: - gcc c_compiler_version: -- '12' +- '13' c_stdlib: - sysroot c_stdlib_version: @@ -15,7 +15,7 @@ channel_targets: cxx_compiler: - gxx cxx_compiler_version: -- '12' +- '13' docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 numpy: @@ -35,3 +35,4 @@ zip_keys: - cdt_name - - python - numpy + - channel_sources diff --git a/.ci_support/linux_64_numpy2.0python3.12.____cpython.yaml b/.ci_support/linux_64_numpy2.0python3.12.____cpython.yaml index dcf1660..5f502ac 100644 --- a/.ci_support/linux_64_numpy2.0python3.12.____cpython.yaml +++ b/.ci_support/linux_64_numpy2.0python3.12.____cpython.yaml @@ -1,7 +1,7 @@ c_compiler: - gcc c_compiler_version: -- '12' +- '13' c_stdlib: - sysroot c_stdlib_version: @@ -15,7 +15,7 @@ channel_targets: cxx_compiler: - gxx cxx_compiler_version: -- '12' +- '13' docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 numpy: @@ -35,3 +35,4 @@ zip_keys: - cdt_name - - python - numpy + - channel_sources diff --git a/.ci_support/linux_64_numpy2python3.13.____cp313.yaml b/.ci_support/linux_64_numpy2python3.13.____cp313.yaml new file mode 100644 index 0000000..977014a --- /dev/null +++ b/.ci_support/linux_64_numpy2python3.13.____cp313.yaml @@ -0,0 +1,38 @@ +c_compiler: +- gcc +c_compiler_version: +- '13' +c_stdlib: +- sysroot +c_stdlib_version: +- '2.17' +cdt_name: +- cos7 +channel_sources: +- conda-forge/label/python_rc,conda-forge +channel_targets: +- conda-forge main +cxx_compiler: +- gxx +cxx_compiler_version: +- '13' +docker_image: +- quay.io/condaforge/linux-anvil-cos7-x86_64 +numpy: +- '2' +pin_run_as_build: + python: + min_pin: x.x + max_pin: x.x +python: +- 3.13.* *_cp313 +target_platform: +- linux-64 +zip_keys: +- - c_compiler_version + - cxx_compiler_version +- - c_stdlib_version + - cdt_name +- - python + - numpy + - channel_sources diff --git a/.ci_support/linux_aarch64_numpy2.0python3.10.____cpython.yaml b/.ci_support/linux_aarch64_numpy2.0python3.10.____cpython.yaml index c6b92fb..a5f9919 100644 --- a/.ci_support/linux_aarch64_numpy2.0python3.10.____cpython.yaml +++ b/.ci_support/linux_aarch64_numpy2.0python3.10.____cpython.yaml @@ -3,7 +3,7 @@ BUILD: c_compiler: - gcc c_compiler_version: -- '12' +- '13' c_stdlib: - sysroot c_stdlib_version: @@ -19,7 +19,7 @@ channel_targets: cxx_compiler: - gxx cxx_compiler_version: -- '12' +- '13' docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 numpy: @@ -39,3 +39,4 @@ zip_keys: - cdt_name - - python - numpy + - channel_sources diff --git a/.ci_support/linux_aarch64_numpy2.0python3.11.____cpython.yaml b/.ci_support/linux_aarch64_numpy2.0python3.11.____cpython.yaml index ec5850d..4845d4c 100644 --- a/.ci_support/linux_aarch64_numpy2.0python3.11.____cpython.yaml +++ b/.ci_support/linux_aarch64_numpy2.0python3.11.____cpython.yaml @@ -3,7 +3,7 @@ BUILD: c_compiler: - gcc c_compiler_version: -- '12' +- '13' c_stdlib: - sysroot c_stdlib_version: @@ -19,7 +19,7 @@ channel_targets: cxx_compiler: - gxx cxx_compiler_version: -- '12' +- '13' docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 numpy: @@ -39,3 +39,4 @@ zip_keys: - cdt_name - - python - numpy + - channel_sources diff --git a/.ci_support/linux_aarch64_numpy2.0python3.12.____cpython.yaml b/.ci_support/linux_aarch64_numpy2.0python3.12.____cpython.yaml index 900d817..4aa3a31 100644 --- a/.ci_support/linux_aarch64_numpy2.0python3.12.____cpython.yaml +++ b/.ci_support/linux_aarch64_numpy2.0python3.12.____cpython.yaml @@ -3,7 +3,7 @@ BUILD: c_compiler: - gcc c_compiler_version: -- '12' +- '13' c_stdlib: - sysroot c_stdlib_version: @@ -19,7 +19,7 @@ channel_targets: cxx_compiler: - gxx cxx_compiler_version: -- '12' +- '13' docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 numpy: @@ -39,3 +39,4 @@ zip_keys: - cdt_name - - python - numpy + - channel_sources diff --git a/.ci_support/linux_aarch64_numpy2python3.13.____cp313.yaml b/.ci_support/linux_aarch64_numpy2python3.13.____cp313.yaml new file mode 100644 index 0000000..6a94a6f --- /dev/null +++ b/.ci_support/linux_aarch64_numpy2python3.13.____cp313.yaml @@ -0,0 +1,42 @@ +BUILD: +- aarch64-conda_cos7-linux-gnu +c_compiler: +- gcc +c_compiler_version: +- '13' +c_stdlib: +- sysroot +c_stdlib_version: +- '2.17' +cdt_arch: +- aarch64 +cdt_name: +- cos7 +channel_sources: +- conda-forge/label/python_rc,conda-forge +channel_targets: +- conda-forge main +cxx_compiler: +- gxx +cxx_compiler_version: +- '13' +docker_image: +- quay.io/condaforge/linux-anvil-cos7-x86_64 +numpy: +- '2' +pin_run_as_build: + python: + min_pin: x.x + max_pin: x.x +python: +- 3.13.* *_cp313 +target_platform: +- linux-aarch64 +zip_keys: +- - c_compiler_version + - cxx_compiler_version +- - c_stdlib_version + - cdt_name +- - python + - numpy + - channel_sources diff --git a/.ci_support/linux_ppc64le_numpy2.0python3.10.____cpython.yaml b/.ci_support/linux_ppc64le_numpy2.0python3.10.____cpython.yaml index 6114e74..3a83867 100644 --- a/.ci_support/linux_ppc64le_numpy2.0python3.10.____cpython.yaml +++ b/.ci_support/linux_ppc64le_numpy2.0python3.10.____cpython.yaml @@ -1,7 +1,7 @@ c_compiler: - gcc c_compiler_version: -- '12' +- '13' c_stdlib: - sysroot c_stdlib_version: @@ -15,7 +15,7 @@ channel_targets: cxx_compiler: - gxx cxx_compiler_version: -- '12' +- '13' docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 numpy: @@ -35,3 +35,4 @@ zip_keys: - cdt_name - - python - numpy + - channel_sources diff --git a/.ci_support/linux_ppc64le_numpy2.0python3.11.____cpython.yaml b/.ci_support/linux_ppc64le_numpy2.0python3.11.____cpython.yaml index 6ea1d00..8ec571b 100644 --- a/.ci_support/linux_ppc64le_numpy2.0python3.11.____cpython.yaml +++ b/.ci_support/linux_ppc64le_numpy2.0python3.11.____cpython.yaml @@ -1,7 +1,7 @@ c_compiler: - gcc c_compiler_version: -- '12' +- '13' c_stdlib: - sysroot c_stdlib_version: @@ -15,7 +15,7 @@ channel_targets: cxx_compiler: - gxx cxx_compiler_version: -- '12' +- '13' docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 numpy: @@ -35,3 +35,4 @@ zip_keys: - cdt_name - - python - numpy + - channel_sources diff --git a/.ci_support/linux_ppc64le_numpy2.0python3.12.____cpython.yaml b/.ci_support/linux_ppc64le_numpy2.0python3.12.____cpython.yaml index 69cd6ef..a6d6b5b 100644 --- a/.ci_support/linux_ppc64le_numpy2.0python3.12.____cpython.yaml +++ b/.ci_support/linux_ppc64le_numpy2.0python3.12.____cpython.yaml @@ -1,7 +1,7 @@ c_compiler: - gcc c_compiler_version: -- '12' +- '13' c_stdlib: - sysroot c_stdlib_version: @@ -15,7 +15,7 @@ channel_targets: cxx_compiler: - gxx cxx_compiler_version: -- '12' +- '13' docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 numpy: @@ -35,3 +35,4 @@ zip_keys: - cdt_name - - python - numpy + - channel_sources diff --git a/.ci_support/linux_ppc64le_numpy2python3.13.____cp313.yaml b/.ci_support/linux_ppc64le_numpy2python3.13.____cp313.yaml new file mode 100644 index 0000000..2f86546 --- /dev/null +++ b/.ci_support/linux_ppc64le_numpy2python3.13.____cp313.yaml @@ -0,0 +1,38 @@ +c_compiler: +- gcc +c_compiler_version: +- '13' +c_stdlib: +- sysroot +c_stdlib_version: +- '2.17' +cdt_name: +- cos7 +channel_sources: +- conda-forge/label/python_rc,conda-forge +channel_targets: +- conda-forge main +cxx_compiler: +- gxx +cxx_compiler_version: +- '13' +docker_image: +- quay.io/condaforge/linux-anvil-cos7-x86_64 +numpy: +- '2' +pin_run_as_build: + python: + min_pin: x.x + max_pin: x.x +python: +- 3.13.* *_cp313 +target_platform: +- linux-ppc64le +zip_keys: +- - c_compiler_version + - cxx_compiler_version +- - c_stdlib_version + - cdt_name +- - python + - numpy + - channel_sources diff --git a/.ci_support/osx_64_numpy2.0python3.10.____cpython.yaml b/.ci_support/osx_64_numpy2.0python3.10.____cpython.yaml index 0588715..9dafbcc 100644 --- a/.ci_support/osx_64_numpy2.0python3.10.____cpython.yaml +++ b/.ci_support/osx_64_numpy2.0python3.10.____cpython.yaml @@ -5,7 +5,7 @@ MACOSX_SDK_VERSION: c_compiler: - clang c_compiler_version: -- '16' +- '17' c_stdlib: - macosx_deployment_target c_stdlib_version: @@ -17,7 +17,7 @@ channel_targets: cxx_compiler: - clangxx cxx_compiler_version: -- '16' +- '17' macos_machine: - x86_64-apple-darwin13.4.0 numpy: @@ -35,3 +35,4 @@ zip_keys: - cxx_compiler_version - - python - numpy + - channel_sources diff --git a/.ci_support/osx_64_numpy2.0python3.11.____cpython.yaml b/.ci_support/osx_64_numpy2.0python3.11.____cpython.yaml index ba94b88..71701df 100644 --- a/.ci_support/osx_64_numpy2.0python3.11.____cpython.yaml +++ b/.ci_support/osx_64_numpy2.0python3.11.____cpython.yaml @@ -5,7 +5,7 @@ MACOSX_SDK_VERSION: c_compiler: - clang c_compiler_version: -- '16' +- '17' c_stdlib: - macosx_deployment_target c_stdlib_version: @@ -17,7 +17,7 @@ channel_targets: cxx_compiler: - clangxx cxx_compiler_version: -- '16' +- '17' macos_machine: - x86_64-apple-darwin13.4.0 numpy: @@ -35,3 +35,4 @@ zip_keys: - cxx_compiler_version - - python - numpy + - channel_sources diff --git a/.ci_support/osx_64_numpy2.0python3.12.____cpython.yaml b/.ci_support/osx_64_numpy2.0python3.12.____cpython.yaml index 14576b3..f462703 100644 --- a/.ci_support/osx_64_numpy2.0python3.12.____cpython.yaml +++ b/.ci_support/osx_64_numpy2.0python3.12.____cpython.yaml @@ -5,7 +5,7 @@ MACOSX_SDK_VERSION: c_compiler: - clang c_compiler_version: -- '16' +- '17' c_stdlib: - macosx_deployment_target c_stdlib_version: @@ -17,7 +17,7 @@ channel_targets: cxx_compiler: - clangxx cxx_compiler_version: -- '16' +- '17' macos_machine: - x86_64-apple-darwin13.4.0 numpy: @@ -35,3 +35,4 @@ zip_keys: - cxx_compiler_version - - python - numpy + - channel_sources diff --git a/.ci_support/osx_64_numpy2python3.13.____cp313.yaml b/.ci_support/osx_64_numpy2python3.13.____cp313.yaml new file mode 100644 index 0000000..1b92bb7 --- /dev/null +++ b/.ci_support/osx_64_numpy2python3.13.____cp313.yaml @@ -0,0 +1,38 @@ +MACOSX_DEPLOYMENT_TARGET: +- '10.13' +MACOSX_SDK_VERSION: +- '10.13' +c_compiler: +- clang +c_compiler_version: +- '17' +c_stdlib: +- macosx_deployment_target +c_stdlib_version: +- '10.13' +channel_sources: +- conda-forge/label/python_rc,conda-forge +channel_targets: +- conda-forge main +cxx_compiler: +- clangxx +cxx_compiler_version: +- '17' +macos_machine: +- x86_64-apple-darwin13.4.0 +numpy: +- '2' +pin_run_as_build: + python: + min_pin: x.x + max_pin: x.x +python: +- 3.13.* *_cp313 +target_platform: +- osx-64 +zip_keys: +- - c_compiler_version + - cxx_compiler_version +- - python + - numpy + - channel_sources diff --git a/.ci_support/osx_arm64_numpy2.0python3.10.____cpython.yaml b/.ci_support/osx_arm64_numpy2.0python3.10.____cpython.yaml index 2d3ca25..6c1de4b 100644 --- a/.ci_support/osx_arm64_numpy2.0python3.10.____cpython.yaml +++ b/.ci_support/osx_arm64_numpy2.0python3.10.____cpython.yaml @@ -5,7 +5,7 @@ MACOSX_SDK_VERSION: c_compiler: - clang c_compiler_version: -- '16' +- '17' c_stdlib: - macosx_deployment_target c_stdlib_version: @@ -17,7 +17,7 @@ channel_targets: cxx_compiler: - clangxx cxx_compiler_version: -- '16' +- '17' macos_machine: - arm64-apple-darwin20.0.0 numpy: @@ -35,3 +35,4 @@ zip_keys: - cxx_compiler_version - - python - numpy + - channel_sources diff --git a/.ci_support/osx_arm64_numpy2.0python3.11.____cpython.yaml b/.ci_support/osx_arm64_numpy2.0python3.11.____cpython.yaml index b4e88ae..93190ae 100644 --- a/.ci_support/osx_arm64_numpy2.0python3.11.____cpython.yaml +++ b/.ci_support/osx_arm64_numpy2.0python3.11.____cpython.yaml @@ -5,7 +5,7 @@ MACOSX_SDK_VERSION: c_compiler: - clang c_compiler_version: -- '16' +- '17' c_stdlib: - macosx_deployment_target c_stdlib_version: @@ -17,7 +17,7 @@ channel_targets: cxx_compiler: - clangxx cxx_compiler_version: -- '16' +- '17' macos_machine: - arm64-apple-darwin20.0.0 numpy: @@ -35,3 +35,4 @@ zip_keys: - cxx_compiler_version - - python - numpy + - channel_sources diff --git a/.ci_support/osx_arm64_numpy2.0python3.12.____cpython.yaml b/.ci_support/osx_arm64_numpy2.0python3.12.____cpython.yaml index c155d83..8877086 100644 --- a/.ci_support/osx_arm64_numpy2.0python3.12.____cpython.yaml +++ b/.ci_support/osx_arm64_numpy2.0python3.12.____cpython.yaml @@ -5,7 +5,7 @@ MACOSX_SDK_VERSION: c_compiler: - clang c_compiler_version: -- '16' +- '17' c_stdlib: - macosx_deployment_target c_stdlib_version: @@ -17,7 +17,7 @@ channel_targets: cxx_compiler: - clangxx cxx_compiler_version: -- '16' +- '17' macos_machine: - arm64-apple-darwin20.0.0 numpy: @@ -35,3 +35,4 @@ zip_keys: - cxx_compiler_version - - python - numpy + - channel_sources diff --git a/.ci_support/osx_arm64_numpy2python3.13.____cp313.yaml b/.ci_support/osx_arm64_numpy2python3.13.____cp313.yaml new file mode 100644 index 0000000..56c6ec5 --- /dev/null +++ b/.ci_support/osx_arm64_numpy2python3.13.____cp313.yaml @@ -0,0 +1,38 @@ +MACOSX_DEPLOYMENT_TARGET: +- '11.0' +MACOSX_SDK_VERSION: +- '11.0' +c_compiler: +- clang +c_compiler_version: +- '17' +c_stdlib: +- macosx_deployment_target +c_stdlib_version: +- '11.0' +channel_sources: +- conda-forge/label/python_rc,conda-forge +channel_targets: +- conda-forge main +cxx_compiler: +- clangxx +cxx_compiler_version: +- '17' +macos_machine: +- arm64-apple-darwin20.0.0 +numpy: +- '2' +pin_run_as_build: + python: + min_pin: x.x + max_pin: x.x +python: +- 3.13.* *_cp313 +target_platform: +- osx-arm64 +zip_keys: +- - c_compiler_version + - cxx_compiler_version +- - python + - numpy + - channel_sources diff --git a/.ci_support/win_64_numpy2.0python3.10.____cpython.yaml b/.ci_support/win_64_numpy2.0python3.10.____cpython.yaml index 644a184..caed20e 100644 --- a/.ci_support/win_64_numpy2.0python3.10.____cpython.yaml +++ b/.ci_support/win_64_numpy2.0python3.10.____cpython.yaml @@ -21,3 +21,4 @@ target_platform: zip_keys: - - python - numpy + - channel_sources diff --git a/.ci_support/win_64_numpy2.0python3.11.____cpython.yaml b/.ci_support/win_64_numpy2.0python3.11.____cpython.yaml index e73b71f..beb73f1 100644 --- a/.ci_support/win_64_numpy2.0python3.11.____cpython.yaml +++ b/.ci_support/win_64_numpy2.0python3.11.____cpython.yaml @@ -21,3 +21,4 @@ target_platform: zip_keys: - - python - numpy + - channel_sources diff --git a/.ci_support/win_64_numpy2.0python3.12.____cpython.yaml b/.ci_support/win_64_numpy2.0python3.12.____cpython.yaml index afb1384..8e0aa12 100644 --- a/.ci_support/win_64_numpy2.0python3.12.____cpython.yaml +++ b/.ci_support/win_64_numpy2.0python3.12.____cpython.yaml @@ -21,3 +21,4 @@ target_platform: zip_keys: - - python - numpy + - channel_sources diff --git a/.ci_support/win_64_numpy2python3.13.____cp313.yaml b/.ci_support/win_64_numpy2python3.13.____cp313.yaml new file mode 100644 index 0000000..24a481a --- /dev/null +++ b/.ci_support/win_64_numpy2python3.13.____cp313.yaml @@ -0,0 +1,24 @@ +c_compiler: +- vs2019 +c_stdlib: +- vs +channel_sources: +- conda-forge/label/python_rc,conda-forge +channel_targets: +- conda-forge main +cxx_compiler: +- vs2019 +numpy: +- '2' +pin_run_as_build: + python: + min_pin: x.x + max_pin: x.x +python: +- 3.13.* *_cp313 +target_platform: +- win-64 +zip_keys: +- - python + - numpy + - channel_sources diff --git a/README.md b/README.md index 7d51b04..36c4fc8 100644 --- a/README.md +++ b/README.md @@ -47,6 +47,13 @@ Current build status variant + + linux_64_numpy2python3.13.____cp313 + + + variant + + linux_aarch64_numpy2.0python3.10.____cpython @@ -68,6 +75,13 @@ Current build status variant + + linux_aarch64_numpy2python3.13.____cp313 + + + variant + + linux_ppc64le_numpy2.0python3.10.____cpython @@ -89,6 +103,13 @@ Current build status variant + + linux_ppc64le_numpy2python3.13.____cp313 + + + variant + + osx_64_numpy2.0python3.10.____cpython @@ -110,6 +131,13 @@ Current build status variant + + osx_64_numpy2python3.13.____cp313 + + + variant + + osx_arm64_numpy2.0python3.10.____cpython @@ -131,6 +159,13 @@ Current build status variant + + osx_arm64_numpy2python3.13.____cp313 + + + variant + + win_64_numpy2.0python3.10.____cpython @@ -152,6 +187,13 @@ Current build status variant + + win_64_numpy2python3.13.____cp313 + + + variant + + diff --git a/build-locally.py b/build-locally.py index d78427b..8ac9b84 100755 --- a/build-locally.py +++ b/build-locally.py @@ -1,8 +1,11 @@ -#!/usr/bin/env python3 +#!/bin/sh +"""exec' "python3" "$0" "$@" #""" # fmt: off # fmt: on # # This file has been generated by conda-smithy in order to build the recipe # locally. # +# The line above this comment is a bash / sh / zsh guard +# to stop people from running it with the wrong interpreter import glob import os import platform From ed6b2f5395a9c016ba69b50a283ca593235f9f46 Mon Sep 17 00:00:00 2001 From: regro-cf-autotick-bot <36490558+regro-cf-autotick-bot@users.noreply.github.com> Date: Wed, 9 Oct 2024 21:18:07 +0000 Subject: [PATCH 03/10] updated v0.13.1 --- recipe/meta.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 6bd45cc..0311043 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -1,5 +1,5 @@ {% set name = "numcodecs" %} -{% set version = "0.13.0" %} +{% set version = "0.13.1" %} package: name: {{ name|lower }} @@ -7,7 +7,7 @@ package: source: url: https://pypi.io/packages/source/{{ name[0] }}/{{ name }}/{{ name }}-{{ version }}.tar.gz - sha256: ba4fac7036ea5a078c7afe1d4dffeb9685080d42f19c9c16b12dad866703aa2e + sha256: a3cf37881df0898f3a9c0d4477df88133fe85185bffe57ba31bcc2fa207709bc patches: # Fix compiling assembly files # Can be removed when https://github.com/zarr-developers/numcodecs/pull/562 From e42ed5a7c9b644e0738d0f17d88a48b7d9718303 Mon Sep 17 00:00:00 2001 From: regro-cf-autotick-bot <36490558+regro-cf-autotick-bot@users.noreply.github.com> Date: Wed, 9 Oct 2024 21:18:58 +0000 Subject: [PATCH 04/10] MNT: Re-rendered with conda-build 24.9.0, conda-smithy 3.41.1, and conda-forge-pinning 2024.10.09.19.05.11 --- .azure-pipelines/azure-pipelines-linux.yml | 36 +++++----- .azure-pipelines/azure-pipelines-osx.yml | 24 +++---- .azure-pipelines/azure-pipelines-win.yml | 12 ++-- ...l => linux_64_python3.10.____cpython.yaml} | 4 +- ...l => linux_64_python3.11.____cpython.yaml} | 4 +- ...l => linux_64_python3.12.____cpython.yaml} | 4 +- ...linux_aarch64_python3.10.____cpython.yaml} | 4 +- ...linux_aarch64_python3.11.____cpython.yaml} | 4 +- ...linux_aarch64_python3.12.____cpython.yaml} | 4 +- ...linux_ppc64le_python3.10.____cpython.yaml} | 4 +- ...linux_ppc64le_python3.11.____cpython.yaml} | 4 +- ...linux_ppc64le_python3.12.____cpython.yaml} | 4 +- ...aml => osx_64_python3.10.____cpython.yaml} | 4 +- ...aml => osx_64_python3.11.____cpython.yaml} | 4 +- ...aml => osx_64_python3.12.____cpython.yaml} | 4 +- ... => osx_arm64_python3.10.____cpython.yaml} | 4 +- ... => osx_arm64_python3.11.____cpython.yaml} | 4 +- ... => osx_arm64_python3.12.____cpython.yaml} | 4 +- ...aml => win_64_python3.10.____cpython.yaml} | 0 ...aml => win_64_python3.11.____cpython.yaml} | 0 ...aml => win_64_python3.12.____cpython.yaml} | 0 .scripts/build_steps.sh | 2 + .scripts/run_win_build.bat | 4 +- README.md | 72 +++++++++---------- build-locally.py | 5 +- 25 files changed, 110 insertions(+), 105 deletions(-) rename .ci_support/{linux_64_numpy2.0python3.10.____cpython.yaml => linux_64_python3.10.____cpython.yaml} (97%) rename .ci_support/{linux_64_numpy2.0python3.11.____cpython.yaml => linux_64_python3.11.____cpython.yaml} (97%) rename .ci_support/{linux_64_numpy2.0python3.12.____cpython.yaml => linux_64_python3.12.____cpython.yaml} (97%) rename .ci_support/{linux_aarch64_numpy2.0python3.10.____cpython.yaml => linux_aarch64_python3.10.____cpython.yaml} (97%) rename .ci_support/{linux_aarch64_numpy2.0python3.11.____cpython.yaml => linux_aarch64_python3.11.____cpython.yaml} (97%) rename .ci_support/{linux_aarch64_numpy2.0python3.12.____cpython.yaml => linux_aarch64_python3.12.____cpython.yaml} (97%) rename .ci_support/{linux_ppc64le_numpy2.0python3.10.____cpython.yaml => linux_ppc64le_python3.10.____cpython.yaml} (97%) rename .ci_support/{linux_ppc64le_numpy2.0python3.11.____cpython.yaml => linux_ppc64le_python3.11.____cpython.yaml} (97%) rename .ci_support/{linux_ppc64le_numpy2.0python3.12.____cpython.yaml => linux_ppc64le_python3.12.____cpython.yaml} (97%) rename .ci_support/{osx_64_numpy2.0python3.10.____cpython.yaml => osx_64_python3.10.____cpython.yaml} (97%) rename .ci_support/{osx_64_numpy2.0python3.11.____cpython.yaml => osx_64_python3.11.____cpython.yaml} (97%) rename .ci_support/{osx_64_numpy2.0python3.12.____cpython.yaml => osx_64_python3.12.____cpython.yaml} (97%) rename .ci_support/{osx_arm64_numpy2.0python3.10.____cpython.yaml => osx_arm64_python3.10.____cpython.yaml} (97%) rename .ci_support/{osx_arm64_numpy2.0python3.11.____cpython.yaml => osx_arm64_python3.11.____cpython.yaml} (97%) rename .ci_support/{osx_arm64_numpy2.0python3.12.____cpython.yaml => osx_arm64_python3.12.____cpython.yaml} (97%) rename .ci_support/{win_64_numpy2.0python3.10.____cpython.yaml => win_64_python3.10.____cpython.yaml} (100%) rename .ci_support/{win_64_numpy2.0python3.11.____cpython.yaml => win_64_python3.11.____cpython.yaml} (100%) rename .ci_support/{win_64_numpy2.0python3.12.____cpython.yaml => win_64_python3.12.____cpython.yaml} (100%) diff --git a/.azure-pipelines/azure-pipelines-linux.yml b/.azure-pipelines/azure-pipelines-linux.yml index bb1dd02..5bce94e 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_numpy2.0python3.10.____cpython: - CONFIG: linux_64_numpy2.0python3.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_numpy2.0python3.11.____cpython: - CONFIG: linux_64_numpy2.0python3.11.____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_numpy2.0python3.12.____cpython: - CONFIG: linux_64_numpy2.0python3.12.____cpython + linux_64_python3.12.____cpython: + CONFIG: linux_64_python3.12.____cpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_aarch64_numpy2.0python3.10.____cpython: - CONFIG: linux_aarch64_numpy2.0python3.10.____cpython + linux_aarch64_python3.10.____cpython: + CONFIG: linux_aarch64_python3.10.____cpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_aarch64_numpy2.0python3.11.____cpython: - CONFIG: linux_aarch64_numpy2.0python3.11.____cpython + linux_aarch64_python3.11.____cpython: + CONFIG: linux_aarch64_python3.11.____cpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_aarch64_numpy2.0python3.12.____cpython: - CONFIG: linux_aarch64_numpy2.0python3.12.____cpython + linux_aarch64_python3.12.____cpython: + CONFIG: linux_aarch64_python3.12.____cpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_ppc64le_numpy2.0python3.10.____cpython: - CONFIG: linux_ppc64le_numpy2.0python3.10.____cpython + linux_ppc64le_python3.10.____cpython: + CONFIG: linux_ppc64le_python3.10.____cpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_ppc64le_numpy2.0python3.11.____cpython: - CONFIG: linux_ppc64le_numpy2.0python3.11.____cpython + linux_ppc64le_python3.11.____cpython: + CONFIG: linux_ppc64le_python3.11.____cpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_ppc64le_numpy2.0python3.12.____cpython: - CONFIG: linux_ppc64le_numpy2.0python3.12.____cpython + linux_ppc64le_python3.12.____cpython: + CONFIG: linux_ppc64le_python3.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 e8e2708..90a84b3 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_numpy2.0python3.10.____cpython: - CONFIG: osx_64_numpy2.0python3.10.____cpython + osx_64_python3.10.____cpython: + CONFIG: osx_64_python3.10.____cpython UPLOAD_PACKAGES: 'True' - osx_64_numpy2.0python3.11.____cpython: - CONFIG: osx_64_numpy2.0python3.11.____cpython + osx_64_python3.11.____cpython: + CONFIG: osx_64_python3.11.____cpython UPLOAD_PACKAGES: 'True' - osx_64_numpy2.0python3.12.____cpython: - CONFIG: osx_64_numpy2.0python3.12.____cpython + osx_64_python3.12.____cpython: + CONFIG: osx_64_python3.12.____cpython UPLOAD_PACKAGES: 'True' - osx_arm64_numpy2.0python3.10.____cpython: - CONFIG: osx_arm64_numpy2.0python3.10.____cpython + osx_arm64_python3.10.____cpython: + CONFIG: osx_arm64_python3.10.____cpython UPLOAD_PACKAGES: 'True' - osx_arm64_numpy2.0python3.11.____cpython: - CONFIG: osx_arm64_numpy2.0python3.11.____cpython + osx_arm64_python3.11.____cpython: + CONFIG: osx_arm64_python3.11.____cpython UPLOAD_PACKAGES: 'True' - osx_arm64_numpy2.0python3.12.____cpython: - CONFIG: osx_arm64_numpy2.0python3.12.____cpython + osx_arm64_python3.12.____cpython: + CONFIG: osx_arm64_python3.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 f8c66f0..65f8109 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_numpy2.0python3.10.____cpython: - CONFIG: win_64_numpy2.0python3.10.____cpython + win_64_python3.10.____cpython: + CONFIG: win_64_python3.10.____cpython UPLOAD_PACKAGES: 'True' - win_64_numpy2.0python3.11.____cpython: - CONFIG: win_64_numpy2.0python3.11.____cpython + win_64_python3.11.____cpython: + CONFIG: win_64_python3.11.____cpython UPLOAD_PACKAGES: 'True' - win_64_numpy2.0python3.12.____cpython: - CONFIG: win_64_numpy2.0python3.12.____cpython + win_64_python3.12.____cpython: + CONFIG: win_64_python3.12.____cpython UPLOAD_PACKAGES: 'True' timeoutInMinutes: 360 variables: diff --git a/.ci_support/linux_64_numpy2.0python3.10.____cpython.yaml b/.ci_support/linux_64_python3.10.____cpython.yaml similarity index 97% rename from .ci_support/linux_64_numpy2.0python3.10.____cpython.yaml rename to .ci_support/linux_64_python3.10.____cpython.yaml index 7598a3e..703c32d 100644 --- a/.ci_support/linux_64_numpy2.0python3.10.____cpython.yaml +++ b/.ci_support/linux_64_python3.10.____cpython.yaml @@ -1,7 +1,7 @@ c_compiler: - gcc c_compiler_version: -- '12' +- '13' c_stdlib: - sysroot c_stdlib_version: @@ -15,7 +15,7 @@ channel_targets: cxx_compiler: - gxx cxx_compiler_version: -- '12' +- '13' docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 numpy: diff --git a/.ci_support/linux_64_numpy2.0python3.11.____cpython.yaml b/.ci_support/linux_64_python3.11.____cpython.yaml similarity index 97% rename from .ci_support/linux_64_numpy2.0python3.11.____cpython.yaml rename to .ci_support/linux_64_python3.11.____cpython.yaml index 90e287e..81b3129 100644 --- a/.ci_support/linux_64_numpy2.0python3.11.____cpython.yaml +++ b/.ci_support/linux_64_python3.11.____cpython.yaml @@ -1,7 +1,7 @@ c_compiler: - gcc c_compiler_version: -- '12' +- '13' c_stdlib: - sysroot c_stdlib_version: @@ -15,7 +15,7 @@ channel_targets: cxx_compiler: - gxx cxx_compiler_version: -- '12' +- '13' docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 numpy: diff --git a/.ci_support/linux_64_numpy2.0python3.12.____cpython.yaml b/.ci_support/linux_64_python3.12.____cpython.yaml similarity index 97% rename from .ci_support/linux_64_numpy2.0python3.12.____cpython.yaml rename to .ci_support/linux_64_python3.12.____cpython.yaml index dcf1660..0467085 100644 --- a/.ci_support/linux_64_numpy2.0python3.12.____cpython.yaml +++ b/.ci_support/linux_64_python3.12.____cpython.yaml @@ -1,7 +1,7 @@ c_compiler: - gcc c_compiler_version: -- '12' +- '13' c_stdlib: - sysroot c_stdlib_version: @@ -15,7 +15,7 @@ channel_targets: cxx_compiler: - gxx cxx_compiler_version: -- '12' +- '13' docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 numpy: diff --git a/.ci_support/linux_aarch64_numpy2.0python3.10.____cpython.yaml b/.ci_support/linux_aarch64_python3.10.____cpython.yaml similarity index 97% rename from .ci_support/linux_aarch64_numpy2.0python3.10.____cpython.yaml rename to .ci_support/linux_aarch64_python3.10.____cpython.yaml index c6b92fb..5c7f53c 100644 --- a/.ci_support/linux_aarch64_numpy2.0python3.10.____cpython.yaml +++ b/.ci_support/linux_aarch64_python3.10.____cpython.yaml @@ -3,7 +3,7 @@ BUILD: c_compiler: - gcc c_compiler_version: -- '12' +- '13' c_stdlib: - sysroot c_stdlib_version: @@ -19,7 +19,7 @@ channel_targets: cxx_compiler: - gxx cxx_compiler_version: -- '12' +- '13' docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 numpy: diff --git a/.ci_support/linux_aarch64_numpy2.0python3.11.____cpython.yaml b/.ci_support/linux_aarch64_python3.11.____cpython.yaml similarity index 97% rename from .ci_support/linux_aarch64_numpy2.0python3.11.____cpython.yaml rename to .ci_support/linux_aarch64_python3.11.____cpython.yaml index ec5850d..6fa3208 100644 --- a/.ci_support/linux_aarch64_numpy2.0python3.11.____cpython.yaml +++ b/.ci_support/linux_aarch64_python3.11.____cpython.yaml @@ -3,7 +3,7 @@ BUILD: c_compiler: - gcc c_compiler_version: -- '12' +- '13' c_stdlib: - sysroot c_stdlib_version: @@ -19,7 +19,7 @@ channel_targets: cxx_compiler: - gxx cxx_compiler_version: -- '12' +- '13' docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 numpy: diff --git a/.ci_support/linux_aarch64_numpy2.0python3.12.____cpython.yaml b/.ci_support/linux_aarch64_python3.12.____cpython.yaml similarity index 97% rename from .ci_support/linux_aarch64_numpy2.0python3.12.____cpython.yaml rename to .ci_support/linux_aarch64_python3.12.____cpython.yaml index 900d817..3d79515 100644 --- a/.ci_support/linux_aarch64_numpy2.0python3.12.____cpython.yaml +++ b/.ci_support/linux_aarch64_python3.12.____cpython.yaml @@ -3,7 +3,7 @@ BUILD: c_compiler: - gcc c_compiler_version: -- '12' +- '13' c_stdlib: - sysroot c_stdlib_version: @@ -19,7 +19,7 @@ channel_targets: cxx_compiler: - gxx cxx_compiler_version: -- '12' +- '13' docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 numpy: diff --git a/.ci_support/linux_ppc64le_numpy2.0python3.10.____cpython.yaml b/.ci_support/linux_ppc64le_python3.10.____cpython.yaml similarity index 97% rename from .ci_support/linux_ppc64le_numpy2.0python3.10.____cpython.yaml rename to .ci_support/linux_ppc64le_python3.10.____cpython.yaml index 6114e74..7b5c991 100644 --- a/.ci_support/linux_ppc64le_numpy2.0python3.10.____cpython.yaml +++ b/.ci_support/linux_ppc64le_python3.10.____cpython.yaml @@ -1,7 +1,7 @@ c_compiler: - gcc c_compiler_version: -- '12' +- '13' c_stdlib: - sysroot c_stdlib_version: @@ -15,7 +15,7 @@ channel_targets: cxx_compiler: - gxx cxx_compiler_version: -- '12' +- '13' docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 numpy: diff --git a/.ci_support/linux_ppc64le_numpy2.0python3.11.____cpython.yaml b/.ci_support/linux_ppc64le_python3.11.____cpython.yaml similarity index 97% rename from .ci_support/linux_ppc64le_numpy2.0python3.11.____cpython.yaml rename to .ci_support/linux_ppc64le_python3.11.____cpython.yaml index 6ea1d00..dbb56a9 100644 --- a/.ci_support/linux_ppc64le_numpy2.0python3.11.____cpython.yaml +++ b/.ci_support/linux_ppc64le_python3.11.____cpython.yaml @@ -1,7 +1,7 @@ c_compiler: - gcc c_compiler_version: -- '12' +- '13' c_stdlib: - sysroot c_stdlib_version: @@ -15,7 +15,7 @@ channel_targets: cxx_compiler: - gxx cxx_compiler_version: -- '12' +- '13' docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 numpy: diff --git a/.ci_support/linux_ppc64le_numpy2.0python3.12.____cpython.yaml b/.ci_support/linux_ppc64le_python3.12.____cpython.yaml similarity index 97% rename from .ci_support/linux_ppc64le_numpy2.0python3.12.____cpython.yaml rename to .ci_support/linux_ppc64le_python3.12.____cpython.yaml index 69cd6ef..b8eb01f 100644 --- a/.ci_support/linux_ppc64le_numpy2.0python3.12.____cpython.yaml +++ b/.ci_support/linux_ppc64le_python3.12.____cpython.yaml @@ -1,7 +1,7 @@ c_compiler: - gcc c_compiler_version: -- '12' +- '13' c_stdlib: - sysroot c_stdlib_version: @@ -15,7 +15,7 @@ channel_targets: cxx_compiler: - gxx cxx_compiler_version: -- '12' +- '13' docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 numpy: diff --git a/.ci_support/osx_64_numpy2.0python3.10.____cpython.yaml b/.ci_support/osx_64_python3.10.____cpython.yaml similarity index 97% rename from .ci_support/osx_64_numpy2.0python3.10.____cpython.yaml rename to .ci_support/osx_64_python3.10.____cpython.yaml index 0588715..025875d 100644 --- a/.ci_support/osx_64_numpy2.0python3.10.____cpython.yaml +++ b/.ci_support/osx_64_python3.10.____cpython.yaml @@ -5,7 +5,7 @@ MACOSX_SDK_VERSION: c_compiler: - clang c_compiler_version: -- '16' +- '17' c_stdlib: - macosx_deployment_target c_stdlib_version: @@ -17,7 +17,7 @@ channel_targets: cxx_compiler: - clangxx cxx_compiler_version: -- '16' +- '17' macos_machine: - x86_64-apple-darwin13.4.0 numpy: diff --git a/.ci_support/osx_64_numpy2.0python3.11.____cpython.yaml b/.ci_support/osx_64_python3.11.____cpython.yaml similarity index 97% rename from .ci_support/osx_64_numpy2.0python3.11.____cpython.yaml rename to .ci_support/osx_64_python3.11.____cpython.yaml index ba94b88..6d2ca15 100644 --- a/.ci_support/osx_64_numpy2.0python3.11.____cpython.yaml +++ b/.ci_support/osx_64_python3.11.____cpython.yaml @@ -5,7 +5,7 @@ MACOSX_SDK_VERSION: c_compiler: - clang c_compiler_version: -- '16' +- '17' c_stdlib: - macosx_deployment_target c_stdlib_version: @@ -17,7 +17,7 @@ channel_targets: cxx_compiler: - clangxx cxx_compiler_version: -- '16' +- '17' macos_machine: - x86_64-apple-darwin13.4.0 numpy: diff --git a/.ci_support/osx_64_numpy2.0python3.12.____cpython.yaml b/.ci_support/osx_64_python3.12.____cpython.yaml similarity index 97% rename from .ci_support/osx_64_numpy2.0python3.12.____cpython.yaml rename to .ci_support/osx_64_python3.12.____cpython.yaml index 14576b3..f7823ec 100644 --- a/.ci_support/osx_64_numpy2.0python3.12.____cpython.yaml +++ b/.ci_support/osx_64_python3.12.____cpython.yaml @@ -5,7 +5,7 @@ MACOSX_SDK_VERSION: c_compiler: - clang c_compiler_version: -- '16' +- '17' c_stdlib: - macosx_deployment_target c_stdlib_version: @@ -17,7 +17,7 @@ channel_targets: cxx_compiler: - clangxx cxx_compiler_version: -- '16' +- '17' macos_machine: - x86_64-apple-darwin13.4.0 numpy: diff --git a/.ci_support/osx_arm64_numpy2.0python3.10.____cpython.yaml b/.ci_support/osx_arm64_python3.10.____cpython.yaml similarity index 97% rename from .ci_support/osx_arm64_numpy2.0python3.10.____cpython.yaml rename to .ci_support/osx_arm64_python3.10.____cpython.yaml index 2d3ca25..8c752bb 100644 --- a/.ci_support/osx_arm64_numpy2.0python3.10.____cpython.yaml +++ b/.ci_support/osx_arm64_python3.10.____cpython.yaml @@ -5,7 +5,7 @@ MACOSX_SDK_VERSION: c_compiler: - clang c_compiler_version: -- '16' +- '17' c_stdlib: - macosx_deployment_target c_stdlib_version: @@ -17,7 +17,7 @@ channel_targets: cxx_compiler: - clangxx cxx_compiler_version: -- '16' +- '17' macos_machine: - arm64-apple-darwin20.0.0 numpy: diff --git a/.ci_support/osx_arm64_numpy2.0python3.11.____cpython.yaml b/.ci_support/osx_arm64_python3.11.____cpython.yaml similarity index 97% rename from .ci_support/osx_arm64_numpy2.0python3.11.____cpython.yaml rename to .ci_support/osx_arm64_python3.11.____cpython.yaml index b4e88ae..297abc6 100644 --- a/.ci_support/osx_arm64_numpy2.0python3.11.____cpython.yaml +++ b/.ci_support/osx_arm64_python3.11.____cpython.yaml @@ -5,7 +5,7 @@ MACOSX_SDK_VERSION: c_compiler: - clang c_compiler_version: -- '16' +- '17' c_stdlib: - macosx_deployment_target c_stdlib_version: @@ -17,7 +17,7 @@ channel_targets: cxx_compiler: - clangxx cxx_compiler_version: -- '16' +- '17' macos_machine: - arm64-apple-darwin20.0.0 numpy: diff --git a/.ci_support/osx_arm64_numpy2.0python3.12.____cpython.yaml b/.ci_support/osx_arm64_python3.12.____cpython.yaml similarity index 97% rename from .ci_support/osx_arm64_numpy2.0python3.12.____cpython.yaml rename to .ci_support/osx_arm64_python3.12.____cpython.yaml index c155d83..4a5e46f 100644 --- a/.ci_support/osx_arm64_numpy2.0python3.12.____cpython.yaml +++ b/.ci_support/osx_arm64_python3.12.____cpython.yaml @@ -5,7 +5,7 @@ MACOSX_SDK_VERSION: c_compiler: - clang c_compiler_version: -- '16' +- '17' c_stdlib: - macosx_deployment_target c_stdlib_version: @@ -17,7 +17,7 @@ channel_targets: cxx_compiler: - clangxx cxx_compiler_version: -- '16' +- '17' macos_machine: - arm64-apple-darwin20.0.0 numpy: diff --git a/.ci_support/win_64_numpy2.0python3.10.____cpython.yaml b/.ci_support/win_64_python3.10.____cpython.yaml similarity index 100% rename from .ci_support/win_64_numpy2.0python3.10.____cpython.yaml rename to .ci_support/win_64_python3.10.____cpython.yaml diff --git a/.ci_support/win_64_numpy2.0python3.11.____cpython.yaml b/.ci_support/win_64_python3.11.____cpython.yaml similarity index 100% rename from .ci_support/win_64_numpy2.0python3.11.____cpython.yaml rename to .ci_support/win_64_python3.11.____cpython.yaml diff --git a/.ci_support/win_64_numpy2.0python3.12.____cpython.yaml b/.ci_support/win_64_python3.12.____cpython.yaml similarity index 100% rename from .ci_support/win_64_numpy2.0python3.12.____cpython.yaml rename to .ci_support/win_64_python3.12.____cpython.yaml diff --git a/.scripts/build_steps.sh b/.scripts/build_steps.sh index ba4b251..856f469 100755 --- a/.scripts/build_steps.sh +++ b/.scripts/build_steps.sh @@ -43,6 +43,8 @@ setup_conda_rc "${FEEDSTOCK_ROOT}" "${RECIPE_ROOT}" "${CONFIG_FILE}" source run_conda_forge_build_setup + + # make the build number clobber make_build_number "${FEEDSTOCK_ROOT}" "${RECIPE_ROOT}" "${CONFIG_FILE}" diff --git a/.scripts/run_win_build.bat b/.scripts/run_win_build.bat index 65650bf..a45c34f 100755 --- a/.scripts/run_win_build.bat +++ b/.scripts/run_win_build.bat @@ -24,7 +24,7 @@ set "CONDA_LIBMAMBA_SOLVER_NO_CHANNELS_FROM_INSTALLED=1" :: Provision the necessary dependencies to build the recipe later echo Installing dependencies -mamba.exe install "python=3.10" pip mamba conda-build conda-forge-ci-setup=4 "conda-build>=24.1" -c conda-forge --strict-channel-priority --yes +mamba.exe install pip mamba conda-build conda-forge-ci-setup=4 "conda-build>=24.1" -c conda-forge --strict-channel-priority --yes if !errorlevel! neq 0 exit /b !errorlevel! :: Set basic configuration @@ -48,7 +48,7 @@ if NOT [%HOST_PLATFORM%] == [%BUILD_PLATFORM%] ( ) if NOT [%flow_run_id%] == [] ( - set "EXTRA_CB_OPTIONS=%EXTRA_CB_OPTIONS% --extra-meta flow_run_id=%flow_run_id% remote_url=%remote_url% sha=%sha%" + set "EXTRA_CB_OPTIONS=%EXTRA_CB_OPTIONS% --extra-meta flow_run_id=%flow_run_id% remote_url=%remote_url% sha=%sha%" ) call :end_group diff --git a/README.md b/README.md index 7d51b04..5d82684 100644 --- a/README.md +++ b/README.md @@ -27,129 +27,129 @@ Current build status - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + diff --git a/build-locally.py b/build-locally.py index d78427b..6788aea 100755 --- a/build-locally.py +++ b/build-locally.py @@ -1,8 +1,11 @@ -#!/usr/bin/env python3 +#!/bin/sh +"""exec" "python3" "$0" "$@" #""" # fmt: off # fmt: on # # This file has been generated by conda-smithy in order to build the recipe # locally. # +# The line above this comment is a bash / sh / zsh guard +# to stop people from running it with the wrong interpreter import glob import os import platform From b933fd7d0a4805d121a6246d0c2c7447351af377 Mon Sep 17 00:00:00 2001 From: jakirkham Date: Wed, 9 Oct 2024 14:25:18 -0700 Subject: [PATCH 05/10] Remove upstreamed patch --- recipe/meta.yaml | 5 ----- recipe/patches/including_assmembly.patch | 19 ------------------- 2 files changed, 24 deletions(-) delete mode 100644 recipe/patches/including_assmembly.patch diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 0311043..15303d4 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -8,11 +8,6 @@ package: source: url: https://pypi.io/packages/source/{{ name[0] }}/{{ name }}/{{ name }}-{{ version }}.tar.gz sha256: a3cf37881df0898f3a9c0d4477df88133fe85185bffe57ba31bcc2fa207709bc - patches: - # 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 diff --git a/recipe/patches/including_assmembly.patch b/recipe/patches/including_assmembly.patch deleted file mode 100644 index 7339b37..0000000 --- a/recipe/patches/including_assmembly.patch +++ /dev/null @@ -1,19 +0,0 @@ -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 f55e063ce85de66929cdab306a624d7a86b616c8 Mon Sep 17 00:00:00 2001 From: "conda-forge-webservices[bot]" <91080706+conda-forge-webservices[bot]@users.noreply.github.com> Date: Wed, 9 Oct 2024 21:38:10 +0000 Subject: [PATCH 06/10] MNT: Re-rendered with conda-build 24.9.0, conda-smithy 3.42.0, and conda-forge-pinning 2024.10.09.19.05.11 --- .azure-pipelines/azure-pipelines-osx.yml | 2 +- azure-pipelines.yml | 34 +++++++++++++++++++++--- 2 files changed, 31 insertions(+), 5 deletions(-) diff --git a/.azure-pipelines/azure-pipelines-osx.yml b/.azure-pipelines/azure-pipelines-osx.yml index 90a84b3..5b30c09 100755 --- a/.azure-pipelines/azure-pipelines-osx.yml +++ b/.azure-pipelines/azure-pipelines-osx.yml @@ -5,7 +5,7 @@ jobs: - job: osx pool: - vmImage: macOS-12 + vmImage: macOS-13 strategy: matrix: osx_64_python3.10.____cpython: diff --git a/azure-pipelines.yml b/azure-pipelines.yml index e5306da..579bd76 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -2,7 +2,33 @@ # update the conda-forge.yml and/or the recipe/meta.yaml. # -*- mode: yaml -*- -jobs: - - template: ./.azure-pipelines/azure-pipelines-linux.yml - - template: ./.azure-pipelines/azure-pipelines-osx.yml - - template: ./.azure-pipelines/azure-pipelines-win.yml \ No newline at end of file +stages: +- stage: Check + jobs: + - job: Skip + pool: + vmImage: 'ubuntu-22.04' + variables: + DECODE_PERCENTS: 'false' + RET: 'true' + steps: + - checkout: self + + fetchDepth: '2' + - bash: | + git_log=`git log --max-count=1 --skip=1 --pretty=format:"%B" | tr "\n" " "` + echo "##vso[task.setvariable variable=log]$git_log" + displayName: Obtain commit message + - bash: echo "##vso[task.setvariable variable=RET]false" + condition: or(contains(variables.log, '[skip azp]'), contains(variables.log, '[azp skip]'), contains(variables.log, '[skip ci]'), contains(variables.log, '[ci skip]')) + displayName: Skip build? + - bash: echo "##vso[task.setvariable variable=start_main;isOutput=true]$RET" + name: result + displayName: Export result +- stage: Build + condition: and(succeeded(), eq(dependencies.Check.outputs['Skip.result.start_main'], 'true')) + dependsOn: Check + jobs: + - template: ./.azure-pipelines/azure-pipelines-linux.yml + - template: ./.azure-pipelines/azure-pipelines-osx.yml + - template: ./.azure-pipelines/azure-pipelines-win.yml \ No newline at end of file From 2bbf853f1f109bc55bb00103c1145d997026efd0 Mon Sep 17 00:00:00 2001 From: jakirkham Date: Wed, 9 Oct 2024 14:38:55 -0700 Subject: [PATCH 07/10] Include @dstansby as a maintainer --- recipe/meta.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 15303d4..50bdc8c 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -69,6 +69,7 @@ about: extra: recipe-maintainers: - alimanfoo + - dstansby - jakirkham - joshmoore - jrbourbeau From 4a17fd690e15c62273a3a455bb323d99221518d4 Mon Sep 17 00:00:00 2001 From: jakirkham Date: Wed, 9 Oct 2024 14:38:56 -0700 Subject: [PATCH 08/10] MNT: Re-rendered with conda-build 24.9.0, conda-smithy 3.42.0, and conda-forge-pinning 2024.10.09.19.05.11 --- .github/CODEOWNERS | 2 +- README.md | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index 822c8f9..c923755 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -1 +1 @@ -* @alimanfoo @jakirkham @joshmoore @jrbourbeau \ No newline at end of file +* @alimanfoo @dstansby @jakirkham @joshmoore @jrbourbeau \ No newline at end of file diff --git a/README.md b/README.md index 5d82684..3035520 100644 --- a/README.md +++ b/README.md @@ -282,6 +282,7 @@ Feedstock Maintainers ===================== * [@alimanfoo](https://github.com/alimanfoo/) +* [@dstansby](https://github.com/dstansby/) * [@jakirkham](https://github.com/jakirkham/) * [@joshmoore](https://github.com/joshmoore/) * [@jrbourbeau](https://github.com/jrbourbeau/) From 50442b3ba30699fcc325b77e8aba5a97f59f7fad Mon Sep 17 00:00:00 2001 From: jakirkham Date: Wed, 9 Oct 2024 14:43:22 -0700 Subject: [PATCH 09/10] Refresh `python313` migrator https://github.com/conda-forge/conda-forge-pinning-feedstock/blob/f1f5499c7886fe52940ed4610aaf7beba9afaca0/recipe/migrations/python313.yaml --- .ci_support/migrations/python313.yaml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/.ci_support/migrations/python313.yaml b/.ci_support/migrations/python313.yaml index 92cc90b..119bed8 100644 --- a/.ci_support/migrations/python313.yaml +++ b/.ci_support/migrations/python313.yaml @@ -29,14 +29,12 @@ __migrator: - pypy-meta - cross-python - python_abi + # see https://github.com/conda-forge/scipy-feedstock/pull/283 + - scipy exclude_pinned_pkgs: false - additional_zip_keys: - - channel_sources python: - 3.13.* *_cp313 -channel_sources: -- conda-forge/label/python_rc,conda-forge # additional entries to add for zip_keys numpy: - 2 From 44f8cdbfb1e8c2c565c1dac329a176cd13d79d67 Mon Sep 17 00:00:00 2001 From: "conda-forge-webservices[bot]" <91080706+conda-forge-webservices[bot]@users.noreply.github.com> Date: Wed, 9 Oct 2024 21:46:32 +0000 Subject: [PATCH 10/10] MNT: Re-rendered with conda-build 24.9.0, conda-smithy 3.42.0, and conda-forge-pinning 2024.10.09.19.05.11 --- .azure-pipelines/azure-pipelines-osx.yml | 2 +- ...nux_64_numpy2.0python3.10.____cpython.yaml | 1 - ...nux_64_numpy2.0python3.11.____cpython.yaml | 1 - ...nux_64_numpy2.0python3.12.____cpython.yaml | 1 - .../linux_64_numpy2python3.13.____cp313.yaml | 3 +- ...arch64_numpy2.0python3.10.____cpython.yaml | 1 - ...arch64_numpy2.0python3.11.____cpython.yaml | 1 - ...arch64_numpy2.0python3.12.____cpython.yaml | 1 - ...ux_aarch64_numpy2python3.13.____cp313.yaml | 3 +- ...pc64le_numpy2.0python3.10.____cpython.yaml | 1 - ...pc64le_numpy2.0python3.11.____cpython.yaml | 1 - ...pc64le_numpy2.0python3.12.____cpython.yaml | 1 - ...ux_ppc64le_numpy2python3.13.____cp313.yaml | 3 +- ...osx_64_numpy2.0python3.10.____cpython.yaml | 1 - ...osx_64_numpy2.0python3.11.____cpython.yaml | 1 - ...osx_64_numpy2.0python3.12.____cpython.yaml | 1 - .../osx_64_numpy2python3.13.____cp313.yaml | 3 +- ..._arm64_numpy2.0python3.10.____cpython.yaml | 1 - ..._arm64_numpy2.0python3.11.____cpython.yaml | 1 - ..._arm64_numpy2.0python3.12.____cpython.yaml | 1 - .../osx_arm64_numpy2python3.13.____cp313.yaml | 3 +- ...win_64_numpy2.0python3.10.____cpython.yaml | 1 - ...win_64_numpy2.0python3.11.____cpython.yaml | 1 - ...win_64_numpy2.0python3.12.____cpython.yaml | 1 - .../win_64_numpy2python3.13.____cp313.yaml | 3 +- .scripts/build_steps.sh | 2 ++ .scripts/run_win_build.bat | 4 +-- azure-pipelines.yml | 34 ++++++++++++++++--- build-locally.py | 2 +- 29 files changed, 42 insertions(+), 38 deletions(-) diff --git a/.azure-pipelines/azure-pipelines-osx.yml b/.azure-pipelines/azure-pipelines-osx.yml index 69eacb1..423293c 100755 --- a/.azure-pipelines/azure-pipelines-osx.yml +++ b/.azure-pipelines/azure-pipelines-osx.yml @@ -5,7 +5,7 @@ jobs: - job: osx pool: - vmImage: macOS-12 + vmImage: macOS-13 strategy: matrix: osx_64_numpy2.0python3.10.____cpython: diff --git a/.ci_support/linux_64_numpy2.0python3.10.____cpython.yaml b/.ci_support/linux_64_numpy2.0python3.10.____cpython.yaml index 5cd140f..703c32d 100644 --- a/.ci_support/linux_64_numpy2.0python3.10.____cpython.yaml +++ b/.ci_support/linux_64_numpy2.0python3.10.____cpython.yaml @@ -35,4 +35,3 @@ zip_keys: - cdt_name - - python - numpy - - channel_sources diff --git a/.ci_support/linux_64_numpy2.0python3.11.____cpython.yaml b/.ci_support/linux_64_numpy2.0python3.11.____cpython.yaml index 7070405..81b3129 100644 --- a/.ci_support/linux_64_numpy2.0python3.11.____cpython.yaml +++ b/.ci_support/linux_64_numpy2.0python3.11.____cpython.yaml @@ -35,4 +35,3 @@ zip_keys: - cdt_name - - python - numpy - - channel_sources diff --git a/.ci_support/linux_64_numpy2.0python3.12.____cpython.yaml b/.ci_support/linux_64_numpy2.0python3.12.____cpython.yaml index 5f502ac..0467085 100644 --- a/.ci_support/linux_64_numpy2.0python3.12.____cpython.yaml +++ b/.ci_support/linux_64_numpy2.0python3.12.____cpython.yaml @@ -35,4 +35,3 @@ zip_keys: - cdt_name - - python - numpy - - channel_sources diff --git a/.ci_support/linux_64_numpy2python3.13.____cp313.yaml b/.ci_support/linux_64_numpy2python3.13.____cp313.yaml index 977014a..8ac5dc3 100644 --- a/.ci_support/linux_64_numpy2python3.13.____cp313.yaml +++ b/.ci_support/linux_64_numpy2python3.13.____cp313.yaml @@ -9,7 +9,7 @@ c_stdlib_version: cdt_name: - cos7 channel_sources: -- conda-forge/label/python_rc,conda-forge +- conda-forge channel_targets: - conda-forge main cxx_compiler: @@ -35,4 +35,3 @@ zip_keys: - cdt_name - - python - numpy - - channel_sources diff --git a/.ci_support/linux_aarch64_numpy2.0python3.10.____cpython.yaml b/.ci_support/linux_aarch64_numpy2.0python3.10.____cpython.yaml index a5f9919..5c7f53c 100644 --- a/.ci_support/linux_aarch64_numpy2.0python3.10.____cpython.yaml +++ b/.ci_support/linux_aarch64_numpy2.0python3.10.____cpython.yaml @@ -39,4 +39,3 @@ zip_keys: - cdt_name - - python - numpy - - channel_sources diff --git a/.ci_support/linux_aarch64_numpy2.0python3.11.____cpython.yaml b/.ci_support/linux_aarch64_numpy2.0python3.11.____cpython.yaml index 4845d4c..6fa3208 100644 --- a/.ci_support/linux_aarch64_numpy2.0python3.11.____cpython.yaml +++ b/.ci_support/linux_aarch64_numpy2.0python3.11.____cpython.yaml @@ -39,4 +39,3 @@ zip_keys: - cdt_name - - python - numpy - - channel_sources diff --git a/.ci_support/linux_aarch64_numpy2.0python3.12.____cpython.yaml b/.ci_support/linux_aarch64_numpy2.0python3.12.____cpython.yaml index 4aa3a31..3d79515 100644 --- a/.ci_support/linux_aarch64_numpy2.0python3.12.____cpython.yaml +++ b/.ci_support/linux_aarch64_numpy2.0python3.12.____cpython.yaml @@ -39,4 +39,3 @@ zip_keys: - cdt_name - - python - numpy - - channel_sources diff --git a/.ci_support/linux_aarch64_numpy2python3.13.____cp313.yaml b/.ci_support/linux_aarch64_numpy2python3.13.____cp313.yaml index 6a94a6f..7893955 100644 --- a/.ci_support/linux_aarch64_numpy2python3.13.____cp313.yaml +++ b/.ci_support/linux_aarch64_numpy2python3.13.____cp313.yaml @@ -13,7 +13,7 @@ cdt_arch: cdt_name: - cos7 channel_sources: -- conda-forge/label/python_rc,conda-forge +- conda-forge channel_targets: - conda-forge main cxx_compiler: @@ -39,4 +39,3 @@ zip_keys: - cdt_name - - python - numpy - - channel_sources diff --git a/.ci_support/linux_ppc64le_numpy2.0python3.10.____cpython.yaml b/.ci_support/linux_ppc64le_numpy2.0python3.10.____cpython.yaml index 3a83867..7b5c991 100644 --- a/.ci_support/linux_ppc64le_numpy2.0python3.10.____cpython.yaml +++ b/.ci_support/linux_ppc64le_numpy2.0python3.10.____cpython.yaml @@ -35,4 +35,3 @@ zip_keys: - cdt_name - - python - numpy - - channel_sources diff --git a/.ci_support/linux_ppc64le_numpy2.0python3.11.____cpython.yaml b/.ci_support/linux_ppc64le_numpy2.0python3.11.____cpython.yaml index 8ec571b..dbb56a9 100644 --- a/.ci_support/linux_ppc64le_numpy2.0python3.11.____cpython.yaml +++ b/.ci_support/linux_ppc64le_numpy2.0python3.11.____cpython.yaml @@ -35,4 +35,3 @@ zip_keys: - cdt_name - - python - numpy - - channel_sources diff --git a/.ci_support/linux_ppc64le_numpy2.0python3.12.____cpython.yaml b/.ci_support/linux_ppc64le_numpy2.0python3.12.____cpython.yaml index a6d6b5b..b8eb01f 100644 --- a/.ci_support/linux_ppc64le_numpy2.0python3.12.____cpython.yaml +++ b/.ci_support/linux_ppc64le_numpy2.0python3.12.____cpython.yaml @@ -35,4 +35,3 @@ zip_keys: - cdt_name - - python - numpy - - channel_sources diff --git a/.ci_support/linux_ppc64le_numpy2python3.13.____cp313.yaml b/.ci_support/linux_ppc64le_numpy2python3.13.____cp313.yaml index 2f86546..38a336a 100644 --- a/.ci_support/linux_ppc64le_numpy2python3.13.____cp313.yaml +++ b/.ci_support/linux_ppc64le_numpy2python3.13.____cp313.yaml @@ -9,7 +9,7 @@ c_stdlib_version: cdt_name: - cos7 channel_sources: -- conda-forge/label/python_rc,conda-forge +- conda-forge channel_targets: - conda-forge main cxx_compiler: @@ -35,4 +35,3 @@ zip_keys: - cdt_name - - python - numpy - - channel_sources diff --git a/.ci_support/osx_64_numpy2.0python3.10.____cpython.yaml b/.ci_support/osx_64_numpy2.0python3.10.____cpython.yaml index 9dafbcc..025875d 100644 --- a/.ci_support/osx_64_numpy2.0python3.10.____cpython.yaml +++ b/.ci_support/osx_64_numpy2.0python3.10.____cpython.yaml @@ -35,4 +35,3 @@ zip_keys: - cxx_compiler_version - - python - numpy - - channel_sources diff --git a/.ci_support/osx_64_numpy2.0python3.11.____cpython.yaml b/.ci_support/osx_64_numpy2.0python3.11.____cpython.yaml index 71701df..6d2ca15 100644 --- a/.ci_support/osx_64_numpy2.0python3.11.____cpython.yaml +++ b/.ci_support/osx_64_numpy2.0python3.11.____cpython.yaml @@ -35,4 +35,3 @@ zip_keys: - cxx_compiler_version - - python - numpy - - channel_sources diff --git a/.ci_support/osx_64_numpy2.0python3.12.____cpython.yaml b/.ci_support/osx_64_numpy2.0python3.12.____cpython.yaml index f462703..f7823ec 100644 --- a/.ci_support/osx_64_numpy2.0python3.12.____cpython.yaml +++ b/.ci_support/osx_64_numpy2.0python3.12.____cpython.yaml @@ -35,4 +35,3 @@ zip_keys: - cxx_compiler_version - - python - numpy - - channel_sources diff --git a/.ci_support/osx_64_numpy2python3.13.____cp313.yaml b/.ci_support/osx_64_numpy2python3.13.____cp313.yaml index 1b92bb7..2097ea6 100644 --- a/.ci_support/osx_64_numpy2python3.13.____cp313.yaml +++ b/.ci_support/osx_64_numpy2python3.13.____cp313.yaml @@ -11,7 +11,7 @@ c_stdlib: c_stdlib_version: - '10.13' channel_sources: -- conda-forge/label/python_rc,conda-forge +- conda-forge channel_targets: - conda-forge main cxx_compiler: @@ -35,4 +35,3 @@ zip_keys: - cxx_compiler_version - - python - numpy - - channel_sources diff --git a/.ci_support/osx_arm64_numpy2.0python3.10.____cpython.yaml b/.ci_support/osx_arm64_numpy2.0python3.10.____cpython.yaml index 6c1de4b..8c752bb 100644 --- a/.ci_support/osx_arm64_numpy2.0python3.10.____cpython.yaml +++ b/.ci_support/osx_arm64_numpy2.0python3.10.____cpython.yaml @@ -35,4 +35,3 @@ zip_keys: - cxx_compiler_version - - python - numpy - - channel_sources diff --git a/.ci_support/osx_arm64_numpy2.0python3.11.____cpython.yaml b/.ci_support/osx_arm64_numpy2.0python3.11.____cpython.yaml index 93190ae..297abc6 100644 --- a/.ci_support/osx_arm64_numpy2.0python3.11.____cpython.yaml +++ b/.ci_support/osx_arm64_numpy2.0python3.11.____cpython.yaml @@ -35,4 +35,3 @@ zip_keys: - cxx_compiler_version - - python - numpy - - channel_sources diff --git a/.ci_support/osx_arm64_numpy2.0python3.12.____cpython.yaml b/.ci_support/osx_arm64_numpy2.0python3.12.____cpython.yaml index 8877086..4a5e46f 100644 --- a/.ci_support/osx_arm64_numpy2.0python3.12.____cpython.yaml +++ b/.ci_support/osx_arm64_numpy2.0python3.12.____cpython.yaml @@ -35,4 +35,3 @@ zip_keys: - cxx_compiler_version - - python - numpy - - channel_sources diff --git a/.ci_support/osx_arm64_numpy2python3.13.____cp313.yaml b/.ci_support/osx_arm64_numpy2python3.13.____cp313.yaml index 56c6ec5..c74ff31 100644 --- a/.ci_support/osx_arm64_numpy2python3.13.____cp313.yaml +++ b/.ci_support/osx_arm64_numpy2python3.13.____cp313.yaml @@ -11,7 +11,7 @@ c_stdlib: c_stdlib_version: - '11.0' channel_sources: -- conda-forge/label/python_rc,conda-forge +- conda-forge channel_targets: - conda-forge main cxx_compiler: @@ -35,4 +35,3 @@ zip_keys: - cxx_compiler_version - - python - numpy - - channel_sources diff --git a/.ci_support/win_64_numpy2.0python3.10.____cpython.yaml b/.ci_support/win_64_numpy2.0python3.10.____cpython.yaml index caed20e..644a184 100644 --- a/.ci_support/win_64_numpy2.0python3.10.____cpython.yaml +++ b/.ci_support/win_64_numpy2.0python3.10.____cpython.yaml @@ -21,4 +21,3 @@ target_platform: zip_keys: - - python - numpy - - channel_sources diff --git a/.ci_support/win_64_numpy2.0python3.11.____cpython.yaml b/.ci_support/win_64_numpy2.0python3.11.____cpython.yaml index beb73f1..e73b71f 100644 --- a/.ci_support/win_64_numpy2.0python3.11.____cpython.yaml +++ b/.ci_support/win_64_numpy2.0python3.11.____cpython.yaml @@ -21,4 +21,3 @@ target_platform: zip_keys: - - python - numpy - - channel_sources diff --git a/.ci_support/win_64_numpy2.0python3.12.____cpython.yaml b/.ci_support/win_64_numpy2.0python3.12.____cpython.yaml index 8e0aa12..afb1384 100644 --- a/.ci_support/win_64_numpy2.0python3.12.____cpython.yaml +++ b/.ci_support/win_64_numpy2.0python3.12.____cpython.yaml @@ -21,4 +21,3 @@ target_platform: zip_keys: - - python - numpy - - channel_sources diff --git a/.ci_support/win_64_numpy2python3.13.____cp313.yaml b/.ci_support/win_64_numpy2python3.13.____cp313.yaml index 24a481a..27fb0ab 100644 --- a/.ci_support/win_64_numpy2python3.13.____cp313.yaml +++ b/.ci_support/win_64_numpy2python3.13.____cp313.yaml @@ -3,7 +3,7 @@ c_compiler: c_stdlib: - vs channel_sources: -- conda-forge/label/python_rc,conda-forge +- conda-forge channel_targets: - conda-forge main cxx_compiler: @@ -21,4 +21,3 @@ target_platform: zip_keys: - - python - numpy - - channel_sources diff --git a/.scripts/build_steps.sh b/.scripts/build_steps.sh index ba4b251..856f469 100755 --- a/.scripts/build_steps.sh +++ b/.scripts/build_steps.sh @@ -43,6 +43,8 @@ setup_conda_rc "${FEEDSTOCK_ROOT}" "${RECIPE_ROOT}" "${CONFIG_FILE}" source run_conda_forge_build_setup + + # make the build number clobber make_build_number "${FEEDSTOCK_ROOT}" "${RECIPE_ROOT}" "${CONFIG_FILE}" diff --git a/.scripts/run_win_build.bat b/.scripts/run_win_build.bat index 65650bf..a45c34f 100755 --- a/.scripts/run_win_build.bat +++ b/.scripts/run_win_build.bat @@ -24,7 +24,7 @@ set "CONDA_LIBMAMBA_SOLVER_NO_CHANNELS_FROM_INSTALLED=1" :: Provision the necessary dependencies to build the recipe later echo Installing dependencies -mamba.exe install "python=3.10" pip mamba conda-build conda-forge-ci-setup=4 "conda-build>=24.1" -c conda-forge --strict-channel-priority --yes +mamba.exe install pip mamba conda-build conda-forge-ci-setup=4 "conda-build>=24.1" -c conda-forge --strict-channel-priority --yes if !errorlevel! neq 0 exit /b !errorlevel! :: Set basic configuration @@ -48,7 +48,7 @@ if NOT [%HOST_PLATFORM%] == [%BUILD_PLATFORM%] ( ) if NOT [%flow_run_id%] == [] ( - set "EXTRA_CB_OPTIONS=%EXTRA_CB_OPTIONS% --extra-meta flow_run_id=%flow_run_id% remote_url=%remote_url% sha=%sha%" + set "EXTRA_CB_OPTIONS=%EXTRA_CB_OPTIONS% --extra-meta flow_run_id=%flow_run_id% remote_url=%remote_url% sha=%sha%" ) call :end_group diff --git a/azure-pipelines.yml b/azure-pipelines.yml index e5306da..579bd76 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -2,7 +2,33 @@ # update the conda-forge.yml and/or the recipe/meta.yaml. # -*- mode: yaml -*- -jobs: - - template: ./.azure-pipelines/azure-pipelines-linux.yml - - template: ./.azure-pipelines/azure-pipelines-osx.yml - - template: ./.azure-pipelines/azure-pipelines-win.yml \ No newline at end of file +stages: +- stage: Check + jobs: + - job: Skip + pool: + vmImage: 'ubuntu-22.04' + variables: + DECODE_PERCENTS: 'false' + RET: 'true' + steps: + - checkout: self + + fetchDepth: '2' + - bash: | + git_log=`git log --max-count=1 --skip=1 --pretty=format:"%B" | tr "\n" " "` + echo "##vso[task.setvariable variable=log]$git_log" + displayName: Obtain commit message + - bash: echo "##vso[task.setvariable variable=RET]false" + condition: or(contains(variables.log, '[skip azp]'), contains(variables.log, '[azp skip]'), contains(variables.log, '[skip ci]'), contains(variables.log, '[ci skip]')) + displayName: Skip build? + - bash: echo "##vso[task.setvariable variable=start_main;isOutput=true]$RET" + name: result + displayName: Export result +- stage: Build + condition: and(succeeded(), eq(dependencies.Check.outputs['Skip.result.start_main'], 'true')) + dependsOn: Check + jobs: + - template: ./.azure-pipelines/azure-pipelines-linux.yml + - template: ./.azure-pipelines/azure-pipelines-osx.yml + - template: ./.azure-pipelines/azure-pipelines-win.yml \ No newline at end of file diff --git a/build-locally.py b/build-locally.py index 8ac9b84..6788aea 100755 --- a/build-locally.py +++ b/build-locally.py @@ -1,5 +1,5 @@ #!/bin/sh -"""exec' "python3" "$0" "$@" #""" # fmt: off # fmt: on +"""exec" "python3" "$0" "$@" #""" # fmt: off # fmt: on # # This file has been generated by conda-smithy in order to build the recipe # locally.
VariantStatus
linux_64_numpy2.0python3.10.____cpythonlinux_64_python3.10.____cpython - variant + variant
linux_64_numpy2.0python3.11.____cpythonlinux_64_python3.11.____cpython - variant + variant
linux_64_numpy2.0python3.12.____cpythonlinux_64_python3.12.____cpython - variant + variant
linux_aarch64_numpy2.0python3.10.____cpythonlinux_aarch64_python3.10.____cpython - variant + variant
linux_aarch64_numpy2.0python3.11.____cpythonlinux_aarch64_python3.11.____cpython - variant + variant
linux_aarch64_numpy2.0python3.12.____cpythonlinux_aarch64_python3.12.____cpython - variant + variant
linux_ppc64le_numpy2.0python3.10.____cpythonlinux_ppc64le_python3.10.____cpython - variant + variant
linux_ppc64le_numpy2.0python3.11.____cpythonlinux_ppc64le_python3.11.____cpython - variant + variant
linux_ppc64le_numpy2.0python3.12.____cpythonlinux_ppc64le_python3.12.____cpython - variant + variant
osx_64_numpy2.0python3.10.____cpythonosx_64_python3.10.____cpython - variant + variant
osx_64_numpy2.0python3.11.____cpythonosx_64_python3.11.____cpython - variant + variant
osx_64_numpy2.0python3.12.____cpythonosx_64_python3.12.____cpython - variant + variant
osx_arm64_numpy2.0python3.10.____cpythonosx_arm64_python3.10.____cpython - variant + variant
osx_arm64_numpy2.0python3.11.____cpythonosx_arm64_python3.11.____cpython - variant + variant
osx_arm64_numpy2.0python3.12.____cpythonosx_arm64_python3.12.____cpython - variant + variant
win_64_numpy2.0python3.10.____cpythonwin_64_python3.10.____cpython - variant + variant
win_64_numpy2.0python3.11.____cpythonwin_64_python3.11.____cpython - variant + variant
win_64_numpy2.0python3.12.____cpythonwin_64_python3.12.____cpython - variant + variant