Make scripts in config.yml relative to config.yml #4860
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
Speedlulu
force-pushed
the
relative_config_path
branch
from
ee31f1b
to
2e7d234
Compare
Speedlulu
force-pushed
the
relative_config_path
branch
from
2e7d234
to
18a0791
Compare
Speedlulu
force-pushed
the
relative_config_path
branch
from
4478012
to
0afacc5
Compare
mhils
force-pushed
the
main
branch
3 times, most recently
from
f0383ea
to
7352811
Compare
Speedlulu
force-pushed
the
relative_config_path
branch
2 times, most recently
from
54dd690
to
9f8d4a8
Compare
mhils
reviewed
Dec 2, 2023
|
No super strong opinion here, I just felt that script_path(...,
relative_to=x) is very readable. Feel free to take it as a regular arg if
you prefer that. :)
…On Sat, Dec 2, 2023, 18:47 Lucas Ficheux ***@***.***> wrote:
***@***.**** commented on this pull request.
------------------------------
In mitmproxy/optmanager.py
<#4860 (comment)>:
> +def compute_path(script_path: str, config_path: str) -> str:
+ """
+ Make relative paths found in config files relative to said config file,
+ instead of relative to where the command is ran.
+ """
+ if os.path.isabs(script_path):
+ return script_path
+ if script_path != os.path.expanduser(script_path):
+ return script_path
+ return os.path.abspath(os.path.join(os.path.dirname(config_path), script_path))
I'll get on it right away.
Just a quick question, why make relative_to a kw_only argument here ?
—
Reply to this email directly, view it on GitHub
<#4860 (comment)>,
or unsubscribe
<https://github.com/notifications/unsubscribe-auth/AAHY2PXCTRHPBWYCDN4UT23YHMIMJAVCNFSM5F5UA2PKU5DIOJSWCZC7NNSXTPCQOVWGYUTFOF2WK43UKJSXM2LFO45TCNZWGA4DMMJVGQ3A>
.
You are receiving this because you commented.Message ID:
***@***.***>
|
Speedlulu
force-pushed
the
relative_config_path
branch
6 times, most recently
from
f2176da
to
73213f6
Compare
mhils
reviewed
Dec 3, 2023
Speedlulu
force-pushed
the
relative_config_path
branch
from
ed58f33
to
c2b0a60
Compare
mhils
reviewed
Dec 4, 2023
Make the paths to scripts found in config.yml relative to the directory where config.yml is instead of where the command is ran.
Speedlulu
force-pushed
the
relative_config_path
branch
from
825e59f
to
37a9b3c
Compare
mhils
approved these changes
Dec 4, 2023
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.
Description
Make the paths to scripts found in config.yml relative to
the directory where config.yml is instead of where the command
is ran.
Checklist