Build with llnl_units 0.12.3 and cmake4 #3680
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
MridulS
commented
Apr 2, 2025
Comment on lines
+66
to
+75
| tools.replace_in_file( | ||
| "units/units/r20_conv.cpp", | ||
| "namespace units {", | ||
| "namespace UNITS_NAMESPACE {" | ||
| ) | ||
| tools.replace_in_file( | ||
| "units/units/r20_conv.cpp", | ||
| "} // namespace units", | ||
| "} // namespace UNITS_NAMESPACE" | ||
| ) |
Member
Author
There was a problem hiding this comment.
This needs to go upstream.
Member
Author
There was a problem hiding this comment.
We can remove this patch, once we get llnl/units#377 resolved.
This reverts commit 6ee8dd0.
Member
Author
|
This should fix our nightly release. To test it out I also built all the wheels and conda packages https://github.com/scipp/scipp/actions/runs/14217952366. |
MridulS
commented
Apr 2, 2025
Comment on lines
+8
to
+9
| - cmake=4.0.0 | ||
| - conan=1.66.0 |
Member
Author
There was a problem hiding this comment.
sync with wheel building.
MridulS
commented
Apr 2, 2025
| gtest/1.11.0 | ||
| LLNL-Units/0.9.1 | ||
| pybind11/2.13.5 | ||
| gtest/1.15.0 |
Member
Author
There was a problem hiding this comment.
gtest/1.15.2 isn't on conan (unlike conda), so using gtest/1.15.0 while building wheels.
jl-wynen
approved these changes
Apr 2, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.