Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

update remaining nb. mv bias to sandbox #382

Merged
merged 4 commits into from
Apr 16, 2021
Merged
Show file tree
Hide file tree
Changes from 3 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .cruft.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
"project_repo_name": "raven",
"project_readthedocs_name": "pavics-raven",
"project_short_description": "Raven offers processes related to hydrological modeling, and in particular, the Raven hydrological modeling framework.",
"version": "0.12.0",
"version": "0.12.1-beta",
huard marked this conversation as resolved.
Show resolved Hide resolved
"open_source_license": "MIT license",
"http_port": "9099",
"_copy_without_render": [
Expand Down
6 changes: 6 additions & 0 deletions CHANGES.rst
Original file line number Diff line number Diff line change
@@ -1,6 +1,12 @@
Changes
=======

0.12.1
------
* Fix bug where the name of configuration files was used, while the client transmission of data does not carry the file name.
* Update notebooks
* Move draft notebooks to sandbox

0.12.0
------
* Update RavenPy to 0.4.2
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# vim:set ft=dockerfile:
FROM continuumio/miniconda3
MAINTAINER https://github.com/huard/raven
LABEL Description="Raven WPS" Vendor="Birdhouse" Version="0.12.0"
LABEL Description="Raven WPS" Vendor="Birdhouse" Version="0.12.1-beta"

# Update Debian system
RUN apt-get update && apt-get install -y \
Expand Down
4 changes: 2 additions & 2 deletions docs/source/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -134,9 +134,9 @@
# the built documents.
#
# The short X.Y version.
version = "0.12.0"
version = "0.12.1-beta"
# The full version, including alpha/beta/rc tags.
release = "0.12.0"
release = "0.12.1-beta"

# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.
Expand Down
88 changes: 43 additions & 45 deletions docs/source/notebooks/Full_process_example_1.ipynb

Large diffs are not rendered by default.

15 changes: 7 additions & 8 deletions docs/source/notebooks/Subset_climate_data_over_watershed.ipynb
Original file line number Diff line number Diff line change
Expand Up @@ -34,11 +34,10 @@
"metadata": {},
"outputs": [],
"source": [
"# Set the links to the remote servers. If you run these services locally, the default ports that the WPS services are mapped to are 9099 for Raven and 8093 for Flyingpigeon, that is:\n",
"# Local Raven URL: http://localhost:9099/wps\n",
"# Local Flyingpigeon URL: http://localhost:8093/wps\n",
"# Set the links to the servers. \n",
"# Note that if Finch is a remote server, Raven needs to be accessible on the next because some cells \n",
"# below use the output from Raven processes to feed into Finch. \n",
"\n",
"# Links to the remote servers\n",
"url_finch = os.environ.get(\n",
" \"FINCH_WPS_URL\", \"https://pavics.ouranos.ca/twitcher/ows/proxy/finch/wps\"\n",
")\n",
Expand All @@ -48,8 +47,8 @@
")\n",
"\n",
"# Establish client connexions to the remote servers\n",
"finch = birdy.WPSClient(url_finch) # , progress=True)\n",
"raven = birdy.WPSClient(url_raven) # , progress=True)"
"finch = birdy.WPSClient(url_finch) \n",
"raven = birdy.WPSClient(url_raven)"
]
},
{
Expand Down Expand Up @@ -157,13 +156,13 @@
"name": "stdout",
"output_type": "stream",
"text": [
"Downloading to /tmp/tmp0i_12hxt/nrcan_canada_daily_tasmin_1990_avg.nc.\n"
"Downloading to /tmp/tmp933rj2jt/nrcan_canada_daily_tasmin_1990_avg.nc.\n"
]
},
{
"data": {
"text/plain": [
"[<matplotlib.lines.Line2D at 0x7f51999fcc70>]"
"[<matplotlib.lines.Line2D at 0x7feaa2979760>]"
]
},
"execution_count": 7,
Expand Down
1 change: 0 additions & 1 deletion docs/source/notebooks/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,6 @@ Advanced workflows
:maxdepth: 1

Full_process_example_1
Bias_correcting_climate_data

.. _OWSLib: https://geopython.github.io/OWSLib/
.. _Birdy: https://birdy.readthedocs.io
2 changes: 1 addition & 1 deletion raven/__version__.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,4 @@

__author__ = """David Huard"""
__email__ = "huard.david@ouranos.ca"
__version__ = "0.12.0"
__version__ = "0.12.1-beta"
1 change: 0 additions & 1 deletion raven/processes/wps_regionalisation.py
Original file line number Diff line number Diff line change
Expand Up @@ -177,7 +177,6 @@ def _handler(self, request, response):

kwds = {}
for spec in request.inputs.pop("nc_spec", []):
print(spec.data)
kwds.update(json.loads(spec.data))

for key, val in request.inputs.items():
Expand Down
2 changes: 1 addition & 1 deletion setup.cfg
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[bumpversion]
current_version = 0.12.0
current_version = 0.12.1-beta
commit = False
tag = False
parse = (?P<major>\d+)\.(?P<minor>\d+).(?P<patch>\d+)(\-(?P<release>[a-z]+))?
Expand Down