Skip to content

Commit

Permalink
Enable Django 1.11 in tests
Browse files Browse the repository at this point in the history
(still needs latest django-polymorphic git release)
  • Loading branch information
vdboor committed Apr 27, 2017
1 parent 52e80a3 commit 5f59d69
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 2 deletions.
7 changes: 7 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ env:
- DJANGO="django>=1.8.0,<1.9.0"
- DJANGO="django>=1.9.0,<1.10.0"
- DJANGO="django>=1.10.0,<1.11.0"
- DJANGO="django>=1.11.0,<1.12.0"
matrix:
exclude:
- python: '2.6'
Expand All @@ -23,12 +24,18 @@ matrix:
env: DJANGO="django>=1.9.0,<1.10.0"
- python: '2.6'
env: DJANGO="django>=1.10.0,<1.11.0"
- python: '2.6'
env: DJANGO="django>=1.11.0,<1.12.0"
- python: '3.3'
env: DJANGO="django>=1.4.0,<1.5.0"
- python: '3.3'
env: DJANGO="django>=1.9.0,<1.10.0"
- python: '3.3'
env: DJANGO="django>=1.10.0,<1.11.0"
- python: '3.3'
env: DJANGO="django>=1.11.0,<1.12.0"
allow_failures:
- env: DJANGO="django>=1.11.0,<1.12.0"
before_install:
- pip install codecov
install:
Expand Down
5 changes: 3 additions & 2 deletions tox.ini
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
[tox]
envlist=
py26-django{15,16},
py27-django{15,16,17,18,19,110},
py27-django{15,16,17,18,19,110,111},
py33-django{16,17,18},
py34-django{16,17,18,19,110},
py34-django{16,17,18,19,110,111},
# py33-django-dev,
docs,

Expand All @@ -22,6 +22,7 @@ deps =
django18: Django >= 1.8,<1.9
django19: Django >= 1.9,<1.10
django110: Django >= 1.10,<1.11
django111: Django >= 1.11,<1.12
django-dev: https://github.com/django/django/tarball/master
commands=
python --version
Expand Down

0 comments on commit 5f59d69

Please sign in to comment.