Merge branch 'py38_PySide6' into py38

arpes/plotting/basic_tools/__init__.py

@@ -4,7 +4,7 @@
 import xarray as xr
 from scipy import interpolate
 
-from PyQt5 import QtWidgets, QtCore
+from PySide6 import QtWidgets, QtCore
 
 from arpes import analysis
 from arpes.utilities import normalize_to_spectrum

arpes/plotting/bz_tool/CoordinateOffsetWidget.py

@@ -1,7 +1,7 @@
 """A widget providing controls for a coordinate offset in the momentum tool."""
 from functools import partial
 
-from PyQt5 import QtWidgets
+from PySide6 import QtWidgets
 
 __all__ = ("CoordinateOffsetWidget",)
 

arpes/plotting/bz_tool/RangeOrSingleValueWidget.py

@@ -1,7 +1,7 @@
 """A control which can provide a range or a single value (i.e. a half open range with ends equal)."""
 from functools import partial
 
-from PyQt5 import QtWidgets
+from PySide6 import QtWidgets
 
 
 __all__ = ["RangeOrSingleValueWidget"]

arpes/plotting/bz_tool/__init__.py

@@ -6,7 +6,7 @@
 import numpy as np
 import xarray as xr
 
-from PyQt5 import QtWidgets
+from PySide6 import QtWidgets
 from matplotlib.backends.backend_qt5agg import FigureCanvas
 from matplotlib.figure import Figure
 

arpes/plotting/dynamic_tool.py

@@ -1,7 +1,7 @@
 """Allows for making any function of a spectrum into a dynamic tool."""
 import inspect
 
-from PyQt5 import QtWidgets
+from PySide6 import QtWidgets
 
 from arpes.utilities import normalize_to_spectrum, group_by
 from arpes.typing import DataType

arpes/plotting/fit_tool/__init__.py

@@ -1,7 +1,7 @@
 """Provides a Qt based implementation of a curve fit inspection tool."""
 from arpes.plotting.qt_tool.BinningInfoWidget import BinningInfoWidget
 from arpes.utilities.qt.utils import PlotOrientation, ReactivePlotRecord
-from PyQt5 import QtGui, QtCore, QtWidgets
+from PySide6 import QtGui, QtCore, QtWidgets
 import pyqtgraph as pg
 import numpy as np
 import dill

arpes/plotting/fit_tool/fit_inspection_plot.py

@@ -1,13 +1,13 @@
 """Defines a widget which provides a 1D browsable `lmfit.model.ModelResult`."""
 
-from PyQt5 import QtCore, QtWidgets
+from PySide6 import QtCore, QtWidgets
 from arpes.utilities.qt.data_array_image_view import DataArrayPlot
 from typing import Optional
 import pyqtgraph as pg
 import xarray as xr
 import numpy as np
 import math
-from PyQt5.QtWidgets import QLayout, QGridLayout, QWidget
+from PySide6.QtWidgets import QLayout, QGridLayout, QWidget
 import lmfit
 from weakref import ReferenceType
 

arpes/plotting/qt_ktool/__init__.py

@@ -1,5 +1,5 @@
 """A live momentun conversion tool, useful for finding and setting offsets."""
-from PyQt5 import QtWidgets
+from PySide6 import QtWidgets
 import numpy as np
 
 from arpes.utilities import normalize_to_spectrum, group_by
@@ -22,7 +22,7 @@
 class KTool(SimpleApp):
     """Provides a live momentum converting tool.
 
-    QtTool is an implementation of Image/Bokeh Tool based on PyQtGraph and PyQt5 for now we retain
+    QtTool is an implementation of Image/Bokeh Tool based on PyQtGraph and PySIde6 for now we retain
     a number of the metaphors from BokehTool, including a "context" that stores the state, and can
     be used to programmatically interface with the tool.
     """

arpes/plotting/qt_tool/AxisInfoWidget.py

@@ -1,7 +1,7 @@
 """A widget providing rudimentary information about an axis on a DataArray."""
 # pylint: disable=import-error
 
-from PyQt5 import QtWidgets
+from PySide6 import QtWidgets
 
 __all__ = ("AxisInfoWidget",)
 

arpes/plotting/qt_tool/BinningInfoWidget.py

@@ -1,6 +1,6 @@
 """An axis binning control."""
 
-from PyQt5 import QtWidgets
+from PySide6 import QtWidgets
 
 from arpes.utilities.ui import layout
 

arpes/plotting/qt_tool/__init__.py

@@ -2,7 +2,7 @@
 # pylint: disable=import-error
 
 from arpes.utilities.qt.utils import PlotOrientation
-from PyQt5 import QtGui, QtCore, QtWidgets
+from PySide6 import QtGui, QtCore, QtWidgets
 import pyqtgraph as pg
 import numpy as np
 import weakref
@@ -137,7 +137,7 @@ def scroll(self, event: QtGui.QKeyEvent):
 
 
 class QtTool(SimpleApp):
-    """QtTool is an implementation of Image/Bokeh Tool based on PyQtGraph and PyQt5.
+    """QtTool is an implementation of Image/Bokeh Tool based on PyQtGraph and PySide6.
 
     For now we retain a number of the metaphors from BokehTool, including a "context"
     that stores the state, and can be used to programmatically interface with the tool.

arpes/utilities/qt/app.py

@@ -1,5 +1,5 @@
 """Application infrastructure for apps/tools which browse a data volume."""
-from PyQt5 import QtWidgets
+from PySide6 import QtWidgets
 import pyqtgraph as pg
 import numpy as np
 import typing
@@ -18,7 +18,7 @@
 
 
 class SimpleApp:
-    """Has all of the layout information and business logic for an interactive data browsing utility using PyQt5."""
+    """Has all of the layout information and business logic for an interactive data browsing utility using PySide6."""
 
     WINDOW_CLS = None
     WINDOW_SIZE = (4, 4)

arpes/utilities/qt/help_dialogs.py

@@ -1,7 +1,7 @@
 """A help dialog showing keyboard shortcuts for Qt application."""
 # pylint: disable=import-error
 
-from PyQt5 import QtCore, QtWidgets
+from PySide6 import QtCore, QtWidgets
 
 from arpes.utilities.ui import PRETTY_KEYS, label, vertical
 

arpes/utilities/qt/utils.py

@@ -3,7 +3,7 @@
 import enum
 from dataclasses import dataclass
 from typing import List
-from PyQt5 import QtWidgets
+from PySide6 import QtWidgets
 
 __all__ = ["PlotOrientation", "ReactivePlotRecord"]
 

arpes/utilities/qt/windows.py

@@ -1,7 +1,7 @@
 """Infrastructure code for Qt application windows."""
 import sys
 
-from PyQt5 import QtGui, QtCore, QtWidgets
+from PySide6 import QtGui, QtCore, QtWidgets
 
 import arpes.config
 from arpes.utilities.excepthook import patched_excepthook

arpes/utilities/ui.py

@@ -1,4 +1,4 @@
-"""Easily composable and reactive UI utilities using RxPy and PyQt5.
+"""Easily composable and reactive UI utilities using RxPy and PySide6.
 
 This makes UI prototyping *MUCH* faster. In order to log IDs so that you can 
 attach subscriptions after the fact, you will need to use the CollectUI
@@ -35,7 +35,7 @@
 
 With the line above, whenever the button with id='submit' is pressed, we will log a dictionary 
 with the most recent values of the inputs {'check','slider','file'} as a dictionary with these 
-keys. This allows building PyQt5 "forms" without effort.
+keys. This allows building PySide6 "forms" without effort.
 """
 from enum import Enum
 from typing import Type
@@ -51,7 +51,7 @@
 from collections import namedtuple
 
 import functools
-from PyQt5.QtWidgets import (
+from PySide6.QtWidgets import (
     QGridLayout,
     QWidget,
     QVBoxLayout,
@@ -62,8 +62,8 @@
     QLabel,
 )
 
-from PyQt5 import QtCore, QtGui
-from PyQt5.QtCore import Qt
+from PySide6 import QtCore, QtGui
+from PySide6.QtCore import Qt
 
 from .widgets import *
 

arpes/utilities/widgets.py

@@ -2,7 +2,7 @@
 import os
 from rx.subject import BehaviorSubject, Subject
 
-from PyQt5.QtWidgets import (
+from PySide6.QtWidgets import (
     QPushButton,
     QCheckBox,
     QComboBox,

docs/source/CHANGELOG.rst

@@ -75,7 +75,7 @@ Fixed
 
 1. Circular references have been removed from tools which use Qt which
    previously lead to crashes due to objects being freed in C++/Qt5 but
-   retained in Python/PyQt5.
+   retained in Python/PySide6.
 
    Additionally, some diagnostics have been added to help deal with
    similar problems in the future.

docs/source/notebooks/basic-data-exploration.ipynb

@@ -1194,7 +1194,7 @@
    "source": [
     "## Interactive Data Browsing\n",
     "\n",
-    "Facilities are included for doing interactive data exploration and analysis both directly in Jupyter, via Bokeh. And in a separate standalone window using PyQt5. To learn more about interactive analysis, please read the interactive analysis section of the documentation."
+    "Facilities are included for doing interactive data exploration and analysis both directly in Jupyter, via Bokeh. And in a separate standalone window using PySide6. To learn more about interactive analysis, please read the interactive analysis section of the documentation."
    ]
   },
   {

docs/source/writing-interactive-tools.rst

@@ -104,7 +104,7 @@ step we will add only as much as is needed to spawn a window.
 
 .. code:: python
 
-   from PyQt5 import QtWidgets
+   from PySide6 import QtWidgets
    from arpes.utilities.qt import qt_info, SimpleApp, SimpleWindow, BasicHelpDialog
 
 

package.json

@@ -20,5 +20,8 @@
   },
   "devDependencies": {
     "@arkweid/lefthook": "^0.7.6"
+  },
+  "dependencies": {
+    "gyp": "^0.3.0"
   }
 }

pytest-config/pytest.ini

@@ -23,7 +23,7 @@ norecursedirs =
 filterwarnings = 
 	ignore::DeprecationWarning
 
-qt_api=pyqt5
+qt_api=pyside6
 
 env=
 	QT_QPA_PLATFORM=offscreen