Enable mypy strict mode (#2517)

Author: sobolevn

mypy.ini

@@ -1,37 +1,43 @@
 # Regular configuration file (can be used as base in other projects, runs in CI)
 
 [mypy]
+# Modified in `tests.yml`
+incremental = true
+
+# Strictness:
 allow_redefinition = true
 check_untyped_defs = true
+# TODO: add type args to all generics
+disallow_any_generics = false
+# TODO: fix `Any` subclassing in `typeshed/builtins.pyi`
+disallow_subclassing_any = false
 ignore_missing_imports = false
-incremental = true
-strict_optional = true
-show_traceback = true
-warn_unused_ignores = true
-warn_redundant_casts = true
-warn_unused_configs = true
+strict = true
+strict_bytes = true
+local_partial_types = true
 warn_unreachable = true
-disallow_untyped_defs = true
-disallow_incomplete_defs = true
-disable_error_code = empty-body
+
 # TODO: update our output assertions to match a new syntax
 force_uppercase_builtins = true
 force_union_syntax = true
 
+disable_error_code = empty-body
 enable_error_code = deprecated
 
+show_traceback = true
 
 plugins =
     mypy_django_plugin.main,
     mypy.plugins.proper_plugin
 
-# Ignore incomplete hints in yaml-stubs
+# Ignore incomplete hints in 3rd party stubs:
 [mypy-yaml.*]
 disallow_untyped_defs = false
 disallow_incomplete_defs = false
 
 [mypy-cryptography.*]
 ignore_errors = true
 
+# Our settings:
 [mypy.plugins.django-stubs]
 django_settings_module = scripts.django_tests_settings

tests/typecheck/fields/test_related.yml

@@ -227,7 +227,7 @@
         -   path: myapp/__init__.py
         -   path: myapp/models/__init__.py
             content: |
-                from .app import App
+                from .app import App as App
         -   path: myapp/models/app.py
             content: |
                 from django.db import models
@@ -254,7 +254,7 @@
         -   path: myapp/__init__.py
         -   path: myapp/models/__init__.py
             content: |
-                from .user import User
+                from .user import User as User
         -   path: myapp/models/user.py
             content: |
                 from django.db import models
@@ -279,9 +279,9 @@
         -   path: myapp/__init__.py
         -   path: myapp/models/__init__.py
             content: |
-                from .user import User
-                from .profile import Profile
-                from .app import App
+                from .user import User as User
+                from .profile import Profile as Profile
+                from .app import App as App
         -   path: myapp/models/user.py
             content: |
                 from django.db import models
@@ -466,8 +466,8 @@
         -   path: myapp/__init__.py
         -   path: myapp/models/__init__.py
             content: |
-                from .publisher import Publisher
-                from .book import Book
+                from .publisher import Publisher as Publisher
+                from .book import Book as Book
         -   path: myapp/models/publisher.py
             content: |
                 from django.db import models
@@ -489,7 +489,7 @@
         -   path: myapp/__init__.py
         -   path: myapp/models/__init__.py
             content: |
-                from .book import Book
+                from .book import Book as Book
         -   path: myapp/models/publisher.py
             content: |
                 from django.db import models
@@ -836,7 +836,8 @@
         reveal_type(Order().products)  # N: Revealed type is "myapp.models.Product_RelatedManager"
         reveal_type(Order().products.get())  # N: Revealed type is "myapp.models.Product"
         reveal_type(Order().products.queryset_method())  # N: Revealed type is "builtins.int"
-        if 1 == 2:
+        cond: bool
+        if cond:
             manager = User().products
         else:
             manager = Order().products
@@ -1338,8 +1339,8 @@
         -   path: myapp/__init__.py
         -   path: myapp/models/__init__.py
             content: |
-                from .child import Child
-                from .parent import Parent
+                from .child import Child as Child
+                from .parent import Parent as Parent
         -   path: myapp/models/parent.py
             content: |
                 from django.db import models

tests/typecheck/managers/querysets/test_annotate.yml

@@ -11,26 +11,26 @@
         print(annotated_user.asdf) # E: "User@AnnotatedWith[TypedDict({'foo': Any})]" has no attribute "asdf"  [attr-defined]
         print(unannotated_user.asdf) # E: "User" has no attribute "asdf"  [attr-defined]
 
-        def func(user: Annotated[User, Annotations]) -> str:  # E: Missing required TypedDict parameter for generic type Annotations  [misc]
-            return user.asdf  # E: "User" has no attribute "asdf"  [attr-defined]
+        def func(user: Annotated[User, Annotations]) -> None:  # E: Missing required TypedDict parameter for generic type Annotations  [misc]
+            user.asdf  # E: "User" has no attribute "asdf"  [attr-defined]
 
         # Due to the error on 'func' it should fall back to expecting 'User'
-        reveal_type(func)  # N: Revealed type is "def (user: myapp.models.User) -> builtins.str"
+        reveal_type(func)  # N: Revealed type is "def (user: myapp.models.User)"
         func(unannotated_user)
         func(annotated_user)
 
-        def func2(user: WithAnnotations[User]) -> str:
-            return user.asdf  # E: "User" has no attribute "asdf"  [attr-defined]
+        def func2(user: WithAnnotations[User]) -> None:
+            user.asdf  # E: "User" has no attribute "asdf"  [attr-defined]
 
         # With only one argument to 'WithAnnotations' it should fall back to expecting 'User'
-        reveal_type(func2)  # N: Revealed type is "def (user: myapp.models.User) -> builtins.str"
+        reveal_type(func2)  # N: Revealed type is "def (user: myapp.models.User)"
         func2(unannotated_user)
         func2(annotated_user)
 
-        def func3(user: WithAnnotations) -> str: ...
+        def func3(user: WithAnnotations) -> None: ...
 
         # With no arguments to 'WithAnnotations' it should become 'Any'
-        reveal_type(func3)  # N: Revealed type is "def (user: Any) -> builtins.str"
+        reveal_type(func3)  # N: Revealed type is "def (user: Any)"
         func3(unannotated_user)
         func3(annotated_user)
     installed_apps:

tests/typecheck/managers/test_managers.yml

@@ -156,7 +156,7 @@
         -   path: myapp/models/__init__.py
             content: |
                 from django.db import models
-                from .main import Inventory
+                from .main import Inventory as Inventory
                 class Band(models.Model):
                     pass
         -   path: myapp/models/main.py

tests/typecheck/test_forms.yml

@@ -83,7 +83,8 @@
 
         class BrokenArticleChoiceField(forms.ModelChoiceField[Article]):
             def label_from_instance(self, obj: Article) -> str:
-                return obj.title # E: "Article" has no attribute "title"  [attr-defined]
+                obj.title # E: "Article" has no attribute "title"  [attr-defined]
+                return 'a'
 
         class ArticleMultipleChoiceField(forms.ModelMultipleChoiceField[Article]):
             def label_from_instance(self, obj: Article) -> str: