Commit 130bbd79 by Usman Khalid

Upgrade to django-pipeline v1.5.3.

TNL-3137
parent ecdba730
...@@ -127,3 +127,7 @@ YOUTUBE['TEXT_API']['url'] = "127.0.0.1:{0}/test_transcripts_youtube/".format(YO ...@@ -127,3 +127,7 @@ YOUTUBE['TEXT_API']['url'] = "127.0.0.1:{0}/test_transcripts_youtube/".format(YO
# Generate a random UUID so that different runs of acceptance tests don't break each other # Generate a random UUID so that different runs of acceptance tests don't break each other
import uuid import uuid
SECRET_KEY = uuid.uuid4().hex SECRET_KEY = uuid.uuid4().hex
############################### PIPELINE #######################################
PIPELINE_ENABLED = False
...@@ -458,6 +458,8 @@ EMBARGO_SITE_REDIRECT_URL = None ...@@ -458,6 +458,8 @@ EMBARGO_SITE_REDIRECT_URL = None
############################### PIPELINE ####################################### ############################### PIPELINE #######################################
PIPELINE_ENABLED = True
# Process static files using RequireJS Optimizer # Process static files using RequireJS Optimizer
STATICFILES_STORAGE = 'openedx.core.lib.django_require.staticstorage.OptimizedCachedRequireJsStorage' STATICFILES_STORAGE = 'openedx.core.lib.django_require.staticstorage.OptimizedCachedRequireJsStorage'
......
...@@ -34,6 +34,7 @@ FEATURES['PREVIEW_LMS_BASE'] = "preview." + LMS_BASE ...@@ -34,6 +34,7 @@ FEATURES['PREVIEW_LMS_BASE'] = "preview." + LMS_BASE
########################### PIPELINE ################################# ########################### PIPELINE #################################
# Skip packaging and optimization in development # Skip packaging and optimization in development
PIPELINE_ENABLED = False
STATICFILES_STORAGE = 'pipeline.storage.NonPackagingPipelineStorage' STATICFILES_STORAGE = 'pipeline.storage.NonPackagingPipelineStorage'
# Revert to the default set of finders as we don't want the production pipeline # Revert to the default set of finders as we don't want the production pipeline
......
...@@ -92,7 +92,6 @@ STATICFILES_DIRS += [ ...@@ -92,7 +92,6 @@ STATICFILES_DIRS += [
# http://stackoverflow.com/questions/12816941/unit-testing-with-django-pipeline # http://stackoverflow.com/questions/12816941/unit-testing-with-django-pipeline
STATICFILES_STORAGE = 'pipeline.storage.NonPackagingPipelineStorage' STATICFILES_STORAGE = 'pipeline.storage.NonPackagingPipelineStorage'
STATIC_URL = "/static/" STATIC_URL = "/static/"
PIPELINE_ENABLED = False
# Update module store settings per defaults for tests # Update module store settings per defaults for tests
update_module_store_settings( update_module_store_settings(
......
...@@ -14,7 +14,7 @@ def compressed_css(package_name, raw=False): ...@@ -14,7 +14,7 @@ def compressed_css(package_name, raw=False):
package = packager.package_for('css', package_name) package = packager.package_for('css', package_name)
if settings.PIPELINE: if settings.PIPELINE_ENABLED:
return render_css(package, package.output_filename, raw=raw) return render_css(package, package.output_filename, raw=raw)
else: else:
paths = packager.compile(package.paths) paths = packager.compile(package.paths)
...@@ -48,7 +48,7 @@ def compressed_js(package_name): ...@@ -48,7 +48,7 @@ def compressed_js(package_name):
package = packager.package_for('js', package_name) package = packager.package_for('js', package_name)
if settings.PIPELINE: if settings.PIPELINE_ENABLED:
return render_js(package, package.output_filename) return render_js(package, package.output_filename)
else: else:
paths = packager.compile(package.paths) paths = packager.compile(package.paths)
......
...@@ -190,3 +190,7 @@ if FEATURES.get('ENABLE_COURSEWARE_SEARCH') or \ ...@@ -190,3 +190,7 @@ if FEATURES.get('ENABLE_COURSEWARE_SEARCH') or \
# Generate a random UUID so that different runs of acceptance tests don't break each other # Generate a random UUID so that different runs of acceptance tests don't break each other
import uuid import uuid
SECRET_KEY = uuid.uuid4().hex SECRET_KEY = uuid.uuid4().hex
############################### PIPELINE #######################################
PIPELINE_ENABLED = False
...@@ -131,9 +131,6 @@ if STATIC_URL_BASE: ...@@ -131,9 +131,6 @@ if STATIC_URL_BASE:
if not STATIC_URL.endswith("/"): if not STATIC_URL.endswith("/"):
STATIC_URL += "/" STATIC_URL += "/"
# Enable uglification of JavaScript
PIPELINE_JS_COMPRESSOR = 'pipeline.compressors.uglifyjs.UglifyJSCompressor'
# DEFAULT_COURSE_ABOUT_IMAGE_URL specifies the default image to show for courses that don't provide one # DEFAULT_COURSE_ABOUT_IMAGE_URL specifies the default image to show for courses that don't provide one
DEFAULT_COURSE_ABOUT_IMAGE_URL = ENV_TOKENS.get('DEFAULT_COURSE_ABOUT_IMAGE_URL', DEFAULT_COURSE_ABOUT_IMAGE_URL) DEFAULT_COURSE_ABOUT_IMAGE_URL = ENV_TOKENS.get('DEFAULT_COURSE_ABOUT_IMAGE_URL', DEFAULT_COURSE_ABOUT_IMAGE_URL)
......
...@@ -74,6 +74,9 @@ DEFAULT_FILE_STORAGE = 'django.core.files.storage.FileSystemStorage' ...@@ -74,6 +74,9 @@ DEFAULT_FILE_STORAGE = 'django.core.files.storage.FileSystemStorage'
MEDIA_ROOT = TEST_ROOT / "uploads" MEDIA_ROOT = TEST_ROOT / "uploads"
MEDIA_URL = "/static/uploads/" MEDIA_URL = "/static/uploads/"
# Don't use compression during tests
PIPELINE_JS_COMPRESSOR = None
################################# CELERY ###################################### ################################# CELERY ######################################
CELERY_ALWAYS_EAGER = True CELERY_ALWAYS_EAGER = True
......
...@@ -1195,6 +1195,8 @@ X_FRAME_OPTIONS = 'ALLOW' ...@@ -1195,6 +1195,8 @@ X_FRAME_OPTIONS = 'ALLOW'
############################### PIPELINE ####################################### ############################### PIPELINE #######################################
PIPELINE_ENABLED = True
# Process static files using RequireJS Optimizer # Process static files using RequireJS Optimizer
STATICFILES_STORAGE = 'openedx.core.lib.django_require.staticstorage.OptimizedCachedRequireJsStorage' STATICFILES_STORAGE = 'openedx.core.lib.django_require.staticstorage.OptimizedCachedRequireJsStorage'
...@@ -1206,9 +1208,8 @@ STATICFILES_FINDERS = [ ...@@ -1206,9 +1208,8 @@ STATICFILES_FINDERS = [
'pipeline.finders.PipelineFinder', 'pipeline.finders.PipelineFinder',
] ]
# Don't use compression by default
PIPELINE_CSS_COMPRESSOR = None PIPELINE_CSS_COMPRESSOR = None
PIPELINE_JS_COMPRESSOR = None PIPELINE_JS_COMPRESSOR = 'pipeline.compressors.uglifyjs.UglifyJSCompressor'
# Setting that will only affect the edX version of django-pipeline until our changes are merged upstream # Setting that will only affect the edX version of django-pipeline until our changes are merged upstream
PIPELINE_COMPILE_INPLACE = True PIPELINE_COMPILE_INPLACE = True
......
...@@ -86,6 +86,7 @@ def should_show_debug_toolbar(_): ...@@ -86,6 +86,7 @@ def should_show_debug_toolbar(_):
########################### PIPELINE ################################# ########################### PIPELINE #################################
# Skip packaging and optimization in development # Skip packaging and optimization in development
PIPELINE_ENABLED = False
STATICFILES_STORAGE = 'pipeline.storage.NonPackagingPipelineStorage' STATICFILES_STORAGE = 'pipeline.storage.NonPackagingPipelineStorage'
# Revert to the default set of finders as we don't want the production pipeline # Revert to the default set of finders as we don't want the production pipeline
......
...@@ -129,6 +129,8 @@ XQUEUE_WAITTIME_BETWEEN_REQUESTS = 5 # seconds ...@@ -129,6 +129,8 @@ XQUEUE_WAITTIME_BETWEEN_REQUESTS = 5 # seconds
MOCK_STAFF_GRADING = True MOCK_STAFF_GRADING = True
MOCK_PEER_GRADING = True MOCK_PEER_GRADING = True
############################ STATIC FILES #############################
# TODO (cpennington): We need to figure out how envs/test.py can inject things # TODO (cpennington): We need to figure out how envs/test.py can inject things
# into common.py so that we don't have to repeat this sort of thing # into common.py so that we don't have to repeat this sort of thing
STATICFILES_DIRS = [ STATICFILES_DIRS = [
...@@ -146,7 +148,9 @@ STATICFILES_DIRS += [ ...@@ -146,7 +148,9 @@ STATICFILES_DIRS += [
# find pipelined assets will raise a ValueError. # find pipelined assets will raise a ValueError.
# http://stackoverflow.com/questions/12816941/unit-testing-with-django-pipeline # http://stackoverflow.com/questions/12816941/unit-testing-with-django-pipeline
STATICFILES_STORAGE = 'pipeline.storage.NonPackagingPipelineStorage' STATICFILES_STORAGE = 'pipeline.storage.NonPackagingPipelineStorage'
PIPELINE_ENABLED = False
# Don't use compression during tests
PIPELINE_JS_COMPRESSOR = None
update_module_store_settings( update_module_store_settings(
MODULESTORE, MODULESTORE,
......
<!DOCTYPE html> <!DOCTYPE html>
{% load compressed %} {% load pipeline %}
{% load sekizai_tags i18n microsite %} {% load sekizai_tags i18n microsite %}
{% load url from future %} {% load url from future %}
{% load staticfiles %} {% load staticfiles %}
...@@ -10,13 +10,13 @@ ...@@ -10,13 +10,13 @@
<link rel="icon" type="image/x-icon" href="{% favicon_path %}" /> <link rel="icon" type="image/x-icon" href="{% favicon_path %}" />
{% compressed_css 'style-vendor' %} {% stylesheet 'style-vendor' %}
{% compressed_css 'style-main' %} {% stylesheet 'style-main' %}
{% compressed_css 'style-course-vendor' %} {% stylesheet 'style-course-vendor' %}
{% compressed_css 'style-course' %} {% stylesheet 'style-course' %}
{% block main_vendor_js %} {% block main_vendor_js %}
{% compressed_js 'main_vendor' %} {% javascript 'main_vendor' %}
{% endblock %} {% endblock %}
{% block headextra %}{% endblock %} {% block headextra %}{% endblock %}
{% render_block "css" %} {% render_block "css" %}
...@@ -50,8 +50,8 @@ ...@@ -50,8 +50,8 @@
</div> </div>
{% compressed_js 'application' %} {% javascript 'application' %}
{% compressed_js 'module-js' %} {% javascript 'module-js' %}
{% render_block "js" %} {% render_block "js" %}
</body> </body>
......
{% extends "main_django.html" %} {% extends "main_django.html" %}
{% load compressed %}{% load sekizai_tags i18n microsite %}{% load url from future %}{% load staticfiles %} {% load pipeline %}{% load sekizai_tags i18n microsite %}{% load url from future %}{% load staticfiles %}
{% block title %}<title>{% block pagetitle %}{% endblock %} | {% trans "Wiki" %} | {% platform_name %}</title>{% endblock %} {% block title %}<title>{% block pagetitle %}{% endblock %} | {% trans "Wiki" %} | {% platform_name %}</title>{% endblock %}
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
{% block headextra %} {% block headextra %}
<script type="text/javascript" src="/i18n.js"></script> <script type="text/javascript" src="/i18n.js"></script>
{% compressed_css 'course' %} {% stylesheet 'course' %}
<script type="text/javascript"> <script type="text/javascript">
function ajaxError(){} function ajaxError(){}
......
<!DOCTYPE html> <!DOCTYPE html>
{% load wiki_tags i18n %}{% load compressed %} {% load wiki_tags i18n %}{% load pipeline %}
<html lang="{{LANGUAGE_CODE}}"> <html lang="{{LANGUAGE_CODE}}">
<head> <head>
{% compressed_css 'course' %} {% stylesheet 'course' %}
{% compressed_js 'main_vendor' %} {% javascript 'main_vendor' %}
</head> </head>
<body class="modal-preview"> <body class="modal-preview">
<section class="container wiki view"> <section class="container wiki view">
......
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
# Third-party: # Third-party:
git+https://github.com/edx/django-staticfiles.git@031bdeaea85798b8c284e2a09977df3e32d06b5d#egg=django-staticfiles==1.2.1.0003 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@88ec8a011e481918fdc9d2682d4017c835acd8be#egg=django-pipeline -e git+https://github.com/edx/django-pipeline.git@1.5.3+importfixes#egg=django-pipeline
-e git+https://github.com/edx/django-wiki.git@cd0b2b31997afccde519fe5b3365e61a9edb143f#egg=django-wiki -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-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 -e git+https://github.com/edx/django-rest-framework-oauth.git@f0b503fda8c254a38f97fef802ded4f5fe367f7a#egg=djangorestframework-oauth
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment