FIX: resolve config-relative paths from config file directory#1650
Open
romanlutz wants to merge 1 commit intomicrosoft:mainfrom
Open
FIX: resolve config-relative paths from config file directory#1650romanlutz wants to merge 1 commit intomicrosoft:mainfrom
romanlutz wants to merge 1 commit intomicrosoft:mainfrom
Conversation
Relative initialization_scripts and env_files paths in YAML config files are now eagerly resolved against the config file's directory at load time in from_yaml_file(), rather than deferring to CWD at resolve time. This fixes the bug where ./scripts/init.py in a config file at /project/config/pyrit.yaml would incorrectly resolve from the caller's working directory instead of /project/config/. CLI path overrides continue to resolve from CWD as expected. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
332a745 to
dc570e8
Compare
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
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.
Summary
Resolve relative
initialization_scriptsandenv_filespaths from the configuration file's directory when loading YAML config files, instead of from the caller's working directory.Problem
ConfigurationLoadercurrently resolves relative paths fromPath.cwd(). When a config file lives in another directory, values like./scripts/init.pypoint to the wrong location.Approach
Eagerly resolve relative paths to absolute in
from_yaml_file()— no hidden state, no plumbing throughload_with_overrides. CLI path overrides continue to resolve from CWD as expected.This is a simplified alternative to #1502.
Validation
pytest tests/unit/setup/test_configuration_loader.py— 51 tests pass