From f260c5c31ece9413fae0c4db8eadd8cbbdeeb267 Mon Sep 17 00:00:00 2001 From: Benjamin Bach Date: Tue, 23 Aug 2016 16:07:06 +0200 Subject: [PATCH] Add django 1.10 to tests --- .travis.yml | 2 ++ setup.py | 2 +- tox.ini | 11 ++++++----- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/.travis.yml b/.travis.yml index 6df710d6..469ec3f0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -20,11 +20,13 @@ env: - TOXENV=py27-django17 - TOXENV=py27-django18 - TOXENV=py27-django19 +- TOXENV=py27-django110 - TOXENV=py34-django15 - TOXENV=py34-django16 - TOXENV=py34-django17 - TOXENV=py34-django18 - TOXENV=py34-django19 +- TOXENV=py34-django110 install: - pip install tox>=2.1 coveralls diff --git a/setup.py b/setup.py index 9052cfef..3beae7aa 100755 --- a/setup.py +++ b/setup.py @@ -55,7 +55,7 @@ else: requirements.append("django-sekizai>=0.9") else: # Latest django-mptt only works for Django 1.8+ - requirements.append("django-mptt>=0.8,<0.9") + requirements.append("django-mptt>=0.8.6,<0.9") requirements.append("django-sekizai>=0.9") if DJANGO_VERSION < (1, 5): # For Django 1.4, use sorl-thumbnail<11.12.1: diff --git a/tox.ini b/tox.ini index 4d9556ab..6ea66d32 100644 --- a/tox.ini +++ b/tox.ini @@ -1,6 +1,6 @@ [tox] # Ensure you add to .travis.yml if you add here -envlist = py26-django{15,16}, {py27,py34}-django{15,16,17,18,19} +envlist = py26-django{15,16}, {py27,py34}-django{15,16,17,18,19,110} [testenv] @@ -26,10 +26,11 @@ deps = django17: django-mptt==0.7.4 django18: Django==1.8.2 django19: Django==1.9 - django{18,19}: django-mptt==0.8.0 - django{17,18,19}: django-sekizai==0.9.0 - django{17,18,19}: sorl-thumbnail==12.3 - django{17,18,19}: pytest-django>=3 + django110: Django==1.10 + django{18,19,110}: django-mptt==0.8.6 + django{17,18,19,110}: django-sekizai==0.9.0 + django{17,18,19,110}: sorl-thumbnail==12.3 + django{17,18,19,110}: pytest-django>=3 py26: importlib py26: Markdown==2.4.1 py{27,34}: Markdown==2.6.5 -- 2.45.2