Skip to content

Commit

Permalink
Merge 1d082ab into 3034218
Browse files Browse the repository at this point in the history
  • Loading branch information
st4lk committed Mar 13, 2019
2 parents 3034218 + 1d082ab commit 0d0539d
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 6 deletions.
6 changes: 5 additions & 1 deletion .travis.yml
Expand Up @@ -10,6 +10,9 @@ env:
- TOXENV=py36-django111
- TOXENV=py36-django20
- TOXENV=py36-django21
- TOXENV=py37-django111
- TOXENV=py37-django20
- TOXENV=py37-django21
- TOXENV=py27-django111

install: pip install --quiet tox
Expand All @@ -18,7 +21,7 @@ install: pip install --quiet tox
script: tox

after_script:
- if [ $TOXENV == "py36-django111" ]; then
- if [ $TOXENV == "py37-django111" ]; then
pip install --quiet coveralls;
coveralls;
fi
Expand All @@ -30,3 +33,4 @@ addons:
packages:
- python3.5
- python3.6
- python3.7
2 changes: 1 addition & 1 deletion README.md
Expand Up @@ -12,7 +12,7 @@ OAuth signin with django rest framework.
Requirements
-----------

- python (2.7, 3.5, 3.6)
- python (2.7, 3.5, 3.6, 3.7)
- django (1.11, 2.0, 2.1)
- djangorestframework (>=3.1, <4.0)
- social-auth-core (>=3.0, <4.0)
Expand Down
10 changes: 6 additions & 4 deletions tox.ini
Expand Up @@ -3,6 +3,7 @@ envlist=
py{27}-django{111},
py{35}-django{111, 20, 21},
py{36}-django{111, 20, 21}
py{37}-django{111, 20, 21}

[testenv]
setenv =
Expand All @@ -12,21 +13,22 @@ basepython =
py27: python2.7
py35: python3.5
py36: python3.6
py37: python3.7
deps =
djangorestframework<4.0
social-auth-core==3.0.0
social-auth-app-django==3.1.0
django111: Django>=1.11,<1.12
django20: Django>=2.0,<2.1
django21: Django>=2.1,<2.2
py36-django111: djangorestframework-jwt
py36-django111: djangorestframework_simplejwt
py36-django111: coverage
py37-django111: djangorestframework-jwt
py37-django111: djangorestframework_simplejwt
py37-django111: coverage
-rrequirements_test.txt
commands =
py.test {posargs}

[testenv:py36-django111]
[testenv:py37-django111]
commands =
coverage run --source=rest_social_auth -m py.test {posargs}
coverage report

0 comments on commit 0d0539d

Please sign in to comment.