Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

MNT: rerender #349

Closed
wants to merge 7 commits into from
Closed

MNT: rerender #349

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
26bb241
dummy commit for rerendering
conda-forge-webservices[bot] Sep 25, 2024
cb5f89f
Use `conda-build` version `24.7`
jakirkham Sep 25, 2024
98fd6aa
Consolidate license file handling
jakirkham Sep 25, 2024
63c540b
Try again to fix license file handling
jakirkham Sep 25, 2024
7c73959
Use C compiler when cross-compiling with Python
jakirkham Sep 25, 2024
5ba9b28
Use `recipe-scripts-license.txt` for `LICENSE.txt`
jakirkham Sep 25, 2024
43ea176
Use `cross-python` for CUDA case only
jakirkham Sep 25, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions README.md
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions conda-forge.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,5 @@ provider:
linux_ppc64le: default
remote_ci_setup:
- conda-forge-ci-setup=4
- conda-build=24.7
test: native_and_emulated
11 changes: 7 additions & 4 deletions recipe/meta.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,12 @@ 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]
# Copy feedstock license file to recipe directory
- pushd {{ RECIPE_DIR }}
- pushd ..
- cp LICENSE.txt {{ RECIPE_DIR }}
- popd
- popd
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

As we mount the recipe directory and the feedstock directory next to each other...

conda-forge-ci-setup-feedstock/.scripts/run_docker_build.sh

Lines 87 to 88 in 2523297

-v "${RECIPE_ROOT}":/home/conda/recipe_root:rw,z,delegated \
-v "${FEEDSTOCK_ROOT}":/home/conda/feedstock_root:rw,z,delegated \

... pushd {{ RECIPE_DIR }}/.. would resolve to /home/conda (not mention not work on Windows)

To avoid that behavior, we pushd to {{ RECIPE_DIR }}. Once in {{ RECIPE_DIR }}, we are within the feedstock directory's recipe directory. So pushd .. resolves to the feedstock directory (instead of /home/conda as it would have in the other case)

Once we are in the feedstock directory, we can copy the feedstock license file and popd back to where we were

This all works around the issue we saw where FEEDSTOCK_ROOT didn't resolve during re-rendering

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah using .get works fine too. No preference on which we use but I am very confused as to why this fails now.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Agreed it is weird this fails

Though ideally there would be a simple solution so we are not doing different thing for macOS, Linux & Windows

Maybe we can just use recipe-scripts-license.txt

Suggested change
# Copy feedstock license file to recipe directory
- pushd {{ RECIPE_DIR }}
- pushd ..
- cp LICENSE.txt {{ RECIPE_DIR }}
- popd
- popd
# Copy feedstock license file to recipe directory
- pushd {{ RECIPE_DIR }}
- cp recipe-scripts-license.txt LICENSE.txt
- 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]
Expand Down Expand Up @@ -112,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: LICENSE.txt
license_file: {{ RECIPE_DIR }}/LICENSE.txt

extra:
recipe-maintainers:
Expand Down
Loading