move to external pytest plugin

conftest.py

@@ -1,3 +0,0 @@
-pytest_plugins = [
-    'test.pytest_plugin'
-]

dev-requirements.txt

@@ -1,4 +1,5 @@
 -r external/mypy/test-requirements.txt
 -e external/mypy
 -e .
-decorator
+decorator
+pip install -e git+https://github.com/mkurnikov/pytest-mypy-plugins.git#egg=pytest-mypy-plugins

mypy_django_plugin/plugins/related_fields.py

@@ -31,8 +31,7 @@ def get_valid_to_value_or_none(ctx: FunctionContext) -> Optional[Instance]:
 
     arg_type = ctx.arg_types[ctx.arg_names.index('to')][0]
     if not isinstance(arg_type, CallableType):
-        ctx.api.msg.warn(f'to= parameter type {arg_type.__class__.__name__} is not supported',
+        # to= defined as string is not supported
-                         context=ctx.context)
         return None
 
     referred_to_type = arg_type.ret_type

pytest.ini

@@ -1,8 +1,10 @@
 [pytest]
 
-testpaths = test
+testpaths = ./test
 python_files = test*.py
 addopts =
     --tb=native
     -v
-    -s
+    -s
+    --ignore=./external
+    --mypy-ini-file=./test/plugins.ini

test/pytest_tests/base.py

@@ -1,9 +0,0 @@
-from test.pytest_plugin import MypyTypecheckTestCase
-
-
-class BaseDjangoPluginTestCase(MypyTypecheckTestCase):
-    def ini_file(self):
-        return """
-[mypy]
-plugins = mypy_django_plugin.main
-        """

test/pytest_tests/test_model_fields.py

@@ -1,21 +0,0 @@
-from test.pytest_plugin import reveal_type
-from test.pytest_tests.base import BaseDjangoPluginTestCase
-
-
-class TestBasicModelFields(BaseDjangoPluginTestCase):
-    def test_model_field_classes_present_as_primitives(self):
-        from django.db import models
-
-        class User(models.Model):
-            id = models.AutoField(primary_key=True)
-            small_int = models.SmallIntegerField()
-            name = models.CharField(max_length=255)
-            slug = models.SlugField(max_length=255)
-            text = models.TextField()
-
-        user = User()
-        reveal_type(user.id)  # E: Revealed type is 'builtins.int'
-        reveal_type(user.small_int)  # E: Revealed type is 'builtins.int'
-        reveal_type(user.name)  # E: Revealed type is 'builtins.str'
-        reveal_type(user.slug)  # E: Revealed type is 'builtins.str'
-        reveal_type(user.text)  # E: Revealed type is 'builtins.str'

test/pytest_tests/test_model_relations.py

@@ -1,103 +0,0 @@
-from test.pytest_plugin import reveal_type, output
-from test.pytest_tests.base import BaseDjangoPluginTestCase
-
-
-class TestForeignKey(BaseDjangoPluginTestCase):
-    def test_foreign_key_field(self):
-        from django.db import models
-
-        class Publisher(models.Model):
-            pass
-
-        class Book(models.Model):
-            publisher = models.ForeignKey(to=Publisher, on_delete=models.CASCADE,
-                                          related_name='books')
-
-        book = Book()
-        reveal_type(book.publisher)  # E: Revealed type is 'main.Publisher*'
-
-        publisher = Publisher()
-        reveal_type(publisher.books)  # E: Revealed type is 'django.db.models.query.QuerySet[main.Book]'
-
-    def test_every_foreign_key_creates_field_name_with_appended_id(self):
-        from django.db import models
-
-        class Publisher(models.Model):
-            pass
-
-        class Book(models.Model):
-            publisher = models.ForeignKey(to=Publisher, on_delete=models.CASCADE,
-                                          related_name='books')
-
-        book = Book()
-        reveal_type(book.publisher_id)  # E: Revealed type is 'builtins.int'
-
-    def test_foreign_key_different_order_of_params(self):
-        from django.db import models
-
-        class Publisher(models.Model):
-            pass
-
-        class Book(models.Model):
-            publisher = models.ForeignKey(on_delete=models.CASCADE, to=Publisher,
-                                          related_name='books')
-
-        book = Book()
-        reveal_type(book.publisher)  # E: Revealed type is 'main.Publisher*'
-
-        publisher = Publisher()
-        reveal_type(publisher.books)  # E: Revealed type is 'django.db.models.query.QuerySet[main.Book]'
-
-    @output(
-        """
-        main:4: warning: to= parameter type Instance is not supported
-"""
-    )
-    def test_to_parameter_as_string_fallbacks_to_any(self):
-        from django.db import models
-
-        class Book(models.Model):
-            publisher = models.ForeignKey(to='Publisher', on_delete=models.CASCADE)
-
-        book = Book()
-        reveal_type(book.publisher)  # E: Revealed type is 'Any'
-
-
-class TestOneToOneField(BaseDjangoPluginTestCase):
-    def test_onetoone_field(self):
-        from django.db import models
-
-        class User(models.Model):
-            pass
-
-        class Profile(models.Model):
-            user = models.OneToOneField(to=User, on_delete=models.CASCADE, related_name='profile')
-
-        profile = Profile()
-        reveal_type(profile.user)  # E: Revealed type is 'main.User*'
-
-        user = User()
-        reveal_type(user.profile)  # E: Revealed type is 'main.Profile'
-
-    def test_onetoone_field_with_underscore_id(self):
-        from django.db import models
-
-        class User(models.Model):
-            pass
-
-        class Profile(models.Model):
-            user = models.OneToOneField(to=User, on_delete=models.CASCADE, related_name='profile')
-
-        profile = Profile()
-        reveal_type(profile.user_id)  # E: Revealed type is 'builtins.int'
-
-    def test_parameter_to_keyword_may_be_absent(self):
-        from django.db import models
-
-        class User(models.Model):
-            pass
-
-        class Profile(models.Model):
-            user = models.OneToOneField(User, on_delete=models.CASCADE, related_name='profile')
-
-        reveal_type(User().profile)  # E: Revealed type is 'main.Profile'

test/pytest_tests/test_objects_queryset.py

@@ -1,13 +0,0 @@
-from test.pytest_plugin import reveal_type, output
-from test.pytest_tests.base import BaseDjangoPluginTestCase
-
-
-class TestObjectsQueryset(BaseDjangoPluginTestCase):
-    def test_every_model_has_objects_queryset_available(self):
-        from django.db import models
-
-        class User(models.Model):
-            pass
-
-        reveal_type(User.objects)  # E: Revealed type is 'django.db.models.query.QuerySet[main.User]'
-        reveal_type(User.objects.get())  # E: Revealed type is 'main.User*'

test/pytest_tests/test_parse_settings.py

@@ -1,37 +0,0 @@
-from test.pytest_plugin import reveal_type, file, env
-from test.pytest_tests.base import BaseDjangoPluginTestCase
-
-
-class TestParseSettingsFromFile(BaseDjangoPluginTestCase):
-    @env(DJANGO_SETTINGS_MODULE='mysettings')
-    def test_case(self):
-        from django.conf import settings
-
-        reveal_type(settings.ROOT_DIR)  # E: Revealed type is 'builtins.str'
-        reveal_type(settings.OBJ)  # E: Revealed type is 'django.utils.functional.LazyObject'
-        reveal_type(settings.NUMBERS)  # E: Revealed type is 'builtins.list[builtins.str]'
-        reveal_type(settings.DICT)  # E: Revealed type is 'builtins.dict[Any, Any]'
-
-    @file('mysettings.py')
-    def mysettings_py_file(self):
-        SECRET_KEY = 112233
-        ROOT_DIR = '/etc'
-        NUMBERS = ['one', 'two']
-        DICT = {}  # type: ignore
-
-        from django.utils.functional import LazyObject
-
-        OBJ = LazyObject()
-
-
-class TestSettingInitializableToNone(BaseDjangoPluginTestCase):
-    @env(DJANGO_SETTINGS_MODULE='mysettings')
-    def test_case(self):
-        from django.conf import settings
-
-        reveal_type(settings.NONE_SETTING)  # E: Revealed type is 'builtins.object'
-
-    @file('mysettings.py')
-    def mysettings_py_file(self):
-        SECRET_KEY = 112233
-        NONE_SETTING: object = None

test/pytest_tests/test_postgres_fields.py

@@ -1,27 +0,0 @@
-from test.pytest_plugin import reveal_type
-from test.pytest_tests.base import BaseDjangoPluginTestCase
-
-
-class TestArrayField(BaseDjangoPluginTestCase):
-    def test_descriptor_access(self):
-        from django.db import models
-        from django.contrib.postgres.fields import ArrayField
-
-        class User(models.Model):
-            array = ArrayField(base_field=models.Field())
-
-        user = User()
-        reveal_type(user.array)  # E: Revealed type is 'builtins.list[Any]'
-
-    def test_base_field_parsed_into_generic_attribute(self):
-        from django.db import models
-        from django.contrib.postgres.fields import ArrayField
-
-        class User(models.Model):
-            members = ArrayField(base_field=models.IntegerField())
-            members_as_text = ArrayField(base_field=models.CharField(max_length=255))
-
-        user = User()
-        reveal_type(user.members)  # E: Revealed type is 'builtins.list[builtins.int*]'
-        reveal_type(user.members_as_text)  # E: Revealed type is 'builtins.list[builtins.str*]'
-

test/test-data/model-fields.test

@@ -0,0 +1,16 @@
+[CASE test_model_fields_classes_present_as_primitives]
+from django.db import models
+
+class User(models.Model):
+    id = models.AutoField(primary_key=True)
+    small_int = models.SmallIntegerField()
+    name = models.CharField(max_length=255)
+    slug = models.SlugField(max_length=255)
+    text = models.TextField()
+
+user = User()
+reveal_type(user.id)  # E: Revealed type is 'builtins.int'
+reveal_type(user.small_int)  # E: Revealed type is 'builtins.int'
+reveal_type(user.name)  # E: Revealed type is 'builtins.str'
+reveal_type(user.slug)  # E: Revealed type is 'builtins.str'
+reveal_type(user.text)  # E: Revealed type is 'builtins.str'

test/test-data/model-relations.test

@@ -0,0 +1,53 @@
+[CASE test_foreign_key_field_with_related_name]
+from django.db import models
+
+class Publisher(models.Model):
+    pass
+
+class Book(models.Model):
+    publisher = models.ForeignKey(to=Publisher, on_delete=models.CASCADE,
+                                  related_name='books')
+
+book = Book()
+reveal_type(book.publisher)  # E: Revealed type is 'main.Publisher*'
+
+publisher = Publisher()
+reveal_type(publisher.books)  # E: Revealed type is 'django.db.models.query.QuerySet[main.Book]'
+
+[CASE test_foreign_key_field_creates_attribute_with_underscore_id]
+from django.db import models
+
+class Publisher(models.Model):
+    pass
+
+class Book(models.Model):
+    publisher = models.ForeignKey(to=Publisher, on_delete=models.CASCADE,
+                                  related_name='books')
+
+book = Book()
+reveal_type(book.publisher_id)  # E: Revealed type is 'builtins.int'
+
+[CASE test_foreign_key_field_different_order_of_params]
+from django.db import models
+
+class Publisher(models.Model):
+    pass
+
+class Book(models.Model):
+    publisher = models.ForeignKey(on_delete=models.CASCADE, to=Publisher,
+                                  related_name='books')
+
+book = Book()
+reveal_type(book.publisher)  # E: Revealed type is 'main.Publisher*'
+
+publisher = Publisher()
+reveal_type(publisher.books)  # E: Revealed type is 'django.db.models.query.QuerySet[main.Book]'
+
+[CASE test_to_parameter_as_string_fallbacks_to_any]
+from django.db import models
+
+class Book(models.Model):
+    publisher = models.ForeignKey(to='Publisher', on_delete=models.CASCADE)
+
+book = Book()
+reveal_type(book.publisher)  # E: Revealed type is 'Any'

test/test-data/objects-queryset.test

@@ -0,0 +1,8 @@
+[CASE test_every_model_has_objects_queryset_available]
+from django.db import models
+
+class User(models.Model):
+    pass
+
+reveal_type(User.objects)  # E: Revealed type is 'django.db.models.query.QuerySet[main.User]'
+reveal_type(User.objects.get())  # E: Revealed type is 'main.User*'

test/test-data/parse-settings.test

@@ -0,0 +1,29 @@
+[CASE test_settings_are_parsed_into_django_conf_settings]
+from django.conf import settings
+
+reveal_type(settings.ROOT_DIR)  # E: Revealed type is 'builtins.str'
+reveal_type(settings.OBJ)  # E: Revealed type is 'django.utils.functional.LazyObject'
+reveal_type(settings.NUMBERS)  # E: Revealed type is 'builtins.list[builtins.str]'
+reveal_type(settings.DICT)  # E: Revealed type is 'builtins.dict[Any, Any]'
+[env DJANGO_SETTINGS_MODULE=mysettings]
+[file mysettings.py]
+SECRET_KEY = 112233
+ROOT_DIR = '/etc'
+NUMBERS = ['one', 'two']
+DICT = {}  # type: ignore
+
+from django.utils.functional import LazyObject
+
+OBJ = LazyObject()
+
+[CASE test_settings_could_be_defined_in_different_module_and_imported_with_star]
+from django.conf import settings
+
+reveal_type(settings.BASE)  # E: Revealed type is 'builtins.int'
+reveal_type(settings.NESTED)  # E: Revealed type is 'builtins.str'
+[env DJANGO_SETTINGS_MODULE=mysettings]
+[file mysettings.py]
+from base import *
+NESTED = '1122'
+[file base.py]
+BASE = 1

test/test-data/postgres-fields.test

@@ -0,0 +1,21 @@
+[CASE array_field_descriptor_access]
+from django.db import models
+from django.contrib.postgres.fields import ArrayField
+
+class User(models.Model):
+    array = ArrayField(base_field=models.Field())
+
+user = User()
+reveal_type(user.array)  # E: Revealed type is 'builtins.list[Any]'
+
+[CASE array_field_base_field_parsed_into_generic_typevar]
+from django.db import models
+from django.contrib.postgres.fields import ArrayField
+
+class User(models.Model):
+    members = ArrayField(base_field=models.IntegerField())
+    members_as_text = ArrayField(base_field=models.CharField(max_length=255))
+
+user = User()
+reveal_type(user.members)  # E: Revealed type is 'builtins.list[builtins.int*]'
+reveal_type(user.members_as_text)  # E: Revealed type is 'builtins.list[builtins.str*]'