Skip to content

Commit 6bed7d3

Browse files
[pre-commit.ci] pre-commit autoupdate (mne-tools#283)
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
1 parent cfa0f60 commit 6bed7d3

File tree

8 files changed

+19
-40
lines changed

8 files changed

+19
-40
lines changed

.github/workflows/qt_viz_tests.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ jobs:
3434
- os: ubuntu
3535
mne: maint/1.5
3636
opengl: 'opengl'
37-
python: '3.9'
37+
python: '3.10'
3838
name: old
3939
- os: ubuntu
4040
mne: main
@@ -111,7 +111,7 @@ jobs:
111111
os: [ubuntu]
112112
mne: [main]
113113
opengl: [opengl]
114-
qt: [PyQt5, PyQt6, PySide2, PySide6]
114+
qt: [PyQt5, PyQt6, PySide6]
115115
python: ['3.10'] # When going to 3.11, PySide2 should be removed or special-cased
116116
name: [matrix]
117117
include:
@@ -189,7 +189,7 @@ jobs:
189189
# case given our primary target moving forward is Qt6+
190190
- run: pytest mne_qt_browser/tests/test_speed.py --cov-report=xml --cov-append
191191
name: Run benchmarks
192-
if: runner.os != 'Linux' || (matrix.qt != 'PySide2' && matrix.qt != 'PyQt5')
192+
if: runner.os != 'Linux' || matrix.qt != 'PyQt5'
193193
- uses: codecov/codecov-action@v4
194194
if: always()
195195
with:

.pre-commit-config.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
repos:
22
- repo: https://github.com/astral-sh/ruff-pre-commit
3-
rev: v0.5.7
3+
rev: v0.6.1
44
hooks:
55
- id: ruff
66
args: ["--fix"]

mne_qt_browser/_fixes.py

-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
# -*- coding: utf-8 -*-
21
"""Backports for older installations."""
32

43
# Author: Martin Schulz <[email protected]>

mne_qt_browser/_pg_figure.py

+13-30
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
# -*- coding: utf-8 -*-
21
"""Base classes and functions for 2D browser backends."""
32

43
# Author: Martin Schulz <[email protected]>
@@ -1457,7 +1456,7 @@ def mouseDragEvent(self, event, axis=None):
14571456
self.mne.overview_bar.update_annotations()
14581457
else:
14591458
x_to = self.mapSceneToView(event.scenePos()).x()
1460-
with SignalBlocker(self._drag_region):
1459+
with QSignalBlocker(self._drag_region):
14611460
self._drag_region.setRegion((self._drag_start, x_to))
14621461

14631462
elif event.isFinish():
@@ -2481,7 +2480,7 @@ def _region_changed(self):
24812480
for region in overlapping_regions:
24822481
self.weakmain()._remove_region(region, from_annot=False)
24832482
# re-set while blocking the signal to avoid re-running this function
2484-
with SignalBlocker(self):
2483+
with QSignalBlocker(self):
24852484
self.setRegion((onset, offset))
24862485

24872486
self.update_label_pos()
@@ -2654,7 +2653,7 @@ def mouseDragEvent(self, ev):
26542653
for pos in new_pos:
26552654
pos.setX(pos.x() - shift)
26562655

2657-
with SignalBlocker(self.lines[0]):
2656+
with QSignalBlocker(self.lines[0]):
26582657
for pos, line in zip(new_pos, self.lines):
26592658
line.setPos(pos)
26602659
self.prepareGeometryChange()
@@ -3066,9 +3065,9 @@ def update_values(self, region):
30663065
rgn = region.getRegion()
30673066
self.start_bx.setEnabled(True)
30683067
self.stop_bx.setEnabled(True)
3069-
with SignalBlocker(self.start_bx):
3068+
with QSignalBlocker(self.start_bx):
30703069
self.start_bx.setValue(rgn[0])
3071-
with SignalBlocker(self.stop_bx):
3070+
with QSignalBlocker(self.stop_bx):
30723071
self.stop_bx.setValue(rgn[1])
30733072

30743073
def _update_description_cmbx(self):
@@ -3087,9 +3086,9 @@ def reset(self):
30873086
if self.description_cmbx.count() > 0:
30883087
self.description_cmbx.setCurrentIndex(0)
30893088
self.mne.current_description = self.description_cmbx.currentText()
3090-
with SignalBlocker(self.start_bx):
3089+
with QSignalBlocker(self.start_bx):
30913090
self.start_bx.setValue(0)
3092-
with SignalBlocker(self.stop_bx):
3091+
with QSignalBlocker(self.stop_bx):
30933092
self.stop_bx.setValue(1 / self.mne.info["sfreq"])
30943093

30953094
def _show_help(self):
@@ -4096,7 +4095,7 @@ def hscroll(self, step):
40964095
del step
40974096

40984097
# Get current range and add step to it
4099-
xmin, xmax = [i + rel_step for i in self.mne.viewbox.viewRange()[0]]
4098+
xmin, xmax = (i + rel_step for i in self.mne.viewbox.viewRange()[0])
41004099

41014100
if xmin < 0:
41024101
xmin = 0
@@ -4125,7 +4124,7 @@ def vscroll(self, step):
41254124
step = self.mne.n_channels
41264125
elif step == "-full":
41274126
step = -self.mne.n_channels
4128-
ymin, ymax = [i + step for i in self.mne.viewbox.viewRange()[1]]
4127+
ymin, ymax = (i + step for i in self.mne.viewbox.viewRange()[1])
41294128

41304129
if ymin < 0:
41314130
ymin = 0
@@ -4696,9 +4695,9 @@ def _remove_region(self, region, from_annot=True):
46964695
# disable, reset start/stop doubleSpinBox until another region is selected
46974696
self.mne.fig_annotation.start_bx.setEnabled(False)
46984697
self.mne.fig_annotation.stop_bx.setEnabled(False)
4699-
with SignalBlocker(self.mne.fig_annotation.start_bx):
4698+
with QSignalBlocker(self.mne.fig_annotation.start_bx):
47004699
self.mne.fig_annotation.start_bx.setValue(0)
4701-
with SignalBlocker(self.mne.fig_annotation.stop_bx):
4700+
with QSignalBlocker(self.mne.fig_annotation.stop_bx):
47024701
self.mne.fig_annotation.stop_bx.setValue(1 / self.mne.info["sfreq"])
47034702

47044703
# Remove from annotations
@@ -5191,12 +5190,12 @@ def _fake_click(
51915190
add_points[idx] = self.mne.viewbox.mapViewToScene(Point(*apoint))
51925191

51935192
elif xform == "none" or xform is None:
5194-
if isinstance(point, (tuple, list)):
5193+
if isinstance(point, tuple | list):
51955194
point = Point(*point)
51965195
else:
51975196
point = Point(point)
51985197
for idx, apoint in enumerate(add_points):
5199-
if isinstance(apoint, (tuple, list)):
5198+
if isinstance(apoint, tuple | list):
52005199
add_points[idx] = Point(*apoint)
52015200
else:
52025201
add_points[idx] = Point(apoint)
@@ -5452,22 +5451,6 @@ def _init_browser(**kwargs):
54525451
return browser
54535452

54545453

5455-
class SignalBlocker(QSignalBlocker):
5456-
"""Wrapper to use QSignalBlocker as a context manager in PySide2."""
5457-
5458-
def __enter__(self):
5459-
if hasattr(super(), "__enter__"):
5460-
super().__enter__()
5461-
else:
5462-
super().reblock()
5463-
5464-
def __exit__(self, exc_type, exc_value, traceback):
5465-
if hasattr(super(), "__exit__"):
5466-
super().__exit__(exc_type, exc_value, traceback)
5467-
else:
5468-
super().unblock()
5469-
5470-
54715454
def _set_window_flags(widget):
54725455
if os.getenv("_MNE_BROWSER_BACK", "").lower() == "true":
54735456
widget.setWindowFlags(widget.windowFlags() | Qt.WindowStaysOnBottomHint)

mne_qt_browser/conftest.py

-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
# -*- coding: utf-8 -*-
21
# Authors: Eric Larson <[email protected]>
32
# Martin Schulz <[email protected]>
43
#

mne_qt_browser/tests/test_pg_specific.py

-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
# -*- coding: utf-8 -*-
21
# Author: Martin Schulz <[email protected]>
32
#
43
# License: BSD-3-Clause

mne_qt_browser/tests/test_speed.py

-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
# -*- coding: utf-8 -*-
21
# Authors: Eric Larson <[email protected]>
32
# Martin Schulz <[email protected]>
43
#

pyproject.toml

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ build-backend = "hatchling.build"
66
name = "mne-qt-browser"
77
description = "A new backend based on pyqtgraph for the 2D-Data-Browser in MNE-Python"
88
readme = "README.md"
9-
requires-python = ">=3.9"
9+
requires-python = ">=3.10"
1010
license = { file = "LICENSE" }
1111
keywords = ["science", "neuroscience", "psychology"]
1212
authors = [{ name = "Martin Schulz", email = "[email protected]" }]
@@ -68,7 +68,7 @@ filterwarnings = [
6868
]
6969

7070
[tool.ruff.lint]
71-
select = ["E", "F", "W", "D", "I"]
71+
select = ["E", "F", "W", "D", "I", "UP"]
7272
exclude = ["__init__.py"]
7373
ignore = [
7474
"D100", # Missing docstring in public module

0 commit comments

Comments
 (0)