Modify schema defaults and their loading#8639
Merged
natefoo merged 3 commits intogalaxyproject:devfrom Sep 24, 2019
Merged
Conversation
nsoranzo
reviewed
Sep 18, 2019
Member
Author
|
Rebased. |
nsoranzo
added a commit
to nsoranzo/galaxy
that referenced
this pull request
Sep 20, 2019
for config files. Broken in galaxyproject#921 . For context, see galaxyproject#8639 (comment) Includes also elimination of `resolve_path` function as in galaxyproject#8646
nsoranzo
added a commit
to nsoranzo/galaxy
that referenced
this pull request
Sep 20, 2019
for config files. Broken in galaxyproject#921 . For context, see galaxyproject#8639 (comment) Includes also elimination of `resolve_path` function as in galaxyproject#8646
natefoo
reviewed
Sep 23, 2019
Member
natefoo
left a comment
There was a problem hiding this comment.
Just a couple minor things and unfortunately it needs another rebase. 😢
Member
Author
|
Rebased. |
natefoo
approved these changes
Sep 23, 2019
- Modify defaults in the schema so that correct values are loaded (add notes to description where applicable). - When the default in schema was inconcsistent with the default loaded in `__init__.py`, use the latter. - Replace `kwargs.get(foo, default)` with `self.foo` if default is set correctly in the schema. - Remove redundant assignments and variables (there are still more left). - The defalt for `citation_cache_lock_dir` should be `citations/locks`. - In a few cases where defaults are NOT loaded in `__init__.py`, and the values are clearly meant to be suggested values, move those defaults into description.
As per discussion in code review.
This is just a hunch. The test shouldn't fail, and it doesn't fail locally. It seems this might fix it (and point to the cause).
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
5 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.
notes to description where applicable).
in
__init__.py, use the latter.kwargs.get(foo, default)withself.fooif default is setcorrectly in the schema.
left).
citation_cache_lock_dirshould becitations/locks.__init__.py, and thevalues are clearly meant to be suggested values, move those defaults
into description.
Ref #8493
Most likely will need to be resolved against #8610