From 0367a1c0bdd271a55e920ea84d6c8282981af5bb Mon Sep 17 00:00:00 2001 From: pbrod Date: Sat, 28 Nov 2015 20:03:22 +0100 Subject: [PATCH] Attempt to fix the coverage --- .coveragerc | 4 +++- .gitignore | 41 +++++++++++++++++++++++++++++++++++++++++ .travis.yml | 2 +- tox.ini | 24 ++++++++++++++++++++++++ 4 files changed, 69 insertions(+), 2 deletions(-) create mode 100644 .gitignore create mode 100644 tox.ini diff --git a/.coveragerc b/.coveragerc index 0fb7db6..cee8f9a 100644 --- a/.coveragerc +++ b/.coveragerc @@ -2,7 +2,9 @@ [run] branch = True source = wafo -#omit = */xxxx.py +omit = + wafo/test/* + wafo/source/* [report] # Regexes for lines to exclude from consideration diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..9a1e58d --- /dev/null +++ b/.gitignore @@ -0,0 +1,41 @@ +# Temporary and binary files +*~ +*.py[cod] +*.so +*.cfg +!setup.cfg +*.orig +*.log +*.pot +__pycache__/* +.cache/* +.*.swp + +# Project files +.ropeproject +.project +.pydevproject +.settings +.idea + +# Package files +*.egg +*.eggs/ +.installed.cfg +*.egg-info + +# Unittest and coverage +htmlcov/* +.coverage +.tox +junit.xml +coverage.xml + +# Build and docs folder/files +build/* +dist/* +sdist/* +docs/_rst/* +docs/_build/* +cover/* +MANIFEST diff --git a/.travis.yml b/.travis.yml index 5dc5d3f..ea12849 100644 --- a/.travis.yml +++ b/.travis.yml @@ -37,7 +37,7 @@ before_install: install: - conda install --yes python=$TRAVIS_PYTHON_VERSION numpy scipy pytest numdifftools - pip install coveralls - - python setup.py build +# - python setup.py build - python setup.py install # - conda build conda_recipe # - conda install wafo --use-local diff --git a/tox.ini b/tox.ini new file mode 100644 index 0000000..82bafe9 --- /dev/null +++ b/tox.ini @@ -0,0 +1,24 @@ +# Tox (http://tox.testrun.org/) is a tool for running tests +# in multiple virtualenvs. This configuration file will run the +# test suite on all supported python versions. To use it, "pip install tox" +# and then run "tox" from this directory. + +[tox] +envlist = py27, py32, py33, py34, pypy, report + +[testenv] +changedir=tests +deps = + -r./requirements.txt + coverage + coveralls +commands = + coverage run --source=wafo setup.py test + +[testenv:report] +basepython = python3.4 +commands = + coverage combine + coverage report -m +usedevelop = true +