From e39a8e994a2403b9d0234b6bee4305c32a5529b1 Mon Sep 17 00:00:00 2001 From: regro-cf-autotick-bot <36490558+regro-cf-autotick-bot@users.noreply.github.com> Date: Tue, 3 Sep 2024 01:09:58 +0000 Subject: [PATCH 1/3] 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 5d89d72..aec0674 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -10,7 +10,7 @@ source: sha256: e02a4956a69d323775d79fdaec7ba7a23ed912c7d45e439bc933d991ea3193fd build: - number: 0 + number: 1 skip: true # [python_impl == 'pypy'] run_exports: - {{ pin_subpackage('nlopt', max_pin='x.x') }} From 63260aadd0b51398a54fac942491b9bdff47e9cd Mon Sep 17 00:00:00 2001 From: regro-cf-autotick-bot <36490558+regro-cf-autotick-bot@users.noreply.github.com> Date: Tue, 3 Sep 2024 01:10:54 +0000 Subject: [PATCH 2/3] MNT: Re-rendered with conda-build 24.7.1, conda-smithy 3.39.1, and conda-forge-pinning 2024.09.02.15.16.22 --- .azure-pipelines/azure-pipelines-linux.yml | 60 ++++----- .azure-pipelines/azure-pipelines-osx.yml | 26 ++-- .azure-pipelines/azure-pipelines-win.yml | 20 +-- ...ux_64_numpy2.0python3.10.____cpython.yaml} | 5 +- ...ux_64_numpy2.0python3.11.____cpython.yaml} | 5 +- ...ux_64_numpy2.0python3.12.____cpython.yaml} | 5 +- ...nux_64_numpy2.0python3.9.____cpython.yaml} | 5 +- ... linux_64_numpy2python3.13.____cp313.yaml} | 11 +- ...rch64_numpy2.0python3.10.____cpython.yaml} | 5 +- ...rch64_numpy2.0python3.11.____cpython.yaml} | 5 +- ...rch64_numpy2.0python3.12.____cpython.yaml} | 5 +- ...arch64_numpy2.0python3.9.____cpython.yaml} | 5 +- ...x_aarch64_numpy2python3.13.____cp313.yaml} | 11 +- ...c64le_numpy2.0python3.10.____cpython.yaml} | 5 +- ...c64le_numpy2.0python3.11.____cpython.yaml} | 5 +- ...c64le_numpy2.0python3.12.____cpython.yaml} | 5 +- ...pc64le_numpy2.0python3.9.____cpython.yaml} | 5 +- ...x_ppc64le_numpy2python3.13.____cp313.yaml} | 11 +- .ci_support/migrations/pypy38.yaml | 53 -------- ...sx_64_numpy2.0python3.10.____cpython.yaml} | 5 +- ...sx_64_numpy2.0python3.11.____cpython.yaml} | 5 +- ...sx_64_numpy2.0python3.12.____cpython.yaml} | 5 +- ...osx_64_numpy2.0python3.9.____cpython.yaml} | 5 +- ...=> osx_64_numpy2python3.13.____cp313.yaml} | 11 +- ..._arm64_numpy2.0python3.10.____cpython.yaml | 5 +- ..._arm64_numpy2.0python3.11.____cpython.yaml | 5 +- ..._arm64_numpy2.0python3.12.____cpython.yaml | 5 +- ...x_arm64_numpy2.0python3.9.____cpython.yaml | 5 +- ...osx_arm64_numpy2python3.13.____cp313.yaml} | 11 +- ...in_64_numpy2.0python3.10.____cpython.yaml} | 1 + ...in_64_numpy2.0python3.11.____cpython.yaml} | 1 + ...in_64_numpy2.0python3.12.____cpython.yaml} | 1 + ...win_64_numpy2.0python3.9.____cpython.yaml} | 1 + ...=> win_64_numpy2python3.13.____cp313.yaml} | 7 +- README.md | 114 +++++++++--------- build-locally.py | 5 +- 36 files changed, 212 insertions(+), 232 deletions(-) rename .ci_support/{linux_64_numpy2.0python3.10.____cpythonpython_implcpython.yaml => linux_64_numpy2.0python3.10.____cpython.yaml} (94%) rename .ci_support/{linux_64_numpy2.0python3.11.____cpythonpython_implcpython.yaml => linux_64_numpy2.0python3.11.____cpython.yaml} (94%) rename .ci_support/{linux_64_numpy2.0python3.12.____cpythonpython_implcpython.yaml => linux_64_numpy2.0python3.12.____cpython.yaml} (94%) rename .ci_support/{linux_64_numpy2.0python3.9.____cpythonpython_implcpython.yaml => linux_64_numpy2.0python3.9.____cpython.yaml} (94%) rename .ci_support/{linux_64_numpy1.22python3.8.____cpythonpython_implcpython.yaml => linux_64_numpy2python3.13.____cp313.yaml} (84%) rename .ci_support/{linux_aarch64_numpy2.0python3.10.____cpythonpython_implcpython.yaml => linux_aarch64_numpy2.0python3.10.____cpython.yaml} (94%) rename .ci_support/{linux_aarch64_numpy2.0python3.11.____cpythonpython_implcpython.yaml => linux_aarch64_numpy2.0python3.11.____cpython.yaml} (94%) rename .ci_support/{linux_aarch64_numpy2.0python3.12.____cpythonpython_implcpython.yaml => linux_aarch64_numpy2.0python3.12.____cpython.yaml} (94%) rename .ci_support/{linux_aarch64_numpy2.0python3.9.____cpythonpython_implcpython.yaml => linux_aarch64_numpy2.0python3.9.____cpython.yaml} (94%) rename .ci_support/{linux_aarch64_numpy1.22python3.8.____cpythonpython_implcpython.yaml => linux_aarch64_numpy2python3.13.____cp313.yaml} (85%) rename .ci_support/{linux_ppc64le_numpy2.0python3.10.____cpythonpython_implcpython.yaml => linux_ppc64le_numpy2.0python3.10.____cpython.yaml} (94%) rename .ci_support/{linux_ppc64le_numpy2.0python3.11.____cpythonpython_implcpython.yaml => linux_ppc64le_numpy2.0python3.11.____cpython.yaml} (94%) rename .ci_support/{linux_ppc64le_numpy2.0python3.12.____cpythonpython_implcpython.yaml => linux_ppc64le_numpy2.0python3.12.____cpython.yaml} (94%) rename .ci_support/{linux_ppc64le_numpy2.0python3.9.____cpythonpython_implcpython.yaml => linux_ppc64le_numpy2.0python3.9.____cpython.yaml} (94%) rename .ci_support/{linux_ppc64le_numpy1.22python3.8.____cpythonpython_implcpython.yaml => linux_ppc64le_numpy2python3.13.____cp313.yaml} (84%) delete mode 100644 .ci_support/migrations/pypy38.yaml rename .ci_support/{osx_64_numpy2.0python3.10.____cpythonpython_implcpython.yaml => osx_64_numpy2.0python3.10.____cpython.yaml} (94%) rename .ci_support/{osx_64_numpy2.0python3.11.____cpythonpython_implcpython.yaml => osx_64_numpy2.0python3.11.____cpython.yaml} (94%) rename .ci_support/{osx_64_numpy2.0python3.12.____cpythonpython_implcpython.yaml => osx_64_numpy2.0python3.12.____cpython.yaml} (94%) rename .ci_support/{osx_64_numpy2.0python3.9.____cpythonpython_implcpython.yaml => osx_64_numpy2.0python3.9.____cpython.yaml} (94%) rename .ci_support/{osx_64_numpy1.22python3.8.____cpythonpython_implcpython.yaml => osx_64_numpy2python3.13.____cp313.yaml} (84%) rename .ci_support/{osx_arm64_numpy1.22python3.8.____cpython.yaml => osx_arm64_numpy2python3.13.____cp313.yaml} (84%) rename .ci_support/{win_64_numpy2.0python3.10.____cpythonpython_implcpython.yaml => win_64_numpy2.0python3.10.____cpython.yaml} (94%) rename .ci_support/{win_64_numpy2.0python3.11.____cpythonpython_implcpython.yaml => win_64_numpy2.0python3.11.____cpython.yaml} (94%) rename .ci_support/{win_64_numpy2.0python3.12.____cpythonpython_implcpython.yaml => win_64_numpy2.0python3.12.____cpython.yaml} (94%) rename .ci_support/{win_64_numpy2.0python3.9.____cpythonpython_implcpython.yaml => win_64_numpy2.0python3.9.____cpython.yaml} (94%) rename .ci_support/{win_64_numpy1.22python3.8.____cpythonpython_implcpython.yaml => win_64_numpy2python3.13.____cp313.yaml} (77%) diff --git a/.azure-pipelines/azure-pipelines-linux.yml b/.azure-pipelines/azure-pipelines-linux.yml index b5d15ce..1443bee 100755 --- a/.azure-pipelines/azure-pipelines-linux.yml +++ b/.azure-pipelines/azure-pipelines-linux.yml @@ -8,64 +8,64 @@ jobs: vmImage: ubuntu-latest strategy: matrix: - linux_64_numpy1.22python3.8.____cpythonpython_implcpython: - CONFIG: linux_64_numpy1.22python3.8.____cpythonpython_implcpython + linux_64_numpy2.0python3.10.____cpython: + CONFIG: linux_64_numpy2.0python3.10.____cpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_64_numpy2.0python3.10.____cpythonpython_implcpython: - CONFIG: linux_64_numpy2.0python3.10.____cpythonpython_implcpython + linux_64_numpy2.0python3.11.____cpython: + CONFIG: linux_64_numpy2.0python3.11.____cpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_64_numpy2.0python3.11.____cpythonpython_implcpython: - CONFIG: linux_64_numpy2.0python3.11.____cpythonpython_implcpython + linux_64_numpy2.0python3.12.____cpython: + CONFIG: linux_64_numpy2.0python3.12.____cpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_64_numpy2.0python3.12.____cpythonpython_implcpython: - CONFIG: linux_64_numpy2.0python3.12.____cpythonpython_implcpython + linux_64_numpy2.0python3.9.____cpython: + CONFIG: linux_64_numpy2.0python3.9.____cpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_64_numpy2.0python3.9.____cpythonpython_implcpython: - CONFIG: linux_64_numpy2.0python3.9.____cpythonpython_implcpython + 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_numpy1.22python3.8.____cpythonpython_implcpython: - CONFIG: linux_aarch64_numpy1.22python3.8.____cpythonpython_implcpython + linux_aarch64_numpy2.0python3.10.____cpython: + CONFIG: linux_aarch64_numpy2.0python3.10.____cpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_aarch64_numpy2.0python3.10.____cpythonpython_implcpython: - CONFIG: linux_aarch64_numpy2.0python3.10.____cpythonpython_implcpython + linux_aarch64_numpy2.0python3.11.____cpython: + CONFIG: linux_aarch64_numpy2.0python3.11.____cpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_aarch64_numpy2.0python3.11.____cpythonpython_implcpython: - CONFIG: linux_aarch64_numpy2.0python3.11.____cpythonpython_implcpython + linux_aarch64_numpy2.0python3.12.____cpython: + CONFIG: linux_aarch64_numpy2.0python3.12.____cpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_aarch64_numpy2.0python3.12.____cpythonpython_implcpython: - CONFIG: linux_aarch64_numpy2.0python3.12.____cpythonpython_implcpython + linux_aarch64_numpy2.0python3.9.____cpython: + CONFIG: linux_aarch64_numpy2.0python3.9.____cpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_aarch64_numpy2.0python3.9.____cpythonpython_implcpython: - CONFIG: linux_aarch64_numpy2.0python3.9.____cpythonpython_implcpython + 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_numpy1.22python3.8.____cpythonpython_implcpython: - CONFIG: linux_ppc64le_numpy1.22python3.8.____cpythonpython_implcpython + linux_ppc64le_numpy2.0python3.10.____cpython: + CONFIG: linux_ppc64le_numpy2.0python3.10.____cpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_ppc64le_numpy2.0python3.10.____cpythonpython_implcpython: - CONFIG: linux_ppc64le_numpy2.0python3.10.____cpythonpython_implcpython + linux_ppc64le_numpy2.0python3.11.____cpython: + CONFIG: linux_ppc64le_numpy2.0python3.11.____cpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_ppc64le_numpy2.0python3.11.____cpythonpython_implcpython: - CONFIG: linux_ppc64le_numpy2.0python3.11.____cpythonpython_implcpython + linux_ppc64le_numpy2.0python3.12.____cpython: + CONFIG: linux_ppc64le_numpy2.0python3.12.____cpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_ppc64le_numpy2.0python3.12.____cpythonpython_implcpython: - CONFIG: linux_ppc64le_numpy2.0python3.12.____cpythonpython_implcpython + linux_ppc64le_numpy2.0python3.9.____cpython: + CONFIG: linux_ppc64le_numpy2.0python3.9.____cpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_ppc64le_numpy2.0python3.9.____cpythonpython_implcpython: - CONFIG: linux_ppc64le_numpy2.0python3.9.____cpythonpython_implcpython + 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 diff --git a/.azure-pipelines/azure-pipelines-osx.yml b/.azure-pipelines/azure-pipelines-osx.yml index 738d898..f1d5a74 100755 --- a/.azure-pipelines/azure-pipelines-osx.yml +++ b/.azure-pipelines/azure-pipelines-osx.yml @@ -8,23 +8,20 @@ jobs: vmImage: macOS-12 strategy: matrix: - osx_64_numpy1.22python3.8.____cpythonpython_implcpython: - CONFIG: osx_64_numpy1.22python3.8.____cpythonpython_implcpython + osx_64_numpy2.0python3.10.____cpython: + CONFIG: osx_64_numpy2.0python3.10.____cpython UPLOAD_PACKAGES: 'True' - osx_64_numpy2.0python3.10.____cpythonpython_implcpython: - CONFIG: osx_64_numpy2.0python3.10.____cpythonpython_implcpython + osx_64_numpy2.0python3.11.____cpython: + CONFIG: osx_64_numpy2.0python3.11.____cpython UPLOAD_PACKAGES: 'True' - osx_64_numpy2.0python3.11.____cpythonpython_implcpython: - CONFIG: osx_64_numpy2.0python3.11.____cpythonpython_implcpython + osx_64_numpy2.0python3.12.____cpython: + CONFIG: osx_64_numpy2.0python3.12.____cpython UPLOAD_PACKAGES: 'True' - osx_64_numpy2.0python3.12.____cpythonpython_implcpython: - CONFIG: osx_64_numpy2.0python3.12.____cpythonpython_implcpython + osx_64_numpy2.0python3.9.____cpython: + CONFIG: osx_64_numpy2.0python3.9.____cpython UPLOAD_PACKAGES: 'True' - osx_64_numpy2.0python3.9.____cpythonpython_implcpython: - CONFIG: osx_64_numpy2.0python3.9.____cpythonpython_implcpython - UPLOAD_PACKAGES: 'True' - osx_arm64_numpy1.22python3.8.____cpython: - CONFIG: osx_arm64_numpy1.22python3.8.____cpython + 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 @@ -38,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 b63d076..900e757 100755 --- a/.azure-pipelines/azure-pipelines-win.yml +++ b/.azure-pipelines/azure-pipelines-win.yml @@ -8,20 +8,20 @@ jobs: vmImage: windows-2022 strategy: matrix: - win_64_numpy1.22python3.8.____cpythonpython_implcpython: - CONFIG: win_64_numpy1.22python3.8.____cpythonpython_implcpython + win_64_numpy2.0python3.10.____cpython: + CONFIG: win_64_numpy2.0python3.10.____cpython UPLOAD_PACKAGES: 'True' - win_64_numpy2.0python3.10.____cpythonpython_implcpython: - CONFIG: win_64_numpy2.0python3.10.____cpythonpython_implcpython + win_64_numpy2.0python3.11.____cpython: + CONFIG: win_64_numpy2.0python3.11.____cpython UPLOAD_PACKAGES: 'True' - win_64_numpy2.0python3.11.____cpythonpython_implcpython: - CONFIG: win_64_numpy2.0python3.11.____cpythonpython_implcpython + win_64_numpy2.0python3.12.____cpython: + CONFIG: win_64_numpy2.0python3.12.____cpython UPLOAD_PACKAGES: 'True' - win_64_numpy2.0python3.12.____cpythonpython_implcpython: - CONFIG: win_64_numpy2.0python3.12.____cpythonpython_implcpython + win_64_numpy2.0python3.9.____cpython: + CONFIG: win_64_numpy2.0python3.9.____cpython UPLOAD_PACKAGES: 'True' - win_64_numpy2.0python3.9.____cpythonpython_implcpython: - CONFIG: win_64_numpy2.0python3.9.____cpythonpython_implcpython + win_64_numpy2python3.13.____cp313: + CONFIG: win_64_numpy2python3.13.____cp313 UPLOAD_PACKAGES: 'True' timeoutInMinutes: 360 variables: diff --git a/.ci_support/linux_64_numpy2.0python3.10.____cpythonpython_implcpython.yaml b/.ci_support/linux_64_numpy2.0python3.10.____cpython.yaml similarity index 94% rename from .ci_support/linux_64_numpy2.0python3.10.____cpythonpython_implcpython.yaml rename to .ci_support/linux_64_numpy2.0python3.10.____cpython.yaml index 64dd761..f38355d 100644 --- a/.ci_support/linux_64_numpy2.0python3.10.____cpythonpython_implcpython.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 nlopt: @@ -40,3 +40,4 @@ zip_keys: - - python - numpy - python_impl + - channel_sources diff --git a/.ci_support/linux_64_numpy2.0python3.11.____cpythonpython_implcpython.yaml b/.ci_support/linux_64_numpy2.0python3.11.____cpython.yaml similarity index 94% rename from .ci_support/linux_64_numpy2.0python3.11.____cpythonpython_implcpython.yaml rename to .ci_support/linux_64_numpy2.0python3.11.____cpython.yaml index dd2f37e..cb89cb5 100644 --- a/.ci_support/linux_64_numpy2.0python3.11.____cpythonpython_implcpython.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 nlopt: @@ -40,3 +40,4 @@ zip_keys: - - python - numpy - python_impl + - channel_sources diff --git a/.ci_support/linux_64_numpy2.0python3.12.____cpythonpython_implcpython.yaml b/.ci_support/linux_64_numpy2.0python3.12.____cpython.yaml similarity index 94% rename from .ci_support/linux_64_numpy2.0python3.12.____cpythonpython_implcpython.yaml rename to .ci_support/linux_64_numpy2.0python3.12.____cpython.yaml index 13e3a31..6408789 100644 --- a/.ci_support/linux_64_numpy2.0python3.12.____cpythonpython_implcpython.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 nlopt: @@ -40,3 +40,4 @@ zip_keys: - - python - numpy - python_impl + - channel_sources diff --git a/.ci_support/linux_64_numpy2.0python3.9.____cpythonpython_implcpython.yaml b/.ci_support/linux_64_numpy2.0python3.9.____cpython.yaml similarity index 94% rename from .ci_support/linux_64_numpy2.0python3.9.____cpythonpython_implcpython.yaml rename to .ci_support/linux_64_numpy2.0python3.9.____cpython.yaml index 543f721..a77b865 100644 --- a/.ci_support/linux_64_numpy2.0python3.9.____cpythonpython_implcpython.yaml +++ b/.ci_support/linux_64_numpy2.0python3.9.____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 nlopt: @@ -40,3 +40,4 @@ zip_keys: - - python - numpy - python_impl + - channel_sources diff --git a/.ci_support/linux_64_numpy1.22python3.8.____cpythonpython_implcpython.yaml b/.ci_support/linux_64_numpy2python3.13.____cp313.yaml similarity index 84% rename from .ci_support/linux_64_numpy1.22python3.8.____cpythonpython_implcpython.yaml rename to .ci_support/linux_64_numpy2python3.13.____cp313.yaml index 6ed6cc4..58a5af9 100644 --- a/.ci_support/linux_64_numpy1.22python3.8.____cpythonpython_implcpython.yaml +++ b/.ci_support/linux_64_numpy2python3.13.____cp313.yaml @@ -1,7 +1,7 @@ c_compiler: - gcc c_compiler_version: -- '12' +- '13' c_stdlib: - sysroot c_stdlib_version: @@ -9,25 +9,25 @@ c_stdlib_version: cdt_name: - cos7 channel_sources: -- conda-forge +- conda-forge/label/python_rc,conda-forge channel_targets: - conda-forge main cxx_compiler: - gxx cxx_compiler_version: -- '12' +- '13' docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 nlopt: - '2.7' numpy: -- '1.22' +- '2' pin_run_as_build: python: min_pin: x.x max_pin: x.x python: -- 3.8.* *_cpython +- 3.13.* *_cp313 python_impl: - cpython target_platform: @@ -40,3 +40,4 @@ zip_keys: - - python - numpy - python_impl + - channel_sources diff --git a/.ci_support/linux_aarch64_numpy2.0python3.10.____cpythonpython_implcpython.yaml b/.ci_support/linux_aarch64_numpy2.0python3.10.____cpython.yaml similarity index 94% rename from .ci_support/linux_aarch64_numpy2.0python3.10.____cpythonpython_implcpython.yaml rename to .ci_support/linux_aarch64_numpy2.0python3.10.____cpython.yaml index e183b51..02b8013 100644 --- a/.ci_support/linux_aarch64_numpy2.0python3.10.____cpythonpython_implcpython.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 nlopt: @@ -44,3 +44,4 @@ zip_keys: - - python - numpy - python_impl + - channel_sources diff --git a/.ci_support/linux_aarch64_numpy2.0python3.11.____cpythonpython_implcpython.yaml b/.ci_support/linux_aarch64_numpy2.0python3.11.____cpython.yaml similarity index 94% rename from .ci_support/linux_aarch64_numpy2.0python3.11.____cpythonpython_implcpython.yaml rename to .ci_support/linux_aarch64_numpy2.0python3.11.____cpython.yaml index a049169..5ced5b6 100644 --- a/.ci_support/linux_aarch64_numpy2.0python3.11.____cpythonpython_implcpython.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 nlopt: @@ -44,3 +44,4 @@ zip_keys: - - python - numpy - python_impl + - channel_sources diff --git a/.ci_support/linux_aarch64_numpy2.0python3.12.____cpythonpython_implcpython.yaml b/.ci_support/linux_aarch64_numpy2.0python3.12.____cpython.yaml similarity index 94% rename from .ci_support/linux_aarch64_numpy2.0python3.12.____cpythonpython_implcpython.yaml rename to .ci_support/linux_aarch64_numpy2.0python3.12.____cpython.yaml index c113365..d9e796c 100644 --- a/.ci_support/linux_aarch64_numpy2.0python3.12.____cpythonpython_implcpython.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 nlopt: @@ -44,3 +44,4 @@ zip_keys: - - python - numpy - python_impl + - channel_sources diff --git a/.ci_support/linux_aarch64_numpy2.0python3.9.____cpythonpython_implcpython.yaml b/.ci_support/linux_aarch64_numpy2.0python3.9.____cpython.yaml similarity index 94% rename from .ci_support/linux_aarch64_numpy2.0python3.9.____cpythonpython_implcpython.yaml rename to .ci_support/linux_aarch64_numpy2.0python3.9.____cpython.yaml index f973054..54b5291 100644 --- a/.ci_support/linux_aarch64_numpy2.0python3.9.____cpythonpython_implcpython.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: @@ -19,7 +19,7 @@ channel_targets: cxx_compiler: - gxx cxx_compiler_version: -- '12' +- '13' docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 nlopt: @@ -44,3 +44,4 @@ zip_keys: - - python - numpy - python_impl + - channel_sources diff --git a/.ci_support/linux_aarch64_numpy1.22python3.8.____cpythonpython_implcpython.yaml b/.ci_support/linux_aarch64_numpy2python3.13.____cp313.yaml similarity index 85% rename from .ci_support/linux_aarch64_numpy1.22python3.8.____cpythonpython_implcpython.yaml rename to .ci_support/linux_aarch64_numpy2python3.13.____cp313.yaml index a1cbaf7..df00519 100644 --- a/.ci_support/linux_aarch64_numpy1.22python3.8.____cpythonpython_implcpython.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,25 +13,25 @@ cdt_arch: cdt_name: - cos7 channel_sources: -- conda-forge +- conda-forge/label/python_rc,conda-forge channel_targets: - conda-forge main cxx_compiler: - gxx cxx_compiler_version: -- '12' +- '13' docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 nlopt: - '2.7' numpy: -- '1.22' +- '2' pin_run_as_build: python: min_pin: x.x max_pin: x.x python: -- 3.8.* *_cpython +- 3.13.* *_cp313 python_impl: - cpython target_platform: @@ -44,3 +44,4 @@ zip_keys: - - python - numpy - python_impl + - channel_sources diff --git a/.ci_support/linux_ppc64le_numpy2.0python3.10.____cpythonpython_implcpython.yaml b/.ci_support/linux_ppc64le_numpy2.0python3.10.____cpython.yaml similarity index 94% rename from .ci_support/linux_ppc64le_numpy2.0python3.10.____cpythonpython_implcpython.yaml rename to .ci_support/linux_ppc64le_numpy2.0python3.10.____cpython.yaml index 835ce1d..4054442 100644 --- a/.ci_support/linux_ppc64le_numpy2.0python3.10.____cpythonpython_implcpython.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 nlopt: @@ -40,3 +40,4 @@ zip_keys: - - python - numpy - python_impl + - channel_sources diff --git a/.ci_support/linux_ppc64le_numpy2.0python3.11.____cpythonpython_implcpython.yaml b/.ci_support/linux_ppc64le_numpy2.0python3.11.____cpython.yaml similarity index 94% rename from .ci_support/linux_ppc64le_numpy2.0python3.11.____cpythonpython_implcpython.yaml rename to .ci_support/linux_ppc64le_numpy2.0python3.11.____cpython.yaml index 6775651..948496b 100644 --- a/.ci_support/linux_ppc64le_numpy2.0python3.11.____cpythonpython_implcpython.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 nlopt: @@ -40,3 +40,4 @@ zip_keys: - - python - numpy - python_impl + - channel_sources diff --git a/.ci_support/linux_ppc64le_numpy2.0python3.12.____cpythonpython_implcpython.yaml b/.ci_support/linux_ppc64le_numpy2.0python3.12.____cpython.yaml similarity index 94% rename from .ci_support/linux_ppc64le_numpy2.0python3.12.____cpythonpython_implcpython.yaml rename to .ci_support/linux_ppc64le_numpy2.0python3.12.____cpython.yaml index 9b3ac41..ae8b5c6 100644 --- a/.ci_support/linux_ppc64le_numpy2.0python3.12.____cpythonpython_implcpython.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 nlopt: @@ -40,3 +40,4 @@ zip_keys: - - python - numpy - python_impl + - channel_sources diff --git a/.ci_support/linux_ppc64le_numpy2.0python3.9.____cpythonpython_implcpython.yaml b/.ci_support/linux_ppc64le_numpy2.0python3.9.____cpython.yaml similarity index 94% rename from .ci_support/linux_ppc64le_numpy2.0python3.9.____cpythonpython_implcpython.yaml rename to .ci_support/linux_ppc64le_numpy2.0python3.9.____cpython.yaml index 946e394..b0ec9e7 100644 --- a/.ci_support/linux_ppc64le_numpy2.0python3.9.____cpythonpython_implcpython.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: @@ -15,7 +15,7 @@ channel_targets: cxx_compiler: - gxx cxx_compiler_version: -- '12' +- '13' docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 nlopt: @@ -40,3 +40,4 @@ zip_keys: - - python - numpy - python_impl + - channel_sources diff --git a/.ci_support/linux_ppc64le_numpy1.22python3.8.____cpythonpython_implcpython.yaml b/.ci_support/linux_ppc64le_numpy2python3.13.____cp313.yaml similarity index 84% rename from .ci_support/linux_ppc64le_numpy1.22python3.8.____cpythonpython_implcpython.yaml rename to .ci_support/linux_ppc64le_numpy2python3.13.____cp313.yaml index 25c0fbe..0af04aa 100644 --- a/.ci_support/linux_ppc64le_numpy1.22python3.8.____cpythonpython_implcpython.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,25 +9,25 @@ c_stdlib_version: cdt_name: - cos7 channel_sources: -- conda-forge +- conda-forge/label/python_rc,conda-forge channel_targets: - conda-forge main cxx_compiler: - gxx cxx_compiler_version: -- '12' +- '13' docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 nlopt: - '2.7' numpy: -- '1.22' +- '2' pin_run_as_build: python: min_pin: x.x max_pin: x.x python: -- 3.8.* *_cpython +- 3.13.* *_cp313 python_impl: - cpython target_platform: @@ -40,3 +40,4 @@ zip_keys: - - python - numpy - python_impl + - channel_sources diff --git a/.ci_support/migrations/pypy38.yaml b/.ci_support/migrations/pypy38.yaml deleted file mode 100644 index 95e0542..0000000 --- a/.ci_support/migrations/pypy38.yaml +++ /dev/null @@ -1,53 +0,0 @@ -migrator_ts: 1647123563 -__migrator: - migration_number: 1 - primary_key: python - ordering: - python: - - 3.6.* *_cpython - - 3.7.* *_cpython - - 3.8.* *_cpython - - 3.9.* *_cpython - - 3.10.* *_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 - wait_for_migrators: - - python310 - commit_message: "Rebuild for PyPy3.8 and PyPy3.9" - exclude: - # this shouldn't attempt to modify the python feedstocks - - python - - pypy3.6 - - pypy-meta - -python: - - 3.7.* *_cpython # [not (osx and arm64)] - - 3.8.* *_cpython - - 3.9.* *_cpython - - 3.10.* *_cpython - - 3.8.* *_73_pypy # [not (osx and arm64)] - - 3.9.* *_73_pypy # [not (osx and arm64)] -numpy: - # part of a zip_keys: python, python_impl, numpy - - 1.19 # [not (osx and arm64)] - - 1.19 - - 1.19 - - 1.21 - - 1.19 # [not (osx and arm64)] - - 1.19 # [not (osx and arm64)] -python_impl: - - cpython # [not (osx and arm64)] - - cpython - - cpython - - cpython - - pypy # [not (osx and arm64)] - - pypy # [not (osx and arm64)] diff --git a/.ci_support/osx_64_numpy2.0python3.10.____cpythonpython_implcpython.yaml b/.ci_support/osx_64_numpy2.0python3.10.____cpython.yaml similarity index 94% rename from .ci_support/osx_64_numpy2.0python3.10.____cpythonpython_implcpython.yaml rename to .ci_support/osx_64_numpy2.0python3.10.____cpython.yaml index cece2c4..43b5e08 100644 --- a/.ci_support/osx_64_numpy2.0python3.10.____cpythonpython_implcpython.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 nlopt: @@ -40,3 +40,4 @@ zip_keys: - - python - numpy - python_impl + - channel_sources diff --git a/.ci_support/osx_64_numpy2.0python3.11.____cpythonpython_implcpython.yaml b/.ci_support/osx_64_numpy2.0python3.11.____cpython.yaml similarity index 94% rename from .ci_support/osx_64_numpy2.0python3.11.____cpythonpython_implcpython.yaml rename to .ci_support/osx_64_numpy2.0python3.11.____cpython.yaml index 67e810f..03698b8 100644 --- a/.ci_support/osx_64_numpy2.0python3.11.____cpythonpython_implcpython.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 nlopt: @@ -40,3 +40,4 @@ zip_keys: - - python - numpy - python_impl + - channel_sources diff --git a/.ci_support/osx_64_numpy2.0python3.12.____cpythonpython_implcpython.yaml b/.ci_support/osx_64_numpy2.0python3.12.____cpython.yaml similarity index 94% rename from .ci_support/osx_64_numpy2.0python3.12.____cpythonpython_implcpython.yaml rename to .ci_support/osx_64_numpy2.0python3.12.____cpython.yaml index 49faf09..021fa1a 100644 --- a/.ci_support/osx_64_numpy2.0python3.12.____cpythonpython_implcpython.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 nlopt: @@ -40,3 +40,4 @@ zip_keys: - - python - numpy - python_impl + - channel_sources diff --git a/.ci_support/osx_64_numpy2.0python3.9.____cpythonpython_implcpython.yaml b/.ci_support/osx_64_numpy2.0python3.9.____cpython.yaml similarity index 94% rename from .ci_support/osx_64_numpy2.0python3.9.____cpythonpython_implcpython.yaml rename to .ci_support/osx_64_numpy2.0python3.9.____cpython.yaml index 0a0a33d..30821f9 100644 --- a/.ci_support/osx_64_numpy2.0python3.9.____cpythonpython_implcpython.yaml +++ b/.ci_support/osx_64_numpy2.0python3.9.____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 nlopt: @@ -40,3 +40,4 @@ zip_keys: - - python - numpy - python_impl + - channel_sources diff --git a/.ci_support/osx_64_numpy1.22python3.8.____cpythonpython_implcpython.yaml b/.ci_support/osx_64_numpy2python3.13.____cp313.yaml similarity index 84% rename from .ci_support/osx_64_numpy1.22python3.8.____cpythonpython_implcpython.yaml rename to .ci_support/osx_64_numpy2python3.13.____cp313.yaml index 2593f1e..0119fb9 100644 --- a/.ci_support/osx_64_numpy1.22python3.8.____cpythonpython_implcpython.yaml +++ b/.ci_support/osx_64_numpy2python3.13.____cp313.yaml @@ -5,31 +5,31 @@ MACOSX_SDK_VERSION: c_compiler: - clang c_compiler_version: -- '16' +- '17' c_stdlib: - macosx_deployment_target c_stdlib_version: - '10.13' channel_sources: -- conda-forge +- conda-forge/label/python_rc,conda-forge channel_targets: - conda-forge main cxx_compiler: - clangxx cxx_compiler_version: -- '16' +- '17' macos_machine: - x86_64-apple-darwin13.4.0 nlopt: - '2.7' numpy: -- '1.22' +- '2' pin_run_as_build: python: min_pin: x.x max_pin: x.x python: -- 3.8.* *_cpython +- 3.13.* *_cp313 python_impl: - cpython target_platform: @@ -40,3 +40,4 @@ zip_keys: - - python - numpy - python_impl + - 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 cbcb5dc..d0e17cb 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 nlopt: @@ -40,3 +40,4 @@ zip_keys: - - python - numpy - python_impl + - 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 0723051..74f425d 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 nlopt: @@ -40,3 +40,4 @@ zip_keys: - - python - numpy - python_impl + - 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 ecba8ef..4060db6 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 nlopt: @@ -40,3 +40,4 @@ zip_keys: - - python - numpy - python_impl + - 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 da8e45f..4cb2e51 100644 --- a/.ci_support/osx_arm64_numpy2.0python3.9.____cpython.yaml +++ b/.ci_support/osx_arm64_numpy2.0python3.9.____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 nlopt: @@ -40,3 +40,4 @@ zip_keys: - - python - numpy - python_impl + - channel_sources diff --git a/.ci_support/osx_arm64_numpy1.22python3.8.____cpython.yaml b/.ci_support/osx_arm64_numpy2python3.13.____cp313.yaml similarity index 84% rename from .ci_support/osx_arm64_numpy1.22python3.8.____cpython.yaml rename to .ci_support/osx_arm64_numpy2python3.13.____cp313.yaml index 576ac19..24be4d6 100644 --- a/.ci_support/osx_arm64_numpy1.22python3.8.____cpython.yaml +++ b/.ci_support/osx_arm64_numpy2python3.13.____cp313.yaml @@ -5,31 +5,31 @@ MACOSX_SDK_VERSION: c_compiler: - clang c_compiler_version: -- '16' +- '17' c_stdlib: - macosx_deployment_target c_stdlib_version: - '11.0' channel_sources: -- conda-forge +- conda-forge/label/python_rc,conda-forge channel_targets: - conda-forge main cxx_compiler: - clangxx cxx_compiler_version: -- '16' +- '17' macos_machine: - arm64-apple-darwin20.0.0 nlopt: - '2.7' numpy: -- '1.22' +- '2' pin_run_as_build: python: min_pin: x.x max_pin: x.x python: -- 3.8.* *_cpython +- 3.13.* *_cp313 python_impl: - cpython target_platform: @@ -40,3 +40,4 @@ zip_keys: - - python - numpy - python_impl + - channel_sources diff --git a/.ci_support/win_64_numpy2.0python3.10.____cpythonpython_implcpython.yaml b/.ci_support/win_64_numpy2.0python3.10.____cpython.yaml similarity index 94% rename from .ci_support/win_64_numpy2.0python3.10.____cpythonpython_implcpython.yaml rename to .ci_support/win_64_numpy2.0python3.10.____cpython.yaml index 9bfe4ee..ed855f7 100644 --- a/.ci_support/win_64_numpy2.0python3.10.____cpythonpython_implcpython.yaml +++ b/.ci_support/win_64_numpy2.0python3.10.____cpython.yaml @@ -26,3 +26,4 @@ zip_keys: - - python - numpy - python_impl + - channel_sources diff --git a/.ci_support/win_64_numpy2.0python3.11.____cpythonpython_implcpython.yaml b/.ci_support/win_64_numpy2.0python3.11.____cpython.yaml similarity index 94% rename from .ci_support/win_64_numpy2.0python3.11.____cpythonpython_implcpython.yaml rename to .ci_support/win_64_numpy2.0python3.11.____cpython.yaml index 6fea2d4..0dbd7cb 100644 --- a/.ci_support/win_64_numpy2.0python3.11.____cpythonpython_implcpython.yaml +++ b/.ci_support/win_64_numpy2.0python3.11.____cpython.yaml @@ -26,3 +26,4 @@ zip_keys: - - python - numpy - python_impl + - channel_sources diff --git a/.ci_support/win_64_numpy2.0python3.12.____cpythonpython_implcpython.yaml b/.ci_support/win_64_numpy2.0python3.12.____cpython.yaml similarity index 94% rename from .ci_support/win_64_numpy2.0python3.12.____cpythonpython_implcpython.yaml rename to .ci_support/win_64_numpy2.0python3.12.____cpython.yaml index 4a32e93..fe2daab 100644 --- a/.ci_support/win_64_numpy2.0python3.12.____cpythonpython_implcpython.yaml +++ b/.ci_support/win_64_numpy2.0python3.12.____cpython.yaml @@ -26,3 +26,4 @@ zip_keys: - - python - numpy - python_impl + - channel_sources diff --git a/.ci_support/win_64_numpy2.0python3.9.____cpythonpython_implcpython.yaml b/.ci_support/win_64_numpy2.0python3.9.____cpython.yaml similarity index 94% rename from .ci_support/win_64_numpy2.0python3.9.____cpythonpython_implcpython.yaml rename to .ci_support/win_64_numpy2.0python3.9.____cpython.yaml index 839e3f4..484b9c8 100644 --- a/.ci_support/win_64_numpy2.0python3.9.____cpythonpython_implcpython.yaml +++ b/.ci_support/win_64_numpy2.0python3.9.____cpython.yaml @@ -26,3 +26,4 @@ zip_keys: - - python - numpy - python_impl + - channel_sources diff --git a/.ci_support/win_64_numpy1.22python3.8.____cpythonpython_implcpython.yaml b/.ci_support/win_64_numpy2python3.13.____cp313.yaml similarity index 77% rename from .ci_support/win_64_numpy1.22python3.8.____cpythonpython_implcpython.yaml rename to .ci_support/win_64_numpy2python3.13.____cp313.yaml index 7e75287..410cfef 100644 --- a/.ci_support/win_64_numpy1.22python3.8.____cpythonpython_implcpython.yaml +++ b/.ci_support/win_64_numpy2python3.13.____cp313.yaml @@ -3,7 +3,7 @@ c_compiler: c_stdlib: - vs channel_sources: -- conda-forge +- conda-forge/label/python_rc,conda-forge channel_targets: - conda-forge main cxx_compiler: @@ -11,13 +11,13 @@ cxx_compiler: nlopt: - '2.7' numpy: -- '1.22' +- '2' pin_run_as_build: python: min_pin: x.x max_pin: x.x python: -- 3.8.* *_cpython +- 3.13.* *_cp313 python_impl: - cpython target_platform: @@ -26,3 +26,4 @@ zip_keys: - - python - numpy - python_impl + - channel_sources diff --git a/README.md b/README.md index 3253394..d7760e6 100644 --- a/README.md +++ b/README.md @@ -27,150 +27,143 @@ Current build status - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - - @@ -202,38 +195,45 @@ Current build status - + + + + - + - + - + - + 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 f7e9cb87af7344506b8a35cfd7688b7f29fda02c Mon Sep 17 00:00:00 2001 From: Julien Schueller Date: Tue, 3 Sep 2024 07:20:55 +0200 Subject: [PATCH 3/3] Py 3.13 support --- recipe/meta.yaml | 2 ++ recipe/py313.patch | 32 ++++++++++++++++++++++++++++++++ 2 files changed, 34 insertions(+) create mode 100644 recipe/py313.patch diff --git a/recipe/meta.yaml b/recipe/meta.yaml index aec0674..9a2ac1e 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -8,6 +8,8 @@ source: fn: nlopt-{{ version }}.tar.gz url: https://github.com/stevengj/nlopt/archive/v{{ version }}.tar.gz sha256: e02a4956a69d323775d79fdaec7ba7a23ed912c7d45e439bc933d991ea3193fd + patches: + - py313.patch build: number: 1 diff --git a/recipe/py313.patch b/recipe/py313.patch new file mode 100644 index 0000000..c835608 --- /dev/null +++ b/recipe/py313.patch @@ -0,0 +1,32 @@ +From d716820578d226976fbb4fa68478758dad1c79b0 Mon Sep 17 00:00:00 2001 +From: Julien Schueller +Date: Thu, 15 Aug 2024 21:18:49 +0200 +Subject: [PATCH] Python: Replace deprecated PyEval_CallObject + +Closes #565 +--- + src/swig/nlopt-python.i | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/swig/nlopt-python.i b/src/swig/nlopt-python.i +index 41531faa..b5cf55e1 100644 +--- a/src/swig/nlopt-python.i ++++ b/src/swig/nlopt-python.i +@@ -151,7 +151,7 @@ static double func_python(unsigned n, const double *x, double *grad, void *f) + : PyArray_SimpleNew(1, &sz0, NPY_DOUBLE); + + PyObject *arglist = Py_BuildValue("OO", xpy, gradpy); +- PyObject *result = PyEval_CallObject((PyObject *) f, arglist); ++ PyObject *result = PyObject_Call((PyObject *) f, arglist, NULL); + Py_DECREF(arglist); + + Py_DECREF(gradpy); +@@ -192,7 +192,7 @@ static void mfunc_python(unsigned m, double *result, + : PyArray_SimpleNew(1, &sz0, NPY_DOUBLE); + + PyObject *arglist = Py_BuildValue("OOO", rpy, xpy, gradpy); +- PyObject *res = PyEval_CallObject((PyObject *) f, arglist); ++ PyObject *res = PyObject_Call((PyObject *) f, arglist, NULL); + Py_XDECREF(res); + Py_DECREF(arglist); +
VariantStatus
linux_64_numpy1.22python3.8.____cpythonpython_implcpythonlinux_64_numpy2.0python3.10.____cpython - variant + variant
linux_64_numpy2.0python3.10.____cpythonpython_implcpythonlinux_64_numpy2.0python3.11.____cpython - variant + variant
linux_64_numpy2.0python3.11.____cpythonpython_implcpythonlinux_64_numpy2.0python3.12.____cpython - variant + variant
linux_64_numpy2.0python3.12.____cpythonpython_implcpythonlinux_64_numpy2.0python3.9.____cpython - variant + variant
linux_64_numpy2.0python3.9.____cpythonpython_implcpythonlinux_64_numpy2python3.13.____cp313 - variant + variant
linux_aarch64_numpy1.22python3.8.____cpythonpython_implcpythonlinux_aarch64_numpy2.0python3.10.____cpython - variant + variant
linux_aarch64_numpy2.0python3.10.____cpythonpython_implcpythonlinux_aarch64_numpy2.0python3.11.____cpython - variant + variant
linux_aarch64_numpy2.0python3.11.____cpythonpython_implcpythonlinux_aarch64_numpy2.0python3.12.____cpython - variant + variant
linux_aarch64_numpy2.0python3.12.____cpythonpython_implcpythonlinux_aarch64_numpy2.0python3.9.____cpython - variant + variant
linux_aarch64_numpy2.0python3.9.____cpythonpython_implcpythonlinux_aarch64_numpy2python3.13.____cp313 - variant + variant
linux_ppc64le_numpy1.22python3.8.____cpythonpython_implcpythonlinux_ppc64le_numpy2.0python3.10.____cpython - variant + variant
linux_ppc64le_numpy2.0python3.10.____cpythonpython_implcpythonlinux_ppc64le_numpy2.0python3.11.____cpython - variant + variant
linux_ppc64le_numpy2.0python3.11.____cpythonpython_implcpythonlinux_ppc64le_numpy2.0python3.12.____cpython - variant + variant
linux_ppc64le_numpy2.0python3.12.____cpythonpython_implcpythonlinux_ppc64le_numpy2.0python3.9.____cpython - variant + variant
linux_ppc64le_numpy2.0python3.9.____cpythonpython_implcpythonlinux_ppc64le_numpy2python3.13.____cp313 - variant + variant
osx_64_numpy1.22python3.8.____cpythonpython_implcpythonosx_64_numpy2.0python3.10.____cpython - variant + variant
osx_64_numpy2.0python3.10.____cpythonpython_implcpythonosx_64_numpy2.0python3.11.____cpython - variant + variant
osx_64_numpy2.0python3.11.____cpythonpython_implcpythonosx_64_numpy2.0python3.12.____cpython - variant + variant
osx_64_numpy2.0python3.12.____cpythonpython_implcpythonosx_64_numpy2.0python3.9.____cpython - variant + variant
osx_64_numpy2.0python3.9.____cpythonpython_implcpythonosx_64_numpy2python3.13.____cp313 - variant - -
osx_arm64_numpy1.22python3.8.____cpython - - variant + variant
win_64_numpy1.22python3.8.____cpythonpython_implcpythonosx_arm64_numpy2python3.13.____cp313 + + variant + +
win_64_numpy2.0python3.10.____cpython - variant + variant
win_64_numpy2.0python3.10.____cpythonpython_implcpythonwin_64_numpy2.0python3.11.____cpython - variant + variant
win_64_numpy2.0python3.11.____cpythonpython_implcpythonwin_64_numpy2.0python3.12.____cpython - variant + variant
win_64_numpy2.0python3.12.____cpythonpython_implcpythonwin_64_numpy2.0python3.9.____cpython - variant + variant
win_64_numpy2.0python3.9.____cpythonpython_implcpythonwin_64_numpy2python3.13.____cp313 - variant + variant