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.

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

DM-19583: Config file includes #152

Merged
merged 7 commits into from May 3, 2019
Merged

DM-19583: Config file includes #152

merged 7 commits into from May 3, 2019

Conversation

timj
Copy link
Member

@timj timj commented May 2, 2019

  • Add support for explicitly importing other configs into the hierarchy.
  • Add dumpButlerConfig command to allow a config to be checked.

timj added 2 commits May 2, 2019 13:33
This runs after resolving all the overrides.
Allows a configuration to explicitly read another configuration
that will be merged with subsequent values in the original YAML.
@timj timj force-pushed the tickets/DM-19583 branch 2 times, most recently from 4c4c2d7 to 5211002 Compare May 2, 2019 20:50
bin.src/dumpButlerConfig.py Outdated Show resolved Hide resolved
bin.src/dumpButlerConfig.py Outdated Show resolved Hide resolved
doc/lsst.daf.butler/configuring.rst Outdated Show resolved Hide resolved
doc/lsst.daf.butler/configuring.rst Outdated Show resolved Hide resolved
* The supplied config is read in.
* If any leaf nodes in the configuration end in ``configIncludes`` they values (either a scalar or list) will be treated as the names of other config files.
These files will be located either as an absolute path or relative to the current working directory, or the directory in which the original configuration file was found.
The contents of these files will then be inserted into the configuration at the same hierarchy as the ``configIncludes`` directive, with priority given to the values defined explicitly in the parent configuration (for lists of include files later files overwrite content from earlier ones).
Copy link
Contributor

Choose a reason for hiding this comment

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

fix "lists of include files later files"

Copy link
Member Author

Choose a reason for hiding this comment

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

Fix in what way? I can add a comma after files?

python/lsst/daf/butler/butler.py Outdated Show resolved Hide resolved
Note that when ``standalone=False`` (the default), the configuration
search path (see `ConfigSubset.defaultSearchPaths`) that was used to
construct the repository should also be used to construct any Butlers
to it to avoid configuration inconsistencies.
Copy link
Contributor

Choose a reason for hiding this comment

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

I think this is a very dangerous way to handle things and should be re thought in the future

@timj timj merged commit 1d9d649 into master May 3, 2019
@timj timj deleted the tickets/DM-19583 branch May 3, 2019 20:48
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants