Skip to content

Commit

Permalink
Merge pull request PyCQA#541 from sigmavirus24/use-tox-with-travis
Browse files Browse the repository at this point in the history
Switch Travis to use tox
  • Loading branch information
sigmavirus24 committed Jan 25, 2017
2 parents 10cefb7 + 5a14978 commit 860369c
Show file tree
Hide file tree
Showing 2 changed files with 29 additions and 18 deletions.
39 changes: 22 additions & 17 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,23 +1,28 @@
language: python
sudo: false
python:
- 2.6
- 2.7
- 3.2
- 3.3
- 3.4
- 3.5
- nightly
- pypy
- pypy3
install:
- pip install -e .
- pip list
script:
- python pycodestyle.py --testsuite testsuite
- python pycodestyle.py --statistics pycodestyle.py
- python pycodestyle.py --doctest
- python setup.py test
- pip install tox
script: tox
matrix:
include:
- python: 2.6
env: TOXENV=py26
- python: 2.7
env: TOXENV=py27
- python: 3.3
env: TOXENV=py33
- python: 3.4
env: TOXENV=py34
- python: 3.5
env: TOXENV=py35
- python: 3.6
env: TOXENV=py36
- python: nightly
env: TOXENV=py37
- python: pypy
env: TOXENV=pypy
- python: 3.5
env: TOXENV=flake8

notifications:
email:
Expand Down
8 changes: 7 additions & 1 deletion tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
# and then run "tox" from this directory.

[tox]
envlist = py26, py27, py32, py33, py34, py35, pypy, pypy3, jython
envlist = py26, py27, py32, py33, py34, py35, py36, pypy, pypy3, jython
skip_missing_interpreters=True

[testenv]
Expand All @@ -14,3 +14,9 @@ commands =
{envpython} pycodestyle.py --statistics pycodestyle.py
{envpython} pycodestyle.py --doctest
{envpython} setup.py test

[testenv:flake8]
deps =
flake8
commands =
flake8 pycodestyle.py

0 comments on commit 860369c

Please sign in to comment.