Skip to content

Commit 1718bc6

Browse files
jwhitlockjwhitlock
committed
Add support for Django 1.11, dev
- Use new urlpattern syntax - Switch .travis.yml to matrix form, to specify specific Python versions - Remove invalid docsinstall and double install from .travis.yml - Add Django 1.11 and master (allowed failure) targets, and Python 3.6 - Add doc target to .travis.yml
1 parent 8608351 commit 1718bc6

File tree

8 files changed

+89
-38
lines changed

8 files changed

+89
-38
lines changed

‎.travis.yml

Lines changed: 62 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,66 @@
11
language: python
2-
python:
3-
- 3.5
42
sudo: false
5-
install:
6-
- pip install tox coveralls
7-
env:
8-
- TOXENV=py27-django16
9-
- TOXENV=py34-django16
10-
- TOXENV=pypy-django16
11-
- TOXENV=py27-django17
12-
- TOXENV=py34-django17
13-
- TOXENV=pypy-django17
14-
- TOXENV=py27-django18
15-
- TOXENV=pypy-django18
16-
- TOXENV=py34-django18
17-
- TOXENV=py27-django19
18-
- TOXENV=pypy-django19
19-
- TOXENV=py34-django19
20-
- TOXENV=py35-django19
21-
- TOXENV=py27-django110
22-
- TOXENV=pypy-django110
23-
- TOXENV=py34-django110
24-
- TOXENV=py35-django110
25-
docsinstall: pip install -q tox
3+
matrix:
4+
include:
5+
- env: TOXENV=py27-django16
6+
python: "2.7"
7+
- env: TOXENV=pypy-django16
8+
python: "pypy"
9+
- env: TOXENV=py34-django16
10+
python: "3.4"
11+
- env: TOXENV=py27-django17
12+
python: "2.7"
13+
- env: TOXENV=pypy-django17
14+
python: "pypy"
15+
- env: TOXENV=py34-django17
16+
python: "3.4"
17+
- env: TOXENV=py27-django18
18+
python: "2.7"
19+
- env: TOXENV=pypy-django18
20+
python: "pypy"
21+
- env: TOXENV=py34-django18
22+
python: "3.4"
23+
- env: TOXENV=py27-django19
24+
python: "2.7"
25+
- env: TOXENV=pypy-django19
26+
python: "pypy"
27+
- env: TOXENV=py34-django19
28+
python: "3.4"
29+
- env: TOXENV=py35-django19
30+
python: "3.5"
31+
- env: TOXENV=py27-django110
32+
python: "2.7"
33+
- env: TOXENV=pypy-django110
34+
python: "pypy"
35+
- env: TOXENV=py34-django110
36+
python: "3.4"
37+
- env: TOXENV=py35-django110
38+
python: "3.5"
39+
- env: TOXENV=py27-django111
40+
python: "2.7"
41+
- env: TOXENV=pypy-django111
42+
python: "pypy"
43+
- env: TOXENV=py34-django111
44+
python: "3.4"
45+
- env: TOXENV=py35-django111
46+
python: "3.5"
47+
- env: TOXENV=py36-django111
48+
python: "3.6"
49+
- env: TOXENV=pypy-django-master
50+
python: "pypy"
51+
- env: TOXENV=py34-django-master
52+
python: "3.4"
53+
- env: TOXENV=py35-django-master
54+
python: "3.5"
55+
- env: TOXENV=py36-django-master
56+
python: "3.6"
57+
- env: TOXENV=docs
58+
python: "2.7"
59+
allow_failures:
60+
- env: TOXENV=pypy-django-master
61+
- env: TOXENV=py34-django-master
62+
- env: TOXENV=py35-django-master
63+
- env: TOXENV=py36-django-master
2664
before_install:
2765
- nvm install node
2866
- nvm use node
@@ -40,6 +78,6 @@ deploy:
4078
on:
4179
tags: true
4280
repo: jazzband/django-pipeline
43-
condition: "$TOXENV = py27-django19"
81+
condition: "$TOXENV = py27-django111"
4482
notifications:
4583
email: false

‎docs/configuration.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ Indicate if you want this group to appear in your cache manifest.
124124
Defaults to ``True``.
125125

126126
``compiler_options``
127-
............
127+
....................
128128

129129
**Optional**
130130

‎requirements.txt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
coveralls
2+
flake8
13
tox
24
wheel
3-
flake8

‎setup.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@
3131
'Framework :: Django :: 1.8',
3232
'Framework :: Django :: 1.9',
3333
'Framework :: Django :: 1.10',
34+
'Framework :: Django :: 1.11',
3435
'Intended Audience :: Developers',
3536
'License :: OSI Approved :: MIT License',
3637
'Operating System :: OS Independent',
@@ -39,6 +40,7 @@
3940
'Programming Language :: Python :: 3',
4041
'Programming Language :: Python :: 3.4',
4142
'Programming Language :: Python :: 3.5',
43+
'Programming Language :: Python :: 3.6',
4244
'Programming Language :: Python :: Implementation :: PyPy',
4345
'Topic :: Utilities',
4446
'Topic :: Software Development :: Libraries :: Python Modules',

‎tests/settings.py

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -164,20 +164,21 @@ def node_exe_path(command):
164164
if HAS_CSSTIDY:
165165
PIPELINE.update({'CSSTIDY_BINARY': CSSTIDY_EXE_PATH})
166166

167-
TEMPLATE_DIRS = (
168-
local_path('templates'),
169-
)
170-
171167
TEMPLATES = [
172168
{
173169
'BACKEND': 'django.template.backends.django.DjangoTemplates',
174170
'APP_DIRS': True,
175-
'DIRS': TEMPLATE_DIRS,
171+
'DIRS': [local_path('templates')],
172+
'OPTIONS': {
173+
'context_processors': [
174+
'django.contrib.auth.context_processors.auth',
175+
]
176+
}
176177
},
177178
{
178179
'BACKEND': 'django.template.backends.jinja2.Jinja2',
179180
'APP_DIRS': True,
180-
'DIRS': TEMPLATE_DIRS,
181+
'DIRS': [local_path('templates')],
181182
'OPTIONS': {
182183
'extensions': ['pipeline.jinja2.PipelineExtension']
183184
}

‎tests/tests/test_storage.py

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,9 @@ def save(self, *args):
4141
def open(self, *args):
4242
return StringIO()
4343

44+
def listdir(self, *args):
45+
return []
46+
4447

4548
class DummyCSSCompiler(DummyCompiler):
4649
""" Handles css files """

‎tests/urls.py

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
1-
from django.conf.urls import patterns, include, url
1+
from django.conf.urls import url
22
from django.contrib import admin
33
from django.views.generic import TemplateView
44

55

6-
urlpatterns = patterns(
7-
'',
6+
urlpatterns = [
87
url(r'^$', TemplateView.as_view(template_name="index.html"), name="index"),
98
url(r'^empty/$', TemplateView.as_view(template_name="empty.html"), name="empty"),
10-
(r'^admin/', include(admin.site.urls)),
11-
)
9+
url(r'^admin/', admin.site.urls),
10+
]

‎tox.ini

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,18 @@
11
[tox]
22
envlist =
3-
{py27,pypy,py34}-django{16,17,18,19,110},py35-django{19,110},docs
3+
{py27,py34}-django{16,17,18,19,110,111}
4+
pypy-django{16,17,18,19,110,111,-master}
5+
py35-django{19,110,111,-master}
6+
py36-django{111,-master}
7+
docs
48

59
[testenv]
610
basepython =
711
py27: python2.7
812
pypy: pypy
913
py34: python3.4
1014
py35: python3.5
15+
py36: python3.6
1116
deps =
1217
py{27,py}: mock
1318
py{27,py}: futures
@@ -16,6 +21,8 @@ deps =
1621
django18: Django>=1.8,<1.9
1722
django19: Django>=1.9,<1.10
1823
django110: Django>=1.10,<1.11
24+
django111: Django>=1.11,<1.12
25+
django-master: https://github.com/django/django/archive/master.tar.gz
1926
jinja2
2027
jsmin==2.2.0
2128
ply==3.4

0 commit comments

Comments
 (0)