From d25d78f9b1f71b6d63905cd0a781daf06e29d04e Mon Sep 17 00:00:00 2001 From: regro-cf-autotick-bot <36490558+regro-cf-autotick-bot@users.noreply.github.com> Date: Wed, 2 Oct 2024 16:43:49 +0000 Subject: [PATCH 1/4] Rebuild for libabseil 20240722, libgrp 1.65 & libprotobuf 5.27.5 --- ...abseil20240722_grpc165_libprotobuf5275.yaml | 18 ++++++++++++++++++ recipe/meta.yaml | 2 +- 2 files changed, 19 insertions(+), 1 deletion(-) create mode 100644 .ci_support/migrations/libabseil20240722_grpc165_libprotobuf5275.yaml diff --git a/.ci_support/migrations/libabseil20240722_grpc165_libprotobuf5275.yaml b/.ci_support/migrations/libabseil20240722_grpc165_libprotobuf5275.yaml new file mode 100644 index 0000000..85540a1 --- /dev/null +++ b/.ci_support/migrations/libabseil20240722_grpc165_libprotobuf5275.yaml @@ -0,0 +1,18 @@ +__migrator: + build_number: 1 + commit_message: Rebuild for libabseil 20240722, libgrp 1.65 & libprotobuf 5.27.5 + kind: version + migration_number: 1 + exclude: + - abseil-cpp + - grpc-cpp + - libprotobuf + - protobuf + - re2 +libabseil: +- 20240722 +libgrpc: +- "1.65" +libprotobuf: +- 5.27.5 +migrator_ts: 1727040240.8650293 diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 459edf0..6635fff 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -31,7 +31,7 @@ build: skip: true # [(aarch64 or ppc64le or osx) and python_impl == 'pypy'] # Workaround for https://github.com/conda-forge/mujoco-feedstock/pull/56#issuecomment-2230334963 skip: true # [py == 38] - number: 1 + number: 2 outputs: - name: {{ namecxx }} From 46cbba6aaf9c63d54e3f93e779041bc15fb84bf9 Mon Sep 17 00:00:00 2001 From: regro-cf-autotick-bot <36490558+regro-cf-autotick-bot@users.noreply.github.com> Date: Wed, 2 Oct 2024 16:45:16 +0000 Subject: [PATCH 2/4] MNT: Re-rendered with conda-build 24.9.0, conda-smithy 3.40.1, and conda-forge-pinning 2024.10.02.13.37.37 --- .azure-pipelines/azure-pipelines-linux.yml | 48 +++++- .azure-pipelines/azure-pipelines-osx.yml | 26 ++- .azure-pipelines/azure-pipelines-win.yml | 13 +- ...l => linux_64_python3.10.____cpython.yaml} | 11 +- .../linux_64_python3.11.____cpython.yaml | 48 ++++++ .../linux_64_python3.12.____cpython.yaml | 48 ++++++ .../linux_64_python3.9.____cpython.yaml | 48 ++++++ ...linux_aarch64_python3.10.____cpython.yaml} | 11 +- .../linux_aarch64_python3.11.____cpython.yaml | 52 ++++++ .../linux_aarch64_python3.12.____cpython.yaml | 52 ++++++ .../linux_aarch64_python3.9.____cpython.yaml | 52 ++++++ ...linux_ppc64le_python3.10.____cpython.yaml} | 11 +- .../linux_ppc64le_python3.11.____cpython.yaml | 48 ++++++ .../linux_ppc64le_python3.12.____cpython.yaml | 48 ++++++ .../linux_ppc64le_python3.9.____cpython.yaml | 48 ++++++ ...aml => osx_64_python3.10.____cpython.yaml} | 11 +- .../osx_64_python3.11.____cpython.yaml | 48 ++++++ .../osx_64_python3.12.____cpython.yaml | 48 ++++++ .ci_support/osx_64_python3.9.____cpython.yaml | 48 ++++++ ... => osx_arm64_python3.10.____cpython.yaml} | 11 +- .../osx_arm64_python3.11.____cpython.yaml | 48 ++++++ .../osx_arm64_python3.12.____cpython.yaml | 48 ++++++ .../osx_arm64_python3.9.____cpython.yaml | 48 ++++++ ...aml => win_64_python3.10.____cpython.yaml} | 11 +- .../win_64_python3.11.____cpython.yaml | 34 ++++ .../win_64_python3.12.____cpython.yaml | 34 ++++ .ci_support/win_64_python3.9.____cpython.yaml | 34 ++++ .scripts/build_steps.sh | 2 + .scripts/run_win_build.bat | 4 +- README.md | 150 ++++++++++++++++-- build-locally.py | 2 +- 31 files changed, 1058 insertions(+), 87 deletions(-) rename .ci_support/{linux_64_.yaml => linux_64_python3.10.____cpython.yaml} (83%) create mode 100644 .ci_support/linux_64_python3.11.____cpython.yaml create mode 100644 .ci_support/linux_64_python3.12.____cpython.yaml create mode 100644 .ci_support/linux_64_python3.9.____cpython.yaml rename .ci_support/{linux_aarch64_.yaml => linux_aarch64_python3.10.____cpython.yaml} (85%) create mode 100644 .ci_support/linux_aarch64_python3.11.____cpython.yaml create mode 100644 .ci_support/linux_aarch64_python3.12.____cpython.yaml create mode 100644 .ci_support/linux_aarch64_python3.9.____cpython.yaml rename .ci_support/{linux_ppc64le_.yaml => linux_ppc64le_python3.10.____cpython.yaml} (83%) create mode 100644 .ci_support/linux_ppc64le_python3.11.____cpython.yaml create mode 100644 .ci_support/linux_ppc64le_python3.12.____cpython.yaml create mode 100644 .ci_support/linux_ppc64le_python3.9.____cpython.yaml rename .ci_support/{osx_64_.yaml => osx_64_python3.10.____cpython.yaml} (84%) create mode 100644 .ci_support/osx_64_python3.11.____cpython.yaml create mode 100644 .ci_support/osx_64_python3.12.____cpython.yaml create mode 100644 .ci_support/osx_64_python3.9.____cpython.yaml rename .ci_support/{osx_arm64_.yaml => osx_arm64_python3.10.____cpython.yaml} (84%) create mode 100644 .ci_support/osx_arm64_python3.11.____cpython.yaml create mode 100644 .ci_support/osx_arm64_python3.12.____cpython.yaml create mode 100644 .ci_support/osx_arm64_python3.9.____cpython.yaml rename .ci_support/{win_64_.yaml => win_64_python3.10.____cpython.yaml} (76%) create mode 100644 .ci_support/win_64_python3.11.____cpython.yaml create mode 100644 .ci_support/win_64_python3.12.____cpython.yaml create mode 100644 .ci_support/win_64_python3.9.____cpython.yaml diff --git a/.azure-pipelines/azure-pipelines-linux.yml b/.azure-pipelines/azure-pipelines-linux.yml index aef462c..b77a148 100755 --- a/.azure-pipelines/azure-pipelines-linux.yml +++ b/.azure-pipelines/azure-pipelines-linux.yml @@ -8,16 +8,52 @@ jobs: vmImage: ubuntu-latest strategy: matrix: - linux_64_: - CONFIG: linux_64_ + 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_aarch64_: - CONFIG: linux_aarch64_ + 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_ppc64le_: - CONFIG: linux_ppc64le_ + 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_python3.9.____cpython: + CONFIG: linux_64_python3.9.____cpython + UPLOAD_PACKAGES: 'True' + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 + linux_aarch64_python3.10.____cpython: + CONFIG: linux_aarch64_python3.10.____cpython + UPLOAD_PACKAGES: 'True' + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 + linux_aarch64_python3.11.____cpython: + CONFIG: linux_aarch64_python3.11.____cpython + UPLOAD_PACKAGES: 'True' + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 + linux_aarch64_python3.12.____cpython: + CONFIG: linux_aarch64_python3.12.____cpython + UPLOAD_PACKAGES: 'True' + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 + linux_aarch64_python3.9.____cpython: + CONFIG: linux_aarch64_python3.9.____cpython + UPLOAD_PACKAGES: 'True' + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 + linux_ppc64le_python3.10.____cpython: + CONFIG: linux_ppc64le_python3.10.____cpython + UPLOAD_PACKAGES: 'True' + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 + linux_ppc64le_python3.11.____cpython: + CONFIG: linux_ppc64le_python3.11.____cpython + UPLOAD_PACKAGES: 'True' + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 + linux_ppc64le_python3.12.____cpython: + CONFIG: linux_ppc64le_python3.12.____cpython + UPLOAD_PACKAGES: 'True' + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 + linux_ppc64le_python3.9.____cpython: + CONFIG: linux_ppc64le_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 7708e23..49fe09a 100755 --- a/.azure-pipelines/azure-pipelines-osx.yml +++ b/.azure-pipelines/azure-pipelines-osx.yml @@ -8,11 +8,29 @@ jobs: vmImage: macOS-12 strategy: matrix: - osx_64_: - CONFIG: osx_64_ + osx_64_python3.10.____cpython: + CONFIG: osx_64_python3.10.____cpython UPLOAD_PACKAGES: 'True' - osx_arm64_: - CONFIG: osx_arm64_ + osx_64_python3.11.____cpython: + CONFIG: osx_64_python3.11.____cpython + UPLOAD_PACKAGES: 'True' + osx_64_python3.12.____cpython: + CONFIG: osx_64_python3.12.____cpython + UPLOAD_PACKAGES: 'True' + osx_64_python3.9.____cpython: + CONFIG: osx_64_python3.9.____cpython + UPLOAD_PACKAGES: 'True' + osx_arm64_python3.10.____cpython: + CONFIG: osx_arm64_python3.10.____cpython + UPLOAD_PACKAGES: 'True' + osx_arm64_python3.11.____cpython: + CONFIG: osx_arm64_python3.11.____cpython + UPLOAD_PACKAGES: 'True' + osx_arm64_python3.12.____cpython: + CONFIG: osx_arm64_python3.12.____cpython + UPLOAD_PACKAGES: 'True' + 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 204327b..fa9734f 100755 --- a/.azure-pipelines/azure-pipelines-win.yml +++ b/.azure-pipelines/azure-pipelines-win.yml @@ -8,8 +8,17 @@ jobs: vmImage: windows-2022 strategy: matrix: - win_64_: - CONFIG: win_64_ + win_64_python3.10.____cpython: + CONFIG: win_64_python3.10.____cpython + UPLOAD_PACKAGES: 'True' + win_64_python3.11.____cpython: + CONFIG: win_64_python3.11.____cpython + UPLOAD_PACKAGES: 'True' + win_64_python3.12.____cpython: + CONFIG: win_64_python3.12.____cpython + UPLOAD_PACKAGES: 'True' + win_64_python3.9.____cpython: + CONFIG: win_64_python3.9.____cpython UPLOAD_PACKAGES: 'True' timeoutInMinutes: 360 variables: diff --git a/.ci_support/linux_64_.yaml b/.ci_support/linux_64_python3.10.____cpython.yaml similarity index 83% rename from .ci_support/linux_64_.yaml rename to .ci_support/linux_64_python3.10.____cpython.yaml index f62d724..b5027a3 100644 --- a/.ci_support/linux_64_.yaml +++ b/.ci_support/linux_64_python3.10.____cpython.yaml @@ -19,12 +19,9 @@ cxx_compiler_version: docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 libabseil: -- '20240116' +- '20240722' numpy: - '2.0' -- '2.0' -- '2.0' -- '2.0' pin_run_as_build: python: min_pin: x.x @@ -33,14 +30,8 @@ pybind11_abi: - '4' python: - 3.10.* *_cpython -- 3.11.* *_cpython -- 3.12.* *_cpython -- 3.9.* *_cpython python_impl: - cpython -- cpython -- cpython -- cpython qhull: - '2020.2' target_platform: diff --git a/.ci_support/linux_64_python3.11.____cpython.yaml b/.ci_support/linux_64_python3.11.____cpython.yaml new file mode 100644 index 0000000..f0dfed0 --- /dev/null +++ b/.ci_support/linux_64_python3.11.____cpython.yaml @@ -0,0 +1,48 @@ +c_compiler: +- gcc +c_compiler_version: +- '13' +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: +- '13' +docker_image: +- quay.io/condaforge/linux-anvil-cos7-x86_64 +libabseil: +- '20240722' +numpy: +- '2.0' +pin_run_as_build: + python: + min_pin: x.x + max_pin: x.x +pybind11_abi: +- '4' +python: +- 3.11.* *_cpython +python_impl: +- cpython +qhull: +- '2020.2' +target_platform: +- linux-64 +tinyxml2: +- '10' +zip_keys: +- - c_compiler_version + - cxx_compiler_version +- - c_stdlib_version + - cdt_name +- - python + - numpy + - python_impl diff --git a/.ci_support/linux_64_python3.12.____cpython.yaml b/.ci_support/linux_64_python3.12.____cpython.yaml new file mode 100644 index 0000000..88201b7 --- /dev/null +++ b/.ci_support/linux_64_python3.12.____cpython.yaml @@ -0,0 +1,48 @@ +c_compiler: +- gcc +c_compiler_version: +- '13' +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: +- '13' +docker_image: +- quay.io/condaforge/linux-anvil-cos7-x86_64 +libabseil: +- '20240722' +numpy: +- '2.0' +pin_run_as_build: + python: + min_pin: x.x + max_pin: x.x +pybind11_abi: +- '4' +python: +- 3.12.* *_cpython +python_impl: +- cpython +qhull: +- '2020.2' +target_platform: +- linux-64 +tinyxml2: +- '10' +zip_keys: +- - c_compiler_version + - cxx_compiler_version +- - c_stdlib_version + - cdt_name +- - python + - numpy + - python_impl diff --git a/.ci_support/linux_64_python3.9.____cpython.yaml b/.ci_support/linux_64_python3.9.____cpython.yaml new file mode 100644 index 0000000..c4a0004 --- /dev/null +++ b/.ci_support/linux_64_python3.9.____cpython.yaml @@ -0,0 +1,48 @@ +c_compiler: +- gcc +c_compiler_version: +- '13' +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: +- '13' +docker_image: +- quay.io/condaforge/linux-anvil-cos7-x86_64 +libabseil: +- '20240722' +numpy: +- '2.0' +pin_run_as_build: + python: + min_pin: x.x + max_pin: x.x +pybind11_abi: +- '4' +python: +- 3.9.* *_cpython +python_impl: +- cpython +qhull: +- '2020.2' +target_platform: +- linux-64 +tinyxml2: +- '10' +zip_keys: +- - c_compiler_version + - cxx_compiler_version +- - c_stdlib_version + - cdt_name +- - python + - numpy + - python_impl diff --git a/.ci_support/linux_aarch64_.yaml b/.ci_support/linux_aarch64_python3.10.____cpython.yaml similarity index 85% rename from .ci_support/linux_aarch64_.yaml rename to .ci_support/linux_aarch64_python3.10.____cpython.yaml index f3b6d38..08e8865 100644 --- a/.ci_support/linux_aarch64_.yaml +++ b/.ci_support/linux_aarch64_python3.10.____cpython.yaml @@ -23,12 +23,9 @@ cxx_compiler_version: docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 libabseil: -- '20240116' +- '20240722' numpy: - '2.0' -- '2.0' -- '2.0' -- '2.0' pin_run_as_build: python: min_pin: x.x @@ -37,14 +34,8 @@ pybind11_abi: - '4' python: - 3.10.* *_cpython -- 3.11.* *_cpython -- 3.12.* *_cpython -- 3.9.* *_cpython python_impl: - cpython -- cpython -- cpython -- cpython qhull: - '2020.2' target_platform: diff --git a/.ci_support/linux_aarch64_python3.11.____cpython.yaml b/.ci_support/linux_aarch64_python3.11.____cpython.yaml new file mode 100644 index 0000000..39ebd2a --- /dev/null +++ b/.ci_support/linux_aarch64_python3.11.____cpython.yaml @@ -0,0 +1,52 @@ +BUILD: +- aarch64-conda_cos7-linux-gnu +c_compiler: +- gcc +c_compiler_version: +- '13' +c_stdlib: +- sysroot +c_stdlib_version: +- '2.17' +cdt_arch: +- aarch64 +cdt_name: +- cos7 +channel_sources: +- conda-forge +channel_targets: +- conda-forge main +cxx_compiler: +- gxx +cxx_compiler_version: +- '13' +docker_image: +- quay.io/condaforge/linux-anvil-cos7-x86_64 +libabseil: +- '20240722' +numpy: +- '2.0' +pin_run_as_build: + python: + min_pin: x.x + max_pin: x.x +pybind11_abi: +- '4' +python: +- 3.11.* *_cpython +python_impl: +- cpython +qhull: +- '2020.2' +target_platform: +- linux-aarch64 +tinyxml2: +- '10' +zip_keys: +- - c_compiler_version + - cxx_compiler_version +- - c_stdlib_version + - cdt_name +- - python + - numpy + - python_impl diff --git a/.ci_support/linux_aarch64_python3.12.____cpython.yaml b/.ci_support/linux_aarch64_python3.12.____cpython.yaml new file mode 100644 index 0000000..682e5ad --- /dev/null +++ b/.ci_support/linux_aarch64_python3.12.____cpython.yaml @@ -0,0 +1,52 @@ +BUILD: +- aarch64-conda_cos7-linux-gnu +c_compiler: +- gcc +c_compiler_version: +- '13' +c_stdlib: +- sysroot +c_stdlib_version: +- '2.17' +cdt_arch: +- aarch64 +cdt_name: +- cos7 +channel_sources: +- conda-forge +channel_targets: +- conda-forge main +cxx_compiler: +- gxx +cxx_compiler_version: +- '13' +docker_image: +- quay.io/condaforge/linux-anvil-cos7-x86_64 +libabseil: +- '20240722' +numpy: +- '2.0' +pin_run_as_build: + python: + min_pin: x.x + max_pin: x.x +pybind11_abi: +- '4' +python: +- 3.12.* *_cpython +python_impl: +- cpython +qhull: +- '2020.2' +target_platform: +- linux-aarch64 +tinyxml2: +- '10' +zip_keys: +- - c_compiler_version + - cxx_compiler_version +- - c_stdlib_version + - cdt_name +- - python + - numpy + - python_impl diff --git a/.ci_support/linux_aarch64_python3.9.____cpython.yaml b/.ci_support/linux_aarch64_python3.9.____cpython.yaml new file mode 100644 index 0000000..7a1907b --- /dev/null +++ b/.ci_support/linux_aarch64_python3.9.____cpython.yaml @@ -0,0 +1,52 @@ +BUILD: +- aarch64-conda_cos7-linux-gnu +c_compiler: +- gcc +c_compiler_version: +- '13' +c_stdlib: +- sysroot +c_stdlib_version: +- '2.17' +cdt_arch: +- aarch64 +cdt_name: +- cos7 +channel_sources: +- conda-forge +channel_targets: +- conda-forge main +cxx_compiler: +- gxx +cxx_compiler_version: +- '13' +docker_image: +- quay.io/condaforge/linux-anvil-cos7-x86_64 +libabseil: +- '20240722' +numpy: +- '2.0' +pin_run_as_build: + python: + min_pin: x.x + max_pin: x.x +pybind11_abi: +- '4' +python: +- 3.9.* *_cpython +python_impl: +- cpython +qhull: +- '2020.2' +target_platform: +- linux-aarch64 +tinyxml2: +- '10' +zip_keys: +- - c_compiler_version + - cxx_compiler_version +- - c_stdlib_version + - cdt_name +- - python + - numpy + - python_impl diff --git a/.ci_support/linux_ppc64le_.yaml b/.ci_support/linux_ppc64le_python3.10.____cpython.yaml similarity index 83% rename from .ci_support/linux_ppc64le_.yaml rename to .ci_support/linux_ppc64le_python3.10.____cpython.yaml index 1276023..94be362 100644 --- a/.ci_support/linux_ppc64le_.yaml +++ b/.ci_support/linux_ppc64le_python3.10.____cpython.yaml @@ -19,12 +19,9 @@ cxx_compiler_version: docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 libabseil: -- '20240116' +- '20240722' numpy: - '2.0' -- '2.0' -- '2.0' -- '2.0' pin_run_as_build: python: min_pin: x.x @@ -33,14 +30,8 @@ pybind11_abi: - '4' python: - 3.10.* *_cpython -- 3.11.* *_cpython -- 3.12.* *_cpython -- 3.9.* *_cpython python_impl: - cpython -- cpython -- cpython -- cpython qhull: - '2020.2' target_platform: diff --git a/.ci_support/linux_ppc64le_python3.11.____cpython.yaml b/.ci_support/linux_ppc64le_python3.11.____cpython.yaml new file mode 100644 index 0000000..f5213e7 --- /dev/null +++ b/.ci_support/linux_ppc64le_python3.11.____cpython.yaml @@ -0,0 +1,48 @@ +c_compiler: +- gcc +c_compiler_version: +- '13' +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: +- '13' +docker_image: +- quay.io/condaforge/linux-anvil-cos7-x86_64 +libabseil: +- '20240722' +numpy: +- '2.0' +pin_run_as_build: + python: + min_pin: x.x + max_pin: x.x +pybind11_abi: +- '4' +python: +- 3.11.* *_cpython +python_impl: +- cpython +qhull: +- '2020.2' +target_platform: +- linux-ppc64le +tinyxml2: +- '10' +zip_keys: +- - c_compiler_version + - cxx_compiler_version +- - c_stdlib_version + - cdt_name +- - python + - numpy + - python_impl diff --git a/.ci_support/linux_ppc64le_python3.12.____cpython.yaml b/.ci_support/linux_ppc64le_python3.12.____cpython.yaml new file mode 100644 index 0000000..2e3f9c7 --- /dev/null +++ b/.ci_support/linux_ppc64le_python3.12.____cpython.yaml @@ -0,0 +1,48 @@ +c_compiler: +- gcc +c_compiler_version: +- '13' +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: +- '13' +docker_image: +- quay.io/condaforge/linux-anvil-cos7-x86_64 +libabseil: +- '20240722' +numpy: +- '2.0' +pin_run_as_build: + python: + min_pin: x.x + max_pin: x.x +pybind11_abi: +- '4' +python: +- 3.12.* *_cpython +python_impl: +- cpython +qhull: +- '2020.2' +target_platform: +- linux-ppc64le +tinyxml2: +- '10' +zip_keys: +- - c_compiler_version + - cxx_compiler_version +- - c_stdlib_version + - cdt_name +- - python + - numpy + - python_impl diff --git a/.ci_support/linux_ppc64le_python3.9.____cpython.yaml b/.ci_support/linux_ppc64le_python3.9.____cpython.yaml new file mode 100644 index 0000000..02fe66f --- /dev/null +++ b/.ci_support/linux_ppc64le_python3.9.____cpython.yaml @@ -0,0 +1,48 @@ +c_compiler: +- gcc +c_compiler_version: +- '13' +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: +- '13' +docker_image: +- quay.io/condaforge/linux-anvil-cos7-x86_64 +libabseil: +- '20240722' +numpy: +- '2.0' +pin_run_as_build: + python: + min_pin: x.x + max_pin: x.x +pybind11_abi: +- '4' +python: +- 3.9.* *_cpython +python_impl: +- cpython +qhull: +- '2020.2' +target_platform: +- linux-ppc64le +tinyxml2: +- '10' +zip_keys: +- - c_compiler_version + - cxx_compiler_version +- - c_stdlib_version + - cdt_name +- - python + - numpy + - python_impl diff --git a/.ci_support/osx_64_.yaml b/.ci_support/osx_64_python3.10.____cpython.yaml similarity index 84% rename from .ci_support/osx_64_.yaml rename to .ci_support/osx_64_python3.10.____cpython.yaml index 718102a..f450e13 100644 --- a/.ci_support/osx_64_.yaml +++ b/.ci_support/osx_64_python3.10.____cpython.yaml @@ -19,14 +19,11 @@ cxx_compiler: cxx_compiler_version: - '17' libabseil: -- '20240116' +- '20240722' macos_machine: - x86_64-apple-darwin13.4.0 numpy: - '2.0' -- '2.0' -- '2.0' -- '2.0' pin_run_as_build: python: min_pin: x.x @@ -35,14 +32,8 @@ pybind11_abi: - '4' python: - 3.10.* *_cpython -- 3.11.* *_cpython -- 3.12.* *_cpython -- 3.9.* *_cpython python_impl: - cpython -- cpython -- cpython -- cpython qhull: - '2020.2' target_platform: diff --git a/.ci_support/osx_64_python3.11.____cpython.yaml b/.ci_support/osx_64_python3.11.____cpython.yaml new file mode 100644 index 0000000..1fe41ce --- /dev/null +++ b/.ci_support/osx_64_python3.11.____cpython.yaml @@ -0,0 +1,48 @@ +MACOSX_DEPLOYMENT_TARGET: +- '10.14' +MACOSX_SDK_VERSION: +- '10.15' +c_compiler: +- clang +c_compiler_version: +- '17' +c_stdlib: +- macosx_deployment_target +c_stdlib_version: +- '10.14' +channel_sources: +- conda-forge +channel_targets: +- conda-forge main +cxx_compiler: +- clangxx +cxx_compiler_version: +- '17' +libabseil: +- '20240722' +macos_machine: +- x86_64-apple-darwin13.4.0 +numpy: +- '2.0' +pin_run_as_build: + python: + min_pin: x.x + max_pin: x.x +pybind11_abi: +- '4' +python: +- 3.11.* *_cpython +python_impl: +- cpython +qhull: +- '2020.2' +target_platform: +- osx-64 +tinyxml2: +- '10' +zip_keys: +- - c_compiler_version + - cxx_compiler_version +- - python + - numpy + - python_impl diff --git a/.ci_support/osx_64_python3.12.____cpython.yaml b/.ci_support/osx_64_python3.12.____cpython.yaml new file mode 100644 index 0000000..e112967 --- /dev/null +++ b/.ci_support/osx_64_python3.12.____cpython.yaml @@ -0,0 +1,48 @@ +MACOSX_DEPLOYMENT_TARGET: +- '10.14' +MACOSX_SDK_VERSION: +- '10.15' +c_compiler: +- clang +c_compiler_version: +- '17' +c_stdlib: +- macosx_deployment_target +c_stdlib_version: +- '10.14' +channel_sources: +- conda-forge +channel_targets: +- conda-forge main +cxx_compiler: +- clangxx +cxx_compiler_version: +- '17' +libabseil: +- '20240722' +macos_machine: +- x86_64-apple-darwin13.4.0 +numpy: +- '2.0' +pin_run_as_build: + python: + min_pin: x.x + max_pin: x.x +pybind11_abi: +- '4' +python: +- 3.12.* *_cpython +python_impl: +- cpython +qhull: +- '2020.2' +target_platform: +- osx-64 +tinyxml2: +- '10' +zip_keys: +- - c_compiler_version + - cxx_compiler_version +- - python + - numpy + - python_impl diff --git a/.ci_support/osx_64_python3.9.____cpython.yaml b/.ci_support/osx_64_python3.9.____cpython.yaml new file mode 100644 index 0000000..9cbff78 --- /dev/null +++ b/.ci_support/osx_64_python3.9.____cpython.yaml @@ -0,0 +1,48 @@ +MACOSX_DEPLOYMENT_TARGET: +- '10.14' +MACOSX_SDK_VERSION: +- '10.15' +c_compiler: +- clang +c_compiler_version: +- '17' +c_stdlib: +- macosx_deployment_target +c_stdlib_version: +- '10.14' +channel_sources: +- conda-forge +channel_targets: +- conda-forge main +cxx_compiler: +- clangxx +cxx_compiler_version: +- '17' +libabseil: +- '20240722' +macos_machine: +- x86_64-apple-darwin13.4.0 +numpy: +- '2.0' +pin_run_as_build: + python: + min_pin: x.x + max_pin: x.x +pybind11_abi: +- '4' +python: +- 3.9.* *_cpython +python_impl: +- cpython +qhull: +- '2020.2' +target_platform: +- osx-64 +tinyxml2: +- '10' +zip_keys: +- - c_compiler_version + - cxx_compiler_version +- - python + - numpy + - python_impl diff --git a/.ci_support/osx_arm64_.yaml b/.ci_support/osx_arm64_python3.10.____cpython.yaml similarity index 84% rename from .ci_support/osx_arm64_.yaml rename to .ci_support/osx_arm64_python3.10.____cpython.yaml index fbbc677..e78e9e4 100644 --- a/.ci_support/osx_arm64_.yaml +++ b/.ci_support/osx_arm64_python3.10.____cpython.yaml @@ -19,14 +19,11 @@ cxx_compiler: cxx_compiler_version: - '17' libabseil: -- '20240116' +- '20240722' macos_machine: - arm64-apple-darwin20.0.0 numpy: - '2.0' -- '2.0' -- '2.0' -- '2.0' pin_run_as_build: python: min_pin: x.x @@ -35,14 +32,8 @@ pybind11_abi: - '4' python: - 3.10.* *_cpython -- 3.11.* *_cpython -- 3.12.* *_cpython -- 3.9.* *_cpython python_impl: - cpython -- cpython -- cpython -- cpython qhull: - '2020.2' target_platform: diff --git a/.ci_support/osx_arm64_python3.11.____cpython.yaml b/.ci_support/osx_arm64_python3.11.____cpython.yaml new file mode 100644 index 0000000..42240e2 --- /dev/null +++ b/.ci_support/osx_arm64_python3.11.____cpython.yaml @@ -0,0 +1,48 @@ +MACOSX_DEPLOYMENT_TARGET: +- '11.0' +MACOSX_SDK_VERSION: +- '11.0' +c_compiler: +- clang +c_compiler_version: +- '17' +c_stdlib: +- macosx_deployment_target +c_stdlib_version: +- '11.0' +channel_sources: +- conda-forge +channel_targets: +- conda-forge main +cxx_compiler: +- clangxx +cxx_compiler_version: +- '17' +libabseil: +- '20240722' +macos_machine: +- arm64-apple-darwin20.0.0 +numpy: +- '2.0' +pin_run_as_build: + python: + min_pin: x.x + max_pin: x.x +pybind11_abi: +- '4' +python: +- 3.11.* *_cpython +python_impl: +- cpython +qhull: +- '2020.2' +target_platform: +- osx-arm64 +tinyxml2: +- '10' +zip_keys: +- - c_compiler_version + - cxx_compiler_version +- - python + - numpy + - python_impl diff --git a/.ci_support/osx_arm64_python3.12.____cpython.yaml b/.ci_support/osx_arm64_python3.12.____cpython.yaml new file mode 100644 index 0000000..2359fcc --- /dev/null +++ b/.ci_support/osx_arm64_python3.12.____cpython.yaml @@ -0,0 +1,48 @@ +MACOSX_DEPLOYMENT_TARGET: +- '11.0' +MACOSX_SDK_VERSION: +- '11.0' +c_compiler: +- clang +c_compiler_version: +- '17' +c_stdlib: +- macosx_deployment_target +c_stdlib_version: +- '11.0' +channel_sources: +- conda-forge +channel_targets: +- conda-forge main +cxx_compiler: +- clangxx +cxx_compiler_version: +- '17' +libabseil: +- '20240722' +macos_machine: +- arm64-apple-darwin20.0.0 +numpy: +- '2.0' +pin_run_as_build: + python: + min_pin: x.x + max_pin: x.x +pybind11_abi: +- '4' +python: +- 3.12.* *_cpython +python_impl: +- cpython +qhull: +- '2020.2' +target_platform: +- osx-arm64 +tinyxml2: +- '10' +zip_keys: +- - c_compiler_version + - cxx_compiler_version +- - python + - numpy + - python_impl diff --git a/.ci_support/osx_arm64_python3.9.____cpython.yaml b/.ci_support/osx_arm64_python3.9.____cpython.yaml new file mode 100644 index 0000000..67bb4d5 --- /dev/null +++ b/.ci_support/osx_arm64_python3.9.____cpython.yaml @@ -0,0 +1,48 @@ +MACOSX_DEPLOYMENT_TARGET: +- '11.0' +MACOSX_SDK_VERSION: +- '11.0' +c_compiler: +- clang +c_compiler_version: +- '17' +c_stdlib: +- macosx_deployment_target +c_stdlib_version: +- '11.0' +channel_sources: +- conda-forge +channel_targets: +- conda-forge main +cxx_compiler: +- clangxx +cxx_compiler_version: +- '17' +libabseil: +- '20240722' +macos_machine: +- arm64-apple-darwin20.0.0 +numpy: +- '2.0' +pin_run_as_build: + python: + min_pin: x.x + max_pin: x.x +pybind11_abi: +- '4' +python: +- 3.9.* *_cpython +python_impl: +- cpython +qhull: +- '2020.2' +target_platform: +- osx-arm64 +tinyxml2: +- '10' +zip_keys: +- - c_compiler_version + - cxx_compiler_version +- - python + - numpy + - python_impl diff --git a/.ci_support/win_64_.yaml b/.ci_support/win_64_python3.10.____cpython.yaml similarity index 76% rename from .ci_support/win_64_.yaml rename to .ci_support/win_64_python3.10.____cpython.yaml index fc54b6d..3dc3834 100644 --- a/.ci_support/win_64_.yaml +++ b/.ci_support/win_64_python3.10.____cpython.yaml @@ -9,12 +9,9 @@ channel_targets: cxx_compiler: - vs2019 libabseil: -- '20240116' +- '20240722' numpy: - '2.0' -- '2.0' -- '2.0' -- '2.0' pin_run_as_build: python: min_pin: x.x @@ -23,14 +20,8 @@ pybind11_abi: - '4' python: - 3.10.* *_cpython -- 3.11.* *_cpython -- 3.12.* *_cpython -- 3.9.* *_cpython python_impl: - cpython -- cpython -- cpython -- cpython qhull: - '2020.2' target_platform: diff --git a/.ci_support/win_64_python3.11.____cpython.yaml b/.ci_support/win_64_python3.11.____cpython.yaml new file mode 100644 index 0000000..852cd08 --- /dev/null +++ b/.ci_support/win_64_python3.11.____cpython.yaml @@ -0,0 +1,34 @@ +c_compiler: +- vs2019 +c_stdlib: +- vs +channel_sources: +- conda-forge +channel_targets: +- conda-forge main +cxx_compiler: +- vs2019 +libabseil: +- '20240722' +numpy: +- '2.0' +pin_run_as_build: + python: + min_pin: x.x + max_pin: x.x +pybind11_abi: +- '4' +python: +- 3.11.* *_cpython +python_impl: +- cpython +qhull: +- '2020.2' +target_platform: +- win-64 +tinyxml2: +- '10' +zip_keys: +- - python + - numpy + - python_impl diff --git a/.ci_support/win_64_python3.12.____cpython.yaml b/.ci_support/win_64_python3.12.____cpython.yaml new file mode 100644 index 0000000..8434e50 --- /dev/null +++ b/.ci_support/win_64_python3.12.____cpython.yaml @@ -0,0 +1,34 @@ +c_compiler: +- vs2019 +c_stdlib: +- vs +channel_sources: +- conda-forge +channel_targets: +- conda-forge main +cxx_compiler: +- vs2019 +libabseil: +- '20240722' +numpy: +- '2.0' +pin_run_as_build: + python: + min_pin: x.x + max_pin: x.x +pybind11_abi: +- '4' +python: +- 3.12.* *_cpython +python_impl: +- cpython +qhull: +- '2020.2' +target_platform: +- win-64 +tinyxml2: +- '10' +zip_keys: +- - python + - numpy + - python_impl diff --git a/.ci_support/win_64_python3.9.____cpython.yaml b/.ci_support/win_64_python3.9.____cpython.yaml new file mode 100644 index 0000000..09512e6 --- /dev/null +++ b/.ci_support/win_64_python3.9.____cpython.yaml @@ -0,0 +1,34 @@ +c_compiler: +- vs2019 +c_stdlib: +- vs +channel_sources: +- conda-forge +channel_targets: +- conda-forge main +cxx_compiler: +- vs2019 +libabseil: +- '20240722' +numpy: +- '2.0' +pin_run_as_build: + python: + min_pin: x.x + max_pin: x.x +pybind11_abi: +- '4' +python: +- 3.9.* *_cpython +python_impl: +- cpython +qhull: +- '2020.2' +target_platform: +- win-64 +tinyxml2: +- '10' +zip_keys: +- - python + - numpy + - python_impl diff --git a/.scripts/build_steps.sh b/.scripts/build_steps.sh index ba4b251..856f469 100755 --- a/.scripts/build_steps.sh +++ b/.scripts/build_steps.sh @@ -43,6 +43,8 @@ setup_conda_rc "${FEEDSTOCK_ROOT}" "${RECIPE_ROOT}" "${CONFIG_FILE}" source run_conda_forge_build_setup + + # make the build number clobber make_build_number "${FEEDSTOCK_ROOT}" "${RECIPE_ROOT}" "${CONFIG_FILE}" diff --git a/.scripts/run_win_build.bat b/.scripts/run_win_build.bat index 65650bf..a45c34f 100755 --- a/.scripts/run_win_build.bat +++ b/.scripts/run_win_build.bat @@ -24,7 +24,7 @@ set "CONDA_LIBMAMBA_SOLVER_NO_CHANNELS_FROM_INSTALLED=1" :: Provision the necessary dependencies to build the recipe later echo Installing dependencies -mamba.exe install "python=3.10" pip mamba conda-build conda-forge-ci-setup=4 "conda-build>=24.1" -c conda-forge --strict-channel-priority --yes +mamba.exe install pip mamba conda-build conda-forge-ci-setup=4 "conda-build>=24.1" -c conda-forge --strict-channel-priority --yes if !errorlevel! neq 0 exit /b !errorlevel! :: Set basic configuration @@ -48,7 +48,7 @@ if NOT [%HOST_PLATFORM%] == [%BUILD_PLATFORM%] ( ) if NOT [%flow_run_id%] == [] ( - set "EXTRA_CB_OPTIONS=%EXTRA_CB_OPTIONS% --extra-meta flow_run_id=%flow_run_id% remote_url=%remote_url% sha=%sha%" + set "EXTRA_CB_OPTIONS=%EXTRA_CB_OPTIONS% --extra-meta flow_run_id=%flow_run_id% remote_url=%remote_url% sha=%sha%" ) call :end_group diff --git a/README.md b/README.md index 8b133bc..8fc2c8c 100644 --- a/README.md +++ b/README.md @@ -95,45 +95,171 @@ Current build status
Variant | Status | |
---|---|---|
linux_64 | +linux_64_python3.10.____cpython | - + |
linux_aarch64 | +linux_64_python3.11.____cpython | - + |
linux_ppc64le | +linux_64_python3.12.____cpython | - + |
osx_64 | +linux_64_python3.9.____cpython | - + |
osx_arm64 | +linux_aarch64_python3.10.____cpython | - + |
win_64 | +linux_aarch64_python3.11.____cpython | - + + + | +
linux_aarch64_python3.12.____cpython | ++ + + + | +|
linux_aarch64_python3.9.____cpython | ++ + + + | +|
linux_ppc64le_python3.10.____cpython | ++ + + + | +|
linux_ppc64le_python3.11.____cpython | ++ + + + | +|
linux_ppc64le_python3.12.____cpython | ++ + + + | +|
linux_ppc64le_python3.9.____cpython | ++ + + + | +|
osx_64_python3.10.____cpython | ++ + + + | +|
osx_64_python3.11.____cpython | ++ + + + | +|
osx_64_python3.12.____cpython | ++ + + + | +|
osx_64_python3.9.____cpython | ++ + + + | +|
osx_arm64_python3.10.____cpython | ++ + + + | +|
osx_arm64_python3.11.____cpython | ++ + + + | +|
osx_arm64_python3.12.____cpython | ++ + + + | +|
osx_arm64_python3.9.____cpython | ++ + + + | +|
win_64_python3.10.____cpython | ++ + + + | +|
win_64_python3.11.____cpython | ++ + + + | +|
win_64_python3.12.____cpython | ++ + + + | +|
win_64_python3.9.____cpython | ++ + |