Skip to content

Commit

Permalink
Fixes to CI
Browse files Browse the repository at this point in the history
  • Loading branch information
ehiggs committed Jan 18, 2017
1 parent 228ee8b commit b5bbd81
Show file tree
Hide file tree
Showing 4 changed files with 46 additions and 21 deletions.
23 changes: 23 additions & 0 deletions .coveragerc
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
omit =
*/test_*
*__init__.py
*/.tox/*
*/.virtualenvs/*
test/*

[paths]
source =
examples/
syscore/
syslogdiag/
syssims/
systems/

[report]
exclude_lines =
pragma: no cover
def __repr__
raise NotImplementedError
raise AssertionError
if 0:
if __name__ == .__main__.:
21 changes: 11 additions & 10 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,18 +1,19 @@
sudo: false
language: python

python:
- "3.4"
- "3.5"
- "3.6"
matrix:
include:
- python: 3.5
env: TOX_ENV=py35
- python: 3.6
env: TOX_ENV=py36

install:
- pip install tox
- pip install tox

script:
- tox
- tox -e "${TOX_ENV}"

branches:

notifications:
email: false
after_success:
- coverage combine
- codecov
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,6 @@ def read(fname):
tests_requires=['nose'],
test_suite='nose.collect',
extras_require=dict(),
test_requires=['pytest', 'coverage', 'pytest-cov'],
test_suite='nose.collector',
include_package_data=True
)
21 changes: 11 additions & 10 deletions tox.ini
Original file line number Diff line number Diff line change
@@ -1,15 +1,16 @@
[tox]
envlist = py36
envlist = py{35,36}

[testenv]
commands = py.test --cov-conf=.coveragerc --junit-xml=junit-{envname}.xml
#commands = py.test --cov-conf=.coveragerc --junit-xml=junit-{envname}.xml
commands = nosetests
deps =
pytest
pytest-cov

pandas >=0.19.0
numpy >= 1.10.1
matplotlib > 1.4.3
PyYAML >= 3.11
scipy >= 0.17
#pytest
#pytest-cov
nose
pandas>=0.19.0
numpy>= 1.10.1
matplotlib>=1.4.3
PyYAML>=3.11
scipy>=0.17

0 comments on commit b5bbd81

Please sign in to comment.