Commit d46de36f authored by Paul McCarthy's avatar Paul McCarthy 🚵
Browse files

Tweaks - I think I've figured out why python 3.x tests were hanging -

something wrong in coverage!
parent e1e84287
[run]
source =
fsl
# async.py is not currently covered because
# it otherwise causes async unit tests to
# hang when running in docker/python 3.x/xvfb-run!
omit =
fsl/utils/async.py
\ No newline at end of file
......@@ -225,7 +225,6 @@ variables:
- apt-get update -y
- apt-get install -y xvfb libgtk-3-0
- apt-get install -y libnotify4 freeglut3 libsdl1.2debian
- apt-get install -y libwebkitgtk-3.0-0 libgstreamer-plugins-base1.0
# Linux builds for wxPython are currently not
# on pypi, but are available at thisd url.
......@@ -234,8 +233,14 @@ variables:
# All other deps can be installed as
# normal. scipy is required by nibabel,
# but not listed in its requirements.
# We install test dependencies through
# pip, because if we let setuptools do
# it, it will build/install everything
# from source, rather than using wheels.
- pip install -r requirements.txt
- pip install scipy
- pip install sphinx sphinx-rtd-theme
- pip install pytest pytest-cov pytest-html pytest-runner mock coverage
# We need the FSL atlases for the atlas
# tests, and need $FSLDIR to be defined
......@@ -245,7 +250,7 @@ variables:
# Finally, run the damned tests.
- su -s /bin/bash -c "xvfb-run python setup.py test" nobody
- coverage report -m
- python -m coverage report
test:2.7:
......
[pytest]
testpaths = tests
addopts = -s -v --niters=50 --cov=fsl --cov-report=html --html=report.html
addopts = -s -v --niters=50 --cov-report=html --html=report.html
......@@ -98,7 +98,9 @@ setup(
'Intended Audience :: Developers',
'License :: OSI Approved :: Apache Software License',
'Programming Language :: Python :: 2.7',
'Programming Language :: Python :: 3.4',
'Programming Language :: Python :: 3.5',
'Programming Language :: Python :: 3.6',
'Topic :: Software Development :: Libraries :: Python Modules'],
packages=packages,
......
Supports Markdown
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