adjust tox and travis files

aldryn · May 22, 2016 · c4bd3d8 · c4bd3d8
1 parent a6a1b3f
commit c4bd3d8
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 14 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -5,15 +5,23 @@ sudo: false
 
 env:
   - TOX_ENV=flake8
+  - TOX_ENV=py35-dj19-cms33
+  - TOX_ENV=py35-dj19-cms32
+  - TOX_ENV=py34-dj19-cms33
   - TOX_ENV=py34-dj19-cms32
+  - TOX_ENV=py27-dj19-cms33
+  - TOX_ENV=py27-dj19-cms32
+  - TOX_ENV=py35-dj18-cms33
+  - TOX_ENV=py35-dj18-cms32
+  - TOX_ENV=py34-dj18-cms33
   - TOX_ENV=py34-dj18-cms32
   - TOX_ENV=py34-dj18-cms31
+  - TOX_ENV=py27-dj18-cms33
+  - TOX_ENV=py27-dj18-cms32
+  - TOX_ENV=py27-dj18-cms31
   - TOX_ENV=py34-dj17-cms32
   - TOX_ENV=py34-dj17-cms31
   - TOX_ENV=py34-dj17-cms30
-  - TOX_ENV=py27-dj19-cms32
-  - TOX_ENV=py27-dj18-cms32
-  - TOX_ENV=py27-dj18-cms31
   - TOX_ENV=py27-dj17-cms32
   - TOX_ENV=py27-dj17-cms31
   - TOX_ENV=py27-dj17-cms30

diff --git a/tox.ini b/tox.ini
@@ -1,13 +1,11 @@
 [tox]
 envlist =
-    flake8,
-    py34-dj19-cms32
-    py34-dj{18,17}-cms{32,31}
-    py34-dj17-cms30
-    py27-dj19-cms32
-    py27-dj{18,17,16}-cms{32,31}
-    py27-dj16-cms30
-    py{26}-dj{16}-cms{32,31,30}
+    flake8
+    py{35,34,27}-dj19-cms{33,32}
+    py{34,27}-dj18-cms{32,31}
+    py{34,27}-dj17-cms{32,31,30}
+    py{33,27}-dj16-cms{32,31,30}
+    py{26}-dj16-cms{32,31,30}
 
 [testenv]
 commands =
@@ -20,14 +18,23 @@ deps =
     dj17: -rtest_requirements/django-1.7.txt
     dj18: -rtest_requirements/django-1.8.txt
     dj19: -rtest_requirements/django-1.9.txt
+
     cms30: django-cms<3.1
+    cms30: djangocms-text-ckeditor<=2.7
     dj17-cms30: django-reversion<1.9
-    cms31: django-cms<3.2
+
+    cms31: django-cms>=3.1,<3.2
     dj{18,17}-cms31: django-reversion<1.10
-    cms32: django-cms<3.3
+
+    cms32: django-cms>=3.2,<3.3
+    cms32: djangocms-text-ckeditor>2.7,<=2.9.3
     dj{19,18,17}-cms32: django-reversion<1.11
+
+    cms33: https://github.com/divio/django-cms/archive/develop.zip#egg=django-cms
+    cms33: https://github.com/divio/djangocms-text-ckeditor/archive/develop.zip#egg=djangocms-text-ckeditor
+    dj{19,18}-cms33: django-reversion<1.11
+
     py26: unittest2
-    djangocms_text_ckeditor
 
 [testenv:flake8]
 deps = flake8