Merge pull request #207 from Ouranosinc/hotfix

Fix buggy merge

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.10.0-beta"
+LABEL Description="Raven WPS" Vendor="Birdhouse" Version="0.10.0"
 
 # Update Debian system
 RUN apt-get update && apt-get install -y \

docs/source/conf.py

@@ -82,7 +82,7 @@
 # The short X.Y version.
 version = ''
 # The full version, including alpha/beta/rc tags.
-release = '0.10.0-beta'
+release = '0.10.0'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

raven/__init__.py

@@ -9,7 +9,7 @@
 
 __author__ = """David Huard"""
 __email__ = '[email protected]'
-__version__ = '0.10.0-beta'
+__version__ = '0.10.0'
 
 if 'DO_NOT_CHECK_EXECUTABLE_EXISTENCE' not in os.environ:
     raven_exec = Path(__file__).parent.parent / 'bin' / 'raven'

raven/processes/wps_raven_gr4j_cemaneige.py

@@ -50,5 +50,5 @@ class RavenGR4JCemaNeigeProcess(RavenProcess):
     tuple_inputs = {'params': GR4JCN.params}
 
     inputs = [wio.ts, wio.nc_spec, params, wio.start_date, wio.end_date, wio.nc_index, wio.duration, wio.run_name,
-              wio.name, wio.area, wio.latitude, wio.longitude, wio.elevation, wio.nc_index, wio.evaporation,
+              wio.name, wio.area, wio.latitude, wio.longitude, wio.elevation, wio.evaporation,
               wio.rain_snow_fraction]

setup.cfg

@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 0.10.0-beta
+current_version = 0.10.0
 commit = False
 tag = False
 parse = (?P<major>\d+)\.(?P<minor>\d+).(?P<patch>\d+)(\-(?P<release>[a-z]+))?