diff --git a/activity_browser/__init__.py b/activity_browser/__init__.py index 1c1cf6999..9a644d50d 100644 --- a/activity_browser/__init__.py +++ b/activity_browser/__init__.py @@ -3,8 +3,8 @@ import sys import traceback -from PySide2.QtCore import QSysInfo, __version__ as qt_version -from PySide2.QtWidgets import QApplication +from PySide6.QtCore import QSysInfo, __version__ as qt_version +from PySide6.QtWidgets import QApplication from .application import Application from .info import __version__ diff --git a/activity_browser/bwutils/calculations.py b/activity_browser/bwutils/calculations.py index d9f4c53b2..e54b2eeaa 100644 --- a/activity_browser/bwutils/calculations.py +++ b/activity_browser/bwutils/calculations.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -from PySide2.QtWidgets import QMessageBox, QApplication +from PySide6.QtWidgets import QMessageBox, QApplication from ..bwutils import ( Contributions, MonteCarloLCA, MLCA, diff --git a/activity_browser/bwutils/multilca.py b/activity_browser/bwutils/multilca.py index cb80b54af..50f136d54 100644 --- a/activity_browser/bwutils/multilca.py +++ b/activity_browser/bwutils/multilca.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- from typing import Iterable, Optional, Union -from PySide2.QtWidgets import QMessageBox, QApplication +from PySide6.QtWidgets import QMessageBox, QApplication import numpy as np import pandas as pd import brightway2 as bw diff --git a/activity_browser/bwutils/superstructure/dataframe.py b/activity_browser/bwutils/superstructure/dataframe.py index d593be4ba..5db3007d6 100644 --- a/activity_browser/bwutils/superstructure/dataframe.py +++ b/activity_browser/bwutils/superstructure/dataframe.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- from typing import List, Tuple -from PySide2.QtWidgets import QApplication, QPushButton -from PySide2.QtCore import Qt +from PySide6.QtWidgets import QApplication, QPushButton +from PySide6.QtCore import Qt import sys import ast diff --git a/activity_browser/bwutils/superstructure/file_dialogs.py b/activity_browser/bwutils/superstructure/file_dialogs.py index 70fb3d009..fd64e396c 100644 --- a/activity_browser/bwutils/superstructure/file_dialogs.py +++ b/activity_browser/bwutils/superstructure/file_dialogs.py @@ -1,4 +1,4 @@ -from PySide2 import QtWidgets, QtCore +from PySide6 import QtWidgets, QtCore import pandas as pd diff --git a/activity_browser/bwutils/superstructure/manager.py b/activity_browser/bwutils/superstructure/manager.py index f86c8344e..af22e3845 100644 --- a/activity_browser/bwutils/superstructure/manager.py +++ b/activity_browser/bwutils/superstructure/manager.py @@ -4,8 +4,8 @@ import numpy as np import pandas as pd from pandas.api.types import is_numeric_dtype -from PySide2.QtWidgets import QApplication, QPushButton -from PySide2.QtCore import Qt +from PySide6.QtWidgets import QApplication, QPushButton +from PySide6.QtCore import Qt from typing import Union, Optional import brightway2 as bw diff --git a/activity_browser/bwutils/superstructure/mlca.py b/activity_browser/bwutils/superstructure/mlca.py index a3f0937ff..d3988c29c 100644 --- a/activity_browser/bwutils/superstructure/mlca.py +++ b/activity_browser/bwutils/superstructure/mlca.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- from typing import Iterable, Optional -from PySide2.QtWidgets import QPushButton +from PySide6.QtWidgets import QPushButton from bw2calc.matrices import TechnosphereBiosphereMatrixBuilder as MB import numpy as np diff --git a/activity_browser/controllers/activity.py b/activity_browser/controllers/activity.py index eb3054060..cf41d5ba9 100644 --- a/activity_browser/controllers/activity.py +++ b/activity_browser/controllers/activity.py @@ -5,8 +5,8 @@ import brightway2 as bw import pandas as pd from bw2data.backends.peewee.proxies import Activity, ExchangeProxyBase -from PySide2.QtCore import QObject, Slot, Qt -from PySide2 import QtWidgets +from PySide6.QtCore import QObject, Slot, Qt +from PySide6 import QtWidgets from activity_browser.bwutils import AB_metadata, commontasks as bc from activity_browser.bwutils.strategies import relink_activity_exchanges diff --git a/activity_browser/controllers/database.py b/activity_browser/controllers/database.py index 9d7d1050f..1157a9121 100644 --- a/activity_browser/controllers/database.py +++ b/activity_browser/controllers/database.py @@ -2,8 +2,8 @@ import brightway2 as bw from bw2data.backends.peewee import sqlite3_lci_db from bw2data.parameters import Group -from PySide2 import QtWidgets -from PySide2.QtCore import QObject, Slot, Qt +from PySide6 import QtWidgets +from PySide6.QtCore import QObject, Slot, Qt from ..bwutils import commontasks as bc from ..bwutils.strategies import relink_exchanges_existing_db diff --git a/activity_browser/controllers/parameter.py b/activity_browser/controllers/parameter.py index aa52f5d02..188aa0469 100644 --- a/activity_browser/controllers/parameter.py +++ b/activity_browser/controllers/parameter.py @@ -3,8 +3,8 @@ import brightway2 as bw from bw2data.parameters import ActivityParameter, Group, ParameterBase -from PySide2.QtCore import QObject, Slot -from PySide2.QtWidgets import QInputDialog, QMessageBox, QErrorMessage +from PySide6.QtCore import QObject, Slot +from PySide6.QtWidgets import QInputDialog, QMessageBox, QErrorMessage from activity_browser.bwutils import commontasks as bc from activity_browser.signals import signals diff --git a/activity_browser/controllers/plugin.py b/activity_browser/controllers/plugin.py index 97fa418eb..42bd4b468 100644 --- a/activity_browser/controllers/plugin.py +++ b/activity_browser/controllers/plugin.py @@ -5,7 +5,7 @@ from pkgutil import iter_modules from shutil import rmtree -from PySide2.QtCore import QObject, Slot +from PySide6.QtCore import QObject, Slot from ..ui.wizards.plugins_manager_wizard import PluginsManagerWizard from ..signals import signals diff --git a/activity_browser/controllers/project.py b/activity_browser/controllers/project.py index 2d8e42c88..215b31606 100644 --- a/activity_browser/controllers/project.py +++ b/activity_browser/controllers/project.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- import brightway2 as bw import traceback -from PySide2.QtCore import QObject, Slot -from PySide2 import QtWidgets +from PySide6.QtCore import QObject, Slot +from PySide6 import QtWidgets from activity_browser.bwutils import commontasks as bc from activity_browser.settings import ab_settings diff --git a/activity_browser/controllers/utils.py b/activity_browser/controllers/utils.py index 3ace0d971..96c66e482 100644 --- a/activity_browser/controllers/utils.py +++ b/activity_browser/controllers/utils.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -from PySide2.QtCore import QObject, Slot +from PySide6.QtCore import QObject, Slot from activity_browser.bwutils import AB_metadata from activity_browser.signals import signals diff --git a/activity_browser/layouts/main.py b/activity_browser/layouts/main.py index 05132d9b7..791bece9f 100644 --- a/activity_browser/layouts/main.py +++ b/activity_browser/layouts/main.py @@ -4,7 +4,7 @@ import sys import shutil -from PySide2 import QtCore, QtGui, QtWidgets +from PySide6 import QtCore, QtGui, QtWidgets from ..ui.icons import qicons from ..ui.menu_bar import MenuBar diff --git a/activity_browser/layouts/panels/panel.py b/activity_browser/layouts/panels/panel.py index 6e0db7b46..d17a0d115 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 QtWidgets, QtCore +from PySide6 import QtWidgets, QtCore from ...signals import signals diff --git a/activity_browser/layouts/panels/right.py b/activity_browser/layouts/panels/right.py index 0d1279d7b..9ae2ccb03 100644 --- a/activity_browser/layouts/panels/right.py +++ b/activity_browser/layouts/panels/right.py @@ -2,7 +2,7 @@ from pathlib import Path import brightway2 as bw -from PySide2.QtWidgets import QVBoxLayout +from PySide6.QtWidgets import QVBoxLayout from .panel import ABTab from ...ui.web import GraphNavigatorWidget, RestrictedWebViewWidget diff --git a/activity_browser/layouts/tabs/LCA_results_tab.py b/activity_browser/layouts/tabs/LCA_results_tab.py index 7a484eb8a..1f25a7de9 100644 --- a/activity_browser/layouts/tabs/LCA_results_tab.py +++ b/activity_browser/layouts/tabs/LCA_results_tab.py @@ -2,8 +2,8 @@ import traceback from bw2calc.errors import BW2CalcError -from PySide2.QtCore import Qt, Slot -from PySide2.QtWidgets import QMessageBox, QVBoxLayout, QApplication +from PySide6.QtCore import Qt, Slot +from PySide6.QtWidgets import QMessageBox, QVBoxLayout, QApplication from .LCA_results_tabs import LCAResultsSubTab from ..panels import ABTab diff --git a/activity_browser/layouts/tabs/LCA_results_tabs.py b/activity_browser/layouts/tabs/LCA_results_tabs.py index 63cc3f214..550fa9f28 100644 --- a/activity_browser/layouts/tabs/LCA_results_tabs.py +++ b/activity_browser/layouts/tabs/LCA_results_tabs.py @@ -9,14 +9,14 @@ from typing import List, Optional, Union import pandas as pd -from PySide2.QtWidgets import ( +from PySide6.QtWidgets import ( QWidget, QTabWidget, QVBoxLayout, QHBoxLayout, QScrollArea, QRadioButton, QLabel, QLineEdit, QCheckBox, QPushButton, QComboBox, QTableView, QButtonGroup, QMessageBox, QGroupBox, QGridLayout, QFileDialog, QButtonGroup, QMessageBox, QGroupBox, QGridLayout, QFileDialog, QApplication, QSizePolicy, QToolBar ) -from PySide2 import QtGui, QtCore +from PySide6 import QtGui, QtCore from stats_arrays.errors import InvalidParamsError from ...bwutils import ( diff --git a/activity_browser/layouts/tabs/LCA_setup.py b/activity_browser/layouts/tabs/LCA_setup.py index 3f0fe9e84..10abbf93c 100644 --- a/activity_browser/layouts/tabs/LCA_setup.py +++ b/activity_browser/layouts/tabs/LCA_setup.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- from typing import Optional, Union -from PySide2 import QtWidgets -from PySide2.QtCore import Slot, Qt +from PySide6 import QtWidgets +from PySide6.QtCore import Slot, Qt from brightway2 import calculation_setups import pandas as pd import re diff --git a/activity_browser/layouts/tabs/activity.py b/activity_browser/layouts/tabs/activity.py index 76ec878e1..f24b34aa9 100644 --- a/activity_browser/layouts/tabs/activity.py +++ b/activity_browser/layouts/tabs/activity.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- import brightway2 as bw 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 ...ui.icons import qicons from ...ui.style import style_activity_tab diff --git a/activity_browser/layouts/tabs/base.py b/activity_browser/layouts/tabs/base.py index fb094fb2c..5db020ae7 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 abd1f340d..96530f8d9 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 horizontal_line, header from ...ui.tables import ActivitiesHistoryTable diff --git a/activity_browser/layouts/tabs/impact_categories.py b/activity_browser/layouts/tabs/impact_categories.py index 7c249b22f..12b6db6d2 100644 --- a/activity_browser/layouts/tabs/impact_categories.py +++ b/activity_browser/layouts/tabs/impact_categories.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -from PySide2 import QtCore, QtWidgets +from PySide6 import QtCore, QtWidgets from ...ui.icons import qicons from ...ui.style import header, horizontal_line diff --git a/activity_browser/layouts/tabs/parameters.py b/activity_browser/layouts/tabs/parameters.py index c89ceba10..cb185aedd 100644 --- a/activity_browser/layouts/tabs/parameters.py +++ b/activity_browser/layouts/tabs/parameters.py @@ -3,8 +3,8 @@ import brightway2 as bw import pandas as pd -from PySide2.QtCore import Slot, QSize, Qt -from PySide2.QtWidgets import ( +from PySide6.QtCore import Slot, QSize, Qt +from PySide6.QtWidgets import ( QCheckBox, QFileDialog, QHBoxLayout, QMessageBox, QPushButton, QToolBar, QStyle, QVBoxLayout, QTabWidget, QSplitter, QWidget, QAbstractButton ) diff --git a/activity_browser/layouts/tabs/project_manager.py b/activity_browser/layouts/tabs/project_manager.py index 3bdf926a0..ac6deab73 100644 --- a/activity_browser/layouts/tabs/project_manager.py +++ b/activity_browser/layouts/tabs/project_manager.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -from PySide2 import QtCore, QtWidgets +from PySide6 import QtCore, QtWidgets from ..panels import ABTab from ...ui.style import header diff --git a/activity_browser/settings.py b/activity_browser/settings.py index 89d156b88..9ef1cf532 100644 --- a/activity_browser/settings.py +++ b/activity_browser/settings.py @@ -4,7 +4,7 @@ from pathlib import Path import shutil from typing import Optional -from PySide2.QtWidgets import QMessageBox +from PySide6.QtWidgets import QMessageBox import appdirs import brightway2 as bw diff --git a/activity_browser/signals.py b/activity_browser/signals.py index db0454e75..ea3ead0fe 100644 --- a/activity_browser/signals.py +++ b/activity_browser/signals.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -from PySide2.QtCore import QObject, Signal, QModelIndex +from PySide6.QtCore import QObject, Signal, QModelIndex class Signals(QObject): diff --git a/activity_browser/ui/figures.py b/activity_browser/ui/figures.py index 98ead0ae5..e1aef9fce 100644 --- a/activity_browser/ui/figures.py +++ b/activity_browser/ui/figures.py @@ -7,7 +7,7 @@ from matplotlib.figure import Figure import numpy as np import pandas as pd -from PySide2 import QtWidgets +from PySide6 import QtWidgets import seaborn as sns from activity_browser.utils import savefilepath diff --git a/activity_browser/ui/icons.py b/activity_browser/ui/icons.py index a9355795e..ce93fd5ff 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 80b888b4f..e97ba9dac 100644 --- a/activity_browser/ui/menu_bar.py +++ b/activity_browser/ui/menu_bar.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- import brightway2 as bw -from PySide2 import QtWidgets, QtGui -from PySide2.QtCore import QSize, QUrl, Slot +from PySide6 import QtWidgets, QtGui +from PySide6.QtCore import QSize, QUrl, Slot from ..info import __version__ as ab_version from .icons import qicons @@ -18,18 +18,18 @@ def __init__(self, window): self.tools_menu = QtWidgets.QMenu('&Tools', self.window) self.help_menu = QtWidgets.QMenu('&Help', self.window) - self.update_biosphere_action = QtWidgets.QAction( + self.update_biosphere_action = QtGui.QAction( window.style().standardIcon(QtWidgets.QStyle.SP_BrowserReload), "&Update biosphere...", None ) - self.export_db_action = QtWidgets.QAction( + self.export_db_action = QtGui.QAction( self.window.style().standardIcon(QtWidgets.QStyle.SP_DriveHDIcon), "&Export database...", None ) - self.import_db_action = QtWidgets.QAction( + self.import_db_action = QtGui.QAction( qicons.import_db, '&Import database...', None ) - self.manage_plugins_action = QtWidgets.QAction( + self.manage_plugins_action = QtGui.QAction( qicons.plugin, '&Plugins...', None ) diff --git a/activity_browser/ui/statusbar.py b/activity_browser/ui/statusbar.py index e40743c78..cc335b1ca 100644 --- a/activity_browser/ui/statusbar.py +++ b/activity_browser/ui/statusbar.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -from PySide2.QtCore import Slot -from PySide2.QtWidgets import QLabel, QStatusBar +from PySide6.QtCore import Slot +from PySide6.QtWidgets import QLabel, QStatusBar import brightway2 as bw diff --git a/activity_browser/ui/style.py b/activity_browser/ui/style.py index 868025f87..0f886e369 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 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 9d2d9e55e..c97b8e4ff 100644 --- a/activity_browser/ui/tables/LCA_setup.py +++ b/activity_browser/ui/tables/LCA_setup.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- import brightway2 as bw -from PySide2.QtCore import Slot, Qt -from PySide2 import QtWidgets +from PySide6.QtCore import Slot, Qt +from PySide6 import QtWidgets from activity_browser.signals import signals from ..icons import qicons diff --git a/activity_browser/ui/tables/activity.py b/activity_browser/ui/tables/activity.py index 84d5c7945..9986933ab 100644 --- a/activity_browser/ui/tables/activity.py +++ b/activity_browser/ui/tables/activity.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -from PySide2 import QtWidgets -from PySide2.QtCore import Slot +from PySide6 import QtWidgets +from PySide6.QtCore import Slot from .delegates import * from .models import ( diff --git a/activity_browser/ui/tables/delegates/checkbox.py b/activity_browser/ui/tables/delegates/checkbox.py index 1a5a24e66..5f594a3e6 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): @@ -16,8 +16,6 @@ def paint(self, painter, option, index): https://stackoverflow.com/a/11778012 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. """ 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 f3a3624dd..5f1b23471 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 5469ac364..c4db374c9 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 3f87eeefe..b6b744337 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.signals import signals from activity_browser.ui.icons import qicons diff --git a/activity_browser/ui/tables/delegates/list.py b/activity_browser/ui/tables/delegates/list.py index 6d8b70883..b737edc7b 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 3b5163d7e..783ea166c 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 63ab866a5..7bf1459b9 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 43884db4c..021cb20c8 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 93a7c1666..eb04b3d68 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 3091cb587..cc9ec396b 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 +from PySide6 import QtWidgets +from PySide6.QtCore import QModelIndex, Slot from ...signals import signals from ..icons import qicons diff --git a/activity_browser/ui/tables/inventory.py b/activity_browser/ui/tables/inventory.py index 30c9e6359..f6e1494b9 100644 --- a/activity_browser/ui/tables/inventory.py +++ b/activity_browser/ui/tables/inventory.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -from PySide2 import QtWidgets, QtCore -from PySide2.QtCore import Slot +from PySide6 import QtWidgets, QtCore, QtGui +from PySide6.QtCore import Slot from ...settings import project_settings from ...signals import signals @@ -27,10 +27,10 @@ def __init__(self, parent=None): QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Maximum )) - self.relink_action = QtWidgets.QAction( + self.relink_action = QtGui.QAction( qicons.edit, "Relink the database", None ) - self.new_activity_action =QtWidgets.QAction( + self.new_activity_action = QtGui.QAction( qicons.add, "Add new activity", None ) self.model = DatabasesModel(parent=self) diff --git a/activity_browser/ui/tables/models/activity.py b/activity_browser/ui/tables/models/activity.py index 97a640fa9..17b10030f 100644 --- a/activity_browser/ui/tables/models/activity.py +++ b/activity_browser/ui/tables/models/activity.py @@ -8,7 +8,7 @@ from bw2data.proxies import ExchangeProxyBase import pandas as pd from peewee import DoesNotExist -from PySide2.QtCore import QModelIndex, Qt, Slot +from PySide6.QtCore import QModelIndex, Qt, Slot from activity_browser.bwutils import ( PedigreeMatrix, uncertainty as uc, commontasks as bc diff --git a/activity_browser/ui/tables/models/base.py b/activity_browser/ui/tables/models/base.py index 5f138e3c8..f03333455 100644 --- a/activity_browser/ui/tables/models/base.py +++ b/activity_browser/ui/tables/models/base.py @@ -5,10 +5,10 @@ import arrow import numpy as np import pandas as pd -from PySide2.QtCore import ( +from PySide6.QtCore import ( QAbstractItemModel, QAbstractTableModel, QModelIndex, Qt, Signal, QSortFilterProxyModel ) -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 64543d31e..04b146640 100644 --- a/activity_browser/ui/tables/models/history.py +++ b/activity_browser/ui/tables/models/history.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- import brightway2 as bw import pandas as pd -from PySide2.QtCore import Slot, QModelIndex +from PySide6.QtCore import Slot, QModelIndex from activity_browser.bwutils import commontasks as bc from activity_browser.signals import signals diff --git a/activity_browser/ui/tables/models/impact_categories.py b/activity_browser/ui/tables/models/impact_categories.py index 1209cf02a..8b09d82d2 100644 --- a/activity_browser/ui/tables/models/impact_categories.py +++ b/activity_browser/ui/tables/models/impact_categories.py @@ -7,8 +7,8 @@ import brightway2 as bw import numpy as np import pandas as pd -from PySide2.QtCore import QModelIndex, Qt, Slot -from PySide2.QtWidgets import QMessageBox +from PySide6.QtCore import QModelIndex, Qt, Slot +from PySide6.QtWidgets import QMessageBox from activity_browser.signals import signals from ...wizards import UncertaintyWizard diff --git a/activity_browser/ui/tables/models/inventory.py b/activity_browser/ui/tables/models/inventory.py index eda93357b..2a044adc1 100644 --- a/activity_browser/ui/tables/models/inventory.py +++ b/activity_browser/ui/tables/models/inventory.py @@ -6,8 +6,8 @@ from bw2data.utils import natural_sort import numpy as np import pandas as pd -from PySide2.QtCore import Qt, QModelIndex, Slot -from PySide2.QtWidgets import QApplication +from PySide6.QtCore import Qt, QModelIndex, Slot +from PySide6.QtWidgets import QApplication from activity_browser.bwutils import AB_metadata, commontasks as bc from activity_browser.settings import project_settings diff --git a/activity_browser/ui/tables/models/lca_setup.py b/activity_browser/ui/tables/models/lca_setup.py index 11495f03b..32bb7783e 100644 --- a/activity_browser/ui/tables/models/lca_setup.py +++ b/activity_browser/ui/tables/models/lca_setup.py @@ -5,7 +5,7 @@ from bw2data.backends.peewee import ActivityDataset import pandas as pd import numpy as np -from PySide2.QtCore import QModelIndex, Slot, Qt +from PySide6.QtCore import QModelIndex, Slot, Qt from activity_browser.bwutils import commontasks as bc from activity_browser.signals import signals diff --git a/activity_browser/ui/tables/models/parameters.py b/activity_browser/ui/tables/models/parameters.py index 715516db3..ab3d3001c 100644 --- a/activity_browser/ui/tables/models/parameters.py +++ b/activity_browser/ui/tables/models/parameters.py @@ -8,7 +8,7 @@ from bw2data.parameters import (ActivityParameter, DatabaseParameter, Group, ProjectParameter) from peewee import DoesNotExist -from PySide2.QtCore import Slot, QModelIndex +from PySide6.QtCore import Slot, QModelIndex from activity_browser.bwutils import commontasks as bc, uncertainty as uc from activity_browser.signals import signals diff --git a/activity_browser/ui/tables/models/plugins.py b/activity_browser/ui/tables/models/plugins.py index a6bf8b688..525728105 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 project_settings, ab_settings from activity_browser.signals import signals diff --git a/activity_browser/ui/tables/models/scenarios.py b/activity_browser/ui/tables/models/scenarios.py index 16a88c628..e841d0cfd 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.signals import signals diff --git a/activity_browser/ui/tables/parameters.py b/activity_browser/ui/tables/parameters.py index 5fb28dc8d..10b258d9e 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 QContextMenuEvent, QDragMoveEvent, QDropEvent, QAction +from PySide6.QtWidgets import QMenu, QMessageBox from ...settings import project_settings from ...signals import signals diff --git a/activity_browser/ui/tables/plugins.py b/activity_browser/ui/tables/plugins.py index 15a5f6270..dda1d758d 100644 --- a/activity_browser/ui/tables/plugins.py +++ b/activity_browser/ui/tables/plugins.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -from PySide2 import QtWidgets, QtCore -from PySide2.QtWidgets import QMessageBox +from PySide6 import QtWidgets, QtCore +from PySide6.QtWidgets import QMessageBox import pandas from ...signals import signals diff --git a/activity_browser/ui/tables/projects.py b/activity_browser/ui/tables/projects.py index 3390fe165..83a53c2c2 100644 --- a/activity_browser/ui/tables/projects.py +++ b/activity_browser/ui/tables/projects.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- from bw2data import projects -from PySide2.QtWidgets import QComboBox -from PySide2.QtCore import Qt +from PySide6.QtWidgets import QComboBox +from PySide6.QtCore import Qt from ...signals import signals diff --git a/activity_browser/ui/tables/scenarios.py b/activity_browser/ui/tables/scenarios.py index b83980a56..7411b47d1 100644 --- a/activity_browser/ui/tables/scenarios.py +++ b/activity_browser/ui/tables/scenarios.py @@ -2,8 +2,8 @@ #from typing import Iterable, List, Tuple from typing import Iterable, Tuple -from PySide2.QtCore import Slot -#from PySide2.QtWidgets import QComboBox +from PySide6.QtCore import Slot +#from PySide6.QtWidgets import QComboBox from activity_browser.signals import signals from .models import ScenarioModel diff --git a/activity_browser/ui/tables/views.py b/activity_browser/ui/tables/views.py index 43f5fd210..95a80e5c8 100644 --- a/activity_browser/ui/tables/views.py +++ b/activity_browser/ui/tables/views.py @@ -3,10 +3,10 @@ from typing import Optional from bw2data.filesystem import safe_filename -from PySide2.QtCore import QSize, Qt, Slot, QPoint, Signal, QRect, QTimer -from PySide2.QtWidgets import QFileDialog, QTableView, QTreeView, QApplication, QMenu, QAction, \ +from PySide6.QtCore import QSize, Qt, Slot, QPoint, Signal, QRect, QTimer +from PySide6.QtWidgets import QFileDialog, QTableView, QTreeView, QApplication, QMenu, \ QHeaderView, QStyle, QStyleOptionButton,QLineEdit, QWidgetAction, QWidget, QHBoxLayout, QToolButton -from PySide2.QtGui import QKeyEvent, QDoubleValidator +from PySide6.QtGui import QKeyEvent, QDoubleValidator, QAction from ...settings import ab_settings from ..widgets.dialog import FilterManagerDialog, SimpleFilterDialog diff --git a/activity_browser/ui/threading.py b/activity_browser/ui/threading.py index c5ac79cfc..efa30d697 100644 --- a/activity_browser/ui/threading.py +++ b/activity_browser/ui/threading.py @@ -1,4 +1,4 @@ -from PySide2.QtCore import QThread +from PySide6.QtCore import QThread import brightway2 as bw diff --git a/activity_browser/ui/web/base.py b/activity_browser/ui/web/base.py index b8bb430a7..2bae10af6 100644 --- a/activity_browser/ui/web/base.py +++ b/activity_browser/ui/web/base.py @@ -5,8 +5,8 @@ import os from typing import Type -from PySide2 import QtWebEngineWidgets, QtWebChannel, QtWidgets -from PySide2.QtCore import Signal, Slot, QObject, Qt, QUrl +from PySide6 import QtWebEngineWidgets, QtWebChannel, QtWidgets +from PySide6.QtCore import Signal, Slot, QObject, Qt, QUrl from bw2data.filesystem import safe_filename from . import webutils diff --git a/activity_browser/ui/web/navigator.py b/activity_browser/ui/web/navigator.py index 761b45848..53c4fbd98 100644 --- a/activity_browser/ui/web/navigator.py +++ b/activity_browser/ui/web/navigator.py @@ -7,8 +7,8 @@ import brightway2 as bw import networkx as nx -from PySide2 import QtWidgets -from PySide2.QtCore import Slot +from PySide6 import QtWidgets +from PySide6.QtCore import Slot from .base import BaseGraph, BaseNavigatorWidget from ...signals import signals diff --git a/activity_browser/ui/web/sankey_navigator.py b/activity_browser/ui/web/sankey_navigator.py index 673206528..f911b5a76 100644 --- a/activity_browser/ui/web/sankey_navigator.py +++ b/activity_browser/ui/web/sankey_navigator.py @@ -5,9 +5,9 @@ from typing import List import brightway2 as bw -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 .base import BaseGraph, BaseNavigatorWidget from ...bwutils.commontasks import identify_activity_type diff --git a/activity_browser/ui/web/webutils.py b/activity_browser/ui/web/webutils.py index 1b4bd7a56..ba524686b 100644 --- a/activity_browser/ui/web/webutils.py +++ b/activity_browser/ui/web/webutils.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -from PySide2 import QtWidgets, QtCore, QtGui, QtWebEngineWidgets +from PySide6 import QtWidgets, QtCore, QtGui, QtWebEngineWidgets, QtWebEngineCore import os # type "localhost:3999" in Chrome for DevTools of AB web content @@ -7,7 +7,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 75fdd1367..77a13e7ef 100644 --- a/activity_browser/ui/widgets/activity.py +++ b/activity_browser/ui/widgets/activity.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -from PySide2 import QtCore, QtWidgets -from PySide2.QtWidgets import QMessageBox +from PySide6 import QtCore, QtWidgets +from PySide6.QtWidgets import QMessageBox from .line_edit import SignalledLineEdit, SignalledComboEdit from ..icons import qicons diff --git a/activity_browser/ui/widgets/biosphere_update.py b/activity_browser/ui/widgets/biosphere_update.py index f7d52cc0e..25961a173 100644 --- a/activity_browser/ui/widgets/biosphere_update.py +++ b/activity_browser/ui/widgets/biosphere_update.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- import brightway2 as bw from bw2data.errors import ValidityError -from PySide2 import QtCore, QtWidgets -from PySide2.QtCore import Signal, Slot +from PySide6 import QtCore, QtWidgets +from PySide6.QtCore import Signal, Slot import bw2io.data as data from ...signals import signals diff --git a/activity_browser/ui/widgets/comparison_switch.py b/activity_browser/ui/widgets/comparison_switch.py index d1807ba8a..3adcbe6eb 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 a198e207c..08ab100ca 100644 --- a/activity_browser/ui/widgets/cutoff_menu.py +++ b/activity_browser/ui/widgets/cutoff_menu.py @@ -10,14 +10,14 @@ from typing import Union import numpy as np -from PySide2 import QtCore -from PySide2.QtCore import QLocale, Qt, Signal, Slot -from PySide2.QtWidgets import ( +from PySide6 import QtCore +from PySide6.QtCore import QLocale, Qt, Signal, Slot +from PySide6.QtWidgets import ( QWidget, QVBoxLayout, QHBoxLayout, QRadioButton, QSlider, QLabel, QLineEdit, QPushButton, QButtonGroup ) -from PySide2.QtGui import QIntValidator, QDoubleValidator +from PySide6.QtGui import QIntValidator, QDoubleValidator from ..style import vertical_line diff --git a/activity_browser/ui/widgets/database_copy.py b/activity_browser/ui/widgets/database_copy.py index 404212daa..abf20ef15 100644 --- a/activity_browser/ui/widgets/database_copy.py +++ b/activity_browser/ui/widgets/database_copy.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- import brightway2 as bw -from PySide2 import QtCore, QtWidgets +from PySide6 import QtCore, QtWidgets from ...signals import signals from ..threading import ABThread diff --git a/activity_browser/ui/widgets/dialog.py b/activity_browser/ui/widgets/dialog.py index 57362821a..6bc610d58 100644 --- a/activity_browser/ui/widgets/dialog.py +++ b/activity_browser/ui/widgets/dialog.py @@ -3,8 +3,8 @@ from typing import List, Tuple import brightway2 as bw -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.bwutils.superstructure import get_sheet_names from activity_browser.settings import project_settings diff --git a/activity_browser/ui/widgets/line_edit.py b/activity_browser/ui/widgets/line_edit.py index dabd70e4c..3246f4959 100644 --- a/activity_browser/ui/widgets/line_edit.py +++ b/activity_browser/ui/widgets/line_edit.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- -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 ...signals import signals diff --git a/activity_browser/ui/widgets/message.py b/activity_browser/ui/widgets/message.py index bc451fab2..bbfa17b61 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 c9e048d96..7f0bc7aad 100644 --- a/activity_browser/ui/wizards/db_export_wizard.py +++ b/activity_browser/ui/wizards/db_export_wizard.py @@ -2,8 +2,8 @@ import os import brightway2 as bw -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 diff --git a/activity_browser/ui/wizards/db_import_wizard.py b/activity_browser/ui/wizards/db_import_wizard.py index 9d2f17924..0b788fac0 100644 --- a/activity_browser/ui/wizards/db_import_wizard.py +++ b/activity_browser/ui/wizards/db_import_wizard.py @@ -13,8 +13,8 @@ from bw2io.errors import InvalidPackage, StrategyError from bw2io.extractors import Ecospold2DataExtractor from bw2data.backends import SQLiteBackend -from PySide2 import QtWidgets, QtCore -from PySide2.QtCore import Signal, Slot +from PySide6 import QtWidgets, QtCore +from PySide6.QtCore import Signal, Slot from ..threading import ABThread from ...bwutils.errors import ImportCanceledError, LinkingFailed diff --git a/activity_browser/ui/wizards/parameter_wizard.py b/activity_browser/ui/wizards/parameter_wizard.py index 483ff246d..e491ca27a 100644 --- a/activity_browser/ui/wizards/parameter_wizard.py +++ b/activity_browser/ui/wizards/parameter_wizard.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- import brightway2 as bw -from PySide2 import QtCore, QtGui, QtWidgets -from PySide2.QtCore import Signal +from PySide6 import QtCore, QtGui, QtWidgets +from PySide6.QtCore import Signal from ...bwutils import commontasks as bc diff --git a/activity_browser/ui/wizards/plugins_manager_wizard.py b/activity_browser/ui/wizards/plugins_manager_wizard.py index 591e010b8..5c11d6a4d 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 Slot, Qt +from PySide6 import QtCore, QtWidgets +from PySide6.QtCore import Slot, Qt from ...ui.style import header from ...ui.tables import PluginsTable diff --git a/activity_browser/ui/wizards/settings_wizard.py b/activity_browser/ui/wizards/settings_wizard.py index a9e8fe9b9..42fe71cd1 100644 --- a/activity_browser/ui/wizards/settings_wizard.py +++ b/activity_browser/ui/wizards/settings_wizard.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- import brightway2 as bw -from PySide2 import QtWidgets, QtCore +from PySide6 import QtWidgets, QtCore from peewee import SqliteDatabase import os import re diff --git a/activity_browser/ui/wizards/uncertainty.py b/activity_browser/ui/wizards/uncertainty.py index 4c27550d7..e53f4e72b 100644 --- a/activity_browser/ui/wizards/uncertainty.py +++ b/activity_browser/ui/wizards/uncertainty.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -from PySide2 import QtCore, QtGui, QtWidgets -from PySide2.QtCore import Signal, Slot +from PySide6 import QtCore, QtGui, QtWidgets +from PySide6.QtCore import Signal, Slot import numpy as np 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 cd3d6ab9d..0476ba763 100644 --- a/activity_browser/utils.py +++ b/activity_browser/utils.py @@ -2,7 +2,7 @@ import requests from pathlib import Path import os -from PySide2 import QtWidgets +from PySide6 import QtWidgets from bw2data.filesystem import safe_filename diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 83da23423..7382ab81d 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -34,7 +34,7 @@ requirements: - pandas <=2.1.4 - pint <=0.21 - pyperclip - - pyside2 >=5.15.5 + - pyside6 ==6.6.1 - qt-webengine - salib >=1.4 - seaborn diff --git a/tests/test_add_default_data.py b/tests/test_add_default_data.py index d03aa1b3f..6b223df55 100644 --- a/tests/test_add_default_data.py +++ b/tests/test_add_default_data.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- import brightway2 as bw -from PySide2 import QtCore, QtWidgets +from PySide6 import QtCore, QtWidgets from activity_browser.signals import signals from activity_browser.ui.widgets.dialog import EcoinventVersionDialog diff --git a/tests/test_calculation_setup.py b/tests/test_calculation_setup.py index f2c4b5d15..326f218ac 100644 --- a/tests/test_calculation_setup.py +++ b/tests/test_calculation_setup.py @@ -1,5 +1,5 @@ import brightway2 as bw -from PySide2 import QtCore, QtWidgets +from PySide6 import QtCore, QtWidgets def test_new_calculation_setup(qtbot, ab_app, monkeypatch): assert bw.projects.current == 'pytest_project' diff --git a/tests/test_export_wizard.py b/tests/test_export_wizard.py index 031187680..1c6d03f47 100644 --- a/tests/test_export_wizard.py +++ b/tests/test_export_wizard.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- import brightway2 as bw -from PySide2 import QtCore, QtWidgets +from PySide6 import QtCore, QtWidgets from activity_browser.signals import signals from activity_browser.controllers.database import DatabaseController diff --git a/tests/test_import_wizard.py b/tests/test_import_wizard.py index 127649fdb..741f1f130 100644 --- a/tests/test_import_wizard.py +++ b/tests/test_import_wizard.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- import brightway2 as bw -from PySide2 import QtCore, QtWidgets +from PySide6 import QtCore, QtWidgets from activity_browser.signals import signals from activity_browser.controllers.database import DatabaseController diff --git a/tests/test_parameters.py b/tests/test_parameters.py index 40d1ed52a..5bd38a1fc 100644 --- a/tests/test_parameters.py +++ b/tests/test_parameters.py @@ -2,7 +2,7 @@ import brightway2 as bw from bw2data.parameters import (ActivityParameter, DatabaseParameter, Group, ProjectParameter) -from PySide2 import QtCore, QtWidgets +from PySide6 import QtCore, QtWidgets import pytest from activity_browser.signals import signals diff --git a/tests/test_projects.py b/tests/test_projects.py index 233302406..2bc7ed3fa 100644 --- a/tests/test_projects.py +++ b/tests/test_projects.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- import brightway2 as bw -from PySide2 import QtCore, QtWidgets +from PySide6 import QtCore, QtWidgets from activity_browser.ui.widgets.dialog import ProjectDeletionDialog diff --git a/tests/test_settings_wizard.py b/tests/test_settings_wizard.py index d6934bc55..1e70132a6 100644 --- a/tests/test_settings_wizard.py +++ b/tests/test_settings_wizard.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- import brightway2 as bw -from PySide2.QtCore import Qt -from PySide2.QtWidgets import QMessageBox, QWizard +from PySide6.QtCore import Qt +from PySide6.QtWidgets import QMessageBox, QWizard from activity_browser.ui.wizards.settings_wizard import SettingsWizard from activity_browser.settings import ab_settings diff --git a/tests/test_uncertainty.py b/tests/test_uncertainty.py index 4e948b6da..63368a90b 100644 --- a/tests/test_uncertainty.py +++ b/tests/test_uncertainty.py @@ -4,7 +4,7 @@ multiple ways """ import brightway2 as bw -from PySide2 import QtCore, QtWidgets +from PySide6 import QtCore, QtWidgets import pytest from stats_arrays.distributions import UndefinedUncertainty, UniformUncertainty diff --git a/tests/test_uncertainty_wizard.py b/tests/test_uncertainty_wizard.py index 2c44972fc..4113f3dc5 100644 --- a/tests/test_uncertainty_wizard.py +++ b/tests/test_uncertainty_wizard.py @@ -5,7 +5,7 @@ from bw2data.parameters import ProjectParameter import numpy as np -from PySide2.QtWidgets import QMessageBox, QWizard +from PySide6.QtWidgets import QMessageBox, QWizard import pytest from stats_arrays.distributions import ( LognormalUncertainty, UniformUncertainty, UndefinedUncertainty, diff --git a/tests/test_widgets.py b/tests/test_widgets.py index 7a1641f11..29980a34d 100644 --- a/tests/test_widgets.py +++ b/tests/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, SwitchComboBox, CutoffMenu, ForceInputDialog,