Fix incorrect and add missing annotations for loaddata command #536
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
- Added some of the instance attributes from command arguments: ignore, using, app_label, verbosity, format. - Added class attribute: help. - Fixed return type of find_fixtures.
Contributor
Author
|
CI appears to have failed booting without actually running the tests. If the maintainers are interested in this patch, would they please re-start CI? I don't think I can do it myself. |
Member
|
Done! |
sobolevn
requested changes
Dec 1, 2020
Member
sobolevn
left a comment
sobolevn
left a comment
There was a problem hiding this comment.
Thanks!
Please, double check that all new attrs are not duplicating ones from BaseCommand 👍
This incorporates all type information I could glean from loaddata at django/django@adb40d2. - Remove `help` per review comment: typeddjango#536 (comment) - Add `exclude_models` and `exclude_apps` based on the return type of `..utils.parse_apps_and_model_labels`. - Change `loaddata`'s `fixture_labels` to `Sequence` of `str` instead of `Iterable` because in practice it's a tuple, but at a type level, the important thing is that `loaddata` iterates over `fixture_labels` more than once. General iterables (which include iterators) need not support iteration more than once. - Correct the return type of `parse_name` to account for the possibility that the data and compression formats are `None`. - Correct the return type of `find_fixtures` to be a list of the same type that `parse_name` returns. - Add a type annotation for `SingleZipReader.read`. Django implements the method in a way that actually conflicts with `zipfile.ZipFile.read`'s type. This necessitates a `type: ignore[override]` to keep the tests passing. Mypy is correct that there is an override error, but Django's code is what it is. (And that method's signature was introduced way back in Django version 1.1, commit django/django@089ab18.)
Contributor
Author
|
CI seems ill. All tests and lints pass locally for me with Python 3.7 set up per https://github.com/typeddjango/django-stubs/blob/master/CONTRIBUTING.md |
snejus
pushed a commit
to snejus/django-stubs
that referenced
this pull request
Mar 10, 2021
This incorporates all type information I could glean from loaddata at django/django@adb40d2. - Remove `help` per review comment: typeddjango#536 (comment) - Add `exclude_models` and `exclude_apps` based on the return type of `..utils.parse_apps_and_model_labels`. - Change `loaddata`'s `fixture_labels` to `Sequence` of `str` instead of `Iterable` because in practice it's a tuple, but at a type level, the important thing is that `loaddata` iterates over `fixture_labels` more than once. General iterables (which include iterators) need not support iteration more than once. - Correct the return type of `parse_name` to account for the possibility that the data and compression formats are `None`. - Correct the return type of `find_fixtures` to be a list of the same type that `parse_name` returns. - Add a type annotation for `SingleZipReader.read`. Django implements the method in a way that actually conflicts with `zipfile.ZipFile.read`'s type. This necessitates a `type: ignore[override]` to keep the tests passing. Mypy is correct that there is an override error, but Django's code is what it is. (And that method's signature was introduced way back in Django version 1.1, commit django/django@089ab18.)
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.
ignore,using,app_label,verbosity,format.help.find_fixtures.