From 1edf14af4d42c891ba27368c800b1f89d9f77dcb Mon Sep 17 00:00:00 2001 From: timonmerk Date: Mon, 2 Oct 2023 19:26:37 +0200 Subject: [PATCH 1/7] Update _pg_figure.py --- mne_qt_browser/_pg_figure.py | 32 ++++++++++++++++++++------------ 1 file changed, 20 insertions(+), 12 deletions(-) diff --git a/mne_qt_browser/_pg_figure.py b/mne_qt_browser/_pg_figure.py index f815127f..00187d71 100644 --- a/mne_qt_browser/_pg_figure.py +++ b/mne_qt_browser/_pg_figure.py @@ -21,18 +21,26 @@ from os.path import getsize import numpy as np -from qtpy.QtCore import ( - QEvent, - QThread, - Qt, - Signal, - QRectF, - QLineF, - QPointF, - QPoint, - QSettings, - QSignalBlocker, -) + +try: + from qtpy.QtCore import ( + QEvent, + QThread, + Qt, + Signal, + QRectF, + QLineF, + QPointF, + QPoint, + QSettings, + QSignalBlocker, + ) +except Exception as exc: + if exc.__class__.__name__ == "QtBindingsNotFoundError": + raise ImportError("No Qt binding found, please install pyqt5") from None + else: + raise exc + from qtpy.QtGui import ( QFont, QIcon, From 6b357b4e9ab81f306d02a9b26358d178418e68b1 Mon Sep 17 00:00:00 2001 From: timonmerk Date: Mon, 2 Oct 2023 19:59:04 +0200 Subject: [PATCH 2/7] Update mne_qt_browser/_pg_figure.py Co-authored-by: Eric Larson --- mne_qt_browser/_pg_figure.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mne_qt_browser/_pg_figure.py b/mne_qt_browser/_pg_figure.py index 00187d71..04484337 100644 --- a/mne_qt_browser/_pg_figure.py +++ b/mne_qt_browser/_pg_figure.py @@ -37,7 +37,7 @@ ) except Exception as exc: if exc.__class__.__name__ == "QtBindingsNotFoundError": - raise ImportError("No Qt binding found, please install pyqt5") from None + raise ImportError("No Qt binding found, please install PyQt6, PyQt5, PySide6, or PySide2") from None else: raise exc From a0a1a8e0a5de8fcd7d98a514eb5563473098d4ba Mon Sep 17 00:00:00 2001 From: timonmerk Date: Mon, 2 Oct 2023 19:59:10 +0200 Subject: [PATCH 3/7] Update mne_qt_browser/_pg_figure.py Co-authored-by: Eric Larson --- mne_qt_browser/_pg_figure.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mne_qt_browser/_pg_figure.py b/mne_qt_browser/_pg_figure.py index 04484337..ea4a38b2 100644 --- a/mne_qt_browser/_pg_figure.py +++ b/mne_qt_browser/_pg_figure.py @@ -39,7 +39,7 @@ if exc.__class__.__name__ == "QtBindingsNotFoundError": raise ImportError("No Qt binding found, please install PyQt6, PyQt5, PySide6, or PySide2") from None else: - raise exc + raise from qtpy.QtGui import ( QFont, From 1bb35f3b0637b7e941096031ef9b96b4cc3ae991 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Mon, 2 Oct 2023 17:59:13 +0000 Subject: [PATCH 4/7] [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --- mne_qt_browser/_pg_figure.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/mne_qt_browser/_pg_figure.py b/mne_qt_browser/_pg_figure.py index ea4a38b2..5c48045e 100644 --- a/mne_qt_browser/_pg_figure.py +++ b/mne_qt_browser/_pg_figure.py @@ -37,7 +37,9 @@ ) except Exception as exc: if exc.__class__.__name__ == "QtBindingsNotFoundError": - raise ImportError("No Qt binding found, please install PyQt6, PyQt5, PySide6, or PySide2") from None + raise ImportError( + "No Qt binding found, please install PyQt6, PyQt5, PySide6, or PySide2" + ) from None else: raise From 31beddf2ade0c6e49da4b6a294eb75f506b1041c Mon Sep 17 00:00:00 2001 From: timonmerk Date: Mon, 2 Oct 2023 20:00:42 +0200 Subject: [PATCH 5/7] Update _pg_figure.py --- mne_qt_browser/_pg_figure.py | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/mne_qt_browser/_pg_figure.py b/mne_qt_browser/_pg_figure.py index 5c48045e..5a7bc503 100644 --- a/mne_qt_browser/_pg_figure.py +++ b/mne_qt_browser/_pg_figure.py @@ -23,18 +23,7 @@ import numpy as np try: - from qtpy.QtCore import ( - QEvent, - QThread, - Qt, - Signal, - QRectF, - QLineF, - QPointF, - QPoint, - QSettings, - QSignalBlocker, - ) + from qtpy.QtCore import Qt except Exception as exc: if exc.__class__.__name__ == "QtBindingsNotFoundError": raise ImportError( @@ -43,6 +32,18 @@ else: raise + from qtpy.QtCore import ( + QEvent, + QThread, + Qt, + Signal, + QRectF, + QLineF, + QPointF, + QPoint, + QSettings, + QSignalBlocker, +) from qtpy.QtGui import ( QFont, QIcon, From 37f7ba103cff22baf7e5787a472492872f2a59a3 Mon Sep 17 00:00:00 2001 From: timonmerk Date: Mon, 2 Oct 2023 20:01:35 +0200 Subject: [PATCH 6/7] Update _pg_figure.py --- mne_qt_browser/_pg_figure.py | 1 - 1 file changed, 1 deletion(-) diff --git a/mne_qt_browser/_pg_figure.py b/mne_qt_browser/_pg_figure.py index 5a7bc503..72a595a1 100644 --- a/mne_qt_browser/_pg_figure.py +++ b/mne_qt_browser/_pg_figure.py @@ -35,7 +35,6 @@ from qtpy.QtCore import ( QEvent, QThread, - Qt, Signal, QRectF, QLineF, From c051f315df46aa7a6f17bb3665ae04db9cb63c76 Mon Sep 17 00:00:00 2001 From: Eric Larson Date: Mon, 2 Oct 2023 14:57:05 -0400 Subject: [PATCH 7/7] Update mne_qt_browser/_pg_figure.py --- mne_qt_browser/_pg_figure.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mne_qt_browser/_pg_figure.py b/mne_qt_browser/_pg_figure.py index 72a595a1..a794ac20 100644 --- a/mne_qt_browser/_pg_figure.py +++ b/mne_qt_browser/_pg_figure.py @@ -32,7 +32,7 @@ else: raise - from qtpy.QtCore import ( +from qtpy.QtCore import ( QEvent, QThread, Signal,