PyQt5 -> PySide2 (#738)

server/gui/browser.py

@@ -1,8 +1,8 @@
 # flake8: noqa F403, F405
 from cefpython3 import cefpython as cef
-from PyQt5.QtCore import *
+from PySide2.QtCore import *
-from PyQt5.QtGui import *
+from PySide2.QtGui import *
-from PyQt5.QtWidgets import *
+from PySide2.QtWidgets import *
 
 from server.gui.utils import WINDOWS, LINUX
 

server/gui/main.py

@@ -3,8 +3,8 @@ import sys
 from os.path import splitext, basename
 
 from cefpython3 import cefpython as cef
-from PyQt5.QtCore import *
+from PySide2.QtCore import *
-from PyQt5.QtWidgets import *
+from PySide2.QtWidgets import *
 
 from server.app.app import Server
 from server.gui.browser import CefWidget, CefApplication

server/gui/utils.py

@@ -1,6 +1,6 @@
 import platform
 
-from PyQt5.QtCore import QObject, pyqtSignal
+from PySide2.QtCore import QObject, Signal
 
 # Detect OS
 WINDOWS = (platform.system() == "Windows")
@@ -16,6 +16,6 @@ class WorkerSignals(QObject):
         error - `str` error message
         result - `object` data returned from processing, anything
     """
-    finished = pyqtSignal()
+    finished = Signal()
-    error = pyqtSignal(str)
+    error = Signal(str)
-    result = pyqtSignal(object)
+    result = Signal(object)

server/gui/workers.py

@@ -1,6 +1,6 @@
 import traceback
 
-from PyQt5.QtCore import QRunnable, pyqtSlot
+from PySide2.QtCore import QRunnable, Slot
 
 from server.gui.utils import WorkerSignals
 
@@ -12,7 +12,7 @@ class DataLoadWorker(QRunnable):
         self.layout = layout
         self.signals = WorkerSignals()
 
-    @pyqtSlot()
+    @Slot()
     def run(self):
         if not self.data_file:
             self.signals.finished.emit()
@@ -46,6 +46,6 @@ class ServerRunWorker(QRunnable):
         self.host = host
         self.port = port
 
-    @pyqtSlot()
+    @Slot()
     def run(self):
         self.app.run(host=self.host, debug=False, port=self.port, threaded=True)

setup.py

@@ -36,5 +36,5 @@ setup(
         "Topic :: Scientific/Engineering :: Bio-Informatics",
     ],
     entry_points={"console_scripts": ["cellxgene = server.cli.cli:cli"]},
-    extras_require=dict(louvain=["python-igraph", "louvain>=0.6"], gui=["PyQt5>=5.12.1", "cefpython3>=66"]),
+    extras_require=dict(louvain=["python-igraph", "louvain>=0.6"], gui=["PySide2>=5.12.3", "cefpython3>=66"]),
 )