Skip to content

Commit

Permalink
Merge pull request #33 from ktbyers/develop
Browse files Browse the repository at this point in the history
Convert to use Tox
  • Loading branch information
ktbyers committed Jan 5, 2017
2 parents 929716f + 8edccd8 commit 5eccc22
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 9 deletions.
6 changes: 2 additions & 4 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,7 @@ python:
- 3.5

install:
- pip install -r requirements-dev.txt
- pip install .
- pip install tox-travis
- pip install coveralls

deploy:
Expand All @@ -20,8 +19,7 @@ deploy:
branch: master

script:
- py.test --cov-report= --cov=napalm_panos test/
- pylama .
- tox

after_success:
- coveralls
Expand Down
9 changes: 4 additions & 5 deletions setup.cfg
Original file line number Diff line number Diff line change
@@ -1,16 +1,15 @@
[pylama]
linters = mccabe,pep8,pyflakes
ignore = D203,C901
skip = build/*,.tox/*

[pylama:pep8]
max_line_length = 100

[tool:pytest]
addopts = --cov=./ -vs
[pytest]
addopts = --cov=napalm_panos --cov-report term-missing -vs --pylama
json_report = report.json
jsonapi = true

[coverage:run]
include =
napalm_panos/*

source = napalm_panos
9 changes: 9 additions & 0 deletions tox.ini
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
[tox]
envlist = py27,py34,py35

[testenv]
deps =
-rrequirements-dev.txt

commands=
py.test

0 comments on commit 5eccc22

Please sign in to comment.