Skip to content

Commit

Permalink
add python 3.5 and django 1.9 support
Browse files Browse the repository at this point in the history
  • Loading branch information
st4lk committed Dec 5, 2015
1 parent 98dc842 commit 0aee252
Show file tree
Hide file tree
Showing 3 changed files with 36 additions and 4 deletions.
6 changes: 5 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,12 @@ python:
env:
- TOXENV=py34-17
- TOXENV=py34-18
- TOXENV=py34-19
- TOXENV=py35-18
- TOXENV=py35-19
- TOXENV=py27-17
- TOXENV=py27-18
- TOXENV=py27-19

branches:
only:
Expand All @@ -19,7 +23,7 @@ install: pip install --quiet tox
script: tox

after_script:
- if [ $TOXENV == "py27-18" ]; then
- if [ $TOXENV == "py27-19" ]; then
pip install --quiet coveralls;
coveralls;
fi
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ OAuth signin with django rest framework.
Requirements
-----------

- python (2.7, 3.4)
- django (1.7, 1.8)
- python (2.7, 3.4, 3.5)
- django (1.7, 1.8, 1.9)
- djangorestframework (>= 3.1)
- [optional] djangorestframework-jwt (>=1.7.2)

Expand Down
30 changes: 29 additions & 1 deletion tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,12 @@
envlist=
py34-17,
py34-18,
py34-19,
py35-18,
py35-19,
py27-17,
py27-18
py27-18,
py27-19

[testenv]
setenv =
Expand All @@ -28,6 +32,24 @@ deps =
django<1.9
{[testenv]deps}

[testenv:py34-19]
basepython = python3.4
deps =
django<1.10
{[testenv]deps}

[testenv:py35-18]
basepython = python3.5
deps =
django<1.9
{[testenv]deps}

[testenv:py35-19]
basepython = python3.5
deps =
django<1.10
{[testenv]deps}

[testenv:py27-17]
basepython = python2.7
deps =
Expand All @@ -38,6 +60,12 @@ deps =
basepython = python2.7
deps =
django<1.9
{[testenv]deps}

[testenv:py27-19]
basepython = python2.7
deps =
django<1.10
djangorestframework-jwt
coverage
{[testenv]deps}
Expand Down

0 comments on commit 0aee252

Please sign in to comment.