Skip to content
This repository has been archived by the owner on Nov 3, 2022. It is now read-only.

Commit

Permalink
Merge pull request #44 from ymyzk/django-1-11-alpha
Browse files Browse the repository at this point in the history
Add Python 3.6 & Django 1.11 to the test matrix
  • Loading branch information
ymyzk committed Jan 30, 2017
2 parents 60565b7 + 8456f39 commit 53575b7
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 4 deletions.
1 change: 1 addition & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ python:
- 3.3
- 3.4
- 3.5
- 3.6
install:
- pip install -U pip setuptools wheel
- pip install 'tox>=2.0.0,<3.0.0' 'tox-travis>=0.8,<1.0'
Expand Down
10 changes: 6 additions & 4 deletions tox.ini
Original file line number Diff line number Diff line change
@@ -1,19 +1,21 @@
[tox]
envlist = {py27,py33,py34,pypy,pypy3}-django18, {py27,py34,py35,pypy}-django{19,110}, coverage, docs, flake8, mypy
envlist = {py27,py33,py34,pypy,pypy3}-django18, {py27,py34,py35,pypy}-django{19,110}, {py27,py34,py35,py36}-django111, coverage, docs, flake8, mypy
; https://docs.djangoproject.com/en/dev/faq/install/#what-python-version-can-i-use-with-django

[travis]
python =
2.7: py27-django{18,19,110}, coverage, docs, flake8
2.7: py27-django{18,19,110,111}, coverage, docs, flake8
3.3: py33-django18
3.4: py34-django{19,110}
3.5: py35-django{19,110}, coverage, docs, flake8, mypy
3.4: py34-django{19,110,111}
3.5: py35-django{19,110,111}, coverage, docs, flake8, mypy
3.6: py36-django111

[testenv]
deps =
django18: Django>=1.8,<1.9
django19: Django>=1.9,<1.10
django110: Django>=1.10,<1.11
django111: Django>=1.11a1,<1.12
commands =
pip install -e .[test]
./runtests.py
Expand Down

0 comments on commit 53575b7

Please sign in to comment.