diff --git a/CHANGELOG.md b/CHANGELOG.md index 61e713504a65939f69220f3a667058df24bc8983..e22d22a25053bab94c8ba4086bfb3f76ff80cb1b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,10 @@ +v0.1.3 +------ +* Deprecated simulator/ravaflow24 module and introduced simulator/ravaflow3G. +* Updated tests and docs accordingly. +* Updated Poetry dependencies. + + v0.1.2 ------ diff --git a/pyproject.toml b/pyproject.toml index 6dcfce8567e2244b34a5c1181ea7c0473262723c..d9e12494558abc6956d6e6f9c2be6b008543c765 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -13,7 +13,7 @@ python = ">=3.9" numpy = ">1.22.3" scipy = ">1.8.0" SALib = ">1.4.5" -rpy2 = "=3.5.12" # 3.5.13 seems to be broken +rpy2 = "=3.5.12" # 3.5.13 seems to be broken, see https://github.com/rpy2/rpy2/issues/1045 beartype = ">0.11.0" [tool.poetry.dev-dependencies] diff --git a/src/psimpy/simulator/ravaflow24.py b/src/psimpy/simulator/ravaflow24.py index 5ad6a3196040b39cd9864b2f2ca628c69cfc501c..c3c779396a3dc55c2962d7451d1debb6dc42ddfc 100755 --- a/src/psimpy/simulator/ravaflow24.py +++ b/src/psimpy/simulator/ravaflow24.py @@ -86,7 +86,7 @@ class Ravaflow24Mixture: """ warnings.warn( - "The ravaflow24 module will be deprecated on 19.01.2024. Please use ravaflow3G module.", + "The ravaflow24 module will be deprecated on 31.12.2023. Please use ravaflow3G module.", FutureWarning, ) @@ -187,7 +187,7 @@ class Ravaflow24Mixture: `GRASS <https://grass.osgeo.org/>`_ to run the simulation. """ warnings.warn( - "The ravaflow24 module will be deprecated on 19.01.2024. Please use ravaflow3G module.", + "The ravaflow24 module will be deprecated on 31.12.2023. Please use ravaflow3G module.", FutureWarning, ) @@ -262,7 +262,7 @@ class Ravaflow24Mixture: Name of the shell file (including path). """ warnings.warn( - "The ravaflow24 module will be deprecated on 19.01.2024. Please use ravaflow3G module.", + "The ravaflow24 module will be deprecated on 31.12.2023. Please use ravaflow3G module.", FutureWarning, ) if not os.path.exists(grass_location): @@ -305,7 +305,7 @@ class Ravaflow24Mixture: A scalar value representing the overall impact area. """ warnings.warn( - "The ravaflow24 module will be deprecated on 19.01.2024. Please use ravaflow3G module.", + "The ravaflow24 module will be deprecated on 31.12.2023. Please use ravaflow3G module.", FutureWarning, ) @@ -356,7 +356,7 @@ class Ravaflow24Mixture: Maximum value(s) of ``qoi`` in one simulation. """ warnings.warn( - "The ravaflow24 module will be deprecated on 19.01.2024. Please use ravaflow3G module.", + "The ravaflow24 module will be deprecated on 31.12.2023. Please use ravaflow3G module.", FutureWarning, ) @@ -404,7 +404,7 @@ class Ravaflow24Mixture: Shape of :code:`(nloc,)`. """ warnings.warn( - "The ravaflow24 module will be deprecated on 19.01.2024. Please use ravaflow3G module.", + "The ravaflow24 module will be deprecated on 31.12.2023. Please use ravaflow3G module.", FutureWarning, )