Merge remote-tracking branch 'refs/remotes/cauldron/feat/ecoinvent_interface' into project-setup-wizard

# Conflicts:
#	.git-blame-ignore-revs
#	activity_browser/__init__.py
#	activity_browser/actions/__init__.py
#	activity_browser/actions/activity/activity_delete.py
#	activity_browser/actions/activity/activity_relink.py
#	activity_browser/actions/biosphere_update.py
#	activity_browser/actions/database/database_delete.py
#	activity_browser/actions/database/database_relink.py
#	activity_browser/actions/default_install.py
#	activity_browser/actions/parameter/parameter_clear_broken.py
#	activity_browser/actions/parameter/parameter_delete.py
#	activity_browser/actions/parameter/parameter_rename.py
#	activity_browser/bwutils/__init__.py
#	activity_browser/bwutils/calculations.py
#	activity_browser/bwutils/exporters.py
#	activity_browser/bwutils/importers.py
#	activity_browser/bwutils/metadata.py
#	activity_browser/bwutils/multilca.py
#	activity_browser/bwutils/sensitivity_analysis.py
#	activity_browser/bwutils/strategies.py
#	activity_browser/bwutils/superstructure/__init__.py
#	activity_browser/bwutils/superstructure/graph_traversal_with_scenario.py
#	activity_browser/bwutils/superstructure/manager.py
#	activity_browser/bwutils/superstructure/mlca.py
#	activity_browser/bwutils/utils.py
#	activity_browser/controllers/plugin.py
#	activity_browser/layouts/panels/__init__.py
#	activity_browser/layouts/panels/right.py
#	activity_browser/layouts/tabs/LCA_results_tab.py
#	activity_browser/layouts/tabs/LCA_results_tabs.py
#	activity_browser/layouts/tabs/LCA_setup.py
#	activity_browser/layouts/tabs/__init__.py
#	activity_browser/layouts/tabs/activity.py
#	activity_browser/layouts/tabs/parameters.py
#	activity_browser/layouts/tabs/project_manager.py
#	activity_browser/logger.py
#	activity_browser/mod/__init__.py
#	activity_browser/mod/bw2data/backends/base.py
#	activity_browser/mod/bw2data/backends/proxies.py
#	activity_browser/ui/menu_bar.py
#	activity_browser/ui/tables/LCA_setup.py
#	activity_browser/ui/tables/__init__.py
#	activity_browser/ui/tables/delegates/__init__.py
#	activity_browser/ui/tables/impact_categories.py
#	activity_browser/ui/tables/inventory.py
#	activity_browser/ui/tables/models/__init__.py
#	activity_browser/ui/tables/models/activity.py
#	activity_browser/ui/tables/models/base.py
#	activity_browser/ui/tables/models/inventory.py
#	activity_browser/ui/tables/models/parameters.py
#	activity_browser/ui/tables/parameters.py
#	activity_browser/ui/tables/projects.py
#	activity_browser/ui/tables/views.py
#	activity_browser/ui/threading.py
#	activity_browser/ui/web/base.py
#	activity_browser/ui/web/sankey_navigator.py
#	activity_browser/ui/widgets/__init__.py
#	activity_browser/ui/widgets/cutoff_menu.py
#	activity_browser/ui/widgets/dialog.py
#	activity_browser/ui/wizards/db_import_wizard.py
#	activity_browser/utils.py
#	recipe/meta.yaml
#	tests/actions/test_activity_actions.py
#	tests/actions/test_calculation_setup_actions.py
#	tests/actions/test_database_actions.py
#	tests/actions/test_exchange_actions.py
#	tests/actions/test_method_actions.py
#	tests/actions/test_parameter_actions.py
#	tests/actions/test_project_actions.py
#	tests/actions/test_various_actions.py
#	tests/conftest.py
#	tests/legacy/test_uncertainty.py
#	tests/legacy/test_widgets.py
#	tests/wizards/test_uncertainty_wizard.py

Author: mrvisscher

.git-blame-ignore-revs

@@ -1 +1,2 @@
 cc69730afaacb15582efcbdf403353d8ce5454d9
+5cde894936aab2611d1f0a5be8ece8d5f3312783

activity_browser/actions/base.py

@@ -14,7 +14,6 @@ def run(*args, **kwargs):
 
     @classmethod
     def triggered(cls, *args, **kwargs):
-
         args = [arg if not callable(arg) else arg() for arg in args]
         kwargs = {k: v if not callable(v) else v() for k, v in kwargs.items()}
 

activity_browser/bwutils/pedigree.py

@@ -13,6 +13,7 @@
 smoothly into the related uncertainty distributions.
 """
 import math
+from pprint import pformat
 
 from bw2data.parameters import ParameterBase
 from bw2data.proxies import ExchangeProxyBase

activity_browser/layouts/panels/left.py

@@ -7,6 +7,8 @@ class LeftPanel(ABTab):
     side = "left"
 
     def __init__(self, *args):
+        from ..tabs import HistoryTab, MethodsTab, ProjectTab
+
         super(LeftPanel, self).__init__(*args)
 
         self.tabs = {

activity_browser/mod/bw2data/method.py

@@ -7,7 +7,6 @@
 
 @patch_superclass
 class Method(Method):
-
     @property
     def changed(self):
         """

activity_browser/mod/bw2data/project.py

@@ -15,7 +15,6 @@
 
 @patch_superclass
 class ProjectManager(ProjectManager):
-
     @property
     def current_changed(self):
         """

activity_browser/ui/tables/models/lca_setup.py

@@ -98,7 +98,6 @@ def get_key(self, proxy: QModelIndex) -> tuple:
         return self._dataframe.iat[idx.row(), self.key_col]
 
     def load(self, cs_name: str = None):
-
         for act in self._activities.values():
             act.changed.disconnect(self.sync)
         self._activities.clear()
@@ -129,8 +128,6 @@ def sync(self):
     def build_row(self, key: tuple, amount: float = 1.0) -> dict:
         try:
             act = bd.get_activity(key)
-            if act.get("type", "process") != "process":
-                raise TypeError("Activity is not of type 'process'")
             row = {
                 key: act.get(bc.AB_names_to_bw_keys[key], "")
                 for key in self.HEADERS[:-1]