Merge remote-tracking branch 'origin/main'

polca · Aug 9, 2024 · 16d14b2 · 16d14b2
2 parents 9a621c9 + c8b6b10
commit 16d14b2
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 9 deletions.
diff --git a/conda/meta.yaml b/conda/meta.yaml
@@ -18,7 +18,7 @@ requirements:
     - python
     - setuptools
   run:
-    - numpy
+    - numpy==1.24.4
     - pathlib
     - pandas
     - scipy
@@ -32,6 +32,8 @@ requirements:
     - platformdirs
     - fs
     - SALib
+    - cvxopt
+    - scikit-umfpack
 test:
   imports:
     - pathways

diff --git a/pathways/lca.py b/pathways/lca.py
@@ -621,17 +621,14 @@ def _calculate_year(args: tuple):
             lca = bc.MultiLCA(
                 demands=fus,
                 method_config={"impact_categories": []},
-                data_objs=[
-                    bw_datapackage, bw_correlated
-                ],
+                data_objs=[bw_datapackage, bw_correlated],
                 use_distributions=True if use_distributions > 0 else False,
                 use_arrays=True,
             )
 
             with CustomFilter("(almost) singular matrix"):
                 lca.lci()
 
-
         lca.uncertain_parameters = uncertain_parameters
         lca.technosphere_indices = technosphere_indices
         lca.acts_category_idx_dict = acts_category_idx_dict

diff --git a/pathways/subshares.py b/pathways/subshares.py
@@ -163,7 +163,9 @@ def find_technology_indices(
                 )[0]
 
                 if activity_index is None:
-                    print(f"Warning: No activity index found for technology '{tech}' in region '{region}'.")
+                    print(
+                        f"Warning: No activity index found for technology '{tech}' in region '{region}'."
+                    )
                     continue
 
                 tech_data = regional_indices.setdefault(tech, {"idx": activity_index})
@@ -252,9 +254,7 @@ def get_nz_col_indices(index):
                                 initial_amount
                                 * subshares[tech_category][year][other_supplier]
                             )
-                            list_indices.append(
-                                (other_supplier_tech["idx"], consumer)
-                            )
+                            list_indices.append((other_supplier_tech["idx"], consumer))
                             list_amounts.append(tuple(amounts * -1))
 
     indices = np.array(list_indices, dtype=bwp.INDICES_DTYPE)

diff --git a/requirements.txt b/requirements.txt
@@ -7,6 +7,7 @@ premise
 pyyaml
 bw_processing
 bw2calc >= 2.0.dev18
+cvxopt
 scikit-umfpack
 datapackage
 pyprind

diff --git a/setup.py b/setup.py
@@ -48,6 +48,8 @@ def package_files(directory):
         "scipy",
         "premise",
         "pyyaml",
+        "cvxopt",
+        "scikit-umfpack",
         "bw_processing",
         "bw2calc>=2.0.dev18",
         "datapackage",