diff --git a/.travis.yml b/.travis.yml index 7aeafe296..bb5884f12 100644 --- a/.travis.yml +++ b/.travis.yml @@ -23,16 +23,19 @@ env: - TOX_ENV=py27-dj17-thumbs2x - TOX_ENV=py27-dj18-thumbs2x - TOX_ENV=py27-dj19-thumbs2x + - TOX_ENV=py27-dj110-thumbs2x # python 3.4 - TOX_ENV=py34-dj16-thumbs2x - TOX_ENV=py34-dj17-thumbs2x - TOX_ENV=py34-dj18-thumbs2x - TOX_ENV=py34-dj19-thumbs2x + - TOX_ENV=py34-dj110-thumbs2x # python 3.5 - TOX_ENV=py35-dj18-thumbs2x - TOX_ENV=py35-dj19-thumbs2x + - TOX_ENV=py35-dj110-thumbs2x # next Django release - TOX_ENV=py27-djmaster-thumbs2x diff --git a/test_requirements/django-1.10.txt b/test_requirements/django-1.10.txt new file mode 100644 index 000000000..775441388 --- /dev/null +++ b/test_requirements/django-1.10.txt @@ -0,0 +1,6 @@ +django>=1.10,<1.11 +django-mptt>=0.8,<0.9 +djangocms-helper>=0.9.2,<0.10 +coverage + +-r base.txt diff --git a/tox.ini b/tox.ini index 051ec7b58..f67073f29 100644 --- a/tox.ini +++ b/tox.ini @@ -8,11 +8,11 @@ envlist = ; easy-thumbnails 1.x supports py27 only and has no dj17+ migrations py{27}-dj{16}-thumbs1x ; easy-thumbanils 2.x supports all current python and django versions - py{34,27}-dj{16,17,18,19,master}-thumbs2x - py{34,27}-dj{16,17,18,19,master}-custom_image-thumbs2x + py{34,27}-dj{16,17,18,19,110,master}-thumbs2x + py{34,27}-dj{16,17,18,19,110,master}-custom_image-thumbs2x ; python 3.5 is only supported by Django 1.8+ - py{35}-dj{18,19,master}-thumbs2x - py{35}-dj{18,19,master}-custom_image-thumbs2x + py{35}-dj{18,19,110,master}-thumbs2x + py{35}-dj{18,19,110,master}-custom_image-thumbs2x ; frontend tests frontend @@ -58,6 +58,7 @@ deps = dj17: -rtest_requirements/django-1.7.txt dj18: -rtest_requirements/django-1.8.txt dj19: -rtest_requirements/django-1.9.txt + dj110: -rtest_requirements/django-1.10.txt djmaster: -rtest_requirements/django-master.txt py26: unittest2 py26: argparse