From cb5010526b6d2a2bf0d28be3eafa632fbb97b06b Mon Sep 17 00:00:00 2001 From: guidoca Date: Sat, 12 Oct 2024 14:03:41 +1300 Subject: [PATCH] Preliminary update to pyside6 --- CHANGELOG.md | 4 ++-- .../actions/activity/activity_delete.py | 2 +- .../actions/activity/activity_duplicate.py | 2 +- .../activity/activity_duplicate_to_db.py | 2 +- .../activity/activity_duplicate_to_loc.py | 2 +- .../actions/activity/activity_modify.py | 2 +- .../actions/activity/activity_new.py | 2 +- .../actions/activity/activity_relink.py | 2 +- activity_browser/actions/base.py | 6 +++--- activity_browser/actions/biosphere_update.py | 2 +- .../actions/calculation_setup/cs_delete.py | 2 +- .../actions/calculation_setup/cs_duplicate.py | 2 +- .../actions/calculation_setup/cs_new.py | 2 +- .../actions/calculation_setup/cs_rename.py | 2 +- .../actions/database/database_delete.py | 2 +- .../actions/database/database_duplicate.py | 2 +- .../actions/database/database_export.py | 2 +- .../actions/database/database_new.py | 2 +- .../actions/database/database_relink.py | 2 +- activity_browser/actions/method/cf_new.py | 2 +- activity_browser/actions/method/cf_remove.py | 2 +- .../actions/method/method_delete.py | 2 +- activity_browser/actions/method/method_open.py | 2 +- activity_browser/actions/migrations_install.py | 2 +- .../actions/parameter/parameter_new.py | 2 +- .../parameter/parameter_new_automatic.py | 2 +- .../actions/parameter/parameter_rename.py | 2 +- .../actions/project/project_delete.py | 2 +- .../actions/project/project_duplicate.py | 2 +- .../actions/project/project_export.py | 2 +- .../actions/project/project_import.py | 2 +- .../actions/project/project_new.py | 2 +- activity_browser/application.py | 4 ++-- activity_browser/bwutils/calculations.py | 2 +- activity_browser/bwutils/multilca.py | 2 +- .../bwutils/superstructure/dataframe.py | 4 ++-- .../bwutils/superstructure/file_dialogs.py | 2 +- .../bwutils/superstructure/manager.py | 4 ++-- .../bwutils/superstructure/mlca.py | 2 +- activity_browser/controllers/plugin.py | 2 +- activity_browser/layouts/main.py | 2 +- activity_browser/layouts/panels/panel.py | 2 +- activity_browser/layouts/panels/right.py | 2 +- .../layouts/tabs/LCA_results_tab.py | 4 ++-- .../layouts/tabs/LCA_results_tabs.py | 4 ++-- activity_browser/layouts/tabs/LCA_setup.py | 4 ++-- activity_browser/layouts/tabs/activity.py | 4 ++-- activity_browser/layouts/tabs/base.py | 4 ++-- activity_browser/layouts/tabs/history.py | 2 +- .../layouts/tabs/impact_categories.py | 2 +- activity_browser/layouts/tabs/parameters.py | 4 ++-- .../layouts/tabs/project_manager.py | 2 +- activity_browser/settings.py | 2 +- activity_browser/signals.py | 2 +- activity_browser/ui/figures.py | 2 +- activity_browser/ui/icons.py | 2 +- activity_browser/ui/menu_bar.py | 6 +++--- activity_browser/ui/statusbar.py | 4 ++-- activity_browser/ui/style.py | 2 +- activity_browser/ui/tables/LCA_setup.py | 6 +++--- activity_browser/ui/tables/activity.py | 4 ++-- .../ui/tables/delegates/checkbox.py | 4 ++-- .../ui/tables/delegates/database.py | 2 +- activity_browser/ui/tables/delegates/float.py | 2 +- .../ui/tables/delegates/formula.py | 4 ++-- activity_browser/ui/tables/delegates/list.py | 2 +- activity_browser/ui/tables/delegates/string.py | 2 +- .../ui/tables/delegates/uncertainty.py | 2 +- .../ui/tables/delegates/viewonly.py | 2 +- activity_browser/ui/tables/history.py | 4 ++-- .../ui/tables/impact_categories.py | 4 ++-- activity_browser/ui/tables/inventory.py | 10 +++++----- activity_browser/ui/tables/models/activity.py | 2 +- activity_browser/ui/tables/models/base.py | 4 ++-- activity_browser/ui/tables/models/history.py | 2 +- .../ui/tables/models/impact_categories.py | 2 +- activity_browser/ui/tables/models/inventory.py | 4 ++-- activity_browser/ui/tables/models/lca_setup.py | 4 ++-- .../ui/tables/models/parameters.py | 4 ++-- activity_browser/ui/tables/models/plugins.py | 2 +- activity_browser/ui/tables/models/scenarios.py | 2 +- activity_browser/ui/tables/parameters.py | 6 +++--- activity_browser/ui/tables/plugins.py | 4 ++-- activity_browser/ui/tables/projects.py | 4 ++-- activity_browser/ui/tables/scenarios.py | 2 +- activity_browser/ui/tables/views.py | 18 +++++++++--------- activity_browser/ui/threading.py | 2 +- activity_browser/ui/web/base.py | 4 ++-- activity_browser/ui/web/navigator.py | 4 ++-- activity_browser/ui/web/sankey_navigator.py | 6 +++--- activity_browser/ui/web/webutils.py | 4 ++-- activity_browser/ui/widgets/activity.py | 2 +- .../ui/widgets/biosphere_update.py | 4 ++-- .../ui/widgets/comparison_switch.py | 2 +- activity_browser/ui/widgets/cutoff_menu.py | 8 ++++---- activity_browser/ui/widgets/dialog.py | 4 ++-- activity_browser/ui/widgets/line_edit.py | 6 +++--- activity_browser/ui/widgets/message.py | 4 ++-- .../ui/wizards/db_export_wizard.py | 4 ++-- .../ui/wizards/db_import_wizard.py | 4 ++-- .../ui/wizards/plugins_manager_wizard.py | 4 ++-- .../ui/wizards/project_setup_wizard.py | 2 +- activity_browser/ui/wizards/settings_wizard.py | 2 +- activity_browser/ui/wizards/uncertainty.py | 4 ++-- activity_browser/utils.py | 2 +- tests/actions/test_activity_actions.py | 2 +- .../actions/test_calculation_setup_actions.py | 2 +- tests/actions/test_database_actions.py | 2 +- tests/actions/test_exchange_actions.py | 2 +- tests/actions/test_method_actions.py | 2 +- tests/actions/test_parameter_actions.py | 2 +- tests/actions/test_project_actions.py | 2 +- tests/actions/test_various_actions.py | 2 +- tests/legacy/test_widgets.py | 4 ++-- tests/wizards/test_export_wizard.py | 2 +- tests/wizards/test_import_wizard.py | 2 +- tests/wizards/test_uncertainty_wizard.py | 2 +- 117 files changed, 177 insertions(+), 177 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index a95549516..78a654234 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -16,7 +16,7 @@ This will make it easier to debug problems with the controller. - ([#506](https://github.com/LCA-ActivityBrowser/activity-browser/pull/506)) Refactor the AB code to increase the separation between brightway code, - PySide2 code and Javascript/HTML/CSS code. + PySide6 code and Javascript/HTML/CSS code. - ([#519](https://github.com/LCA-ActivityBrowser/activity-browser/pull/519), [#520](https://github.com/LCA-ActivityBrowser/activity-browser/pull/520)) Small fixes to the look of the AB for large database names and small @@ -270,7 +270,7 @@ Slight changes to the main drop-down menu's, adding relevant icons to functionality. - ([#315](https://github.com/LCA-ActivityBrowser/activity-browser/pull/315)) - Refactor code to use PySide2, use LGPL license. + Refactor code to use PySide6, use LGPL license. ### Fixed diff --git a/activity_browser/actions/activity/activity_delete.py b/activity_browser/actions/activity/activity_delete.py index 836a9cc5b..255c824b4 100644 --- a/activity_browser/actions/activity/activity_delete.py +++ b/activity_browser/actions/activity/activity_delete.py @@ -1,6 +1,6 @@ from typing import List -from PySide2 import QtWidgets +from PySide6 import QtWidgets from activity_browser import application from activity_browser.actions.base import ABAction, exception_dialogs diff --git a/activity_browser/actions/activity/activity_duplicate.py b/activity_browser/actions/activity/activity_duplicate.py index b1c616a41..572a11fa6 100644 --- a/activity_browser/actions/activity/activity_duplicate.py +++ b/activity_browser/actions/activity/activity_duplicate.py @@ -1,6 +1,6 @@ from typing import Callable, List, Union -from PySide2 import QtCore +from PySide6 import QtCore from activity_browser.actions.base import ABAction, exception_dialogs from activity_browser.bwutils import commontasks diff --git a/activity_browser/actions/activity/activity_duplicate_to_db.py b/activity_browser/actions/activity/activity_duplicate_to_db.py index b6fef79c0..3d7cf7c69 100644 --- a/activity_browser/actions/activity/activity_duplicate_to_db.py +++ b/activity_browser/actions/activity/activity_duplicate_to_db.py @@ -1,6 +1,6 @@ from typing import List -from PySide2 import QtWidgets +from PySide6 import QtWidgets from activity_browser import application, project_settings from activity_browser.actions.base import ABAction, exception_dialogs diff --git a/activity_browser/actions/activity/activity_duplicate_to_loc.py b/activity_browser/actions/activity/activity_duplicate_to_loc.py index dd0d45bdc..e57f41814 100644 --- a/activity_browser/actions/activity/activity_duplicate_to_loc.py +++ b/activity_browser/actions/activity/activity_duplicate_to_loc.py @@ -1,7 +1,7 @@ from typing import Callable, Optional, Union import pandas as pd -from PySide2 import QtCore +from PySide6 import QtCore from activity_browser import application, signals from activity_browser.actions.base import ABAction, exception_dialogs diff --git a/activity_browser/actions/activity/activity_modify.py b/activity_browser/actions/activity/activity_modify.py index 40b86f371..946bbcc1c 100644 --- a/activity_browser/actions/activity/activity_modify.py +++ b/activity_browser/actions/activity/activity_modify.py @@ -1,6 +1,6 @@ from typing import Callable, Union -from PySide2 import QtCore +from PySide6 import QtCore from activity_browser.actions.base import ABAction, exception_dialogs from activity_browser.mod.bw2data import get_activity diff --git a/activity_browser/actions/activity/activity_new.py b/activity_browser/actions/activity/activity_new.py index 527086724..3ef57fca5 100644 --- a/activity_browser/actions/activity/activity_new.py +++ b/activity_browser/actions/activity/activity_new.py @@ -1,6 +1,6 @@ from uuid import uuid4 -from PySide2 import QtWidgets +from PySide6 import QtWidgets from activity_browser import application from activity_browser.actions.base import ABAction, exception_dialogs diff --git a/activity_browser/actions/activity/activity_relink.py b/activity_browser/actions/activity/activity_relink.py index 347f0faf4..c7488b873 100644 --- a/activity_browser/actions/activity/activity_relink.py +++ b/activity_browser/actions/activity/activity_relink.py @@ -1,6 +1,6 @@ from typing import List -from PySide2 import QtCore, QtWidgets +from PySide6 import QtCore, QtWidgets from activity_browser import application from activity_browser.actions.base import ABAction, exception_dialogs diff --git a/activity_browser/actions/base.py b/activity_browser/actions/base.py index 2572e0f64..48d299c6c 100644 --- a/activity_browser/actions/base.py +++ b/activity_browser/actions/base.py @@ -1,4 +1,4 @@ -from PySide2 import QtCore, QtGui, QtWidgets +from PySide6 import QtCore, QtGui, QtWidgets from activity_browser import application @@ -20,8 +20,8 @@ def triggered(cls, *args, **kwargs): cls.run(*args, **kwargs) @classmethod - def get_QAction(cls, *args, **kwargs) -> QtWidgets.QAction: - action = QtWidgets.QAction(cls.icon, cls.text, None) + def get_QAction(cls, *args, **kwargs) -> QtGui.QAction: + action = QtGui.QAction(cls.icon, cls.text, None) action.setToolTip(cls.tooltip) action.triggered.connect(lambda: cls.triggered(*args, **kwargs)) diff --git a/activity_browser/actions/biosphere_update.py b/activity_browser/actions/biosphere_update.py index def55d202..9007f42fa 100644 --- a/activity_browser/actions/biosphere_update.py +++ b/activity_browser/actions/biosphere_update.py @@ -1,4 +1,4 @@ -from PySide2 import QtWidgets +from PySide6 import QtWidgets from activity_browser import application from activity_browser.actions.base import ABAction, exception_dialogs diff --git a/activity_browser/actions/calculation_setup/cs_delete.py b/activity_browser/actions/calculation_setup/cs_delete.py index a22f32c45..41389f82a 100644 --- a/activity_browser/actions/calculation_setup/cs_delete.py +++ b/activity_browser/actions/calculation_setup/cs_delete.py @@ -1,6 +1,6 @@ from logging import getLogger -from PySide2 import QtWidgets +from PySide6 import QtWidgets from activity_browser import application, signals from activity_browser.actions.base import ABAction, exception_dialogs diff --git a/activity_browser/actions/calculation_setup/cs_duplicate.py b/activity_browser/actions/calculation_setup/cs_duplicate.py index 597edca85..846867aee 100644 --- a/activity_browser/actions/calculation_setup/cs_duplicate.py +++ b/activity_browser/actions/calculation_setup/cs_duplicate.py @@ -1,6 +1,6 @@ from logging import getLogger -from PySide2 import QtWidgets +from PySide6 import QtWidgets from activity_browser import application, signals from activity_browser.actions.base import ABAction, exception_dialogs diff --git a/activity_browser/actions/calculation_setup/cs_new.py b/activity_browser/actions/calculation_setup/cs_new.py index 105ef1ccf..0d22a5849 100644 --- a/activity_browser/actions/calculation_setup/cs_new.py +++ b/activity_browser/actions/calculation_setup/cs_new.py @@ -1,6 +1,6 @@ from logging import getLogger -from PySide2 import QtWidgets +from PySide6 import QtWidgets from activity_browser import application, signals from activity_browser.actions.base import ABAction, exception_dialogs diff --git a/activity_browser/actions/calculation_setup/cs_rename.py b/activity_browser/actions/calculation_setup/cs_rename.py index 735548f1f..0b5f9df5c 100644 --- a/activity_browser/actions/calculation_setup/cs_rename.py +++ b/activity_browser/actions/calculation_setup/cs_rename.py @@ -1,6 +1,6 @@ from logging import getLogger -from PySide2 import QtWidgets +from PySide6 import QtWidgets from activity_browser import application, signals from activity_browser.actions.base import ABAction, exception_dialogs diff --git a/activity_browser/actions/database/database_delete.py b/activity_browser/actions/database/database_delete.py index 26994a52a..657dc3f85 100644 --- a/activity_browser/actions/database/database_delete.py +++ b/activity_browser/actions/database/database_delete.py @@ -1,5 +1,5 @@ from bw2data.parameters import Group -from PySide2 import QtCore, QtWidgets +from PySide6 import QtCore, QtWidgets from activity_browser import application, project_settings from activity_browser.actions.base import ABAction, exception_dialogs diff --git a/activity_browser/actions/database/database_duplicate.py b/activity_browser/actions/database/database_duplicate.py index 2aec75cea..a06e2c6f3 100644 --- a/activity_browser/actions/database/database_duplicate.py +++ b/activity_browser/actions/database/database_duplicate.py @@ -1,4 +1,4 @@ -from PySide2 import QtWidgets +from PySide6 import QtWidgets from activity_browser import application from activity_browser.actions.base import ABAction, exception_dialogs diff --git a/activity_browser/actions/database/database_export.py b/activity_browser/actions/database/database_export.py index 57810a00c..f3e5ceff5 100644 --- a/activity_browser/actions/database/database_export.py +++ b/activity_browser/actions/database/database_export.py @@ -1,4 +1,4 @@ -from PySide2 import QtWidgets +from PySide6 import QtWidgets from activity_browser import application from activity_browser.actions.base import ABAction, exception_dialogs diff --git a/activity_browser/actions/database/database_new.py b/activity_browser/actions/database/database_new.py index 6f303b321..413fef5d3 100644 --- a/activity_browser/actions/database/database_new.py +++ b/activity_browser/actions/database/database_new.py @@ -1,4 +1,4 @@ -from PySide2 import QtWidgets +from PySide6 import QtWidgets from activity_browser import application, project_settings, signals from activity_browser.actions.base import ABAction, exception_dialogs diff --git a/activity_browser/actions/database/database_relink.py b/activity_browser/actions/database/database_relink.py index 48548ea46..2203f2c86 100644 --- a/activity_browser/actions/database/database_relink.py +++ b/activity_browser/actions/database/database_relink.py @@ -1,4 +1,4 @@ -from PySide2 import QtCore, QtWidgets +from PySide6 import QtCore, QtWidgets from activity_browser import application from activity_browser.actions.base import ABAction, exception_dialogs diff --git a/activity_browser/actions/method/cf_new.py b/activity_browser/actions/method/cf_new.py index 4de62c16d..0d8c3970f 100644 --- a/activity_browser/actions/method/cf_new.py +++ b/activity_browser/actions/method/cf_new.py @@ -1,6 +1,6 @@ from typing import List -from PySide2 import QtWidgets +from PySide6 import QtWidgets from activity_browser import application from activity_browser.actions.base import ABAction, exception_dialogs diff --git a/activity_browser/actions/method/cf_remove.py b/activity_browser/actions/method/cf_remove.py index 51d0c5b55..4bed4a16b 100644 --- a/activity_browser/actions/method/cf_remove.py +++ b/activity_browser/actions/method/cf_remove.py @@ -1,6 +1,6 @@ from typing import List -from PySide2 import QtWidgets +from PySide6 import QtWidgets from activity_browser import application from activity_browser.actions.base import ABAction, exception_dialogs diff --git a/activity_browser/actions/method/method_delete.py b/activity_browser/actions/method/method_delete.py index 2471a86d2..4e3a6d87a 100644 --- a/activity_browser/actions/method/method_delete.py +++ b/activity_browser/actions/method/method_delete.py @@ -1,7 +1,7 @@ from typing import List from logging import getLogger -from PySide2 import QtWidgets +from PySide6 import QtWidgets from activity_browser import application from activity_browser.actions.base import ABAction, exception_dialogs diff --git a/activity_browser/actions/method/method_open.py b/activity_browser/actions/method/method_open.py index 480fadee7..793722ecd 100644 --- a/activity_browser/actions/method/method_open.py +++ b/activity_browser/actions/method/method_open.py @@ -1,6 +1,6 @@ from typing import List -from PySide2 import QtWidgets, QtCore +from PySide6 import QtWidgets, QtCore from activity_browser import signals from activity_browser.actions.base import ABAction, exception_dialogs diff --git a/activity_browser/actions/migrations_install.py b/activity_browser/actions/migrations_install.py index 14d9305c3..fb6d47611 100644 --- a/activity_browser/actions/migrations_install.py +++ b/activity_browser/actions/migrations_install.py @@ -1,4 +1,4 @@ -from PySide2 import QtWidgets +from PySide6 import QtWidgets from activity_browser import application from activity_browser.actions.base import ABAction, exception_dialogs diff --git a/activity_browser/actions/parameter/parameter_new.py b/activity_browser/actions/parameter/parameter_new.py index 2eea4ad79..1f9d406a4 100644 --- a/activity_browser/actions/parameter/parameter_new.py +++ b/activity_browser/actions/parameter/parameter_new.py @@ -1,6 +1,6 @@ from typing import Tuple -from PySide2 import QtCore, QtGui, QtWidgets +from PySide6 import QtCore, QtGui, QtWidgets from activity_browser import actions, application from activity_browser.actions.base import ABAction, exception_dialogs diff --git a/activity_browser/actions/parameter/parameter_new_automatic.py b/activity_browser/actions/parameter/parameter_new_automatic.py index dc0f90aca..bc1c5753e 100644 --- a/activity_browser/actions/parameter/parameter_new_automatic.py +++ b/activity_browser/actions/parameter/parameter_new_automatic.py @@ -1,7 +1,7 @@ from typing import List, Tuple from peewee import IntegrityError -from PySide2 import QtWidgets +from PySide6 import QtWidgets from activity_browser import application from activity_browser.actions.base import ABAction, exception_dialogs diff --git a/activity_browser/actions/parameter/parameter_rename.py b/activity_browser/actions/parameter/parameter_rename.py index c1eee3147..8e5ae5d56 100644 --- a/activity_browser/actions/parameter/parameter_rename.py +++ b/activity_browser/actions/parameter/parameter_rename.py @@ -1,6 +1,6 @@ from typing import Any -from PySide2 import QtWidgets +from PySide6 import QtWidgets from activity_browser import application from activity_browser.actions.base import ABAction, exception_dialogs diff --git a/activity_browser/actions/project/project_delete.py b/activity_browser/actions/project/project_delete.py index 87a96c65d..0567f5df5 100644 --- a/activity_browser/actions/project/project_delete.py +++ b/activity_browser/actions/project/project_delete.py @@ -1,4 +1,4 @@ -from PySide2 import QtWidgets +from PySide6 import QtWidgets from activity_browser import ab_settings, application from activity_browser.actions.base import ABAction, exception_dialogs diff --git a/activity_browser/actions/project/project_duplicate.py b/activity_browser/actions/project/project_duplicate.py index 77d3bbcd4..c9f4b1183 100644 --- a/activity_browser/actions/project/project_duplicate.py +++ b/activity_browser/actions/project/project_duplicate.py @@ -1,4 +1,4 @@ -from PySide2 import QtWidgets +from PySide6 import QtWidgets from activity_browser import application from activity_browser.actions.base import ABAction, exception_dialogs diff --git a/activity_browser/actions/project/project_export.py b/activity_browser/actions/project/project_export.py index 2c3f15282..192595c8d 100644 --- a/activity_browser/actions/project/project_export.py +++ b/activity_browser/actions/project/project_export.py @@ -3,7 +3,7 @@ import tarfile from logging import getLogger -from PySide2 import QtWidgets, QtCore +from PySide6 import QtWidgets, QtCore from activity_browser import application from activity_browser.mod import bw2data as bd diff --git a/activity_browser/actions/project/project_import.py b/activity_browser/actions/project/project_import.py index 777cc484a..4561e98c6 100644 --- a/activity_browser/actions/project/project_import.py +++ b/activity_browser/actions/project/project_import.py @@ -3,7 +3,7 @@ import tarfile from logging import getLogger -from PySide2 import QtWidgets, QtCore +from PySide6 import QtWidgets, QtCore from bw2io import backup from activity_browser import application diff --git a/activity_browser/actions/project/project_new.py b/activity_browser/actions/project/project_new.py index 7b6f7c5bd..a807e5d77 100644 --- a/activity_browser/actions/project/project_new.py +++ b/activity_browser/actions/project/project_new.py @@ -1,4 +1,4 @@ -from PySide2 import QtWidgets +from PySide6 import QtWidgets from activity_browser import application from activity_browser.actions.base import ABAction, exception_dialogs diff --git a/activity_browser/application.py b/activity_browser/application.py index bfd32f17d..c978f9216 100644 --- a/activity_browser/application.py +++ b/activity_browser/application.py @@ -2,8 +2,8 @@ import os from logging import getLogger -from PySide2.QtCore import QCoreApplication, QObject, QSysInfo, Qt -from PySide2.QtWidgets import QApplication +from PySide6.QtCore import QCoreApplication, QObject, QSysInfo, Qt +from PySide6.QtWidgets import QApplication log = getLogger(__name__) diff --git a/activity_browser/bwutils/calculations.py b/activity_browser/bwutils/calculations.py index 479480a7f..bad0ec778 100644 --- a/activity_browser/bwutils/calculations.py +++ b/activity_browser/bwutils/calculations.py @@ -2,7 +2,7 @@ from logging import getLogger from bw2calc.errors import BW2CalcError -from PySide2.QtWidgets import QApplication +from PySide6.QtWidgets import QApplication from ..bwutils import (MLCA, Contributions, MonteCarloLCA, SuperstructureContributions, SuperstructureMLCA) diff --git a/activity_browser/bwutils/multilca.py b/activity_browser/bwutils/multilca.py index 759c3da9f..a8a4dd088 100644 --- a/activity_browser/bwutils/multilca.py +++ b/activity_browser/bwutils/multilca.py @@ -6,7 +6,7 @@ import bw2calc as bc import numpy as np import pandas as pd -from PySide2.QtWidgets import QApplication, QMessageBox +from PySide6.QtWidgets import QApplication, QMessageBox from activity_browser.mod import bw2data as bd diff --git a/activity_browser/bwutils/superstructure/dataframe.py b/activity_browser/bwutils/superstructure/dataframe.py index 044c8b305..ae395264f 100644 --- a/activity_browser/bwutils/superstructure/dataframe.py +++ b/activity_browser/bwutils/superstructure/dataframe.py @@ -5,8 +5,8 @@ import numpy as np import pandas as pd -from PySide2.QtCore import Qt -from PySide2.QtWidgets import QApplication, QPushButton +from PySide6.QtCore import Qt +from PySide6.QtWidgets import QApplication, QPushButton from ..errors import ScenarioDatabaseNotFoundError from ..metadata import AB_metadata diff --git a/activity_browser/bwutils/superstructure/file_dialogs.py b/activity_browser/bwutils/superstructure/file_dialogs.py index 57e4f3897..467ea456f 100644 --- a/activity_browser/bwutils/superstructure/file_dialogs.py +++ b/activity_browser/bwutils/superstructure/file_dialogs.py @@ -1,5 +1,5 @@ import pandas as pd -from PySide2 import QtCore, QtWidgets +from PySide6 import QtCore, QtWidgets from ...ui.icons import qicons diff --git a/activity_browser/bwutils/superstructure/manager.py b/activity_browser/bwutils/superstructure/manager.py index dd9cd70e3..6cc97f1e1 100644 --- a/activity_browser/bwutils/superstructure/manager.py +++ b/activity_browser/bwutils/superstructure/manager.py @@ -6,8 +6,8 @@ import numpy as np import pandas as pd from pandas.api.types import is_numeric_dtype -from PySide2.QtCore import Qt -from PySide2.QtWidgets import QApplication, QPushButton +from PySide6.QtCore import Qt +from PySide6.QtWidgets import QApplication, QPushButton from activity_browser.mod import bw2data as bd diff --git a/activity_browser/bwutils/superstructure/mlca.py b/activity_browser/bwutils/superstructure/mlca.py index 31d6c4117..c2b11809f 100644 --- a/activity_browser/bwutils/superstructure/mlca.py +++ b/activity_browser/bwutils/superstructure/mlca.py @@ -3,7 +3,7 @@ import numpy as np import pandas as pd -from PySide2.QtWidgets import QPushButton +from PySide6.QtWidgets import QPushButton from activity_browser.mod import bw2data as bd diff --git a/activity_browser/controllers/plugin.py b/activity_browser/controllers/plugin.py index db8342c12..87f35bebe 100644 --- a/activity_browser/controllers/plugin.py +++ b/activity_browser/controllers/plugin.py @@ -3,7 +3,7 @@ from pkgutil import iter_modules from logging import getLogger -from PySide2.QtCore import QObject +from PySide6.QtCore import QObject from activity_browser import ab_settings, application, project_settings, signals from activity_browser.mod import bw2data as bd diff --git a/activity_browser/layouts/main.py b/activity_browser/layouts/main.py index 3fb6e80c8..4d618c026 100644 --- a/activity_browser/layouts/main.py +++ b/activity_browser/layouts/main.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -from PySide2 import QtCore, QtWidgets +from PySide6 import QtCore, QtWidgets import activity_browser.mod.bw2data as bd diff --git a/activity_browser/layouts/panels/panel.py b/activity_browser/layouts/panels/panel.py index a6b87d01f..0315037bf 100644 --- a/activity_browser/layouts/panels/panel.py +++ b/activity_browser/layouts/panels/panel.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -from PySide2 import QtCore, QtWidgets +from PySide6 import QtCore, QtWidgets from logging import getLogger from activity_browser import signals diff --git a/activity_browser/layouts/panels/right.py b/activity_browser/layouts/panels/right.py index 0b8e48525..3bb2b9302 100644 --- a/activity_browser/layouts/panels/right.py +++ b/activity_browser/layouts/panels/right.py @@ -1,7 +1,7 @@ from pathlib import Path from logging import getLogger -from PySide2.QtWidgets import QVBoxLayout +from PySide6.QtWidgets import QVBoxLayout from activity_browser import signals from activity_browser.mod import bw2data as bd diff --git a/activity_browser/layouts/tabs/LCA_results_tab.py b/activity_browser/layouts/tabs/LCA_results_tab.py index 10728cfe8..bd1547f57 100644 --- a/activity_browser/layouts/tabs/LCA_results_tab.py +++ b/activity_browser/layouts/tabs/LCA_results_tab.py @@ -3,8 +3,8 @@ from logging import getLogger from bw2calc.errors import BW2CalcError -from PySide2.QtCore import Qt, Slot -from PySide2.QtWidgets import QApplication, QMessageBox, QVBoxLayout +from PySide6.QtCore import Qt, Slot +from PySide6.QtWidgets import QApplication, QMessageBox, QVBoxLayout from activity_browser import signals from activity_browser.mod import bw2data as bd diff --git a/activity_browser/layouts/tabs/LCA_results_tabs.py b/activity_browser/layouts/tabs/LCA_results_tabs.py index 3df4cae44..afe5dfaef 100644 --- a/activity_browser/layouts/tabs/LCA_results_tabs.py +++ b/activity_browser/layouts/tabs/LCA_results_tabs.py @@ -9,8 +9,8 @@ from logging import getLogger import pandas as pd -from PySide2 import QtCore, QtGui -from PySide2.QtWidgets import (QApplication, QButtonGroup, QCheckBox, +from PySide6 import QtCore, QtGui +from PySide6.QtWidgets import (QApplication, QButtonGroup, QCheckBox, QComboBox, QFileDialog, QGridLayout, QGroupBox, QHBoxLayout, QLabel, QLineEdit, QMessageBox, QPushButton, QRadioButton, QScrollArea, diff --git a/activity_browser/layouts/tabs/LCA_setup.py b/activity_browser/layouts/tabs/LCA_setup.py index 314fa8c73..e541eb839 100644 --- a/activity_browser/layouts/tabs/LCA_setup.py +++ b/activity_browser/layouts/tabs/LCA_setup.py @@ -2,8 +2,8 @@ from logging import getLogger import pandas as pd -from PySide2 import QtWidgets -from PySide2.QtCore import Qt, Slot +from PySide6 import QtWidgets +from PySide6.QtCore import Qt, Slot from activity_browser import actions, signals from activity_browser.mod import bw2data as bd diff --git a/activity_browser/layouts/tabs/activity.py b/activity_browser/layouts/tabs/activity.py index 4c328668e..c568568c4 100644 --- a/activity_browser/layouts/tabs/activity.py +++ b/activity_browser/layouts/tabs/activity.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- from peewee import DoesNotExist -from PySide2 import QtCore, QtWidgets -from PySide2.QtCore import Slot +from PySide6 import QtCore, QtWidgets +from PySide6.QtCore import Slot from activity_browser import ab_settings, project_settings, signals from activity_browser.bwutils import commontasks as bc diff --git a/activity_browser/layouts/tabs/base.py b/activity_browser/layouts/tabs/base.py index cd3d8e5c1..7f60ef08a 100644 --- a/activity_browser/layouts/tabs/base.py +++ b/activity_browser/layouts/tabs/base.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -from PySide2.QtCore import Slot -from PySide2.QtWidgets import QMessageBox, QWidget +from PySide6.QtCore import Slot +from PySide6.QtWidgets import QMessageBox, QWidget class BaseRightTab(QWidget): diff --git a/activity_browser/layouts/tabs/history.py b/activity_browser/layouts/tabs/history.py index b86ff0d37..e3d2fe301 100644 --- a/activity_browser/layouts/tabs/history.py +++ b/activity_browser/layouts/tabs/history.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -from PySide2 import QtCore, QtWidgets +from PySide6 import QtCore, QtWidgets from ...ui.style import header, horizontal_line from ...ui.tables import ActivitiesHistoryTable diff --git a/activity_browser/layouts/tabs/impact_categories.py b/activity_browser/layouts/tabs/impact_categories.py index 7270cec29..06d6cc1f8 100644 --- a/activity_browser/layouts/tabs/impact_categories.py +++ b/activity_browser/layouts/tabs/impact_categories.py @@ -1,4 +1,4 @@ -from PySide2 import QtCore, QtWidgets +from PySide6 import QtCore, QtWidgets from activity_browser import signals from activity_browser.mod import bw2data as bd diff --git a/activity_browser/layouts/tabs/parameters.py b/activity_browser/layouts/tabs/parameters.py index 79b1f38a6..9124a51e2 100644 --- a/activity_browser/layouts/tabs/parameters.py +++ b/activity_browser/layouts/tabs/parameters.py @@ -2,8 +2,8 @@ from pathlib import Path import pandas as pd -from PySide2.QtCore import QSize, Qt, Slot -from PySide2.QtWidgets import (QAbstractButton, QCheckBox, QFileDialog, +from PySide6.QtCore import QSize, Qt, Slot +from PySide6.QtWidgets import (QAbstractButton, QCheckBox, QFileDialog, QHBoxLayout, QMessageBox, QPushButton, QSplitter, QStyle, QTabWidget, QToolBar, QVBoxLayout, QWidget) diff --git a/activity_browser/layouts/tabs/project_manager.py b/activity_browser/layouts/tabs/project_manager.py index 524518afe..a32d1eec4 100644 --- a/activity_browser/layouts/tabs/project_manager.py +++ b/activity_browser/layouts/tabs/project_manager.py @@ -1,4 +1,4 @@ -from PySide2 import QtCore, QtWidgets +from PySide6 import QtCore, QtWidgets from activity_browser import actions, signals from activity_browser.mod import bw2data as bd diff --git a/activity_browser/settings.py b/activity_browser/settings.py index b6aa61c16..69c5efcd9 100644 --- a/activity_browser/settings.py +++ b/activity_browser/settings.py @@ -7,7 +7,7 @@ from logging import getLogger import appdirs -from PySide2.QtWidgets import QMessageBox +from PySide6.QtWidgets import QMessageBox from activity_browser.signals import signals from activity_browser.mod import bw2data as bd diff --git a/activity_browser/signals.py b/activity_browser/signals.py index c2b18e102..45059537a 100644 --- a/activity_browser/signals.py +++ b/activity_browser/signals.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- from bw2data import Method, get_activity from bw2data.parameters import ParameterBase -from PySide2.QtCore import QObject, Qt, QThread, Signal, SignalInstance +from PySide6.QtCore import QObject, Qt, QThread, Signal, SignalInstance from .application import application diff --git a/activity_browser/ui/figures.py b/activity_browser/ui/figures.py index 4d65b9bf0..bfdc9e1bf 100644 --- a/activity_browser/ui/figures.py +++ b/activity_browser/ui/figures.py @@ -8,7 +8,7 @@ import seaborn as sns from matplotlib.backends.backend_qt5agg import FigureCanvasQTAgg from matplotlib.figure import Figure -from PySide2 import QtWidgets +from PySide6 import QtWidgets from activity_browser.mod.bw2data import methods from activity_browser.utils import savefilepath diff --git a/activity_browser/ui/icons.py b/activity_browser/ui/icons.py index fb8e3916e..f70d4ebb5 100644 --- a/activity_browser/ui/icons.py +++ b/activity_browser/ui/icons.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- from pathlib import Path -from PySide2.QtGui import QIcon +from PySide6.QtGui import QIcon PACKAGE_DIR = Path(__file__).resolve().parents[1] diff --git a/activity_browser/ui/menu_bar.py b/activity_browser/ui/menu_bar.py index bda2dbcb5..24abca99f 100644 --- a/activity_browser/ui/menu_bar.py +++ b/activity_browser/ui/menu_bar.py @@ -1,8 +1,8 @@ import os from importlib.metadata import version -from PySide2 import QtGui, QtWidgets -from PySide2.QtCore import QSize, QUrl, Slot +from PySide6 import QtGui, QtWidgets +from PySide6.QtCore import QSize, QUrl, Slot from activity_browser import actions, signals, application, info from activity_browser.mod import bw2data as bd @@ -210,7 +210,7 @@ def populate(self): name = proj.name if not bw_25 or AB_BW25 else "[BW25] " + proj.name # create the action and disable it if it's BW25 and BW25 is not supported - action = QtWidgets.QAction(name, self) + action = QtGui.QAction(name, self) action.setEnabled(not bw_25 or AB_BW25) self.addAction(action) diff --git a/activity_browser/ui/statusbar.py b/activity_browser/ui/statusbar.py index 31f4d56d8..4e2f063b7 100644 --- a/activity_browser/ui/statusbar.py +++ b/activity_browser/ui/statusbar.py @@ -1,7 +1,7 @@ from logging import getLogger -from PySide2.QtCore import Slot -from PySide2.QtWidgets import QLabel, QStatusBar +from PySide6.QtCore import Slot +from PySide6.QtWidgets import QLabel, QStatusBar from activity_browser import signals from activity_browser.mod import bw2data as bd diff --git a/activity_browser/ui/style.py b/activity_browser/ui/style.py index 07b97405b..434c8d0cb 100644 --- a/activity_browser/ui/style.py +++ b/activity_browser/ui/style.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -from PySide2 import QtGui, QtWidgets +from PySide6 import QtGui, QtWidgets from activity_browser import ab_settings default_font = QtGui.QFont("Arial", 8) diff --git a/activity_browser/ui/tables/LCA_setup.py b/activity_browser/ui/tables/LCA_setup.py index 97d55b2d4..70de4ead5 100644 --- a/activity_browser/ui/tables/LCA_setup.py +++ b/activity_browser/ui/tables/LCA_setup.py @@ -1,7 +1,7 @@ from logging import getLogger -from PySide2 import QtWidgets -from PySide2.QtCore import Qt, Slot +from PySide6 import QtWidgets +from PySide6.QtCore import Qt, Slot from activity_browser import signals, actions from activity_browser.mod.bw2data import calculation_setups @@ -20,7 +20,7 @@ class CSList(QtWidgets.QComboBox): def __init__(self, parent=None): super(CSList, self).__init__(parent) # Runs even if selection doesn't change - self.activated["QString"].connect(self.set_cs) + self.activated[int].connect(self.set_cs) signals.calculation_setup_selected.connect(self.sync) def sync(self, name): diff --git a/activity_browser/ui/tables/activity.py b/activity_browser/ui/tables/activity.py index f41dcf616..6e7415a8e 100644 --- a/activity_browser/ui/tables/activity.py +++ b/activity_browser/ui/tables/activity.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- from typing import List -from PySide2 import QtWidgets -from PySide2.QtCore import Slot +from PySide6 import QtWidgets +from PySide6.QtCore import Slot from activity_browser import actions diff --git a/activity_browser/ui/tables/delegates/checkbox.py b/activity_browser/ui/tables/delegates/checkbox.py index 30559ee6e..2268bca7b 100644 --- a/activity_browser/ui/tables/delegates/checkbox.py +++ b/activity_browser/ui/tables/delegates/checkbox.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -from PySide2 import QtCore, QtWidgets +from PySide6 import QtCore, QtWidgets class CheckboxDelegate(QtWidgets.QStyledItemDelegate): @@ -17,7 +17,7 @@ def paint(self, painter, option, index): https://stackoverflow.com/q/15235273 NOTE: PyQt 5.9.2 needs to treat OSX different from others. - PySide2 5.13.1 and higher no longer has this issue. + PySide6 5.13.1 and higher no longer has this issue. """ painter.save() value = bool(index.data(QtCore.Qt.DisplayRole)) diff --git a/activity_browser/ui/tables/delegates/database.py b/activity_browser/ui/tables/delegates/database.py index 2bd6a7b4c..84fed9688 100644 --- a/activity_browser/ui/tables/delegates/database.py +++ b/activity_browser/ui/tables/delegates/database.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- from bw2data import databases -from PySide2 import QtCore, QtWidgets +from PySide6 import QtCore, QtWidgets class DatabaseDelegate(QtWidgets.QStyledItemDelegate): diff --git a/activity_browser/ui/tables/delegates/float.py b/activity_browser/ui/tables/delegates/float.py index 16f410c7a..4221e3854 100644 --- a/activity_browser/ui/tables/delegates/float.py +++ b/activity_browser/ui/tables/delegates/float.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- import math -from PySide2 import QtCore, QtGui, QtWidgets +from PySide6 import QtCore, QtGui, QtWidgets class FloatDelegate(QtWidgets.QStyledItemDelegate): diff --git a/activity_browser/ui/tables/delegates/formula.py b/activity_browser/ui/tables/delegates/formula.py index cc036fc7b..177c4a5c5 100644 --- a/activity_browser/ui/tables/delegates/formula.py +++ b/activity_browser/ui/tables/delegates/formula.py @@ -2,8 +2,8 @@ from os import devnull from asteval import Interpreter -from PySide2 import QtCore, QtGui, QtWidgets -from PySide2.QtCore import Signal, Slot +from PySide6 import QtCore, QtGui, QtWidgets +from PySide6.QtCore import Signal, Slot from activity_browser import actions, signals diff --git a/activity_browser/ui/tables/delegates/list.py b/activity_browser/ui/tables/delegates/list.py index 0dcdc41cf..664fcde3b 100644 --- a/activity_browser/ui/tables/delegates/list.py +++ b/activity_browser/ui/tables/delegates/list.py @@ -2,7 +2,7 @@ from itertools import zip_longest from typing import List -from PySide2 import QtCore, QtGui, QtWidgets +from PySide6 import QtCore, QtGui, QtWidgets class OrderedListInputDialog(QtWidgets.QDialog): diff --git a/activity_browser/ui/tables/delegates/string.py b/activity_browser/ui/tables/delegates/string.py index afec04dc5..252d5c762 100644 --- a/activity_browser/ui/tables/delegates/string.py +++ b/activity_browser/ui/tables/delegates/string.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -from PySide2 import QtCore, QtWidgets +from PySide6 import QtCore, QtWidgets class StringDelegate(QtWidgets.QStyledItemDelegate): diff --git a/activity_browser/ui/tables/delegates/uncertainty.py b/activity_browser/ui/tables/delegates/uncertainty.py index a6e203ec9..d44b34aa2 100644 --- a/activity_browser/ui/tables/delegates/uncertainty.py +++ b/activity_browser/ui/tables/delegates/uncertainty.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -from PySide2 import QtCore, QtWidgets +from PySide6 import QtCore, QtWidgets from stats_arrays import uncertainty_choices as uc from ....signals import signals diff --git a/activity_browser/ui/tables/delegates/viewonly.py b/activity_browser/ui/tables/delegates/viewonly.py index 4efd2d571..fe516ba04 100644 --- a/activity_browser/ui/tables/delegates/viewonly.py +++ b/activity_browser/ui/tables/delegates/viewonly.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- import math -from PySide2.QtWidgets import QStyledItemDelegate +from PySide6.QtWidgets import QStyledItemDelegate from .float import FloatDelegate from .uncertainty import UncertaintyDelegate diff --git a/activity_browser/ui/tables/history.py b/activity_browser/ui/tables/history.py index 9534fe524..58ad19b66 100644 --- a/activity_browser/ui/tables/history.py +++ b/activity_browser/ui/tables/history.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -from PySide2.QtCore import Slot -from PySide2.QtWidgets import QAbstractItemView, QMenu +from PySide6.QtCore import Slot +from PySide6.QtWidgets import QAbstractItemView, QMenu from ..icons import qicons from .models import ActivitiesHistoryModel diff --git a/activity_browser/ui/tables/impact_categories.py b/activity_browser/ui/tables/impact_categories.py index b532c952a..825e10053 100644 --- a/activity_browser/ui/tables/impact_categories.py +++ b/activity_browser/ui/tables/impact_categories.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- from typing import Iterable -from PySide2 import QtWidgets -from PySide2.QtCore import QModelIndex, Slot, Qt +from PySide6 import QtWidgets +from PySide6.QtCore import QModelIndex, Slot, Qt from activity_browser import actions from activity_browser.mod.bw2data import methods diff --git a/activity_browser/ui/tables/inventory.py b/activity_browser/ui/tables/inventory.py index c589ddf66..2c8187556 100644 --- a/activity_browser/ui/tables/inventory.py +++ b/activity_browser/ui/tables/inventory.py @@ -1,7 +1,7 @@ from typing import List, Iterable -from PySide2 import QtCore, QtWidgets -from PySide2.QtCore import Slot +from PySide6 import QtCore, QtWidgets, QtGui +from PySide6.QtCore import Slot from activity_browser import actions @@ -104,7 +104,7 @@ def __init__(self, parent=None): self.model = ActivitiesBiosphereListModel(parent=self) self.setDragEnabled(True) self.setDragDropMode(QtWidgets.QTableView.DragOnly) - self.setSelectionBehavior(self.SelectRows) + self.setSelectionBehavior(QtWidgets.QAbstractItemView.SelectRows) # context-menu items self.open_activity_action = actions.ActivityOpen.get_QAction(self.selected_keys) @@ -129,7 +129,7 @@ def __init__(self, parent=None): self.dup_other_db_action = actions.ActivityDuplicateToDB.get_QAction( self.selected_keys ) - self.copy_exchanges_for_SDF_action = QtWidgets.QAction( + self.copy_exchanges_for_SDF_action = QtGui.QAction( qicons.superstructure, "Exchanges for scenario difference file", None ) self.connect_signals() @@ -316,7 +316,7 @@ def __init__(self, parent=None, database_name=None): self.dup_other_db_action = actions.ActivityDuplicateToDB.get_QAction( self.selected_keys ) - self.copy_exchanges_for_SDF_action = QtWidgets.QAction( + self.copy_exchanges_for_SDF_action = QtGui.QAction( qicons.superstructure, "Exchanges for scenario difference file", None ) diff --git a/activity_browser/ui/tables/models/activity.py b/activity_browser/ui/tables/models/activity.py index 04c257b02..f131e0c2f 100644 --- a/activity_browser/ui/tables/models/activity.py +++ b/activity_browser/ui/tables/models/activity.py @@ -9,7 +9,7 @@ ProjectParameter) from bw2data.proxies import ExchangeProxyBase from peewee import DoesNotExist -from PySide2.QtCore import QModelIndex, Qt, Slot +from PySide6.QtCore import QModelIndex, Qt, Slot from activity_browser import actions, signals from activity_browser.bwutils import PedigreeMatrix diff --git a/activity_browser/ui/tables/models/base.py b/activity_browser/ui/tables/models/base.py index fb9db1bb5..5a09de58c 100644 --- a/activity_browser/ui/tables/models/base.py +++ b/activity_browser/ui/tables/models/base.py @@ -6,9 +6,9 @@ import arrow import numpy as np import pandas as pd -from PySide2.QtCore import (QAbstractItemModel, QAbstractTableModel, +from PySide6.QtCore import (QAbstractItemModel, QAbstractTableModel, QModelIndex, QSortFilterProxyModel, Qt, Signal) -from PySide2.QtGui import QBrush +from PySide6.QtGui import QBrush from activity_browser.bwutils import commontasks as bc from activity_browser.ui.style import style_item diff --git a/activity_browser/ui/tables/models/history.py b/activity_browser/ui/tables/models/history.py index af7e37370..093db6ad7 100644 --- a/activity_browser/ui/tables/models/history.py +++ b/activity_browser/ui/tables/models/history.py @@ -1,5 +1,5 @@ import pandas as pd -from PySide2.QtCore import QModelIndex, Slot +from PySide6.QtCore import QModelIndex, Slot from activity_browser import signals from activity_browser.bwutils import commontasks as bc diff --git a/activity_browser/ui/tables/models/impact_categories.py b/activity_browser/ui/tables/models/impact_categories.py index 0753303fc..9165f514c 100644 --- a/activity_browser/ui/tables/models/impact_categories.py +++ b/activity_browser/ui/tables/models/impact_categories.py @@ -4,7 +4,7 @@ import numpy as np import pandas as pd -from PySide2.QtCore import QModelIndex, Qt, Slot +from PySide6.QtCore import QModelIndex, Qt, Slot from activity_browser import signals from activity_browser.mod import bw2data as bd diff --git a/activity_browser/ui/tables/models/inventory.py b/activity_browser/ui/tables/models/inventory.py index 6624ee7ff..12d642122 100644 --- a/activity_browser/ui/tables/models/inventory.py +++ b/activity_browser/ui/tables/models/inventory.py @@ -9,8 +9,8 @@ import numpy as np import pandas as pd -from PySide2.QtCore import QModelIndex, Qt, Slot -from PySide2.QtWidgets import QApplication +from PySide6.QtCore import QModelIndex, Qt, Slot +from PySide6.QtWidgets import QApplication import activity_browser from activity_browser import project_settings diff --git a/activity_browser/ui/tables/models/lca_setup.py b/activity_browser/ui/tables/models/lca_setup.py index 90f089f45..26962e9f2 100644 --- a/activity_browser/ui/tables/models/lca_setup.py +++ b/activity_browser/ui/tables/models/lca_setup.py @@ -3,8 +3,8 @@ import numpy as np import pandas as pd -from PySide2 import QtWidgets -from PySide2.QtCore import QModelIndex, Qt, Slot +from PySide6 import QtWidgets +from PySide6.QtCore import QModelIndex, Qt, Slot from activity_browser import signals, application from activity_browser.bwutils import commontasks as bc diff --git a/activity_browser/ui/tables/models/parameters.py b/activity_browser/ui/tables/models/parameters.py index 41b3ed3cf..28ad595fb 100644 --- a/activity_browser/ui/tables/models/parameters.py +++ b/activity_browser/ui/tables/models/parameters.py @@ -6,8 +6,8 @@ import pandas as pd from asteval import Interpreter from peewee import DoesNotExist -from PySide2 import QtWidgets -from PySide2.QtCore import QModelIndex, Slot +from PySide6 import QtWidgets +from PySide6.QtCore import QModelIndex, Slot from activity_browser import actions, application from activity_browser.mod import bw2data as bd diff --git a/activity_browser/ui/tables/models/plugins.py b/activity_browser/ui/tables/models/plugins.py index 67deed6b7..2d5df82da 100644 --- a/activity_browser/ui/tables/models/plugins.py +++ b/activity_browser/ui/tables/models/plugins.py @@ -2,7 +2,7 @@ from importlib import metadata import pandas as pd -from PySide2.QtCore import QModelIndex +from PySide6.QtCore import QModelIndex from activity_browser.settings import ab_settings, project_settings from activity_browser.signals import qparameters, qprojects diff --git a/activity_browser/ui/tables/models/scenarios.py b/activity_browser/ui/tables/models/scenarios.py index b68bac909..66145ea2e 100644 --- a/activity_browser/ui/tables/models/scenarios.py +++ b/activity_browser/ui/tables/models/scenarios.py @@ -3,7 +3,7 @@ import numpy as np import pandas as pd -from PySide2.QtCore import Slot +from PySide6.QtCore import Slot from activity_browser.bwutils.utils import Parameters from activity_browser.mod.bw2data import parameters, projects diff --git a/activity_browser/ui/tables/parameters.py b/activity_browser/ui/tables/parameters.py index 85f604c85..b86f28c50 100644 --- a/activity_browser/ui/tables/parameters.py +++ b/activity_browser/ui/tables/parameters.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- from asteval import Interpreter -from PySide2.QtCore import Slot -from PySide2.QtGui import QContextMenuEvent, QDragMoveEvent, QDropEvent -from PySide2.QtWidgets import QAction, QMenu, QMessageBox +from PySide6.QtCore import Slot +from PySide6.QtGui import QAction, QContextMenuEvent, QDragMoveEvent, QDropEvent +from PySide6.QtWidgets import QMenu, QMessageBox from activity_browser import actions, project_settings, signals diff --git a/activity_browser/ui/tables/plugins.py b/activity_browser/ui/tables/plugins.py index 925a43358..af59d3480 100644 --- a/activity_browser/ui/tables/plugins.py +++ b/activity_browser/ui/tables/plugins.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- import pandas -from PySide2 import QtCore, QtWidgets -from PySide2.QtWidgets import QMessageBox +from PySide6 import QtCore, QtWidgets +from PySide6.QtWidgets import QMessageBox from ...signals import signals from .delegates import CheckboxDelegate diff --git a/activity_browser/ui/tables/projects.py b/activity_browser/ui/tables/projects.py index e6473576c..8b0af9aad 100644 --- a/activity_browser/ui/tables/projects.py +++ b/activity_browser/ui/tables/projects.py @@ -1,7 +1,7 @@ import os -from PySide2.QtCore import Qt -from PySide2.QtWidgets import QComboBox, QSizePolicy +from PySide6.QtCore import Qt +from PySide6.QtWidgets import QComboBox, QSizePolicy from activity_browser import actions from activity_browser.mod import bw2data as bd diff --git a/activity_browser/ui/tables/scenarios.py b/activity_browser/ui/tables/scenarios.py index 12021148e..fa136c37d 100644 --- a/activity_browser/ui/tables/scenarios.py +++ b/activity_browser/ui/tables/scenarios.py @@ -1,6 +1,6 @@ from typing import Iterable, Tuple -from PySide2.QtCore import Slot +from PySide6.QtCore import Slot from activity_browser.mod import bw2data as bd diff --git a/activity_browser/ui/tables/views.py b/activity_browser/ui/tables/views.py index 363d43127..7b0358a71 100644 --- a/activity_browser/ui/tables/views.py +++ b/activity_browser/ui/tables/views.py @@ -2,9 +2,9 @@ from typing import Optional from logging import getLogger -from PySide2 import QtGui, QtWidgets -from PySide2.QtCore import QPoint, QRect, QSize, Qt, QTimer, Signal, Slot -from PySide2.QtWidgets import QApplication, QSizePolicy, QTableView +from PySide6 import QtGui, QtWidgets +from PySide6.QtCore import QPoint, QRect, QSize, Qt, QTimer, Signal, Slot +from PySide6.QtWidgets import QApplication, QSizePolicy, QTableView from activity_browser import ab_settings from activity_browser.mod import bw2data as bd @@ -250,7 +250,7 @@ def header_context_menu(self) -> None: mf_menu.setTitle("More filters") filter_actions = [] for i, f in enumerate(self.FILTER_TYPES[col_type]): - fa = QtWidgets.QAction(text=f) + fa = QtGui.QAction(text=f) fa.setToolTip(self.FILTER_TYPES[col_type + "_tt"][i]) fa.triggered.connect(self.simple_filter_dialog) filter_actions.append(fa) @@ -258,12 +258,12 @@ def header_context_menu(self) -> None: mf_menu.addAction(fa) menu.addMenu(mf_menu) # edit filters main menu - filter_man = QtWidgets.QAction(qicons.edit, "Manage filters") + filter_man = QtGui.QAction(qicons.edit, "Manage filters") filter_man.triggered.connect(self.filter_manager_dialog) filter_man.setToolTip("Open the filter management menu") menu.addAction(filter_man) # delete column filters option - col_del = QtWidgets.QAction(qicons.delete, "Remove column filters") + col_del = QtGui.QAction(qicons.delete, "Remove column filters") col_del.triggered.connect(self.reset_column_filters) col_del.setToolTip("Remove all filters on this column") menu.addAction(col_del) @@ -273,7 +273,7 @@ def header_context_menu(self) -> None: ): col_del.setEnabled(True) # delete all filters option - all_del = QtWidgets.QAction(qicons.delete, "Remove all filters") + all_del = QtGui.QAction(qicons.delete, "Remove all filters") all_del.triggered.connect(self.reset_filters) all_del.setToolTip("Remove all filters in this table") menu.addAction(all_del) @@ -286,7 +286,7 @@ def header_context_menu(self) -> None: self.selected_column, False ): menu.addSeparator() - active_filters_label = QtWidgets.QAction( + active_filters_label = QtGui.QAction( qicons.filter, "Active column filters:" ) active_filters_label.setEnabled(False) @@ -298,7 +298,7 @@ def header_context_menu(self) -> None: else: q = filter_data[1] filter_str = ": ".join([filter_data[0], q]) - f = QtWidgets.QAction(text=filter_str) + f = QtGui.QAction(text=filter_str) f.setEnabled(False) active_filters.append(f) for f in active_filters: diff --git a/activity_browser/ui/threading.py b/activity_browser/ui/threading.py index 191bc1876..925f229b5 100644 --- a/activity_browser/ui/threading.py +++ b/activity_browser/ui/threading.py @@ -5,7 +5,7 @@ from activity_browser.mod import bw2data as bd from activity_browser.logger import exception_hook -from PySide2.QtCore import QThread, SignalInstance, Signal +from PySide6.QtCore import QThread, SignalInstance, Signal class ABThread(QThread): diff --git a/activity_browser/ui/web/base.py b/activity_browser/ui/web/base.py index 9d1ca6c70..18379cd75 100644 --- a/activity_browser/ui/web/base.py +++ b/activity_browser/ui/web/base.py @@ -5,8 +5,8 @@ from typing import Type from logging import getLogger -from PySide2 import QtWebChannel, QtWebEngineWidgets, QtWidgets -from PySide2.QtCore import QObject, Qt, QUrl, Signal, Slot +from PySide6 import QtWebChannel, QtWebEngineWidgets, QtWidgets +from PySide6.QtCore import QObject, Qt, QUrl, Signal, Slot from activity_browser import ab_settings, signals from activity_browser.mod import bw2data as bd diff --git a/activity_browser/ui/web/navigator.py b/activity_browser/ui/web/navigator.py index 05417758e..f695d5921 100644 --- a/activity_browser/ui/web/navigator.py +++ b/activity_browser/ui/web/navigator.py @@ -6,8 +6,8 @@ from logging import getLogger import networkx as nx -from PySide2 import QtWidgets -from PySide2.QtCore import Slot +from PySide6 import QtWidgets +from PySide6.QtCore import Slot from activity_browser import signals from activity_browser.mod.bw2data import Database, get_activity diff --git a/activity_browser/ui/web/sankey_navigator.py b/activity_browser/ui/web/sankey_navigator.py index e637ed3cc..be9764f5b 100644 --- a/activity_browser/ui/web/sankey_navigator.py +++ b/activity_browser/ui/web/sankey_navigator.py @@ -6,9 +6,9 @@ from logging import getLogger import bw2calc as bc -from PySide2 import QtWidgets -from PySide2.QtCore import Slot -from PySide2.QtWidgets import QComboBox +from PySide6 import QtWidgets +from PySide6.QtCore import Slot +from PySide6.QtWidgets import QComboBox from activity_browser import signals from activity_browser.mod import bw2data as bd diff --git a/activity_browser/ui/web/webutils.py b/activity_browser/ui/web/webutils.py index 072d4d040..ff65926bd 100644 --- a/activity_browser/ui/web/webutils.py +++ b/activity_browser/ui/web/webutils.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- import os -from PySide2 import QtCore, QtGui, QtWebEngineWidgets, QtWidgets +from PySide6 import QtCore, QtGui, QtWebEngineWidgets, QtWidgets, QtWebEngineCore # type "localhost:3999" in Chrome for DevTools of AB web content from activity_browser.utils import get_base_path @@ -9,7 +9,7 @@ os.environ["QTWEBENGINE_REMOTE_DEBUGGING"] = "3999" -class RestrictedQWebEnginePage(QtWebEngineWidgets.QWebEnginePage): +class RestrictedQWebEnginePage(QtWebEngineCore.QWebEnginePage): """Filters links so that users cannot just navigate to any page on the web, but just to those pages, that are listed in allowed_pages. This is achieved by re-implementing acceptNavigationRequest. diff --git a/activity_browser/ui/widgets/activity.py b/activity_browser/ui/widgets/activity.py index b501795ba..2e7175156 100644 --- a/activity_browser/ui/widgets/activity.py +++ b/activity_browser/ui/widgets/activity.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -from PySide2 import QtCore, QtWidgets +from PySide6 import QtCore, QtWidgets from activity_browser import actions, project_settings, signals diff --git a/activity_browser/ui/widgets/biosphere_update.py b/activity_browser/ui/widgets/biosphere_update.py index e5b885f39..6ab9e3e16 100644 --- a/activity_browser/ui/widgets/biosphere_update.py +++ b/activity_browser/ui/widgets/biosphere_update.py @@ -1,8 +1,8 @@ from logging import getLogger import bw2io.data as data -from PySide2 import QtWidgets -from PySide2.QtCore import Signal, Slot +from PySide6 import QtWidgets +from PySide6.QtCore import Signal, Slot from activity_browser.mod import bw2data as bd diff --git a/activity_browser/ui/widgets/comparison_switch.py b/activity_browser/ui/widgets/comparison_switch.py index 76193243d..54d42ab56 100644 --- a/activity_browser/ui/widgets/comparison_switch.py +++ b/activity_browser/ui/widgets/comparison_switch.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- from collections import namedtuple -from PySide2 import QtWidgets +from PySide6 import QtWidgets Switches = namedtuple("switches", ("func", "method", "scenario")) diff --git a/activity_browser/ui/widgets/cutoff_menu.py b/activity_browser/ui/widgets/cutoff_menu.py index bf1f45f60..a700253f4 100644 --- a/activity_browser/ui/widgets/cutoff_menu.py +++ b/activity_browser/ui/widgets/cutoff_menu.py @@ -10,10 +10,10 @@ from typing import Union import numpy as np -from PySide2 import QtCore -from PySide2.QtCore import QLocale, Qt, Signal, Slot -from PySide2.QtGui import QDoubleValidator, QIntValidator -from PySide2.QtWidgets import (QButtonGroup, QHBoxLayout, QLabel, QLineEdit, +from PySide6 import QtCore +from PySide6.QtCore import QLocale, Qt, Signal, Slot +from PySide6.QtGui import QDoubleValidator, QIntValidator +from PySide6.QtWidgets import (QButtonGroup, QHBoxLayout, QLabel, QLineEdit, QPushButton, QRadioButton, QSlider, QVBoxLayout, QWidget) diff --git a/activity_browser/ui/widgets/dialog.py b/activity_browser/ui/widgets/dialog.py index 95eab30e0..ebf374e12 100644 --- a/activity_browser/ui/widgets/dialog.py +++ b/activity_browser/ui/widgets/dialog.py @@ -2,8 +2,8 @@ from typing import List, Tuple import bw2io as bi -from PySide2 import QtGui, QtWidgets -from PySide2.QtCore import Qt, Signal, Slot +from PySide6 import QtGui, QtWidgets +from PySide6.QtCore import Qt, Signal, Slot from activity_browser import project_settings, signals from activity_browser.bwutils.superstructure import get_sheet_names diff --git a/activity_browser/ui/widgets/line_edit.py b/activity_browser/ui/widgets/line_edit.py index 0756cd0ef..2caef4d9e 100644 --- a/activity_browser/ui/widgets/line_edit.py +++ b/activity_browser/ui/widgets/line_edit.py @@ -1,6 +1,6 @@ -from PySide2 import QtWidgets -from PySide2.QtCore import Slot -from PySide2.QtGui import QTextFormat +from PySide6 import QtWidgets +from PySide6.QtCore import Slot +from PySide6.QtGui import QTextFormat from activity_browser import actions diff --git a/activity_browser/ui/widgets/message.py b/activity_browser/ui/widgets/message.py index f53c45f5d..1d57cc965 100644 --- a/activity_browser/ui/widgets/message.py +++ b/activity_browser/ui/widgets/message.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -from PySide2.QtCore import Qt -from PySide2.QtWidgets import QMessageBox +from PySide6.QtCore import Qt +from PySide6.QtWidgets import QMessageBox def parameter_save_errorbox(parent, error) -> int: diff --git a/activity_browser/ui/wizards/db_export_wizard.py b/activity_browser/ui/wizards/db_export_wizard.py index 07e4d3322..05d24aef6 100644 --- a/activity_browser/ui/wizards/db_export_wizard.py +++ b/activity_browser/ui/wizards/db_export_wizard.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- import os -from PySide2 import QtWidgets -from PySide2.QtCore import Slot +from PySide6 import QtWidgets +from PySide6.QtCore import Slot from activity_browser.bwutils import exporters as exp from activity_browser.mod import bw2data as bd diff --git a/activity_browser/ui/wizards/db_import_wizard.py b/activity_browser/ui/wizards/db_import_wizard.py index 8072d7c0f..bc6fa944b 100644 --- a/activity_browser/ui/wizards/db_import_wizard.py +++ b/activity_browser/ui/wizards/db_import_wizard.py @@ -14,8 +14,8 @@ import requests from bw2io import BW2Package, SingleOutputEcospold2Importer from bw2io.extractors import Ecospold2DataExtractor -from PySide2 import QtCore, QtWidgets -from PySide2.QtCore import Signal, Slot +from PySide6 import QtCore, QtWidgets +from PySide6.QtCore import Signal, Slot from py7zr import py7zr from activity_browser.bwutils import errors diff --git a/activity_browser/ui/wizards/plugins_manager_wizard.py b/activity_browser/ui/wizards/plugins_manager_wizard.py index 08788c21e..5e477293f 100644 --- a/activity_browser/ui/wizards/plugins_manager_wizard.py +++ b/activity_browser/ui/wizards/plugins_manager_wizard.py @@ -1,6 +1,6 @@ import pandas -from PySide2 import QtCore, QtWidgets -from PySide2.QtCore import Qt, Slot +from PySide6 import QtCore, QtWidgets +from PySide6.QtCore import Qt, Slot from ...signals import signals from ...ui.style import header diff --git a/activity_browser/ui/wizards/project_setup_wizard.py b/activity_browser/ui/wizards/project_setup_wizard.py index a572f54b1..28ef583bf 100644 --- a/activity_browser/ui/wizards/project_setup_wizard.py +++ b/activity_browser/ui/wizards/project_setup_wizard.py @@ -1,6 +1,6 @@ import ecoinvent_interface as ei import requests -from PySide2 import QtWidgets, QtCore +from PySide6 import QtWidgets, QtCore from activity_browser.ui.threading import ABThread from activity_browser.mod.bw2io import ab_bw2setup diff --git a/activity_browser/ui/wizards/settings_wizard.py b/activity_browser/ui/wizards/settings_wizard.py index 27a4f8ff7..de7052ddc 100644 --- a/activity_browser/ui/wizards/settings_wizard.py +++ b/activity_browser/ui/wizards/settings_wizard.py @@ -3,7 +3,7 @@ from logging import getLogger from peewee import SqliteDatabase -from PySide2 import QtCore, QtWidgets +from PySide6 import QtCore, QtWidgets from activity_browser import ab_settings from activity_browser.mod.bw2data import projects diff --git a/activity_browser/ui/wizards/uncertainty.py b/activity_browser/ui/wizards/uncertainty.py index 854dc5922..22ed2a42f 100644 --- a/activity_browser/ui/wizards/uncertainty.py +++ b/activity_browser/ui/wizards/uncertainty.py @@ -1,8 +1,8 @@ from logging import getLogger import numpy as np -from PySide2 import QtCore, QtGui, QtWidgets -from PySide2.QtCore import Signal, Slot +from PySide6 import QtCore, QtGui, QtWidgets +from PySide6.QtCore import Signal, Slot from stats_arrays import uncertainty_choices as uncertainty from stats_arrays.distributions import * diff --git a/activity_browser/utils.py b/activity_browser/utils.py index 1f930c2a1..b5cfd11c9 100644 --- a/activity_browser/utils.py +++ b/activity_browser/utils.py @@ -3,7 +3,7 @@ from typing import Iterable, Tuple import requests -from PySide2 import QtWidgets +from PySide6 import QtWidgets from activity_browser.mod import bw2data as bd diff --git a/tests/actions/test_activity_actions.py b/tests/actions/test_activity_actions.py index 2161eeeb2..9d80865a6 100644 --- a/tests/actions/test_activity_actions.py +++ b/tests/actions/test_activity_actions.py @@ -1,6 +1,6 @@ import bw2data as bd import pytest -from PySide2 import QtWidgets +from PySide6 import QtWidgets from activity_browser import actions from activity_browser.mod.bw2data import Database diff --git a/tests/actions/test_calculation_setup_actions.py b/tests/actions/test_calculation_setup_actions.py index 6ea6777d8..ebd89ed67 100644 --- a/tests/actions/test_calculation_setup_actions.py +++ b/tests/actions/test_calculation_setup_actions.py @@ -1,5 +1,5 @@ import bw2data as bd -from PySide2 import QtWidgets +from PySide6 import QtWidgets from activity_browser import actions diff --git a/tests/actions/test_database_actions.py b/tests/actions/test_database_actions.py index 7f173bbb7..f2a54b5d5 100644 --- a/tests/actions/test_database_actions.py +++ b/tests/actions/test_database_actions.py @@ -1,5 +1,5 @@ import bw2data as bd -from PySide2 import QtWidgets +from PySide6 import QtWidgets from activity_browser import actions, application from activity_browser.actions.database.database_duplicate import \ diff --git a/tests/actions/test_exchange_actions.py b/tests/actions/test_exchange_actions.py index 750c14908..b7f481fb5 100644 --- a/tests/actions/test_exchange_actions.py +++ b/tests/actions/test_exchange_actions.py @@ -2,7 +2,7 @@ import bw2data as bd import pytest -from PySide2 import QtGui +from PySide6 import QtGui from stats_arrays.distributions import NormalUncertainty, UndefinedUncertainty from activity_browser import actions, application diff --git a/tests/actions/test_method_actions.py b/tests/actions/test_method_actions.py index 35148928b..f37a8b277 100644 --- a/tests/actions/test_method_actions.py +++ b/tests/actions/test_method_actions.py @@ -1,5 +1,5 @@ import bw2data as bd -from PySide2 import QtWidgets +from PySide6 import QtWidgets from stats_arrays.distributions import (NormalUncertainty, UndefinedUncertainty, UniformUncertainty) diff --git a/tests/actions/test_parameter_actions.py b/tests/actions/test_parameter_actions.py index accfbb59a..f53779f3c 100644 --- a/tests/actions/test_parameter_actions.py +++ b/tests/actions/test_parameter_actions.py @@ -1,7 +1,7 @@ import bw2data as bd from bw2data.parameters import (ActivityParameter, DatabaseParameter, ProjectParameter) -from PySide2 import QtWidgets +from PySide6 import QtWidgets from activity_browser import actions from activity_browser.actions.parameter.parameter_new import ParameterWizard diff --git a/tests/actions/test_project_actions.py b/tests/actions/test_project_actions.py index fae34f7d7..b69cd9ea3 100644 --- a/tests/actions/test_project_actions.py +++ b/tests/actions/test_project_actions.py @@ -1,7 +1,7 @@ import os.path import bw2data as bd -from PySide2 import QtWidgets +from PySide6 import QtWidgets from activity_browser import actions, ab_settings, application from activity_browser.ui.widgets import ProjectDeletionDialog from activity_browser.actions.project.project_export import ExportThread diff --git a/tests/actions/test_various_actions.py b/tests/actions/test_various_actions.py index 31b03cf96..44ef766e3 100644 --- a/tests/actions/test_various_actions.py +++ b/tests/actions/test_various_actions.py @@ -3,7 +3,7 @@ import bw2data as bd import bw2io as bi import pytest -from PySide2 import QtWidgets +from PySide6 import QtWidgets from activity_browser import actions, application from activity_browser.mod.bw2data import Database diff --git a/tests/legacy/test_widgets.py b/tests/legacy/test_widgets.py index 2524e6174..7e874b153 100644 --- a/tests/legacy/test_widgets.py +++ b/tests/legacy/test_widgets.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -from PySide2.QtCore import Qt -from PySide2.QtWidgets import QDialogButtonBox, QMessageBox, QWidget +from PySide6.QtCore import Qt +from PySide6.QtWidgets import QDialogButtonBox, QMessageBox, QWidget from activity_browser.ui.widgets import (BiosphereUpdater, CutoffMenu, ForceInputDialog, SwitchComboBox, diff --git a/tests/wizards/test_export_wizard.py b/tests/wizards/test_export_wizard.py index 0fc61e7ef..1373d66b3 100644 --- a/tests/wizards/test_export_wizard.py +++ b/tests/wizards/test_export_wizard.py @@ -1,4 +1,4 @@ -from PySide2 import QtCore, QtWidgets +from PySide6 import QtCore, QtWidgets from activity_browser.ui.wizards.db_export_wizard import DatabaseExportWizard diff --git a/tests/wizards/test_import_wizard.py b/tests/wizards/test_import_wizard.py index 3ead27149..2e5e13c74 100644 --- a/tests/wizards/test_import_wizard.py +++ b/tests/wizards/test_import_wizard.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -from PySide2 import QtCore, QtWidgets +from PySide6 import QtCore, QtWidgets from activity_browser.ui.wizards.db_import_wizard import DatabaseImportWizard diff --git a/tests/wizards/test_uncertainty_wizard.py b/tests/wizards/test_uncertainty_wizard.py index eac97de48..8e4b14475 100644 --- a/tests/wizards/test_uncertainty_wizard.py +++ b/tests/wizards/test_uncertainty_wizard.py @@ -5,7 +5,7 @@ import numpy as np import pytest from bw2data.parameters import ProjectParameter -from PySide2.QtWidgets import QMessageBox, QWizard +from PySide6.QtWidgets import QMessageBox, QWizard from stats_arrays.distributions import (LognormalUncertainty, TriangularUncertainty, UndefinedUncertainty,