Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #29403 from mitodl/arslan/fix-pipeline-import

Browse Source 
fix: Inconsistent PipelineCachedStorage usages
This commit is contained in:
Peter Pinch
2022-03-14 07:43:07 -04:00
committed by GitHub
parent b51f65dd03 2bc6a8ac0a
commit 43cf7e6b98
5 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cms/envs/devstack_optimized.py
View File

@@ -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

3
cms/envs/test_static_optimized.py
View File

@@ -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 = [

2
lms/envs/devstack_optimized.py
View File

@@ -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

3
lms/envs/test_static_optimized.py
View File

@@ -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 = [

4
openedx/core/lib/django_require/staticstorage.py
View File

@@ -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.
"""