From 4215cb44e890b089696a2c6745b62d0c6a483d78 Mon Sep 17 00:00:00 2001 From: "Julian.Endres" Date: Wed, 4 Oct 2023 20:41:16 +0200 Subject: [PATCH 1/5] Improve error message for reading datapackage --- src/oemof/tabular/datapackage/reading.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/oemof/tabular/datapackage/reading.py b/src/oemof/tabular/datapackage/reading.py index 02ff3c9b..c7cd22ef 100644 --- a/src/oemof/tabular/datapackage/reading.py +++ b/src/oemof/tabular/datapackage/reading.py @@ -133,8 +133,12 @@ def deserialize_energy_system(cls, path, typemap={}, attributemap={}): for r in package.resources: try: r.read() - except dp.exceptions.CastError: - raise dp.exceptions.CastError((cast_error_msg).format(r.name)) + except dp.exceptions.CastError as e: + raise dp.exceptions.CastError("\n" + + (cast_error_msg).format(r.name) + + "\n" + "\n ".join( + [str(i) for i in e.errors]) + ) empty = HSN() empty.read = lambda *xs, **ks: () empty.headers = () From ce3eb63bc8422ad964925098f54dc4ab2f60b757 Mon Sep 17 00:00:00 2001 From: "Julian.Endres" Date: Thu, 5 Oct 2023 18:04:01 +0200 Subject: [PATCH 2/5] Adhere to black --- src/oemof/tabular/datapackage/reading.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/oemof/tabular/datapackage/reading.py b/src/oemof/tabular/datapackage/reading.py index c7cd22ef..39f32181 100644 --- a/src/oemof/tabular/datapackage/reading.py +++ b/src/oemof/tabular/datapackage/reading.py @@ -134,10 +134,11 @@ def deserialize_energy_system(cls, path, typemap={}, attributemap={}): try: r.read() except dp.exceptions.CastError as e: - raise dp.exceptions.CastError("\n" + - (cast_error_msg).format(r.name) - + "\n" + "\n ".join( - [str(i) for i in e.errors]) + raise dp.exceptions.CastError( + "\n" + + (cast_error_msg).format(r.name) + + "\n" + + "\n ".join([str(i) for i in e.errors]) ) empty = HSN() empty.read = lambda *xs, **ks: () From 24525282ce754f4a8dc3975154be0163c85b09da Mon Sep 17 00:00:00 2001 From: "Julian.Endres" Date: Thu, 9 Nov 2023 18:07:30 +0100 Subject: [PATCH 3/5] Add changelog entry --- CHANGELOG.rst | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 974a0b83..b7a18252 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -10,6 +10,7 @@ Unreleased Features +* Improve reading error message `#129 `_ Fixes From 82d8b64682dbc0a8b211ae2248b07afa780b0f5b Mon Sep 17 00:00:00 2001 From: Julian Endres <51374526+nailend@users.noreply.github.com> Date: Fri, 10 Nov 2023 15:15:25 +0100 Subject: [PATCH 4/5] Update CHANGELOG.rst fix link --- CHANGELOG.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 91273245..ba58ff37 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -10,7 +10,7 @@ Unreleased Features -* Improve reading error message `#129 `_ +* Improve reading error message `#129 `_ * Remove facade relicts `#135 `_ Fixes From 8e446f413d0ef24dc50005d3890cab234137e28d Mon Sep 17 00:00:00 2001 From: Julian Endres <51374526+nailend@users.noreply.github.com> Date: Fri, 10 Nov 2023 15:18:27 +0100 Subject: [PATCH 5/5] Real fix of PR link --- CHANGELOG.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.rst b/CHANGELOG.rst index ba58ff37..58456454 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -10,7 +10,7 @@ Unreleased Features -* Improve reading error message `#129 `_ +* Improve reading error message `#134 `_ * Remove facade relicts `#135 `_ Fixes