Merge remote-tracking branch 'origin/2.3.0.dev' into 2.3.0.dev

# Conflicts: # premise/pathways.py
polca · Dec 22, 2024 · f0fdc7b · f0fdc7b
2 parents 6d9ab0a + 6276a95
commit f0fdc7b
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 4 deletions.
diff --git a/premise/external.py b/premise/external.py
@@ -1151,7 +1151,6 @@ def create_markets(self) -> None:
             # Open corresponding config file
             configuration = self.configurations[i]
 
-
             # Check if information on market creation is provided
             if "markets" in configuration:
                 for market_vars in configuration["markets"]:
@@ -1372,7 +1371,6 @@ def create_markets(self) -> None:
                             # check if there are variables that
                             # relate to inefficiencies or losses
 
-
                             # check if we should add some additional exchanges
                             if "add" in market_vars:
                                 for additional_exc in market_vars["add"]:
@@ -1404,7 +1402,6 @@ def create_markets(self) -> None:
                             self.add_to_index(new_market)
                             market_status[region] = True
 
-
                         else:
                             print(
                                 f"No suppliers found for {new_market['name']} in {region}. "

diff --git a/premise/external_data_validation.py b/premise/external_data_validation.py
@@ -562,7 +562,7 @@ def adjust_candidates_or_raise_error(
             duplicate_name = None
             if val.get("duplicate") is True:
                 duplicate_name = val["original name"]
-                #duplicate_name = key[0]
+                # duplicate_name = key[0]
                 key = (key[0].split("_")[0], key[1])
 
             potential_candidates = identify_potential_candidates(