wassname/scikit-image
1
0
Fork 0
mirror of https://github.com/wassname/scikit-image.git synced 2026-08-07 11:28:14 +08:00
Code Issues Packages Projects Releases Wiki Activity

Make sure stdlib io is not shadowed by skimage.io

Browse Source
This commit is contained in:
Johannes Schönberger
2013-11-18 12:27:44 +01:00
parent e472528e3d
commit b9b50dcf22
3 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.travis.yml
+2 -2
View File
@@ -59,8 +59,8 @@ script:
- "echo 'backend : Agg' > $HOME/.matplotlib/matplotlibrc"
- "echo 'backend.qt4 : PyQt4' >> $HOME/.matplotlib/matplotlibrc"
# Run all tests
- python -c "import skimage, sys; sys.exit(skimage.test_verbose())"
- python -c "import skimage, sys; sys.exit(skimage.doctest_verbose())"
- python -c "import skimage, sys, io; sys.exit(skimage.test_verbose())"
- python -c "import skimage, sys, io; sys.exit(skimage.doctest_verbose())"
# Run all doc examples
- export PYTHONPATH=$(pwd):$PYTHONPATH
- for f in doc/examples/*.py; do $PYTHON "$f"; if [ $? -ne 0 ]; then exit 1; fi done
Makefile
+2 -2
View File
@@ -7,10 +7,10 @@ clean:
find . -name "*.so" -o -name "*.pyc" -o -name "*.pyx.md5" | xargs rm -f
test:
python -c "import skimage, sys; sys.exit(skimage.test_verbose())"
python -c "import skimage, sys, io; sys.exit(skimage.test_verbose())"
doctest:
python -c "import skimage, sys; sys.exit(skimage.doctest_verbose())"
python -c "import skimage, sys, io; sys.exit(skimage.doctest_verbose())"
coverage:
nosetests skimage --with-coverage --cover-package=skimage
skimage/__init__.py
+1
View File
@@ -89,6 +89,7 @@ else:
if doctest:
args.extend(['--with-doctest', '--ignore-files=^\.',
'--ignore-files=^setup\.py$$', '--ignore-files=test'])
# Make sure warnings do not break the doc tests
with _warnings.catch_warnings():
_warnings.simplefilter("ignore")
success = nose.run('skimage', argv=args)