Commit dc613897 authored by Jason Swails's avatar Jason Swails

Update MANIFEST.in file, and updates to hopefully get coverage/coveralls

working.
parent af2ecb7f
graft examples graft examples
graft src graft src
graft test graft parmed
#!/bin/sh #!/bin/sh
set -e set -e
do_coverage() {
coverage combine .
coverage report -m
}
echo "Checking parmed source with pyflakes linter" echo "Checking parmed source with pyflakes linter"
if [ "$PYTHON_VERSION" = "pypy" ]; then if [ "$PYTHON_VERSION" = "pypy" ]; then
export PYENV_ROOT="${HOME}/.pyenv" export PYENV_ROOT="${HOME}/.pyenv"
...@@ -12,14 +17,16 @@ cd test ...@@ -12,14 +17,16 @@ cd test
echo "Using nosetests...:" echo "Using nosetests...:"
./run_scripts.sh ./run_scripts.sh
if [ "$PYTHON_VERSION" = "pypy" ]; then if [ "$PYTHON_VERSION" = "pypy" ]; then
# Disable coverage with pyflakes, since it multiplies the time taken by 6 or # Disable coverage with pypy, since it multiplies the time taken by 6 or
# something ridiculous like that # something ridiculous like that
nosetests -vs --with-timer --timer-ok=5s --timer-warning=12s \ nosetests -vs --with-timer --timer-ok=5s --timer-warning=12s \
--timer-filter=warning,error . --timer-filter=warning,error .
else else
nosetests -vs --with-timer --timer-ok=5s --timer-warning=12s \ # Run nose under coverage, since that allows getting the full flexibility of
--timer-filter=warning,error --with-coverage \ # the coverage package without sacrificing nose functionality
--cover-package=parmed . coverage run --source=parmed --parallel-mode -m \
nose -vs --with-timer --timer-ok=5s --timer-warning=12s \
--timer-filter=warning,error .
fi fi
test -z `which coverage 2>/dev/null` || coverage report -m test -z `which coverage 2>/dev/null` || do_coverage
test -z `which coveralls` || coveralls test -z `which coveralls` || coveralls
...@@ -8,7 +8,3 @@ omit = ...@@ -8,7 +8,3 @@ omit =
*/parmed/utils/netcdf.py */parmed/utils/netcdf.py
*/parmed/tinker/* */parmed/tinker/*
*/parmed/rosetta/* */parmed/rosetta/*
[report]
show_missing = True
skip_covered = True
...@@ -47,11 +47,6 @@ $run_cmd -m parmed.gromacs._cpp -i - < files/pptest1/pptest1.h \ ...@@ -47,11 +47,6 @@ $run_cmd -m parmed.gromacs._cpp -i - < files/pptest1/pptest1.h \
evaluate_test $? cpptest1 evaluate_test $? cpptest1
###### END TESTS ###### ###### END TESTS ######
if [ "$has_coverage" = "yes" ]; then
coverage combine .coverage*
echo "Coverage data combined. Run 'coverage report' to get the report"
fi
# Clean up if everything passed # Clean up if everything passed
if [ $failures -eq 0 ]; then if [ $failures -eq 0 ]; then
/bin/rm -fr files/writes /bin/rm -fr files/writes
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment