Cleanup for v4
As discussed in LHCBPS-1808 and #19 (closed) this MR prepares a new empty AppConfig/master for future use as v4r*
-
A protected v3-patches branch has been created from the current master for legacy v3r* use -
All existing options files and scripts have been removed, leaving only those in Sprucing/FEST subdirectory -
Support has been added for use of AppConfig via the PYTHONPATH -
APPCONFIGOPTS and APPCONFIGROOT environment variables has been removed. -
Remaining options files to be adapted so that they can be accessed as python functions
@clemenci could you please modify the files in options/Sprucing/FEST so that the options can be accessed as functions, as you suggest in LHCBPS-1808 and move them to python/AppConfig/Sprucing - this can then be used as examples for future updates
@gcorti @kreps @rmatev @nskidmor @pkoppenb @erodrigu FYI
Closes LHCBPS-1808 #19 (closed)
Merge request reports
Activity
- Resolved by Marco Clemencic
Note that the pipeline fails because of the removal of all the options files... Not much we can do about that!
mentioned in merge request !158 (merged)
mentioned in merge request !161 (merged)
You can of course use
options/Sprucing/FEST
files as examples but note that they are technically "incorrect" and the correct versions exist in !161 (merged)I actually noticed it while testing the refactoring. I'll include here the changes from !161 (merged)
The other options to stay in master are the DaVinci options added by @dfazzini in MR !160 (merged). they could though be put under
.../DaVinci/FEST/
.I'm not able to test the Sprucing in
options/Sprucing/FEST
even after !161 (merged). I'll try with !160 (merged).added 6 commits
- a7b4a912 - Use pre-commit to run basic checks (like formatting)
- d2210546 - Drop Eclipse configuration files and ignore vscode settings
- 88c5b6b8 - Fix typo in AppConfig.xenv
- 71b1b45a - Integrate changes from !161 (merged)
- 67ccc869 - Refactored options from !160 (merged)
- 13baeade - Add example of test for DaVinci FEST configuration
Toggle commit listApart for a bit of clean up, I added some checks via
pre-commit
and refactored the options introduced with !160 (merged).Instead of
lb-run ... gaudirun.py \$APPCONFIGOPTS/DaVinci/Upgrade/FEST/options_read_spruce.py prodConf.py
one can call
lb-run ... gaudirun.py AppConfig.FEST.DaVinci:read_spruce prodConf.py
I also added a test to make sure that the configuration produced is the same as that of the v3 version.
- Resolved by Marco Clemencic
How would people like to proceed with this? If @clemenci you have finished your bit, I would be tempted to make already a v4r0 tag and deployment, to see what fallout we will have from applications that are requesting AppConfig v* ...
I'm not done yet. The refactoring for Sprucing is still missing (it requires lhcb/Moore!1178 (merged) that has been added to lhcb-head only today). I'll look into it this afternoon.
- Resolved by Marco Clemencic
Actually it's better if I wait that !161 (merged) is merged.