[FIX] Imports from pp were broken

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__)
 

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,

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,

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__)
 

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,

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

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"
 

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__)
 

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__)
 

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__)
 

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__)
 

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__)
 

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__)
 

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"))