Merge branch 'main' into pre-commit-ci-update-config

mne-tools · Oct 1, 2024 · 325edbf · 325edbf
2 parents c2e4cf8 + 6d9cb0d
commit 325edbf
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -76,12 +76,13 @@ jobs:
 
       - run:
           name: Get Python running and install dependencies
+          # Install mne-bids dev version: https://github.com/mne-tools/mne-connectivity/pull/237
           command: |
             pip install git+https://github.com/mne-tools/mne-python@main
             curl https://raw.githubusercontent.com/mne-tools/mne-python/main/tools/circleci_dependencies.sh -o circleci_dependencies.sh
             chmod +x circleci_dependencies.sh
             ./circleci_dependencies.sh
-            pip install .[doc]
+            pip install .[doc] git+https://github.com/mne-tools/mne-bids@main
 
       - save_cache:
           key: pip-cache

diff --git a/.github/workflows/linux_conda.yml b/.github/workflows/linux_conda.yml
@@ -32,6 +32,8 @@ jobs:
           pyvista: false
       - uses: mamba-org/setup-micromamba@v1
         with:
+          # https://github.com/mamba-org/setup-micromamba/issues/225
+          micromamba-version: 1.5.10-0
           environment-file: environment.yml
           create-args: >- # beware the >- instead of |, we don't split on newlines but on spaces
             python=${{ env.PYTHON_VERSION }}