Merge branch 'CLIMATE-962'
Project: http://git-wip-us.apache.org/repos/asf/climate/repo Commit: http://git-wip-us.apache.org/repos/asf/climate/commit/27db6a67 Tree: http://git-wip-us.apache.org/repos/asf/climate/tree/27db6a67 Diff: http://git-wip-us.apache.org/repos/asf/climate/diff/27db6a67 Branch: refs/heads/master Commit: 27db6a67893972d62b873669ee3e9593615e5880 Parents: 353bd50 d50998f Author: huikyole <huiky...@argo.jpl.nasa.gov> Authored: Sat Nov 24 19:05:27 2018 -0800 Committer: huikyole <huiky...@argo.jpl.nasa.gov> Committed: Sat Nov 24 19:05:27 2018 -0800 ---------------------------------------------------------------------- README.md | 36 -------------- README.rst | 105 +++++++++++++++++++++++++++++++++++++++++ deps_py2.txt | 7 ++- deps_py3.txt | 5 +- ocw/data_source/local.py | 3 +- ocw/metrics.py | 45 ++++++++++++++++++ ocw/tests/test_metrics.py | 40 ++++++++++++++++ setup.py | 2 +- 8 files changed, 202 insertions(+), 41 deletions(-) ----------------------------------------------------------------------
