From fe1f15015ef9e601c0de2cf7130f95ebec841cde Mon Sep 17 00:00:00 2001 From: regro-cf-autotick-bot <36490558+regro-cf-autotick-bot@users.noreply.github.com> Date: Thu, 12 Sep 2024 21:12:44 +0000 Subject: [PATCH 1/2] Rebuild for python 3.13 --- .ci_support/migrations/python313.yaml | 46 +++++++++++++++++++++++++++ recipe/meta.yaml | 2 +- 2 files changed, 47 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..f9389e3 --- /dev/null +++ b/.ci_support/migrations/python313.yaml @@ -0,0 +1,46 @@ +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 + # 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 +python_impl: +- cpython diff --git a/recipe/meta.yaml b/recipe/meta.yaml index e1e86e7..e7b3bdb 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -10,7 +10,7 @@ source: sha256: 52e43c7d860c8742876baab59d0e93e5c91963d1fecf11fd218655c6740281b1 build: - number: 0 + number: 1 skip: true # [win] requirements: From c5209f3d3be2e29207d38699bfd8ea3e630cc967 Mon Sep 17 00:00:00 2001 From: regro-cf-autotick-bot <36490558+regro-cf-autotick-bot@users.noreply.github.com> Date: Thu, 12 Sep 2024 21:13:44 +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.12.08.18.46 --- .azure-pipelines/azure-pipelines-linux.yml | 24 +++------- .azure-pipelines/azure-pipelines-osx.yml | 11 ++--- .../linux_64_python3.10.____cpython.yaml | 4 +- .../linux_64_python3.11.____cpython.yaml | 4 +- .../linux_64_python3.12.____cpython.yaml | 4 +- ...aml => linux_64_python3.13.____cp313.yaml} | 8 ++-- .../linux_64_python3.9.____73_pypy.yaml | 29 ----------- .../linux_64_python3.9.____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_aarch64_python3.13.____cp313.yaml} | 8 ++-- .../linux_aarch64_python3.9.____73_pypy.yaml | 33 ------------- .../linux_aarch64_python3.9.____cpython.yaml | 4 +- .../linux_ppc64le_python3.10.____cpython.yaml | 4 +- .../linux_ppc64le_python3.11.____cpython.yaml | 4 +- .../linux_ppc64le_python3.12.____cpython.yaml | 4 +- ...> linux_ppc64le_python3.13.____cp313.yaml} | 8 ++-- .../linux_ppc64le_python3.9.____73_pypy.yaml | 29 ----------- .../linux_ppc64le_python3.9.____cpython.yaml | 4 +- .ci_support/migrations/pypy38.yaml | 43 ----------------- .../osx_64_python3.10.____cpython.yaml | 5 +- .../osx_64_python3.11.____cpython.yaml | 5 +- .../osx_64_python3.12.____cpython.yaml | 5 +- ....yaml => osx_64_python3.13.____cp313.yaml} | 9 ++-- .ci_support/osx_64_python3.9.____73_pypy.yaml | 28 ----------- .ci_support/osx_64_python3.9.____cpython.yaml | 5 +- .../osx_arm64_python3.10.____cpython.yaml | 5 +- .../osx_arm64_python3.11.____cpython.yaml | 5 +- .../osx_arm64_python3.12.____cpython.yaml | 5 +- ...ml => osx_arm64_python3.13.____cp313.yaml} | 9 ++-- .../osx_arm64_python3.9.____cpython.yaml | 5 +- .scripts/run_osx_build.sh | 2 +- README.md | 48 ++++--------------- build-locally.py | 9 ++-- 35 files changed, 122 insertions(+), 264 deletions(-) rename .ci_support/{linux_64_python3.8.____cpython.yaml => linux_64_python3.13.____cp313.yaml} (79%) delete mode 100644 .ci_support/linux_64_python3.9.____73_pypy.yaml rename .ci_support/{linux_aarch64_python3.8.____cpython.yaml => linux_aarch64_python3.13.____cp313.yaml} (82%) delete mode 100644 .ci_support/linux_aarch64_python3.9.____73_pypy.yaml rename .ci_support/{linux_ppc64le_python3.8.____cpython.yaml => linux_ppc64le_python3.13.____cp313.yaml} (79%) delete mode 100644 .ci_support/linux_ppc64le_python3.9.____73_pypy.yaml delete mode 100644 .ci_support/migrations/pypy38.yaml rename .ci_support/{osx_64_python3.8.____cpython.yaml => osx_64_python3.13.____cp313.yaml} (78%) delete mode 100644 .ci_support/osx_64_python3.9.____73_pypy.yaml rename .ci_support/{osx_arm64_python3.8.____cpython.yaml => osx_arm64_python3.13.____cp313.yaml} (78%) diff --git a/.azure-pipelines/azure-pipelines-linux.yml b/.azure-pipelines/azure-pipelines-linux.yml index e422e31..b866620 100755 --- a/.azure-pipelines/azure-pipelines-linux.yml +++ b/.azure-pipelines/azure-pipelines-linux.yml @@ -20,12 +20,8 @@ jobs: CONFIG: linux_64_python3.12.____cpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_64_python3.8.____cpython: - CONFIG: linux_64_python3.8.____cpython - UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_64_python3.9.____73_pypy: - CONFIG: linux_64_python3.9.____73_pypy + linux_64_python3.13.____cp313: + CONFIG: linux_64_python3.13.____cp313 UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 linux_64_python3.9.____cpython: @@ -44,12 +40,8 @@ jobs: CONFIG: linux_aarch64_python3.12.____cpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_aarch64_python3.8.____cpython: - CONFIG: linux_aarch64_python3.8.____cpython - UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_aarch64_python3.9.____73_pypy: - CONFIG: linux_aarch64_python3.9.____73_pypy + linux_aarch64_python3.13.____cp313: + CONFIG: linux_aarch64_python3.13.____cp313 UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 linux_aarch64_python3.9.____cpython: @@ -68,12 +60,8 @@ jobs: CONFIG: linux_ppc64le_python3.12.____cpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_ppc64le_python3.8.____cpython: - CONFIG: linux_ppc64le_python3.8.____cpython - UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_ppc64le_python3.9.____73_pypy: - CONFIG: linux_ppc64le_python3.9.____73_pypy + linux_ppc64le_python3.13.____cp313: + CONFIG: linux_ppc64le_python3.13.____cp313 UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 linux_ppc64le_python3.9.____cpython: diff --git a/.azure-pipelines/azure-pipelines-osx.yml b/.azure-pipelines/azure-pipelines-osx.yml index 4141e1a..16c1bc2 100755 --- a/.azure-pipelines/azure-pipelines-osx.yml +++ b/.azure-pipelines/azure-pipelines-osx.yml @@ -17,11 +17,8 @@ jobs: osx_64_python3.12.____cpython: CONFIG: osx_64_python3.12.____cpython UPLOAD_PACKAGES: 'True' - osx_64_python3.8.____cpython: - CONFIG: osx_64_python3.8.____cpython - UPLOAD_PACKAGES: 'True' - osx_64_python3.9.____73_pypy: - CONFIG: osx_64_python3.9.____73_pypy + osx_64_python3.13.____cp313: + CONFIG: osx_64_python3.13.____cp313 UPLOAD_PACKAGES: 'True' osx_64_python3.9.____cpython: CONFIG: osx_64_python3.9.____cpython @@ -35,8 +32,8 @@ jobs: osx_arm64_python3.12.____cpython: CONFIG: osx_arm64_python3.12.____cpython UPLOAD_PACKAGES: 'True' - osx_arm64_python3.8.____cpython: - CONFIG: osx_arm64_python3.8.____cpython + osx_arm64_python3.13.____cp313: + CONFIG: osx_arm64_python3.13.____cp313 UPLOAD_PACKAGES: 'True' osx_arm64_python3.9.____cpython: CONFIG: osx_arm64_python3.9.____cpython diff --git a/.ci_support/linux_64_python3.10.____cpython.yaml b/.ci_support/linux_64_python3.10.____cpython.yaml index 44f7162..0db5417 100644 --- a/.ci_support/linux_64_python3.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: @@ -27,3 +27,5 @@ target_platform: zip_keys: - - c_stdlib_version - cdt_name +- - python + - channel_sources diff --git a/.ci_support/linux_64_python3.11.____cpython.yaml b/.ci_support/linux_64_python3.11.____cpython.yaml index 229ac03..204413b 100644 --- a/.ci_support/linux_64_python3.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: @@ -27,3 +27,5 @@ target_platform: zip_keys: - - c_stdlib_version - cdt_name +- - python + - channel_sources diff --git a/.ci_support/linux_64_python3.12.____cpython.yaml b/.ci_support/linux_64_python3.12.____cpython.yaml index 0a573cc..908ec48 100644 --- a/.ci_support/linux_64_python3.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: @@ -27,3 +27,5 @@ target_platform: zip_keys: - - c_stdlib_version - cdt_name +- - python + - channel_sources diff --git a/.ci_support/linux_64_python3.8.____cpython.yaml b/.ci_support/linux_64_python3.13.____cp313.yaml similarity index 79% rename from .ci_support/linux_64_python3.8.____cpython.yaml rename to .ci_support/linux_64_python3.13.____cp313.yaml index 1217d77..80cb5b2 100644 --- a/.ci_support/linux_64_python3.8.____cpython.yaml +++ b/.ci_support/linux_64_python3.13.____cp313.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 +- conda-forge/label/python_rc,conda-forge channel_targets: - conda-forge main docker_image: @@ -21,9 +21,11 @@ pin_run_as_build: min_pin: x.x max_pin: x.x python: -- 3.8.* *_cpython +- 3.13.* *_cp313 target_platform: - linux-64 zip_keys: - - c_stdlib_version - cdt_name +- - python + - channel_sources diff --git a/.ci_support/linux_64_python3.9.____73_pypy.yaml b/.ci_support/linux_64_python3.9.____73_pypy.yaml deleted file mode 100644 index 09684c5..0000000 --- a/.ci_support/linux_64_python3.9.____73_pypy.yaml +++ /dev/null @@ -1,29 +0,0 @@ -c_compiler: -- gcc -c_compiler_version: -- '12' -c_stdlib: -- sysroot -c_stdlib_version: -- '2.17' -cdt_name: -- cos7 -channel_sources: -- conda-forge -channel_targets: -- conda-forge main -docker_image: -- quay.io/condaforge/linux-anvil-cos7-x86_64 -libblas: -- 3.9 *netlib -pin_run_as_build: - python: - min_pin: x.x - max_pin: x.x -python: -- 3.9.* *_73_pypy -target_platform: -- linux-64 -zip_keys: -- - c_stdlib_version - - cdt_name diff --git a/.ci_support/linux_64_python3.9.____cpython.yaml b/.ci_support/linux_64_python3.9.____cpython.yaml index ea57149..f42efcd 100644 --- a/.ci_support/linux_64_python3.9.____cpython.yaml +++ b/.ci_support/linux_64_python3.9.____cpython.yaml @@ -1,7 +1,7 @@ c_compiler: - gcc c_compiler_version: -- '12' +- '13' c_stdlib: - sysroot c_stdlib_version: @@ -27,3 +27,5 @@ target_platform: zip_keys: - - c_stdlib_version - cdt_name +- - python + - channel_sources diff --git a/.ci_support/linux_aarch64_python3.10.____cpython.yaml b/.ci_support/linux_aarch64_python3.10.____cpython.yaml index 69b6591..ec9e857 100644 --- a/.ci_support/linux_aarch64_python3.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: @@ -31,3 +31,5 @@ target_platform: zip_keys: - - c_stdlib_version - cdt_name +- - python + - channel_sources diff --git a/.ci_support/linux_aarch64_python3.11.____cpython.yaml b/.ci_support/linux_aarch64_python3.11.____cpython.yaml index 8667a12..211d035 100644 --- a/.ci_support/linux_aarch64_python3.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: @@ -31,3 +31,5 @@ target_platform: zip_keys: - - c_stdlib_version - cdt_name +- - python + - channel_sources diff --git a/.ci_support/linux_aarch64_python3.12.____cpython.yaml b/.ci_support/linux_aarch64_python3.12.____cpython.yaml index 0f1cfd8..ebeebd7 100644 --- a/.ci_support/linux_aarch64_python3.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: @@ -31,3 +31,5 @@ target_platform: zip_keys: - - c_stdlib_version - cdt_name +- - python + - channel_sources diff --git a/.ci_support/linux_aarch64_python3.8.____cpython.yaml b/.ci_support/linux_aarch64_python3.13.____cp313.yaml similarity index 82% rename from .ci_support/linux_aarch64_python3.8.____cpython.yaml rename to .ci_support/linux_aarch64_python3.13.____cp313.yaml index 01ef9e9..04b6c45 100644 --- a/.ci_support/linux_aarch64_python3.8.____cpython.yaml +++ b/.ci_support/linux_aarch64_python3.13.____cp313.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 +- conda-forge/label/python_rc,conda-forge channel_targets: - conda-forge main docker_image: @@ -25,9 +25,11 @@ pin_run_as_build: min_pin: x.x max_pin: x.x python: -- 3.8.* *_cpython +- 3.13.* *_cp313 target_platform: - linux-aarch64 zip_keys: - - c_stdlib_version - cdt_name +- - python + - channel_sources diff --git a/.ci_support/linux_aarch64_python3.9.____73_pypy.yaml b/.ci_support/linux_aarch64_python3.9.____73_pypy.yaml deleted file mode 100644 index 6f85150..0000000 --- a/.ci_support/linux_aarch64_python3.9.____73_pypy.yaml +++ /dev/null @@ -1,33 +0,0 @@ -BUILD: -- aarch64-conda_cos7-linux-gnu -c_compiler: -- gcc -c_compiler_version: -- '12' -c_stdlib: -- sysroot -c_stdlib_version: -- '2.17' -cdt_arch: -- aarch64 -cdt_name: -- cos7 -channel_sources: -- conda-forge -channel_targets: -- conda-forge main -docker_image: -- quay.io/condaforge/linux-anvil-cos7-x86_64 -libblas: -- 3.9 *netlib -pin_run_as_build: - python: - min_pin: x.x - max_pin: x.x -python: -- 3.9.* *_73_pypy -target_platform: -- linux-aarch64 -zip_keys: -- - c_stdlib_version - - cdt_name diff --git a/.ci_support/linux_aarch64_python3.9.____cpython.yaml b/.ci_support/linux_aarch64_python3.9.____cpython.yaml index b1889f8..b0a0502 100644 --- a/.ci_support/linux_aarch64_python3.9.____cpython.yaml +++ b/.ci_support/linux_aarch64_python3.9.____cpython.yaml @@ -3,7 +3,7 @@ BUILD: c_compiler: - gcc c_compiler_version: -- '12' +- '13' c_stdlib: - sysroot c_stdlib_version: @@ -31,3 +31,5 @@ target_platform: zip_keys: - - c_stdlib_version - cdt_name +- - python + - channel_sources diff --git a/.ci_support/linux_ppc64le_python3.10.____cpython.yaml b/.ci_support/linux_ppc64le_python3.10.____cpython.yaml index 76381a5..070a205 100644 --- a/.ci_support/linux_ppc64le_python3.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: @@ -27,3 +27,5 @@ target_platform: zip_keys: - - c_stdlib_version - cdt_name +- - python + - channel_sources diff --git a/.ci_support/linux_ppc64le_python3.11.____cpython.yaml b/.ci_support/linux_ppc64le_python3.11.____cpython.yaml index 84c080e..a9fe3e4 100644 --- a/.ci_support/linux_ppc64le_python3.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: @@ -27,3 +27,5 @@ target_platform: zip_keys: - - c_stdlib_version - cdt_name +- - python + - channel_sources diff --git a/.ci_support/linux_ppc64le_python3.12.____cpython.yaml b/.ci_support/linux_ppc64le_python3.12.____cpython.yaml index c02d083..17a5279 100644 --- a/.ci_support/linux_ppc64le_python3.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: @@ -27,3 +27,5 @@ target_platform: zip_keys: - - c_stdlib_version - cdt_name +- - python + - channel_sources diff --git a/.ci_support/linux_ppc64le_python3.8.____cpython.yaml b/.ci_support/linux_ppc64le_python3.13.____cp313.yaml similarity index 79% rename from .ci_support/linux_ppc64le_python3.8.____cpython.yaml rename to .ci_support/linux_ppc64le_python3.13.____cp313.yaml index 1ab2380..887e4f9 100644 --- a/.ci_support/linux_ppc64le_python3.8.____cpython.yaml +++ b/.ci_support/linux_ppc64le_python3.13.____cp313.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 +- conda-forge/label/python_rc,conda-forge channel_targets: - conda-forge main docker_image: @@ -21,9 +21,11 @@ pin_run_as_build: min_pin: x.x max_pin: x.x python: -- 3.8.* *_cpython +- 3.13.* *_cp313 target_platform: - linux-ppc64le zip_keys: - - c_stdlib_version - cdt_name +- - python + - channel_sources diff --git a/.ci_support/linux_ppc64le_python3.9.____73_pypy.yaml b/.ci_support/linux_ppc64le_python3.9.____73_pypy.yaml deleted file mode 100644 index c2b8485..0000000 --- a/.ci_support/linux_ppc64le_python3.9.____73_pypy.yaml +++ /dev/null @@ -1,29 +0,0 @@ -c_compiler: -- gcc -c_compiler_version: -- '12' -c_stdlib: -- sysroot -c_stdlib_version: -- '2.17' -cdt_name: -- cos7 -channel_sources: -- conda-forge -channel_targets: -- conda-forge main -docker_image: -- quay.io/condaforge/linux-anvil-cos7-x86_64 -libblas: -- 3.9 *netlib -pin_run_as_build: - python: - min_pin: x.x - max_pin: x.x -python: -- 3.9.* *_73_pypy -target_platform: -- linux-ppc64le -zip_keys: -- - c_stdlib_version - - cdt_name diff --git a/.ci_support/linux_ppc64le_python3.9.____cpython.yaml b/.ci_support/linux_ppc64le_python3.9.____cpython.yaml index c21bfc0..65f7941 100644 --- a/.ci_support/linux_ppc64le_python3.9.____cpython.yaml +++ b/.ci_support/linux_ppc64le_python3.9.____cpython.yaml @@ -1,7 +1,7 @@ c_compiler: - gcc c_compiler_version: -- '12' +- '13' c_stdlib: - sysroot c_stdlib_version: @@ -27,3 +27,5 @@ target_platform: zip_keys: - - c_stdlib_version - cdt_name +- - python + - channel_sources diff --git a/.ci_support/migrations/pypy38.yaml b/.ci_support/migrations/pypy38.yaml deleted file mode 100644 index 7313853..0000000 --- a/.ci_support/migrations/pypy38.yaml +++ /dev/null @@ -1,43 +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.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.8 and 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.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.21 # [not (osx and arm64)] - - 1.21 # [not (osx and arm64)] -python_impl: - - pypy # [not (osx and arm64)] - - pypy # [not (osx and arm64)] diff --git a/.ci_support/osx_64_python3.10.____cpython.yaml b/.ci_support/osx_64_python3.10.____cpython.yaml index 15364c6..2049aeb 100644 --- a/.ci_support/osx_64_python3.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: @@ -26,3 +26,6 @@ python: - 3.10.* *_cpython target_platform: - osx-64 +zip_keys: +- - python + - channel_sources diff --git a/.ci_support/osx_64_python3.11.____cpython.yaml b/.ci_support/osx_64_python3.11.____cpython.yaml index 38ce3a0..af70888 100644 --- a/.ci_support/osx_64_python3.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: @@ -26,3 +26,6 @@ python: - 3.11.* *_cpython target_platform: - osx-64 +zip_keys: +- - python + - channel_sources diff --git a/.ci_support/osx_64_python3.12.____cpython.yaml b/.ci_support/osx_64_python3.12.____cpython.yaml index 8853ec5..0462f84 100644 --- a/.ci_support/osx_64_python3.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: @@ -26,3 +26,6 @@ python: - 3.12.* *_cpython target_platform: - osx-64 +zip_keys: +- - python + - channel_sources diff --git a/.ci_support/osx_64_python3.8.____cpython.yaml b/.ci_support/osx_64_python3.13.____cp313.yaml similarity index 78% rename from .ci_support/osx_64_python3.8.____cpython.yaml rename to .ci_support/osx_64_python3.13.____cp313.yaml index d4a8e13..122ad7c 100644 --- a/.ci_support/osx_64_python3.8.____cpython.yaml +++ b/.ci_support/osx_64_python3.13.____cp313.yaml @@ -5,13 +5,13 @@ 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 libblas: @@ -23,6 +23,9 @@ pin_run_as_build: min_pin: x.x max_pin: x.x python: -- 3.8.* *_cpython +- 3.13.* *_cp313 target_platform: - osx-64 +zip_keys: +- - python + - channel_sources diff --git a/.ci_support/osx_64_python3.9.____73_pypy.yaml b/.ci_support/osx_64_python3.9.____73_pypy.yaml deleted file mode 100644 index 5f88fa2..0000000 --- a/.ci_support/osx_64_python3.9.____73_pypy.yaml +++ /dev/null @@ -1,28 +0,0 @@ -MACOSX_DEPLOYMENT_TARGET: -- '10.13' -MACOSX_SDK_VERSION: -- '10.13' -c_compiler: -- clang -c_compiler_version: -- '16' -c_stdlib: -- macosx_deployment_target -c_stdlib_version: -- '10.13' -channel_sources: -- conda-forge -channel_targets: -- conda-forge main -libblas: -- 3.9 *netlib -macos_machine: -- x86_64-apple-darwin13.4.0 -pin_run_as_build: - python: - min_pin: x.x - max_pin: x.x -python: -- 3.9.* *_73_pypy -target_platform: -- osx-64 diff --git a/.ci_support/osx_64_python3.9.____cpython.yaml b/.ci_support/osx_64_python3.9.____cpython.yaml index bbe30ef..ed5f82a 100644 --- a/.ci_support/osx_64_python3.9.____cpython.yaml +++ b/.ci_support/osx_64_python3.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: @@ -26,3 +26,6 @@ python: - 3.9.* *_cpython target_platform: - osx-64 +zip_keys: +- - python + - channel_sources diff --git a/.ci_support/osx_arm64_python3.10.____cpython.yaml b/.ci_support/osx_arm64_python3.10.____cpython.yaml index ee5079c..1e4650f 100644 --- a/.ci_support/osx_arm64_python3.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: @@ -26,3 +26,6 @@ python: - 3.10.* *_cpython target_platform: - osx-arm64 +zip_keys: +- - python + - channel_sources diff --git a/.ci_support/osx_arm64_python3.11.____cpython.yaml b/.ci_support/osx_arm64_python3.11.____cpython.yaml index 8c44b98..206ee9d 100644 --- a/.ci_support/osx_arm64_python3.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: @@ -26,3 +26,6 @@ python: - 3.11.* *_cpython target_platform: - osx-arm64 +zip_keys: +- - python + - channel_sources diff --git a/.ci_support/osx_arm64_python3.12.____cpython.yaml b/.ci_support/osx_arm64_python3.12.____cpython.yaml index 38ee413..74e3c32 100644 --- a/.ci_support/osx_arm64_python3.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: @@ -26,3 +26,6 @@ python: - 3.12.* *_cpython target_platform: - osx-arm64 +zip_keys: +- - python + - channel_sources diff --git a/.ci_support/osx_arm64_python3.8.____cpython.yaml b/.ci_support/osx_arm64_python3.13.____cp313.yaml similarity index 78% rename from .ci_support/osx_arm64_python3.8.____cpython.yaml rename to .ci_support/osx_arm64_python3.13.____cp313.yaml index a762ec3..be73d64 100644 --- a/.ci_support/osx_arm64_python3.8.____cpython.yaml +++ b/.ci_support/osx_arm64_python3.13.____cp313.yaml @@ -5,13 +5,13 @@ 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 libblas: @@ -23,6 +23,9 @@ pin_run_as_build: min_pin: x.x max_pin: x.x python: -- 3.8.* *_cpython +- 3.13.* *_cp313 target_platform: - osx-arm64 +zip_keys: +- - python + - channel_sources diff --git a/.ci_support/osx_arm64_python3.9.____cpython.yaml b/.ci_support/osx_arm64_python3.9.____cpython.yaml index 2e2ad46..86ffd05 100644 --- a/.ci_support/osx_arm64_python3.9.____cpython.yaml +++ b/.ci_support/osx_arm64_python3.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: @@ -26,3 +26,6 @@ python: - 3.9.* *_cpython target_platform: - osx-arm64 +zip_keys: +- - python + - channel_sources diff --git a/.scripts/run_osx_build.sh b/.scripts/run_osx_build.sh index ba0c879..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} diff --git a/README.md b/README.md index 67043d0..a9ff8f4 100644 --- a/README.md +++ b/README.md @@ -48,17 +48,10 @@ Current build status - linux_64_python3.8.____cpython + linux_64_python3.13.____cp313 - variant - - - - linux_64_python3.9.____73_pypy - - - variant + variant @@ -90,17 +83,10 @@ Current build status - linux_aarch64_python3.8.____cpython - - - variant - - - - linux_aarch64_python3.9.____73_pypy + linux_aarch64_python3.13.____cp313 - variant + variant @@ -132,17 +118,10 @@ Current build status - linux_ppc64le_python3.8.____cpython + linux_ppc64le_python3.13.____cp313 - variant - - - - linux_ppc64le_python3.9.____73_pypy - - - variant + variant @@ -174,17 +153,10 @@ Current build status - osx_64_python3.8.____cpython - - - variant - - - - osx_64_python3.9.____73_pypy + osx_64_python3.13.____cp313 - variant + variant @@ -216,10 +188,10 @@ Current build status - osx_arm64_python3.8.____cpython + osx_arm64_python3.13.____cp313 - variant + 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):