config: apply --override-ini eagerly
#13830
Merged
+53
−30
Conversation
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
bluetech
commented
Oct 19, 2025
| inicfg.update(ini_overrides) | ||
|
|
||
| assert rootdir is not None | ||
| return rootdir, inipath, inicfg or {}, ignored_config_files |
Member
Author
There was a problem hiding this comment.
Unrelated cleanup, the or isn't needed.
nicoddemus
reviewed
Oct 20, 2025
Member
nicoddemus
left a comment
nicoddemus
left a comment
There was a problem hiding this comment.
LGTM
Perhaps mention this in a trivial changelog just in case there is a corner case affected by this?
nicoddemus
approved these changes
Oct 20, 2025
Currently ini overrides are handled lazily in `getini`, but I think it just complicates things and I don't see a reason to it lazily. Do it eagerly in `determine_setup` instead.
bluetech
force-pushed
the
simplify-override-ini
branch
from
44a7fc8 to
15c2e19
Compare
Member
Author
We don't have "trivial" but I added a "misc" one. |
Member
|
FWIW, this also changes behavior (in a good way!). Before this change, We should probably have a test for this, will try to follow up tomorrow. edit: #13980 |
The-Compiler
added a commit
to The-Compiler/pytest
that referenced
this pull request
Nov 18, 2025
This was ignored until pytest-dev#13830. With that change, it now gets correctly surfaced to the user as a warning (or error with --strict-config), so we should have a test for it.
nicoddemus
pushed a commit
that referenced
this pull request
Nov 21, 2025
This was ignored until #13830. With that change, it now gets correctly surfaced to the user as a warning (or error with --strict-config), so we should have a test for it.
nicoddemus
pushed a commit
that referenced
this pull request
Nov 21, 2025
…nvalid option (#13994) * config: Add a test for -o with invalid option (#13980) This was ignored until #13830. With that change, it now gets correctly surfaced to the user as a warning (or error with --strict-config), so we should have a test for it. (cherry picked from commit 9f992b8) * [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --------- Co-authored-by: Florian Bruhin <[email protected]> Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 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.
Currently ini overrides are handled lazily in
getini, but I think it just complicates things and I don't see a reason to do it lazily.Do it eagerly in
determine_setupinstead.