From 7945c81cd502f164ff5b7d3930f90d7d2cc3bd2b Mon Sep 17 00:00:00 2001 From: Alen Mujezinovic Date: Fri, 14 Jun 2013 16:09:55 +0100 Subject: [PATCH] Tests updates * Removed Django 1.2 * Don't run dev tests on travis --- .travis.yml | 1 - requirements.txt | 4 ++-- tox.ini | 10 ---------- 3 files changed, 2 insertions(+), 13 deletions(-) diff --git a/.travis.yml b/.travis.yml index bf8718a..5a7c0e5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -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" diff --git a/requirements.txt b/requirements.txt index 9578bff..cf610e5 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,2 +1,2 @@ -Django>=1.2 -shortuuid>=0.3 \ No newline at end of file +Django>=1.3 +shortuuid>=0.3 diff --git a/tox.ini b/tox.ini index 85c52d0..07fad6b 100644 --- a/tox.ini +++ b/tox.ini @@ -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}