From dbcd1bf430d75b1fe2c7d3c7ed08fd48aad9b69d Mon Sep 17 00:00:00 2001 From: Usman Khalid <2200617@gmail.com> Date: Tue, 8 Sep 2015 01:47:11 +0500 Subject: [PATCH] Use django.contrib.staticfiles instead of django-staticfiles. TNL-3137 --- cms/envs/bok_choy.py | 2 +- cms/envs/common.py | 6 +++--- cms/envs/devstack.py | 4 ++-- cms/envs/devstack_optimized.py | 2 +- cms/envs/test_static_optimized.py | 4 ++-- common/djangoapps/pipeline_js/views.py | 2 +- .../pipeline_mako/templates/static_content.html | 2 +- common/djangoapps/static_replace/__init__.py | 4 ++-- common/djangoapps/terrain/browser.py | 17 ----------------- docs/en_us/platform_api/source/conf.py | 4 ++-- lms/djangoapps/branding/__init__.py | 2 +- lms/djangoapps/branding/api.py | 2 +- lms/djangoapps/branding/views.py | 2 +- .../courseware/tests/test_comp_theming.py | 2 +- lms/djangoapps/verify_student/views.py | 2 +- lms/envs/bok_choy.py | 2 +- lms/envs/common.py | 6 +++--- lms/envs/devstack.py | 4 ++-- lms/envs/devstack_optimized.py | 2 +- lms/envs/test_static_optimized.py | 4 ++-- openedx/core/djangoapps/credit/email_utils.py | 2 +- .../user_api/accounts/image_helpers.py | 2 +- requirements/edx/github.txt | 5 ++--- 23 files changed, 33 insertions(+), 51 deletions(-) diff --git a/cms/envs/bok_choy.py b/cms/envs/bok_choy.py index 94f90d46ad..817eedac89 100644 --- a/cms/envs/bok_choy.py +++ b/cms/envs/bok_choy.py @@ -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(), diff --git a/cms/envs/common.py b/cms/envs/common.py index fb05659589..40950d5648 100644 --- a/cms/envs/common.py +++ b/cms/envs/common.py @@ -466,8 +466,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', ] @@ -742,7 +742,7 @@ INSTALLED_APPS = ( # For asset pipelining 'edxmako', 'pipeline', - 'staticfiles', + 'django.contrib.staticfiles', 'static_replace', 'require', diff --git a/cms/envs/devstack.py b/cms/envs/devstack.py index 8abcaf1d33..db003d239b 100644 --- a/cms/envs/devstack.py +++ b/cms/envs/devstack.py @@ -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 ############################# diff --git a/cms/envs/devstack_optimized.py b/cms/envs/devstack_optimized.py index ae2cdd541b..2eaa3da79f 100644 --- a/cms/envs/devstack_optimized.py +++ b/cms/envs/devstack_optimized.py @@ -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(), diff --git a/cms/envs/test_static_optimized.py b/cms/envs/test_static_optimized.py index af030f1633..9b66e3cc45 100644 --- a/cms/envs/test_static_optimized.py +++ b/cms/envs/test_static_optimized.py @@ -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 diff --git a/common/djangoapps/pipeline_js/views.py b/common/djangoapps/pipeline_js/views.py index 6cd97159d4..d64f17b1a4 100644 --- a/common/djangoapps/pipeline_js/views.py +++ b/common/djangoapps/pipeline_js/views.py @@ -4,7 +4,7 @@ Views for returning XModule JS (used by requirejs) import json from django.conf import settings from django.http import HttpResponse -from staticfiles.storage import staticfiles_storage +from django.contrib.staticfiles.storage import staticfiles_storage from edxmako.shortcuts import render_to_response diff --git a/common/djangoapps/pipeline_mako/templates/static_content.html b/common/djangoapps/pipeline_mako/templates/static_content.html index f62abf6635..3b461fa08a 100644 --- a/common/djangoapps/pipeline_mako/templates/static_content.html +++ b/common/djangoapps/pipeline_mako/templates/static_content.html @@ -1,5 +1,5 @@ <%! -from staticfiles.storage import staticfiles_storage +from django.contrib.staticfiles.storage import staticfiles_storage from pipeline_mako import compressed_css, compressed_js from django.utils.translation import get_language_bidi from mako.exceptions import TemplateLookupException diff --git a/common/djangoapps/static_replace/__init__.py b/common/djangoapps/static_replace/__init__.py index 96db5a73b6..b22a1058e1 100644 --- a/common/djangoapps/static_replace/__init__.py +++ b/common/djangoapps/static_replace/__init__.py @@ -1,8 +1,8 @@ import logging import re -from staticfiles.storage import staticfiles_storage -from staticfiles import finders +from django.contrib.staticfiles.storage import staticfiles_storage +from django.contrib.staticfiles import finders from django.conf import settings from xmodule.modulestore.django import modulestore diff --git a/common/djangoapps/terrain/browser.py b/common/djangoapps/terrain/browser.py index 2e9da01e9b..ad3d3e6de9 100644 --- a/common/djangoapps/terrain/browser.py +++ b/common/djangoapps/terrain/browser.py @@ -19,23 +19,6 @@ from json import dumps import xmodule.modulestore.django from xmodule.contentstore.django import _CONTENTSTORE -# There is an import issue when using django-staticfiles with lettuce -# Lettuce assumes that we are using django.contrib.staticfiles, -# but the rest of the app assumes we are using django-staticfiles -# (in particular, django-pipeline and our mako implementation) -# To resolve this, we check whether staticfiles is installed, -# then redirect imports for django.contrib.staticfiles -# to use staticfiles. -try: - import staticfiles - import staticfiles.handlers -except ImportError: - pass -else: - import sys - sys.modules['django.contrib.staticfiles'] = staticfiles - sys.modules['django.contrib.staticfiles.handlers'] = staticfiles.handlers - LOGGER = getLogger(__name__) LOGGER.info("Loading the lettuce acceptance testing terrain file...") diff --git a/docs/en_us/platform_api/source/conf.py b/docs/en_us/platform_api/source/conf.py index 01f2e59a4a..7a61b6b92c 100644 --- a/docs/en_us/platform_api/source/conf.py +++ b/docs/en_us/platform_api/source/conf.py @@ -84,9 +84,9 @@ MOCK_MODULES = [ 'ratelimitbackend', 'analytics', 'courseware.courses', - 'staticfiles', + 'django.contrib.staticfiles', 'storage', - 'staticfiles.storage', + 'django.contrib.staticfiles.storage', 'content', 'xmodule.contentstore', 'xmodule.contentstore.content', diff --git a/lms/djangoapps/branding/__init__.py b/lms/djangoapps/branding/__init__.py index e8fa35ee22..c60c86ff42 100644 --- a/lms/djangoapps/branding/__init__.py +++ b/lms/djangoapps/branding/__init__.py @@ -4,7 +4,7 @@ from django.conf import settings from opaque_keys.edx.locations import SlashSeparatedCourseKey from microsite_configuration import microsite -from staticfiles.storage import staticfiles_storage +from django.contrib.staticfiles.storage import staticfiles_storage def get_visible_courses(): diff --git a/lms/djangoapps/branding/api.py b/lms/djangoapps/branding/api.py index c1bd3c0c4e..2cda491b53 100644 --- a/lms/djangoapps/branding/api.py +++ b/lms/djangoapps/branding/api.py @@ -17,7 +17,7 @@ import urlparse from django.conf import settings from django.utils.translation import ugettext as _ -from staticfiles.storage import staticfiles_storage +from django.contrib.staticfiles.storage import staticfiles_storage from microsite_configuration import microsite from edxmako.shortcuts import marketing_link diff --git a/lms/djangoapps/branding/views.py b/lms/djangoapps/branding/views.py index 17677bdfbd..0ec77ac4ec 100644 --- a/lms/djangoapps/branding/views.py +++ b/lms/djangoapps/branding/views.py @@ -10,7 +10,7 @@ from django.http import HttpResponse, Http404 from django.utils import translation from django.shortcuts import redirect from django.views.decorators.csrf import ensure_csrf_cookie -from staticfiles.storage import staticfiles_storage +from django.contrib.staticfiles.storage import staticfiles_storage from edxmako.shortcuts import render_to_response import student.views diff --git a/lms/djangoapps/courseware/tests/test_comp_theming.py b/lms/djangoapps/courseware/tests/test_comp_theming.py index 56ebca08f8..66f930eeef 100644 --- a/lms/djangoapps/courseware/tests/test_comp_theming.py +++ b/lms/djangoapps/courseware/tests/test_comp_theming.py @@ -5,7 +5,7 @@ from django.conf import settings from django.test import TestCase from path import path # pylint: disable=no-name-in-module -import staticfiles +from django.contrib import staticfiles from openedx.core.djangoapps.theming.test_util import with_comp_theme from openedx.core.lib.tempdir import mkdtemp_clean diff --git a/lms/djangoapps/verify_student/views.py b/lms/djangoapps/verify_student/views.py index 3b4278d520..2c2cd1219b 100644 --- a/lms/djangoapps/verify_student/views.py +++ b/lms/djangoapps/verify_student/views.py @@ -57,7 +57,7 @@ from verify_student.image import decode_image_data, InvalidImageData from util.json_request import JsonResponse from util.date_utils import get_default_time_display from xmodule.modulestore.django import modulestore -from staticfiles.storage import staticfiles_storage +from django.contrib.staticfiles.storage import staticfiles_storage log = logging.getLogger(__name__) diff --git a/lms/envs/bok_choy.py b/lms/envs/bok_choy.py index ac6a5fef74..898504791e 100644 --- a/lms/envs/bok_choy.py +++ b/lms/envs/bok_choy.py @@ -64,7 +64,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" / "lms").abspath(), diff --git a/lms/envs/common.py b/lms/envs/common.py index 90c3c29944..082c046693 100644 --- a/lms/envs/common.py +++ b/lms/envs/common.py @@ -1203,8 +1203,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', ] @@ -1813,7 +1813,7 @@ INSTALLED_APPS = ( # For asset pipelining 'edxmako', 'pipeline', - 'staticfiles', + 'django.contrib.staticfiles', 'static_replace', # Theming diff --git a/lms/envs/devstack.py b/lms/envs/devstack.py index 43fe3704fd..0dd9a187fc 100644 --- a/lms/envs/devstack.py +++ b/lms/envs/devstack.py @@ -91,8 +91,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', ] # Disable JavaScript compression in development diff --git a/lms/envs/devstack_optimized.py b/lms/envs/devstack_optimized.py index 813916c7eb..251ed4f343 100644 --- a/lms/envs/devstack_optimized.py +++ b/lms/envs/devstack_optimized.py @@ -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" / "lms").abspath(), diff --git a/lms/envs/test_static_optimized.py b/lms/envs/test_static_optimized.py index bd810b4a69..58dd303064 100644 --- a/lms/envs/test_static_optimized.py +++ b/lms/envs/test_static_optimized.py @@ -39,8 +39,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 diff --git a/openedx/core/djangoapps/credit/email_utils.py b/openedx/core/djangoapps/credit/email_utils.py index b565d2a198..54c6c8f8f6 100644 --- a/openedx/core/djangoapps/credit/email_utils.py +++ b/openedx/core/djangoapps/credit/email_utils.py @@ -12,7 +12,7 @@ import HTMLParser from django.conf import settings from django.contrib.auth.models import User -from staticfiles import finders +from django.contrib.staticfiles import finders from django.core.cache import cache from django.core.mail import EmailMessage from django.core.urlresolvers import reverse diff --git a/openedx/core/djangoapps/user_api/accounts/image_helpers.py b/openedx/core/djangoapps/user_api/accounts/image_helpers.py index f5058a0d9c..00de36609c 100644 --- a/openedx/core/djangoapps/user_api/accounts/image_helpers.py +++ b/openedx/core/djangoapps/user_api/accounts/image_helpers.py @@ -6,7 +6,7 @@ import hashlib from django.conf import settings from django.core.exceptions import ObjectDoesNotExist from django.core.files.storage import get_storage_class -from staticfiles.storage import staticfiles_storage +from django.contrib.staticfiles.storage import staticfiles_storage from microsite_configuration import microsite diff --git a/requirements/edx/github.txt b/requirements/edx/github.txt index d9882880ec..c06bcf57b3 100644 --- a/requirements/edx/github.txt +++ b/requirements/edx/github.txt @@ -8,8 +8,7 @@ # Python libraries to install directly from github # Third-party: -git+https://github.com/edx/django-staticfiles.git@031bdeaea85798b8c284e2a09977df3e32d06b5d#egg=django-staticfiles==1.2.1.0003 --e git+https://github.com/edx/django-pipeline.git@1.5.3+importfixes#egg=django-pipeline +-e git+https://github.com/cyberdelia/django-pipeline.git@1.5.3#egg=django-pipeline -e git+https://github.com/edx/django-wiki.git@cd0b2b31997afccde519fe5b3365e61a9edb143f#egg=django-wiki -e git+https://github.com/edx/django-oauth2-provider.git@0.2.7-fork-edx-5#egg=django-oauth2-provider -e git+https://github.com/edx/django-rest-framework-oauth.git@f0b503fda8c254a38f97fef802ded4f5fe367f7a#egg=djangorestframework-oauth @@ -41,7 +40,7 @@ git+https://github.com/edx/rfc6266.git@v0.0.5-edx#egg=rfc6266==0.0.5-edx -e git+https://github.com/edx/event-tracking.git@0.2.0#egg=event-tracking -e git+https://github.com/edx-solutions/django-splash.git@7579d052afcf474ece1239153cffe1c89935bc4f#egg=django-splash -e git+https://github.com/edx/acid-block.git@e46f9cda8a03e121a00c7e347084d142d22ebfb7#egg=acid-xblock --e git+https://github.com/edx/edx-ora2.git@release-2015-09-16T15.28#egg=edx-ora2 +-e git+https://github.com/edx/edx-ora2.git@release-2015-09-22T15.43#egg=edx-ora2 -e git+https://github.com/edx/edx-submissions.git@0.1.0#egg=edx-submissions -e git+https://github.com/edx/opaque-keys.git@27dc382ea587483b1e3889a3d19cbd90b9023a06#egg=opaque-keys git+https://github.com/edx/ease.git@release-2015-07-14#egg=ease==0.1.3