diff --git a/.travis.yml b/.travis.yml index a5b6d7d91..9b7217ae4 100644 --- a/.travis.yml +++ b/.travis.yml @@ -22,7 +22,10 @@ env: - TOX_ENV=py2.6-django1.4 install: - - "pip install tox --download-cache $HOME/.pip-cache" + - "travis_retry pip install tox --download-cache $HOME/.pip-cache" script: - tox -e $TOX_ENV + +matrix: + fast_finish: true diff --git a/tox.ini b/tox.ini index d40a70799..b5382d677 100644 --- a/tox.ini +++ b/tox.ini @@ -18,7 +18,7 @@ commands = ./runtests.py --lintonly [testenv:py3.4-django1.7] basepython = python3.4 -deps = Django==1.7 +deps = Django>=1.7.0,<1.8.0 django-filter==0.7 defusedxml==0.3 Pillow==2.3.0 @@ -26,7 +26,7 @@ deps = Django==1.7 [testenv:py3.3-django1.7] basepython = python3.3 -deps = Django==1.7 +deps = Django>=1.7.0,<1.8.0 django-filter==0.7 defusedxml==0.3 Pillow==2.3.0 @@ -34,7 +34,7 @@ deps = Django==1.7 [testenv:py3.2-django1.7] basepython = python3.2 -deps = Django==1.7 +deps = Django>=1.7.0,<1.8.0 django-filter==0.7 defusedxml==0.3 Pillow==2.3.0 @@ -42,7 +42,7 @@ deps = Django==1.7 [testenv:py2.7-django1.7] basepython = python2.7 -deps = Django==1.7 +deps = Django>=1.7.0,<1.8.0 django-filter==0.7 defusedxml==0.3 # django-oauth-plus==2.2.1 @@ -54,7 +54,7 @@ deps = Django==1.7 [testenv:py3.4-django1.6] basepython = python3.4 -deps = Django==1.6.3 +deps = Django>=1.6.0,<1.7.0 django-filter==0.7 defusedxml==0.3 Pillow==2.3.0 @@ -62,7 +62,7 @@ deps = Django==1.6.3 [testenv:py3.3-django1.6] basepython = python3.3 -deps = Django==1.6.3 +deps = Django>=1.6.0,<1.7.0 django-filter==0.7 defusedxml==0.3 Pillow==2.3.0 @@ -70,7 +70,7 @@ deps = Django==1.6.3 [testenv:py3.2-django1.6] basepython = python3.2 -deps = Django==1.6.3 +deps = Django>=1.6.0,<1.7.0 django-filter==0.7 defusedxml==0.3 Pillow==2.3.0 @@ -78,7 +78,7 @@ deps = Django==1.6.3 [testenv:py2.7-django1.6] basepython = python2.7 -deps = Django==1.6.3 +deps = Django>=1.6.0,<1.7.0 django-filter==0.7 defusedxml==0.3 django-oauth-plus==2.2.1 @@ -90,7 +90,7 @@ deps = Django==1.6.3 [testenv:py2.6-django1.6] basepython = python2.6 -deps = Django==1.6.3 +deps = Django>=1.6.0,<1.7.0 django-filter==0.7 defusedxml==0.3 django-oauth-plus==2.2.1 @@ -102,7 +102,7 @@ deps = Django==1.6.3 [testenv:py3.4-django1.5] basepython = python3.4 -deps = django==1.5.6 +deps = Django>=1.5.0,<1.6.0 django-filter==0.7 defusedxml==0.3 Pillow==2.3.0 @@ -110,7 +110,7 @@ deps = django==1.5.6 [testenv:py3.3-django1.5] basepython = python3.3 -deps = django==1.5.6 +deps = Django>=1.5.0,<1.6.0 django-filter==0.7 defusedxml==0.3 Pillow==2.3.0 @@ -118,7 +118,7 @@ deps = django==1.5.6 [testenv:py3.2-django1.5] basepython = python3.2 -deps = django==1.5.6 +deps = Django>=1.5.0,<1.6.0 django-filter==0.7 defusedxml==0.3 Pillow==2.3.0 @@ -126,7 +126,7 @@ deps = django==1.5.6 [testenv:py2.7-django1.5] basepython = python2.7 -deps = django==1.5.6 +deps = Django>=1.5.0,<1.6.0 django-filter==0.7 defusedxml==0.3 django-oauth-plus==2.2.1 @@ -138,7 +138,7 @@ deps = django==1.5.6 [testenv:py2.6-django1.5] basepython = python2.6 -deps = django==1.5.6 +deps = Django>=1.5.0,<1.6.0 django-filter==0.7 defusedxml==0.3 django-oauth-plus==2.2.1 @@ -150,7 +150,7 @@ deps = django==1.5.6 [testenv:py2.7-django1.4] basepython = python2.7 -deps = django==1.4.11 +deps = Django>=1.4.0,<1.5.0 django-filter==0.7 defusedxml==0.3 django-oauth-plus==2.2.1 @@ -162,7 +162,7 @@ deps = django==1.4.11 [testenv:py2.6-django1.4] basepython = python2.6 -deps = django==1.4.11 +deps = Django>=1.4.0,<1.5.0 django-filter==0.7 defusedxml==0.3 django-oauth-plus==2.2.1