Skip to content

Commit

Permalink
Added test config for django 1.11b1.
Browse files Browse the repository at this point in the history
  • Loading branch information
benkonrath committed Feb 21, 2017
1 parent b3debd0 commit 8a980ee
Show file tree
Hide file tree
Showing 2 changed files with 18 additions and 4 deletions.
16 changes: 14 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ matrix:
- python: 2.7
env: TOXENV=py27-1.10
- python: 2.7
env: TOXENV=py27-master
env: TOXENV=py27-1.11
- python: 3.2
env: TOXENV=py32-1.8
- python: 3.3
Expand All @@ -28,19 +28,31 @@ matrix:
env: TOXENV=py34-1.9
- python: 3.4
env: TOXENV=py34-1.10
- python: 3.4
env: TOXENV=py34-1.11
- python: 3.4
env: TOXENV=py34-master
- python: 3.5
env: TOXENV=py35-1.9
- python: 3.5
env: TOXENV=py35-1.10
- python: 3.5
env: TOXENV=py35-1.11
- python: 3.5
env: TOXENV=py35-master
- python: 3.6
env: TOXENV=py36-1.11
- python: 3.6
env: TOXENV=py36-master
allow_failures:
- python: 2.7
env: TOXENV=py27-master
env: TOXENV=py27-1.11
- python: 3.4
env: TOXENV=py34-1.11
- python: 3.5
env: TOXENV=py35-1.11
- python: 3.6
env: TOXENV=py36-1.11
- python: 3.4
env: TOXENV=py34-master
- python: 3.5
Expand Down
6 changes: 4 additions & 2 deletions tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,9 @@ args_are_paths = false
envlist =
docs,prospector,isort
{py27,py32,py33,py34}-1.8,
{py27,py34,py35}-{1.9,1.10,master}
py36-master
{py27,py34,py35}-{1.9,1.10}
{py27,py34,py35,py36}-1.11
{py34,py35,py36}-master

[testenv]
basepython =
Expand All @@ -22,6 +23,7 @@ deps =
1.8: Django>=1.8,<1.9
1.9: Django>=1.9,<1.10
1.10: Django>=1.10,<1.11
1.11: Django==1.11b1
master: https://github.com/django/django/archive/master.tar.gz
-r{toxinidir}/tests/requirements.txt

Expand Down

0 comments on commit 8a980ee

Please sign in to comment.