Skip to content

Commit

Permalink
Merge pull request #207 from rafaelcaricio/use-tox-for-testing
Browse files Browse the repository at this point in the history
Use tox for testing
  • Loading branch information
hjacobs committed May 11, 2016
2 parents 71382b7 + 2db902c commit 3a02142
Show file tree
Hide file tree
Showing 3 changed files with 20 additions and 8 deletions.
1 change: 1 addition & 0 deletions .gitignore
Expand Up @@ -18,3 +18,4 @@ htmlcov/

# Vi
*.sw*
.tox/
13 changes: 5 additions & 8 deletions .travis.yml
@@ -1,13 +1,10 @@
language: python
matrix:
include:
- python: 3.4
- python: 3.5
python:
- "3.4"
- "3.5"
install:
- pip install -r requirements.txt
- pip install coveralls
- pip install tox tox-travis coveralls
script:
- python setup.py test
- python setup.py flake8
- tox
after_success:
- coveralls
14 changes: 14 additions & 0 deletions tox.ini
@@ -1,3 +1,17 @@
[flake8]
max-line-length=120
select = E,W,F,N,I

[tox]
envlist=py34,py35,flake8

[tox:travis]
3.4=py34
3.5=py35,flake8

[testenv]
commands=python setup.py test

[testenv:flake8]
deps=flake8
commands=python setup.py flake8

0 comments on commit 3a02142

Please sign in to comment.