Merge pull request #629 from jwhitlock/django-110-add-only

Test support for Django 1.11, dev

.travis.yml

 language: python
-python:
-  - 3.5
 sudo: false
-install:
-- pip install tox coveralls
-env:
-  - TOXENV=py27-django16
-  - TOXENV=py34-django16
-  - TOXENV=pypy-django16
-  - TOXENV=py27-django17
-  - TOXENV=py34-django17
-  - TOXENV=pypy-django17
-  - TOXENV=py27-django18
-  - TOXENV=pypy-django18
-  - TOXENV=py34-django18
-  - TOXENV=py27-django19
-  - TOXENV=pypy-django19
-  - TOXENV=py34-django19
-  - TOXENV=py35-django19
-  - TOXENV=py27-django110
-  - TOXENV=pypy-django110
-  - TOXENV=py34-django110
-  - TOXENV=py35-django110
-docsinstall: pip install -q tox
+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-django-master
+      python: "3.4"
+    - env: TOXENV=py35-django-master
+      python: "3.5"
+    - env: TOXENV=py36-django-master
+      python: "3.6"
+    - env: TOXENV=docs
+      python: "2.7"
+  allow_failures:
+    - env: TOXENV=py34-django-master
+    - env: TOXENV=py35-django-master
+    - env: TOXENV=py36-django-master
 before_install:
   - nvm install node
   - nvm use node
@@ -40,6 +75,6 @@ deploy:
   on:
     tags: true
     repo: jazzband/django-pipeline
-    condition: "$TOXENV = py27-django19"
+    condition: "$TOXENV = py27-django111"
 notifications:
   email: false

docs/configuration.rst

@@ -124,7 +124,7 @@ Indicate if you want this group to appear in your cache manifest.
 Defaults to ``True``.
 
 ``compiler_options``
-............
+....................
 
 **Optional**
 

requirements.txt

+coveralls
+flake8
 tox
 wheel
-flake8

setup.py

@@ -31,6 +31,7 @@ setup(
         'Framework :: Django :: 1.8',
         'Framework :: Django :: 1.9',
         'Framework :: Django :: 1.10',
+        'Framework :: Django :: 1.11',
         'Intended Audience :: Developers',
         'License :: OSI Approved :: MIT License',
         'Operating System :: OS Independent',
@@ -39,6 +40,7 @@ setup(
         'Programming Language :: Python :: 3',
         'Programming Language :: Python :: 3.4',
         'Programming Language :: Python :: 3.5',
+        'Programming Language :: Python :: 3.6',
         'Programming Language :: Python :: Implementation :: PyPy',
         'Topic :: Utilities',
         'Topic :: Software Development :: Libraries :: Python Modules',

tests/settings.py

@@ -164,20 +164,21 @@ if HAS_NODE and HAS_JAVA:
 if HAS_CSSTIDY:
     PIPELINE.update({'CSSTIDY_BINARY': CSSTIDY_EXE_PATH})
 
-TEMPLATE_DIRS = (
-    local_path('templates'),
-)
-
 TEMPLATES = [
     {
         'BACKEND': 'django.template.backends.django.DjangoTemplates',
         'APP_DIRS': True,
-        'DIRS': TEMPLATE_DIRS,
+        'DIRS': [local_path('templates')],
+        'OPTIONS': {
+            'context_processors': [
+                'django.contrib.auth.context_processors.auth',
+            ]
+        }
     },
     {
         'BACKEND': 'django.template.backends.jinja2.Jinja2',
         'APP_DIRS': True,
-        'DIRS': TEMPLATE_DIRS,
+        'DIRS': [local_path('templates')],
         'OPTIONS': {
             'extensions': ['pipeline.jinja2.PipelineExtension']
         }

tests/tests/test_storage.py

@@ -41,6 +41,9 @@ class PipelineNoPathStorage(PipelineStorage):
     def open(self, *args):
         return StringIO()
 
+    def listdir(self, *args):
+        return []
+
 
 class DummyCSSCompiler(DummyCompiler):
     """ Handles css files """

tests/urls.py

-from django.conf.urls import patterns, include, url
+from django.conf.urls import url
 from django.contrib import admin
 from django.views.generic import TemplateView
 
 
-urlpatterns = patterns(
-    '',
+urlpatterns = [
     url(r'^$', TemplateView.as_view(template_name="index.html"), name="index"),
     url(r'^empty/$', TemplateView.as_view(template_name="empty.html"), name="empty"),
-    (r'^admin/', include(admin.site.urls)),
-)
+    url(r'^admin/', admin.site.urls),
+]

tox.ini

 [tox]
 envlist =
-    {py27,pypy,py34}-django{16,17,18,19,110},py35-django{19,110},docs
+  {py27,pypy,py34}-django{16,17,18,19,110,111}
+  py35-django{19,110,111,-master}
+  py36-django{111,-master}
+  docs
 
 [testenv]
 basepython =
@@ -8,6 +11,7 @@ basepython =
   pypy: pypy
   py34: python3.4
   py35: python3.5
+  py36: python3.6
 deps =
   py{27,py}: mock
   py{27,py}: futures
@@ -16,7 +20,10 @@ deps =
   django18: Django>=1.8,<1.9
   django19: Django>=1.9,<1.10
   django110: Django>=1.10,<1.11
+  django111: Django>=1.11,<1.12
+  django-master: https://github.com/django/django/archive/master.tar.gz
   jinja2
+  coverage
   jsmin==2.2.0
   ply==3.4
   slimit==0.8.1
@@ -24,7 +31,8 @@ setenv =
     DJANGO_SETTINGS_MODULE = tests.settings
     PYTHONPATH = {toxinidir}
 commands =
-    {envbindir}/django-admin.py test {posargs:tests}
+    {envbindir}/coverage run --source pipeline {envbindir}/django-admin.py test {posargs:tests}
+    {envbindir}/coverage report
 
 [testenv:docs]
 basepython = python2.7