aboutsummaryrefslogtreecommitdiffstats
path: root/.travis.yml
diff options
context:
space:
mode:
authorXavier Ordoquy2013-01-02 16:09:21 +0100
committerXavier Ordoquy2013-01-02 16:09:21 +0100
commit737349d2389197d23886b72c1cb44f53c501ac9a (patch)
tree0c542b6c73deee0280705c8253334126c5f5d254 /.travis.yml
parent5fad46d7e213afed503b1533515cab96875a5936 (diff)
parentd379997aba5b1e41309bbed8740ed704c0feb58b (diff)
downloaddjango-rest-framework-737349d2389197d23886b72c1cb44f53c501ac9a.tar.bz2
Merge remote-tracking branch 'reference/py3k' into p3k
Diffstat (limited to '.travis.yml')
-rw-r--r--.travis.yml7
1 files changed, 4 insertions, 3 deletions
diff --git a/.travis.yml b/.travis.yml
index a9e63580..714634f5 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,9 +6,10 @@ python:
- "3.2"
env:
- - DJANGO=https://www.djangoproject.com/download/1.5b1/tarball/
- - DJANGO=django==1.4.2 --use-mirrors
- - DJANGO=django==1.3.3 --use-mirrors
+ - DJANGO=https://github.com/django/django/zipball/master
+ - DJANGO=https://www.djangoproject.com/download/1.5b2/tarball/
+ - DJANGO=django==1.4.3 --use-mirrors
+ - DJANGO=django==1.3.5 --use-mirrors
install:
- pip install $DJANGO