From a4c5126ab98dfcf0167e73ca3949666ca9b2812f Mon Sep 17 00:00:00 2001 From: Brendan Date: Wed, 22 Nov 2023 11:48:02 +0100 Subject: [PATCH 1/4] v0.4.1 prep --- docs/changelog.rst | 8 ++++++++ docs/getting_started/installation.rst | 4 ++++ hydromt_wflow/__init__.py | 2 +- 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/docs/changelog.rst b/docs/changelog.rst index 8c13aa1c..a207c4bc 100644 --- a/docs/changelog.rst +++ b/docs/changelog.rst @@ -6,6 +6,14 @@ All notable changes to this project will be documented in this page. The format is based on `Keep a Changelog`_, and this project adheres to `Semantic Versioning`_. +v0.4.1 (November 2023) +========== +Small update + +Fixed +----- +- Make **v0.4.0** conda installable + v0.4.0 (November 2023) ========== Small overhaul of internal methods and stability fixes. This version works with HydroMT **v0.9.1** onwards. diff --git a/docs/getting_started/installation.rst b/docs/getting_started/installation.rst index fcd15bd8..330c60ff 100644 --- a/docs/getting_started/installation.rst +++ b/docs/getting_started/installation.rst @@ -49,6 +49,10 @@ You can install HydroMT-Wflow in a new environment called `hydromt-wflow`: $ mamba create -n hydromt-wflow -c conda-forge hydromt_wflow +.. Note:: + + Please take into account that gwwapi or hydroengine packages are not available from conda and therefore have to be installed from pypi separately. + Then, activate the environment (as stated by mamba/conda) to start making use of HydroMT-Wflow: HydroMT-Wflow will be installed together with all optional (see above) and a few additional dependencies with: diff --git a/hydromt_wflow/__init__.py b/hydromt_wflow/__init__.py index 933e5bae..38446d52 100644 --- a/hydromt_wflow/__init__.py +++ b/hydromt_wflow/__init__.py @@ -2,7 +2,7 @@ from os.path import abspath, dirname, join -__version__ = "0.4.0" +__version__ = "0.4.1" try: import pcraster as pcr From da6946e139ffeadd1575712c4d542f50d56bcf0b Mon Sep 17 00:00:00 2001 From: Brendan Date: Wed, 22 Nov 2023 11:54:14 +0100 Subject: [PATCH 2/4] Changelog formatting --- docs/changelog.rst | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/changelog.rst b/docs/changelog.rst index a207c4bc..550af0a9 100644 --- a/docs/changelog.rst +++ b/docs/changelog.rst @@ -7,15 +7,15 @@ The format is based on `Keep a Changelog`_, and this project adheres to `Semantic Versioning`_. v0.4.1 (November 2023) -========== +====================== Small update Fixed ----- -- Make **v0.4.0** conda installable +- Make HydroMT-Wflow **v0.4.0** conda installable v0.4.0 (November 2023) -========== +====================== Small overhaul of internal methods and stability fixes. This version works with HydroMT **v0.9.1** onwards. Changed From 0f8e42f7f7799f0449187feb4610e440307fd66c Mon Sep 17 00:00:00 2001 From: Brendan Date: Wed, 22 Nov 2023 13:17:36 +0100 Subject: [PATCH 3/4] Updated credits --- .zenodo.json | 8 ++++++++ pyproject.toml | 2 ++ 2 files changed, 10 insertions(+) diff --git a/.zenodo.json b/.zenodo.json index a1df6848..4a14048c 100644 --- a/.zenodo.json +++ b/.zenodo.json @@ -24,6 +24,14 @@ { "affiliation": "Deltares", "name": "Hegnauer, Mark" + }, + { + "affiliation": "Deltares", + "name": "Buitink, Joost" + }, + { + "affiliation": "Deltares", + "name": "Dalmijn, Brendan" } ], "access_right": "open", diff --git a/pyproject.toml b/pyproject.toml index 1afacf6c..98dc8a52 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -7,6 +7,8 @@ name = "hydromt_wflow" authors = [ { name = "Dirk Eilander", email = "dirk.eilander@deltares.nl" }, { name = "Hélène Boisgontier", email = "helene.boisgontier@deltares.nl" }, + { name = "Joost Buitink", email = "joost.buitink@deltares.nl" }, + { name = "Brendan Dalmijn", email = "brendan.dalmijn@deltares.nl" }, ] dependencies = [ "dask", From 015b2f95912961878136565ab5b55488cd70a7e4 Mon Sep 17 00:00:00 2001 From: JoostBuitink <44062204+JoostBuitink@users.noreply.github.com> Date: Wed, 22 Nov 2023 13:34:26 +0100 Subject: [PATCH 4/4] add pip block to new env install --- docs/getting_started/installation.rst | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/docs/getting_started/installation.rst b/docs/getting_started/installation.rst index 330c60ff..d9b5010a 100644 --- a/docs/getting_started/installation.rst +++ b/docs/getting_started/installation.rst @@ -53,6 +53,11 @@ You can install HydroMT-Wflow in a new environment called `hydromt-wflow`: Please take into account that gwwapi or hydroengine packages are not available from conda and therefore have to be installed from pypi separately. +.. code-block:: console + + $ pip install gwwapi + $ pip install hydroengine + Then, activate the environment (as stated by mamba/conda) to start making use of HydroMT-Wflow: HydroMT-Wflow will be installed together with all optional (see above) and a few additional dependencies with: