From 6e6f6f2c7d441a032e8c9a89cd8c37a820eaeaaa Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Wed, 27 Feb 2013 21:14:40 +0000 Subject: [PATCH] Update for Django 1.5 --- .travis.yml | 2 +- tox.ini | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index 3787e5177..5f0724108 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,7 +7,7 @@ python: - "3.3" env: - - DJANGO=https://www.djangoproject.com/download/1.5c1/tarball/ + - DJANGO="django==1.5 --use-mirrors" - DJANGO="django==1.4.3 --use-mirrors" - DJANGO="django==1.3.5 --use-mirrors" diff --git a/tox.ini b/tox.ini index ee4db1465..58d308aca 100644 --- a/tox.ini +++ b/tox.ini @@ -7,24 +7,24 @@ commands = {envpython} rest_framework/runtests/runtests.py [testenv:py3.3-django1.5] basepython = python3.3 -deps = https://www.djangoproject.com/download/1.5c1/tarball/ +deps = django==1.5 https://github.com/alex/django-filter/archive/master.tar.gz defusedxml==0.3 [testenv:py3.2-django1.5] basepython = python3.2 -deps = https://www.djangoproject.com/download/1.5c1/tarball/ +deps = django==1.5 https://github.com/alex/django-filter/archive/master.tar.gz defusedxml==0.3 [testenv:py2.7-django1.5] basepython = python2.7 -deps = https://www.djangoproject.com/download/1.5c1/tarball/ +deps = django==1.5 django-filter==0.5.4 [testenv:py2.6-django1.5] basepython = python2.6 -deps = https://www.djangoproject.com/download/1.5c1/tarball/ +deps = django==1.5 django-filter==0.5.4 defusedxml==0.3