Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
repos:
# Ruff mne
- repo: https://github.com/astral-sh/ruff-pre-commit
rev: v0.11.11
rev: v0.11.12
hooks:
- id: ruff
name: ruff lint mne
Expand Down Expand Up @@ -40,7 +40,7 @@ repos:

# rstcheck
- repo: https://github.com/rstcheck/rstcheck.git
rev: v6.2.4
rev: v6.2.5
hooks:
- id: rstcheck
additional_dependencies:
Expand Down Expand Up @@ -82,7 +82,7 @@ repos:

# zizmor
- repo: https://github.com/woodruffw/zizmor-pre-commit
rev: v1.8.0
rev: v1.9.0
hooks:
- id: zizmor

Expand Down
4 changes: 2 additions & 2 deletions azure-pipelines.yml
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ stages:
- bash: |
set -e
python -m pip install --progress-bar off --upgrade pip
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
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
python -m pip uninstall -yq mne
python -m pip install --progress-bar off --upgrade -e .[test]
displayName: 'Install dependencies with pip'
Expand Down Expand Up @@ -203,7 +203,7 @@ stages:
displayName: 'PyQt6'
- bash: |
set -eo pipefail
python -m pip install "PySide6!=6.8.0,!=6.8.0.1"
python -m pip install "PySide6!=6.8.0,!=6.8.0.1,!=6.9.1"
mne sys_info -pd
mne sys_info -pd | grep "qtpy .* (PySide6=.*)$"
PYTEST_QT_API=PySide6 pytest ${TEST_OPTIONS}
Expand Down
9 changes: 6 additions & 3 deletions mne/commands/tests/test_commands.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@

import glob
import os
import platform
import shutil
from os import path as op
from pathlib import Path
Expand Down Expand Up @@ -102,8 +103,12 @@ def test_compare_fiff():
check_usage(mne_compare_fiff)


# should match ".*valid tag.*" but conda-linux intermittently fails for some reason
@pytest.mark.filterwarnings("ignore:Invalid tag.*:RuntimeWarning")
def test_show_fiff(tmp_path):
"""Test mne compare_fiff."""
if os.getenv("MNE_CI_KIND", "") == "conda" and platform.system() == "Linux":
pytest.skip("Skipping test on conda-linux due to intermittent failures")
check_usage(mne_show_fiff)
with ArgvSetter((raw_fname,)):
mne_show_fiff.run()
Expand All @@ -112,9 +117,7 @@ def test_show_fiff(tmp_path):
bad_fname = tmp_path / "test_bad_raw.fif"
with open(bad_fname, "wb") as fout, open(raw_fname, "rb") as fin:
fout.write(fin.read(100000))
# should match ".*valid tag.*" but conda-linux intermittently fails for some reason
with _record_warnings():
lines = show_fiff(bad_fname, output=list)
lines = show_fiff(bad_fname, output=list)
last_line = lines[-1]
assert last_line.endswith(">>>>BAD @9015")
assert "302 = FIFF_EPOCH (734412b >f4)" in last_line
Expand Down
2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@ full-no-qt = [
"xlrd",
]
full-pyqt6 = ["mne[full]"]
full-pyside6 = ["mne[full-no-qt]", "PySide6 != 6.7.0, != 6.8.0, != 6.8.0.1"]
full-pyside6 = ["mne[full-no-qt]", "PySide6 != 6.7.0, != 6.8.0, != 6.8.0.1, != 6.9.1"]
# Dependencies for MNE-Python functions that use HDF5 I/O
hdf5 = ["h5io >= 0.2.4", "pymatreader"]
# Dependencies for running the test infrastructure
Expand Down
2 changes: 1 addition & 1 deletion tools/github_actions_dependencies.sh
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ if [ ! -z "$CONDA_ENV" ]; then
elif [[ "${MNE_CI_KIND}" == "pip" ]]; then
# Only used for 3.13 at the moment, just get test deps plus a few extras
# that we know are available
INSTALL_ARGS="nibabel scikit-learn numpydoc PySide6 mne-qt-browser pandas h5io mffpy defusedxml numba"
INSTALL_ARGS="nibabel scikit-learn numpydoc PySide6!=6.9.1 mne-qt-browser pandas h5io mffpy defusedxml numba"
INSTALL_KIND="test"
else
test "${MNE_CI_KIND}" == "pip-pre"
Expand Down
2 changes: 2 additions & 0 deletions tools/hooks/update_environment_file.py
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,8 @@ def split_dep(dep):
# `environment.yaml` breaks the solver
if package_name == "PySide6":
version_spec = version_spec.replace("!=6.7.0,", "")
# not on CF yet either
version_spec = version_spec.replace(",!=6.9.1", "")
elif package_name == "vtk":
# TODO VERSION remove once we support VTK 9.4
version_spec = "=9.3.1=qt_*"
Expand Down
Loading