Merge remote-tracking branch 'origin/main'

# Conflicts: # pathways/lca.py # pathways/pathways.py
polca · Apr 11, 2024 · 447deea · 447deea
2 parents 7c5d05c + 1e97b7d
commit 447deea
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/pathways/lca.py b/pathways/lca.py
@@ -3,7 +3,6 @@
 
 """
 
-
 import csv
 import logging
 import uuid
@@ -16,7 +15,7 @@
 import pyprind
 from bw2calc.monte_carlo import MonteCarloLCA
 from bw_processing import Datapackage
-from numpy import ndarray, dtype
+from numpy import dtype, ndarray
 from scipy import sparse
 from scipy.sparse import csr_matrix
 

diff --git a/pathways/pathways.py b/pathways/pathways.py
@@ -20,7 +20,7 @@
 
 from .data_validation import validate_datapackage
 from .filesystem_constants import DATA_DIR, DIR_CACHED_DB
-from .lca import get_lca_matrices, _calculate_year
+from .lca import _calculate_year, get_lca_matrices
 from .lcia import get_lcia_method_names
 from .utils import (
     clean_cache_directory,
@@ -31,7 +31,8 @@
     load_classifications,
     load_numpy_array_from_disk,
     load_units_conversion,
-    resize_scenario_data, )
+    resize_scenario_data,
+)
 
 # remove warnings
 warnings.filterwarnings("ignore")
@@ -149,7 +150,9 @@ def create_dict_for_specific_model(row: dict, model: str) -> dict:
                 return dict_structure
             return None
 
-        def create_dict_with_specific_model(dataframe: pandas.DataFrame, model: str) -> dict:
+        def create_dict_with_specific_model(
+            dataframe: pandas.DataFrame, model: str
+        ) -> dict:
             """
             Create a dictionary for a specific model from the dataframe.
             :param dataframe: pandas.DataFrame