Merge pull request #1 from amoodie/develop

import tests relative
DeltaRCM · Mar 31, 2020 · abcaadb · abcaadb
2 parents 9e5c418 + d67ace4
commit abcaadb
Show file tree

Hide file tree

Showing 9 changed files with 27 additions and 11 deletions.
diff --git a/.gitignore b/.gitignore
@@ -44,6 +44,7 @@ nosetests.xml
 coverage.xml
 *,cover
 .hypothesis/
+.pytest_cache
 
 # Translations
 *.mo
@@ -60,3 +61,6 @@ target/
 
 #Ipython Notebook
 .ipynb_checkpoints
+
+# SublimeText docs
+*.sublime-*
diff --git a/.travis.yml b/.travis.yml
@@ -16,9 +16,7 @@ jobs:
       python: "3.8"
       install: 
         - pip install -r requirements.txt 
-        - pip install pytest
-        - pip install pytest-cov
-        - pip install coveralls
+        - pip install pytest pytest-cov coveralls
       script: pytest --cov=pyDeltaRCM_WMT/
       after_success: 
         - coveralls
diff --git a/tests/test_bmi_delta.py b/tests/test_bmi_delta.py
@@ -2,8 +2,10 @@
 
 import pytest
 
-import os
+import sys, os
 import numpy as np
+sys.path.append(os.path.realpath(os.path.dirname(__file__)+"/.."))
+
 from pyDeltaRCM import BmiDelta
 
 # need to create a simple case of pydeltarcm object to test these functions

diff --git a/tests/test_deltaRCM_driver.py b/tests/test_deltaRCM_driver.py
@@ -2,9 +2,11 @@
 
 import pytest
 
-import os
+import sys, os
 import numpy as np
-import pyDeltaRCM
+sys.path.append(os.path.realpath(os.path.dirname(__file__)+"/.."))
+
+# import pyDeltaRCM
 from pyDeltaRCM import BmiDelta
 
 # need to create a simple case of pydeltarcm object to test these functions

diff --git a/tests/test_deltaRCM_tools.py b/tests/test_deltaRCM_tools.py
@@ -2,8 +2,10 @@
 
 import pytest
 
-import os
+import sys, os
 import numpy as np
+sys.path.append(os.path.realpath(os.path.dirname(__file__)+"/.."))
+
 from pyDeltaRCM import BmiDelta
 from pyDeltaRCM import Tools
 

diff --git a/tests/test_init_tools.py b/tests/test_init_tools.py
@@ -2,8 +2,10 @@
 
 import pytest
 
-import os
+import sys, os
 import numpy as np
+sys.path.append(os.path.realpath(os.path.dirname(__file__)+"/.."))
+
 from pyDeltaRCM import BmiDelta
 from pyDeltaRCM import init_tools
 

diff --git a/tests/test_sed_tools.py b/tests/test_sed_tools.py
@@ -2,8 +2,10 @@
 
 import pytest
 
-import os
+import sys, os
 import numpy as np
+sys.path.append(os.path.realpath(os.path.dirname(__file__)+"/.."))
+
 from pyDeltaRCM import BmiDelta
 from pyDeltaRCM import sed_tools
 

diff --git a/tests/test_shared_tools.py b/tests/test_shared_tools.py
@@ -2,8 +2,10 @@
 
 import pytest
 
-import os
+import sys, os
 import numpy as np
+sys.path.append(os.path.realpath(os.path.dirname(__file__)+"/.."))
+
 from pyDeltaRCM import BmiDelta
 from pyDeltaRCM import shared_tools
 

diff --git a/tests/test_water_tools.py b/tests/test_water_tools.py
@@ -2,8 +2,10 @@
 
 import pytest
 
-import os
+import sys, os
 import numpy as np
+sys.path.append(os.path.realpath(os.path.dirname(__file__)+"/.."))
+
 from pyDeltaRCM import BmiDelta
 from pyDeltaRCM import water_tools