Merge pull request #28 from brack3t/django_15_final

Travis: test against Django 1.5 final
This commit is contained in:
Mike Edmunds
2013-02-28 17:49:46 -08:00

View File

@@ -6,7 +6,8 @@ python:
env: env:
- DJANGO=django==1.3 - DJANGO=django==1.3
- DJANGO=django==1.4 - DJANGO=django==1.4
- DJANGO=https://github.com/django/django/tarball/stable/1.5.x - DJANGO=django==1.5
#- DJANGO=https://github.com/django/django/tarball/stable/1.6.x
matrix: matrix:
exclude: exclude:
# Django < 1.5 not supported on python 3 # Django < 1.5 not supported on python 3
@@ -16,7 +17,7 @@ matrix:
env: DJANGO=django==1.4 env: DJANGO=django==1.4
# Django 1.5 strongly recommends python 2.7 or later (so skip 2.6) # Django 1.5 strongly recommends python 2.7 or later (so skip 2.6)
- python: "2.6" - python: "2.6"
env: DJANGO=https://github.com/django/django/tarball/stable/1.5.x env: DJANGO=django==1.5
install: install:
- pip install -q $DJANGO --use-mirrors - pip install -q $DJANGO --use-mirrors
- pip install . --use-mirrors - pip install . --use-mirrors