Skip to content

Commit

Permalink
Include the Django 2.0 beta release in the test matrix
Browse files Browse the repository at this point in the history
  • Loading branch information
matthiask committed Oct 17, 2017
1 parent 85ff21f commit 3a366ae
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 0 deletions.
7 changes: 7 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ env:
- DJANGO="Django>=1.9,<1.10"
- DJANGO="Django>=1.10,<1.11"
- DJANGO="Django>=1.11,<2.0"
- DJANGO="Django==2.0b1"
- DJANGO="https://github.com/django/django/archive/master.tar.gz"

matrix:
Expand All @@ -28,10 +29,16 @@ matrix:
python: "3.3"
- env: DJANGO="Django>=1.11,<2.0"
python: "3.3"
- env: DJANGO="Django==2.0b1"
python: "2.7"
- env: DJANGO="Django==2.0b1"
python: "3.3"
- env: DJANGO="https://github.com/django/django/archive/master.tar.gz"
python: "2.7"
- env: DJANGO="https://github.com/django/django/archive/master.tar.gz"
python: "3.3"
- env: DJANGO="https://github.com/django/django/archive/master.tar.gz"
python: "3.4"
allow_failures:
- env: DJANGO="https://github.com/django/django/archive/master.tar.gz"

Expand Down
2 changes: 2 additions & 0 deletions tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
envlist =
{py27,py33,py34,pypy}-{dj18}
{py27,py34,py35,pypy}-{dj19,dj110,dj111}
{py35}-{dj20}

[testenv]
changedir = {toxinidir}/tests
Expand All @@ -18,3 +19,4 @@ deps =
dj19: Django>=1.9,<1.10
dj110: Django>=1.10,<1.11
dj111: Django>=1.11,<2.0
dj20: Django==2.0b1

0 comments on commit 3a366ae

Please sign in to comment.