fix: storage compatibility issue for django42

Author: Talha-Rizwan

.github/workflows/ci.yml

@@ -63,7 +63,7 @@ jobs:
           make static
           make tests
       - name: Run code coverage
-        if: matrix.python-version == '3.12' && matrix.django-version == 'django52'
+        if: matrix.python-version == '3.12' && matrix.django-version == 'django42'
         uses: codecov/codecov-action@v5
         with:
           flags: unittests

credentials/apps/core/tests/test_storage_settings.py

@@ -3,7 +3,6 @@
 from os.path import abspath, dirname, join
 
 from corsheaders.defaults import default_headers as corsheaders_default_headers
-import django
 from django.conf.global_settings import LANGUAGES_BIDI
 from edx_toggles.toggles import WaffleSwitch
 from edx_django_utils.plugins import get_plugin_apps, add_plugins
@@ -462,23 +461,14 @@
 EXTRA_APPS = []
 SESSION_EXPIRE_AT_BROWSER_CLOSE = False
 
-DEFAULT_FILE_STORAGE_BACKEND = "django.core.files.storage.FileSystemStorage"
-STATICFILES_STORAGE_BACKEND = "django.contrib.staticfiles.storage.StaticFilesStorage"
-
-if django.VERSION >= (4, 2):
-    # Use new STORAGES setting (available from Django 4.2)
-    STORAGES = {
-        "default": {
-            "BACKEND": DEFAULT_FILE_STORAGE_BACKEND,
-        },
-        "staticfiles": {
-            "BACKEND": STATICFILES_STORAGE_BACKEND,
-        },
-    }
-else:
-    # For Django < 4.2 or packages still using legacy settings
-    DEFAULT_FILE_STORAGE = DEFAULT_FILE_STORAGE_BACKEND
-    STATICFILES_STORAGE = STATICFILES_STORAGE_BACKEND
+STORAGES = {
+    "default": {
+        "BACKEND": "django.core.files.storage.FileSystemStorage",
+    },
+    "staticfiles": {
+        "BACKEND": "django.contrib.staticfiles.storage.ManifestStaticFilesStorage",
+    },
+}
 
 CACHES = {
     "default": {

credentials/settings/base.py

@@ -43,10 +43,12 @@
 EMAIL_BACKEND = "django.core.mail.backends.filebased.EmailBackend"
 EMAIL_FILE_PATH = "/tmp/credentials-emails"
 
-DEFAULT_FILE_STORAGE = os.environ.get("DEFAULT_FILE_STORAGE", "django.core.files.storage.FileSystemStorage")
+DEFAULT_FILE_STORAGE = os.environ.get(STORAGES["default"]["BACKEND"], "django.core.files.storage.FileSystemStorage")
 MEDIA_URL = os.environ.get("MEDIA_URL", "/media/")
 
-STATICFILES_STORAGE = os.environ.get("STATICFILES_STORAGE", "django.contrib.staticfiles.storage.StaticFilesStorage")
+STATICFILES_STORAGE = os.environ.get(
+    STORAGES["staticfiles"]["BACKEND"], "django.contrib.staticfiles.storage.StaticFilesStorage"
+)
 STATIC_URL = os.environ.get("STATIC_URL", "/static/")
 
 # OAuth2 variables specific to social-auth/SSO login use case.

credentials/settings/devstack.py

@@ -36,24 +36,14 @@
 # Local Directories
 TEST_ROOT = path("test_root")
 
-DEFAULT_FILE_STORAGE_BACKEND = "django.core.files.storage.FileSystemStorage"
-STATICFILES_STORAGE_BACKEND = "django.contrib.staticfiles.storage.StaticFilesStorage"
-
-if django.VERSION >= (4, 2):
-    # Use new STORAGES setting (available from Django 4.2)
-    STORAGES = {
-        "default": {
-            "BACKEND": DEFAULT_FILE_STORAGE_BACKEND,
-        },
-        "staticfiles": {
-            "BACKEND": STATICFILES_STORAGE_BACKEND,
-        },
-    }
-else:
-    # For Django < 4.2 or packages still using legacy settings
-    DEFAULT_FILE_STORAGE = DEFAULT_FILE_STORAGE_BACKEND
-    STATICFILES_STORAGE = STATICFILES_STORAGE_BACKEND
-
+STORAGES = {
+    "default": {
+        "BACKEND": "django.core.files.storage.FileSystemStorage",
+    },
+    "staticfiles": {
+        "BACKEND": "django.contrib.staticfiles.storage.StaticFilesStorage",
+    },
+}
 MEDIA_ROOT = str(TEST_ROOT / "uploads")
 MEDIA_URL = "/static/uploads/"