Merge pull request #409 from NaturalHistoryMuseum/feature/405-remove-…

…qtpy

[#405] Remove qtpy

CHANGELOG.md

@@ -2,6 +2,7 @@ This is an overview of major changes. Refer to the git repository for a full log
 
 Version 0.1.35
 -------------
+- #405 Remove qtpy
 - #401 Support new pyzbar and pylibdmtx
 - #397 Couple of problems with keyboard shortcuts box
 - #395 PyQt5

inselect/gui/about.py

@@ -5,12 +5,10 @@
 
 import humanize
 import psutil
-import qtpy
-import qtpy.QtCore
 
-from qtpy import QtWidgets
-from qtpy.QtCore import Qt
-from qtpy.QtWidgets import QDialog, QLabel, QPushButton, QSizePolicy, QVBoxLayout
+from PyQt5 import QtCore, QtWidgets
+from PyQt5.QtWidgets import (QDialog, QLabel, QPushButton, QSizePolicy,
+                             QVBoxLayout)
 
 from inselect.gui.utils import HTML_LINK_TEMPLATE
 
@@ -41,11 +39,8 @@ def _environment():
         ('Python', '{0} ({1})'.format(platform.python_version(), python_bit_depth)),
         ('Numpy', np.version.version),
         ('OpenCV', cv2.__version__),
-        (
-            qtpy.API_NAME, 
-            qtpy.PYQT_VERSION if (qtpy.PYQT4 or qtpy.PYQT5) else qtpy.PYSIDE_VERSION
-        ),
-        ('Qt',  qtpy.QT_VERSION),
+        ('PyQt5', QtCore.PYQT_VERSION_STR),
+        ('Qt',  QtCore.qVersion()),
         ('scikit-learn', sklearn.__version__),
         ('SciPy', scipy.__version__),
     ]
@@ -139,7 +134,7 @@ def show_about_box(parent=None):
     close.setSizePolicy(QSizePolicy.Fixed, QSizePolicy.Fixed)
     close.setDefault(True)
     close.clicked.connect(box.close)
-    vlayout.addWidget(close, alignment=Qt.AlignHCenter)
+    vlayout.addWidget(close, alignment=QtCore.Qt.AlignHCenter)
 
     box.setLayout(vlayout)
 

inselect/gui/app.py

@@ -5,9 +5,9 @@
 
 from pathlib import Path
 
-from qtpy import QtWidgets
-from qtpy.QtCore import QCoreApplication, QLocale, QSettings, QSize, QTimer
-from qtpy.QtGui import QIcon
+from PyQt5 import QtWidgets
+from PyQt5.QtCore import QCoreApplication, QLocale, QSettings, QSize, QTimer
+from PyQt5.QtGui import QIcon
 
 import inselect
 

inselect/gui/colours.py

@@ -1,5 +1,5 @@
-from qtpy.QtCore import QObject, QSettings, Signal
-from qtpy.QtGui import QColor
+from PyQt5.QtCore import QObject, QSettings, pyqtSignal
+from PyQt5.QtGui import QColor
 
 
 LIGHT_BACKGROUND = {
@@ -38,7 +38,7 @@ class ColourSchemeChoice(QObject):
     KEY = 'colour_scheme'
 
     # Emitted when the user picks a new colour scheme
-    colour_scheme_changed = Signal()
+    colour_scheme_changed = pyqtSignal()
 
     def __init__(self):
         super(ColourSchemeChoice, self).__init__()

inselect/gui/cookie_cutter_choice.py

@@ -1,6 +1,6 @@
 from pathlib import Path
 
-from qtpy.QtCore import QObject, QSettings, Signal, QStandardPaths
+from PyQt5.QtCore import QObject, QSettings, pyqtSignal, QStandardPaths
 
 from inselect.lib.cookie_cutter import CookieCutter
 from inselect.lib.utils import debug_print
@@ -25,7 +25,7 @@ class CookieCutterChoice(QObject):
     DIRECTORY_KEY = 'cookie_cutter_last_directory'
 
     # Emitted when the user picks a new file
-    cookie_cutter_changed = Signal()
+    cookie_cutter_changed = pyqtSignal()
 
     def __init__(self):
         super(CookieCutterChoice, self).__init__()

inselect/gui/cookie_cutter_widget.py

@@ -1,6 +1,6 @@
-from qtpy.QtCore import Qt, QObject
-from qtpy.QtGui import QFontMetrics
-from qtpy.QtWidgets import QAction, QFileDialog, QMenu
+from PyQt5.QtCore import Qt, QObject
+from PyQt5.QtGui import QFontMetrics
+from PyQt5.QtWidgets import QAction, QFileDialog, QMenu
 
 from inselect.lib.cookie_cutter import CookieCutter
 from inselect.lib.utils import debug_print

inselect/gui/copy_box.py

@@ -1,6 +1,6 @@
 from functools import partial
 
-from qtpy.QtWidgets import QApplication, QMessageBox
+from PyQt5.QtWidgets import QApplication, QMessageBox
 
 
 def copy_to_clipboard(text):

inselect/gui/info_widget.py

@@ -1,7 +1,7 @@
 import humanize
 import locale
-from qtpy.QtCore import Qt
-from qtpy.QtWidgets import QFormLayout, QLabel, QWidget
+from PyQt5.QtCore import Qt
+from PyQt5.QtWidgets import QFormLayout, QLabel, QWidget
 
 from inselect.lib.utils import format_dt_display
 from inselect.gui.utils import BoldLabel, HorizontalLine, reveal_path

inselect/gui/main_window.py

@@ -6,14 +6,14 @@
 from itertools import count
 from pathlib import Path
 
-from qtpy import QtWidgets
-from qtpy.QtCore import (Qt, QEvent, QSettings, QItemSelection,
-                         QItemSelectionModel, QStandardPaths)
-from qtpy.QtGui import (QColor, QFont, QIcon, QImageWriter, QKeySequence,
-                        QPixmap, QScreen)
-from qtpy.QtWidgets import (QAction, QActionGroup, QFileDialog, QLabel,
-                            QMainWindow, QMenu, QMessageBox, QSizePolicy,
-                            QSplitter, QStackedWidget, QVBoxLayout, QWidget)
+from PyQt5 import QtWidgets
+from PyQt5.QtCore import (Qt, QEvent, QSettings, QItemSelection,
+                          QItemSelectionModel, QStandardPaths)
+from PyQt5.QtGui import (QColor, QFont, QIcon, QImageWriter, QKeySequence,
+                         QPixmap, QScreen)
+from PyQt5.QtWidgets import (QAction, QActionGroup, QFileDialog, QLabel,
+                             QMainWindow, QMenu, QMessageBox, QSizePolicy,
+                             QSplitter, QStackedWidget, QVBoxLayout, QWidget)
 
 # This import is to register our icon resources with QT
 import inselect.gui.icons  # noqa

inselect/gui/model.py

@@ -1,7 +1,7 @@
 from copy import deepcopy
 
-from qtpy.QtCore import Qt, QAbstractItemModel, QModelIndex, QRect, Signal
-from qtpy.QtGui import QPixmap
+from PyQt5.QtCore import Qt, QAbstractItemModel, QModelIndex, QRect, pyqtSignal
+from PyQt5.QtGui import QPixmap
 
 from inselect.lib.utils import debug_print
 
@@ -19,7 +19,7 @@ class Model(QAbstractItemModel):
     # TODO LH Plugins should operate on Model, not InselectDocument
 
     # Emitted when modified status changes
-    modified_changed = Signal()
+    modified_changed = pyqtSignal()
 
     DISPLAY_TEMPLATE = '{0} {1}'
     LEADING_ZEROES = '{0:04d}'

inselect/gui/navigator.py

@@ -1,6 +1,6 @@
-from qtpy.QtCore import QModelIndex, Qt, QRect, QRectF
-from qtpy.QtGui import QBrush, QColor, QPainter, QPen
-from qtpy.QtWidgets import QAbstractItemView, QVBoxLayout, QWidget
+from PyQt5.QtCore import QModelIndex, Qt, QRect, QRectF
+from PyQt5.QtGui import QBrush, QColor, QPainter, QPen
+from PyQt5.QtWidgets import QAbstractItemView, QVBoxLayout, QWidget
 
 from .popup_panel import PopupPanel
 from .roles import PixmapRole

inselect/gui/plugins/barcode.py

@@ -1,6 +1,6 @@
 from itertools import count
 
-from qtpy.QtWidgets import QMessageBox
+from PyQt5.QtWidgets import QMessageBox
 
 import inselect.lib.utils
 

inselect/gui/plugins/barcode_dialog.py

@@ -1,5 +1,5 @@
-from qtpy.QtWidgets import (QDialog, QRadioButton, QVBoxLayout, QLabel, QWidget,
-                            QDialogButtonBox)
+from PyQt5.QtWidgets import (QDialog, QRadioButton, QVBoxLayout, QLabel,
+                             QWidget, QDialogButtonBox)
 
 from inselect.lib.utils import debug_print
 from inselect.gui.utils import HTML_LINK_TEMPLATE, HorizontalLine

inselect/gui/plugins/barcode_settings.py

@@ -1,4 +1,4 @@
-from qtpy.QtCore import QSettings
+from PyQt5.QtCore import QSettings
 
 from inselect.lib.inselect_error import InselectError
 from inselect.lib.utils import debug_print

inselect/gui/plugins/segment.py

@@ -1,4 +1,4 @@
-from qtpy.QtWidgets import QMessageBox
+from PyQt5.QtWidgets import QMessageBox
 
 from inselect.lib.segment_document import SegmentDocument
 from inselect.lib.utils import debug_print

inselect/gui/plugins/subsegment.py

@@ -1,4 +1,4 @@
-from qtpy.QtWidgets import QMessageBox
+from PyQt5.QtWidgets import QMessageBox
 
 from inselect.lib.segment_document import SegmentDocument
 from inselect.lib.utils import debug_print

inselect/gui/popup_panel.py

@@ -1,5 +1,5 @@
-from qtpy.QtCore import Qt
-from qtpy.QtWidgets import QGroupBox, QVBoxLayout, QFrame
+from PyQt5.QtCore import Qt
+from PyQt5.QtWidgets import QGroupBox, QVBoxLayout, QFrame
 
 from .toggle_widget_label import ToggleWidgetLabel
 

inselect/gui/progress_dialog.py

@@ -1,5 +1,5 @@
-from qtpy.QtCore import Qt
-from qtpy.QtWidgets import QProgressDialog
+from PyQt5.QtCore import Qt
+from PyQt5.QtWidgets import QProgressDialog
 
 from inselect.lib.utils import debug_print
 

inselect/gui/recent_documents.py

@@ -1,6 +1,6 @@
 from pathlib import Path
 
-from qtpy.QtCore import QSettings
+from PyQt5.QtCore import QSettings
 
 from inselect.lib.utils import debug_print
 

inselect/gui/ribbon.py

@@ -1,5 +1,5 @@
-from qtpy.QtGui import QBrush, QPainter, QPen
-from qtpy.QtWidgets import QSizePolicy, QTabBar, QTabWidget
+from PyQt5.QtGui import QBrush, QPainter, QPen
+from PyQt5.QtWidgets import QSizePolicy, QTabBar, QTabWidget
 
 
 class Ribbon(QTabWidget):

inselect/gui/roles.py

@@ -1,6 +1,6 @@
 from itertools import count
 
-from qtpy.QtCore import Qt
+from PyQt5.QtCore import Qt
 
 
 _role = count(start=int(Qt.UserRole))

inselect/gui/shortcuts_help.py

@@ -1,10 +1,9 @@
 """Dialog showing a list of shortcuts
 """
-from qtpy.QtCore import Qt, QSettings
-from qtpy.QtWidgets import (QCheckBox, QDialog, QGridLayout, QHBoxLayout,
-                            QLabel, QPushButton, QSizePolicy, QVBoxLayout,
-                            QWidget)
-
+from PyQt5.QtCore import Qt, QSettings
+from PyQt5.QtWidgets import (QCheckBox, QDialog, QGridLayout, QHBoxLayout,
+                             QLabel, QPushButton, QSizePolicy, QVBoxLayout,
+                             QWidget)
 
 from inselect.gui.utils import HorizontalLine, VerticalLine
 from inselect.gui.prompts import format_action_shortcuts, BOXES_VIEW_SHORTCUTS

inselect/gui/sidebar.py

@@ -1,5 +1,5 @@
-from qtpy.QtCore import Qt
-from qtpy.QtWidgets import QScrollArea, QSizePolicy
+from PyQt5.QtCore import Qt
+from PyQt5.QtWidgets import QScrollArea, QSizePolicy
 
 
 class SideBar(QScrollArea):

inselect/gui/sort_document_items.py

@@ -1,4 +1,4 @@
-from qtpy.QtCore import QSettings
+from PyQt5.QtCore import QSettings
 
 from inselect.lib.sort_document_items import sort_document_items
 

inselect/gui/toggle_widget_label.py

@@ -1,6 +1,6 @@
-from qtpy.QtCore import Qt
-from qtpy.QtGui import QPixmap
-from qtpy.QtWidgets import QHBoxLayout, QLabel, QWidget
+from PyQt5.QtCore import Qt
+from PyQt5.QtGui import QPixmap
+from PyQt5.QtWidgets import QHBoxLayout, QLabel, QWidget
 
 
 class ToggleWidgetLabel(QWidget):

inselect/gui/toolbar_ribbon.py

@@ -1,6 +1,6 @@
-from qtpy.QtCore import Qt, QSize
-from qtpy.QtWidgets import (QGridLayout, QSizePolicy, QToolBar, QToolButton,
-                            QWidget)
+from PyQt5.QtCore import Qt, QSize
+from PyQt5.QtWidgets import (QGridLayout, QSizePolicy, QToolBar, QToolButton,
+                             QWidget)
 
 from .ribbon import Ribbon
 

inselect/gui/user_template_choice.py

@@ -1,6 +1,6 @@
 from pathlib import Path
 
-from qtpy.QtCore import QObject, QSettings, Signal, QStandardPaths
+from PyQt5.QtCore import QObject, QSettings, pyqtSignal, QStandardPaths
 
 from inselect.lib.templates.dwc import DWC
 from inselect.lib.user_template import UserTemplate
@@ -28,7 +28,7 @@ class UserTemplateChoice(QObject):
     DEFAULT = DWC
 
     # Emitted when the user picks a new template
-    template_changed = Signal()
+    template_changed = pyqtSignal()
 
     def __init__(self):
         super(UserTemplateChoice, self).__init__()

inselect/gui/user_template_popup_button.py

@@ -1,4 +1,4 @@
-from qtpy.QtWidgets import QAction, QFileDialog, QMenu, QPushButton
+from PyQt5.QtWidgets import QAction, QFileDialog, QMenu, QPushButton
 
 from inselect.lib.user_template import UserTemplate
 from inselect.lib.utils import debug_print

inselect/gui/utils.py

@@ -10,9 +10,9 @@
 
 import sip
 
-from qtpy.QtCore import Qt, QItemSelection, QItemSelectionModel
-from qtpy.QtGui import QColor, QIcon, QImage, QPainter, QPixmap
-from qtpy.QtWidgets import QFrame, QLabel, QMessageBox, QWidget
+from PyQt5.QtCore import Qt, QItemSelection, QItemSelectionModel
+from PyQt5.QtGui import QColor, QIcon, QImage, QPainter, QPixmap
+from PyQt5.QtWidgets import QFrame, QLabel, QMessageBox, QWidget
 
 from . import copy_box
 from functools import reduce

inselect/gui/views/boxes/box_item.py

@@ -2,9 +2,9 @@
 
 from itertools import chain
 
-from qtpy.QtCore import Qt, QRect, QRectF
-from qtpy.QtGui import QPen, QBrush
-from qtpy.QtWidgets import QGraphicsItem, QGraphicsRectItem
+from PyQt5.QtCore import Qt, QRect, QRectF
+from PyQt5.QtGui import QPen, QBrush
+from PyQt5.QtWidgets import QGraphicsItem, QGraphicsRectItem
 
 from inselect.lib.utils import debug_print
 from inselect.gui.colours import colour_scheme_choice

inselect/gui/views/boxes/boxes_scene.py

@@ -1,8 +1,5 @@
-
-
-
-from qtpy.QtCore import Qt
-from qtpy.QtWidgets import QGraphicsScene, QGraphicsItem, QGraphicsPixmapItem
+from PyQt5.QtCore import Qt
+from PyQt5.QtWidgets import QGraphicsScene, QGraphicsItem, QGraphicsPixmapItem
 
 from inselect.lib.utils import debug_print
 

inselect/gui/views/boxes/boxes_view.py

@@ -1,6 +1,6 @@
-from qtpy.QtCore import Qt, QRectF, QSizeF, Signal
-from qtpy.QtGui import QCursor, QPen, QTransform
-from qtpy.QtWidgets import QGraphicsView
+from PyQt5.QtCore import Qt, QRectF, QSizeF, pyqtSignal
+from PyQt5.QtGui import QCursor, QPen, QTransform
+from PyQt5.QtWidgets import QGraphicsView
 
 from inselect.lib.utils import debug_print
 from inselect.gui.utils import unite_rects
@@ -15,7 +15,7 @@ class BoxesView(QGraphicsView):
     # 1.8 was chosen through experimentation to fix #331
     MAXIMUM_ZOOM = 1.8
 
-    viewport_changed = Signal(QRectF)
+    viewport_changed = pyqtSignal(QRectF)
 
     def __init__(self, scene, parent=None):
         super(BoxesView, self).__init__(scene, parent)

inselect/gui/views/boxes/graphics_item_view.py

@@ -1,7 +1,5 @@
-
-
-from qtpy.QtCore import QModelIndex, QRect
-from qtpy.QtWidgets import QAbstractItemView
+from PyQt5.QtCore import QModelIndex, QRect
+from PyQt5.QtWidgets import QAbstractItemView
 
 from inselect.lib.inselect_error import InselectError
 from inselect.lib.utils import debug_print

inselect/gui/views/boxes/resize_handle.py

@@ -1,5 +1,5 @@
-from qtpy.QtCore import Qt, QRectF
-from qtpy.QtWidgets import QGraphicsItem
+from PyQt5.QtCore import Qt, QRectF
+from PyQt5.QtWidgets import QGraphicsItem
 
 from inselect.lib.utils import debug_print