Merge pull request #30 from jphuong/master

update ogh and unit test
Freshwater-Initiative · Aug 29, 2018 · 445ecfc · 445ecfc
2 parents ba9a215 + d877775
commit 445ecfc
Show file tree

Hide file tree

Showing 53 changed files with 325,172 additions and 8,894 deletions.
diff --git a/.gitattributes b/.gitattributes
diff --git a/.gitignore b/.gitignore
diff --git a/.travis.yml b/.travis.yml
@@ -47,16 +47,16 @@ before_install:
   - source activate TEST
   # These have different names from PyPI.
   - conda install --yes python-wget basemap-data-hires
+  - conda install --yes landlab -c landlab
 
 # Test source distribution.
 install:
   - python setup.py sdist && version=$(python setup.py --version) && pushd dist  && pip install ogh-${version}.tar.gz && popd
 
 script:
   - if [[ $TEST_TARGET == 'default' ]]; then
-      cp -r tests /tmp && cd /tmp ;
-      pytest -vv tests ;
+      pytest -vv ogh/tests/test_ogh.py ;
     fi
   - if [[ $TEST_TARGET == 'coding_standards' ]]; then
       flake8 --max-line-length=105 ogh;
-    fi
+    fi
diff --git a/LICENSE b/LICENSE
diff --git a/MANIFEST.in b/MANIFEST.in
diff --git a/README.md b/README.md
diff --git a/ogh/__init__.py b/ogh/__init__.py
@@ -3,8 +3,8 @@
                         print_function,
                         unicode_literals)
 
-from ogh.ogh_meta import *  # noqa
-from ogh.ogh import *  # noqa
+from .ogh_meta import *  # noqa
+from .ogh import *  # noqa
 
 
 __author__ = 'Jimmy Phuong'