Merge pull request #693 from jazzband/dj22

Django 2.2

Author: Asif Saif Uddin

.travis.yml

@@ -1,58 +1,23 @@
 language: python
-sudo: false
+sudo: True
+dist: xenial
 matrix:
   include:
-    - env: TOXENV=py27-django16
-      python: "2.7"
-    - env: TOXENV=pypy-django16
-      python: "pypy"
-    - env: TOXENV=py34-django16
-      python: "3.4"
-    - env: TOXENV=py27-django17
-      python: "2.7"
-    - env: TOXENV=pypy-django17
-      python: "pypy"
-    - env: TOXENV=py34-django17
-      python: "3.4"
-    - env: TOXENV=py27-django18
-      python: "2.7"
-    - env: TOXENV=pypy-django18
-      python: "pypy"
-    - env: TOXENV=py34-django18
-      python: "3.4"
-    - env: TOXENV=py27-django19
-      python: "2.7"
-    - env: TOXENV=pypy-django19
-      python: "pypy"
-    - env: TOXENV=py34-django19
-      python: "3.4"
-    - env: TOXENV=py35-django19
-      python: "3.5"
-    - env: TOXENV=py27-django110
-      python: "2.7"
-    - env: TOXENV=pypy-django110
-      python: "pypy"
-    - env: TOXENV=py34-django110
-      python: "3.4"
-    - env: TOXENV=py35-django110
-      python: "3.5"
     - env: TOXENV=py27-django111
       python: "2.7"
     - env: TOXENV=pypy-django111
       python: "pypy"
-    - env: TOXENV=py34-django111
-      python: "3.4"
     - env: TOXENV=py35-django111
       python: "3.5"
     - env: TOXENV=py36-django111
       python: "3.6"
-    - env: TOXENV=py34-django20
-      python: "3.4"
-    - env: TOXENV=py35-django20
-      python: "3.5"
     - env: TOXENV=py36-django20
       python: "3.6"
-    - env: TOXENV=py37-django20
+    - env: TOXENV=py35-django22
+      python: "3.5"
+    - env: TOXENV=py36-django22
+      python: "3.6"
+    - env: TOXENV=py37-django22
       python: "3.7-dev"
     - env: TOXENV=py35-django-master
       python: "3.5"
@@ -63,10 +28,6 @@ matrix:
     - env: TOXENV=docs
       python: "2.7"
   allow_failures:
-    - env: TOXENV=py34-django20
-    - env: TOXENV=py35-django20
-    - env: TOXENV=py36-django20
-    - env: TOXENV=py37-django20
     - env: TOXENV=py35-django-master
     - env: TOXENV=py36-django-master
     - env: TOXENV=py37-django-master

CONTRIBUTING.rst

@@ -17,3 +17,26 @@ Contribute
 
 Otherwise, if you simply wants to suggest a feature or report a bug, create an issue :
 https://github.com/jazzband/django-pipeline/issues
+
+
+Running tests
+=============
+
+We use tox to run the test suite on different versions locally (and travis-ci
+to automate the check for PRs).
+
+To tun the test suite locally, please make sure your python environment has
+tox and django installed::
+
+    python3.7 -m pip install tox
+
+Since we use a number of node.js tools, one should first install the node
+depencies. We reccomend using [nvm](https://github.com/nvm-sh/nvm#installation-and-update) , tl;dr::
+
+    curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.34.0/install.sh | bash
+    nvm install node
+    nvm use node
+
+And then simply execute tox to run the whole test matrix::
+
+    tox

docs/installation.rst

@@ -29,7 +29,7 @@ Installation
 
 
 .. note::
-  You need to use ``Django>=1.7`` to be able to use this version of pipeline.
+  You need to use ``Django>=1.11`` to be able to use this version of pipeline.
 
 .. _GitHub: http://github.com/jazzband/django-pipeline
 .. _PyPI: http://pypi.python.org/pypi/django-pipeline

pipeline/conf.py

@@ -6,11 +6,7 @@
 import shlex
 
 from django.conf import settings as _settings
-try:
-    from django.core.signals import setting_changed
-except ImportError:
-    # Django < 1.8
-    from django.test.signals import setting_changed
+from django.core.signals import setting_changed
 from django.dispatch import receiver
 from django.utils.six import string_types
 

pipeline/middleware.py

@@ -6,11 +6,7 @@
 
 from pipeline.conf import settings
 
-try:
-    # Support for Django 1.10 new MIDDLEWARE setting
-    from django.utils.deprecation import MiddlewareMixin
-except ImportError:  # Django < 1.10
-    MiddlewareMixin = object
+from django.utils.deprecation import MiddlewareMixin
 
 
 class MinifyHTMLMiddleware(MiddlewareMixin):

requirements.txt

@@ -2,3 +2,4 @@ coveralls
 flake8
 tox
 wheel
+django

setup.py

@@ -24,21 +24,18 @@
         'Development Status :: 5 - Production/Stable',
         'Environment :: Web Environment',
         'Framework :: Django',
-        'Framework :: Django :: 1.6',
-        'Framework :: Django :: 1.7',
-        'Framework :: Django :: 1.8',
-        'Framework :: Django :: 1.9',
-        'Framework :: Django :: 1.10',
         'Framework :: Django :: 1.11',
+        'Framework :: Django :: 2.0',
+        'Framework :: Django :: 2.2',
         'Intended Audience :: Developers',
         'License :: OSI Approved :: MIT License',
         'Operating System :: OS Independent',
         'Programming Language :: Python',
         'Programming Language :: Python :: 2.7',
         'Programming Language :: Python :: 3',
-        'Programming Language :: Python :: 3.4',
         'Programming Language :: Python :: 3.5',
         'Programming Language :: Python :: 3.6',
+        'Programming Language :: Python :: 3.7',
         'Programming Language :: Python :: Implementation :: PyPy',
         'Topic :: Utilities',
         'Topic :: Software Development :: Libraries :: Python Modules',

tests/settings.py

@@ -19,6 +19,7 @@ def local_path(path):
 
 INSTALLED_APPS = [
     'django.contrib.contenttypes',
+    'django.contrib.messages',
     'django.contrib.sites',
     'django.contrib.sessions',
     'django.contrib.staticfiles',
@@ -28,17 +29,16 @@ def local_path(path):
     'tests.tests'
 ]
 
-MIDDLEWARE_CLASSES = (
-    'django.contrib.sessions.middleware.SessionMiddleware',
-    'django.contrib.auth.middleware.AuthenticationMiddleware'
-)
 
 ROOT_URLCONF = 'tests.urls'
 
-MIDDLEWARE_CLASSES = (
+MIDDLEWARE = [
+    'django.contrib.sessions.middleware.SessionMiddleware',
+    'django.contrib.auth.middleware.AuthenticationMiddleware',
+    'django.contrib.messages.middleware.MessageMiddleware',
     'django.middleware.common.CommonMiddleware',
-    'django.middleware.csrf.CsrfViewMiddleware'
-)
+    'django.middleware.csrf.CsrfViewMiddleware',
+]
 
 MEDIA_URL = '/media/'
 
@@ -172,6 +172,7 @@ def node_exe_path(command):
         'OPTIONS': {
             'context_processors': [
                 'django.contrib.auth.context_processors.auth',
+                'django.contrib.messages.context_processors.messages',
             ]
         }
     },

tests/tests/test_forms.py

@@ -2,7 +2,6 @@
 
 from django.forms import Media
 from django.test import TestCase
-from django.utils import six
 
 from pipeline.forms import PipelineFormMedia
 from ..utils import pipeline_settings
@@ -76,21 +75,23 @@ class MyMedia(PipelineFormMedia):
                 'print': ['/static/print.min.css'],
             })
         self.assertEqual(MyMedia.css, media._css)
-        self.assertEqual(
-            list(media.render_css()),
-            [
-                '<link href="%s" type="text/css" media="all" '
-                'rel="stylesheet" />' % path
-                for path in (
-                    '/static/extra1.css',
-                    '/static/extra2.css',
-                    '/static/styles1.min.css',
-                    '/static/styles2.min.css',
-                )
-            ] + [
-                '<link href="/static/print.min.css" type="text/css" '
-                'media="print" rel="stylesheet" />'
-            ])
+        expected_regex = [
+            r'<link href="%s" type="text/css" media="all" '
+            'rel="stylesheet"( /)?>' % path
+            for path in (
+                '/static/extra1.css',
+                '/static/extra2.css',
+                '/static/styles1.min.css',
+                '/static/styles2.min.css',
+            )
+        ] + [
+            r'<link href="/static/print.min.css" type="text/css" '
+            'media="print" rel="stylesheet"( /)?>'
+        ]
+        for rendered_node, expected_node in zip(
+            media.render_css(), expected_regex
+        ):
+            self.assertRegex(rendered_node, expected_node)
 
     @pipeline_settings(PIPELINE_ENABLED=False)
     def test_css_packages_with_pipeline_disabled(self):
@@ -120,22 +121,25 @@ class MyMedia(PipelineFormMedia):
                 'print': ['pipeline/css/urls.css'],
             })
         self.assertEqual(MyMedia.css, media._css)
-        self.assertEqual(
-            list(media.render_css()),
-            [
-                '<link href="%s" type="text/css" media="all" '
-                'rel="stylesheet" />' % path
-                for path in (
-                    '/static/extra1.css',
-                    '/static/extra2.css',
-                    '/static/pipeline/css/first.css',
-                    '/static/pipeline/css/second.css',
-                    '/static/pipeline/css/unicode.css',
-                )
-            ] + [
-                '<link href="/static/pipeline/css/urls.css" type="text/css" '
-                'media="print" rel="stylesheet" />'
-            ])
+
+        expected_regex = [
+            '<link href="%s" type="text/css" media="all" '
+            'rel="stylesheet"( /)?>' % path
+            for path in (
+                '/static/extra1.css',
+                '/static/extra2.css',
+                '/static/pipeline/css/first.css',
+                '/static/pipeline/css/second.css',
+                '/static/pipeline/css/unicode.css',
+            )
+        ] + [
+            '<link href="/static/pipeline/css/urls.css" type="text/css" '
+            'media="print" rel="stylesheet"( /)?>'
+        ]
+        for rendered_node, expected_node in zip(
+            media.render_css(), expected_regex
+        ):
+            self.assertRegex(rendered_node, expected_node)
 
     @pipeline_settings(PIPELINE_ENABLED=True)
     def test_js_packages_with_pipeline_enabled(self):

tests/tests/test_middleware.py

@@ -1,6 +1,12 @@
 # -*- coding: utf-8 -*-
 from __future__ import unicode_literals
 
+try:
+    from mock import patch
+except ImportError:
+    from unittest.mock import patch  # noqa
+
+from django.core.exceptions import MiddlewareNotUsed
 from django.test import TestCase
 from django.http import HttpRequest, HttpResponse
 
@@ -34,3 +40,9 @@ def test_middleware_text(self):
         response = MinifyHTMLMiddleware().process_response(self.req, self.resp)
         self.assertIn('text/plain', response['Content-Type'])
         self.assertIn(self.whitespace, response.content)
+
+    @patch('pipeline.middleware.settings.PIPELINE_ENABLED', False)
+    def test_middleware_not_used(self):
+        self.resp['Content-Type'] = 'text/plain; charset=UTF-8'
+
+        self.assertRaises(MiddlewareNotUsed, MinifyHTMLMiddleware)