diff --git a/pytest.ini b/pytest.ini index 4e4608cd10d..a1664faa58f 100644 --- a/pytest.ini +++ b/pytest.ini @@ -22,6 +22,7 @@ filterwarnings = ignore:DateTimeField .* received a naive datetime .* while time zone support is active:RuntimeWarning ignore:.*:DeprecationWarning - ignore:.*:django.utils.deprecation.RemovedInDjango60Warning + # TODO: uncomment after upgrading to Django 5.2.x + # ignore:.*:django.utils.deprecation.RemovedInDjango60Warning ignore:.*:elasticsearch.exceptions.ElasticsearchWarning ignore:.*:PendingDeprecationWarning diff --git a/readthedocs/oauth/models.py b/readthedocs/oauth/models.py index 4753410de64..44430622ff2 100644 --- a/readthedocs/oauth/models.py +++ b/readthedocs/oauth/models.py @@ -74,7 +74,7 @@ class GitHubAppInstallation(TimeStampedModel): ) target_type = models.CharField( help_text=_("Account type that the target_id belongs to (user or organization)"), - choices=GitHubAccountType, + choices=GitHubAccountType.choices, max_length=255, ) extra_data = models.JSONField( diff --git a/requirements/deploy.txt b/requirements/deploy.txt index 74316dfc8f1..d5e4c51973d 100644 --- a/requirements/deploy.txt +++ b/requirements/deploy.txt @@ -105,7 +105,7 @@ dj-pagination==2.5.0 # via -r requirements/pip.txt dj-stripe==2.6.3 # via -r requirements/pip.txt -django==5.2 +django==4.2.20 # via # -r requirements/pip.txt # dj-stripe diff --git a/requirements/docker.txt b/requirements/docker.txt index 4d4dd1a9828..255174984b6 100644 --- a/requirements/docker.txt +++ b/requirements/docker.txt @@ -113,7 +113,7 @@ dj-pagination==2.5.0 # via -r requirements/pip.txt dj-stripe==2.6.3 # via -r requirements/pip.txt -django==5.2 +django==4.2.20 # via # -r requirements/pip.txt # dj-stripe diff --git a/requirements/pip.in b/requirements/pip.in index 0f1a510dec7..a8a0b4a0a29 100644 --- a/requirements/pip.in +++ b/requirements/pip.in @@ -2,7 +2,7 @@ pip virtualenv -django~=5.2.0 +django~=4.2.0 django-extensions django-polymorphic django-autoslug diff --git a/requirements/pip.txt b/requirements/pip.txt index 4fe05eaf3fe..b220236c2dc 100644 --- a/requirements/pip.txt +++ b/requirements/pip.txt @@ -68,7 +68,7 @@ dj-pagination==2.5.0 # via -r requirements/pip.in dj-stripe==2.6.3 # via -r requirements/pip.in -django==5.2 +django==4.2.20 # via # -r requirements/pip.in # dj-stripe diff --git a/requirements/testing.txt b/requirements/testing.txt index a463e979c01..337f437ae9f 100644 --- a/requirements/testing.txt +++ b/requirements/testing.txt @@ -110,7 +110,7 @@ dj-pagination==2.5.0 # via -r requirements/pip.txt dj-stripe==2.6.3 # via -r requirements/pip.txt -django==5.2 +django==4.2.20 # via # -r requirements/pip.txt # dj-stripe