Skip to content

Commit c4960d3

Browse files
committed
Set up with tox-travis
This means we don't need to specify the Tox environments in two places anymore.
1 parent 628def9 commit c4960d3

File tree

2 files changed

+4
-14
lines changed

2 files changed

+4
-14
lines changed

.travis.yml

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,13 @@
11
language: python
22

33
install:
4-
- pip install tox coveralls
4+
- pip install tox tox-travis coveralls
55
matrix:
66
include:
77
- python: 2.7
8-
env:
9-
- ENV=docs
10-
- python: 2.7
11-
env:
12-
- ENV=py27-django111
138
- python: 3.5
14-
env:
15-
- ENV=py35-django111,py35-django20,py35-django21
169
- python: 3.6
17-
env:
18-
- ENV=py36-django111,py36-django20,py36-django21
1910
script:
20-
- tox -e $ENV
11+
- tox
2112
after_success:
2213
- coveralls

tox.ini

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[tox]
22
envlist=
3-
docs,
3+
py27-docs,
44
py27-django{111},
55
py35-django{111,20,21},
66
py36-django{111,20,21},
@@ -22,8 +22,7 @@ deps =
2222
commands =
2323
pytest --flake8 --cov=oidc_provider {posargs}
2424

25-
[testenv:docs]
26-
basepython = python2.7
25+
[testenv:py27-docs]
2726
changedir = docs
2827
whitelist_externals =
2928
mkdir

0 commit comments

Comments
 (0)