Skip to content

Commit 251355c

Browse files
authored
Add support for Django 5.2 (#298)
* fix: add support for django 5.2
1 parent 640c1df commit 251355c

File tree

7 files changed

+78
-5
lines changed

7 files changed

+78
-5
lines changed

.annotation_safe_list.yml

Lines changed: 55 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,61 @@ auth.Group:
1313
".. no_pii:": "This model has no PII"
1414
auth.Permission:
1515
".. no_pii:": "This model has no PII"
16+
auth.User:
17+
".. pii": "This model minimally contains a username, password, and email"
18+
".. pii_types": "username, email_address, password"
19+
".. pii_retirement": "consumer_api"
1620
contenttypes.ContentType:
1721
".. no_pii:": "This model has no PII"
18-
sessions.Session:
22+
oel_collections.Collection:
23+
".. no_pii:": "This model has no PII"
24+
oel_collections.CollectionPublishableEntity:
25+
".. no_pii:": "This model has no PII"
26+
oel_components.Component:
27+
".. no_pii:": "This model has no PII"
28+
oel_components.ComponentType:
29+
".. no_pii:": "This model has no PII"
30+
oel_components.ComponentVersion:
31+
".. no_pii:": "This model has no PII"
32+
oel_components.ComponentVersionContent:
33+
".. no_pii:": "This model has no PII"
34+
oel_contents.Content:
35+
".. no_pii:": "This model has no PII"
36+
oel_contents.MediaType:
37+
".. no_pii:": "This model has no PII"
38+
oel_publishing.Container:
39+
".. no_pii:": "This model has no PII"
40+
oel_publishing.ContainerVersion:
41+
".. no_pii:": "This model has no PII"
42+
oel_publishing.Draft:
43+
".. no_pii:": "This model has no PII"
44+
oel_publishing.EntityList:
45+
".. no_pii:": "This model has no PII"
46+
oel_publishing.EntityListRow:
47+
".. no_pii:": "This model has no PII"
48+
oel_publishing.LearningPackage:
49+
".. no_pii:": "This model has no PII"
50+
oel_publishing.PublishLog:
51+
".. no_pii:": "This model has no PII"
52+
oel_publishing.PublishLogRecord:
53+
".. no_pii:": "This model has no PII"
54+
oel_publishing.PublishableEntity:
55+
".. no_pii:": "This model has no PII"
56+
oel_publishing.PublishableEntityVersion:
57+
".. no_pii:": "This model has no PII"
58+
oel_publishing.Published:
59+
".. no_pii:": "This model has no PII"
60+
oel_tagging.ObjectTag:
61+
".. no_pii:": "This model has no PII"
62+
oel_tagging.Tag:
63+
".. no_pii:": "This model has no PII"
64+
oel_tagging.TagImportTask:
65+
".. no_pii:": "This model has no PII"
66+
oel_tagging.Taxonomy:
67+
".. no_pii:": "This model has no PII"
68+
oel_units.Unit:
69+
".. no_pii:": "This model has no PII"
70+
oel_units.UnitVersion:
1971
".. no_pii:": "This model has no PII"
2072
social_django.Association:
2173
".. no_pii:": "This model has no PII"
@@ -29,6 +81,8 @@ social_django.Partial:
2981
".. no_pii:": "This model has no PII"
3082
social_django.UserSocialAuth:
3183
".. no_pii:": "This model has no PII"
84+
sessions.Session:
85+
".. no_pii:": "This model has no PII"
3286
waffle.Flag:
3387
".. no_pii:": "This model has no PII"
3488
waffle.Sample:

.github/workflows/ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
matrix:
1818
os: [ubuntu-latest] # Add macos-latest later?
1919
python-version: ['3.11', '3.12']
20-
toxenv: ["django42", "package", "quality"]
20+
toxenv: ["django42", "django52", "package", "quality"]
2121
# We're only testing against MySQL 8 right now because 5.7 is
2222
# incompatible with Djagno 4.2. We'd have to make the tox.ini file more
2323
# complicated than it's worth given the short expected shelf-life of

openedx_learning/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@
22
Open edX Learning ("Learning Core").
33
"""
44

5-
__version__ = "0.19.2"
5+
__version__ = "0.20.0"
Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
# Generated by Django 5.2 on 2025-04-08 10:50
2+
3+
from django.db import migrations
4+
5+
6+
class Migration(migrations.Migration):
7+
8+
dependencies = [
9+
('oel_publishing', '0004_publishableentity_can_stand_alone'),
10+
]
11+
12+
operations = [
13+
migrations.AlterModelOptions(
14+
name='entitylistrow',
15+
options={'ordering': ['order_num']},
16+
),
17+
]

requirements/base.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ attrs # Reduces boilerplate code involving class attributes
55

66
celery # Asynchronous task execution library
77

8-
Django<5.0 # Web application framework
8+
Django # Web application framework
99

1010
djangorestframework<4.0 # REST API
1111
edx-drf-extensions # Extensions to the Django REST Framework used by Open edX

setup.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -86,6 +86,7 @@ def is_requirement(line):
8686
'Development Status :: 3 - Alpha',
8787
'Framework :: Django',
8888
'Framework :: Django :: 4.2',
89+
'Framework :: Django :: 5.2',
8990
'Intended Audience :: Developers',
9091
'License :: OSI Approved :: GNU Affero General Public License v3 or later (AGPLv3+)',
9192
'Natural Language :: English',

tox.ini

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
[tox]
2-
envlist = py{311,312}-django{42}, quality, docs, pii_check, lint-imports
2+
envlist = py{311,312}-django{42,52}, quality, docs, pii_check, lint-imports
33

44
[doc8]
55
; D001 = Line too long
@@ -38,6 +38,7 @@ norecursedirs = .* docs requirements site-packages
3838
deps =
3939
setuptools
4040
django42: Django>=4.2,<5.0
41+
django52: Django>=5.2,<6.0
4142
-r{toxinidir}/requirements/test.txt
4243
setenv =
4344
# Note that the django32/django42 targets use MySQL, but running pytest by

0 commit comments

Comments
 (0)