From 9da274b0aa07ad29af259c428e08275f08a6c1cb Mon Sep 17 00:00:00 2001
From: "pre-commit-ci[bot]"
 <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Date: Mon, 17 Jun 2024 21:36:40 +0000
Subject: [PATCH 1/8] [pre-commit.ci] pre-commit autoupdate
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

updates:
- [github.com/astral-sh/ruff-pre-commit: v0.4.8 → v0.4.9](https://github.com/astral-sh/ruff-pre-commit/compare/v0.4.8...v0.4.9)
---
 .pre-commit-config.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 323da6068..093d949a7 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -1,7 +1,7 @@
 repos:
   # Ruff mne
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.4.8
+    rev: v0.4.9
     hooks:
       - id: ruff
         args: ["--fix"]

From 77baa73962bbe21be22e37df2d4cc23232944b1c Mon Sep 17 00:00:00 2001
From: Eric Larson <larson.eric.d@gmail.com>
Date: Tue, 18 Jun 2024 10:20:34 -0400
Subject: [PATCH 2/8] FIX: Tables

---
 .github/workflows/tests.yml | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 70651e0c9..4ad88a885 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -60,9 +60,11 @@ jobs:
       - run: pip install --upgrade --pre -e ./mne-python git+https://github.com/nilearn/nilearn
         if: matrix.mne == 'dev'
         name: Install MNE and nilearn dev
-      # - run: pip install --upgrade --pre --force --only-binary=":all:" --index-url "https://pypi.anaconda.org/scientific-python-nightly-wheels/simple" "numpy>=2.0.0rc1" scipy h5py matplotlib pandas scikit-learn statsmodels "tables>=3.9.3.dev0"
-      #   if: matrix.mne == 'dev' && startsWith(matrix.os, 'ubuntu')
-      #   name: Install numpy, scipy, nilearn pre
+      # Tables on PyPI is not NumPy 2.0 compatible
+      - run: pip install --only-binary=":all:" --index-url "https://pypi.anaconda.org/scientific-python-nightly-wheels/simple" "tables>=3.9.3.dev0"
+      - run: pip install --upgrade --pre --force --only-binary=":all:" --index-url "https://pypi.anaconda.org/scientific-python-nightly-wheels/simple" "numpy>=2.0.0rc1" scipy h5py matplotlib pandas scikit-learn statsmodels "tables>=3.9.3.dev0"
+        if: matrix.mne == 'dev' && startsWith(matrix.os, 'ubuntu')
+        name: Install numpy, scipy, nilearn pre
       - run: pip install -ve .
       - run: mne sys_info
       - run: ./tools/get_testing_version.sh

From ce964d3852a813c612eefe2668b60021b82955cf Mon Sep 17 00:00:00 2001
From: Eric Larson <larson.eric.d@gmail.com>
Date: Tue, 18 Jun 2024 10:23:20 -0400
Subject: [PATCH 3/8] FIX: Try again

---
 .github/workflows/tests.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 4ad88a885..1375fba30 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -61,8 +61,8 @@ jobs:
         if: matrix.mne == 'dev'
         name: Install MNE and nilearn dev
       # Tables on PyPI is not NumPy 2.0 compatible
-      - run: pip install --only-binary=":all:" --index-url "https://pypi.anaconda.org/scientific-python-nightly-wheels/simple" "tables>=3.9.3.dev0"
-      - run: pip install --upgrade --pre --force --only-binary=":all:" --index-url "https://pypi.anaconda.org/scientific-python-nightly-wheels/simple" "numpy>=2.0.0rc1" scipy h5py matplotlib pandas scikit-learn statsmodels "tables>=3.9.3.dev0"
+      - run: pip install --only-binary="tables" --extra-index-url "https://pypi.anaconda.org/scientific-python-nightly-wheels/simple" "tables>=3.9.3.dev0"
+      - run: pip install --upgrade --pre --only-binary=":all:" --index-url "https://pypi.anaconda.org/scientific-python-nightly-wheels/simple" "numpy>=2.0.0rc1" scipy h5py matplotlib pandas scikit-learn statsmodels "tables>=3.9.3.dev0"
         if: matrix.mne == 'dev' && startsWith(matrix.os, 'ubuntu')
         name: Install numpy, scipy, nilearn pre
       - run: pip install -ve .

From e2133b25b1710851f3b71a90d768c2f23cff0aaf Mon Sep 17 00:00:00 2001
From: Eric Larson <larson.eric.d@gmail.com>
Date: Tue, 18 Jun 2024 10:24:42 -0400
Subject: [PATCH 4/8] FIX: Fine

---
 .github/workflows/tests.yml | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 1375fba30..8d36167ab 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -60,12 +60,10 @@ jobs:
       - run: pip install --upgrade --pre -e ./mne-python git+https://github.com/nilearn/nilearn
         if: matrix.mne == 'dev'
         name: Install MNE and nilearn dev
-      # Tables on PyPI is not NumPy 2.0 compatible
-      - run: pip install --only-binary="tables" --extra-index-url "https://pypi.anaconda.org/scientific-python-nightly-wheels/simple" "tables>=3.9.3.dev0"
-      - run: pip install --upgrade --pre --only-binary=":all:" --index-url "https://pypi.anaconda.org/scientific-python-nightly-wheels/simple" "numpy>=2.0.0rc1" scipy h5py matplotlib pandas scikit-learn statsmodels "tables>=3.9.3.dev0"
-        if: matrix.mne == 'dev' && startsWith(matrix.os, 'ubuntu')
-        name: Install numpy, scipy, nilearn pre
-      - run: pip install -ve .
+      # - run: pip install --upgrade --pre --force --only-binary=":all:" --index-url "https://pypi.anaconda.org/scientific-python-nightly-wheels/simple" "numpy>=2.0.0rc1" scipy h5py matplotlib pandas scikit-learn statsmodels "tables>=3.9.3.dev0"
+      #   if: matrix.mne == 'dev' && startsWith(matrix.os, 'ubuntu')
+      #   name: Install numpy, scipy, nilearn pre
+      - run: pip install -ve . "numpy<2"
       - run: mne sys_info
       - run: ./tools/get_testing_version.sh
         working-directory: mne-python

From 6e7ecd634fe327bbbca975575a98e4ef537986b4 Mon Sep 17 00:00:00 2001
From: Eric Larson <larson.eric.d@gmail.com>
Date: Tue, 18 Jun 2024 10:55:05 -0400
Subject: [PATCH 5/8] FIX?

---
 .github/workflows/tests.yml | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 8d36167ab..fff4439fc 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -2,10 +2,11 @@ name: 'tests'
 on:
   push:
     branches:
-      - '*'
+      - 'main'
   pull_request:
     branches:
       - '*'
+
 concurrency:
   group: ${{ github.workflow }}-${{ github.event.number }}-${{ github.event.type }}
   cancel-in-progress: true
@@ -55,6 +56,9 @@ jobs:
           create-args: >-
             python=${{ matrix.python }}
         if: matrix.kind == 'conda'
+      # For some reason both qt6 and qt6 get installed on macOS
+      - run: conda remove -y qt5-libs
+        if: matrix.kind == 'conda' and startsWith(matrix.os, 'macos')
       - run: pip install -r requirements_testing.txt
       - run: git clone https://github.com/mne-tools/mne-python
       - run: pip install --upgrade --pre -e ./mne-python git+https://github.com/nilearn/nilearn

From a5a772a334c911e9ac9d34e3cffd9d8c296e3d4c Mon Sep 17 00:00:00 2001
From: Eric Larson <larson.eric.d@gmail.com>
Date: Tue, 18 Jun 2024 10:58:07 -0400
Subject: [PATCH 6/8] FIX: Syntax

---
 .github/workflows/tests.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index fff4439fc..197651345 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -58,7 +58,7 @@ jobs:
         if: matrix.kind == 'conda'
       # For some reason both qt6 and qt6 get installed on macOS
       - run: conda remove -y qt5-libs
-        if: matrix.kind == 'conda' and startsWith(matrix.os, 'macos')
+        if: matrix.kind == 'conda' && startsWith(matrix.os, 'macos')
       - run: pip install -r requirements_testing.txt
       - run: git clone https://github.com/mne-tools/mne-python
       - run: pip install --upgrade --pre -e ./mne-python git+https://github.com/nilearn/nilearn

From 48378f893c89d6394fa99b7272e4877c58b85596 Mon Sep 17 00:00:00 2001
From: Eric Larson <larson.eric.d@gmail.com>
Date: Tue, 18 Jun 2024 11:17:28 -0400
Subject: [PATCH 7/8] FIX: What

---
 environment.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/environment.yml b/environment.yml
index 8257e9be1..01dd18ed3 100644
--- a/environment.yml
+++ b/environment.yml
@@ -4,6 +4,8 @@ channels:
 dependencies:
 - python>=3.9
 - pip
+- conda
+- mamba
 - mne
 - nilearn
 - statsmodels

From bb4c0b0a1b96145ade459d6c94733b1d263538e0 Mon Sep 17 00:00:00 2001
From: Eric Larson <larson.eric.d@gmail.com>
Date: Tue, 18 Jun 2024 11:47:04 -0400
Subject: [PATCH 8/8] FIX: No?

---
 .github/workflows/tests.yml | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 197651345..aabb0e5fd 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -56,9 +56,6 @@ jobs:
           create-args: >-
             python=${{ matrix.python }}
         if: matrix.kind == 'conda'
-      # For some reason both qt6 and qt6 get installed on macOS
-      - run: conda remove -y qt5-libs
-        if: matrix.kind == 'conda' && startsWith(matrix.os, 'macos')
       - run: pip install -r requirements_testing.txt
       - run: git clone https://github.com/mne-tools/mne-python
       - run: pip install --upgrade --pre -e ./mne-python git+https://github.com/nilearn/nilearn