Fix "STATICFILES_STORAGE/STORAGES are mutually exclusive" on Django>=4.2

This commit is contained in:
Ran Benita 2023-01-24 13:55:09 +02:00
parent befe7f1e0d
commit ced6bd1c27
3 changed files with 8 additions and 0 deletions

View file

@ -52,6 +52,12 @@ class ConfigurationBase(type):
# https://github.com/django/django/commit/226ebb17290b604ef29e82fb5c1fbac3594ac163#diff-ec2bed07bb264cb95a80f08d71a47c06R163-R170
if "PASSWORD_RESET_TIMEOUT" in settings_vars:
deprecated_settings.add("PASSWORD_RESET_TIMEOUT_DAYS")
# DEFAULT_FILE_STORAGE and STATICFILES_STORAGE are deprecated
# in favor of STORAGES.
# https://docs.djangoproject.com/en/dev/releases/4.2/#custom-file-storages
if "STORAGES" in settings_vars:
deprecated_settings.add("DEFAULT_FILE_STORAGE")
deprecated_settings.add("STATICFILES_STORAGE")
for deprecated_setting in deprecated_settings:
if deprecated_setting in settings_vars:
del settings_vars[deprecated_setting]

View file

@ -6,6 +6,7 @@ Changelog
unreleased
^^^^^^^^^^
- Add compatibility with Django 4.2 - fix "STATICFILES_STORAGE/STORAGES are mutually exclusive" error.
- Test Django 4.1.3+ on Python 3.11
v2.4 (2022-08-24)

View file

@ -30,6 +30,7 @@ deps =
dj32: django~=3.2.9
dj40: django~=4.0.0
dj41: django~=4.1.3
dj42: django~=4.2.0a1
djmain: https://github.com/django/django/archive/main.tar.gz
coverage
coverage_enable_subprocess