From 591ef1df4d2cd5e693b22e4eab8d1ee718e1688b Mon Sep 17 00:00:00 2001 From: regro-cf-autotick-bot <36490558+regro-cf-autotick-bot@users.noreply.github.com> Date: Wed, 4 Sep 2024 00:56:38 +0000 Subject: [PATCH 1/2] 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 94a1ca7..15410df 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -15,7 +15,7 @@ source: - backport_427.patch build: - number: 5 + number: 6 skip: True # [py<=38] requirements: From 4a40365fd2325063be36cb4fec7317345800df4d Mon Sep 17 00:00:00 2001 From: regro-cf-autotick-bot <36490558+regro-cf-autotick-bot@users.noreply.github.com> Date: Wed, 4 Sep 2024 00:57:36 +0000 Subject: [PATCH 2/2] MNT: Re-rendered with conda-build 24.7.1, conda-smithy 3.39.1, and conda-forge-pinning 2024.09.04.00.11.56 --- .azure-pipelines/azure-pipelines-linux.yml | 16 ++++---- .azure-pipelines/azure-pipelines-osx.yml | 9 ++-- .azure-pipelines/azure-pipelines-win.yml | 8 ++-- ...nux_64_numpy2.0python3.10.____cpython.yaml | 9 ++-- ...nux_64_numpy2.0python3.11.____cpython.yaml | 9 ++-- ...nux_64_numpy2.0python3.12.____cpython.yaml | 9 ++-- ...inux_64_numpy2.0python3.9.____cpython.yaml | 9 ++-- ... linux_64_numpy2python3.13.____cp313.yaml} | 13 +++--- ...arch64_numpy2.0python3.10.____cpython.yaml | 5 ++- ...arch64_numpy2.0python3.11.____cpython.yaml | 5 ++- ...arch64_numpy2.0python3.12.____cpython.yaml | 5 ++- ...aarch64_numpy2.0python3.9.____cpython.yaml | 5 ++- ...x_aarch64_numpy2python3.13.____cp313.yaml} | 9 ++-- ...pc64le_numpy2.0python3.10.____cpython.yaml | 5 ++- ...pc64le_numpy2.0python3.11.____cpython.yaml | 5 ++- ...pc64le_numpy2.0python3.12.____cpython.yaml | 5 ++- ...ppc64le_numpy2.0python3.9.____cpython.yaml | 5 ++- ...x_ppc64le_numpy2python3.13.____cp313.yaml} | 9 ++-- .ci_support/migrations/pypy38.yaml | 41 ------------------- ...osx_64_numpy2.0python3.10.____cpython.yaml | 7 +++- ...osx_64_numpy2.0python3.11.____cpython.yaml | 7 +++- ...osx_64_numpy2.0python3.12.____cpython.yaml | 7 +++- .../osx_64_numpy2.0python3.9.____cpython.yaml | 7 +++- ...=> osx_64_numpy2python3.13.____cp313.yaml} | 11 +++-- ..._arm64_numpy2.0python3.10.____cpython.yaml | 7 +++- ..._arm64_numpy2.0python3.11.____cpython.yaml | 7 +++- ..._arm64_numpy2.0python3.12.____cpython.yaml | 7 +++- ...x_arm64_numpy2.0python3.9.____cpython.yaml | 7 +++- .../osx_arm64_numpy2python3.13.____cp313.yaml | 32 +++++++++++++++ ...win_64_numpy2.0python3.10.____cpython.yaml | 3 +- ...win_64_numpy2.0python3.11.____cpython.yaml | 3 +- ...win_64_numpy2.0python3.12.____cpython.yaml | 3 +- .../win_64_numpy2.0python3.9.____cpython.yaml | 3 +- ...=> win_64_numpy2python3.13.____cp313.yaml} | 7 ++-- .gitattributes | 4 +- .scripts/build_steps.sh | 6 +++ .scripts/run_osx_build.sh | 9 +++- .scripts/run_win_build.bat | 5 +++ README.md | 37 ++++++++++------- build-locally.py | 9 ++-- 40 files changed, 219 insertions(+), 150 deletions(-) rename .ci_support/{linux_64_numpy1.22python3.9.____73_pypy.yaml => linux_64_numpy2python3.13.____cp313.yaml} (77%) rename .ci_support/{linux_aarch64_numpy1.22python3.9.____73_pypy.yaml => linux_aarch64_numpy2python3.13.____cp313.yaml} (82%) rename .ci_support/{linux_ppc64le_numpy1.22python3.9.____73_pypy.yaml => linux_ppc64le_numpy2python3.13.____cp313.yaml} (80%) delete mode 100644 .ci_support/migrations/pypy38.yaml rename .ci_support/{osx_64_numpy1.22python3.9.____73_pypy.yaml => osx_64_numpy2python3.13.____cp313.yaml} (75%) create mode 100644 .ci_support/osx_arm64_numpy2python3.13.____cp313.yaml rename .ci_support/{win_64_numpy1.22python3.9.____73_pypy.yaml => win_64_numpy2python3.13.____cp313.yaml} (72%) diff --git a/.azure-pipelines/azure-pipelines-linux.yml b/.azure-pipelines/azure-pipelines-linux.yml index c7960cf..1443bee 100755 --- a/.azure-pipelines/azure-pipelines-linux.yml +++ b/.azure-pipelines/azure-pipelines-linux.yml @@ -8,10 +8,6 @@ jobs: vmImage: ubuntu-latest strategy: matrix: - linux_64_numpy1.22python3.9.____73_pypy: - CONFIG: linux_64_numpy1.22python3.9.____73_pypy - UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 linux_64_numpy2.0python3.10.____cpython: CONFIG: linux_64_numpy2.0python3.10.____cpython UPLOAD_PACKAGES: 'True' @@ -28,8 +24,8 @@ jobs: CONFIG: linux_64_numpy2.0python3.9.____cpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_aarch64_numpy1.22python3.9.____73_pypy: - CONFIG: linux_aarch64_numpy1.22python3.9.____73_pypy + 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: @@ -48,8 +44,8 @@ jobs: CONFIG: linux_aarch64_numpy2.0python3.9.____cpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_ppc64le_numpy1.22python3.9.____73_pypy: - CONFIG: linux_ppc64le_numpy1.22python3.9.____73_pypy + 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: @@ -68,6 +64,10 @@ jobs: CONFIG: linux_ppc64le_numpy2.0python3.9.____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 3a4c058..f1d5a74 100755 --- a/.azure-pipelines/azure-pipelines-osx.yml +++ b/.azure-pipelines/azure-pipelines-osx.yml @@ -8,9 +8,6 @@ jobs: vmImage: macOS-12 strategy: matrix: - osx_64_numpy1.22python3.9.____73_pypy: - CONFIG: osx_64_numpy1.22python3.9.____73_pypy - UPLOAD_PACKAGES: 'True' osx_64_numpy2.0python3.10.____cpython: CONFIG: osx_64_numpy2.0python3.10.____cpython UPLOAD_PACKAGES: 'True' @@ -23,6 +20,9 @@ jobs: osx_64_numpy2.0python3.9.____cpython: CONFIG: osx_64_numpy2.0python3.9.____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' @@ -35,6 +35,9 @@ jobs: osx_arm64_numpy2.0python3.9.____cpython: CONFIG: osx_arm64_numpy2.0python3.9.____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 4e4693b..900e757 100755 --- a/.azure-pipelines/azure-pipelines-win.yml +++ b/.azure-pipelines/azure-pipelines-win.yml @@ -8,9 +8,6 @@ jobs: vmImage: windows-2022 strategy: matrix: - win_64_numpy1.22python3.9.____73_pypy: - CONFIG: win_64_numpy1.22python3.9.____73_pypy - UPLOAD_PACKAGES: 'True' win_64_numpy2.0python3.10.____cpython: CONFIG: win_64_numpy2.0python3.10.____cpython UPLOAD_PACKAGES: 'True' @@ -23,6 +20,9 @@ jobs: win_64_numpy2.0python3.9.____cpython: CONFIG: win_64_numpy2.0python3.9.____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\\ @@ -36,7 +36,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_numpy2.0python3.10.____cpython.yaml b/.ci_support/linux_64_numpy2.0python3.10.____cpython.yaml index 62aeb20..9f9a7b0 100644 --- a/.ci_support/linux_64_numpy2.0python3.10.____cpython.yaml +++ b/.ci_support/linux_64_numpy2.0python3.10.____cpython.yaml @@ -1,15 +1,15 @@ c_compiler: - gcc c_compiler_version: -- '12' +- '13' c_stdlib: - sysroot c_stdlib_version: -- '2.12' +- '2.17' cdt_name: -- cos6 +- cos7 channel_sources: -- conda-forge/label/numpy_rc,conda-forge +- conda-forge channel_targets: - conda-forge main docker_image: @@ -29,3 +29,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 a936a15..838f3ad 100644 --- a/.ci_support/linux_64_numpy2.0python3.11.____cpython.yaml +++ b/.ci_support/linux_64_numpy2.0python3.11.____cpython.yaml @@ -1,15 +1,15 @@ c_compiler: - gcc c_compiler_version: -- '12' +- '13' c_stdlib: - sysroot c_stdlib_version: -- '2.12' +- '2.17' cdt_name: -- cos6 +- cos7 channel_sources: -- conda-forge/label/numpy_rc,conda-forge +- conda-forge channel_targets: - conda-forge main docker_image: @@ -29,3 +29,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 d73ec4a..0958768 100644 --- a/.ci_support/linux_64_numpy2.0python3.12.____cpython.yaml +++ b/.ci_support/linux_64_numpy2.0python3.12.____cpython.yaml @@ -1,15 +1,15 @@ c_compiler: - gcc c_compiler_version: -- '12' +- '13' c_stdlib: - sysroot c_stdlib_version: -- '2.12' +- '2.17' cdt_name: -- cos6 +- cos7 channel_sources: -- conda-forge/label/numpy_rc,conda-forge +- conda-forge channel_targets: - conda-forge main docker_image: @@ -29,3 +29,4 @@ zip_keys: - cdt_name - - python - numpy + - channel_sources diff --git a/.ci_support/linux_64_numpy2.0python3.9.____cpython.yaml b/.ci_support/linux_64_numpy2.0python3.9.____cpython.yaml index f7551d1..2ed15de 100644 --- a/.ci_support/linux_64_numpy2.0python3.9.____cpython.yaml +++ b/.ci_support/linux_64_numpy2.0python3.9.____cpython.yaml @@ -1,15 +1,15 @@ c_compiler: - gcc c_compiler_version: -- '12' +- '13' c_stdlib: - sysroot c_stdlib_version: -- '2.12' +- '2.17' cdt_name: -- cos6 +- cos7 channel_sources: -- conda-forge/label/numpy_rc,conda-forge +- conda-forge channel_targets: - conda-forge main docker_image: @@ -29,3 +29,4 @@ zip_keys: - cdt_name - - python - numpy + - channel_sources diff --git a/.ci_support/linux_64_numpy1.22python3.9.____73_pypy.yaml b/.ci_support/linux_64_numpy2python3.13.____cp313.yaml similarity index 77% rename from .ci_support/linux_64_numpy1.22python3.9.____73_pypy.yaml rename to .ci_support/linux_64_numpy2python3.13.____cp313.yaml index 8b2fb5e..19cfbf4 100644 --- a/.ci_support/linux_64_numpy1.22python3.9.____73_pypy.yaml +++ b/.ci_support/linux_64_numpy2python3.13.____cp313.yaml @@ -1,27 +1,27 @@ c_compiler: - gcc c_compiler_version: -- '12' +- '13' c_stdlib: - sysroot c_stdlib_version: -- '2.12' +- '2.17' cdt_name: -- cos6 +- cos7 channel_sources: -- conda-forge/label/numpy_rc,conda-forge +- conda-forge/label/python_rc,conda-forge channel_targets: - conda-forge main docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 numpy: -- '1.22' +- '2' pin_run_as_build: python: min_pin: x.x max_pin: x.x python: -- 3.9.* *_73_pypy +- 3.13.* *_cp313 target_platform: - linux-64 zip_keys: @@ -29,3 +29,4 @@ 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 9244aad..2bddaad 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: @@ -13,7 +13,7 @@ cdt_arch: cdt_name: - cos7 channel_sources: -- conda-forge/label/numpy_rc,conda-forge +- conda-forge channel_targets: - conda-forge main docker_image: @@ -33,3 +33,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 871232d..1787e3c 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: @@ -13,7 +13,7 @@ cdt_arch: cdt_name: - cos7 channel_sources: -- conda-forge/label/numpy_rc,conda-forge +- conda-forge channel_targets: - conda-forge main docker_image: @@ -33,3 +33,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 a69d515..f8cf9c4 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: @@ -13,7 +13,7 @@ cdt_arch: cdt_name: - cos7 channel_sources: -- conda-forge/label/numpy_rc,conda-forge +- conda-forge channel_targets: - conda-forge main docker_image: @@ -33,3 +33,4 @@ zip_keys: - cdt_name - - python - numpy + - channel_sources diff --git a/.ci_support/linux_aarch64_numpy2.0python3.9.____cpython.yaml b/.ci_support/linux_aarch64_numpy2.0python3.9.____cpython.yaml index d7753e5..9b75d46 100644 --- a/.ci_support/linux_aarch64_numpy2.0python3.9.____cpython.yaml +++ b/.ci_support/linux_aarch64_numpy2.0python3.9.____cpython.yaml @@ -3,7 +3,7 @@ BUILD: c_compiler: - gcc c_compiler_version: -- '12' +- '13' c_stdlib: - sysroot c_stdlib_version: @@ -13,7 +13,7 @@ cdt_arch: cdt_name: - cos7 channel_sources: -- conda-forge/label/numpy_rc,conda-forge +- conda-forge channel_targets: - conda-forge main docker_image: @@ -33,3 +33,4 @@ zip_keys: - cdt_name - - python - numpy + - channel_sources diff --git a/.ci_support/linux_aarch64_numpy1.22python3.9.____73_pypy.yaml b/.ci_support/linux_aarch64_numpy2python3.13.____cp313.yaml similarity index 82% rename from .ci_support/linux_aarch64_numpy1.22python3.9.____73_pypy.yaml rename to .ci_support/linux_aarch64_numpy2python3.13.____cp313.yaml index c46b457..7f8f45e 100644 --- a/.ci_support/linux_aarch64_numpy1.22python3.9.____73_pypy.yaml +++ b/.ci_support/linux_aarch64_numpy2python3.13.____cp313.yaml @@ -3,7 +3,7 @@ BUILD: c_compiler: - gcc c_compiler_version: -- '12' +- '13' c_stdlib: - sysroot c_stdlib_version: @@ -13,19 +13,19 @@ cdt_arch: cdt_name: - cos7 channel_sources: -- conda-forge/label/numpy_rc,conda-forge +- conda-forge/label/python_rc,conda-forge channel_targets: - conda-forge main docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 numpy: -- '1.22' +- '2' pin_run_as_build: python: min_pin: x.x max_pin: x.x python: -- 3.9.* *_73_pypy +- 3.13.* *_cp313 target_platform: - linux-aarch64 zip_keys: @@ -33,3 +33,4 @@ 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 e1d4e08..a7ac863 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: @@ -9,7 +9,7 @@ c_stdlib_version: cdt_name: - cos7 channel_sources: -- conda-forge/label/numpy_rc,conda-forge +- conda-forge channel_targets: - conda-forge main docker_image: @@ -29,3 +29,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 0e4c14d..22e9e59 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: @@ -9,7 +9,7 @@ c_stdlib_version: cdt_name: - cos7 channel_sources: -- conda-forge/label/numpy_rc,conda-forge +- conda-forge channel_targets: - conda-forge main docker_image: @@ -29,3 +29,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 43cc917..feea977 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: @@ -9,7 +9,7 @@ c_stdlib_version: cdt_name: - cos7 channel_sources: -- conda-forge/label/numpy_rc,conda-forge +- conda-forge channel_targets: - conda-forge main docker_image: @@ -29,3 +29,4 @@ zip_keys: - cdt_name - - python - numpy + - channel_sources diff --git a/.ci_support/linux_ppc64le_numpy2.0python3.9.____cpython.yaml b/.ci_support/linux_ppc64le_numpy2.0python3.9.____cpython.yaml index ab7f2d1..227a441 100644 --- a/.ci_support/linux_ppc64le_numpy2.0python3.9.____cpython.yaml +++ b/.ci_support/linux_ppc64le_numpy2.0python3.9.____cpython.yaml @@ -1,7 +1,7 @@ c_compiler: - gcc c_compiler_version: -- '12' +- '13' c_stdlib: - sysroot c_stdlib_version: @@ -9,7 +9,7 @@ c_stdlib_version: cdt_name: - cos7 channel_sources: -- conda-forge/label/numpy_rc,conda-forge +- conda-forge channel_targets: - conda-forge main docker_image: @@ -29,3 +29,4 @@ zip_keys: - cdt_name - - python - numpy + - channel_sources diff --git a/.ci_support/linux_ppc64le_numpy1.22python3.9.____73_pypy.yaml b/.ci_support/linux_ppc64le_numpy2python3.13.____cp313.yaml similarity index 80% rename from .ci_support/linux_ppc64le_numpy1.22python3.9.____73_pypy.yaml rename to .ci_support/linux_ppc64le_numpy2python3.13.____cp313.yaml index f6ff451..b7eff0e 100644 --- a/.ci_support/linux_ppc64le_numpy1.22python3.9.____73_pypy.yaml +++ b/.ci_support/linux_ppc64le_numpy2python3.13.____cp313.yaml @@ -1,7 +1,7 @@ c_compiler: - gcc c_compiler_version: -- '12' +- '13' c_stdlib: - sysroot c_stdlib_version: @@ -9,19 +9,19 @@ c_stdlib_version: cdt_name: - cos7 channel_sources: -- conda-forge/label/numpy_rc,conda-forge +- conda-forge/label/python_rc,conda-forge channel_targets: - conda-forge main docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 numpy: -- '1.22' +- '2' pin_run_as_build: python: min_pin: x.x max_pin: x.x python: -- 3.9.* *_73_pypy +- 3.13.* *_cp313 target_platform: - linux-ppc64le zip_keys: @@ -29,3 +29,4 @@ zip_keys: - cdt_name - - python - numpy + - channel_sources diff --git a/.ci_support/migrations/pypy38.yaml b/.ci_support/migrations/pypy38.yaml deleted file mode 100644 index 065dae6..0000000 --- a/.ci_support/migrations/pypy38.yaml +++ /dev/null @@ -1,41 +0,0 @@ -migrator_ts: 1647123563 -__migrator: - 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.6.* *_73_pypy - - 3.7.* *_73_pypy - - 3.8.* *_73_pypy - - 3.9.* *_73_pypy - paused: False - longterm: True - use_local: False - check_solvable: True - exclude_pinned_pkgs: False - pr_limit: 10 - bump_number: 1 - commit_message: "Rebuild for PyPy3.9" - exclude: - # this shouldn't attempt to modify the python feedstocks - - python - - pypy3.6 - - pypy-meta - ignored_deps_per_node: - matplotlib: - - pyqt - -python: - - 3.9.* *_73_pypy # [not (osx and arm64)] -numpy: - # part of a zip_keys: python, python_impl, numpy - - 1.22 # [not (osx and arm64)] -python_impl: - - pypy # [not (osx and arm64)] diff --git a/.ci_support/osx_64_numpy2.0python3.10.____cpython.yaml b/.ci_support/osx_64_numpy2.0python3.10.____cpython.yaml index 5c9d26a..34f1241 100644 --- a/.ci_support/osx_64_numpy2.0python3.10.____cpython.yaml +++ b/.ci_support/osx_64_numpy2.0python3.10.____cpython.yaml @@ -1,15 +1,17 @@ MACOSX_DEPLOYMENT_TARGET: - '10.13' +MACOSX_SDK_VERSION: +- '10.13' c_compiler: - clang c_compiler_version: -- '16' +- '17' c_stdlib: - macosx_deployment_target c_stdlib_version: - '10.13' channel_sources: -- conda-forge/label/numpy_rc,conda-forge +- conda-forge channel_targets: - conda-forge main macos_machine: @@ -27,3 +29,4 @@ target_platform: zip_keys: - - 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 40c42f8..e0f5fdd 100644 --- a/.ci_support/osx_64_numpy2.0python3.11.____cpython.yaml +++ b/.ci_support/osx_64_numpy2.0python3.11.____cpython.yaml @@ -1,15 +1,17 @@ MACOSX_DEPLOYMENT_TARGET: - '10.13' +MACOSX_SDK_VERSION: +- '10.13' c_compiler: - clang c_compiler_version: -- '16' +- '17' c_stdlib: - macosx_deployment_target c_stdlib_version: - '10.13' channel_sources: -- conda-forge/label/numpy_rc,conda-forge +- conda-forge channel_targets: - conda-forge main macos_machine: @@ -27,3 +29,4 @@ target_platform: zip_keys: - - 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 c9768ab..525b805 100644 --- a/.ci_support/osx_64_numpy2.0python3.12.____cpython.yaml +++ b/.ci_support/osx_64_numpy2.0python3.12.____cpython.yaml @@ -1,15 +1,17 @@ MACOSX_DEPLOYMENT_TARGET: - '10.13' +MACOSX_SDK_VERSION: +- '10.13' c_compiler: - clang c_compiler_version: -- '16' +- '17' c_stdlib: - macosx_deployment_target c_stdlib_version: - '10.13' channel_sources: -- conda-forge/label/numpy_rc,conda-forge +- conda-forge channel_targets: - conda-forge main macos_machine: @@ -27,3 +29,4 @@ target_platform: zip_keys: - - python - numpy + - channel_sources diff --git a/.ci_support/osx_64_numpy2.0python3.9.____cpython.yaml b/.ci_support/osx_64_numpy2.0python3.9.____cpython.yaml index 0f69c97..008b74c 100644 --- a/.ci_support/osx_64_numpy2.0python3.9.____cpython.yaml +++ b/.ci_support/osx_64_numpy2.0python3.9.____cpython.yaml @@ -1,15 +1,17 @@ MACOSX_DEPLOYMENT_TARGET: - '10.13' +MACOSX_SDK_VERSION: +- '10.13' c_compiler: - clang c_compiler_version: -- '16' +- '17' c_stdlib: - macosx_deployment_target c_stdlib_version: - '10.13' channel_sources: -- conda-forge/label/numpy_rc,conda-forge +- conda-forge channel_targets: - conda-forge main macos_machine: @@ -27,3 +29,4 @@ target_platform: zip_keys: - - python - numpy + - channel_sources diff --git a/.ci_support/osx_64_numpy1.22python3.9.____73_pypy.yaml b/.ci_support/osx_64_numpy2python3.13.____cp313.yaml similarity index 75% rename from .ci_support/osx_64_numpy1.22python3.9.____73_pypy.yaml rename to .ci_support/osx_64_numpy2python3.13.____cp313.yaml index 106aced..1f0a358 100644 --- a/.ci_support/osx_64_numpy1.22python3.9.____73_pypy.yaml +++ b/.ci_support/osx_64_numpy2python3.13.____cp313.yaml @@ -1,29 +1,32 @@ MACOSX_DEPLOYMENT_TARGET: - '10.13' +MACOSX_SDK_VERSION: +- '10.13' c_compiler: - clang c_compiler_version: -- '16' +- '17' c_stdlib: - macosx_deployment_target c_stdlib_version: - '10.13' channel_sources: -- conda-forge/label/numpy_rc,conda-forge +- conda-forge/label/python_rc,conda-forge channel_targets: - conda-forge main macos_machine: - x86_64-apple-darwin13.4.0 numpy: -- '1.22' +- '2' pin_run_as_build: python: min_pin: x.x max_pin: x.x python: -- 3.9.* *_73_pypy +- 3.13.* *_cp313 target_platform: - osx-64 zip_keys: - - 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 3440727..f680bf6 100644 --- a/.ci_support/osx_arm64_numpy2.0python3.10.____cpython.yaml +++ b/.ci_support/osx_arm64_numpy2.0python3.10.____cpython.yaml @@ -1,15 +1,17 @@ MACOSX_DEPLOYMENT_TARGET: - '11.0' +MACOSX_SDK_VERSION: +- '11.0' c_compiler: - clang c_compiler_version: -- '16' +- '17' c_stdlib: - macosx_deployment_target c_stdlib_version: - '11.0' channel_sources: -- conda-forge/label/numpy_rc,conda-forge +- conda-forge channel_targets: - conda-forge main macos_machine: @@ -27,3 +29,4 @@ target_platform: zip_keys: - - 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 84cbab5..6a6ff4b 100644 --- a/.ci_support/osx_arm64_numpy2.0python3.11.____cpython.yaml +++ b/.ci_support/osx_arm64_numpy2.0python3.11.____cpython.yaml @@ -1,15 +1,17 @@ MACOSX_DEPLOYMENT_TARGET: - '11.0' +MACOSX_SDK_VERSION: +- '11.0' c_compiler: - clang c_compiler_version: -- '16' +- '17' c_stdlib: - macosx_deployment_target c_stdlib_version: - '11.0' channel_sources: -- conda-forge/label/numpy_rc,conda-forge +- conda-forge channel_targets: - conda-forge main macos_machine: @@ -27,3 +29,4 @@ target_platform: zip_keys: - - 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 d61051b..bfdb7b4 100644 --- a/.ci_support/osx_arm64_numpy2.0python3.12.____cpython.yaml +++ b/.ci_support/osx_arm64_numpy2.0python3.12.____cpython.yaml @@ -1,15 +1,17 @@ MACOSX_DEPLOYMENT_TARGET: - '11.0' +MACOSX_SDK_VERSION: +- '11.0' c_compiler: - clang c_compiler_version: -- '16' +- '17' c_stdlib: - macosx_deployment_target c_stdlib_version: - '11.0' channel_sources: -- conda-forge/label/numpy_rc,conda-forge +- conda-forge channel_targets: - conda-forge main macos_machine: @@ -27,3 +29,4 @@ target_platform: zip_keys: - - python - numpy + - channel_sources diff --git a/.ci_support/osx_arm64_numpy2.0python3.9.____cpython.yaml b/.ci_support/osx_arm64_numpy2.0python3.9.____cpython.yaml index 889a684..be26e7c 100644 --- a/.ci_support/osx_arm64_numpy2.0python3.9.____cpython.yaml +++ b/.ci_support/osx_arm64_numpy2.0python3.9.____cpython.yaml @@ -1,15 +1,17 @@ MACOSX_DEPLOYMENT_TARGET: - '11.0' +MACOSX_SDK_VERSION: +- '11.0' c_compiler: - clang c_compiler_version: -- '16' +- '17' c_stdlib: - macosx_deployment_target c_stdlib_version: - '11.0' channel_sources: -- conda-forge/label/numpy_rc,conda-forge +- conda-forge channel_targets: - conda-forge main macos_machine: @@ -27,3 +29,4 @@ target_platform: zip_keys: - - 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..f0d643b --- /dev/null +++ b/.ci_support/osx_arm64_numpy2python3.13.____cp313.yaml @@ -0,0 +1,32 @@ +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 +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: +- - 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 6a4727e..5c4e0d2 100644 --- a/.ci_support/win_64_numpy2.0python3.10.____cpython.yaml +++ b/.ci_support/win_64_numpy2.0python3.10.____cpython.yaml @@ -3,7 +3,7 @@ c_compiler: c_stdlib: - vs channel_sources: -- conda-forge/label/numpy_rc,conda-forge +- conda-forge channel_targets: - conda-forge main numpy: @@ -19,3 +19,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 be15992..e33b224 100644 --- a/.ci_support/win_64_numpy2.0python3.11.____cpython.yaml +++ b/.ci_support/win_64_numpy2.0python3.11.____cpython.yaml @@ -3,7 +3,7 @@ c_compiler: c_stdlib: - vs channel_sources: -- conda-forge/label/numpy_rc,conda-forge +- conda-forge channel_targets: - conda-forge main numpy: @@ -19,3 +19,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 d75cdb1..dd869f2 100644 --- a/.ci_support/win_64_numpy2.0python3.12.____cpython.yaml +++ b/.ci_support/win_64_numpy2.0python3.12.____cpython.yaml @@ -3,7 +3,7 @@ c_compiler: c_stdlib: - vs channel_sources: -- conda-forge/label/numpy_rc,conda-forge +- conda-forge channel_targets: - conda-forge main numpy: @@ -19,3 +19,4 @@ target_platform: zip_keys: - - python - numpy + - channel_sources diff --git a/.ci_support/win_64_numpy2.0python3.9.____cpython.yaml b/.ci_support/win_64_numpy2.0python3.9.____cpython.yaml index 268b175..e2bdcdf 100644 --- a/.ci_support/win_64_numpy2.0python3.9.____cpython.yaml +++ b/.ci_support/win_64_numpy2.0python3.9.____cpython.yaml @@ -3,7 +3,7 @@ c_compiler: c_stdlib: - vs channel_sources: -- conda-forge/label/numpy_rc,conda-forge +- conda-forge channel_targets: - conda-forge main numpy: @@ -19,3 +19,4 @@ target_platform: zip_keys: - - python - numpy + - channel_sources diff --git a/.ci_support/win_64_numpy1.22python3.9.____73_pypy.yaml b/.ci_support/win_64_numpy2python3.13.____cp313.yaml similarity index 72% rename from .ci_support/win_64_numpy1.22python3.9.____73_pypy.yaml rename to .ci_support/win_64_numpy2python3.13.____cp313.yaml index b07f88f..5860aa8 100644 --- a/.ci_support/win_64_numpy1.22python3.9.____73_pypy.yaml +++ b/.ci_support/win_64_numpy2python3.13.____cp313.yaml @@ -3,19 +3,20 @@ c_compiler: c_stdlib: - vs channel_sources: -- conda-forge/label/numpy_rc,conda-forge +- conda-forge/label/python_rc,conda-forge channel_targets: - conda-forge main numpy: -- '1.22' +- '2' pin_run_as_build: python: min_pin: x.x max_pin: x.x python: -- 3.9.* *_73_pypy +- 3.13.* *_cp313 target_platform: - win-64 zip_keys: - - python - numpy + - channel_sources 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 8f9ae12..f7c26c1 100644 --- a/README.md +++ b/README.md @@ -27,13 +27,6 @@ Current build status - - - - + @@ -97,10 +90,10 @@ Current build status - + @@ -132,10 +125,10 @@ Current build status - + @@ -166,6 +159,13 @@ Current build status variant + + + - + @@ -229,6 +229,13 @@ Current build status variant + + +
VariantStatus
linux_64_numpy1.22python3.9.____73_pypy - - variant - -
linux_64_numpy2.0python3.10.____cpython @@ -62,10 +55,10 @@ Current build status
linux_aarch64_numpy1.22python3.9.____73_pypylinux_64_numpy2python3.13.____cp313 - variant + variant
linux_ppc64le_numpy1.22python3.9.____73_pypylinux_aarch64_numpy2python3.13.____cp313 - variant + variant
osx_64_numpy1.22python3.9.____73_pypylinux_ppc64le_numpy2python3.13.____cp313 - variant + variant
osx_64_numpy2python3.13.____cp313 + + variant + +
osx_arm64_numpy2.0python3.10.____cpython @@ -195,10 +195,10 @@ Current build status
win_64_numpy1.22python3.9.____73_pypyosx_arm64_numpy2python3.13.____cp313 - variant + variant
win_64_numpy2python3.13.____cp313 + + variant + +
diff --git a/build-locally.py b/build-locally.py index e0d408d..8ac9b84 100755 --- a/build-locally.py +++ b/build-locally.py @@ -1,13 +1,16 @@ -#!/usr/bin/env python3 +#!/bin/sh +"""exec' "python3" "$0" "$@" #""" # fmt: off # fmt: on # # This file has been generated by conda-smithy in order to build the recipe # locally. # -import os +# The line above this comment is a bash / sh / zsh guard +# to stop people from running it with the wrong interpreter import glob +import os +import platform import subprocess from argparse import ArgumentParser -import platform def setup_environment(ns):