Skip to content
Browse files

separate testing for django-1.5c1 and django-dev

  • Loading branch information...
1 parent 0c44abb commit 38fbeccdbe7691f8094e4844f0d558ea49dde92d @stefanfoulis stefanfoulis committed
Showing with 20 additions and 5 deletions.
  1. +1 −0 .travis.yml
  2. +19 −5 tox.ini
View
1 .travis.yml
@@ -7,6 +7,7 @@ install:
env:
- DJANGO="django>=1.3,<1.4"
- DJANGO="django>=1.4,<1.5"
+ - DJANGO="https://www.djangoproject.com/download/1.5c1/tarball/#egg=Django" EASY_THUMBNAILS="-e git+git://github.com/SmileyChris/easy-thumbnails.git#egg=easy-thumbnails"
- DJANGO="-e git+git://github.com/django/django.git#egg=Django" EASY_THUMBNAILS="-e git+git://github.com/SmileyChris/easy-thumbnails.git#egg=easy-thumbnails"
script: python setup.py test
matrix:
View
24 tox.ini
@@ -1,5 +1,5 @@
[tox]
-envlist = py26-django13,py27-django13,py26-django14,py27-django14,py26-django-dev,py27-django-dev
+envlist = py26-django13,py27-django13,py26-django14,py27-django14,py26-django15,py27-django15
[testenv:docs]
changedir = docs
@@ -18,21 +18,21 @@ commands = python runtests.py {posargs}
[testenv:py26-django13]
basepython = python2.6
deps =
- django>=1.3,<1.4
+ Django>=1.3,<1.4
Pillow
argparse
[testenv:py27-django13]
basepython = python2.7
deps =
- django>=1.3,<1.4
+ Django>=1.3,<1.4
Pillow
[testenv:py26-django14]
basepython = python2.6
deps =
- django>=1.4,<1.5
+ Django>=1.4,<1.5
Pillow
argparse
@@ -40,7 +40,21 @@ deps =
[testenv:py27-django14]
basepython = python2.7
deps =
- django>=1.4,<1.5
+ Django>=1.4,<1.5
+ Pillow
+
+[testenv:py26-django15]
+basepython = python2.6
+deps =
+ https://www.djangoproject.com/download/1.5c1/tarball/#egg=Django
+ Pillow
+ argparse
+
+
+[testenv:py27-django15]
+basepython = python2.7
+deps =
+ https://www.djangoproject.com/download/1.5c1/tarball/#egg=Django
Pillow

0 comments on commit 38fbecc

Please sign in to comment.
Something went wrong with that request. Please try again.