Commit 25300849 authored by Jameson Rollins's avatar Jameson Rollins
Browse files

PyQt5

PyQt5 is now available on all target platforms, so we can officially drop
PyQt4 support.

We keep in qtpy to handle pyside{,2}.
parent 392107be
......@@ -31,15 +31,15 @@ Package requirements for `ndscope` (Debian package names):
* [python3-pyqtgraph](http://pyqtgraph.org/)
* [python3-nds2-client](https://git.ligo.org/nds/nds2-client)
* python3-pyqt4
* python3-pyqt5
* [python3-gpstime](https://git.ligo.org/cds/gpstime)
* python3-dateutil
* python3-yaml
The following packages are used for development purposes:
* pyqt4-dev-tools
* qt4-designer
* pyqt5-dev-tools
* qt5-designer
* python3-setuptools_scm
* pytest3-pytest
......
......@@ -10,7 +10,7 @@ from gpstime import gpstime, GPSTimeException
try:
from qtpy.QtWidgets import QApplication, QStyleFactory
except ImportError:
from PyQt4.QtGui import QApplication, QStyleFactory
from PyQt5.QtWidgets import QApplication, QStyleFactory
import signal
try:
from setproctitle import setproctitle
......
......@@ -5,7 +5,7 @@ from . import pghacks as pg
try:
from qtpy.QtCore import Qt
except ImportError:
from PyQt4.QtCore import Qt
from PyQt5.QtCore import Qt
import numpy as np
......
......@@ -5,9 +5,9 @@ try:
from qtpy import QtCore
from qtpy.QtCore import Signal, Slot
except ImportError:
from PyQt4 import QtCore
from PyQt4.QtCore import pyqtSignal as Signal
from PyQt4.QtCore import pyqtSlot as Slot
from PyQt5 import QtCore
from PyQt5.QtCore import pyqtSignal as Signal
from PyQt5.QtCore import pyqtSlot as Slot
import traceback
import logging
......
......@@ -6,8 +6,8 @@ try:
from qtpy import QtCore
from qtpy.QtCore import Signal
except ImportError:
from PyQt4 import QtCore
from PyQt4.QtCore import pyqtSignal as Signal
from PyQt5 import QtCore
from PyQt5.QtCore import pyqtSignal as Signal
import logging
import nds2
......
......@@ -8,8 +8,8 @@ from pyqtgraph import PlotItem, PlotDataItem, FillBetweenItem
try:
from qtpy import QtCore, QtGui, QtWidgets
except ImportError:
from PyQt4 import QtCore, QtGui
import PyQt4.QtGui as QtWidgets
from PyQt5 import QtCore, QtGui
from PyQt5 import QtWidgets
import logging
from .const import CHANNEL_RE
......
......@@ -8,9 +8,9 @@ try:
from qtpy.QtWidgets import QStyle
from qtpy import uic
except ImportError:
from PyQt4 import QtGui
from PyQt4.QtGui import QStyle
from PyQt4 import uic
from PyQt5 import QtGui
from PyQt5.QtGui import QStyle
from PyQt5 import uic
from gpstime import gpstime, GPSTimeException
import logging
......
......@@ -17,7 +17,7 @@ setup(
license='GNU GPL v3+',
# install_requires=[
# 'PyQt4',
# 'PyQt5',
# 'pyqtgraph',
# 'nds2-client',
# 'numpy',
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment