Tests updates

* Removed Django 1.2
* Don't run dev tests on travis
This commit is contained in:
Alen Mujezinovic 2013-06-14 16:09:55 +01:00
parent efaa2379e7
commit 7945c81cd5
3 changed files with 2 additions and 13 deletions

View File

@ -1,6 +1,5 @@
language: python
env:
- DJANGO="django>=1.2,<1.3"
- DJANGO="django>=1.3,<1.4"
- DJANGO="django>=1.4,<1.5"
- DJANGO="django>=1.5,<1.6"

View File

@ -1,2 +1,2 @@
Django>=1.2
shortuuid>=0.3
Django>=1.3
shortuuid>=0.3

10
tox.ini
View File

@ -29,12 +29,6 @@ basepython = python2.7
deps = django>=1.3,<1.4
{[testenv]deps}
[testenv:py2.7-django1.2]
basepython = python2.7
deps = django>=1.2,<1.3
{[testenv]deps}
[testenv:py2.6-django.dev]
basepython = python2.6
deps = https://github.com/django/django/zipball/master
@ -55,7 +49,3 @@ basepython = python2.6
deps = django>=1.3,<1.4
{[testenv]deps}
[testenv:py2.6-django1.2]
basepython = python2.6
deps = django>=1.2,<1.3
{[testenv]deps}