From 2bc6a8ac0a9d9448838857c4a736cfb0a99fc428 Mon Sep 17 00:00:00 2001 From: Arslan Date: Mon, 14 Mar 2022 12:35:42 +0500 Subject: [PATCH] fix: Use PipelineManifestStorage instead of PipelineCachedStorage --- cms/envs/devstack_optimized.py | 2 +- cms/envs/test_static_optimized.py | 3 ++- lms/envs/devstack_optimized.py | 2 +- lms/envs/test_static_optimized.py | 3 ++- openedx/core/lib/django_require/staticstorage.py | 4 ++-- 5 files changed, 8 insertions(+), 6 deletions(-) diff --git a/cms/envs/devstack_optimized.py b/cms/envs/devstack_optimized.py index f4c55b7b8b..b7f4234466 100644 --- a/cms/envs/devstack_optimized.py +++ b/cms/envs/devstack_optimized.py @@ -33,7 +33,7 @@ DEBUG = True REQUIRE_DEBUG = False # Fetch static files out of the pipeline's static root -STATICFILES_STORAGE = 'pipeline.storage.PipelineCachedStorage' +STATICFILES_STORAGE = 'pipeline.storage.PipelineManifestStorage' # Serve static files at /static directly from the staticfiles directory under test root. # Note: optimized files for testing are generated with settings from test_static_optimized diff --git a/cms/envs/test_static_optimized.py b/cms/envs/test_static_optimized.py index d42af8a8a2..61738c9254 100644 --- a/cms/envs/test_static_optimized.py +++ b/cms/envs/test_static_optimized.py @@ -14,6 +14,7 @@ from the same directory. from openedx.core.lib.derived import derive_settings +from openedx.core.lib.django_require.staticstorage import OptimizedCachedRequireJsStorage from .common import * # pylint: disable=wildcard-import, unused-wildcard-import @@ -30,7 +31,7 @@ DATABASES = { ######################### PIPELINE #################################### # Use RequireJS optimized storage -STATICFILES_STORAGE = 'openedx.core.lib.django_require.staticstorage.OptimizedCachedRequireJsStorage' +STATICFILES_STORAGE = f"{OptimizedCachedRequireJsStorage.__module__}.{OptimizedCachedRequireJsStorage.__name__}" # Revert to the default set of finders as we don't want to dynamically pick up files from the pipeline STATICFILES_FINDERS = [ diff --git a/lms/envs/devstack_optimized.py b/lms/envs/devstack_optimized.py index 45072b8ed1..415e0e6c29 100644 --- a/lms/envs/devstack_optimized.py +++ b/lms/envs/devstack_optimized.py @@ -34,7 +34,7 @@ DEBUG = True REQUIRE_DEBUG = False # Fetch static files out of the pipeline's static root -STATICFILES_STORAGE = 'pipeline.storage.PipelineCachedStorage' +STATICFILES_STORAGE = 'pipeline.storage.PipelineManifestStorage' # Serve static files at /static directly from the staticfiles directory under test root. # Note: optimized files for testing are generated with settings from test_static_optimized diff --git a/lms/envs/test_static_optimized.py b/lms/envs/test_static_optimized.py index 2862db1b06..5c9cf06208 100644 --- a/lms/envs/test_static_optimized.py +++ b/lms/envs/test_static_optimized.py @@ -14,6 +14,7 @@ from the same directory. from openedx.core.lib.derived import derive_settings +from openedx.core.lib.django_require.staticstorage import OptimizedCachedRequireJsStorage from .common import * # pylint: disable=wildcard-import, unused-wildcard-import @@ -47,7 +48,7 @@ PROCTORING_BACKENDS = { ######################### PIPELINE #################################### # Use RequireJS optimized storage -STATICFILES_STORAGE = 'openedx.core.lib.django_require.staticstorage.OptimizedCachedRequireJsStorage' +STATICFILES_STORAGE = f"{OptimizedCachedRequireJsStorage.__module__}.{OptimizedCachedRequireJsStorage.__name__}" # Revert to the default set of finders as we don't want to dynamically pick up files from the pipeline STATICFILES_FINDERS = [ diff --git a/openedx/core/lib/django_require/staticstorage.py b/openedx/core/lib/django_require/staticstorage.py index 97a79561fd..e718dbd876 100644 --- a/openedx/core/lib/django_require/staticstorage.py +++ b/openedx/core/lib/django_require/staticstorage.py @@ -2,13 +2,13 @@ :class:`~django_require.staticstorage.OptimizedCachedRequireJsStorage` """ -from pipeline.storage import PipelineCachedStorage +from pipeline.storage import PipelineManifestStorage from require.storage import OptimizedFilesMixin from openedx.core.storage import PipelineForgivingMixin -class OptimizedCachedRequireJsStorage(OptimizedFilesMixin, PipelineForgivingMixin, PipelineCachedStorage): +class OptimizedCachedRequireJsStorage(OptimizedFilesMixin, PipelineForgivingMixin, PipelineManifestStorage): """ Custom storage backend that is used by Django-require. """