Use qtpy

isstools/batch/batch.py

@@ -1,7 +1,7 @@
 import pandas as pd
 import collections
 import numpy as np
-from PyQt5 import QtGui
+from qtpy import QtGui
 
 class BatchManager():
 

isstools/dialogs/BasicDialogs.py

@@ -1,4 +1,4 @@
-from PyQt5 import  QtWidgets
+from qtpy import  QtWidgets
 
 def message_box(title, message):
     messageBox = QtWidgets.QMessageBox()

isstools/dialogs/GetEmailAddress.py

@@ -1,4 +1,4 @@
-from PyQt5 import uic, QtGui, QtCore
+from qtpy import uic, QtGui, QtCore
 import pkg_resources
 
 ui_path = pkg_resources.resource_filename('isstools', 'dialogs/GetEmailAddress.ui')

isstools/dialogs/MoveMotorDialog.py

@@ -1,4 +1,4 @@
-from PyQt5 import uic, QtGui, QtCore
+from qtpy import uic, QtGui, QtCore
 import pkg_resources
 
 ui_path = pkg_resources.resource_filename('isstools', 'dialogs/MoveMotorDialog.ui')

isstools/dialogs/PeriodicTable.py

@@ -1,13 +1,13 @@
-from PyQt5 import uic, QtGui, QtCore
+from qtpy import uic, QtGui, QtCore
 import pkg_resources
-from PyQt5.QtWidgets import QWidget, QVBoxLayout, QTableWidget, QTableWidgetItem, QPushButton
-from PyQt5.QtWidgets import QWidget, QVBoxLayout, QGridLayout, QPushButton, QLabel
+from qtpy.QtWidgets import QWidget, QVBoxLayout, QTableWidget, QTableWidgetItem, QPushButton
+from qtpy.QtWidgets import QWidget, QVBoxLayout, QGridLayout, QPushButton, QLabel
 
 ui_path = pkg_resources.resource_filename('isstools', 'dialogs/PeriodicTable.ui')
 
-from PyQt5 import uic, QtGui, QtCore
-from PyQt5.QtWidgets import QWidget, QVBoxLayout, QGridLayout, QLabel, QMainWindow
-from PyQt5.QtCore import pyqtSignal
+from qtpy import uic, QtGui, QtCore
+from qtpy.QtWidgets import QWidget, QVBoxLayout, QGridLayout, QLabel, QMainWindow
+from qtpy.QtCore import Signal
 
 
 
@@ -76,7 +76,7 @@ def element_clicked(self, symbol):
 
 
 class PeriodicTableWidget(*uic.loadUiType(ui_path)):
-    element_selected = pyqtSignal(str)
+    element_selected = Signal(str)
 
     elements = {
         # Main table

isstools/dialogs/Prepare_BL_Dialog.py

@@ -1,4 +1,4 @@
-from PyQt5 import uic, QtGui, QtCore, QtWidgets
+from qtpy import uic, QtGui, QtCore, QtWidgets
 import pkg_resources
 
 ui_path = pkg_resources.resource_filename('isstools', 'dialogs/Prepare_BL_Dialog.ui')

isstools/dialogs/SelectNNeffPointsDialog.py

@@ -1,4 +1,4 @@
-from PyQt5 import uic, QtGui, QtCore
+from qtpy import uic, QtGui, QtCore
 import pkg_resources
 
 ui_path = pkg_resources.resource_filename('isstools', 'dialogs/SelectNNeffPointsDialog.ui')

isstools/dialogs/SetEnergy.py

@@ -1,4 +1,4 @@
-from PyQt5 import uic, QtGui, QtCore
+from qtpy import uic, QtGui, QtCore
 import pkg_resources
 
 ui_path = pkg_resources.resource_filename('isstools', 'dialogs/SetEnergy.ui')

isstools/dialogs/UpdateAngleOffset.py

@@ -1,4 +1,4 @@
-from PyQt5 import uic, QtGui, QtCore
+from qtpy import uic, QtGui, QtCore
 import pkg_resources
 
 ui_path = pkg_resources.resource_filename('isstools', 'dialogs/UpdateAngleOffset.ui')

isstools/dialogs/UpdateHHMFeedbackSettings.py

@@ -1,4 +1,4 @@
-from PyQt5 import uic, QtGui, QtCore
+from qtpy import uic, QtGui, QtCore
 import pkg_resources
 
 ui_path = pkg_resources.resource_filename('isstools', 'dialogs/UpdateHHMFeedbackSettings.ui')

isstools/dialogs/UpdateMotorLimit.py

@@ -1,4 +1,4 @@
-from PyQt5 import uic, QtGui, QtCore
+from qtpy import uic, QtGui, QtCore
 import pkg_resources
 
 ui_path = pkg_resources.resource_filename('isstools', 'dialogs/UpdateMotorLimits.ui')

isstools/dialogs/UpdateSampleInfo.py

@@ -1,4 +1,4 @@
-from PyQt5 import uic, QtGui, QtCore
+from qtpy import uic, QtGui, QtCore
 import pkg_resources
 
 ui_path_sample = pkg_resources.resource_filename('isstools', 'dialogs/UpdateSampleInfo.ui')

isstools/dialogs/UpdateScanInfo.py

@@ -1,4 +1,4 @@
-from PyQt5 import uic, QtGui, QtCore
+from qtpy import uic, QtGui, QtCore
 import pkg_resources
 
 ui_path = pkg_resources.resource_filename('isstools', 'dialogs/UpdateScanInfo.ui')

isstools/dialogs/UpdateUserDialog.py

@@ -1,4 +1,4 @@
-from PyQt5 import uic, QtGui, QtCore
+from qtpy import uic, QtGui, QtCore
 import pkg_resources
 
 ui_path = pkg_resources.resource_filename('isstools', 'dialogs/UpdateUserDialog.ui')

isstools/elements/batch_elements.py

@@ -1,8 +1,8 @@
 import numpy as np
 import pkg_resources
-from PyQt5 import QtCore, QtGui, QtWidgets
-from PyQt5.QtCore import Qt
-from PyQt5.Qt import QObject
+from qtpy import QtCore, QtGui, QtWidgets
+from qtpy.QtCore import Qt
+from qtpy.QtCore import QObject
 import copy
 
 path_icon_experiment = pkg_resources.resource_filename('isstools', 'icons/experiment.png')

isstools/elements/elements.py

@@ -1,6 +1,6 @@
 import pkg_resources
 import json
-from PyQt5 import QtWidgets, QtCore, QtGui
+from qtpy import QtWidgets, QtCore, QtGui
 from isstools.dialogs.BasicDialogs import message_box, question_message_box
 import pandas as pd
 

isstools/elements/emitting_stream.py

@@ -1,9 +1,9 @@
-from PyQt5 import QtCore, QtGui
+from qtpy import QtCore, QtGui
 import sys
 
 
 class EmittingStream(QtCore.QObject):
-    textWritten = QtCore.pyqtSignal(str)
+    textWritten = QtCore.Signal(str)
 
     # I think this code is writing a new subclass of stdout
     # (julien)

isstools/elements/parameter_handler.py

@@ -1,6 +1,6 @@
 import inspect
 import re
-from PyQt5 import QtWidgets
+from qtpy import QtWidgets
 
 
 def create_parameter(description, annotation, units=None):

isstools/elements/roi_widget.py

@@ -1,13 +1,13 @@
-from PyQt5.QtWidgets import (
+from qtpy.QtWidgets import (
     QApplication, QWidget, QHBoxLayout,
     QSpinBox, QLabel
 )
 
-from PyQt5.QtWidgets import QWidget, QLabel, QSpinBox, QHBoxLayout
-from PyQt5 import QtWidgets
-from PyQt5.QtCore import QTimer
+from qtpy.QtWidgets import QWidget, QLabel, QSpinBox, QHBoxLayout
+from qtpy import QtWidgets
+from qtpy.QtCore import QTimer
 
-from PyQt5 import uic, QtGui, QtCore
+from qtpy import uic, QtGui, QtCore
 import pkg_resources
 
 ui_path = pkg_resources.resource_filename('isstools', 'elements/roi_widget.ui')

isstools/elements/widget_motors.py

@@ -1,15 +1,15 @@
 import pkg_resources
-from PyQt5 import uic, QtWidgets
-from PyQt5.QtCore import QThread, QSettings, Qt
-from PyQt5.QtGui import QPixmap, QCursor
-from PyQt5.Qt import  QObject
+from qtpy import uic, QtWidgets
+from qtpy.QtCore import QThread, QSettings, Qt
+from qtpy.QtGui import QPixmap, QCursor
+from qtpy.QtCore import  QObject
 from bluesky.callbacks import LivePlot
 from bluesky.callbacks.mpl_plotting import LiveScatter
 import bluesky.plan_stubs as bps
 import bluesky.plans as bp
 import numpy as np
 from functools import partial
-from PyQt5.QtWidgets import QLabel, QPushButton, QLineEdit, QSizePolicy, QSpacerItem, QSlider, QToolTip
+from qtpy.QtWidgets import QLabel, QPushButton, QLineEdit, QSizePolicy, QSpacerItem, QSlider, QToolTip
 
 # from isstools.dialogs import MoveMotorDialog
 # from isstools.dialogs.BasicDialogs import question_message_box

isstools/elements/widget_spectrometer_R.py

@@ -1,15 +1,15 @@
 import pkg_resources
-from PyQt5 import uic, QtWidgets
-from PyQt5.QtCore import QThread, QSettings, Qt
-from PyQt5.QtGui import QPixmap, QCursor
-from PyQt5.Qt import  QObject
+from qtpy import uic, QtWidgets
+from qtpy.QtCore import QThread, QSettings, Qt
+from qtpy.QtGui import QPixmap, QCursor
+from qtpy.QtCore import  QObject
 from bluesky.callbacks import LivePlot
 from bluesky.callbacks.mpl_plotting import LiveScatter
 import bluesky.plan_stubs as bps
 import bluesky.plans as bp
 import numpy as np
 from functools import partial
-from PyQt5.QtWidgets import QLabel, QPushButton, QLineEdit, QSizePolicy, QSpacerItem, QSlider, QToolTip
+from qtpy.QtWidgets import QLabel, QPushButton, QLineEdit, QSizePolicy, QSpacerItem, QSlider, QToolTip
 from isstools.dialogs.BasicDialogs import message_box, question_message_box
 ui_path = pkg_resources.resource_filename('isstools', 'ui/ui_spectrometer_R.ui')
 

isstools/widgets/widget_batch.py

@@ -1,10 +1,10 @@
 import sys
 
 import pkg_resources
-from PyQt5 import uic, QtGui, QtCore, QtWidgets
-from PyQt5.Qt import Qt
+from qtpy import uic, QtGui, QtCore, QtWidgets
+from qtpy.QtCore import Qt
 
-from PyQt5.QtWidgets import QMenu
+from qtpy.QtWidgets import QMenu
 # from xas.trajectory import trajectory_manager
 # from isstools.widgets import widget_batch_manual
 
@@ -24,9 +24,9 @@
 
 
 class UIBatch(*uic.loadUiType(ui_path)):
-    sample_list_changed_signal = QtCore.pyqtSignal()
-    scan_list_changed_signal = QtCore.pyqtSignal()
-    batch_list_changed_signal = QtCore.pyqtSignal()
+    sample_list_changed_signal = QtCore.Signal()
+    scan_list_changed_signal = QtCore.Signal()
+    batch_list_changed_signal = QtCore.Signal()
     def __init__(self,
                  service_plan_funcs=None,
                  hhm=None,

isstools/widgets/widget_batch_manual_legacy.py

@@ -1,8 +1,8 @@
 import pkg_resources
-from PyQt5 import uic, QtGui, QtCore, QtWidgets
-from PyQt5.Qt import Qt
+from qtpy import uic, QtGui, QtCore, QtWidgets
+from qtpy.QtCore import Qt
 
-from PyQt5.QtWidgets import QMenu
+from qtpy.QtWidgets import QMenu
 from isstools.elements import elements
 from isstools.elements.parameter_handler import parse_plan_parameters
 # from xas.trajectory import trajectory_manager
@@ -18,9 +18,9 @@
 
 
 class UIBatchManual(*uic.loadUiType(ui_path)):
-    sample_list_changed_signal = QtCore.pyqtSignal()
-    scan_list_changed_signal = QtCore.pyqtSignal()
-    batch_list_changed_signal = QtCore.pyqtSignal()
+    sample_list_changed_signal = QtCore.Signal()
+    scan_list_changed_signal = QtCore.Signal()
+    batch_list_changed_signal = QtCore.Signal()
     def __init__(self,
                  service_plan_funcs,
                  hhm,

isstools/widgets/widget_beamline_setup.py

@@ -5,8 +5,8 @@
 import bluesky.plan_stubs as bps
 import numpy as np
 import pkg_resources
-from PyQt5 import uic, QtWidgets, QtCore
-from PyQt5.QtCore import QThread, QSettings
+from qtpy import uic, QtWidgets, QtCore
+from qtpy.QtCore import QThread, QSettings
 from bluesky.callbacks import LivePlot
 from isstools.dialogs import (UpdateHHMFeedbackSettings, MoveMotorDialog)
 from isstools.dialogs.BasicDialogs import question_message_box, error_message_box, message_box

isstools/widgets/widget_emission_energy_selector.py

@@ -1,6 +1,6 @@
 import json
 import pkg_resources
-from PyQt5 import uic
+from qtpy import uic
 from isstools.elements.elements import elements_lines_dict
 from ..elements.elements import get_spectrometer_line_dict
 

isstools/widgets/widget_energy_selector.py

@@ -2,7 +2,7 @@
 import json
 
 import pkg_resources
-from PyQt5 import uic
+from qtpy import uic
 
 ui_path = pkg_resources.resource_filename('isstools', 'ui/ui_energy_selector.ui')
 ui_path_without_e0 = pkg_resources.resource_filename('isstools', 'ui/ui_energy_selector_without_e0.ui')

isstools/widgets/widget_energy_selector_with_periodic_table.py

@@ -2,7 +2,7 @@
 import json
 
 import pkg_resources
-from PyQt5 import uic
+from qtpy import uic
 from isstools.dialogs import PeriodicTable
 
 ui_path = pkg_resources.resource_filename('isstools', 'ui/ui_energy_selector_with_periodic_table.ui')

isstools/widgets/widget_info_beamline.py

@@ -1,5 +1,5 @@
 
-from PyQt5 import uic, QtGui, QtCore
+from qtpy import uic, QtGui, QtCore
 import pkg_resources
 import requests
 import urllib.request

isstools/widgets/widget_info_general.py

@@ -1,5 +1,5 @@
 
-from PyQt5 import uic, QtGui, QtCore
+from qtpy import uic, QtGui, QtCore
 import pkg_resources
 import requests
 import urllib.request
@@ -12,7 +12,7 @@
 from isstools.dialogs.BasicDialogs import message_box
 from isscloudtools.initialize import get_slack_service, get_dropbox_service, get_gmail_service
 import bluesky.plan_stubs as bps
-from PyQt5 import uic, QtWidgets
+from qtpy import uic, QtWidgets
 
 from xas.file_io import make_user_dir
 from isscloudtools.slack import *

isstools/widgets/widget_info_shutters.py

@@ -1,12 +1,12 @@
-from PyQt5 import uic, QtCore, QtWidgets
+from qtpy import uic, QtCore, QtWidgets
 import pkg_resources
 
 
 ui_path = pkg_resources.resource_filename('isstools', 'ui/ui_info_shutters.ui')
 
 
 class UIInfoShutters(*uic.loadUiType(ui_path)):
-    shutters_sig = QtCore.pyqtSignal()
+    shutters_sig = QtCore.Signal()
     def __init__(self,
                  shutters=None,
                  plan_processor=None,

isstools/widgets/widget_johann_tools.py

@@ -1,6 +1,6 @@
 import json
 import pkg_resources
-from PyQt5 import uic, QtWidgets, QtCore
+from qtpy import uic, QtWidgets, QtCore
 from isstools.widgets import widget_emission_energy_selector
 import bluesky.plan_stubs as bps
 from xas.spectrometer import Crystal

isstools/widgets/widget_motors_compact.py

@@ -1,15 +1,15 @@
 import pkg_resources
-from PyQt5 import uic, QtWidgets
-from PyQt5.QtCore import QThread, QSettings
-from PyQt5.Qt import  QObject
+from qtpy import uic, QtWidgets
+from qtpy.QtCore import QThread, QSettings
+from qtpy.QtCore import  QObject
 from bluesky.callbacks import LivePlot
 from bluesky.callbacks.mpl_plotting import LiveScatter
 import bluesky.plan_stubs as bps
 import bluesky.plans as bp
 import numpy as np
 from functools import partial
-from PyQt5.QtWidgets import QLabel, QPushButton, QLineEdit
-from PyQt5.QtCore import Qt
+from qtpy.QtWidgets import QLabel, QPushButton, QLineEdit
+from qtpy.QtCore import Qt
 
 # from isstools.dialogs import MoveMotorDialog
 # from isstools.dialogs.BasicDialogs import question_message_box

isstools/widgets/widget_pilatus.py

@@ -1,9 +1,9 @@
 import pkg_resources
-from PyQt5 import uic, QtCore
+from qtpy import uic, QtCore
 from matplotlib.widgets import RectangleSelector, Cursor
-from PyQt5.Qt import QSplashScreen, QObject
-from PyQt5.QtWidgets import QToolTip
-from PyQt5.QtGui import QPixmap, QCursor
+from qtpy.QtCore import QObject
+from qtpy.QtWidgets import QToolTip, QSplashScreen
+from qtpy.QtGui import QPixmap, QCursor
 from isstools.dialogs.BasicDialogs import message_box
 from isstools.elements.widget_motors import UIWidgetMotors
 from functools import partial