Merge remote-tracking branch 'upstream/main' into lazy-loading

* upstream/main: [pre-commit.ci] pre-commit autoupdate (mne-tools#11911) [BUG, MRG] Remove check on `mne.viz.Brain.add_volume_labels` (mne-tools#11889) Small splits fix (mne-tools#11905) adds niseq package to "Related software" (mne-tools#11909) Minor fixes for ERDS maps example (mne-tools#11904) FIX: Fix pyvista rendering (mne-tools#11896) BUG: Fix epoch splits naming (mne-tools#11876) ENH: Use section-title for HTML anchors in Report (mne-tools#11890) CI: Deploy [circle deploy] MAINT: Clean up whats_new and doc versions (mne-tools#11888) Refactor test_epochs.py::test_split_saving (2 out of 2) (mne-tools#11884) Cross-figure event passing system (mne-tools#11685) MAINT: Post-release deprecations, updates [circle deploy] (mne-tools#11887) MAINT: Release 1.5.0 (mne-tools#11886) [pre-commit.ci] pre-commit autoupdate (mne-tools#11883) Refactor test_epochs.py::test_split_saving (1 out of 2) (mne-tools#11880) FIX: Missing Saccade information in Eyelink File (mne-tools#11877) Improve drawing of annotations with matplotlib (mne-tools#11855) MAINT: Work around NumPy deprecation (mne-tools#11878)
drammock · Aug 22, 2023 · 8149b4a · 8149b4a
2 parents 594904c + 3e32781
commit 8149b4a
Show file tree

Hide file tree

Showing 111 changed files with 1,768 additions and 809 deletions.
diff --git a/.mailmap b/.mailmap
@@ -108,6 +108,7 @@ Frederik D. Weber <Frederik-D-Weber@users.noreply.github.com> Frederik-D-Weber <
 Fu-Te Wong <zuxfoucault@gmail.com> foucault <zuxfoucault@gmail.com>
 Fu-Te Wong <zuxfoucault@gmail.com> zuxfoucault <zuxfoucault@yahoo.com.tw>
 Gansheng Tan <49130176+GanshengT@users.noreply.github.com> Gansheng TAN <49130176+GanshengT@users.noreply.github.com>
+Gennadiy Belonosov <7503709+Genuster@users.noreply.github.com> Gennadiy <7503709+Genuster@users.noreply.github.com>
 Giorgio Marinato <giorgio.marinato@unitn.it> neurogima <76406896+neurogima@users.noreply.github.com>
 Guillaume Dumas <deep@introspection.eu> deep-introspection <deep@introspection.eu>
 Guillaume Dumas <deep@introspection.eu> Guillaume Dumas <deep-introspection@users.noreply.github.com>
@@ -155,6 +156,7 @@ José C. García Alanis <joialanisson@gmail.com> José C. G. Alanis <12409129+Jo
 José C. García Alanis <joialanisson@gmail.com> José C. García Alanis <12409129+JoseAlanis@users.noreply.github.com>
 Joshua J Bear <joshbear@users.noreply.github.com>
 Joshua Teves <jbtevespro@gmail.com> Joshua Teves <joshua.teves@nih.gov>
+Joshua Calder-Travis <38797399+jCalderTravis@users.noreply.github.com> jCalderTravis <38797399+jCalderTravis@users.noreply.github.com>
 Julius Welzel <52565341+JuliusWelzel@users.noreply.github.com> jwelzel <52565341+JuliusWelzel@users.noreply.github.com>
 Kaisu Lankinen <41806798+klankinen@users.noreply.github.com> klankinen <41806798+klankinen@users.noreply.github.com>
 Kambiz Tabavi <ktavabi@gmail.com> Kambiz Tavabi <ktavabi@uw.edu>
@@ -248,6 +250,7 @@ Pierre-Antoine Bannier <pierreantoine.bannier@gmail.com> Pierre-Antoine Bannier
 Pierre-Antoine Bannier <pierreantoine.bannier@gmail.com> Pierre-Antoine Bannier <pierre-antoine@mbpdepieantoine.home>
 Praveen Sripad <pravsripad@gmail.com> prav <prav@prav-dell.(none)>
 Praveen Sripad <pravsripad@gmail.com> prav <pravsripad@gmail.com>
+Proloy Das <pdas6@mgh.harvard.edu> pdas6 <pdas6@mgh.harvard.edu>
 Ram Pari <ramsbam@gmail.com> Ram <ramsbam@gmail.com>
 Ramonapariciog Apariciogarcia <moncho_apa@hotmail.com> ramonapariciog <moncho_apa@hotmail.com>
 Reza Nasri <reza@ddpo.ir> Reza <qablameh13@gmail.com>
@@ -301,4 +304,5 @@ Yousra Bekhti <yousra.bekhti@gmail.com> Yoursa BEKHTI <ybekhti@is222485.intra.ce
 Yousra Bekhti <yousra.bekhti@gmail.com> Yoursa BEKHTI <yousra.bekhti@gmail.com>
 Yousra Bekhti <yousra.bekhti@gmail.com> Yousra BEKHTI <yousra.bekhti@gmail.com>
 Yousra Bekhti <yousra.bekhti@gmail.com> yousrabk <yousra.bekhti@gmail.com>
+Yiping Zuo <frostime@foxmail.com> Frostime <frostime@foxmail.com>
 Zhi Zhang <850734033@qq.com> ZHANG Zhi <850734033@qq.com>
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -7,15 +7,15 @@ repos:
 
   # Ruff mne
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.0.282
+    rev: v0.0.285
     hooks:
       - id: ruff
         name: ruff mne
         files: ^mne/
 
   # Ruff tutorials and examples
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.0.282
+    rev: v0.0.285
     hooks:
       - id: ruff
         name: ruff tutorials and examples

diff --git a/CITATION.cff b/CITATION.cff
@@ -1,9 +1,9 @@
 cff-version: 1.2.0
 title: "MNE-Python"
 message: "If you use this software, please cite both the software itself, and the paper listed in the preferred-citation field."
-version: 1.4.0
-date-released: "2023-05-10"
-commit: 425e3b34439bfcff68f4f926b886aaba9a02478c
+version: 1.5.0
+date-released: "2023-08-15"
+commit: 5645d375f52727eb563bd46a45422fc1a55e9f1a
 doi: 10.5281/zenodo.592483
 keywords:
   - MEG
@@ -55,10 +55,10 @@ authors:
     given-names: Mark
   - family-names: Holdgraf
     given-names: Chris
-  - family-names: Massich
-    given-names: Joan
   - family-names: Rockhill
     given-names: Alex
+  - family-names: Massich
+    given-names: Joan
   - family-names: Bekhti
     given-names: Yousra
   - family-names: Appelhoff
@@ -67,6 +67,8 @@ authors:
     given-names: Alan
   - family-names: Dykstra
     given-names: Andrew
+  - family-names: Scheltienne
+    given-names: Mathieu
   - family-names: Luke
     given-names: Rob
   - family-names: Trachel
@@ -77,8 +79,6 @@ authors:
     given-names: Asish
   - family-names: Magnuski
     given-names: Mikołaj
-  - family-names: Scheltienne
-    given-names: Mathieu
   - family-names: Westner
     given-names: Britta
   - family-names: Billinger
@@ -133,6 +133,8 @@ authors:
     given-names: Christoph
   - family-names: Dumas
     given-names: Guillaume
+  - family-names: Huberty
+    given-names: Scott
   - family-names: Hartmann
     given-names: Thomas
   - family-names: Orfanos
@@ -204,8 +206,8 @@ authors:
     given-names: Michiru
   - family-names: Klein
     given-names: Natalie
-  - family-names: Huberty
-    given-names: Scott
+  - family-names: Kern
+    given-names: Simon
   - family-names: Rantala
     given-names: Antti
   - family-names: Maess
@@ -228,8 +230,8 @@ authors:
     given-names: Pierre-Antoine
   - family-names: Choudhary
     given-names: Saket
-  - family-names: Kern
-    given-names: Simon
+  - family-names: Gramfort
+    given-names: Alexandre
   - family-names: Forster
     given-names: Carina
   - family-names: Kim
@@ -256,7 +258,6 @@ authors:
     given-names: Nathalie
   - family-names: Ward
     given-names: Nick
-  - name: dependabot[bot]
   - family-names: Quinn
     given-names: Andrew
   - family-names: Gauthier
@@ -283,6 +284,8 @@ authors:
     given-names: Jan
   - family-names: Stout
     given-names: Jeff
+  - family-names: Calder-Travis
+    given-names: Joshua
   - family-names: Eisenman
     given-names: Larry
   - family-names: Esch
@@ -313,8 +316,6 @@ authors:
     given-names: Alessandro
   - family-names: Kovrig
     given-names: Alexander
-  - family-names: Gramfort
-    given-names: Alexandre
   - family-names: Pascarella
     given-names: Annalisa
   - family-names: Karekal
@@ -325,6 +326,8 @@ authors:
     given-names: Chetan
   - family-names: Zhao
     given-names: Christina
+  - family-names: Altukhov
+    given-names: Dmitrii
   - family-names: Krzemiński
     given-names: Dominik
   - family-names: Welke
@@ -333,6 +336,12 @@ authors:
     given-names: Dominique
   - family-names: Mikulan
     given-names: Ezequiel
+  - family-names: Belonosov
+    given-names: Gennadiy
+  - family-names: O'Neill
+    given-names: George
+  - family-names: Woessner
+    given-names: Jacob
   - family-names: Schiratti
     given-names: Jean-Baptiste
   - family-names: Evans
@@ -406,6 +415,8 @@ authors:
     given-names: Tziona
   - name: akshay0724
   - name: sviter
+  - family-names: Earle-Richardson
+    given-names: Aaron
   - family-names: Hindle
     given-names: Abram
   - family-names: Koutsou
@@ -450,6 +461,8 @@ authors:
     given-names: Daniel Carlström
   - family-names: Hasegan
     given-names: Daniel
+  - family-names: Tse
+    given-names: Daniel
   - family-names: Sleiter
     given-names: Darin Erat
   - family-names: Haslacher
@@ -462,8 +475,8 @@ authors:
     given-names: Desislava
   - family-names: Issagaliyeva
     given-names: Dinara
-  - family-names: Altukhov
-    given-names: Dmitrii
+  - family-names: Das
+    given-names: Diptyajit
   - family-names: Wetzel
     given-names: Dominik
   - family-names: Eich
@@ -496,11 +509,11 @@ authors:
     given-names: Geoff
   - family-names: O'Neill
     given-names: George
-  - family-names: O'Neill
-    given-names: George
   - name: Giulio
   - family-names: Maymandi
     given-names: Hamid
+  - family-names: Abdelhedi
+    given-names: Hamza
   - family-names: Sonntag
     given-names: Hermann
   - family-names: Ye
@@ -511,8 +524,6 @@ authors:
     given-names: Hüseyin Orkun
   - family-names: Machairas
     given-names: Ilias
-  - family-names: Woessner
-    given-names: Jacob
   - family-names: Kaczmarzyk
     given-names: Jakub
   - family-names: Zerfowski
@@ -610,6 +621,8 @@ authors:
     given-names: Pedro
   - family-names: Molfese
     given-names: Peter J
+  - family-names: Das
+    given-names: Proloy
   - family-names: Li
     given-names: Quanliang
   - family-names: Barthélemy
@@ -638,6 +651,8 @@ authors:
     given-names: Sagun
   - family-names: Perry
     given-names: Sam
+  - family-names: Louviot
+    given-names: Samuel
   - family-names: Ruuskanen
     given-names: Santeri
   - family-names: Saha
@@ -676,6 +691,8 @@ authors:
     given-names: T
   - family-names: Donoghue
     given-names: Thomas
+  - family-names: Moreau
+    given-names: Thomas
   - family-names: Radman
     given-names: Thomas
   - family-names: Gates
@@ -690,6 +707,8 @@ authors:
     given-names: Toomas Erik
   - family-names: Xia
     given-names: Xiaokai
+  - family-names: Zuo
+    given-names: Yiping
   - family-names: Zhang
     given-names: Zhi
   - name: buildqa

diff --git a/README.rst b/README.rst
@@ -88,9 +88,9 @@ Dependencies
 The minimum required dependencies to run MNE-Python are:
 
 - Python >= 3.8
-- NumPy >= 1.20.2
-- SciPy >= 1.6.3
-- Matplotlib >= 3.4.0
+- NumPy >= 1.21.2
+- SciPy >= 1.7.1
+- Matplotlib >= 3.4.3
 - pooch >= 1.5
 - tqdm
 - Jinja2
@@ -99,7 +99,7 @@ The minimum required dependencies to run MNE-Python are:
 
 For full functionality, some functions require:
 
-- Scikit-learn >= 0.24.2
+- Scikit-learn >= 1.0
 - joblib >= 0.15 (for parallelization control)
 - mne-qt-browser >= 0.1 (for fast raw data visualization)
 - Qt5 >= 5.12 via one of the following bindings (for fast raw data visualization and interactive 3D visualization):
@@ -109,10 +109,10 @@ For full functionality, some functions require:
   - PyQt5 >= 5.12
   - PySide2 >= 5.12
 
-- Numba >= 0.53.1
+- Numba >= 0.54.0
 - NiBabel >= 3.2.1
 - OpenMEEG >= 2.5.6
-- Pandas >= 1.2.4
+- Pandas >= 1.3.2
 - Picard >= 0.3
 - CuPy >= 9.0.0 (for NVIDIA CUDA acceleration)
 - DIPY >= 1.4.0

diff --git a/SECURITY.md b/SECURITY.md
@@ -10,9 +10,9 @@ without a proper 6-month deprecation cycle.
 
 | Version | Supported                |
 | ------- | ------------------------ |
-| 1.5.x   | :heavy_check_mark: (dev) |
-| 1.4.x   | :heavy_check_mark:       |
-| < 1.4   | :x:                      |
+| 1.6.x   | :heavy_check_mark: (dev) |
+| 1.5.x   | :heavy_check_mark:       |
+| < 1.5   | :x:                      |
 
 ## Reporting a Vulnerability
 

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -108,7 +108,7 @@ stages:
           - bash: |
               set -e
               python -m pip install --progress-bar off --upgrade pip setuptools wheel
-              python -m pip install --progress-bar off mne-qt-browser[opengl] pyvista scikit-learn pytest-error-for-skips python-picard "PyQt6!=6.5.1" qtpy
+              python -m pip install --progress-bar off "mne-qt-browser[opengl] @ git+https://github.com/mne-tools/mne-qt-browser.git@main" pyvista scikit-learn pytest-error-for-skips python-picard "PyQt6!=6.5.1" qtpy
               python -m pip uninstall -yq mne
               python -m pip install --progress-bar off --upgrade -e .[test]
             displayName: 'Install dependencies with pip'