Commit 4a8e896c authored by Johannes Linke's avatar Johannes Linke

Test against django 1.11

parent bc69eee4
......@@ -12,6 +12,8 @@ env:
- TOXENV=py34-1.9.X
- TOXENV=py27-1.10.X
- TOXENV=py34-1.10.X
- TOXENV=py27-1.11.X
- TOXENV=py34-1.11.X
# https://github.com/travis-ci/travis-ci/issues/4794
matrix:
include:
......@@ -21,6 +23,8 @@ matrix:
env: TOXENV=py35-1.9.X
- python: 3.5
env: TOXENV=py35-1.10.X
- python: 3.5
env: TOXENV=py35-1.11.X
notifications:
irc: "irc.freenode.org#django-compressor"
after_success:
......
......@@ -144,7 +144,7 @@ class Command(BaseCommand):
templates.update(os.path.join(root, name)
for name in files if not name.startswith('.') and
any(fnmatch(name, "*%s" % glob) for glob in extensions))
elif engine == 'jinja2' and django.VERSION >= (1, 8):
elif engine == 'jinja2':
env = settings.COMPRESS_JINJA2_GET_ENVIRONMENT()
if env and hasattr(env, 'list_templates'):
templates |= set([env.loader.get_source(env, template)[1] for template in
......
......@@ -26,7 +26,7 @@ three =
[tox]
envlist =
{py27,py33,py34,py35}-{1.8.X}
{py27,py34,py35}-{1.9.X,1.10.X}
{py27,py34,py35}-{1.9.X,1.10.X,1.11.X}
[testenv]
basepython =
py27: python2.7
......@@ -44,6 +44,7 @@ deps =
1.8.X: Django>=1.8,<1.9
1.9.X: Django>=1.9,<1.10
1.10.X: Django>=1.10,<1.11
1.11.X: Django>=1.11,<1.12
py27: {[deps]two}
py33: {[deps]three}
py34: {[deps]three}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment