From 619a088d2c3e5d6c12bf0b4bc5b03ee1116d6add Mon Sep 17 00:00:00 2001
From: Iacopo Spalletti <i.spalletti@nephila.it>
Date: Sun, 1 Jan 2017 17:19:14 +0100
Subject: [PATCH] Add django 1.10 / cms 3.4

---
 .travis.yml |  3 +++
 tox.ini     | 15 +++++----------
 2 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 305eec5..62c2777 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -14,8 +14,11 @@ env:
   - TOXENV='pep8'
   - TOXENV='isort'
   - TOXENV='docs'
+  - DJANGO='django110' CMS='cms34'
+  - DJANGO='django19' CMS='cms34'
   - DJANGO='django19' CMS='cms33'
   - DJANGO='django19' CMS='cms32'
+  - DJANGO='django18' CMS='cms34'
   - DJANGO='django18' CMS='cms33'
   - DJANGO='django18' CMS='cms32'
 
diff --git a/tox.ini b/tox.ini
index 90393b7..65241eb 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,26 +1,21 @@
 [tox]
-envlist = pep8,isort,docs,py{35,34,27}-django{19}-{cms33,cms32},py{35,34,33,27}-django{18}-cms{33,32,31},py{34,33,27}-django{17,16}-cms{32,31,30},py{26}-django16-cms{31,30}
+envlist = pep8,isort,docs,py{35,34,27}-django{110}-cms{34},py{35,34,27}-django{19}-cms{34,33,32},py{35,34,33,27}-django{18}-cms{34,33,32}
 
 [testenv]
 commands = {env:COMMAND:python} cms_helper.py test djangocms_multisite
 deps =
-    django16: Django>=1.6,<1.7
-    django16: django-taggit<0.18
-    django16: django-mptt<0.8
-    django17: Django>=1.7,<1.8
-    django17: django-mptt<0.8
     django18: Django>=1.8,<1.9
     django18: django-mptt>=0.8
     django19: Django>=1.9,<1.10
     django19: django-mptt>=0.8
-    cms30: https://github.com/divio/django-cms/archive/release/3.0.x.zip
-    cms30: djangocms-text-ckeditor<2.8
-    cms31: https://github.com/divio/django-cms/archive/release/3.1.x.zip
-    cms31: djangocms-text-ckeditor<2.9
+    django110: Django>=1.10,<1.11
+    django110: django-mptt>=0.8
     cms32: https://github.com/divio/django-cms/archive/release/3.2.x.zip
     cms32: djangocms-text-ckeditor<3.0
     cms33: https://github.com/divio/django-cms/archive/release/3.3.x.zip
     cms33: djangocms-text-ckeditor>=3.0
+    cms34: https://github.com/divio/django-cms/archive/release/3.4.x.zip
+    cms34: djangocms-text-ckeditor>=3.0
     https://github.com/nephila/djangocms-helper/archive/develop.zip
     -r{toxinidir}/requirements-test.txt