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

Use django.contrib.staticfiles instead of django-staticfiles.

Browse Source 
TNL-3137
This commit is contained in:
Usman Khalid
2015-09-08 01:47:11 +05:00
parent 1e799eb508
commit 158bdf4d09
22 changed files with 32 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cms/envs/bok_choy.py
View File

@@ -62,7 +62,7 @@ DEBUG = True
# Note: optimized files for testing are generated with settings from test_static_optimized
STATIC_URL = "/static/"
STATICFILES_FINDERS = (
'staticfiles.finders.FileSystemFinder',
'django.contrib.staticfiles.finders.FileSystemFinder',
)
STATICFILES_DIRS = (
(TEST_ROOT / "staticfiles" / "cms").abspath(),

6
cms/envs/common.py
View File

@@ -463,8 +463,8 @@ STATICFILES_STORAGE = 'openedx.core.lib.django_require.staticstorage.OptimizedCa
# List of finder classes that know how to find static files in various locations.
# Note: the pipeline finder is included to be able to discover optimized files
STATICFILES_FINDERS = [
'staticfiles.finders.FileSystemFinder',
'staticfiles.finders.AppDirectoriesFinder',
'django.contrib.staticfiles.finders.FileSystemFinder',
'django.contrib.staticfiles.finders.AppDirectoriesFinder',
'pipeline.finders.PipelineFinder',
]
@@ -752,7 +752,7 @@ INSTALLED_APPS = (
# For asset pipelining
'edxmako',
'pipeline',
'staticfiles',
'django.contrib.staticfiles',
'static_replace',
'require',

4
cms/envs/devstack.py
View File

@@ -39,8 +39,8 @@ STATICFILES_STORAGE = 'pipeline.storage.NonPackagingPipelineStorage'
# Revert to the default set of finders as we don't want the production pipeline
STATICFILES_FINDERS = [
'staticfiles.finders.FileSystemFinder',
'staticfiles.finders.AppDirectoriesFinder',
'django.contrib.staticfiles.finders.FileSystemFinder',
'django.contrib.staticfiles.finders.AppDirectoriesFinder',
]
############################# ADVANCED COMPONENTS #############################

2
cms/envs/devstack_optimized.py
View File

@@ -36,7 +36,7 @@ REQUIRE_DEBUG = False
# Note: optimized files for testing are generated with settings from test_static_optimized
STATIC_URL = "/static/"
STATICFILES_FINDERS = (
'staticfiles.finders.FileSystemFinder',
'django.contrib.staticfiles.finders.FileSystemFinder',
)
STATICFILES_DIRS = (
(TEST_ROOT / "staticfiles" / "cms").abspath(),

4
cms/envs/test_static_optimized.py
View File

@@ -28,8 +28,8 @@ STATICFILES_STORAGE = 'openedx.core.lib.django_require.staticstorage.OptimizedCa
# Revert to the default set of finders as we don't want to dynamically pick up files from the pipeline
STATICFILES_FINDERS = [
'staticfiles.finders.FileSystemFinder',
'staticfiles.finders.AppDirectoriesFinder',
'django.contrib.staticfiles.finders.FileSystemFinder',
'django.contrib.staticfiles.finders.AppDirectoriesFinder',
]
# Redirect to the test_root folder within the repo