DM-25028 change butler create --config-file to --seed-config & DM-25151 in butler CLI add -h as an alias for --help #297
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
timj
approved these changes
Jun 1, 2020
python/lsst/daf/butler/cli/butler.py
Outdated
| @@ -253,7 +253,7 @@ def get_command(self, context, name): | |||
| return doImport(commands[name][0] + "." + cmdNameToFuncName(name)) | |||
|
|
|||
|
|
|||
| @click.command(cls=LoaderCLI) | |||
| @click.command(cls=LoaderCLI, context_settings=dict(help_option_names=['-h', '--help'])) | |||
There was a problem hiding this comment.
General comment but in daf_butler we always prefer double quotes to single quotes.
There was a problem hiding this comment.
yeah. This was copy/paste and I didn't notice the quotes, will fix.
| @@ -50,7 +49,7 @@ def butler_import(*args, **kwargs): | |||
|
|
|||
| @click.command() | |||
| @repo_argument(help=repo_argument.will_create_repo) | |||
| @config_file_option(help="Path to an existing YAML config file to apply (on top of defaults).") | |||
| @click.option("--seed-config", help="Path to an existing YAML config file to apply (on top of defaults).") | |||
| @click.option("--standalone", is_flag=True, help="Include all defaults in the config file in the repo, " | |||
| "insulating the repo from changes in package defaults.") | |||
| @click.option("--override", "-o", is_flag=True, help="Allow values in the supplied config to override any " | |||
There was a problem hiding this comment.
We probably want to remove the -o here since it's a very rare option and it's likely that we'll be using -o elsewhere.
There was a problem hiding this comment.
Also change text to "...supplied seed config to override all repo defaults"
| from ..cli import butler | ||
|
|
||
|
|
||
| class MockeredTestBase(unittest.TestCase, abc.ABC): |
There was a problem hiding this comment.
at the risk of being too cute, I have a class called Mocker that wraps a static instance of MagicMock. This test uses a Mocker and so is Mockered.
remove -o because --option is a rarely used option and so don't squat on that short option alias. fix the --override help text
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.
No description provided.