Merge pull request #1308 from mrvisscher/project-setup-wizard

ecoinvent 3.10 compatibility

Author: mrvisscher

.git-blame-ignore-revs

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

.github/workflows/main.yaml

@@ -34,7 +34,7 @@ jobs:
       fail-fast: false
       matrix:
         os: [ubuntu-latest, windows-latest, macos-latest]
-        python-version: ['3.9', '3.10', '3.11']
+        python-version: ['3.10', '3.11']
     defaults:
       run:
         shell: bash -l {0}

activity_browser/__init__.py

@@ -30,6 +30,4 @@ def run_activity_browser():
     load_settings()
     application.show()
 
-    sys.excepthook = exception_hook
-
     sys.exit(application.exec_())

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/actions/default_install.py

@@ -1,8 +1,7 @@
 from activity_browser import application
 from activity_browser.actions.base import ABAction, exception_dialogs
+from activity_browser.ui.wizards import ProjectSetupWizard
 from activity_browser.ui.icons import qicons
-from activity_browser.ui.widgets import (DefaultBiosphereDialog,
-                                         EcoinventVersionDialog)
 
 
 class DefaultInstall(ABAction):
@@ -11,16 +10,9 @@ class DefaultInstall(ABAction):
     """
 
     icon = qicons.import_db
-    text = "Add default data (biosphere flows and impact categories)"
+    text = "Set up your project with default data"
 
     @staticmethod
     @exception_dialogs
     def run():
-        version_dialog = EcoinventVersionDialog(application.main_window)
-        if version_dialog.exec_() != EcoinventVersionDialog.Accepted:
-            return
-        version = version_dialog.options.currentText()
-
-        DefaultBiosphereDialog(
-            version[:3], application.main_window
-        ).show()  # only read Major/Minor part of version
+        ProjectSetupWizard(application.main_window).show()

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/__init__.py

@@ -0,0 +1,4 @@
+import activity_browser.mod.bw2data as bw2data
+import activity_browser.mod.bw2io as bw2io
+import activity_browser.mod.ecoinvent_interface as ecoinvent_interface
+import activity_browser.mod.pyprind as pyprind

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