From 9554b4c4f9c5970bfc5f794a81379c98d173025e Mon Sep 17 00:00:00 2001 From: Mike Vogt Date: Wed, 1 Apr 2026 15:52:34 +0200 Subject: [PATCH] removed import from pandaplan.core and repaired some pp dependent imports. --- simbench/converter/auxiliary.py | 8 ++++---- simbench/converter/csv_data_manipulation.py | 5 +---- simbench/converter/csv_pp_converter.py | 5 +---- simbench/converter/format_information.py | 5 +---- simbench/converter/pp_net_manipulation.py | 5 +---- simbench/converter/read_and_write.py | 5 +---- simbench/converter/voltLvl.py | 5 ++++- simbench/networks/extract_simbench_grids_from_csv.py | 5 +---- simbench/networks/loadcases.py | 5 +---- simbench/networks/profiles.py | 5 +---- simbench/test/converter/test_csv_pp_converter.py | 5 +---- simbench/test/converter/test_pp_net_manipulation.py | 5 +---- simbench/test/networks/test_extract_grids_from_csv.py | 5 +---- simbench/test/run_tests.py | 5 +---- 14 files changed, 20 insertions(+), 53 deletions(-) diff --git a/simbench/converter/auxiliary.py b/simbench/converter/auxiliary.py index 80385f0..c195e69 100644 --- a/simbench/converter/auxiliary.py +++ b/simbench/converter/auxiliary.py @@ -6,12 +6,12 @@ import pandas as pd import datetime as dt from packaging import version -from pandapower import compare_arrays - try: - import pandaplan.core.pplog as logging + from pandapower.toolbox.comparison import compare_arrays except ImportError: - import logging + from pandapower import compare_arrays + +import logging logger = logging.getLogger(__name__) diff --git a/simbench/converter/csv_data_manipulation.py b/simbench/converter/csv_data_manipulation.py index 2c45827..de92bfb 100644 --- a/simbench/converter/csv_data_manipulation.py +++ b/simbench/converter/csv_data_manipulation.py @@ -5,10 +5,7 @@ import pandas as pd from copy import deepcopy -try: - import pandaplan.core.pplog as logging -except ImportError: - import logging +import logging from simbench.converter.auxiliary import ( idx_in_2nd_array, diff --git a/simbench/converter/csv_pp_converter.py b/simbench/converter/csv_pp_converter.py index 31cbb46..398459f 100644 --- a/simbench/converter/csv_pp_converter.py +++ b/simbench/converter/csv_pp_converter.py @@ -18,10 +18,7 @@ from pandapower.plotting import create_generic_coordinates import warnings -try: - import pandaplan.core.pplog as logging -except ImportError: - import logging +import logging from simbench.converter.auxiliary import ( reindex_dict_dataframes, diff --git a/simbench/converter/format_information.py b/simbench/converter/format_information.py index c129cdb..4e717fb 100644 --- a/simbench/converter/format_information.py +++ b/simbench/converter/format_information.py @@ -5,10 +5,7 @@ from numpy import pi from pandas import DataFrame -try: - import pandaplan.core.pplog as logging -except ImportError: - import logging +import logging logger = logging.getLogger(__name__) diff --git a/simbench/converter/pp_net_manipulation.py b/simbench/converter/pp_net_manipulation.py index c073107..e2fe9e9 100644 --- a/simbench/converter/pp_net_manipulation.py +++ b/simbench/converter/pp_net_manipulation.py @@ -8,10 +8,7 @@ import pandapower as pp from copy import deepcopy -try: - import pandaplan.core.pplog as logging -except ImportError: - import logging +import logging from simbench.converter.auxiliary import ( idx_in_2nd_array, diff --git a/simbench/converter/read_and_write.py b/simbench/converter/read_and_write.py index c76bb2a..4e5a478 100644 --- a/simbench/converter/read_and_write.py +++ b/simbench/converter/read_and_write.py @@ -6,10 +6,7 @@ import pandas as pd import os -try: - import pandaplan.core.pplog as logging -except ImportError: - import logging +import logging from simbench.converter.auxiliary import merge_dataframes from simbench.converter.format_information import get_columns, csv_tablenames, get_dtypes diff --git a/simbench/converter/voltLvl.py b/simbench/converter/voltLvl.py index d6ecb59..85f5f36 100644 --- a/simbench/converter/voltLvl.py +++ b/simbench/converter/voltLvl.py @@ -4,7 +4,10 @@ import numpy as np from pandas import Series -from pandapower import element_bus_tuples, pp_elements +try: + from pandapower.toolbox.element_selection import element_bus_tuples, pp_elements +except ImportError: + from pandapower import element_bus_tuples, pp_elements __author__ = "smeinecke" diff --git a/simbench/networks/extract_simbench_grids_from_csv.py b/simbench/networks/extract_simbench_grids_from_csv.py index 85201ea..340031c 100644 --- a/simbench/networks/extract_simbench_grids_from_csv.py +++ b/simbench/networks/extract_simbench_grids_from_csv.py @@ -15,10 +15,7 @@ from simbench import csv_data2pp, read_csv_data, csv_tablenames, idx_in_2nd_array, \ ensure_iterability, pp_profile_names -try: - import pandaplan.core.pplog as logging -except ImportError: - import logging +import logging logger = logging.getLogger(__name__) diff --git a/simbench/networks/loadcases.py b/simbench/networks/loadcases.py index dbaa6f8..93640fe 100644 --- a/simbench/networks/loadcases.py +++ b/simbench/networks/loadcases.py @@ -5,10 +5,7 @@ from simbench import get_voltlvl from simbench.converter.csv_pp_converter import _is_pp_type -try: - import pandaplan.core.pplog as logging -except ImportError: - import logging +import logging logger = logging.getLogger(__name__) diff --git a/simbench/networks/profiles.py b/simbench/networks/profiles.py index 82a1e63..fb796ca 100644 --- a/simbench/networks/profiles.py +++ b/simbench/networks/profiles.py @@ -10,10 +10,7 @@ from simbench import csv_tablenames, idx_in_2nd_array, merge_dataframes -try: - import pandaplan.core.pplog as logging -except ImportError: - import logging +import logging logger = logging.getLogger(__name__) diff --git a/simbench/test/converter/test_csv_pp_converter.py b/simbench/test/converter/test_csv_pp_converter.py index b0b137d..0b6f9ab 100644 --- a/simbench/test/converter/test_csv_pp_converter.py +++ b/simbench/test/converter/test_csv_pp_converter.py @@ -26,10 +26,7 @@ repl_nans_in_obj_cols_to_empty_str, ) -try: - import pandaplan.core.pplog as logging -except ImportError: - import logging +import logging logger = logging.getLogger(__name__) diff --git a/simbench/test/converter/test_pp_net_manipulation.py b/simbench/test/converter/test_pp_net_manipulation.py index a60387e..4ebb0ce 100644 --- a/simbench/test/converter/test_pp_net_manipulation.py +++ b/simbench/test/converter/test_pp_net_manipulation.py @@ -11,10 +11,7 @@ from simbench.converter import replace_branch_switches, create_branch_switches, \ repl_nans_in_obj_cols_to_empty_str -try: - import pandaplan.core.pplog as logging -except ImportError: - import logging +import logging logger = logging.getLogger(__name__) diff --git a/simbench/test/networks/test_extract_grids_from_csv.py b/simbench/test/networks/test_extract_grids_from_csv.py index 4393f34..0df421d 100644 --- a/simbench/test/networks/test_extract_grids_from_csv.py +++ b/simbench/test/networks/test_extract_grids_from_csv.py @@ -16,10 +16,7 @@ import simbench as sb from simbench.networks.extract_simbench_grids_from_csv import \ _get_extracted_csv_data_from_dict -try: - import pandaplan.core.pplog as logging -except ImportError: - import logging +import logging logger = logging.getLogger(__name__) diff --git a/simbench/test/run_tests.py b/simbench/test/run_tests.py index 9debfd2..9f0db33 100644 --- a/simbench/test/run_tests.py +++ b/simbench/test/run_tests.py @@ -9,10 +9,7 @@ from simbench import sb_dir -try: - import pandaplan.core.pplog as logging -except ImportError: - import logging +import logging test_dir = os.path.abspath(os.path.join(sb_dir, "test"))