Skip to content

Commit 0134ec0

Browse files
committed
Fix tests for Django 6.0
1 parent 26d648f commit 0134ec0

File tree

3 files changed

+7
-5
lines changed

3 files changed

+7
-5
lines changed

tests/typecheck/fields/test_related.yml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1200,6 +1200,7 @@
12001200
)
12011201
12021202
- case: test_many_to_many
1203+
skip: __import__("django").VERSION < (6, 0)
12031204
main: |
12041205
from typing_extensions import reveal_type
12051206
from myapp.models import MyModel, Other
@@ -1273,13 +1274,13 @@
12731274
main:34: note: Revealed type is "django.db.models.manager.Manager[myapp.models.MyModel_auto_through]"
12741275
main:36: note: Revealed type is "myapp.models.Other_ManyRelatedManager[myapp.models.MyModel_auto_through]"
12751276
main:37: note: Revealed type is "type[myapp.models.MyModel_auto_through]"
1276-
main:38: note: Revealed type is "django.db.models.fields._FieldDescriptor[django.db.models.fields.AutoField[django.db.models.expressions.Combinable | builtins.int | builtins.str | None, builtins.int]]"
1277+
main:38: note: Revealed type is "django.db.models.fields._FieldDescriptor[django.db.models.fields.BigAutoField[builtins.float | builtins.int | builtins.str | django.db.models.expressions.Combinable | None, builtins.int]]"
12771278
main:39: note: Revealed type is "myapp.models.Other_ManyRelatedManager[myapp.models.MyModel_other_again]"
12781279
main:40: note: Revealed type is "type[myapp.models.MyModel_other_again]"
1279-
main:41: note: Revealed type is "django.db.models.fields._FieldDescriptor[django.db.models.fields.AutoField[django.db.models.expressions.Combinable | builtins.int | builtins.str | None, builtins.int]]"
1280+
main:41: note: Revealed type is "django.db.models.fields._FieldDescriptor[django.db.models.fields.BigAutoField[builtins.float | builtins.int | builtins.str | django.db.models.expressions.Combinable | None, builtins.int]]"
12801281
main:42: note: Revealed type is "myapp.models.Other_ManyRelatedManager[myapp.models.CustomThrough]"
12811282
main:43: note: Revealed type is "type[myapp.models.CustomThrough]"
1282-
main:44: note: Revealed type is "django.db.models.fields._FieldDescriptor[django.db.models.fields.AutoField[django.db.models.expressions.Combinable | builtins.int | builtins.str, builtins.int]]"
1283+
main:44: note: Revealed type is "django.db.models.fields._FieldDescriptor[django.db.models.fields.BigAutoField[builtins.float | builtins.int | builtins.str | django.db.models.expressions.Combinable | None, builtins.int]]"
12831284
installed_apps:
12841285
- myapp
12851286
files:

tests/typecheck/models/test_create.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@
8686
8787
Book.objects.create(id=None) # E: Incompatible type for "id" of "Book" (got "None", expected "float | int | str | Combinable") [misc]
8888
Book.objects.create(publisher=None) # E: Incompatible type for "publisher" of "Book" (got "None", expected "Publisher | Combinable") [misc]
89-
Book.objects.create(publisher_id=None) # E: Incompatible type for "publisher_id" of "Book" (got "None", expected "Combinable | int | str") [misc]
89+
Book.objects.create(publisher_id=None) # E: Incompatible type for "publisher_id" of "Book" (got "None", expected "float | int | str | Combinable") [misc]
9090
installed_apps:
9191
- myapp
9292
files:

tests/typecheck/models/test_init.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,13 +120,14 @@
120120
mypk = models.IntegerField(primary_key=True)
121121
122122
- case: set_foreign_key_by_its_primary_key
123+
skip: __import__("django").VERSION < (6, 0)
123124
main: |
124125
from datetime import datetime
125126
now = datetime.now()
126127
127128
from myapp.models import Publisher, PublisherDatetime, Book
128129
Book(publisher_id=1, publisher_dt_id=now)
129-
Book(publisher_id=[], publisher_dt_id=now) # E: Incompatible type for "publisher_id" of "Book" (got "list[Any]", expected "Combinable | int | str") [misc]
130+
Book(publisher_id=[], publisher_dt_id=now) # E: Incompatible type for "publisher_id" of "Book" (got "list[Any]", expected "float | int | str | Combinable") [misc]
130131
Book(publisher_id=1, publisher_dt_id=1) # E: Incompatible type for "publisher_dt_id" of "Book" (got "int", expected "str | datetime | date | Combinable") [misc]
131132
installed_apps:
132133
- myapp

0 commit comments

Comments
 (0)