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

Jump to bottom

Fea/support embedded patch content #728

Open
wants to merge 7 commits into
base: branch-25.02
Choose a base branch
from
Open

Fea/support embedded patch content #728

wants to merge 7 commits into from

Conversation

robertmaynard
Copy link
Contributor

@robertmaynard robertmaynard commented Dec 9, 2024 •
edited by bdice
Loading

Description

rapids-cmake versions.json files now support embedded patch files. This feature is leveraged by rapids-cmake generated pinned versions.json to make the file full relocatable.

Fixes #718

Checklist

  • I am familiar with the Contributing Guidelines.
  • New or existing tests cover these changes.
  • The documentation is up to date with these changes.
  • The cmake-format.json is up to date with these changes.
  • I have added new files under rapids-cmake/
    • I have added include guards (include_guard(GLOBAL))
    • I have added the associated docs/ rst file and update the api.rst

@robertmaynard robertmaynard added feature request New feature or request non-breaking Introduces a non-breaking change labels Dec 9, 2024
@robertmaynard
Pin files don't incorrectly propagate fields from default json
c1d49c8 
When an override exists the `patch` and `proprietary_binary` fields
from the default entry shouldn't be exported as they are ignored.
@robertmaynard
Update test since rmm doesn't bring in spdlog anymore
aae6f75
@robertmaynard
rapids-cmake now embeds patches directly into json
4cc423c
@robertmaynard robertmaynard force-pushed the fea/support_embedded_patch_content branch from 320d1af to 4cc423c Compare December 12, 2024 16:25
@robertmaynard robertmaynard marked this pull request as ready for review December 16, 2024 18:39
@robertmaynard robertmaynard requested a review from a team as a code owner December 16, 2024 18:39
bdice
bdice approved these changes Jan 8, 2025
View reviewed changes
Copy link
Contributor

@bdice bdice left a comment

Choose a reason for hiding this comment

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

Generally looks good to me! I have a few minor comments.

docs/cpm.rst Outdated Show resolved Hide resolved
docs/cpm.rst Outdated Show resolved Hide resolved
docs/cpm.rst Outdated Show resolved Hide resolved
rapids-cmake/cpm/detail/pinning_write_file.cmake Outdated Show resolved Hide resolved
@robertmaynard robertmaynard force-pushed the fea/support_embedded_patch_content branch from 8e0ec48 to cd82ea3 Compare January 9, 2025 21:36
@robertmaynard robertmaynard force-pushed the fea/support_embedded_patch_content branch from 4d21399 to 3328224 Compare January 13, 2025 19:44
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@bdice bdice bdice approved these changes

Assignees
No one assigned
Labels
feature request New feature or request non-breaking Introduces a non-breaking change
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

[BUG] pinned dependency versions file references patches with the wrong path
2 participants
@robertmaynard @bdice