Merge pull request #21 from UW-Hydro/develop

merge develop into master for tonic 0.1

Author: Joe Hamman

.gitignore

@@ -4,6 +4,8 @@ data/
 modelforcings/
 modeloutput/
 plots/
+build/
+dist/
 #file types to ignore
 *junk*
 *tmp*

.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,26 +1,30 @@
 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 truely a work in progress...
+This is truly a work in progress...
 
 ## Models:
-1. [the Vairable Infiltration Capacity (VIC) model](https://github.com/UW-Hydro/VIC)
-1.  [the Community Land Model (CLM)](http://www.cgd.ucar.edu/tss/clm/)
-1.  [the Unified Land Model (ULM)](https://github.com/UW-Hydro/ULM)
-1.  [the Precipitation Runoff Modeling System (PRMS)](http://wwwbrr.cr.usgs.gov/projects/SW_MoWS/PRMS.html)
-1.  [the Noah Land Surface Model](http://www.ral.ucar.edu/research/land/technology/lsm.php)
-1.  [the Structure for Unifying Multiple Modeling Alternatives (SUMMA)](http://www.ral.ucar.edu/projects/summa/)
+1. [Variable Infiltration Capacity (VIC) model](https://github.com/UW-Hydro/VIC)
+1. [Community Land Model (CLM)](http://www.cgd.ucar.edu/tss/clm/)
+1. [Unified Land Model (ULM)](https://github.com/UW-Hydro/ULM)
+1. [Precipitation Runoff Modeling System (PRMS)](http://wwwbrr.cr.usgs.gov/projects/SW_MoWS/PRMS.html)
+1. [Noah Land Surface Model](http://www.ral.ucar.edu/research/land/technology/lsm.php)
+1. [Structure for Unifying Multiple Modeling Alternatives (SUMMA)](http://www.ral.ucar.edu/projects/summa/)
+1. [FLO-2D hydrodynamic floodplain model](http://www.flo-2d.com/)
+1. [SNOW17 accumulation and ablation model](http://www.nws.noaa.gov/oh/hrl/nwsrfs/users_manual/part2/_pdf/22snow17.pdf)
 
 ## Scripts:
 `tonic` currently has 1 script available for use on the command line.
 
-**vic_utils**: is a utility script that runs a number of VIC related processing tools.  Once `tonic` is installed, `vic_utils` will be available in your path.  Run `vic_utils -h` for a description of the utilities available.
+**vic_utils**: a utility script that runs a number of VIC related processing tools. Once `tonic` is installed, `vic_utils` will be available in your path. Run `vic_utils -h` for a description of the utilities available.
 
 ## Install:
 Dependencies:
-- python 3
+- python 2.7 or greater
 - netCDF4
 - xray
 - matplotlib
@@ -29,5 +33,4 @@ Dependencies:
 
 To install `tonic`, run `python setup.py install` from this directory.
 
-Questions? Sure, Joe Hamman - jhamman at hydro.washington.edu
-
+Questions? Find us on [![Join the chat at https://gitter.im/UW-Hydro/tonic](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/UW-Hydro/tonic?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge).

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

@@ -3,10 +3,7 @@
 import re
 import sys
 import warnings
-try:
-    from setuptools import setup
-except:
-    from distutils.core import setup
+from setuptools import setup, find_packages
 
 MAJOR = 0
 MINOR = 0
@@ -94,10 +91,10 @@ def write_version_py(filename=None):
 # Run Setup
 setup(name='tonic',
       version=FULLVERSION,
-      description='tonic is a Python toolkit for distributed hydrologic modeling',
+      description='tonic is a Python toolkit for distributed hydrologic models',
       author='Joe Hamman',
       author_email='[email protected]',
       url='https://github.com/jhamman/tonic',
-      packages=['tonic', 'tonic.models', 'tonic.data_tools'],
+      packages=find_packages(),
       scripts=['scripts/vic_utils'])
 # -------------------------------------------------------------------- #

setup.py

@@ -0,0 +1,24 @@
+from tonic.pycompat import pyrange, pyzip, iteritems
+
+
+def test_pyrange():
+    x = pyrange(5)
+    assert list(x) == [0, 1, 2, 3, 4]
+
+
+def test_pyzip():
+    a = [1, 2, 3]
+    b = ['a', 'b', 'c']
+
+    z = pyzip(a, b)
+    assert hasattr(z, '__iter__')
+    lz = list(pyzip(a, b))
+    assert lz[0] == (1, 'a')
+    assert len(lz) == len(a)  # == len(b)
+
+
+def test_iteritems():
+    d = {'a': 0, 'b': 1, 'c': 2}
+    for k, v in iteritems(d):
+        assert type(k) == str
+        assert type(v) == int