From 5bf371da4ec72f700d346f0ad2d46ffdf09a7087 Mon Sep 17 00:00:00 2001 From: regro-cf-autotick-bot <36490558+regro-cf-autotick-bot@users.noreply.github.com> Date: Sat, 31 Aug 2024 15:03:33 +0000 Subject: [PATCH] MNT: Re-rendered with conda-build 24.7.1, conda-smithy 3.39.0, and conda-forge-pinning 2024.08.31.07.28.13 --- .azure-pipelines/azure-pipelines-linux.yml | 20 ++--- .azure-pipelines/azure-pipelines-osx.yml | 35 ++++---- .azure-pipelines/azure-pipelines-win.yml | 21 ++--- ...2python3.9.____73_pypypython_implpypy.yaml | 38 --------- ...l => linux_64_python3.10.____cpython.yaml} | 2 +- ...l => linux_64_python3.11.____cpython.yaml} | 2 +- ...l => linux_64_python3.12.____cpython.yaml} | 2 +- ...ml => linux_64_python3.9.____cpython.yaml} | 2 +- .ci_support/migrations/pypy38.yaml | 53 ------------ ...2python3.9.____73_pypypython_implpypy.yaml | 38 --------- ...aml => osx_64_python3.10.____cpython.yaml} | 2 +- ...aml => osx_64_python3.11.____cpython.yaml} | 2 +- ...aml => osx_64_python3.12.____cpython.yaml} | 2 +- ...yaml => osx_64_python3.9.____cpython.yaml} | 2 +- ... => osx_arm64_python3.10.____cpython.yaml} | 2 +- ... => osx_arm64_python3.11.____cpython.yaml} | 2 +- ... => osx_arm64_python3.12.____cpython.yaml} | 2 +- ...l => osx_arm64_python3.9.____cpython.yaml} | 2 +- ...2python3.9.____73_pypypython_implpypy.yaml | 28 ------ ...aml => win_64_python3.10.____cpython.yaml} | 0 ...aml => win_64_python3.11.____cpython.yaml} | 0 ...aml => win_64_python3.12.____cpython.yaml} | 0 ...yaml => win_64_python3.9.____cpython.yaml} | 0 .scripts/build_steps.sh | 1 - .scripts/run_osx_build.sh | 2 +- README.md | 85 +++++++------------ build-locally.py | 4 +- 27 files changed, 80 insertions(+), 269 deletions(-) delete mode 100644 .ci_support/linux_64_numpy1.22python3.9.____73_pypypython_implpypy.yaml rename .ci_support/{linux_64_numpy2.0python3.10.____cpythonpython_implcpython.yaml => linux_64_python3.10.____cpython.yaml} (98%) rename .ci_support/{linux_64_numpy2.0python3.11.____cpythonpython_implcpython.yaml => linux_64_python3.11.____cpython.yaml} (98%) rename .ci_support/{linux_64_numpy2.0python3.12.____cpythonpython_implcpython.yaml => linux_64_python3.12.____cpython.yaml} (98%) rename .ci_support/{linux_64_numpy2.0python3.9.____cpythonpython_implcpython.yaml => linux_64_python3.9.____cpython.yaml} (98%) delete mode 100644 .ci_support/migrations/pypy38.yaml delete mode 100644 .ci_support/osx_64_numpy1.22python3.9.____73_pypypython_implpypy.yaml rename .ci_support/{osx_64_numpy2.0python3.10.____cpythonpython_implcpython.yaml => osx_64_python3.10.____cpython.yaml} (98%) rename .ci_support/{osx_64_numpy2.0python3.11.____cpythonpython_implcpython.yaml => osx_64_python3.11.____cpython.yaml} (98%) rename .ci_support/{osx_64_numpy2.0python3.12.____cpythonpython_implcpython.yaml => osx_64_python3.12.____cpython.yaml} (98%) rename .ci_support/{osx_64_numpy2.0python3.9.____cpythonpython_implcpython.yaml => osx_64_python3.9.____cpython.yaml} (98%) rename .ci_support/{osx_arm64_numpy2.0python3.10.____cpython.yaml => osx_arm64_python3.10.____cpython.yaml} (98%) rename .ci_support/{osx_arm64_numpy2.0python3.11.____cpython.yaml => osx_arm64_python3.11.____cpython.yaml} (98%) rename .ci_support/{osx_arm64_numpy2.0python3.12.____cpython.yaml => osx_arm64_python3.12.____cpython.yaml} (98%) rename .ci_support/{osx_arm64_numpy2.0python3.9.____cpython.yaml => osx_arm64_python3.9.____cpython.yaml} (98%) delete mode 100644 .ci_support/win_64_numpy1.22python3.9.____73_pypypython_implpypy.yaml rename .ci_support/{win_64_numpy2.0python3.10.____cpythonpython_implcpython.yaml => win_64_python3.10.____cpython.yaml} (100%) rename .ci_support/{win_64_numpy2.0python3.11.____cpythonpython_implcpython.yaml => win_64_python3.11.____cpython.yaml} (100%) rename .ci_support/{win_64_numpy2.0python3.12.____cpythonpython_implcpython.yaml => win_64_python3.12.____cpython.yaml} (100%) rename .ci_support/{win_64_numpy2.0python3.9.____cpythonpython_implcpython.yaml => win_64_python3.9.____cpython.yaml} (100%) diff --git a/.azure-pipelines/azure-pipelines-linux.yml b/.azure-pipelines/azure-pipelines-linux.yml index cae75d5..3db01d7 100755 --- a/.azure-pipelines/azure-pipelines-linux.yml +++ b/.azure-pipelines/azure-pipelines-linux.yml @@ -8,24 +8,20 @@ jobs: vmImage: ubuntu-latest strategy: matrix: - linux_64_numpy1.22python3.9.____73_pypypython_implpypy: - CONFIG: linux_64_numpy1.22python3.9.____73_pypypython_implpypy + linux_64_python3.10.____cpython: + CONFIG: linux_64_python3.10.____cpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_64_numpy2.0python3.10.____cpythonpython_implcpython: - CONFIG: linux_64_numpy2.0python3.10.____cpythonpython_implcpython + linux_64_python3.11.____cpython: + CONFIG: linux_64_python3.11.____cpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_64_numpy2.0python3.11.____cpythonpython_implcpython: - CONFIG: linux_64_numpy2.0python3.11.____cpythonpython_implcpython + linux_64_python3.12.____cpython: + CONFIG: linux_64_python3.12.____cpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_64_numpy2.0python3.12.____cpythonpython_implcpython: - CONFIG: linux_64_numpy2.0python3.12.____cpythonpython_implcpython - 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_python3.9.____cpython: + CONFIG: linux_64_python3.9.____cpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 timeoutInMinutes: 360 diff --git a/.azure-pipelines/azure-pipelines-osx.yml b/.azure-pipelines/azure-pipelines-osx.yml index f6fad21..49fe09a 100755 --- a/.azure-pipelines/azure-pipelines-osx.yml +++ b/.azure-pipelines/azure-pipelines-osx.yml @@ -8,32 +8,29 @@ jobs: vmImage: macOS-12 strategy: matrix: - osx_64_numpy1.22python3.9.____73_pypypython_implpypy: - CONFIG: osx_64_numpy1.22python3.9.____73_pypypython_implpypy + osx_64_python3.10.____cpython: + CONFIG: osx_64_python3.10.____cpython UPLOAD_PACKAGES: 'True' - osx_64_numpy2.0python3.10.____cpythonpython_implcpython: - CONFIG: osx_64_numpy2.0python3.10.____cpythonpython_implcpython + osx_64_python3.11.____cpython: + CONFIG: osx_64_python3.11.____cpython UPLOAD_PACKAGES: 'True' - osx_64_numpy2.0python3.11.____cpythonpython_implcpython: - CONFIG: osx_64_numpy2.0python3.11.____cpythonpython_implcpython + osx_64_python3.12.____cpython: + CONFIG: osx_64_python3.12.____cpython UPLOAD_PACKAGES: 'True' - osx_64_numpy2.0python3.12.____cpythonpython_implcpython: - CONFIG: osx_64_numpy2.0python3.12.____cpythonpython_implcpython + osx_64_python3.9.____cpython: + CONFIG: osx_64_python3.9.____cpython UPLOAD_PACKAGES: 'True' - osx_64_numpy2.0python3.9.____cpythonpython_implcpython: - CONFIG: osx_64_numpy2.0python3.9.____cpythonpython_implcpython + osx_arm64_python3.10.____cpython: + CONFIG: osx_arm64_python3.10.____cpython UPLOAD_PACKAGES: 'True' - osx_arm64_numpy2.0python3.10.____cpython: - CONFIG: osx_arm64_numpy2.0python3.10.____cpython + osx_arm64_python3.11.____cpython: + CONFIG: osx_arm64_python3.11.____cpython UPLOAD_PACKAGES: 'True' - osx_arm64_numpy2.0python3.11.____cpython: - CONFIG: osx_arm64_numpy2.0python3.11.____cpython + osx_arm64_python3.12.____cpython: + CONFIG: osx_arm64_python3.12.____cpython UPLOAD_PACKAGES: 'True' - osx_arm64_numpy2.0python3.12.____cpython: - CONFIG: osx_arm64_numpy2.0python3.12.____cpython - UPLOAD_PACKAGES: 'True' - osx_arm64_numpy2.0python3.9.____cpython: - CONFIG: osx_arm64_numpy2.0python3.9.____cpython + osx_arm64_python3.9.____cpython: + CONFIG: osx_arm64_python3.9.____cpython UPLOAD_PACKAGES: 'True' timeoutInMinutes: 360 variables: {} diff --git a/.azure-pipelines/azure-pipelines-win.yml b/.azure-pipelines/azure-pipelines-win.yml index 918cda1..fa9734f 100755 --- a/.azure-pipelines/azure-pipelines-win.yml +++ b/.azure-pipelines/azure-pipelines-win.yml @@ -8,20 +8,17 @@ jobs: vmImage: windows-2022 strategy: matrix: - win_64_numpy1.22python3.9.____73_pypypython_implpypy: - CONFIG: win_64_numpy1.22python3.9.____73_pypypython_implpypy + win_64_python3.10.____cpython: + CONFIG: win_64_python3.10.____cpython UPLOAD_PACKAGES: 'True' - win_64_numpy2.0python3.10.____cpythonpython_implcpython: - CONFIG: win_64_numpy2.0python3.10.____cpythonpython_implcpython + win_64_python3.11.____cpython: + CONFIG: win_64_python3.11.____cpython UPLOAD_PACKAGES: 'True' - win_64_numpy2.0python3.11.____cpythonpython_implcpython: - CONFIG: win_64_numpy2.0python3.11.____cpythonpython_implcpython + win_64_python3.12.____cpython: + CONFIG: win_64_python3.12.____cpython UPLOAD_PACKAGES: 'True' - win_64_numpy2.0python3.12.____cpythonpython_implcpython: - CONFIG: win_64_numpy2.0python3.12.____cpythonpython_implcpython - UPLOAD_PACKAGES: 'True' - win_64_numpy2.0python3.9.____cpythonpython_implcpython: - CONFIG: win_64_numpy2.0python3.9.____cpythonpython_implcpython + win_64_python3.9.____cpython: + CONFIG: win_64_python3.9.____cpython UPLOAD_PACKAGES: 'True' timeoutInMinutes: 360 variables: @@ -36,7 +33,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_numpy1.22python3.9.____73_pypypython_implpypy.yaml b/.ci_support/linux_64_numpy1.22python3.9.____73_pypypython_implpypy.yaml deleted file mode 100644 index 3fa9895..0000000 --- a/.ci_support/linux_64_numpy1.22python3.9.____73_pypypython_implpypy.yaml +++ /dev/null @@ -1,38 +0,0 @@ -c_stdlib: -- sysroot -c_stdlib_version: -- '2.17' -cdt_name: -- cos7 -channel_sources: -- conda-forge -channel_targets: -- conda-forge main -cxx_compiler: -- gxx -cxx_compiler_version: -- '12' -docker_image: -- quay.io/condaforge/linux-anvil-cos7-x86_64 -numpy: -- '1.22' -pin_run_as_build: - python: - min_pin: x.x - max_pin: x.x -python: -- 3.9.* *_73_pypy -python_impl: -- pypy -qhull: -- '2020.2' -target_platform: -- linux-64 -zip_keys: -- - c_stdlib_version - - cdt_name -- - python - - numpy - - python_impl -zlib: -- '1' diff --git a/.ci_support/linux_64_numpy2.0python3.10.____cpythonpython_implcpython.yaml b/.ci_support/linux_64_python3.10.____cpython.yaml similarity index 98% rename from .ci_support/linux_64_numpy2.0python3.10.____cpythonpython_implcpython.yaml rename to .ci_support/linux_64_python3.10.____cpython.yaml index 9b8f669..0ced897 100644 --- a/.ci_support/linux_64_numpy2.0python3.10.____cpythonpython_implcpython.yaml +++ b/.ci_support/linux_64_python3.10.____cpython.yaml @@ -11,7 +11,7 @@ channel_targets: cxx_compiler: - gxx cxx_compiler_version: -- '12' +- '13' docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 numpy: diff --git a/.ci_support/linux_64_numpy2.0python3.11.____cpythonpython_implcpython.yaml b/.ci_support/linux_64_python3.11.____cpython.yaml similarity index 98% rename from .ci_support/linux_64_numpy2.0python3.11.____cpythonpython_implcpython.yaml rename to .ci_support/linux_64_python3.11.____cpython.yaml index 8ce74dc..9b4e25a 100644 --- a/.ci_support/linux_64_numpy2.0python3.11.____cpythonpython_implcpython.yaml +++ b/.ci_support/linux_64_python3.11.____cpython.yaml @@ -11,7 +11,7 @@ channel_targets: cxx_compiler: - gxx cxx_compiler_version: -- '12' +- '13' docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 numpy: diff --git a/.ci_support/linux_64_numpy2.0python3.12.____cpythonpython_implcpython.yaml b/.ci_support/linux_64_python3.12.____cpython.yaml similarity index 98% rename from .ci_support/linux_64_numpy2.0python3.12.____cpythonpython_implcpython.yaml rename to .ci_support/linux_64_python3.12.____cpython.yaml index da73601..2d2872c 100644 --- a/.ci_support/linux_64_numpy2.0python3.12.____cpythonpython_implcpython.yaml +++ b/.ci_support/linux_64_python3.12.____cpython.yaml @@ -11,7 +11,7 @@ channel_targets: cxx_compiler: - gxx cxx_compiler_version: -- '12' +- '13' docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 numpy: diff --git a/.ci_support/linux_64_numpy2.0python3.9.____cpythonpython_implcpython.yaml b/.ci_support/linux_64_python3.9.____cpython.yaml similarity index 98% rename from .ci_support/linux_64_numpy2.0python3.9.____cpythonpython_implcpython.yaml rename to .ci_support/linux_64_python3.9.____cpython.yaml index 6fb5b03..98cf8d9 100644 --- a/.ci_support/linux_64_numpy2.0python3.9.____cpythonpython_implcpython.yaml +++ b/.ci_support/linux_64_python3.9.____cpython.yaml @@ -11,7 +11,7 @@ channel_targets: cxx_compiler: - gxx cxx_compiler_version: -- '12' +- '13' docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 numpy: diff --git a/.ci_support/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_numpy1.22python3.9.____73_pypypython_implpypy.yaml b/.ci_support/osx_64_numpy1.22python3.9.____73_pypypython_implpypy.yaml deleted file mode 100644 index cecf329..0000000 --- a/.ci_support/osx_64_numpy1.22python3.9.____73_pypypython_implpypy.yaml +++ /dev/null @@ -1,38 +0,0 @@ -MACOSX_DEPLOYMENT_TARGET: -- '10.13' -MACOSX_SDK_VERSION: -- '10.13' -c_stdlib: -- macosx_deployment_target -c_stdlib_version: -- '10.13' -channel_sources: -- conda-forge -channel_targets: -- conda-forge main -cxx_compiler: -- clangxx -cxx_compiler_version: -- '16' -macos_machine: -- x86_64-apple-darwin13.4.0 -numpy: -- '1.22' -pin_run_as_build: - python: - min_pin: x.x - max_pin: x.x -python: -- 3.9.* *_73_pypy -python_impl: -- pypy -qhull: -- '2020.2' -target_platform: -- osx-64 -zip_keys: -- - python - - numpy - - python_impl -zlib: -- '1' diff --git a/.ci_support/osx_64_numpy2.0python3.10.____cpythonpython_implcpython.yaml b/.ci_support/osx_64_python3.10.____cpython.yaml similarity index 98% rename from .ci_support/osx_64_numpy2.0python3.10.____cpythonpython_implcpython.yaml rename to .ci_support/osx_64_python3.10.____cpython.yaml index 02289f6..0d46850 100644 --- a/.ci_support/osx_64_numpy2.0python3.10.____cpythonpython_implcpython.yaml +++ b/.ci_support/osx_64_python3.10.____cpython.yaml @@ -13,7 +13,7 @@ channel_targets: cxx_compiler: - clangxx cxx_compiler_version: -- '16' +- '17' macos_machine: - x86_64-apple-darwin13.4.0 numpy: diff --git a/.ci_support/osx_64_numpy2.0python3.11.____cpythonpython_implcpython.yaml b/.ci_support/osx_64_python3.11.____cpython.yaml similarity index 98% rename from .ci_support/osx_64_numpy2.0python3.11.____cpythonpython_implcpython.yaml rename to .ci_support/osx_64_python3.11.____cpython.yaml index 089ba81..ef45d7e 100644 --- a/.ci_support/osx_64_numpy2.0python3.11.____cpythonpython_implcpython.yaml +++ b/.ci_support/osx_64_python3.11.____cpython.yaml @@ -13,7 +13,7 @@ channel_targets: cxx_compiler: - clangxx cxx_compiler_version: -- '16' +- '17' macos_machine: - x86_64-apple-darwin13.4.0 numpy: diff --git a/.ci_support/osx_64_numpy2.0python3.12.____cpythonpython_implcpython.yaml b/.ci_support/osx_64_python3.12.____cpython.yaml similarity index 98% rename from .ci_support/osx_64_numpy2.0python3.12.____cpythonpython_implcpython.yaml rename to .ci_support/osx_64_python3.12.____cpython.yaml index 6e24c03..660e43f 100644 --- a/.ci_support/osx_64_numpy2.0python3.12.____cpythonpython_implcpython.yaml +++ b/.ci_support/osx_64_python3.12.____cpython.yaml @@ -13,7 +13,7 @@ channel_targets: cxx_compiler: - clangxx cxx_compiler_version: -- '16' +- '17' macos_machine: - x86_64-apple-darwin13.4.0 numpy: diff --git a/.ci_support/osx_64_numpy2.0python3.9.____cpythonpython_implcpython.yaml b/.ci_support/osx_64_python3.9.____cpython.yaml similarity index 98% rename from .ci_support/osx_64_numpy2.0python3.9.____cpythonpython_implcpython.yaml rename to .ci_support/osx_64_python3.9.____cpython.yaml index fc13e8b..1858d6f 100644 --- a/.ci_support/osx_64_numpy2.0python3.9.____cpythonpython_implcpython.yaml +++ b/.ci_support/osx_64_python3.9.____cpython.yaml @@ -13,7 +13,7 @@ channel_targets: cxx_compiler: - clangxx cxx_compiler_version: -- '16' +- '17' macos_machine: - x86_64-apple-darwin13.4.0 numpy: diff --git a/.ci_support/osx_arm64_numpy2.0python3.10.____cpython.yaml b/.ci_support/osx_arm64_python3.10.____cpython.yaml similarity index 98% rename from .ci_support/osx_arm64_numpy2.0python3.10.____cpython.yaml rename to .ci_support/osx_arm64_python3.10.____cpython.yaml index b7a9cb9..f7550e8 100644 --- a/.ci_support/osx_arm64_numpy2.0python3.10.____cpython.yaml +++ b/.ci_support/osx_arm64_python3.10.____cpython.yaml @@ -13,7 +13,7 @@ channel_targets: cxx_compiler: - clangxx cxx_compiler_version: -- '16' +- '17' macos_machine: - arm64-apple-darwin20.0.0 numpy: diff --git a/.ci_support/osx_arm64_numpy2.0python3.11.____cpython.yaml b/.ci_support/osx_arm64_python3.11.____cpython.yaml similarity index 98% rename from .ci_support/osx_arm64_numpy2.0python3.11.____cpython.yaml rename to .ci_support/osx_arm64_python3.11.____cpython.yaml index c49f816..464892d 100644 --- a/.ci_support/osx_arm64_numpy2.0python3.11.____cpython.yaml +++ b/.ci_support/osx_arm64_python3.11.____cpython.yaml @@ -13,7 +13,7 @@ channel_targets: cxx_compiler: - clangxx cxx_compiler_version: -- '16' +- '17' macos_machine: - arm64-apple-darwin20.0.0 numpy: diff --git a/.ci_support/osx_arm64_numpy2.0python3.12.____cpython.yaml b/.ci_support/osx_arm64_python3.12.____cpython.yaml similarity index 98% rename from .ci_support/osx_arm64_numpy2.0python3.12.____cpython.yaml rename to .ci_support/osx_arm64_python3.12.____cpython.yaml index b50bddb..556cd2c 100644 --- a/.ci_support/osx_arm64_numpy2.0python3.12.____cpython.yaml +++ b/.ci_support/osx_arm64_python3.12.____cpython.yaml @@ -13,7 +13,7 @@ channel_targets: cxx_compiler: - clangxx cxx_compiler_version: -- '16' +- '17' macos_machine: - arm64-apple-darwin20.0.0 numpy: diff --git a/.ci_support/osx_arm64_numpy2.0python3.9.____cpython.yaml b/.ci_support/osx_arm64_python3.9.____cpython.yaml similarity index 98% rename from .ci_support/osx_arm64_numpy2.0python3.9.____cpython.yaml rename to .ci_support/osx_arm64_python3.9.____cpython.yaml index 2c93461..0f4ca03 100644 --- a/.ci_support/osx_arm64_numpy2.0python3.9.____cpython.yaml +++ b/.ci_support/osx_arm64_python3.9.____cpython.yaml @@ -13,7 +13,7 @@ channel_targets: cxx_compiler: - clangxx cxx_compiler_version: -- '16' +- '17' macos_machine: - arm64-apple-darwin20.0.0 numpy: diff --git a/.ci_support/win_64_numpy1.22python3.9.____73_pypypython_implpypy.yaml b/.ci_support/win_64_numpy1.22python3.9.____73_pypypython_implpypy.yaml deleted file mode 100644 index 67df78d..0000000 --- a/.ci_support/win_64_numpy1.22python3.9.____73_pypypython_implpypy.yaml +++ /dev/null @@ -1,28 +0,0 @@ -c_stdlib: -- vs -channel_sources: -- conda-forge -channel_targets: -- conda-forge main -cxx_compiler: -- vs2019 -numpy: -- '1.22' -pin_run_as_build: - python: - min_pin: x.x - max_pin: x.x -python: -- 3.9.* *_73_pypy -python_impl: -- pypy -qhull: -- '2020.2' -target_platform: -- win-64 -zip_keys: -- - python - - numpy - - python_impl -zlib: -- '1' diff --git a/.ci_support/win_64_numpy2.0python3.10.____cpythonpython_implcpython.yaml b/.ci_support/win_64_python3.10.____cpython.yaml similarity index 100% rename from .ci_support/win_64_numpy2.0python3.10.____cpythonpython_implcpython.yaml rename to .ci_support/win_64_python3.10.____cpython.yaml diff --git a/.ci_support/win_64_numpy2.0python3.11.____cpythonpython_implcpython.yaml b/.ci_support/win_64_python3.11.____cpython.yaml similarity index 100% rename from .ci_support/win_64_numpy2.0python3.11.____cpythonpython_implcpython.yaml rename to .ci_support/win_64_python3.11.____cpython.yaml diff --git a/.ci_support/win_64_numpy2.0python3.12.____cpythonpython_implcpython.yaml b/.ci_support/win_64_python3.12.____cpython.yaml similarity index 100% rename from .ci_support/win_64_numpy2.0python3.12.____cpythonpython_implcpython.yaml rename to .ci_support/win_64_python3.12.____cpython.yaml diff --git a/.ci_support/win_64_numpy2.0python3.9.____cpythonpython_implcpython.yaml b/.ci_support/win_64_python3.9.____cpython.yaml similarity index 100% rename from .ci_support/win_64_numpy2.0python3.9.____cpythonpython_implcpython.yaml rename to .ci_support/win_64_python3.9.____cpython.yaml diff --git a/.scripts/build_steps.sh b/.scripts/build_steps.sh index a5836e8..ba4b251 100755 --- a/.scripts/build_steps.sh +++ b/.scripts/build_steps.sh @@ -72,7 +72,6 @@ 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 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 dd7f9a6..b3939ee 100644 --- a/README.md +++ b/README.md @@ -39,136 +39,115 @@ Current build status
Variant | Status | |
---|---|---|
linux_64_numpy1.22python3.9.____73_pypypython_implpypy | +linux_64_python3.10.____cpython |
- |
linux_64_numpy2.0python3.10.____cpythonpython_implcpython | +linux_64_python3.11.____cpython |
- |
linux_64_numpy2.0python3.11.____cpythonpython_implcpython | +linux_64_python3.12.____cpython |
- |
linux_64_numpy2.0python3.12.____cpythonpython_implcpython | +linux_64_python3.9.____cpython |
- |
linux_64_numpy2.0python3.9.____cpythonpython_implcpython | +osx_64_python3.10.____cpython |
- |
osx_64_numpy1.22python3.9.____73_pypypython_implpypy | +osx_64_python3.11.____cpython |
- |
osx_64_numpy2.0python3.10.____cpythonpython_implcpython | +osx_64_python3.12.____cpython |
- |
osx_64_numpy2.0python3.11.____cpythonpython_implcpython | +osx_64_python3.9.____cpython |
- |
osx_64_numpy2.0python3.12.____cpythonpython_implcpython | +osx_arm64_python3.10.____cpython |
- |
osx_64_numpy2.0python3.9.____cpythonpython_implcpython | +osx_arm64_python3.11.____cpython |
- |
osx_arm64_numpy2.0python3.10.____cpython | +osx_arm64_python3.12.____cpython |
- |
osx_arm64_numpy2.0python3.11.____cpython | +osx_arm64_python3.9.____cpython |
- |
osx_arm64_numpy2.0python3.12.____cpython | +win_64_python3.10.____cpython |
- |
osx_arm64_numpy2.0python3.9.____cpython | +win_64_python3.11.____cpython |
- |
win_64_numpy1.22python3.9.____73_pypypython_implpypy | +win_64_python3.12.____cpython |
- |
win_64_numpy2.0python3.10.____cpythonpython_implcpython | +win_64_python3.9.____cpython |
- |
-
win_64_numpy2.0python3.11.____cpythonpython_implcpython | -
-
- |
- |
win_64_numpy2.0python3.12.____cpythonpython_implcpython | -
-
- |
- |
win_64_numpy2.0python3.9.____cpythonpython_implcpython | -
-
- |