Remove django-compressor, it's no longer needed

The CDN frontend compresses JavaScript and CSS instead.

Author: vdboor

Dockerfile

@@ -85,11 +85,9 @@ RUN rm /app/src/*/settings/local.py* && \
     chmod -R go+rw /app/web/media/ /app/web/static/CACHE /tmp/demo.db
 
 # Insert main code (still as root), then reduce permissions
-# Allow to mount the compressor cache as volume too for sharing between pods.
 COPY deployment/docker/uwsgi.ini /app/uwsgi.ini
 CMD ["/usr/local/bin/uwsgi", "--ini", "/app/uwsgi.ini"]
 VOLUME /app/web/media
-VOLUME /app/web/static/CACHE
 
 # Tag the docker image
 ARG GIT_VERSION

README.rst

@@ -62,7 +62,6 @@ Some application settings can be overwritten by defining these environment varia
 
 * ``ALLOWED_HOSTS`` A list of hostnames, or ``*`` for all.
 * ``CACHE_URL`` to point to a cache server (memcached/redis, e.g. ``memcache://127.0.0.1:11211?TIMEOUT=86400&KEY_PREFIX=fluentdemo``).
-* ``COMPRESS_ENABLED`` True/False (to disable django-compressor_)
 * ``CSRF_COOKIE_SECURE`` True/False
 * ``DATABASE_URL`` to point to a database (e.g. ``postgresql://user:pass@host/dbname``).
 * ``DJANGO_DEBUG`` True/False
@@ -159,7 +158,6 @@ The django-fluent modules are licensed under the Apache License Version 2.0.
 .. Add links here:
 
 .. _django-fluent: http://django-fluent.org/
-.. _django-compressor: https://django-compressor.readthedocs.io/
 .. _django-environ: https://django-environ.readthedocs.io/
 .. _LiveReload: http://livereload.com/
 .. _SASS: http://sass-lang.com/

src/fluentdemo/settings/defaults.py

@@ -84,7 +84,6 @@
     'django.contrib.sites',
     'django.contrib.sitemaps',
     'django.contrib.staticfiles',
-    'compressor',
 
     # Site parts
     'frontend',
@@ -174,12 +173,8 @@
 STATICFILES_FINDERS = (
     'django.contrib.staticfiles.finders.FileSystemFinder',
     'django.contrib.staticfiles.finders.AppDirectoriesFinder',
-    'compressor.finders.CompressorFinder',
 )
 
-# Generate cache-busing static file names that can have a far-future expire headers
-STATICFILES_STORAGE = 'whitenoise.storage.CompressedManifestStaticFilesStorage'
-
 MIDDLEWARE = (
     'raven.contrib.django.middleware.SentryMiddleware',  # make 'request' available on all logs.
     'raven.contrib.django.middleware.Sentry404CatchMiddleware',  # on 404, report to sentry.
@@ -317,19 +312,6 @@
 
 COMMENTS_APP = 'fluent_comments'
 
-COMPRESS_CSS_HASHING_METHOD = None  # WhiteNoise already hashes files. Use 'content' otherwise for multi-server setups
-
-COMPRESS_CSS_FILTERS = (
-    'compressor.filters.css_default.CssAbsoluteFilter',
-    'compressor.filters.cssmin.CSSMinFilter',
-)
-
-COMPRESS_JS_FILTERS = (
-    'compressor.filters.jsmin.JSMinFilter',
-)
-
-COMPRESS_ENABLED = env.bool('COMPRESS_ENABLED', not DEBUG)
-
 DJANGO_WYSIWYG_FLAVOR = 'tinymce_advanced'
 
 FILE_UPLOAD_PERMISSIONS = 0o644  # Avoid 600 permission for filebrowser uploads.

src/fluentdemo/settings/docker.py

@@ -7,12 +7,6 @@
 CACHES['axes'] = env.cache(default='dummycache://')
 AXES_CACHE = 'axes'
 
-# When the container restarts, and memcache still indicates the files are present,
-# django-compressor will not recreate the files on the fly. Better use offline compression
-CACHES['compressor'] = env.cache('COMPRESSOR_CACHE', 'locmemcache://')
-COMPRESS_CACHE_BACKEND = 'compressor'
-COMPRESS_STORAGE = 'compressor.storage.GzipCompressorFileStorage'  # generate .gz too for uwsgi static-gzip-dir
-
 # Need to different way to get the release, since there is no .git folder to read.
 try:
     with open(SRC_DIR + '/.docker-git-version') as f:

src/fluentdemo/settings/production.py

@@ -7,7 +7,6 @@
 
 # Change some defaults
 DEBUG = env.bool('DJANGO_DEBUG', default=False)
-COMPRESS_ENABLED = env.bool('COMPRESS_ENABLED', not DEBUG)
 SESSION_COOKIE_SECURE = env.bool('SESSION_COOKIE_SECURE', not DEBUG)
 CSRF_COOKIE_SECURE = env.bool('CSRF_COOKIE_SECURE', not DEBUG)
 

src/fluentdemo/settings/unittest.py

@@ -26,7 +26,5 @@
     'django.contrib.auth.hashers.MD5PasswordHasher',
 ]
 
-COMPRESS_ENABLED = True
-
 # Avoid sending real emails
 EMAIL_BACKEND = 'django.core.mail.backends.console.EmailBackend'

src/frontend/templates/base.html

@@ -1,4 +1,4 @@
-{% load analytical compress i18n static staff_toolbar_tags fluent_pages_tags fluent_contents_tags sharedcontent_tags %}<!doctype html>
+{% load analytical i18n static staff_toolbar_tags fluent_pages_tags fluent_contents_tags sharedcontent_tags %}<!doctype html>
 <html xml:lang="{{ LANGUAGE_CODE|default:"en" }}" lang="{{ LANGUAGE_CODE|default:"en" }}">
   <head>{% analytical_head_top %}
     <meta charset="utf-8" />
@@ -18,11 +18,9 @@
     <meta property="og:url" content="{{ site_root }}{{ request.path }}" />
     <meta property="og:site_name" content="{{ site.name|default:site.domain }}" />
     <meta property="og:description" content="{% block og-description %}{{ page.description }}{% endblock %}" />
-    {% compress css %}
     <link href="{% static 'frontend/css/screen.css' %}" rel="stylesheet" type="text/css" />
     <link href="{% static 'staff_toolbar/staff_toolbar.css' %}" rel="stylesheet" type="text/css" />
-    {% endcompress %}
-    {% compress css %}{% block link %}{% endblock %}{% endcompress %}
+    {% block link %}{% endblock %}
     {% block extrahead %}{% endblock %}
     {% analytical_head_bottom %}
   </head>
@@ -66,19 +64,15 @@
       </footer>
     </div>
 
-    {% compress css %}{% render_content_items_media css %}{% endcompress %}
+    {% render_content_items_media css %}
 
-    {% compress js %}
-      <script type="text/javascript" src="{% static 'frontend/vendor/jquery.min.js' %}"></script>
-      <script type="text/javascript" src="{% static 'frontend/vendor/bootstrap.min.js' %}"></script>
-    {% endcompress %}<!-- common JS -->
+    <script type="text/javascript" src="{% static 'frontend/vendor/jquery.min.js' %}"></script>
+    <script type="text/javascript" src="{% static 'frontend/vendor/bootstrap.min.js' %}"></script>
 
     {% render_content_items_media js external %}{# for django-fluent-contents #}
-    {% compress js %}
-      {% block script %}{% endblock %}{# for django-fluent-blogs/comments. #}
-      {% block bodyscripts %}{% endblock %}
-      {% render_content_items_media js local %}{# for django-fluent-contents #}
-    {% endcompress %}<!-- page specific JS -->
+    {% block script %}{% endblock %}{# for django-fluent-blogs/comments. #}
+    {% block bodyscripts %}{% endblock %}
+    {% render_content_items_media js local %}{# for django-fluent-contents #}
 
     {% analytical_body_bottom %}
   </body>

src/requirements/base.in

@@ -41,7 +41,6 @@ django-any-imagefield == 1.1
 django-any-urlfield == 2.6.2
 django-axes == 5.3.0
 django-categories-i18n == 1.1.1
-django-compressor == 2.4
 django-contrib-comments == 1.9.2
 django-crispy-forms == 1.9.0
 django-environ == 0.4.5

src/requirements/base.txt

@@ -16,10 +16,9 @@ django-admin-tools==0.9.0  # via -r requirements/base.in, django-fluent-dashboar
 django-analytical==2.5.0  # via -r requirements/base.in
 django-any-imagefield==1.1  # via -r requirements/base.in
 django-any-urlfield==2.6.2  # via -r requirements/base.in
-django-appconf==1.0.3     # via django-axes, django-compressor, fluentcms-emailtemplates
+django-appconf==1.0.3     # via django-axes, fluentcms-emailtemplates
 django-axes==5.3.0        # via -r requirements/base.in
 django-categories-i18n==1.1.1  # via -r requirements/base.in, django-fluent-blogs
-django-compressor==2.4    # via -r requirements/base.in
 django-contrib-comments==1.9.2  # via -r requirements/base.in, django-fluent-comments, django-threadedcomments
 django-crispy-forms==1.9.0  # via -r requirements/base.in, django-fluent-comments, fluentcms-contactform
 django-email-extras==0.3.4  # via django-forms-builder
@@ -100,12 +99,10 @@ python-gnupg==0.4.5       # via django-email-extras
 python-memcached==1.59    # via -r requirements/base.in
 pytz==2019.3              # via -r requirements/base.in, babel, django
 raven==6.10.0             # via -r requirements/base.in
-rcssmin==1.0.6            # via django-compressor
 redis==3.4.1              # via -r requirements/base.in, django-redis
 regex==2020.2.20          # via textile
 requests==2.23.0          # via django-healthchecks, python-akismet
-rjsmin==1.1.0             # via django-compressor
-six==1.14.0               # via django-appconf, django-compressor, django-contrib-comments, django-filebrowser-no-grappelli, django-fluent-contents, django-healthchecks, django-parler, django-simple-captcha, html5lib, packaging, python-memcached
+six==1.14.0               # via django-appconf, django-contrib-comments, django-filebrowser-no-grappelli, django-fluent-contents, django-healthchecks, django-parler, django-simple-captcha, html5lib, packaging, python-memcached
 smartypants==2.0.1        # via -r requirements/base.in
 sorl-thumbnail==12.6.3    # via -r requirements/base.in
 soupsieve==2.0            # via beautifulsoup4