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 all 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
13 changes: 7 additions & 6 deletions recipe/meta.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,10 @@ 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 }}
- cp recipe-scripts-license.txt LICENSE.txt
Copy link
Member

Choose a reason for hiding this comment

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

Doesn't this rely on an implementation detail in smithy? It is also very opaque since this file appears nowhere in the actual recipe.

Copy link
Member

Choose a reason for hiding this comment

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

Am ok going back to the previous approach. Was just trying this to see if we could simplify

Copy link
Member

Choose a reason for hiding this comment

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

yeah we should go back and add a .get

- 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 @@ -57,8 +58,8 @@ requirements:
- {{ compiler('cuda') }} # [cuda_compiler_version != "None"]
- {{ compiler('c') }} # [cuda_compiler_version != "None"]
- {{ stdlib('c') }} # [cuda_compiler_version != "None"]
- python # [build_platform != target_platform]
- cross-python_{{ target_platform }} # [build_platform != target_platform]
- python # [cuda_compiler_version != "None" and build_platform != target_platform]
- cross-python_{{ target_platform }} # [cuda_compiler_version != "None" and build_platform != target_platform]
Comment on lines -60 to +62
Copy link
Member

@beckermr beckermr Sep 25, 2024 •
edited
Loading

Choose a reason for hiding this comment

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

This change is wrong. even when cuda compiler version is none we need the cross-python tools for cross-builds of the python package in this recipe.

Copy link
Member

Choose a reason for hiding this comment

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

See the osx-arm64 build failures with this change for example.

Copy link
Member

Choose a reason for hiding this comment

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

Yeah was just trying stuff. Agree this isn't working

Should we consider moving this to noarch using virtual OS packages?

Copy link
Member

Choose a reason for hiding this comment

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

We can but i'd like to understand why this is failing when it did not this morning.

Copy link
Member

Choose a reason for hiding this comment

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

Also, do you know why we need all of the cuda variants?

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 odd

The CUDA variants are for testing ( #93 ). There have been a few rounds of cleanup of these ( for example: #191 ). At this point only CUDA pre-12 uses this, which is only CUDA 11.8. It will go away whenever we drop CUDA 11.8

host:
- python
- pip
Expand Down Expand Up @@ -112,7 +113,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