Skip to content

Commit 860369c

Browse files
authored
Merge pull request #541 from sigmavirus24/use-tox-with-travis
Switch Travis to use tox
2 parents 10cefb7 + 5a14978 commit 860369c

File tree

2 files changed

+29
-18
lines changed

2 files changed

+29
-18
lines changed

.travis.yml

+22-17
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,28 @@
11
language: python
22
sudo: false
3-
python:
4-
- 2.6
5-
- 2.7
6-
- 3.2
7-
- 3.3
8-
- 3.4
9-
- 3.5
10-
- nightly
11-
- pypy
12-
- pypy3
133
install:
14-
- pip install -e .
15-
- pip list
16-
script:
17-
- python pycodestyle.py --testsuite testsuite
18-
- python pycodestyle.py --statistics pycodestyle.py
19-
- python pycodestyle.py --doctest
20-
- python setup.py test
4+
- pip install tox
5+
script: tox
6+
matrix:
7+
include:
8+
- python: 2.6
9+
env: TOXENV=py26
10+
- python: 2.7
11+
env: TOXENV=py27
12+
- python: 3.3
13+
env: TOXENV=py33
14+
- python: 3.4
15+
env: TOXENV=py34
16+
- python: 3.5
17+
env: TOXENV=py35
18+
- python: 3.6
19+
env: TOXENV=py36
20+
- python: nightly
21+
env: TOXENV=py37
22+
- python: pypy
23+
env: TOXENV=pypy
24+
- python: 3.5
25+
env: TOXENV=flake8
2126

2227
notifications:
2328
email:

tox.ini

+7-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
# and then run "tox" from this directory.
55

66
[tox]
7-
envlist = py26, py27, py32, py33, py34, py35, pypy, pypy3, jython
7+
envlist = py26, py27, py32, py33, py34, py35, py36, pypy, pypy3, jython
88
skip_missing_interpreters=True
99

1010
[testenv]
@@ -14,3 +14,9 @@ commands =
1414
{envpython} pycodestyle.py --statistics pycodestyle.py
1515
{envpython} pycodestyle.py --doctest
1616
{envpython} setup.py test
17+
18+
[testenv:flake8]
19+
deps =
20+
flake8
21+
commands =
22+
flake8 pycodestyle.py

0 commit comments

Comments
 (0)