Skip to content

Commit 13f9e4b

Browse files
authored
Update Travis testing matrix (#679)
* Set up tox-travis This will allow us to keep our matrix configuration in Tox instead of having to replicate it within Travis. Right now this does not fully match the Tox configuration, since it didn't previously, but that will be corrected later. * Add testing on Python 3.5 This is in the supported versions and the Tox matrix, but not in the Travis matrix. * Fix running flake8 and docs tox configurations * Test on Python 3.7 * Add Python 3.7 to tox matrix Forgot to do this, so Travis will know what environments to execute. The docs and flake8 remain at Python 3.6 since that's where they were before.
1 parent 560a7f3 commit 13f9e4b

File tree

2 files changed

+13
-20
lines changed

2 files changed

+13
-20
lines changed

.travis.yml

Lines changed: 8 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,22 @@
11
# https://travis-ci.org/evonove/django-oauth-toolkit
22
sudo: false
3-
language: python
3+
dist: xenial
44

5-
python: "3.6"
5+
language: python
66

7-
env:
8-
- TOXENV=py34-django20
9-
- TOXENV=py36-django20
10-
- TOXENV=py36-django21
11-
- TOXENV=py36-djangomaster
12-
- TOXENV=docs
13-
- TOXENV=flake8
7+
python:
8+
- "3.4"
9+
- "3.5"
10+
- "3.6"
11+
- "3.7"
1412

1513
cache:
1614
directories:
1715
- $HOME/.cache/pip
1816
- $TRAVIS_BUILD_DIR/.tox
1917

20-
matrix:
21-
fast_finish: true
22-
23-
allow_failures:
24-
- env: TOXENV=py36-djangomaster
25-
2618
install:
27-
- pip install coveralls tox
19+
- pip install coveralls tox tox-travis
2820

2921
script:
3022
- tox

tox.ini

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,9 @@ envlist =
33
py34-django20,
44
py35-django{20,21,master},
55
py36-django{20,21,master},
6-
docs,
7-
flake8
6+
py37-django{20,21,master},
7+
py36-docs,
8+
py36-flake8
89

910
[pytest]
1011
django_find_project = false
@@ -27,14 +28,14 @@ deps =
2728
pytest-xdist
2829
py27: mock
2930

30-
[testenv:docs]
31+
[testenv:py36-docs]
3132
basepython = python
3233
changedir = docs
3334
whitelist_externals = make
3435
commands = make html
3536
deps = sphinx
3637

37-
[testenv:flake8]
38+
[testenv:py36-flake8]
3839
skip_install = True
3940
commands =
4041
flake8 {toxinidir}

0 commit comments

Comments
 (0)