Simplify tox setup

django-cms · Dec 29, 2015 · 391a6a8 · 391a6a8
1 parent b71e428
commit 391a6a8
Show file tree

Hide file tree

Showing 8 changed files with 55 additions and 58 deletions.
diff --git a/test_requirements/base.txt b/test_requirements/base.txt
@@ -0,0 +1,2 @@
+Pillow>=2.3,<3.0
+coverage
diff --git a/test_requirements/django-1.5.txt b/test_requirements/django-1.5.txt
@@ -0,0 +1,6 @@
+django>=1.5,<1.6
+django-mptt>0.6,<0.8
+djangocms-helper==0.8.1
+south
+
+-r base.txt
diff --git a/test_requirements/django-1.6.txt b/test_requirements/django-1.6.txt
@@ -0,0 +1,6 @@
+django>=1.6,<1.7
+django-mptt>0.6,<0.8
+djangocms-helper>=0.9.2,<0.10
+south
+
+-r base.txt
diff --git a/test_requirements/django-1.7.txt b/test_requirements/django-1.7.txt
@@ -0,0 +1,5 @@
+django>=1.7,<1.8
+django-mptt>0.6,<0.8
+djangocms-helper>=0.9.2,<0.10
+
+-r base.txt
diff --git a/test_requirements/django-1.8.txt b/test_requirements/django-1.8.txt
@@ -0,0 +1,5 @@
+django>=1.8,<1.9
+django-mptt>=0.7,<0.9
+djangocms-helper>=0.9.2,<0.10
+
+-r base.txt
diff --git a/test_requirements/django-1.9.txt b/test_requirements/django-1.9.txt
@@ -0,0 +1,5 @@
+django>=1.9,<1.10
+django-mptt>=0.8,<0.9
+djangocms-helper>=0.9.2,<0.10
+
+-r base.txt
diff --git a/test_requirements/django-master.txt b/test_requirements/django-master.txt
@@ -0,0 +1,5 @@
+git+git://github.com/django/django.git@master#egg=Django
+django-mptt>=0.7,<0.9
+djangocms-helper>=0.9.2,<0.10
+
+-r base.txt
diff --git a/tox.ini b/tox.ini
@@ -1,10 +1,10 @@
 [tox]
 envlist=
     flake8
-    py{26,27,33,34}-django{15,16},
-    py{27,33,34}-django{17,18},
-    py{27,33,34}-django{16,17,18}-custom
-
+    py{34,33,27}-django{19,18,17}-thumbs2x
+    py{34,33,27}-django{18,17,16}-custom_image-thumbs2x
+    py{34,33,27,26}-django{16,15}-thumbs1x
+    py{34,33,27}-django_master-thumbs2x
 
 [testenv:docs]
 changedir=docs
@@ -23,59 +23,22 @@ exclude = build/*,docs/*,filer/migrations/*,filer/south_migrations/*,filer/migra
 max-line-length = 80
 
 [testenv]
-commands=python test_settings.py
-deps=
-    Pillow<2.6
-    unidecode
-    djangocms-helper<=0.8.1
-    easy-thumbnails>2.0
-    django15: django<1.6
-    django15: south
-    django15: django-mptt>=0.6,<0.8
-    django16: django<1.7
-    django16: south
-    django16: django-mptt>=0.6,<0.8
-    django17: django<1.8
-    django17: django-mptt>=0.6,<0.8
-    django18: django<1.9
-    django18: django-mptt>=0.8,<0.9
-    djangodev: git+git://github.com/django/django.git#egg=Django
+commands =
+    {envpython} --version
+    - coverage erase
+    coverage run --rcfile=coverage.rc test_settings.py
+    - coverage report
+setenv =
+    custom_image: CUSTOM_IMAGE=filer.test_utils.custom_image.models.Image
+deps =
+    thumbs1x: easy-thumbnails>=1.4,<2.0
+    thumbs2x: easy-thumbnails>=2.0,<2.4
+    django15: -rtest_requirements/django-1.5.txt
+    django16: -rtest_requirements/django-1.6.txt
+    django17: -rtest_requirements/django-1.7.txt
+    django18: -rtest_requirements/django-1.8.txt
+    ; Note: Django 1.9+ is not supported yet
+    django19: -rtest_requirements/django-1.9.txt
+    django_master: -rtest_requirements/django-master.txt
     py26: unittest2
     py26: argparse
-
-
-[testenv:py27-django16-custom]
-setenv =
-    CUSTOM_IMAGE=filer.test_utils.custom_image.models.Image
-
-[testenv:py33-django16-custom]
-setenv =
-    CUSTOM_IMAGE=filer.test_utils.custom_image.models.Image
-
-[testenv:py34-django16-custom]
-setenv =
-    CUSTOM_IMAGE=filer.test_utils.custom_image.models.Image
-
-[testenv:py27-django17-custom]
-setenv =
-    CUSTOM_IMAGE=filer.test_utils.custom_image.models.Image
-
-[testenv:py33-django17-custom]
-setenv =
-    CUSTOM_IMAGE=filer.test_utils.custom_image.models.Image
-
-[testenv:py34-django17-custom]
-setenv =
-    CUSTOM_IMAGE=filer.test_utils.custom_image.models.Image
-
-[testenv:py27-django18-custom]
-setenv =
-    CUSTOM_IMAGE=filer.test_utils.custom_image.models.Image
-
-[testenv:py33-django18-custom]
-setenv =
-    CUSTOM_IMAGE=filer.test_utils.custom_image.models.Image
-
-[testenv:py34-django18-custom]
-setenv =
-    CUSTOM_IMAGE=filer.test_utils.custom_image.models.Image