From 2860a1f0481c8bae2b774ca0c3a5cc8eef906fbd Mon Sep 17 00:00:00 2001 From: "conda-forge-webservices[bot]" <121827174+conda-forge-webservices[bot]@users.noreply.github.com> Date: Thu, 3 Oct 2024 16:57:35 +0000 Subject: [PATCH 1/3] dummy commit for rerendering --- README.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/README.md b/README.md index 9d117705..a2185ae6 100644 --- a/README.md +++ b/README.md @@ -338,3 +338,6 @@ Feedstock Maintainers * [@ocefpaf](https://github.com/ocefpaf/) * [@rgommers](https://github.com/rgommers/) + + + From 30ce6b533a4cc8edfb5c29fdc575ea8ec9e30783 Mon Sep 17 00:00:00 2001 From: "conda-forge-webservices[bot]" <91080706+conda-forge-webservices[bot]@users.noreply.github.com> Date: Thu, 3 Oct 2024 17:00:46 +0000 Subject: [PATCH 2/3] MNT: Re-rendered with conda-build 24.9.0, conda-smithy 3.41.1, and conda-forge-pinning 2024.10.03.06.07.11 --- .ci_support/linux_64_numpy2.0python3.10.____cpython.yaml | 2 ++ .ci_support/linux_64_numpy2.0python3.11.____cpython.yaml | 2 ++ .ci_support/linux_64_numpy2.0python3.12.____cpython.yaml | 2 ++ .ci_support/linux_64_numpy2.1python3.13.____cp313.yaml | 2 ++ .ci_support/linux_aarch64_numpy2.0python3.10.____cpython.yaml | 2 ++ .ci_support/linux_aarch64_numpy2.0python3.11.____cpython.yaml | 2 ++ .ci_support/linux_aarch64_numpy2.0python3.12.____cpython.yaml | 2 ++ .ci_support/linux_aarch64_numpy2.1python3.13.____cp313.yaml | 2 ++ .ci_support/linux_ppc64le_numpy2.0python3.10.____cpython.yaml | 2 ++ .ci_support/linux_ppc64le_numpy2.0python3.11.____cpython.yaml | 2 ++ .ci_support/linux_ppc64le_numpy2.0python3.12.____cpython.yaml | 2 ++ .ci_support/linux_ppc64le_numpy2.1python3.13.____cp313.yaml | 2 ++ .ci_support/osx_64_numpy2.0python3.10.____cpython.yaml | 2 ++ .ci_support/osx_64_numpy2.0python3.11.____cpython.yaml | 2 ++ .ci_support/osx_64_numpy2.0python3.12.____cpython.yaml | 2 ++ .ci_support/osx_64_numpy2.1python3.13.____cp313.yaml | 2 ++ .ci_support/osx_arm64_numpy2.0python3.10.____cpython.yaml | 2 ++ .ci_support/osx_arm64_numpy2.0python3.11.____cpython.yaml | 2 ++ .ci_support/osx_arm64_numpy2.0python3.12.____cpython.yaml | 2 ++ .ci_support/osx_arm64_numpy2.1python3.13.____cp313.yaml | 2 ++ .ci_support/win_64_numpy2.0python3.10.____cpython.yaml | 2 ++ .ci_support/win_64_numpy2.0python3.11.____cpython.yaml | 2 ++ .ci_support/win_64_numpy2.0python3.12.____cpython.yaml | 2 ++ .ci_support/win_64_numpy2.1python3.13.____cp313.yaml | 4 +++- .scripts/build_steps.sh | 2 ++ .scripts/run_win_build.bat | 4 ++-- README.md | 3 --- build-locally.py | 2 +- 28 files changed, 54 insertions(+), 7 deletions(-) diff --git a/.ci_support/linux_64_numpy2.0python3.10.____cpython.yaml b/.ci_support/linux_64_numpy2.0python3.10.____cpython.yaml index ebdd62ab..f5fb124f 100644 --- a/.ci_support/linux_64_numpy2.0python3.10.____cpython.yaml +++ b/.ci_support/linux_64_numpy2.0python3.10.____cpython.yaml @@ -1,3 +1,5 @@ +ace: +- 8.0.1 c_compiler: - gcc c_compiler_version: diff --git a/.ci_support/linux_64_numpy2.0python3.11.____cpython.yaml b/.ci_support/linux_64_numpy2.0python3.11.____cpython.yaml index 850270db..b880ca07 100644 --- a/.ci_support/linux_64_numpy2.0python3.11.____cpython.yaml +++ b/.ci_support/linux_64_numpy2.0python3.11.____cpython.yaml @@ -1,3 +1,5 @@ +ace: +- 8.0.1 c_compiler: - gcc c_compiler_version: diff --git a/.ci_support/linux_64_numpy2.0python3.12.____cpython.yaml b/.ci_support/linux_64_numpy2.0python3.12.____cpython.yaml index 33704e2d..33a3fa15 100644 --- a/.ci_support/linux_64_numpy2.0python3.12.____cpython.yaml +++ b/.ci_support/linux_64_numpy2.0python3.12.____cpython.yaml @@ -1,3 +1,5 @@ +ace: +- 8.0.1 c_compiler: - gcc c_compiler_version: diff --git a/.ci_support/linux_64_numpy2.1python3.13.____cp313.yaml b/.ci_support/linux_64_numpy2.1python3.13.____cp313.yaml index 7e097177..eaf01ad1 100644 --- a/.ci_support/linux_64_numpy2.1python3.13.____cp313.yaml +++ b/.ci_support/linux_64_numpy2.1python3.13.____cp313.yaml @@ -1,3 +1,5 @@ +ace: +- 8.0.1 c_compiler: - gcc c_compiler_version: diff --git a/.ci_support/linux_aarch64_numpy2.0python3.10.____cpython.yaml b/.ci_support/linux_aarch64_numpy2.0python3.10.____cpython.yaml index 40f1ace3..6c1c0f6f 100644 --- a/.ci_support/linux_aarch64_numpy2.0python3.10.____cpython.yaml +++ b/.ci_support/linux_aarch64_numpy2.0python3.10.____cpython.yaml @@ -1,5 +1,7 @@ BUILD: - aarch64-conda_cos7-linux-gnu +ace: +- 8.0.1 c_compiler: - gcc c_compiler_version: diff --git a/.ci_support/linux_aarch64_numpy2.0python3.11.____cpython.yaml b/.ci_support/linux_aarch64_numpy2.0python3.11.____cpython.yaml index 7656ed66..095b3c11 100644 --- a/.ci_support/linux_aarch64_numpy2.0python3.11.____cpython.yaml +++ b/.ci_support/linux_aarch64_numpy2.0python3.11.____cpython.yaml @@ -1,5 +1,7 @@ BUILD: - aarch64-conda_cos7-linux-gnu +ace: +- 8.0.1 c_compiler: - gcc c_compiler_version: diff --git a/.ci_support/linux_aarch64_numpy2.0python3.12.____cpython.yaml b/.ci_support/linux_aarch64_numpy2.0python3.12.____cpython.yaml index 47d87b6c..6aa37c2f 100644 --- a/.ci_support/linux_aarch64_numpy2.0python3.12.____cpython.yaml +++ b/.ci_support/linux_aarch64_numpy2.0python3.12.____cpython.yaml @@ -1,5 +1,7 @@ BUILD: - aarch64-conda_cos7-linux-gnu +ace: +- 8.0.1 c_compiler: - gcc c_compiler_version: diff --git a/.ci_support/linux_aarch64_numpy2.1python3.13.____cp313.yaml b/.ci_support/linux_aarch64_numpy2.1python3.13.____cp313.yaml index c38d2c7c..aaf0268b 100644 --- a/.ci_support/linux_aarch64_numpy2.1python3.13.____cp313.yaml +++ b/.ci_support/linux_aarch64_numpy2.1python3.13.____cp313.yaml @@ -1,5 +1,7 @@ BUILD: - aarch64-conda_cos7-linux-gnu +ace: +- 8.0.1 c_compiler: - gcc c_compiler_version: diff --git a/.ci_support/linux_ppc64le_numpy2.0python3.10.____cpython.yaml b/.ci_support/linux_ppc64le_numpy2.0python3.10.____cpython.yaml index 100795d1..5f2d4eef 100644 --- a/.ci_support/linux_ppc64le_numpy2.0python3.10.____cpython.yaml +++ b/.ci_support/linux_ppc64le_numpy2.0python3.10.____cpython.yaml @@ -1,3 +1,5 @@ +ace: +- 8.0.1 c_compiler: - gcc c_compiler_version: diff --git a/.ci_support/linux_ppc64le_numpy2.0python3.11.____cpython.yaml b/.ci_support/linux_ppc64le_numpy2.0python3.11.____cpython.yaml index dfb21c88..29fabe9d 100644 --- a/.ci_support/linux_ppc64le_numpy2.0python3.11.____cpython.yaml +++ b/.ci_support/linux_ppc64le_numpy2.0python3.11.____cpython.yaml @@ -1,3 +1,5 @@ +ace: +- 8.0.1 c_compiler: - gcc c_compiler_version: diff --git a/.ci_support/linux_ppc64le_numpy2.0python3.12.____cpython.yaml b/.ci_support/linux_ppc64le_numpy2.0python3.12.____cpython.yaml index 173e7a9b..877c5310 100644 --- a/.ci_support/linux_ppc64le_numpy2.0python3.12.____cpython.yaml +++ b/.ci_support/linux_ppc64le_numpy2.0python3.12.____cpython.yaml @@ -1,3 +1,5 @@ +ace: +- 8.0.1 c_compiler: - gcc c_compiler_version: diff --git a/.ci_support/linux_ppc64le_numpy2.1python3.13.____cp313.yaml b/.ci_support/linux_ppc64le_numpy2.1python3.13.____cp313.yaml index b2054600..737d38b5 100644 --- a/.ci_support/linux_ppc64le_numpy2.1python3.13.____cp313.yaml +++ b/.ci_support/linux_ppc64le_numpy2.1python3.13.____cp313.yaml @@ -1,3 +1,5 @@ +ace: +- 8.0.1 c_compiler: - gcc c_compiler_version: diff --git a/.ci_support/osx_64_numpy2.0python3.10.____cpython.yaml b/.ci_support/osx_64_numpy2.0python3.10.____cpython.yaml index 3c988b9c..72d3083a 100644 --- a/.ci_support/osx_64_numpy2.0python3.10.____cpython.yaml +++ b/.ci_support/osx_64_numpy2.0python3.10.____cpython.yaml @@ -2,6 +2,8 @@ MACOSX_DEPLOYMENT_TARGET: - '10.13' MACOSX_SDK_VERSION: - '10.13' +ace: +- 8.0.1 c_compiler: - clang c_compiler_version: diff --git a/.ci_support/osx_64_numpy2.0python3.11.____cpython.yaml b/.ci_support/osx_64_numpy2.0python3.11.____cpython.yaml index af3dba98..64aa3b51 100644 --- a/.ci_support/osx_64_numpy2.0python3.11.____cpython.yaml +++ b/.ci_support/osx_64_numpy2.0python3.11.____cpython.yaml @@ -2,6 +2,8 @@ MACOSX_DEPLOYMENT_TARGET: - '10.13' MACOSX_SDK_VERSION: - '10.13' +ace: +- 8.0.1 c_compiler: - clang c_compiler_version: diff --git a/.ci_support/osx_64_numpy2.0python3.12.____cpython.yaml b/.ci_support/osx_64_numpy2.0python3.12.____cpython.yaml index f68cc0ff..e5a7eac3 100644 --- a/.ci_support/osx_64_numpy2.0python3.12.____cpython.yaml +++ b/.ci_support/osx_64_numpy2.0python3.12.____cpython.yaml @@ -2,6 +2,8 @@ MACOSX_DEPLOYMENT_TARGET: - '10.13' MACOSX_SDK_VERSION: - '10.13' +ace: +- 8.0.1 c_compiler: - clang c_compiler_version: diff --git a/.ci_support/osx_64_numpy2.1python3.13.____cp313.yaml b/.ci_support/osx_64_numpy2.1python3.13.____cp313.yaml index d74107d7..ed5b4498 100644 --- a/.ci_support/osx_64_numpy2.1python3.13.____cp313.yaml +++ b/.ci_support/osx_64_numpy2.1python3.13.____cp313.yaml @@ -2,6 +2,8 @@ MACOSX_DEPLOYMENT_TARGET: - '10.13' MACOSX_SDK_VERSION: - '10.13' +ace: +- 8.0.1 c_compiler: - clang c_compiler_version: diff --git a/.ci_support/osx_arm64_numpy2.0python3.10.____cpython.yaml b/.ci_support/osx_arm64_numpy2.0python3.10.____cpython.yaml index 7e463db6..4a4e2777 100644 --- a/.ci_support/osx_arm64_numpy2.0python3.10.____cpython.yaml +++ b/.ci_support/osx_arm64_numpy2.0python3.10.____cpython.yaml @@ -2,6 +2,8 @@ MACOSX_DEPLOYMENT_TARGET: - '11.0' MACOSX_SDK_VERSION: - '11.0' +ace: +- 8.0.1 c_compiler: - clang c_compiler_version: diff --git a/.ci_support/osx_arm64_numpy2.0python3.11.____cpython.yaml b/.ci_support/osx_arm64_numpy2.0python3.11.____cpython.yaml index 917fb123..141661f4 100644 --- a/.ci_support/osx_arm64_numpy2.0python3.11.____cpython.yaml +++ b/.ci_support/osx_arm64_numpy2.0python3.11.____cpython.yaml @@ -2,6 +2,8 @@ MACOSX_DEPLOYMENT_TARGET: - '11.0' MACOSX_SDK_VERSION: - '11.0' +ace: +- 8.0.1 c_compiler: - clang c_compiler_version: diff --git a/.ci_support/osx_arm64_numpy2.0python3.12.____cpython.yaml b/.ci_support/osx_arm64_numpy2.0python3.12.____cpython.yaml index 2dff2f43..60835e5a 100644 --- a/.ci_support/osx_arm64_numpy2.0python3.12.____cpython.yaml +++ b/.ci_support/osx_arm64_numpy2.0python3.12.____cpython.yaml @@ -2,6 +2,8 @@ MACOSX_DEPLOYMENT_TARGET: - '11.0' MACOSX_SDK_VERSION: - '11.0' +ace: +- 8.0.1 c_compiler: - clang c_compiler_version: diff --git a/.ci_support/osx_arm64_numpy2.1python3.13.____cp313.yaml b/.ci_support/osx_arm64_numpy2.1python3.13.____cp313.yaml index 1a21400f..f73fa269 100644 --- a/.ci_support/osx_arm64_numpy2.1python3.13.____cp313.yaml +++ b/.ci_support/osx_arm64_numpy2.1python3.13.____cp313.yaml @@ -2,6 +2,8 @@ MACOSX_DEPLOYMENT_TARGET: - '11.0' MACOSX_SDK_VERSION: - '11.0' +ace: +- 8.0.1 c_compiler: - clang c_compiler_version: diff --git a/.ci_support/win_64_numpy2.0python3.10.____cpython.yaml b/.ci_support/win_64_numpy2.0python3.10.____cpython.yaml index 3e72eda5..b8b18ff5 100644 --- a/.ci_support/win_64_numpy2.0python3.10.____cpython.yaml +++ b/.ci_support/win_64_numpy2.0python3.10.____cpython.yaml @@ -1,3 +1,5 @@ +ace: +- 8.0.1 c_compiler: - vs2019 c_stdlib: diff --git a/.ci_support/win_64_numpy2.0python3.11.____cpython.yaml b/.ci_support/win_64_numpy2.0python3.11.____cpython.yaml index 57450686..fe80fcdb 100644 --- a/.ci_support/win_64_numpy2.0python3.11.____cpython.yaml +++ b/.ci_support/win_64_numpy2.0python3.11.____cpython.yaml @@ -1,3 +1,5 @@ +ace: +- 8.0.1 c_compiler: - vs2019 c_stdlib: diff --git a/.ci_support/win_64_numpy2.0python3.12.____cpython.yaml b/.ci_support/win_64_numpy2.0python3.12.____cpython.yaml index 9150c0a6..3d162d08 100644 --- a/.ci_support/win_64_numpy2.0python3.12.____cpython.yaml +++ b/.ci_support/win_64_numpy2.0python3.12.____cpython.yaml @@ -1,3 +1,5 @@ +ace: +- 8.0.1 c_compiler: - vs2019 c_stdlib: diff --git a/.ci_support/win_64_numpy2.1python3.13.____cp313.yaml b/.ci_support/win_64_numpy2.1python3.13.____cp313.yaml index 1199acd4..1913d523 100644 --- a/.ci_support/win_64_numpy2.1python3.13.____cp313.yaml +++ b/.ci_support/win_64_numpy2.1python3.13.____cp313.yaml @@ -1,9 +1,11 @@ +ace: +- 8.0.1 c_compiler: - vs2019 c_stdlib: - vs channel_sources: -- conda-forge/label/python_rc,conda-forge/label/llvm_rc,conda-forge +- conda-forge/label/python_rc,conda-forge channel_targets: - conda-forge main cxx_compiler: diff --git a/.scripts/build_steps.sh b/.scripts/build_steps.sh index ba4b251c..856f469d 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 65650bf2..a45c34fd 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 a2185ae6..9d117705 100644 --- a/README.md +++ b/README.md @@ -338,6 +338,3 @@ Feedstock Maintainers * [@ocefpaf](https://github.com/ocefpaf/) * [@rgommers](https://github.com/rgommers/) - - - diff --git a/build-locally.py b/build-locally.py index 8ac9b846..6788aea6 100755 --- a/build-locally.py +++ b/build-locally.py @@ -1,5 +1,5 @@ #!/bin/sh -"""exec' "python3" "$0" "$@" #""" # fmt: off # fmt: on +"""exec" "python3" "$0" "$@" #""" # fmt: off # fmt: on # # This file has been generated by conda-smithy in order to build the recipe # locally. From ad6c7241c7ffb9855f99e8e9cfbac88bec15bbae Mon Sep 17 00:00:00 2001 From: jaimergp Date: Thu, 3 Oct 2024 19:05:08 +0200 Subject: [PATCH 3/3] MINIFORGE_HOME: C:\Miniforge --- conda-forge.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/conda-forge.yml b/conda-forge.yml index 70bf473c..56c55b5d 100644 --- a/conda-forge.yml +++ b/conda-forge.yml @@ -2,6 +2,7 @@ azure: settings_win: variables: CONDA_BLD_PATH: C:\\bld\\ + MINIFORGE_HOME: C:\Miniforge build_platform: linux_aarch64: linux_64 linux_ppc64le: linux_64