Skip to content

Commit

Permalink
build: Upgrade django-stubs even further, to fix mypy
Browse files Browse the repository at this point in the history
Rather than constraining django-stubs' major version to our django
major version (4.x.x), we are going to go one ahead (5.x.x), as
recommended by python/mypy#17958

Also includes an unrelated common_constraints update.
  • Loading branch information
kdmccormick committed Jan 7, 2025
1 parent 41c25cf commit 3d99ebb
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 10 deletions.
4 changes: 4 additions & 0 deletions requirements/common_constraints.txt
Original file line number Diff line number Diff line change
Expand Up @@ -28,3 +28,7 @@ elasticsearch<7.14.0
# Cause: https://github.com/openedx/edx-lint/issues/458
# This can be unpinned once https://github.com/openedx/edx-lint/issues/459 has been resolved.
pip<24.3

# Cause: https://github.com/openedx/edx-lint/issues/475
# This can be unpinned once https://github.com/openedx/edx-lint/issues/476 has been resolved.
urllib3<2.3.0
8 changes: 5 additions & 3 deletions requirements/constraints.txt
Original file line number Diff line number Diff line change
Expand Up @@ -61,11 +61,13 @@ django-webpack-loader==0.7.0
djangorestframework<3.15.0

# 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:
# Generally speaking, the major version of django-stubs either match the major version
# of django, or exceed it by 1. So, we will need toperpetually constrain django-stubs and
# update it as we perform django upgrades. For more details, see:
# https://github.com/typeddjango/django-stubs?tab=readme-ov-file#version-compatibility
# including the note on "Partial Support".
# Issue: https://github.com/openedx/edx-platform/issues/35275
django-stubs<5
django-stubs<6

# Date: 2024-07-23
# django-storages==1.14.4 breaks course imports
Expand Down
12 changes: 5 additions & 7 deletions requirements/edx/development.txt
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,7 @@ asgiref==3.8.1
# django
# django-cors-headers
# django-countries
# django-stubs
asn1crypto==1.5.1
# via
# -r requirements/edx/doc.txt
Expand Down Expand Up @@ -577,7 +578,7 @@ django-storages==1.14.3
# -r requirements/edx/doc.txt
# -r requirements/edx/testing.txt
# edxval
django-stubs==4.2.7
django-stubs==5.1.1
# via
# -c requirements/edx/../constraints.txt
# -r requirements/edx/development.in
Expand Down Expand Up @@ -625,7 +626,7 @@ djangorestframework==3.14.0
# openedx-learning
# ora2
# super-csv
djangorestframework-stubs==3.14.5
djangorestframework-stubs==3.15.2
# via -r requirements/edx/development.in
djangorestframework-xml==2.0.0
# via
Expand Down Expand Up @@ -1292,9 +1293,7 @@ multidict==6.1.0
# aiohttp
# yarl
mypy==1.14.1
# via
# -c requirements/edx/../constraints.txt
# -r requirements/edx/development.in
# via -r requirements/edx/development.in
mypy-extensions==1.0.0
# via mypy
mysqlclient==2.2.6
Expand Down Expand Up @@ -2118,8 +2117,6 @@ tqdm==4.67.1
# -r requirements/edx/testing.txt
# nltk
# openai
types-pytz==2024.2.0.20241003
# via django-stubs
types-pyyaml==6.0.12.20240917
# via
# django-stubs
Expand Down Expand Up @@ -2170,6 +2167,7 @@ uritemplate==4.1.1
# google-api-python-client
urllib3==2.2.3
# via
# -c requirements/edx/../common_constraints.txt
# -r requirements/edx/doc.txt
# -r requirements/edx/testing.txt
# botocore
Expand Down

0 comments on commit 3d99ebb

Please sign in to comment.