Skip to content

Commit

Permalink
Simplify tox tests (#142)
Browse files Browse the repository at this point in the history
* Simplify tox tests

* Update py39 env

* Update pip

* Update test dependencies

* Fix lint

* Downgrade cryptography for py36

* Fix tox.ini
  • Loading branch information
st4lk committed Feb 15, 2021
1 parent 4719f50 commit 183ac5b
Show file tree
Hide file tree
Showing 4 changed files with 24 additions and 21 deletions.
14 changes: 10 additions & 4 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,12 +16,21 @@ 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

install: pip install --quiet tox
- 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 --upgrade pip tox

# command to run tests
script: tox
Expand Down
2 changes: 1 addition & 1 deletion example_project/config/settings_test.py
@@ -1,7 +1,7 @@
" Settings for tests. "
INSTALLED_APPS = []

from .settings import * # NOQA: F401, F403
from .settings import * # NOQA: E402, F401, F403

# Databases
DATABASES = {
Expand Down
8 changes: 4 additions & 4 deletions requirements_test.txt
@@ -1,5 +1,5 @@
pytest-django==4.1.0
httpretty==0.9.6
unittest2==1.0.1
django-sslserver>=0.20
flake8==3.7.9
httpretty==1.0.5
unittest2==1.1.0
django-sslserver>=0.22
flake8==3.8.4
21 changes: 9 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,16 @@ basepython =
py36: python3.6
py37: python3.7
py38: python3.8
py38: python3.9
py39: python3.9
deps =
py36: cryptography<3.4
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 183ac5b

Please sign in to comment.