diff --git a/docs/advanced_topics/settings.rst b/docs/advanced_topics/settings.rst index 11bdb5524..8155ccafb 100644 --- a/docs/advanced_topics/settings.rst +++ b/docs/advanced_topics/settings.rst @@ -73,7 +73,6 @@ Apps (``settings.py``) 'wagtail.wagtailadmin', 'wagtail.wagtailcore', - 'compressor', 'taggit', 'modelcluster', @@ -422,7 +421,6 @@ These two files should reside in your project directory (``myproject/myproject/` STATICFILES_FINDERS = [ 'django.contrib.staticfiles.finders.FileSystemFinder', 'django.contrib.staticfiles.finders.AppDirectoriesFinder', - 'compressor.finders.CompressorFinder', ] STATICFILES_DIRS = [ diff --git a/docs/getting_started/integrating_into_django.rst b/docs/getting_started/integrating_into_django.rst index b0bfdaa6c..15db30d81 100644 --- a/docs/getting_started/integrating_into_django.rst +++ b/docs/getting_started/integrating_into_django.rst @@ -29,7 +29,6 @@ In your settings file, add the following apps to ``INSTALLED_APPS``:: 'wagtail.wagtailcore', 'modelcluster', - 'compressor', 'taggit', Add the following entries to ``MIDDLEWARE_CLASSES``:: diff --git a/setup.py b/setup.py index d564370c1..10de56dc6 100755 --- a/setup.py +++ b/setup.py @@ -22,7 +22,6 @@ except ImportError: install_requires = [ "Django>=1.8.1,<1.10", - "django-compressor>=1.4", "django-modelcluster>=1.1,<1.2", "django-taggit>=0.17.5", "django-treebeard==3.0", diff --git a/tox.ini b/tox.ini index a016276f8..cc0703e3a 100644 --- a/tox.ini +++ b/tox.ini @@ -19,7 +19,6 @@ basepython = py35: python3.5 deps = - django-compressor>=1.4 django-modelcluster>=1.1b1 django-taggit>=0.17.5 django-treebeard==3.0 diff --git a/wagtail/project_template/project_name/settings/base.py b/wagtail/project_template/project_name/settings/base.py index 76b44ce08..28cb1f667 100644 --- a/wagtail/project_template/project_name/settings/base.py +++ b/wagtail/project_template/project_name/settings/base.py @@ -40,7 +40,6 @@ INSTALLED_APPS = [ 'wagtail.wagtailcore', 'modelcluster', - 'compressor', 'taggit', 'django.contrib.admin', @@ -119,7 +118,6 @@ USE_TZ = True STATICFILES_FINDERS = [ 'django.contrib.staticfiles.finders.FileSystemFinder', 'django.contrib.staticfiles.finders.AppDirectoriesFinder', - 'compressor.finders.CompressorFinder', ] STATICFILES_DIRS = [ diff --git a/wagtail/tests/settings.py b/wagtail/tests/settings.py index c30b0f43c..73f0158df 100644 --- a/wagtail/tests/settings.py +++ b/wagtail/tests/settings.py @@ -31,7 +31,6 @@ STATIC_ROOT = STATIC_ROOT STATICFILES_FINDERS = ( 'django.contrib.staticfiles.finders.AppDirectoriesFinder', - 'compressor.finders.CompressorFinder', ) USE_TZ = True @@ -111,7 +110,6 @@ INSTALLED_APPS = ( 'wagtail.wagtailcore', 'taggit', - 'compressor', 'rest_framework', 'django.contrib.admin',