Skip to content

Commit

Permalink
Merge 63e1954 into 4719f50
Browse files Browse the repository at this point in the history
  • Loading branch information
st4lk committed Feb 15, 2021
2 parents 4719f50 + 63e1954 commit 1e243df
Show file tree
Hide file tree
Showing 2 changed files with 17 additions and 15 deletions.
12 changes: 9 additions & 3 deletions .travis.yml
Expand Up @@ -2,9 +2,6 @@ language: python

matrix:
include:
- python: 3.5
env: TOXENV=py35-django22

- python: 3.6
env: TOXENV=py36-django22
- python: 3.6
Expand All @@ -19,11 +16,20 @@ matrix:
- python: 3.7
env: TOXENV=py37-django31

- python: 3.8
env: TOXENV=py38-django22
- python: 3.8
env: TOXENV=py38-django30
- python: 3.8
env: TOXENV=py38-django31

- python: 3.9
env: TOXENV=py39-django22
- python: 3.9
env: TOXENV=py39-django30
- python: 3.9
env: TOXENV=py39-django31

install: pip install --quiet tox

# command to run tests
Expand Down
20 changes: 8 additions & 12 deletions tox.ini
@@ -1,9 +1,9 @@
[tox]
envlist=
py{36}-django{22, 30, 31}-core{30, 33, 34, 40}-coreapp{3, 4}
py{37}-django{22, 30, 31}-core{30, 33, 34, 40}-coreapp{3, 4}
py{38}-django{22, 30, 31}-core{30, 33, 34, 40}-coreapp{3, 4}
py{39}-django{22, 30, 31}-core{30, 33, 34, 40}-coreapp{3, 4}
py{36}-django{22, 30, 31}
py{37}-django{22, 30, 31}
py{38}-django{22, 30, 31}
py{39}-django{22, 30, 31}

[testenv]
setenv =
Expand All @@ -13,19 +13,15 @@ basepython =
py36: python3.6
py37: python3.7
py38: python3.8
py38: python3.9
py39: python3.9
deps =
djangorestframework<4.0
core30: social-auth-core>=3.0,<3.1
core33: social-auth-core>=3.3,<3.4
core34: social-auth-core>=3.4,<3.5
core40: social-auth-core>=4.0,<4.1
coreapp3: social-auth-app-django>=3.1,<4
coreapp4: social-auth-app-django>=4,<4.1
social-auth-core==4.0.3
social-auth-app-django==4.0.0
djangorestframework-jwt
djangorestframework_simplejwt
django-rest-knox<5.0.0
django22: Django>=2.2,<2.3
django22: Django>=2.2.17,<2.3
django30: Django>=3.0,<3.1
django31: Django>=3.1,<3.2
py37-django22: coverage
Expand Down

0 comments on commit 1e243df

Please sign in to comment.