Skip to content

Commit

Permalink
perform Django 1.9 tests on final release, add to tox too
Browse files Browse the repository at this point in the history
  • Loading branch information
vdboor committed Dec 16, 2015
1 parent 999775c commit a01fd92
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 9 deletions.
10 changes: 5 additions & 5 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ env:
- DJANGO=">=1.6,<1.7"
- DJANGO=">=1.7,<1.8"
- DJANGO=">=1.8,<1.9"
- DJANGO=">=1.9a1,<1.10"
- DJANGO=">=1.9,<1.10"

matrix:
exclude:
Expand All @@ -30,24 +30,24 @@ matrix:
- python: "3.4"
env: DJANGO=">=1.4,<1.5"
- python: "3.4"
env: DJANGO=">=1.9a1,<1.10"
env: DJANGO=">=1.9,<1.10"

- python: "3.3"
env: DJANGO=">=1.4,<1.5"
- python: "3.3"
env: DJANGO=">=1.9a1,<1.10"
env: DJANGO=">=1.9,<1.10"

- python: "3.2"
env: DJANGO=">=1.4,<1.5"
- python: "3.2"
env: DJANGO=">=1.9a1,<1.10"
env: DJANGO=">=1.9,<1.10"

- python: "2.6"
env: DJANGO=">=1.7,<1.8"
- python: "2.6"
env: DJANGO=">=1.8,<1.9"
- python: "2.6"
env: DJANGO=">=1.9a1,<1.10"
env: DJANGO=">=1.9,<1.10"

install:
- pip install django$DJANGO coverage==3.6
Expand Down
8 changes: 4 additions & 4 deletions tox.ini
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
[tox]
envlist=
py26-django{14,15,16},
py27-django{14,15,16,17,18},
py27-django{14,15,16,17,18,19},
py32-django{15,16,17,18},
py33-django{15,16,17,18},
py34-django{15,16,17,18},
py35-django18
py34-django{15,16,17,18,19},
py35-django{18,19}
# py33-django-dev,
docs,

Expand All @@ -16,7 +16,7 @@ deps =
django16: Django >= 1.6, < 1.7
django17: Django >= 1.7, < 1.8
django18: Django >= 1.8, < 1.9
django19: Django >= 1.9a1, < 1.10
django19: Django >= 1.9, < 1.10
django-dev: https://github.com/django/django/tarball/master
commands=
python runtests.py
Expand Down

0 comments on commit a01fd92

Please sign in to comment.