Merge pull request #10 from ocefpaf/appveyor

Run tests from installed version.
TEOS-10 · Apr 10, 2017 · a1b2fa9 · a1b2fa9
2 parents 64fbb3a + 0bb8aed
commit a1b2fa9
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 6 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -39,8 +39,7 @@ install:
 
 script:
     - if [[ $TEST_TARGET == "default" ]]; then
-        python setup.py build_ext -i ;
-        py.test -s -rxs -v gsw ;
+        pushd gsw && py.test -s -rxs -v tests && popd ;
       fi
 
 after_success:

diff --git a/MANIFEST.in b/MANIFEST.in
@@ -2,5 +2,4 @@ include LICENSE
 include README.rst
 recursive-include src *
 recursive-include src2 *
-include gsw/tests/*.npz
 # recursive-include docs *
diff --git a/conda.recipe/meta.yaml b/conda.recipe/meta.yaml
@@ -19,8 +19,13 @@ requirements:
     - numpy x.x
 
 test:
+test:
+  source_files:
+    - gsw/tests
+  requires:
+    - pytest
   imports:
     - gsw
     - gsw.ice
   commands:
-    - python -c "import gsw; print(dir(gsw))"
+    - cd gsw && py.test -s -rxs -v tests
diff --git a/gsw/tests/__init__.py b/gsw/tests/__init__.py
diff --git a/gsw/tests/test_check_functions.py b/gsw/tests/test_check_functions.py
@@ -10,7 +10,7 @@
 
 import gsw
 from gsw._utilities import Bunch
-from gsw.tests.check_functions import parse_check_functions
+from check_functions import parse_check_functions
 
 root_path = os.path.abspath(os.path.dirname(__file__))
 

diff --git a/setup.py b/setup.py
@@ -39,7 +39,7 @@ def extract_version():
 config = dict(
     name='gsw',
     version=extract_version(),
-    packages=['gsw', 'gsw/tests'],
+    packages=['gsw'],
     author=['Eric Firing', 'Filipe Fernandes'],
     author_email='efiring@hawaii.edu',
     description='Gibbs Seawater Oceanographic Package of TEOS-10',