Fix bootstrap --cmake with preloaded CCP4 #2544
Merged
Conversation
This file contains 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
Otherwise, conda is used at the end of the bootstrap process, when running libtbx.precommit.
If we don't do this, it tries to search all HDF5 in path, including broken CCP4
Codecov Report
@@ Coverage Diff @@
## main #2544 +/- ##
=======================================
Coverage 78.81% 78.81%
=======================================
Files 609 609
Lines 74629 74629
Branches 10619 10619
=======================================
+ Hits 58816 58822 +6
+ Misses 13633 13628 -5
+ Partials 2180 2179 -1 |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
The HDF5 CMake configuration files in the CCP4 distribution are incomplete (missing a static library that they refer to), and this causes configuration failures when CCP4 is preloaded (as CMake tries to evaluate all available versions to determine the newest).
This updates bootstrap to force usage of the
conda_base/configuration of HDF5.Additionally, install pre-commit with the rest of the dependencies, so that
libtbx.precommitdoesn't need to install it (using conda, which could be slow).