From d49a253b741f9f4244d62bcf5db8a65a6a16c7e7 Mon Sep 17 00:00:00 2001
From: Nicholas Book <nicholasbook@googlemail.com>
Date: Thu, 10 Aug 2023 16:57:11 +0200
Subject: [PATCH] updated changelog
---
CHANGELOG.md | 7 +++++++
pyproject.toml | 2 +-
src/psimpy/simulator/ravaflow24.py | 12 ++++++------
3 files changed, 14 insertions(+), 7 deletions(-)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 61e7135..e22d22a 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 6dcfce8..d9e1249 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 5ad6a31..c3c7793 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,
)
--
GitLab