Merge branch 'main' into decoding_ncomps

.github/workflows/linux_conda.yml

@@ -20,8 +20,6 @@ jobs:
       run:
         shell: bash -el {0}
     env:
-      CONDA_ENV: 'environment.yml'
-      DISPLAY: ':99.0'
       MNE_LOGGING_LEVEL: 'warning'
       MKL_NUM_THREADS: '1'
       PYTHONUNBUFFERED: '1'
@@ -34,7 +32,7 @@ jobs:
           pyvista: false
       - uses: mamba-org/setup-micromamba@v1
         with:
-          environment-file: ${{ env.CONDA_ENV }}
+          environment-file: environment.yml
           create-args: >- # beware the >- instead of |, we don't split on newlines but on spaces
             python=${{ env.PYTHON_VERSION }}
       - run: |

.pre-commit-config.yaml

@@ -1,7 +1,7 @@
 repos:
   # Ruff mne_connectivity
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.5.2
+    rev: v0.5.4
     hooks:
       - id: ruff
         name: ruff lint mne_connectivity
@@ -10,7 +10,7 @@ repos:
 
   # Ruff tutorials and examples
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.5.2
+    rev: v0.5.4
     hooks:
       - id: ruff
         name: ruff lint tutorials and examples

environment.yml

@@ -7,7 +7,7 @@ dependencies:
   - numpy
   - scipy
   - xarray
-  - matplotlib
+  - matplotlib-base
   - tqdm
   - pooch>=1.5
   - decorator
@@ -20,6 +20,6 @@ dependencies:
   - pyvista>=0.32,!=0.35.2,!=0.38.0,!=0.38.1,!=0.38.2,!=0.38.3,!=0.38.4,!=0.38.5
   - pyvistaqt>=0.4
   - qtpy
-  - pyqt!=5.15.3,!=5.15.4
-  - mne>=1.3
+  - mne-base>=1.3
   - h5netcdf
+  - pyside6

pyproject.toml

@@ -52,6 +52,7 @@ all = [
   'mne-connectivity[gui]',
   'mne-connectivity[style]',
   'mne-connectivity[test]',
+  'PyQt6',
 ]
 build = [
   'build',
@@ -82,7 +83,6 @@ gui = [
   'h5netcdf',
   'matplotlib',
   'mne-qt-browser>=0.6.0',
-  'PyQt6',
   'pyvista',
   'pyvistaqt',
   'qtpy',
@@ -107,7 +107,6 @@ test = [
   'mne-connectivity[gui]',
   'pandas',
   'pymatreader',
-  'PyQt6',
   'pytest-cov',
   'pytest<8.0.0',
   'statsmodels',