Skip to content

Commit ebf6d4d

Browse files
authored
Downgrade to Django 4.2.x due to djstripe (#12145)
We need to upgrade `djstripe` first because the admin is broken otherwise. See #9706
1 parent e11c7e2 commit ebf6d4d

File tree

7 files changed

+8
-7
lines changed

7 files changed

+8
-7
lines changed

pytest.ini

+2-1
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ filterwarnings =
2222
ignore:DateTimeField .* received a naive datetime .* while time zone support is active:RuntimeWarning
2323
ignore:.*:DeprecationWarning
2424

25-
ignore:.*:django.utils.deprecation.RemovedInDjango60Warning
25+
# TODO: uncomment after upgrading to Django 5.2.x
26+
# ignore:.*:django.utils.deprecation.RemovedInDjango60Warning
2627
ignore:.*:elasticsearch.exceptions.ElasticsearchWarning
2728
ignore:.*:PendingDeprecationWarning

readthedocs/oauth/models.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ class GitHubAppInstallation(TimeStampedModel):
7474
)
7575
target_type = models.CharField(
7676
help_text=_("Account type that the target_id belongs to (user or organization)"),
77-
choices=GitHubAccountType,
77+
choices=GitHubAccountType.choices,
7878
max_length=255,
7979
)
8080
extra_data = models.JSONField(

requirements/deploy.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ dj-pagination==2.5.0
105105
# via -r requirements/pip.txt
106106
dj-stripe==2.6.3
107107
# via -r requirements/pip.txt
108-
django==5.2
108+
django==4.2.20
109109
# via
110110
# -r requirements/pip.txt
111111
# dj-stripe

requirements/docker.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ dj-pagination==2.5.0
113113
# via -r requirements/pip.txt
114114
dj-stripe==2.6.3
115115
# via -r requirements/pip.txt
116-
django==5.2
116+
django==4.2.20
117117
# via
118118
# -r requirements/pip.txt
119119
# dj-stripe

requirements/pip.in

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
pip
33
virtualenv
44

5-
django~=5.2.0
5+
django~=4.2.0
66
django-extensions
77
django-polymorphic
88
django-autoslug

requirements/pip.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ dj-pagination==2.5.0
6868
# via -r requirements/pip.in
6969
dj-stripe==2.6.3
7070
# via -r requirements/pip.in
71-
django==5.2
71+
django==4.2.20
7272
# via
7373
# -r requirements/pip.in
7474
# dj-stripe

requirements/testing.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ dj-pagination==2.5.0
110110
# via -r requirements/pip.txt
111111
dj-stripe==2.6.3
112112
# via -r requirements/pip.txt
113-
django==5.2
113+
django==4.2.20
114114
# via
115115
# -r requirements/pip.txt
116116
# dj-stripe

0 commit comments

Comments
 (0)