Fix tests and documentation generation

.travis.yml

 language: python
 sudo: false
 env:
-  - TOXENV=py27-1.7.X
-  - TOXENV=pypy-1.7.X
-  - TOXENV=py33-1.7.X
-  - TOXENV=py34-1.7.X
-  - TOXENV=py27
-  - TOXENV=pypy
-  - TOXENV=py33
-  - TOXENV=py34
+  - TOXENV=py27-django18
+  - TOXENV=pypy-django18
+  - TOXENV=py34-django18
+  - TOXENV=py27-django19
+  - TOXENV=pypy-django19
+  - TOXENV=py34-django19
 docsinstall: pip install -q tox
 script: tox

docs/configuration.rst

@@ -5,7 +5,7 @@ Configuration
 =============
 
 
-Configuration and list of available settings for Pipeline. Pipeline settings are namespaced in a PIPELINE dictionary in your project settings, e.g.:
+Configuration and list of available settings for Pipeline. Pipeline settings are namespaced in a PIPELINE dictionary in your project settings, e.g.: ::
 
   PIPELINE = {
       'PIPELINE_ENABLED': True,
@@ -32,7 +32,6 @@ syntax to select multiples files.
 The basic syntax for specifying CSS/JavaScript groups files is ::
 
   PIPELINE = {
-
       'STYLESHEETS': {
           'colors': {
               'source_filenames': (
@@ -46,7 +45,6 @@ The basic syntax for specifying CSS/JavaScript groups files is ::
               },
           },
       },
-
       'JAVASCRIPT': {
           'stats': {
               'source_filenames': (

docs/installation.rst

@@ -35,7 +35,7 @@ Installation
 .. _PyPI: http://pypi.python.org/pypi/django-pipeline
 
 Upgrading from 1.3
-================
+==================
 
 To upgrade from pipeline 1.3, you will need to follow these steps:
 

pipeline/compressors/__init__.py

@@ -59,7 +59,7 @@ class Compressor(object):
         if templates:
             js = js + self.compile_templates(templates)
 
-        if not settings.PIPELINE_DISABLE_WRAPPER:
+        if not settings.DISABLE_WRAPPER:
             js = "(function() {\n%s\n}).call(this);" % js
 
         compressor = self.js_compressor

pipeline/conf.py

@@ -61,6 +61,8 @@ DEFAULTS = {
     'LESS_BINARY': '/usr/bin/env lessc',
     'LESS_ARGUMENTS': '',
 
+    'DISABLE_WRAPPER': False,
+
     'MIMETYPES': (
         (b'text/coffeescript', '.coffee'),
         (b'text/less', '.less'),

tox.ini

 [tox]
 envlist =
-    py27-1.8.X, pypy-1.8.X, py34-1.8.X,
-    py27, pypy, py34, py35
+    {py27,pypy,py34}-django{18,19}
+    py35-1.9
     docs
 
 [testenv]
+basepython =
+  py27: python2.7
+  pypy: pypy
+  py34: python3.4
+  py35: python3.5
+deps =
+  py{27,py}: mock
+  py{27,py}: futures
+  django18: Django>=1.8,<1.9
+  django19: Django>=1.9,<1.10
+  jinja2
 setenv =
     DJANGO_SETTINGS_MODULE = tests.settings
     PYTHONPATH = {toxinidir}
 commands =
     {envbindir}/django-admin.py test {posargs:tests}
 
-[testenv:py27-1.8.X]
-basepython = python2.7
-deps =
-    Django>=1.8, <1.9
-    mock
-    jinja2
-    futures
-
-[testenv:py34-1.8.X]
-basepython = python3.4
-deps =
-    Django>=1.8, <1.9
-    jinja2
-
-[testenv:pypy-1.8.X]
-basepython = pypy
-deps =
-    Django>=1.8, <1.9
-    mock
-    jinja2
-    futures
-
-[testenv:py27]
-basepython = python2.7
-deps =
-    Django>=1.9 <1.10
-    mock
-    jinja2
-    futures
-
-[testenv:pypy]
-basepython = pypy
-deps =
-    Django>=1.9 <1.10
-    mock
-    jinja2
-    futures
-
-[testenv:py34]
-basepython = python3.4
-deps =
-    jinja2
-    Django>=1.9 <1.10
-
-[testenv:py35]
-basepython = python3.5
-deps =
-    jinja2
-    Django>=1.9 <1.10
-
 [testenv:docs]
 basepython = python2.7
 changedir = docs