mirror of
https://github.com/chanzuckerberg/cellxgene.git
synced 2026-09-28 03:18:12 +08:00
PyQt5 -> PySide2 (#738)
This commit is contained in:
@@ -1,8 +1,8 @@
|
||||
# flake8: noqa F403, F405
|
||||
from cefpython3 import cefpython as cef
|
||||
from PyQt5.QtCore import *
|
||||
from PyQt5.QtGui import *
|
||||
from PyQt5.QtWidgets import *
|
||||
from PySide2.QtCore import *
|
||||
from PySide2.QtGui import *
|
||||
from PySide2.QtWidgets import *
|
||||
|
||||
from server.gui.utils import WINDOWS, LINUX
|
||||
|
||||
|
||||
+2
-2
@@ -3,8 +3,8 @@ import sys
|
||||
from os.path import splitext, basename
|
||||
|
||||
from cefpython3 import cefpython as cef
|
||||
from PyQt5.QtCore import *
|
||||
from PyQt5.QtWidgets import *
|
||||
from PySide2.QtCore import *
|
||||
from PySide2.QtWidgets import *
|
||||
|
||||
from server.app.app import Server
|
||||
from server.gui.browser import CefWidget, CefApplication
|
||||
|
||||
+4
-4
@@ -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()
|
||||
error = pyqtSignal(str)
|
||||
result = pyqtSignal(object)
|
||||
finished = Signal()
|
||||
error = Signal(str)
|
||||
result = Signal(object)
|
||||
|
||||
@@ -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)
|
||||
|
||||
Reference in New Issue
Block a user