Merge pull request #55 from tacaswell/fix_build_install_tests

Fix build install tests
Nikea · Apr 15, 2015 · 9ccc230 · 9ccc230
2 parents d51c8ee + 776197e
commit 9ccc230
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 4 deletions.
diff --git a/conda-recipe/meta.yaml b/conda-recipe/meta.yaml
@@ -28,6 +28,7 @@ requirements:
 test:
   imports:
      - vttools
+     - vttools.tests
 
 about:
   license: 3-Clause BSD
diff --git a/setup.py b/setup.py
@@ -9,7 +9,8 @@
     packages=["vttools",
               'vttools.vtmods',
               'vttools.vtmods.import_lists',
-              'vttools.to_wrap'
+              'vttools.to_wrap',
+              'vttools.tests'
               ],
-    package_data = {'vttools.vtmods.import_lists': ['*.yaml']}
+    package_data={'vttools.vtmods.import_lists': ['*.yaml']}
     )
diff --git a/vttools/tests/__init__.py b/vttools/tests/__init__.py
@@ -0,0 +1 @@
+
diff --git a/vttools/tests/test_scape.py b/vttools/tests/test_scape.py
@@ -46,7 +46,8 @@
 from numpy.testing import assert_string_equal, assert_equal, assert_raises
 from nose.tools import assert_true
 
-from scrape_test_source import eat_porridge, porridge_for_the_bears, has_defaults
+from vttools.tests.scrape_test_source import (
+    eat_porridge, porridge_for_the_bears, has_defaults)
 
 
 def test_scrape():
@@ -351,7 +352,9 @@ def test_module_scrape():
              ({'exclude_private': False}, {}, ['_private']))
 
     for pre, post, tst_lst in tests:
-        yield _mod_scrape_test_helper, 'scrape_test_source', pre, post, tst_lst
+        yield (_mod_scrape_test_helper,
+               'vttools.tests.scrape_test_source',
+               pre, post, tst_lst)
 
 
 def _mod_scrape_test_helper(mod_name, kwargs_with, kwargs_without,