Skip to content

Conversation

@intgr
Copy link
Collaborator

@intgr intgr commented Dec 9, 2025

  • Closes chore(deps): update dependency django to v6 #2929
  • Depending on Python version, Django 6.0 or 5.2 will be used in tests dependency group.
  • Workflows: Updated test matrix to use Django 6.0 x Python 3.12, 3.13
  • Stubtest:
    • Only running with Django 6.0 now.
    • Created new allowlist_todo_django60.txt file.
    • Some old entries could also be removed.
  • Tests: Updated some tests for Django 6.0 and excluded from running with older Django

@intgr intgr changed the title CI: Use Django 5.2 or 6.0 depending on Python version Tests: Update to Django 6.0 on Python 3.12+, otherwise fall back Dec 9, 2025
@intgr intgr changed the title Tests: Update to Django 6.0 on Python 3.12+, otherwise fall back Tests: Update to Django 6.0; fall back to 5.2 on Python <3.12 Dec 9, 2025
@intgr
Copy link
Collaborator Author

intgr commented Dec 9, 2025

It worked! 🤯 🥳

@intgr intgr requested a review from Copilot December 9, 2025 22:11

This comment was marked as resolved.

Book.objects.create(id=None) # E: Incompatible type for "id" of "Book" (got "None", expected "float | int | str | Combinable") [misc]
Book.objects.create(publisher=None) # E: Incompatible type for "publisher" of "Book" (got "None", expected "Publisher | Combinable") [misc]
Book.objects.create(publisher_id=None) # E: Incompatible type for "publisher_id" of "Book" (got "None", expected "Combinable | int | str") [misc]
Book.objects.create(publisher_id=None) # E: Incompatible type for "publisher_id" of "Book" (got "None", expected "float | int | str | Combinable") [misc]
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 is a bit surprising -- where does this float come from? But I don't care enough to spend more time on it, seems mostly harmless.

Copy link
Member

@sobolevn sobolevn left a comment

Choose a reason for hiding this comment

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

Great stuff!

Now we should decide if we are ready to jump into 6.0 support cicle. If we are - merge this right ahead!

@intgr
Copy link
Collaborator Author

intgr commented Dec 9, 2025

Now we should decide if we are ready to jump into 6.0 support cicle.

We don't necessarily want to advertise official Django 6.0 support yet. Not until we have more of the new APIs covered.

But this should be merged regardless -- it's crucial to at least begin work on adding 6.0 APIs.

@intgr intgr added the dependencies Pull requests that update a dependency file label Dec 9, 2025
@intgr
Copy link
Collaborator Author

intgr commented Dec 10, 2025

@UnknownPlatypus Do you want to take a look as well?

@intgr intgr merged commit 5adea71 into typeddjango:master Dec 10, 2025
88 of 89 checks passed
@intgr intgr added this to the Django 6.0 support milestone Dec 11, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

dependencies Pull requests that update a dependency file

Development

Successfully merging this pull request may close these issues.

3 participants