Merge pull request UW-Hydro#14 from jhamman/feature/fix_travis

use container based travis build, add build on python.3.4., and integ…

Author: orianac

.travis.yml

@@ -1,13 +1,39 @@
+sudo: false  # travis container-based infrastructure
+
 language: python
 
 python:
-  - "2.6"
   - "2.7"
-  - "3.3"
+  - "3.4"
+
+# Setup anaconda
+before_install:
+  - wget http://repo.continuum.io/miniconda/Miniconda-2.2.2-Linux-x86_64.sh -O miniconda.sh
+  - chmod +x miniconda.sh
+  - ./miniconda.sh -b
+  - export PATH=/home/travis/anaconda/bin:$PATH
+  # Update conda itself
+  - conda update --yes conda
 
 install:
+  - conda create --yes --name=tonic_test_env python=$TRAVIS_PYTHON_VERSION --file=ci/requirements-$TRAVIS_PYTHON_VERSION.txt
+  - source activate tonic_test_env
   - python setup.py install
 
 # command to run tests
 script:
+  - which python
+  - python --version
+  - conda list
+  - pip freeze
+  - echo $PATH
   - vic_utils -h
+  - py.test
+
+notifications:
+  webhooks:
+    urls:
+      - https://webhooks.gitter.im/e/0b751ac59ea833728a02
+    on_success: change  # options: [always|never|change] default: always
+    on_failure: always  # options: [always|never|change] default: always
+    on_start: false     # default: false

README.md

@@ -1,6 +1,8 @@
 TONIC
 =====
 
+[![Build Status](https://travis-ci.org/UW-Hydro/tonic.svg?branch=develop)](https://travis-ci.org/UW-Hydro/tonic)
+
 `tonic` is a toolkit for working with distributed hydrologic models and their output.
 
 This is truly a work in progress...
@@ -22,7 +24,7 @@ This is truly a work in progress...
 
 ## Install:
 Dependencies:
-- python 3
+- python 2.7 or greater
 - netCDF4
 - xray
 - matplotlib

ci/requirements-2.7.txt

@@ -0,0 +1,9 @@
+matplotlib
+netCDF4
+numpy
+scipy
+pandas
+pytest
+xray
+configobj
+basemap

ci/requirements-3.4.txt

@@ -0,0 +1,9 @@
+matplotlib
+netCDF4
+numpy
+scipy
+pandas
+pytest
+xray
+configobj
+basemap

forcing_tools/netcdf2vic.py

@@ -6,25 +6,12 @@
 
 Usage: py.test (from RVIC or test directory)
 """
-import pytest
 import numpy as np
-import sys
-sys.path.append("../")
+from tonic.tonic import calc_grid
 
-# -------------------------------------------------------------------- #
-# Unit tests for vic2netcdf.py
-
-
-@pytest.fixture
-def lons():
-	pass
 
 def test_calc_grid_standard():
-    from processing_tools.vic2netcdf import calc_grid
-    lons = np.arange(0, 5, 0.5)
+    lons = np.arange(0, 5, 0.25)
     lats = np.arange(0, 10, 0.5)
     target_grid = calc_grid(lons, lats, decimals=4)
-
-# -------------------------------------------------------------------- #
-
-
+    assert type(target_grid) == dict