Merge branch 'master' into CLIMATE-825
Project: http://git-wip-us.apache.org/repos/asf/climate/repo Commit: http://git-wip-us.apache.org/repos/asf/climate/commit/317cca41 Tree: http://git-wip-us.apache.org/repos/asf/climate/tree/317cca41 Diff: http://git-wip-us.apache.org/repos/asf/climate/diff/317cca41 Branch: refs/heads/CLIMATE-825 Commit: 317cca41be1e2be02d97edb59099b258bacc50f6 Parents: fa8356c 577dfb7 Author: Alex Goodman <ago...@users.noreply.github.com> Authored: Fri Jul 29 10:15:22 2016 -0700 Committer: Alex Goodman <ago...@users.noreply.github.com> Committed: Fri Jul 29 10:15:22 2016 -0700 ---------------------------------------------------------------------- .travis.yml | 3 +- CHANGES.txt | 167 +++++++++++++++++++ RCMES/cli_app.py | 11 +- RCMES/run_RCMES.py | 8 +- .../run_statistical_downscaling.py | 6 +- RCMES/test/test.py | 4 +- conda_recipes/bottle/bld.bat | 25 +++ conda_recipes/bottle/build.sh | 26 +++ conda_recipes/bottle/meta.yaml | 76 +++++++++ conda_recipes/esgf-pyclient/bld.bat | 25 +++ conda_recipes/esgf-pyclient/build.sh | 26 +++ conda_recipes/esgf-pyclient/meta.yaml | 82 +++++++++ conda_recipes/myproxyclient/bld.bat | 25 +++ conda_recipes/myproxyclient/build.sh | 26 +++ conda_recipes/myproxyclient/meta.yaml | 84 ++++++++++ conda_recipes/ocw/bld.bat | 25 +++ conda_recipes/ocw/build.sh | 26 +++ conda_recipes/ocw/meta.yaml | 60 +++++++ conda_recipes/pydap/bld.bat | 25 +++ conda_recipes/pydap/build.sh | 26 +++ conda_recipes/pydap/meta.yaml | 81 +++++++++ conda_recipes/sphinxcontrib-httpdomain/bld.bat | 25 +++ conda_recipes/sphinxcontrib-httpdomain/build.sh | 26 +++ .../sphinxcontrib-httpdomain/meta.yaml | 83 +++++++++ doap_CLIMATE.rdf | 7 + docs/source/conf.py | 6 +- docs/source/ocw/overview.rst | 4 +- easy-ocw/ocw-conda-dependencies.txt | 12 +- easy-ocw/ocw-pip-dependencies.txt | 22 +-- examples/knmi_to_cru31_full_bias.py | 4 +- examples/model_ensemble_to_rcmed.py | 6 +- examples/multi_model_evaluation.py | 2 +- examples/multi_model_taylor_diagram.py | 2 +- examples/subregions_portrait_diagram.py | 2 +- examples/taylor_diagram_example.py | 4 +- examples/time_series_with_regions.py | 8 +- ocw-ui/backend/processing.py | 4 +- ocw-ui/backend/tests/test_processing.py | 2 +- ocw/dataset.py | 16 +- ocw/dataset_processor.py | 26 +-- ocw/evaluation.py | 9 +- ocw/tests/test_dataset.py | 18 +- ocw/tests/test_dataset_processor.py | 64 +++---- ocw/utils.py | 4 +- ocw_config_runner/configuration_parsing.py | 2 +- ocw_config_runner/configuration_writer.py | 4 +- ocw_config_runner/evaluation_creation.py | 4 +- .../example/time_series_plot_example.yaml | 2 +- ocw_config_runner/plot_generation.py | 8 +- ocw_config_runner/tests/test_config_writer.py | 4 +- test.sh | 27 +++ test_smoke.py | 139 +++++++++++++++ 52 files changed, 1250 insertions(+), 133 deletions(-) ----------------------------------------------------------------------
