From 6f5e9ec59ce0977e7a7a635c1ba364afe7ea1846 Mon Sep 17 00:00:00 2001 From: "conda-forge-webservices[bot]" <121827174+conda-forge-webservices[bot]@users.noreply.github.com> Date: Mon, 23 Oct 2023 23:08:38 +0000 Subject: [PATCH 1/4] dummy commit for rerendering --- README.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/README.md b/README.md index 7565484..2df4b5c 100644 --- a/README.md +++ b/README.md @@ -273,3 +273,6 @@ Feedstock Maintainers * [@m3vaz](https://github.com/m3vaz/) * [@mmccarty](https://github.com/mmccarty/) + + + From 0b68edde04fb89bcadcc88a9bdea2a95a2bf4e7d Mon Sep 17 00:00:00 2001 From: "conda-forge-webservices[bot]" <91080706+conda-forge-webservices[bot]@users.noreply.github.com> Date: Mon, 23 Oct 2023 23:11:13 +0000 Subject: [PATCH 2/4] MNT: Re-rendered with conda-build 3.27.0, conda-smithy 3.27.1, and conda-forge-pinning 2023.10.23.08.51.53 --- ...rsion12.0cxx_compiler_version12python3.10.____cpython.yaml | 2 -- ...rsion12.0cxx_compiler_version12python3.11.____cpython.yaml | 2 -- ...rsion12.0cxx_compiler_version12python3.12.____cpython.yaml | 4 +--- ...ersion12.0cxx_compiler_version12python3.8.____cpython.yaml | 2 -- ...ersion12.0cxx_compiler_version12python3.9.____cpython.yaml | 2 -- ...rsion12.0cxx_compiler_version12python3.10.____cpython.yaml | 2 -- ...rsion12.0cxx_compiler_version12python3.11.____cpython.yaml | 2 -- ...rsion12.0cxx_compiler_version12python3.12.____cpython.yaml | 4 +--- ...ersion12.0cxx_compiler_version12python3.8.____cpython.yaml | 2 -- ...ersion12.0cxx_compiler_version12python3.9.____cpython.yaml | 2 -- ...rsion12.0cxx_compiler_version12python3.10.____cpython.yaml | 2 -- ...rsion12.0cxx_compiler_version12python3.11.____cpython.yaml | 2 -- ...rsion12.0cxx_compiler_version12python3.12.____cpython.yaml | 4 +--- ...ersion12.0cxx_compiler_version12python3.8.____cpython.yaml | 2 -- ...ersion12.0cxx_compiler_version12python3.9.____cpython.yaml | 2 -- .scripts/build_steps.sh | 2 +- README.md | 3 --- 17 files changed, 4 insertions(+), 37 deletions(-) diff --git a/.ci_support/linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12python3.10.____cpython.yaml b/.ci_support/linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12python3.10.____cpython.yaml index 1727a9d..7893ee8 100644 --- a/.ci_support/linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12python3.10.____cpython.yaml +++ b/.ci_support/linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12python3.10.____cpython.yaml @@ -33,5 +33,3 @@ zip_keys: - cuda_compiler_version - cdt_name - docker_image -- - python - - channel_sources diff --git a/.ci_support/linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12python3.11.____cpython.yaml b/.ci_support/linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12python3.11.____cpython.yaml index fb90dfe..2ff774f 100644 --- a/.ci_support/linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12python3.11.____cpython.yaml +++ b/.ci_support/linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12python3.11.____cpython.yaml @@ -33,5 +33,3 @@ zip_keys: - cuda_compiler_version - cdt_name - docker_image -- - python - - channel_sources diff --git a/.ci_support/linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12python3.12.____cpython.yaml b/.ci_support/linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12python3.12.____cpython.yaml index 688408c..e7bea4c 100644 --- a/.ci_support/linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12python3.12.____cpython.yaml +++ b/.ci_support/linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12python3.12.____cpython.yaml @@ -5,7 +5,7 @@ c_compiler_version: cdt_name: - cos7 channel_sources: -- conda-forge/label/python_rc,conda-forge +- conda-forge channel_targets: - conda-forge main cuda_compiler: @@ -33,5 +33,3 @@ zip_keys: - cuda_compiler_version - cdt_name - docker_image -- - python - - channel_sources diff --git a/.ci_support/linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12python3.8.____cpython.yaml b/.ci_support/linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12python3.8.____cpython.yaml index 2c1ecc7..7091c62 100644 --- a/.ci_support/linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12python3.8.____cpython.yaml +++ b/.ci_support/linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12python3.8.____cpython.yaml @@ -33,5 +33,3 @@ zip_keys: - cuda_compiler_version - cdt_name - docker_image -- - python - - channel_sources diff --git a/.ci_support/linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12python3.9.____cpython.yaml b/.ci_support/linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12python3.9.____cpython.yaml index 42e84ad..3f2993b 100644 --- a/.ci_support/linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12python3.9.____cpython.yaml +++ b/.ci_support/linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12python3.9.____cpython.yaml @@ -33,5 +33,3 @@ zip_keys: - cuda_compiler_version - cdt_name - docker_image -- - python - - channel_sources diff --git a/.ci_support/linux_aarch64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12python3.10.____cpython.yaml b/.ci_support/linux_aarch64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12python3.10.____cpython.yaml index 6cb0f9c..6489a03 100644 --- a/.ci_support/linux_aarch64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12python3.10.____cpython.yaml +++ b/.ci_support/linux_aarch64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12python3.10.____cpython.yaml @@ -37,5 +37,3 @@ zip_keys: - cuda_compiler_version - cdt_name - docker_image -- - python - - channel_sources diff --git a/.ci_support/linux_aarch64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12python3.11.____cpython.yaml b/.ci_support/linux_aarch64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12python3.11.____cpython.yaml index cecd581..6a08670 100644 --- a/.ci_support/linux_aarch64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12python3.11.____cpython.yaml +++ b/.ci_support/linux_aarch64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12python3.11.____cpython.yaml @@ -37,5 +37,3 @@ zip_keys: - cuda_compiler_version - cdt_name - docker_image -- - python - - channel_sources diff --git a/.ci_support/linux_aarch64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12python3.12.____cpython.yaml b/.ci_support/linux_aarch64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12python3.12.____cpython.yaml index 18dcc0e..83bda77 100644 --- a/.ci_support/linux_aarch64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12python3.12.____cpython.yaml +++ b/.ci_support/linux_aarch64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12python3.12.____cpython.yaml @@ -9,7 +9,7 @@ cdt_arch: cdt_name: - cos7 channel_sources: -- conda-forge/label/python_rc,conda-forge +- conda-forge channel_targets: - conda-forge main cuda_compiler: @@ -37,5 +37,3 @@ zip_keys: - cuda_compiler_version - cdt_name - docker_image -- - python - - channel_sources diff --git a/.ci_support/linux_aarch64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12python3.8.____cpython.yaml b/.ci_support/linux_aarch64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12python3.8.____cpython.yaml index 1060774..1f59d64 100644 --- a/.ci_support/linux_aarch64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12python3.8.____cpython.yaml +++ b/.ci_support/linux_aarch64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12python3.8.____cpython.yaml @@ -37,5 +37,3 @@ zip_keys: - cuda_compiler_version - cdt_name - docker_image -- - python - - channel_sources diff --git a/.ci_support/linux_aarch64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12python3.9.____cpython.yaml b/.ci_support/linux_aarch64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12python3.9.____cpython.yaml index a21ea8a..cf60663 100644 --- a/.ci_support/linux_aarch64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12python3.9.____cpython.yaml +++ b/.ci_support/linux_aarch64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12python3.9.____cpython.yaml @@ -37,5 +37,3 @@ zip_keys: - cuda_compiler_version - cdt_name - docker_image -- - python - - channel_sources diff --git a/.ci_support/linux_ppc64le_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12python3.10.____cpython.yaml b/.ci_support/linux_ppc64le_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12python3.10.____cpython.yaml index 896eafc..efe83e8 100644 --- a/.ci_support/linux_ppc64le_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12python3.10.____cpython.yaml +++ b/.ci_support/linux_ppc64le_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12python3.10.____cpython.yaml @@ -33,5 +33,3 @@ zip_keys: - cuda_compiler_version - cdt_name - docker_image -- - python - - channel_sources diff --git a/.ci_support/linux_ppc64le_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12python3.11.____cpython.yaml b/.ci_support/linux_ppc64le_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12python3.11.____cpython.yaml index f404b67..a45a851 100644 --- a/.ci_support/linux_ppc64le_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12python3.11.____cpython.yaml +++ b/.ci_support/linux_ppc64le_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12python3.11.____cpython.yaml @@ -33,5 +33,3 @@ zip_keys: - cuda_compiler_version - cdt_name - docker_image -- - python - - channel_sources diff --git a/.ci_support/linux_ppc64le_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12python3.12.____cpython.yaml b/.ci_support/linux_ppc64le_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12python3.12.____cpython.yaml index 13c56aa..d476f56 100644 --- a/.ci_support/linux_ppc64le_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12python3.12.____cpython.yaml +++ b/.ci_support/linux_ppc64le_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12python3.12.____cpython.yaml @@ -5,7 +5,7 @@ c_compiler_version: cdt_name: - cos7 channel_sources: -- conda-forge/label/python_rc,conda-forge +- conda-forge channel_targets: - conda-forge main cuda_compiler: @@ -33,5 +33,3 @@ zip_keys: - cuda_compiler_version - cdt_name - docker_image -- - python - - channel_sources diff --git a/.ci_support/linux_ppc64le_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12python3.8.____cpython.yaml b/.ci_support/linux_ppc64le_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12python3.8.____cpython.yaml index 140804c..55d93ce 100644 --- a/.ci_support/linux_ppc64le_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12python3.8.____cpython.yaml +++ b/.ci_support/linux_ppc64le_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12python3.8.____cpython.yaml @@ -33,5 +33,3 @@ zip_keys: - cuda_compiler_version - cdt_name - docker_image -- - python - - channel_sources diff --git a/.ci_support/linux_ppc64le_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12python3.9.____cpython.yaml b/.ci_support/linux_ppc64le_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12python3.9.____cpython.yaml index 997acf5..d63c04c 100644 --- a/.ci_support/linux_ppc64le_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12python3.9.____cpython.yaml +++ b/.ci_support/linux_ppc64le_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12python3.9.____cpython.yaml @@ -33,5 +33,3 @@ zip_keys: - cuda_compiler_version - cdt_name - docker_image -- - python - - channel_sources diff --git a/.scripts/build_steps.sh b/.scripts/build_steps.sh index 438ed2b..d20d8f4 100755 --- a/.scripts/build_steps.sh +++ b/.scripts/build_steps.sh @@ -34,7 +34,7 @@ CONDARC mamba install --update-specs --yes --quiet --channel conda-forge --strict-channel-priority \ pip mamba conda-build boa conda-forge-ci-setup=3 mamba update --update-specs --yes --quiet --channel conda-forge --strict-channel-priority \ - pip mamba conda-build boa conda-forge-ci-setup + pip mamba conda-build boa conda-forge-ci-setup=3 # set up the condarc setup_conda_rc "${FEEDSTOCK_ROOT}" "${RECIPE_ROOT}" "${CONFIG_FILE}" diff --git a/README.md b/README.md index 2df4b5c..7565484 100644 --- a/README.md +++ b/README.md @@ -273,6 +273,3 @@ Feedstock Maintainers * [@m3vaz](https://github.com/m3vaz/) * [@mmccarty](https://github.com/mmccarty/) - - - From 5afbe555d5eecab15ee88e852b07d58e4cabcf48 Mon Sep 17 00:00:00 2001 From: jakirkham Date: Mon, 23 Oct 2023 16:17:39 -0700 Subject: [PATCH 3/4] Sort `conda-forge.yml` keys --- conda-forge.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/conda-forge.yml b/conda-forge.yml index ac37f64..379e455 100644 --- a/conda-forge.yml +++ b/conda-forge.yml @@ -1,11 +1,11 @@ +conda_build: + pkg_format: '2' conda_forge_output_validation: true +github: + branch_name: main + tooling_branch_name: main os_version: linux_64: cos7 provider: linux_aarch64: azure linux_ppc64le: azure -github: - branch_name: main - tooling_branch_name: main -conda_build: - pkg_format: '2' From f0449ce55c4270489f249e280afacc13c89d8e89 Mon Sep 17 00:00:00 2001 From: jakirkham Date: Mon, 23 Oct 2023 16:20:19 -0700 Subject: [PATCH 4/4] Add `11.8` branch to ABI migrations --- conda-forge.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/conda-forge.yml b/conda-forge.yml index 379e455..8c9f670 100644 --- a/conda-forge.yml +++ b/conda-forge.yml @@ -1,3 +1,6 @@ +bot: + abi_migration_branches: + - 11.8 conda_build: pkg_format: '2' conda_forge_output_validation: true