Merge pull request #172 from dartmouth-pbs/bf-misc

Small fixes: skip tests when resource is N/A, do not install "tests" package

Author: yarikoptic

setup.py

@@ -31,6 +31,11 @@ def findsome(subdir, extensions):
             f.split(op.sep, 1)[1] for f in findall(subdir)
             if op.splitext(f)[-1].lstrip('.') in extensions
         ]
+    # Only recentish versions of find_packages support include
+    # heudiconv_pkgs = find_packages('.', include=['heudiconv*'])
+    # so we will filter manually for maximal compatibility
+    heudiconv_pkgs = [pkg for pkg in find_packages('.') if pkg.startswith('heudiconv')]
+
 
     setup(
         name=ldict['__packagename__'],
@@ -40,7 +45,7 @@ def findsome(subdir, extensions):
         description=ldict['__description__'],
         long_description=ldict['__longdesc__'],
         license=ldict['__license__'],
-        packages=find_packages(),
+        packages=heudiconv_pkgs,
         entry_points={'console_scripts': [
             'heudiconv=heudiconv.cli.run:main',
             'heudiconv_monitor=heudiconv.cli.monitor:main',

tests/test_monitor.py

@@ -3,7 +3,10 @@
 import os.path as op
 import pytest
 from mock import patch
-from tinydb import TinyDB, Query
+try:
+    from tinydb import TinyDB, Query
+except ImportError:
+    pytest.importorskip("tinydb")
 from subprocess import CalledProcessError
 
 try:

tests/test_regression.py

@@ -7,6 +7,7 @@
 have_datalad = True
 try:
     from datalad import api # to pull and grab data
+    from datalad.support.exceptions import IncompleteResultsError
 except ImportError:
     have_datalad = False
 
@@ -21,7 +22,10 @@
 @pytest.mark.skipif(not have_datalad, reason="no datalad")
 def test_conversion(tmpdir, subject, heuristic):
     tmpdir.chdir()
-    datadir = fetch_data(tmpdir.strpath, subject)
+    try:
+        datadir = fetch_data(tmpdir.strpath, subject)
+    except IncompleteResultsError as exc:
+        pytest.skip("Failed to fetch test data: %s" % str(exc))
     outdir = tmpdir.mkdir('out').strpath
 
     args = gen_heudiconv_args(datadir, outdir, subject, heuristic)