From 26bb2410e5c31ebb479f0127c248e205ba2612eb Mon Sep 17 00:00:00 2001 From: "conda-forge-webservices[bot]" <121827174+conda-forge-webservices[bot]@users.noreply.github.com> Date: Wed, 25 Sep 2024 22:47:05 +0000 Subject: [PATCH 1/7] dummy commit for rerendering --- README.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/README.md b/README.md index 15af27a0..ebfe6fef 100644 --- a/README.md +++ b/README.md @@ -507,3 +507,6 @@ Feedstock Maintainers * [@conda-forge/core](https://github.com/conda-forge/core/) + + + From cb5f89f78a6e7e7a986cfbf911be5541c411aab6 Mon Sep 17 00:00:00 2001 From: jakirkham Date: Wed, 25 Sep 2024 15:57:42 -0700 Subject: [PATCH 2/7] Use `conda-build` version `24.7` --- conda-forge.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/conda-forge.yml b/conda-forge.yml index 0ca5b766..77d3f3c9 100644 --- a/conda-forge.yml +++ b/conda-forge.yml @@ -15,4 +15,5 @@ provider: linux_ppc64le: default remote_ci_setup: - conda-forge-ci-setup=4 + - conda-build=24.7 test: native_and_emulated From 98fd6aad1b26dda43ab9a2b9becdef472fe140ce Mon Sep 17 00:00:00 2001 From: jakirkham Date: Wed, 25 Sep 2024 16:08:54 -0700 Subject: [PATCH 3/7] Consolidate license file handling --- recipe/meta.yaml | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index d555fcd4..9aba4610 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -21,9 +21,6 @@ build: skip: True {% endif %} script: - - cp {{ os.environ["FEEDSTOCK_ROOT"] }}/LICENSE.txt ${RECIPE_DIR}/LICENSE.txt # [linux] - - cp ${RECIPE_DIR}/../LICENSE.txt ${RECIPE_DIR}/LICENSE.txt # [osx] - - COPY "%RECIPE_DIR%\\..\\LICENSE.txt" "%RECIPE_DIR%\\LICENSE.txt" # [win] - if not exist "%LIBRARY_BIN%" mkdir "%LIBRARY_BIN%" # [win] - mkdir -p "${PREFIX}/bin" # [unix] - COPY "%RECIPE_DIR%\\run_conda_forge_build_setup_win.bat" "%SCRIPTS%\\run_conda_forge_build_setup.bat" # [win] @@ -112,7 +109,7 @@ about: home: https://github.com/conda-forge/conda-forge-ci-setup-feedstock summary: A package installed by conda-forge each time a build is run on CI. This package has side-effects to your conda config. license: BSD-3-Clause - license_file: LICENSE.txt + license_file: {{ RECIPE_DIR }}/../LICENSE.txt extra: recipe-maintainers: From 63c540bced35fb747aef0121643629a74ddbc2c4 Mon Sep 17 00:00:00 2001 From: jakirkham Date: Wed, 25 Sep 2024 16:21:59 -0700 Subject: [PATCH 4/7] Try again to fix license file handling --- recipe/meta.yaml | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 9aba4610..011582d5 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -21,6 +21,12 @@ build: skip: True {% endif %} script: + # Copy feedstock license file to recipe directory + - pushd {{ RECIPE_DIR }} + - pushd .. + - cp LICENSE.txt {{ RECIPE_DIR }} + - popd + - popd - if not exist "%LIBRARY_BIN%" mkdir "%LIBRARY_BIN%" # [win] - mkdir -p "${PREFIX}/bin" # [unix] - COPY "%RECIPE_DIR%\\run_conda_forge_build_setup_win.bat" "%SCRIPTS%\\run_conda_forge_build_setup.bat" # [win] @@ -109,7 +115,7 @@ about: home: https://github.com/conda-forge/conda-forge-ci-setup-feedstock summary: A package installed by conda-forge each time a build is run on CI. This package has side-effects to your conda config. license: BSD-3-Clause - license_file: {{ RECIPE_DIR }}/../LICENSE.txt + license_file: {{ RECIPE_DIR }}/LICENSE.txt extra: recipe-maintainers: From 7c73959797e22c1ffe544f1f20e5f18b45711530 Mon Sep 17 00:00:00 2001 From: jakirkham Date: Wed, 25 Sep 2024 16:42:10 -0700 Subject: [PATCH 5/7] Use C compiler when cross-compiling with Python --- recipe/meta.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 011582d5..408f264d 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -58,8 +58,8 @@ requirements: build: # ensure that all variants of cuda_compiler_version are tested - {{ compiler('cuda') }} # [cuda_compiler_version != "None"] - - {{ compiler('c') }} # [cuda_compiler_version != "None"] - - {{ stdlib('c') }} # [cuda_compiler_version != "None"] + - {{ compiler('c') }} # [cuda_compiler_version != "None" or build_platform != target_platform] + - {{ stdlib('c') }} # [cuda_compiler_version != "None" or build_platform != target_platform] - python # [build_platform != target_platform] - cross-python_{{ target_platform }} # [build_platform != target_platform] host: From 5ba9b28cd7c4f637ab938b9037c87f81cdc93430 Mon Sep 17 00:00:00 2001 From: jakirkham Date: Wed, 25 Sep 2024 16:49:40 -0700 Subject: [PATCH 6/7] Use `recipe-scripts-license.txt` for `LICENSE.txt` This does the same thing. We are just now relying on conda-smithy to do it for us. --- recipe/meta.yaml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 408f264d..69996171 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -23,9 +23,7 @@ build: script: # Copy feedstock license file to recipe directory - pushd {{ RECIPE_DIR }} - - pushd .. - - cp LICENSE.txt {{ RECIPE_DIR }} - - popd + - cp recipe-scripts-license.txt LICENSE.txt - popd - if not exist "%LIBRARY_BIN%" mkdir "%LIBRARY_BIN%" # [win] - mkdir -p "${PREFIX}/bin" # [unix] From 43ea176132109bde42f57991caa987e5c739a2cb Mon Sep 17 00:00:00 2001 From: jakirkham Date: Wed, 25 Sep 2024 16:52:14 -0700 Subject: [PATCH 7/7] Use `cross-python` for CUDA case only --- recipe/meta.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 69996171..95e9b991 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -56,10 +56,10 @@ requirements: build: # ensure that all variants of cuda_compiler_version are tested - {{ compiler('cuda') }} # [cuda_compiler_version != "None"] - - {{ compiler('c') }} # [cuda_compiler_version != "None" or build_platform != target_platform] - - {{ stdlib('c') }} # [cuda_compiler_version != "None" or build_platform != target_platform] - - python # [build_platform != target_platform] - - cross-python_{{ target_platform }} # [build_platform != target_platform] + - {{ compiler('c') }} # [cuda_compiler_version != "None"] + - {{ stdlib('c') }} # [cuda_compiler_version != "None"] + - python # [cuda_compiler_version != "None" and build_platform != target_platform] + - cross-python_{{ target_platform }} # [cuda_compiler_version != "None" and build_platform != target_platform] host: - python - pip