Support expansion of all path configuration options #7273
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
This commit modifies parsing of all configuration options dealing with paths so that they may be able to expand user home directories and environment variables as per the 'cache_dir' configuration.
hetmankp
force-pushed
the
topic/config-expand-vars
branch
from
c6d6be4 to
f376e57
Compare
msullivan
reviewed
Jul 29, 2019
mypy/config_parser.py
Outdated
| @@ -63,8 +64,9 @@ def split_and_match_files(paths: str) -> List[str]: | |||
| 'python_version': parse_version, | |||
| 'strict_optional_whitelist': lambda s: s.split(), | |||
| 'custom_typing_module': str, | |||
| 'custom_typeshed_dir': str, | |||
| 'mypy_path': lambda s: [p.strip() for p in re.split('[,:]', s)], | |||
| 'custom_typeshed_dir': lambda s: os.path.expandvars(os.path.expanduser(s)), | |||
There was a problem hiding this comment.
How about defining a function that does the two expansions together?
msullivan
reviewed
Jul 29, 2019
|
Ok, let me know if that's what you had in mind. |
|
Yeah! |
| 'custom_typeshed_dir': str, | ||
| 'mypy_path': lambda s: [p.strip() for p in re.split('[,:]', s)], | ||
| 'custom_typeshed_dir': expand_path, | ||
| 'mypy_path': lambda s: [expand_path(p.strip()) for p in re.split('[,:]', s)], | ||
| 'files': split_and_match_files, | ||
| 'quickstart_file': str, | ||
| 'junit_xml': str, |
There was a problem hiding this comment.
Would enabling environment variable interpolation for this config key be as simple as this?
Suggested change
| 'junit_xml': str, | |
| 'junit_xml': expand_path |
There was a problem hiding this comment.
Would enabling environment variable interpolation for this config key be as simple as this?
Yes. Probably should have done this for junit_xml and quickstart_file as well.
There was a problem hiding this comment.
Alright, I'll include that in my PR #8479
ilevkivskyi
pushed a commit
that referenced
this pull request
Mar 6, 2020
…_file config keys (#8479) Expands on the goal of #7273 Exactly what the title says. The docs say this: > Some flags support user home directory and environment variable expansion. To refer to the user home directory, use ~ at the beginning of the path. To expand environment variables use $VARNAME or ${VARNAME}. This would add `quickstart_file` and `junit_xml` to the flags that support environment variable expansion. The only downside I see here is if someone decides they want their JUnit XML ouput file or quickstart file something weird like `$file`
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.
This closes #7272; all options in the configuration file that deal with paths will be expanded for the user home directory and environment variables.