Merge pull request #417 from Ouranosinc/update_raven_ravenpy077

Update Raven to 0.15.0 (RavenPy v0.7.7)

.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.14.2",
+            "version": "0.15.0",
             "open_source_license": "MIT license",
             "http_port": "9099",
             "_copy_without_render": [

CHANGES.rst

@@ -1,10 +1,12 @@
 Changes
 =======
 
-
-0.14.3
+0.15.0
 ------
-* Update to RavenPy 0.7.5
+* Update to RavenPy 0.7.7
+* Update required Python consistently to v3.7+
+* Set development status to Beta.
+* Replace pip-installed packages with conda-forge equivalents.
 
 0.14.2
 ------

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

docs/source/conf.py

@@ -133,9 +133,9 @@
 # the built documents.
 #
 # The short X.Y version.
-version = "0.14.2"
+version = "0.15.0"
 # The full version, including alpha/beta/rc tags.
-release = "0.14.2"
+release = "0.15.0"
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

docs/source/installation.rst

@@ -10,9 +10,6 @@ Installation
 Install from Conda-Forge (suggested)
 ------------------------------------
 
-.. warning::
-  The Raven-WPS conda package is not yet available on conda-forge. This documentation will be updated when it is.
-
 Create an Anaconda environment named `ravenwps-env`:
 
 .. code-block:: console

environment-dev.yml

@@ -1,29 +1,25 @@
 name: raven
 channels:
-- conda-forge
-- defaults
+  - conda-forge
+  - defaults
 dependencies:
-- pytest
-- flake8
-- pytest
-- pytest-flake8
-- ipython
-- pytest-notebook
-- nbsphinx
-- nbval
-- nbconvert
-- birdy
-- sphinx>=1.7
-- bumpversion
-- bump2version
-- twine
-- cruft
-- pre-commit
-- pytest-dependency
-- pytest-notebook
-- sphinx-autoapi
-- black
-- pip
-- pip:
-  - urlpath
+  - birdy
+  - black
+  - bump2version
+  - cruft
+  - flake8
+  - ipython
+  - nbconvert
+  - nbsphinx
+  - nbval
+  - pre-commit
   - pymetalink
+  - pytest
+  - pytest-dependency
+  - pytest-flake8
+  - pytest-notebook
+  - python >=3.7
+  - sphinx >=1.7
+  - sphinx-autoapi
+  - twine
+  - urlpath

environment-docs.yml

@@ -1,15 +1,17 @@
 # conda env create -f environment-docs.yml
 name: raven-docs
 channels:
-- conda-forge
-- defaults
+  - conda-forge
+  - defaults
 dependencies:
-- python>=3.7
-- pywps==4.4.5
-- sphinx==3.5.4
-- nbsphinx
-- ipython
-- xskillscore
-- numpy
-- sphinx_rtd_theme
-- ravenpy>=0.7.5
+  - ravenpy >=0.7.7
+  - python >=3.7
+  - pywps ==4.4.5
+  - sphinx ==3.5.4
+  - ipython
+  - nbsphinx
+  - numpy
+  - pip
+  - pypandoc
+  - sphinx_rtd_theme
+  - xskillscore

environment.yml

@@ -1,47 +1,46 @@
 name: raven
 channels:
-- conda-forge
-- defaults
+  - conda-forge
+  - defaults
 dependencies:
-- raven-hydro ==3.0.4.322
-- ostrich ==21.03.16
-- ravenpy >=0.7.5
-- pywps ==4.4.5
-- affine
-- cartopy
-- click
-- dask
-- fiona
-- geopandas
-- geojson
-- gdal >=3.0
-- ipyleaflet
-- jinja2
-- matplotlib
-- nbval
-- numpy
-- owslib
-- pandas
-- pandoc
-- poppler
-- psutil
-- psycopg2
-- pymetalink
-- pyproj
-- pysheds
-- rasterio
-- rasterstats
-- rioxarray
-- rtree
-- scipy
-- shapely
-- statsmodels
-- tbb
-- unidecode
-- xarray >=0.18
-- xclim >=0.28.1
-- xskillscore
-- pip
-- pip:
+  - raven-hydro ==3.0.4.322
+  - ostrich ==21.03.16
+  - python >=3.7
+  - ravenpy >=0.7.7
+  - pywps ==4.4.5
+  - affine
+  - cartopy
+  - click
+  - dask
+  - fiona
+  - geopandas
+  - geojson
+  - gdal >=3.0
+  - ipyleaflet
+  - jinja2
+  - matplotlib
+  - nbval
+  - numpy
+  - owslib
+  - pandas
+  - pandoc
+  - poppler
+  - psutil
+  - psycopg2
+  - pymetalink
+  - pyproj
+  - pysheds
+  - rasterio
+  - rasterstats
+  - rioxarray
+  - rtree
+  - scipy
+  - shapely
   - spotpy
+  - statsmodels
+  - tbb
+  - unidecode
   - urlpath
+  - xarray >=0.18
+  - xclim >=0.28.1
+  - xskillscore

raven/__version__.py

@@ -6,4 +6,4 @@
 
 __author__ = """David Huard"""
 __email__ = "huard.david@ouranos.ca"
-__version__ = "0.14.2"
+__version__ = "0.15.0"

requirements.txt

@@ -1,4 +1,4 @@
-ravenpy>=0.7.5
+ravenpy>=0.7.7
 six
 pywps==4.4.5
 owslib
@@ -9,7 +9,7 @@ psutil
 numpy
 scipy
 matplotlib
-xarray
+xarray>=0.18
 xclim>=0.28.1
 pandas
 requests
@@ -30,7 +30,6 @@ rasterstats
 shapely
 # DOCS and other utilities
 unidecode
-pandoc
 ipyleaflet
 ipython # needed for the parsing of Jupyter Notebooks
 psycopg2 # to use postgres to log pywps requests like in Prod

requirements_dev.txt

@@ -21,3 +21,4 @@ black
 black-nb
 nc-time-axis
 pre-commit
+pandoc

setup.cfg

@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 0.14.2
+current_version = 0.15.0
 commit = False
 tag = False
 

setup.py

@@ -11,14 +11,14 @@
 here = os.path.abspath(os.path.dirname(__file__))
 README = open(os.path.join(here, "README.rst")).read()
 CHANGES = open(os.path.join(here, "CHANGES.rst")).read()
-REQUIRES_PYTHON = ">=3.6.0"
+REQUIRES_PYTHON = ">=3.7.0"
 
 about = {}
 with open(os.path.join(here, "raven", "__version__.py"), "r") as f:
     exec(f.read(), about)
 
-reqs = list()
 # Special GDAL handling
+reqs = []
 try:
     gdal_version = subprocess.run(
         ["gdal-config", "--version"], capture_output=True
@@ -33,15 +33,14 @@
 docs_reqs = ["sphinx>=1.7", "sphinx-autoapi", "nbsphinx", "sphinx_rtd_theme"]
 
 classifiers = [
-    "Development Status :: 3 - Alpha",
+    "Development Status :: 4 - Beta",
     "Intended Audience :: Developers",
     "Intended Audience :: Science/Research",
     "Operating System :: MacOS :: MacOS X",
     "Operating System :: POSIX",
     "Programming Language :: Python",
     "Natural Language :: English",
     "Programming Language :: Python :: 3",
-    "Programming Language :: Python :: 3.6",
     "Programming Language :: Python :: 3.7",
     "Programming Language :: Python :: 3.8",
     "Programming Language :: Python :: 3.9",