Bump mypy 0.950 (#939)

* Bump mypy to 0.95x

* Remove the * for inferred types

There was an upstream change (https://github.com/python/mypy/pull/12459)
to remove * from inferred types in the reveal_type output.

As we are asserting the * to exist, all the test cases are now failing
on the 0.950 release. Removing the expected * to mirror the upstream
behaviour change should resolve the test failures.
This commit is contained in:
Damian Zaremba
2022-04-29 12:44:33 +01:00
committed by GitHub
parent 0caee74490
commit 2ef7ff3309
28 changed files with 217 additions and 217 deletions

View File

@@ -1,14 +1,14 @@
- case: contrib_auth_model_fields
main: |
from django.contrib.auth.models import User
reveal_type(User().username) # N: Revealed type is "builtins.str*"
reveal_type(User().password) # N: Revealed type is "builtins.str*"
reveal_type(User().first_name) # N: Revealed type is "builtins.str*"
reveal_type(User().last_name) # N: Revealed type is "builtins.str*"
reveal_type(User().email) # N: Revealed type is "builtins.str*"
reveal_type(User().username) # N: Revealed type is "builtins.str"
reveal_type(User().password) # N: Revealed type is "builtins.str"
reveal_type(User().first_name) # N: Revealed type is "builtins.str"
reveal_type(User().last_name) # N: Revealed type is "builtins.str"
reveal_type(User().email) # N: Revealed type is "builtins.str"
reveal_type(User().is_staff) # N: Revealed type is "builtins.bool"
reveal_type(User().is_active) # N: Revealed type is "builtins.bool"
reveal_type(User().date_joined) # N: Revealed type is "datetime.datetime*"
reveal_type(User().date_joined) # N: Revealed type is "datetime.datetime"
reveal_type(User().last_login) # N: Revealed type is "Union[datetime.datetime, None]"
reveal_type(User().is_authenticated) # N: Revealed type is "Literal[True]"
reveal_type(User().is_anonymous) # N: Revealed type is "Literal[False]"
@@ -18,11 +18,11 @@
reveal_type(AnonymousUser().is_anonymous) # N: Revealed type is "Literal[True]"
from django.contrib.auth.models import Permission
reveal_type(Permission().name) # N: Revealed type is "builtins.str*"
reveal_type(Permission().codename) # N: Revealed type is "builtins.str*"
reveal_type(Permission().name) # N: Revealed type is "builtins.str"
reveal_type(Permission().codename) # N: Revealed type is "builtins.str"
from django.contrib.auth.models import PermissionsMixin
reveal_type(PermissionsMixin().is_superuser) # N: Revealed type is "builtins.bool"
from django.contrib.auth.models import Group
reveal_type(Group().name) # N: Revealed type is "builtins.str*"
reveal_type(Group().name) # N: Revealed type is "builtins.str"

View File

@@ -19,9 +19,9 @@
main: |
from myapp.models import Child
c = Child.objects.create(name='Maxim', lastname='Maxim2')
reveal_type(c.id) # N: Revealed type is "builtins.int*"
reveal_type(c.name) # N: Revealed type is "builtins.str*"
reveal_type(c.lastname) # N: Revealed type is "builtins.str*"
reveal_type(c.id) # N: Revealed type is "builtins.int"
reveal_type(c.name) # N: Revealed type is "builtins.str"
reveal_type(c.lastname) # N: Revealed type is "builtins.str"
installed_apps:
- myapp
files:
@@ -96,19 +96,19 @@
main: |
from myapp.models import MyModel
first = MyModel(id=None)
reveal_type(first.id) # N: Revealed type is "builtins.int*"
reveal_type(first.id) # N: Revealed type is "builtins.int"
first = MyModel.objects.create(id=None)
reveal_type(first.id) # N: Revealed type is "builtins.int*"
reveal_type(first.id) # N: Revealed type is "builtins.int"
first = MyModel()
first.id = None
reveal_type(first.id) # N: Revealed type is "builtins.int*"
reveal_type(first.id) # N: Revealed type is "builtins.int"
from myapp.models import MyModel2
MyModel2(id=None) # E: Incompatible type for "id" of "MyModel2" (got "None", expected "Union[float, int, str, Combinable]")
MyModel2.objects.create(id=None) # E: Incompatible type for "id" of "MyModel2" (got "None", expected "Union[float, int, str, Combinable]")
second = MyModel2()
second.id = None # E: Incompatible types in assignment (expression has type "None", variable has type "Union[float, int, str, Combinable]")
reveal_type(second.id) # N: Revealed type is "builtins.int*"
reveal_type(second.id) # N: Revealed type is "builtins.int"
# default set but no primary key doesn't allow None
from myapp.models import MyModel3
@@ -116,7 +116,7 @@
MyModel3.objects.create(default=None) # E: Incompatible type for "default" of "MyModel3" (got "None", expected "Union[float, int, str, Combinable]")
third = MyModel3()
third.default = None # E: Incompatible types in assignment (expression has type "None", variable has type "Union[float, int, str, Combinable]")
reveal_type(third.default) # N: Revealed type is "builtins.int*"
reveal_type(third.default) # N: Revealed type is "builtins.int"
installed_apps:
- myapp
files:

View File

@@ -69,7 +69,7 @@
- case: fields_recognized_if_base_model_is_subclass_of_models_model
main: |
from myapp.models import User
reveal_type(User().username) # N: Revealed type is "builtins.str*"
reveal_type(User().username) # N: Revealed type is "builtins.str"
installed_apps:
- myapp
files:
@@ -90,8 +90,8 @@
- case: django_contrib_gis_base_model_mixin_inheritance
main: |
from myapp.models import User
reveal_type(User().name) # N: Revealed type is "builtins.str*"
reveal_type(User().updated_at) # N: Revealed type is "datetime.datetime*"
reveal_type(User().name) # N: Revealed type is "builtins.str"
reveal_type(User().updated_at) # N: Revealed type is "datetime.datetime"
installed_apps:
- myapp
files:

View File

@@ -283,10 +283,10 @@
unset_set_type=[],
)
out: |
main:4: note: Revealed type is "builtins.int*"
main:5: note: Revealed type is "builtins.int*"
main:6: note: Revealed type is "builtins.list*[builtins.int]"
main:7: note: Revealed type is "builtins.int*"
main:4: note: Revealed type is "builtins.int"
main:5: note: Revealed type is "builtins.int"
main:6: note: Revealed type is "builtins.list[builtins.int]"
main:7: note: Revealed type is "builtins.int"
main:8: note: Revealed type is "Any"
main:9: error: Incompatible types in assignment (expression has type "str", variable has type "int")
main:10: error: Incompatible types in assignment (expression has type "str", variable has type "Union[int, float]")

View File

@@ -2,8 +2,8 @@
main: |
from myapp.models import MyModel
x = MyModel.objects.get(id=1)
reveal_type(x.id) # N: Revealed type is "builtins.int*"
reveal_type(x.pk) # N: Revealed type is "builtins.int*"
reveal_type(x.id) # N: Revealed type is "builtins.int"
reveal_type(x.pk) # N: Revealed type is "builtins.int"
MyModel.objects.get(pk=1)
installed_apps:
@@ -15,16 +15,16 @@
from django.db import models
class MyModel(models.Model):
def __str__(self):
reveal_type(self.id) # N: Revealed type is "builtins.int*"
reveal_type(self.pk) # N: Revealed type is "builtins.int*"
reveal_type(self.id) # N: Revealed type is "builtins.int"
reveal_type(self.pk) # N: Revealed type is "builtins.int"
- case: test_access_to_id_field_through_self_if_primary_key_is_defined
main: |
from myapp.models import MyModel
x = MyModel.objects.get(id='a')
reveal_type(x.id) # N: Revealed type is "builtins.str*"
reveal_type(x.pk) # N: Revealed type is "builtins.str*"
reveal_type(x.id) # N: Revealed type is "builtins.str"
reveal_type(x.pk) # N: Revealed type is "builtins.str"
MyModel.objects.get(pk='a')
installed_apps:
@@ -37,16 +37,16 @@
class MyModel(models.Model):
id = models.CharField(max_length=10, primary_key=True)
def __str__(self):
reveal_type(self.id) # N: Revealed type is "builtins.str*"
reveal_type(self.pk) # N: Revealed type is "builtins.str*"
reveal_type(self.id) # N: Revealed type is "builtins.str"
reveal_type(self.pk) # N: Revealed type is "builtins.str"
- case: test_access_to_id_field_through_self_if_primary_key_has_different_name
main: |
from myapp.models import MyModel
x = MyModel.objects.get(primary='a')
reveal_type(x.primary) # N: Revealed type is "builtins.str*"
reveal_type(x.pk) # N: Revealed type is "builtins.str*"
reveal_type(x.primary) # N: Revealed type is "builtins.str"
reveal_type(x.pk) # N: Revealed type is "builtins.str"
x.id # E: "MyModel" has no attribute "id"
MyModel.objects.get(pk='a')
@@ -61,6 +61,6 @@
class MyModel(models.Model):
primary = models.CharField(max_length=10, primary_key=True)
def __str__(self):
reveal_type(self.primary) # N: Revealed type is "builtins.str*"
reveal_type(self.pk) # N: Revealed type is "builtins.str*"
reveal_type(self.primary) # N: Revealed type is "builtins.str"
reveal_type(self.pk) # N: Revealed type is "builtins.str"
self.id # E: "MyModel" has no attribute "id"

View File

@@ -4,7 +4,7 @@
Blog(publisher=Publisher())
Blog.objects.create(publisher=Publisher())
Blog().publisher = Publisher()
reveal_type(Blog().publisher) # N: Revealed type is "myapp.models.PublisherProxy*"
reveal_type(Blog().publisher) # N: Revealed type is "myapp.models.PublisherProxy"
installed_apps:
- myapp
files: