aboutsummaryrefslogtreecommitdiffstats
path: root/.travis.yml
diff options
context:
space:
mode:
authorTom Christie2013-02-01 15:07:51 +0000
committerTom Christie2013-02-01 15:07:51 +0000
commit00752dcd2a3647f2de2a259934753745597e3ade (patch)
treebf730061dc16480f9a09da5b4916bf0d31f4fe6a /.travis.yml
parentf4f237e3ee02fef4fd5f389bf4fb3bbdd00173bd (diff)
downloaddjango-rest-framework-00752dcd2a3647f2de2a259934753745597e3ade.tar.bz2
Py3k cleanup
Diffstat (limited to '.travis.yml')
-rw-r--r--.travis.yml11
1 files changed, 7 insertions, 4 deletions
diff --git a/.travis.yml b/.travis.yml
index 572e483b..662ea5c8 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,18 +4,17 @@ python:
- "2.6"
- "2.7"
- "3.2"
+ - "3.3"
env:
- - DJANGO=https://github.com/django/django/zipball/master
- DJANGO=https://www.djangoproject.com/download/1.5c1/tarball/
- DJANGO="django==1.4.3 --use-mirrors"
- DJANGO="django==1.3.5 --use-mirrors"
install:
- pip install $DJANGO
- - "if [[ $TRAVIS_PYTHON_VERSION != '3.2' ]]; then pip install django-filter==0.5.4 --use-mirrors; fi"
- - "if [[ $TRAVIS_PYTHON_VERSION == '3.2' ]]; then pip install https://github.com/alex/django-filter/tarball/master; fi"
- - "if [[ $DJANGO == 'django==1.3.5 --use-mirrors' ]]; then pip install six --use-mirrors; fi"
+ - "if [[ ${TRAVIS_PYTHON_VERSION::1} != '3' ]]; then pip install django-filter==0.5.4 --use-mirrors; fi"
+ - "if [[ ${TRAVIS_PYTHON_VERSION::1} == '3' ]]; then pip install https://github.com/alex/django-filter/tarball/master; fi"
- export PYTHONPATH=.
script:
@@ -27,3 +26,7 @@ matrix:
env: DJANGO="django==1.4.3 --use-mirrors"
- python: "3.2"
env: DJANGO="django==1.3.5 --use-mirrors"
+ - python: "3.3"
+ env: DJANGO="django==1.4.3 --use-mirrors"
+ - python: "3.3"
+ env: DJANGO="django==1.3.5 --use-mirrors"