From 7c84624ee1816b6ec63a7b707ebe9a981d3d2a2b Mon Sep 17 00:00:00 2001 From: Nitish Bharambe Date: Fri, 4 Apr 2025 11:04:41 +0200 Subject: [PATCH 1/4] add upper limit Signed-off-by: Nitish Bharambe --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index a1c8c506..e59a876f 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -28,7 +28,7 @@ classifiers=[ ] requires-python = ">=3.11" dependencies = [ - "numpy>=1.20", + "numpy>=1.20, <2.0", "openpyxl", "pandas", "power_grid_model>=1.8", From b5160b4ccf75cf5de2a116e5466d8b5b8e5bd0f9 Mon Sep 17 00:00:00 2001 From: Nitish Bharambe Date: Fri, 4 Apr 2025 11:09:15 +0200 Subject: [PATCH 2/4] restrict pandapower too Signed-off-by: Nitish Bharambe --- pyproject.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index e59a876f..94bc89f9 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -40,7 +40,7 @@ dynamic = ["version"] [project.optional-dependencies] dev = [ - "pandapower>2.11.1", + "pandapower>2.11.1, <3.0", "pre-commit", "pylint", "pytest", @@ -50,7 +50,7 @@ dev = [ ] examples = [ "power-grid-model>1.9.80", - "pandapower>2.11.1", + "pandapower>2.11.1, <3.0", "pyarrow", # Pyarrow support for Python 3.12 scheduled for 14.0.0: https://github.com/apache/arrow/issues/37880 ] doc = [ From 949c002b2d04c58edb0ec1680dc5a788c326b720 Mon Sep 17 00:00:00 2001 From: Nitish Bharambe Date: Fri, 4 Apr 2025 12:06:15 +0200 Subject: [PATCH 3/4] remove array prepare Signed-off-by: Nitish Bharambe --- pyproject.toml | 2 +- tests/utils.py | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index 94bc89f9..aefb8b80 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -28,7 +28,7 @@ classifiers=[ ] requires-python = ">=3.11" dependencies = [ - "numpy>=1.20, <2.0", + "numpy>=1.20", "openpyxl", "pandas", "power_grid_model>=1.8", diff --git a/tests/utils.py b/tests/utils.py index d39d637a..267308f2 100644 --- a/tests/utils.py +++ b/tests/utils.py @@ -71,7 +71,6 @@ class MockFn: __slots__ = ["fn", "args", "kwargs", "postfix"] __array_struct__ = np.array([]).__array_struct__ - __array_prepare__ = np.array([]).__array_prepare__ def __init__(self, fn: str, *args, **kwargs): self.fn = fn From 9a833ff09533075a297516b1164ac212b736842e Mon Sep 17 00:00:00 2001 From: Nitish Bharambe Date: Fri, 4 Apr 2025 12:24:51 +0200 Subject: [PATCH 4/4] revert utils change Signed-off-by: Nitish Bharambe --- tests/utils.py | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/utils.py b/tests/utils.py index 267308f2..d39d637a 100644 --- a/tests/utils.py +++ b/tests/utils.py @@ -71,6 +71,7 @@ class MockFn: __slots__ = ["fn", "args", "kwargs", "postfix"] __array_struct__ = np.array([]).__array_struct__ + __array_prepare__ = np.array([]).__array_prepare__ def __init__(self, fn: str, *args, **kwargs): self.fn = fn