Fix --help/--version when conftest imports models#1275
Open
brianhelba wants to merge 2 commits intopytest-dev:mainfrom
Open
Fix --help/--version when conftest imports models#1275brianhelba wants to merge 2 commits intopytest-dev:mainfrom
--help/--version when conftest imports models#1275brianhelba wants to merge 2 commits intopytest-dev:mainfrom
Conversation
Author
|
@kingbuzzman I was able to fix this myself (and add a test to reproduce the failure). Could you please take a look? |
brianhelba
force-pushed
the
help-conftest
branch
from
617176a to
022848c
Compare
brianhelba
added a commit
to kitware-resonant/django-auth-style
that referenced
this pull request
Mar 7, 2026
Fixed upstream by: pytest-dev/pytest-django#1275
brianhelba
added a commit
to kitware-resonant/django-auth-style
that referenced
this pull request
Mar 9, 2026
Fixed upstream by: pytest-dev/pytest-django#1275
brianhelba
added a commit
to kitware-resonant/django-auth-style
that referenced
this pull request
Mar 9, 2026
Fixed upstream by: pytest-dev/pytest-django#1275
kingbuzzman
requested changes
Mar 9, 2026
Member
kingbuzzman
left a comment
kingbuzzman
left a comment
There was a problem hiding this comment.
This is not a bad addition, please update the changelog.md
Previously, `pytest_load_initial_conftests` returned early when `--help` or `--version` was passed (added by pytest-dev#238), skipping `django.setup()` entirely. This caused conftest files with top-level Django model imports to fail with `AppRegistryNotReady`. Instead of returning early, continue with normal Django initialization, allowing `--help`/`--version` to return properly when everything is valid. If Django is somehow invalid (e.g. incorrect `DJANGO_SETTINGS_MODULE`), add a guard to still return gracefully if `--help`/`--version` is requested. Running real tests would still fail, but these basic informational arguments shouldn't be blocked. Fixes pytest-dev#1152
brianhelba
force-pushed
the
help-conftest
branch
from
d6e1466 to
e016e08
Compare
Author
|
@kingbuzzman Updated |
kingbuzzman
reviewed
Mar 9, 2026
| ^^^^^^^^ | ||
|
|
||
| * Fixed type hints of assert methods to match actual signature (`PR #1271 <https://github.com/pytest-dev/pytest-django/pull/1271>`__) | ||
| * Fix Pytest `--help`/`--version` options when a `conftest.py` file imports Django models (`PR #1275 <https://github.com/pytest-dev/pytest-django/pull/1275>`__). |
Member
There was a problem hiding this comment.
I thought the issue was when your apps we'rent ready, and you didn't care because you were doing a --help
Author
There was a problem hiding this comment.
Right now, if you have any kind of top-level model import in confest.py, running a --help will error out, which what this PR fixes.
Author
There was a problem hiding this comment.
I'm open to feedback on how to better describe this.
The PR is essentially a fix to --help and --version. The models are just the trigger for the previous failure.
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
2 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.
Previously,
pytest_load_initial_conftestsreturned early when--helpor--versionwas passed (added by #238), skippingdjango.setup()entirely. This caused conftest files with top-level Django model imports to fail withAppRegistryNotReady.Instead of returning early, continue with normal Django initialization, allowing
--help/--versionto return properly when everything is valid.If Django is somehow invalid (e.g. incorrect
DJANGO_SETTINGS_MODULE), add a guard to still return gracefully if--help/--versionis requested. Running real tests would still fail, but these basic informational arguments shouldn't be blocked.Fixes #1152