Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

build: upgrade django-stubs and djangorestframework-stubs #36053

Merged
merged 3 commits into from
Jan 2, 2025
Merged

build: upgrade django-stubs and djangorestframework-stubs #36053

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0372b52
build: upgrade django-stubs and djangorestframework-stubs
kdmccormick Dec 19, 2024
ac6d1f2
build: Very explicitly annotate a model field so that it passes mypy
kdmccormick Jan 2, 2025
33174db
refactor: UsageKeyV2Serializer should be a BaseSerializer
kdmccormick Jan 2, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions openedx/core/djangoapps/content/learning_sequences/models.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,8 @@
yourself to the LearningContext and LearningSequence models. Other tables are
not guaranteed to stick around, and values may be deleted unexpectedly.
"""
from __future__ import annotations

from django.db import models
from model_utils.models import TimeStampedModel

Expand Down Expand Up @@ -214,7 +216,7 @@ class CourseSection(CourseContentVisibilityMixin, TimeStampedModel):
# What is our position within the Course? (starts with 0)
ordering = models.PositiveIntegerField(null=False)

new_user_partition_groups = models.ManyToManyField(
new_user_partition_groups: models.ManyToManyField[UserPartitionGroup, models.Model] = models.ManyToManyField(
UserPartitionGroup,
db_index=True,
related_name='sec_user_partition_groups',
Expand Down Expand Up @@ -280,7 +282,7 @@ class CourseSectionSequence(CourseContentVisibilityMixin, TimeStampedModel):
# sequences across 20 sections, the numbering here would be 0-199.
ordering = models.PositiveIntegerField(null=False)

new_user_partition_groups = models.ManyToManyField(
new_user_partition_groups: models.ManyToManyField[UserPartitionGroup, models.Model] = models.ManyToManyField(
UserPartitionGroup,
db_index=True,
related_name='secseq_user_partition_groups',
Expand Down
2 changes: 1 addition & 1 deletion openedx/core/djangoapps/content_libraries/serializers.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -276,7 +276,7 @@ class ContentLibraryCollectionUpdateSerializer(serializers.Serializer):
description = serializers.CharField(allow_blank=True)


class UsageKeyV2Serializer(serializers.Serializer):
class UsageKeyV2Serializer(serializers.BaseSerializer):
"""
Serializes a UsageKeyV2.
"""
Expand Down
12 changes: 6 additions & 6 deletions requirements/constraints.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,12 +60,12 @@ django-webpack-loader==0.7.0
# Adding pin to avoid any major upgrade
djangorestframework<3.15.0

# Date: 2023-07-19
# The version of django-stubs we can use depends on which Django release we're using
# 1.16.0 works with Django 3.2 through 4.1
# Issue for unpinning: https://github.com/openedx/edx-platform/issues/35275
django-stubs==1.16.0
djangorestframework-stubs==3.14.0 # Pinned to match django-stubs. Remove this when we can remove the above pin.
# Date: 2024-07-19
# Generally speaking, the major version of django-stubs should match the major version of django.
# Specifically, we need to perpetually constrain django-stubs to a compatible version based on:
# https://github.com/typeddjango/django-stubs?tab=readme-ov-file#version-compatibility
# Issue: https://github.com/openedx/edx-platform/issues/35275
django-stubs<5

# Date: 2024-07-23
# django-storages==1.14.4 breaks course imports
Expand Down
12 changes: 3 additions & 9 deletions requirements/edx/development.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -577,7 +577,7 @@ django-storages==1.14.3
# -r requirements/edx/doc.txt
# -r requirements/edx/testing.txt
# edxval
django-stubs==1.16.0
django-stubs==4.2.7
# via
# -c requirements/edx/../constraints.txt
# -r requirements/edx/development.in
Expand Down Expand Up @@ -625,10 +625,8 @@ djangorestframework==3.14.0
# openedx-learning
# ora2
# super-csv
djangorestframework-stubs==3.14.0
# via
# -c requirements/edx/../constraints.txt
# -r requirements/edx/development.in
djangorestframework-stubs==3.14.5
# via -r requirements/edx/development.in
djangorestframework-xml==2.0.0
# via
# -r requirements/edx/doc.txt
Expand Down Expand Up @@ -1301,8 +1299,6 @@ mypy==1.11.2
# via
# -c requirements/edx/../constraints.txt
# -r requirements/edx/development.in
# django-stubs
# djangorestframework-stubs
mypy-extensions==1.0.0
# via mypy
mysqlclient==2.2.6
Expand Down Expand Up @@ -2121,8 +2117,6 @@ tinycss2==1.4.0
# -r requirements/edx/doc.txt
# -r requirements/edx/testing.txt
# bleach
tomli==2.2.1
# via django-stubs
tomlkit==0.13.2
# via
# -r requirements/edx/doc.txt
Expand Down
Loading