Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update to mypy 0.991 for compatible-mypy & CI #1260

Merged
merged 5 commits into from
Jan 24, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion mypy.ini
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,14 @@ ignore_missing_imports = True
incremental = True
strict_optional = True
show_traceback = True
warn_no_return = False
warn_unused_ignores = True
warn_redundant_casts = True
warn_unused_configs = True
warn_unreachable = True
disallow_untyped_defs = true
disallow_incomplete_defs = true
show_error_codes = False
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

show_error_codes default changed in mypy 0.990.

I'm reverting to the old behavior, because so many .yml test files have mypy error messages without the error code.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should we try to work towards show_error_codes = True? It feels reasonable that tests are granular enough to fail if a specific error code changes.

It could be an option to try to resolve this over time. Best thing would probably be to have a linter that disallows type: ignore i.e. without code in the test suite. I suppose that could be tracked in an issue.

disable_error_code = empty-body
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Replaced warn_no_return = False with disable_error_code = empty-body, the latter is less dangerous as it now only applies to empty functions.


plugins =
mypy_django_plugin.main
Expand Down
4 changes: 4 additions & 0 deletions mypy_django_plugin/main.py
Original file line number Diff line number Diff line change
Expand Up @@ -249,6 +249,8 @@ def get_customize_class_mro_hook(self, fullname: str) -> Optional[Callable[[Clas
and sym.node.has_base(fullnames.BASE_MANAGER_CLASS_FULLNAME)
):
return reparametrize_any_manager_hook
else:
return None

def get_base_class_hook(self, fullname: str) -> Optional[Callable[[ClassDefContext], None]]:
# Base class is a Model class definition
Expand Down Expand Up @@ -309,6 +311,8 @@ def get_type_analyze_hook(self, fullname: str) -> Optional[Callable[[AnalyzeType
"django_stubs_ext.annotations.WithAnnotations",
):
return partial(handle_annotated_type, django_context=self.django_context)
else:
return None
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This was added because I removed warn_no_return = False mypy setting.


def get_dynamic_class_hook(self, fullname: str) -> Optional[Callable[[DynamicClassDefContext], None]]:
# Create a new manager class definition when a manager's '.from_queryset' classmethod is called
Expand Down
2 changes: 1 addition & 1 deletion requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,4 @@ psycopg2-binary
-e .[compatible-mypy]

# Overrides:
mypy==0.982
mypy==0.991
8 changes: 8 additions & 0 deletions scripts/enabled_test_modules.py
Original file line number Diff line number Diff line change
Expand Up @@ -113,6 +113,9 @@
'error: "HttpResponse" has no attribute "streaming_content"',
'error: "HttpResponse" has no attribute "context_data"',
'Duplicate module named "apps"',
"Function is missing a return type annotation",
"Function is missing a type annotation",
"Library stubs not installed for ",
],
"admin_checks": ['Argument 1 to "append" of "list" has incompatible type "str"; expected "CheckMessage"'],
"admin_default_site": [
Expand Down Expand Up @@ -512,6 +515,11 @@
"wsgi": [
'"HttpResponse" has no attribute "block_size"',
],
# test_runner_apps/tagged/tests_syntax_error.py
"test_runner_apps": [
"invalid syntax",
"invalid decimal literal",
],
}


Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ def find_stub_files(name: str) -> List[str]:
]

extras_require = {
"compatible-mypy": ["mypy>=0.980,<0.990"],
"compatible-mypy": ["mypy>=0.991,<1.0"],
}

setup(
Expand Down
2 changes: 1 addition & 1 deletion tests/typecheck/contrib/admin/test_options.yml
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@
from django.contrib import admin

class A(admin.ModelAdmin):
fieldsets = [ # type: ignore
fieldsets = [
(None, {}), # E: Missing key "fields" for TypedDict "_FieldOpts"
]
- case: errors_on_invalid_radio_fields
Expand Down