Draft update to pyside6

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
 

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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__)
 

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)

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
 

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

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
 

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
 

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
 

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

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
 

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

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

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

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,

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