Skip to content

Commit 40b9232

Browse files
[pre-commit.ci] pre-commit autoupdate (#13274)
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com> Co-authored-by: Eric Larson <larson.eric.d@gmail.com>
1 parent b0e9a85 commit 40b9232

File tree

6 files changed

+15
-10
lines changed

6 files changed

+15
-10
lines changed

.pre-commit-config.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
repos:
22
# Ruff mne
33
- repo: https://github.com/astral-sh/ruff-pre-commit
4-
rev: v0.11.11
4+
rev: v0.11.12
55
hooks:
66
- id: ruff
77
name: ruff lint mne
@@ -40,7 +40,7 @@ repos:
4040

4141
# rstcheck
4242
- repo: https://github.com/rstcheck/rstcheck.git
43-
rev: v6.2.4
43+
rev: v6.2.5
4444
hooks:
4545
- id: rstcheck
4646
additional_dependencies:
@@ -82,7 +82,7 @@ repos:
8282

8383
# zizmor
8484
- repo: https://github.com/woodruffw/zizmor-pre-commit
85-
rev: v1.8.0
85+
rev: v1.9.0
8686
hooks:
8787
- id: zizmor
8888

azure-pipelines.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ stages:
113113
- bash: |
114114
set -e
115115
python -m pip install --progress-bar off --upgrade pip
116-
python -m pip install --progress-bar off "mne-qt-browser[opengl] @ git+https://github.com/mne-tools/mne-qt-browser.git" pyvista scikit-learn python-picard qtpy nibabel sphinx-gallery "PySide6!=6.8.0,!=6.8.0.1,!=6.8.1.1" pandas neo pymatreader antio defusedxml
116+
python -m pip install --progress-bar off "mne-qt-browser[opengl] @ git+https://github.com/mne-tools/mne-qt-browser.git" pyvista scikit-learn python-picard qtpy nibabel sphinx-gallery "PySide6!=6.8.0,!=6.8.0.1,!=6.8.1.1,!=6.9.1" pandas neo pymatreader antio defusedxml
117117
python -m pip uninstall -yq mne
118118
python -m pip install --progress-bar off --upgrade -e .[test]
119119
displayName: 'Install dependencies with pip'
@@ -203,7 +203,7 @@ stages:
203203
displayName: 'PyQt6'
204204
- bash: |
205205
set -eo pipefail
206-
python -m pip install "PySide6!=6.8.0,!=6.8.0.1"
206+
python -m pip install "PySide6!=6.8.0,!=6.8.0.1,!=6.9.1"
207207
mne sys_info -pd
208208
mne sys_info -pd | grep "qtpy .* (PySide6=.*)$"
209209
PYTEST_QT_API=PySide6 pytest ${TEST_OPTIONS}

mne/commands/tests/test_commands.py

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44

55
import glob
66
import os
7+
import platform
78
import shutil
89
from os import path as op
910
from pathlib import Path
@@ -102,8 +103,12 @@ def test_compare_fiff():
102103
check_usage(mne_compare_fiff)
103104

104105

106+
# should match ".*valid tag.*" but conda-linux intermittently fails for some reason
107+
@pytest.mark.filterwarnings("ignore:Invalid tag.*:RuntimeWarning")
105108
def test_show_fiff(tmp_path):
106109
"""Test mne compare_fiff."""
110+
if os.getenv("MNE_CI_KIND", "") == "conda" and platform.system() == "Linux":
111+
pytest.skip("Skipping test on conda-linux due to intermittent failures")
107112
check_usage(mne_show_fiff)
108113
with ArgvSetter((raw_fname,)):
109114
mne_show_fiff.run()
@@ -112,9 +117,7 @@ def test_show_fiff(tmp_path):
112117
bad_fname = tmp_path / "test_bad_raw.fif"
113118
with open(bad_fname, "wb") as fout, open(raw_fname, "rb") as fin:
114119
fout.write(fin.read(100000))
115-
# should match ".*valid tag.*" but conda-linux intermittently fails for some reason
116-
with _record_warnings():
117-
lines = show_fiff(bad_fname, output=list)
120+
lines = show_fiff(bad_fname, output=list)
118121
last_line = lines[-1]
119122
assert last_line.endswith(">>>>BAD @9015")
120123
assert "302 = FIFF_EPOCH (734412b >f4)" in last_line

pyproject.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ full-no-qt = [
134134
"xlrd",
135135
]
136136
full-pyqt6 = ["mne[full]"]
137-
full-pyside6 = ["mne[full-no-qt]", "PySide6 != 6.7.0, != 6.8.0, != 6.8.0.1"]
137+
full-pyside6 = ["mne[full-no-qt]", "PySide6 != 6.7.0, != 6.8.0, != 6.8.0.1, != 6.9.1"]
138138
# Dependencies for MNE-Python functions that use HDF5 I/O
139139
hdf5 = ["h5io >= 0.2.4", "pymatreader"]
140140
# Dependencies for running the test infrastructure

tools/github_actions_dependencies.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ if [ ! -z "$CONDA_ENV" ]; then
2323
elif [[ "${MNE_CI_KIND}" == "pip" ]]; then
2424
# Only used for 3.13 at the moment, just get test deps plus a few extras
2525
# that we know are available
26-
INSTALL_ARGS="nibabel scikit-learn numpydoc PySide6 mne-qt-browser pandas h5io mffpy defusedxml numba"
26+
INSTALL_ARGS="nibabel scikit-learn numpydoc PySide6!=6.9.1 mne-qt-browser pandas h5io mffpy defusedxml numba"
2727
INSTALL_KIND="test"
2828
else
2929
test "${MNE_CI_KIND}" == "pip-pre"

tools/hooks/update_environment_file.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,8 @@ def split_dep(dep):
5656
# `environment.yaml` breaks the solver
5757
if package_name == "PySide6":
5858
version_spec = version_spec.replace("!=6.7.0,", "")
59+
# not on CF yet either
60+
version_spec = version_spec.replace(",!=6.9.1", "")
5961
elif package_name == "vtk":
6062
# TODO VERSION remove once we support VTK 9.4
6163
version_spec = "=9.3.1=qt_*"

0 commit comments

Comments
 (0)