Small test fixes, and no test-pass required for beta build

.github/workflows/main.yaml

@@ -142,9 +142,6 @@ jobs:
           /usr/share/miniconda/envs/build/conda-bld/noarch/*.conda
 
   deploy-beta:
-    # Make sure to only run a deploy if all tests pass.
-    needs:
-      - tests
     # And only on a push event, not a pull_request.
     if: ${{ github.event_name == 'push' && github.ref == 'refs/heads/major' }}
     runs-on: ubuntu-latest

activity_browser/actions/method/cf_new.py

@@ -20,7 +20,7 @@ class CFNew(ABAction):
     @exception_dialogs
     def run(method_name: tuple, keys: List[tuple]):
         # load old cf's from the Method
-        method_dict = bd.Method(method_name).load_dict()
+        method_dict = {cf[0]: cf[1] for cf in bd.Method(method_name).load()}
 
         # use only the keys that don't already exist within the method
         unique_keys = [key for key in keys if key not in method_dict]

tests/actions/test_activity_actions.py

@@ -1,3 +1,4 @@
+from bw2data import Database
 from bw2data.errors import BW2Exception
 from bw2data.project import projects
 from bw2data.utils import get_activity
@@ -6,7 +7,6 @@
 from qtpy import QtWidgets
 
 from activity_browser import actions
-from activity_browser.mod.bw2data import Database
 from activity_browser.ui.widgets.dialog import (ActivityLinkingDialog,
                                                 LocationLinkingDialog)
 from activity_browser.ui.widgets.new_node_dialog import NewNodeDialog

tests/actions/test_database_actions.py

@@ -45,7 +45,7 @@ def test_database_duplicate(ab_app, monkeypatch, qtbot):
     actions.DatabaseDuplicate.run(db)
 
     dialog = application.main_window.findChild(DuplicateDatabaseDialog)
-    with qtbot.waitSignal(dialog.thread.finished, timeout=60 * 1000):
+    with qtbot.waitSignal(dialog.dup_thread.finished, timeout=60 * 1000):
         pass
 
     assert db in databases

tests/actions/test_project_actions.py

@@ -3,7 +3,7 @@
 from qtpy import QtWidgets
 
 from activity_browser import ab_settings, actions
-from activity_browser.ui.widgets import ProjectDeletionDialog
+from activity_browser.actions.project.project_delete import ProjectDeletionDialog
 
 
 def test_project_delete(ab_app, monkeypatch):

tests/actions/test_various_actions.py

@@ -1,19 +1,4 @@
-import os
-
-from bw2data.meta import databases, methods
-from bw2data.project import projects
-
-import pytest
-from qtpy import QtWidgets
-
 from activity_browser import actions, application
-from activity_browser.bwutils import AB_metadata
-from activity_browser.mod.bw2data import Database
-from activity_browser.ui.widgets import (
-    BiosphereUpdater,
-    DefaultBiosphereDialog,
-    EcoinventVersionDialog,
-)
 from activity_browser.ui.wizards.plugins_manager_wizard import PluginsManagerWizard
 from activity_browser.ui.wizards.settings_wizard import SettingsWizard
 

tests/legacy/test_uncertainty.py

@@ -7,6 +7,7 @@
 from bw2data.database import Database
 from bw2data.configuration import config
 from bw2data.utils import get_activity
+from bw2data import Method, methods
 
 import pytest
 from stats_arrays.distributions import UndefinedUncertainty, UniformUncertainty
@@ -16,7 +17,6 @@
     ExchangeUncertaintyInterface,
     get_uncertainty_interface,
 )
-from activity_browser.mod.bw2data import Method, methods
 
 
 def test_exchange_interface(qtbot, ab_app):

tests/wizards/test_uncertainty_wizard.py

@@ -11,7 +11,7 @@
                                         UndefinedUncertainty,
                                         UniformUncertainty)
 
-from activity_browser.signals import qparameters
+from activity_browser import signals
 from activity_browser.ui.wizards import UncertaintyWizard
 
 """
@@ -104,7 +104,7 @@ def test_update_uncertainty(ab_app, qtbot):
     assert wizard.type.complete
 
     # Now trigger a 'finish' action
-    with qtbot.waitSignal(qparameters.parameters_changed, timeout=100):
+    with qtbot.waitSignal(signals.parameter.changed, timeout=100):
         wizard.button(QWizard.FinishButton).click()
 
     # Reload param
@@ -131,7 +131,7 @@ def test_update_alter_mean(qtbot, monkeypatch, ab_app):
         QMessageBox, "question", staticmethod(lambda *args: QMessageBox.Yes)
     )
     # Now trigger a 'finish' action
-    with qtbot.waitSignal(qparameters.parameters_changed, timeout=100):
+    with qtbot.waitSignal(signals.parameter.changed, timeout=100):
         wizard.button(QWizard.FinishButton).click()
 
     # Reload param and check that the amount is changed.