Merge pull request #382 from Ouranosinc/fix_finch_nb

update remaining nb. mv bias to sandbox
Ouranosinc · Apr 16, 2021 · 7ffdb38 · 7ffdb38
2 parents 7d5af9e + 32492ee
commit 7ffdb38
Show file tree

Hide file tree

Showing 11 changed files with 62 additions and 61 deletions.
diff --git a/.cruft.json b/.cruft.json
@@ -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",
             "open_source_license": "MIT license",
             "http_port": "9099",
             "_copy_without_render": [

diff --git a/CHANGES.rst b/CHANGES.rst
@@ -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

diff --git a/Dockerfile b/Dockerfile
@@ -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"
 
 # Update Debian system
 RUN apt-get update && apt-get install -y \

diff --git a/docs/source/conf.py b/docs/source/conf.py
@@ -134,9 +134,9 @@
 # the built documents.
 #
 # The short X.Y version.
-version = "0.12.0"
+version = "0.12.1"
 # The full version, including alpha/beta/rc tags.
-release = "0.12.0"
+release = "0.12.1"
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

diff --git a/docs/source/notebooks/Full_process_example_1.ipynb b/docs/source/notebooks/Full_process_example_1.ipynb
diff --git a/docs/source/notebooks/Subset_climate_data_over_watershed.ipynb b/docs/source/notebooks/Subset_climate_data_over_watershed.ipynb
@@ -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",
@@ -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)"
    ]
   },
   {
@@ -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,

diff --git a/docs/source/notebooks/index.rst b/docs/source/notebooks/index.rst
@@ -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
diff --git a/...ebooks/Bias_correcting_climate_data.ipynb → ...andbox/Bias_correcting_climate_data.ipynb b/...ebooks/Bias_correcting_climate_data.ipynb → ...andbox/Bias_correcting_climate_data.ipynb
diff --git a/raven/__version__.py b/raven/__version__.py
@@ -6,4 +6,4 @@
 
 __author__ = """David Huard"""
 __email__ = "huard.david@ouranos.ca"
-__version__ = "0.12.0"
+__version__ = "0.12.1"
diff --git a/raven/processes/wps_regionalisation.py b/raven/processes/wps_regionalisation.py
@@ -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():

diff --git a/setup.cfg b/setup.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 0.12.0
+current_version = 0.12.1
 commit = False
 tag = False
 parse = (?P<major>\d+)\.(?P<minor>\d+).(?P<patch>\d+)(\-(?P<release>[a-z]+))?