From c8c85983a1a6ae8bc84082687c0f13e7ddd389af Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 2 Dec 2024 14:15:17 +0000 Subject: [PATCH 01/16] Bump autofix-ci/action in the actions group Bumps the actions group with 1 update: [autofix-ci/action](https://github.com/autofix-ci/action). Updates `autofix-ci/action` from dd55f44df8f7cdb7a6bf74c78677eb8acd40cd0a to ff86a557419858bb967097bfc916833f5647fa8c - [Release notes](https://github.com/autofix-ci/action/releases) - [Commits](https://github.com/autofix-ci/action/compare/dd55f44df8f7cdb7a6bf74c78677eb8acd40cd0a...ff86a557419858bb967097bfc916833f5647fa8c) --- updated-dependencies: - dependency-name: autofix-ci/action dependency-type: direct:production dependency-group: actions ... Signed-off-by: dependabot[bot] --- .github/workflows/outdated.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/outdated.yml b/.github/workflows/outdated.yml index 6a5386cb..69b5d41d 100644 --- a/.github/workflows/outdated.yml +++ b/.github/workflows/outdated.yml @@ -20,5 +20,5 @@ jobs: python-version: "3.12" - run: pip install packaging requests pyyaml - run: python tests/test_outdated.py # can update the file in place - - uses: autofix-ci/action@dd55f44df8f7cdb7a6bf74c78677eb8acd40cd0a + - uses: autofix-ci/action@ff86a557419858bb967097bfc916833f5647fa8c if: failure() From 5dd16c062e6a69d15f669d59016b469d9f542c93 Mon Sep 17 00:00:00 2001 From: "autofix-ci[bot]" <114827586+autofix-ci[bot]@users.noreply.github.com> Date: Mon, 2 Dec 2024 14:23:39 +0000 Subject: [PATCH 02/16] [autofix.ci] apply automated fixes --- recipes/mne-python/construct.yaml | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/recipes/mne-python/construct.yaml b/recipes/mne-python/construct.yaml index 4c85930c..cc6975ec 100644 --- a/recipes/mne-python/construct.yaml +++ b/recipes/mne-python/construct.yaml @@ -85,7 +85,7 @@ specs: - mne-ari =0.1.2 - mne-icalabel =0.7.0 - mne-gui-addons =0.1=*_1 - - mne-lsl =1.7.1 + - mne-lsl =1.8.0 - mne-kit-gui =1.3.0 - autoreject =0.4.3 - antio =0.4.0 @@ -131,7 +131,7 @@ specs: - pyface =8.0.0=*_1 - imageio-ffmpeg =0.5.1 - pandas =2.2.3 - - polars =1.14.0 + - polars =1.16.0 - scipy =1.14.1 - openblas =0.3.27 # allow_outdated, scipy / numpy not updated yet - libblas =3.9.0=*openblas @@ -155,12 +155,12 @@ specs: # NeuroSpin needs the following - questionary =2.0.1 - pqdm =0.2.0 - - astropy =6.1.6 + - astropy =7.0.0 # Viz # matplotilb is just matplotlib-base, tornado, and pyqt # https://github.com/conda-forge/matplotlib-feedstock/blob/main/recipe/meta.yaml - matplotlib-base =3.9.2 - - tornado =6.4.1 + - tornado =6.4.2 - pyside6 =6.7.3=*_1 # allow_outdated, 6.8.0.1 has a star-import bug - qt6-main =6.7.3 # allow_outdated - ipympl =0.9.4 @@ -169,7 +169,7 @@ specs: - plotly =5.24.1 - vtk =9.3.1=qt* - ipywidgets =8.1.5 - - pyvista =0.44.1 + - pyvista =0.44.2 - pyvistaqt =0.11.1 - trame =3.7.0 - trame-vtk =2.8.12 @@ -177,21 +177,21 @@ specs: - termcolor =2.5.0 - defusedxml =0.7.1 # Development - - gh =2.62.0 + - gh =2.63.0 - setuptools_scm =8.1.0 - - pytest =8.3.3 + - pytest =8.3.4 - pytest-cov =6.0.0 - pytest-qt =4.4.0 - pytest-timeout =2.3.1 - pre-commit =4.0.1 - - ruff =0.8.0 - - uv =0.5.4 + - ruff =0.8.1 + - uv =0.5.5 - check-manifest =0.50 - codespell =2.3.0 - py-spy =0.4.0 - line_profiler =4.1.3 - memory_profiler =0.61.0 - - twine =5.1.1 + - twine =6.0.1 - hatchling =1.26.3 - hatch-vcs =0.4.0 - mypy =1.13.0 @@ -202,7 +202,7 @@ specs: - pydata-sphinx-theme =0.16.0 - graphviz =12.0.0 - python-graphviz =0.20.3 - - selenium =4.26.1 + - selenium =4.27.0 - sphinx =7.4.7 # allow_outdated, sphinx-design not 8.0 compatible - sphinx-design =0.6.1 - sphinx-gallery =0.18.0 @@ -211,9 +211,9 @@ specs: - sphinxcontrib-youtube =1.4.1 - intersphinx-registry =0.2411.25 # OS-specific - - git =2.47.0 # [win] + - git =2.47.1 # [win] - make =4.4.1 # [win] - - pyobjc-core =10.3.1 # [osx] + - pyobjc-core =10.3.2 # [osx] - pyobjc-framework-Cocoa =10.3.1 # [osx] - pyobjc-framework-FSEvents =10.3.1 # [osx] condarc: From a100776cf37c4e782d978cf5a0d665eed7a16bc7 Mon Sep 17 00:00:00 2001 From: Eric Larson Date: Mon, 2 Dec 2024 09:37:18 -0500 Subject: [PATCH 03/16] FIX: More --- recipes/mne-python/construct.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes/mne-python/construct.yaml b/recipes/mne-python/construct.yaml index cc6975ec..75ed6c6b 100644 --- a/recipes/mne-python/construct.yaml +++ b/recipes/mne-python/construct.yaml @@ -213,7 +213,7 @@ specs: # OS-specific - git =2.47.1 # [win] - make =4.4.1 # [win] - - pyobjc-core =10.3.2 # [osx] + - pyobjc-core =10.3.1 # allow_outdated # [osx] - pyobjc-framework-Cocoa =10.3.1 # [osx] - pyobjc-framework-FSEvents =10.3.1 # [osx] condarc: From f773d543019c434a2b73bf53cf52b803a419b032 Mon Sep 17 00:00:00 2001 From: Eric Larson Date: Mon, 2 Dec 2024 09:51:09 -0500 Subject: [PATCH 04/16] FIX: Pin --- environment.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/environment.yml b/environment.yml index 61d55505..cebfc9eb 100644 --- a/environment.yml +++ b/environment.yml @@ -4,7 +4,7 @@ channels: - conda-forge dependencies: - - constructor >=3.6.0 + - constructor >=3.6.0,!=3.10.0 - conda-standalone >=23.11.0 - menuinst - conda >=23.11.0 From b4abc2aa75bf15254d913d6102172297adf4775f Mon Sep 17 00:00:00 2001 From: Eric Larson Date: Mon, 2 Dec 2024 16:45:05 -0500 Subject: [PATCH 05/16] Update environment.yml --- environment.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/environment.yml b/environment.yml index cebfc9eb..523f110e 100644 --- a/environment.yml +++ b/environment.yml @@ -4,7 +4,8 @@ channels: - conda-forge dependencies: - - constructor >=3.6.0,!=3.10.0 + - constructor >=3.6.0 + - conda-libmamba-solver <=24.9 - conda-standalone >=23.11.0 - menuinst - conda >=23.11.0 From 8fd0aad45e74aed24635c035fd7856f018c65d1c Mon Sep 17 00:00:00 2001 From: "autofix-ci[bot]" <114827586+autofix-ci[bot]@users.noreply.github.com> Date: Mon, 2 Dec 2024 21:47:18 +0000 Subject: [PATCH 06/16] [autofix.ci] apply automated fixes --- recipes/mne-python/construct.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/recipes/mne-python/construct.yaml b/recipes/mne-python/construct.yaml index 75ed6c6b..adaedecc 100644 --- a/recipes/mne-python/construct.yaml +++ b/recipes/mne-python/construct.yaml @@ -202,7 +202,7 @@ specs: - pydata-sphinx-theme =0.16.0 - graphviz =12.0.0 - python-graphviz =0.20.3 - - selenium =4.27.0 + - selenium =4.27.1 - sphinx =7.4.7 # allow_outdated, sphinx-design not 8.0 compatible - sphinx-design =0.6.1 - sphinx-gallery =0.18.0 @@ -214,7 +214,7 @@ specs: - git =2.47.1 # [win] - make =4.4.1 # [win] - pyobjc-core =10.3.1 # allow_outdated # [osx] - - pyobjc-framework-Cocoa =10.3.1 # [osx] + - pyobjc-framework-Cocoa =10.3.2 # [osx] - pyobjc-framework-FSEvents =10.3.1 # [osx] condarc: channels: From 2b81f6846c348c9487e0e77d6fabbdcb0bc55019 Mon Sep 17 00:00:00 2001 From: Eric Larson Date: Mon, 2 Dec 2024 16:53:39 -0500 Subject: [PATCH 07/16] FIX: Revert --- recipes/mne-python/construct.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/recipes/mne-python/construct.yaml b/recipes/mne-python/construct.yaml index adaedecc..f573cfad 100644 --- a/recipes/mne-python/construct.yaml +++ b/recipes/mne-python/construct.yaml @@ -214,8 +214,8 @@ specs: - git =2.47.1 # [win] - make =4.4.1 # [win] - pyobjc-core =10.3.1 # allow_outdated # [osx] - - pyobjc-framework-Cocoa =10.3.2 # [osx] - - pyobjc-framework-FSEvents =10.3.1 # [osx] + - pyobjc-framework-Cocoa =10.3.1 # allow_outdated # [osx] + - pyobjc-framework-FSEvents =10.3.1 # allow_outdated # [osx] condarc: channels: - conda-forge From 081443930fd0e889dd5b3667d589e013d77ceb72 Mon Sep 17 00:00:00 2001 From: "autofix-ci[bot]" <114827586+autofix-ci[bot]@users.noreply.github.com> Date: Mon, 2 Dec 2024 21:56:08 +0000 Subject: [PATCH 08/16] [autofix.ci] apply automated fixes --- recipes/mne-python/construct.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes/mne-python/construct.yaml b/recipes/mne-python/construct.yaml index f573cfad..b535fe6e 100644 --- a/recipes/mne-python/construct.yaml +++ b/recipes/mne-python/construct.yaml @@ -159,7 +159,7 @@ specs: # Viz # matplotilb is just matplotlib-base, tornado, and pyqt # https://github.com/conda-forge/matplotlib-feedstock/blob/main/recipe/meta.yaml - - matplotlib-base =3.9.2 + - matplotlib-base =3.9.3 - tornado =6.4.2 - pyside6 =6.7.3=*_1 # allow_outdated, 6.8.0.1 has a star-import bug - qt6-main =6.7.3 # allow_outdated From 3ee71a466c31e7912d2bcbc7db520283161ed422 Mon Sep 17 00:00:00 2001 From: Eric Larson Date: Mon, 2 Dec 2024 16:58:36 -0500 Subject: [PATCH 09/16] FIX: Stop --- recipes/mne-python/construct.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes/mne-python/construct.yaml b/recipes/mne-python/construct.yaml index b535fe6e..de25a00d 100644 --- a/recipes/mne-python/construct.yaml +++ b/recipes/mne-python/construct.yaml @@ -159,7 +159,7 @@ specs: # Viz # matplotilb is just matplotlib-base, tornado, and pyqt # https://github.com/conda-forge/matplotlib-feedstock/blob/main/recipe/meta.yaml - - matplotlib-base =3.9.3 + - matplotlib-base =3.9.2 # allow_outdated - tornado =6.4.2 - pyside6 =6.7.3=*_1 # allow_outdated, 6.8.0.1 has a star-import bug - qt6-main =6.7.3 # allow_outdated From c40944dd4d9e0f790599d6e3b22d1814e7db7920 Mon Sep 17 00:00:00 2001 From: Eric Larson Date: Mon, 2 Dec 2024 17:31:20 -0500 Subject: [PATCH 10/16] FIX: Revert pin --- environment.yml | 2 +- recipes/mne-python/construct.yaml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/environment.yml b/environment.yml index 523f110e..d9432405 100644 --- a/environment.yml +++ b/environment.yml @@ -5,7 +5,7 @@ channels: dependencies: - constructor >=3.6.0 - - conda-libmamba-solver <=24.9 + - conda-libmamba-solver - conda-standalone >=23.11.0 - menuinst - conda >=23.11.0 diff --git a/recipes/mne-python/construct.yaml b/recipes/mne-python/construct.yaml index de25a00d..fd3229c9 100644 --- a/recipes/mne-python/construct.yaml +++ b/recipes/mne-python/construct.yaml @@ -161,8 +161,8 @@ specs: # https://github.com/conda-forge/matplotlib-feedstock/blob/main/recipe/meta.yaml - matplotlib-base =3.9.2 # allow_outdated - tornado =6.4.2 - - pyside6 =6.7.3=*_1 # allow_outdated, 6.8.0.1 has a star-import bug - - qt6-main =6.7.3 # allow_outdated + - pyside6 =6.8.0.2 + - qt6-main =6.8.0 - ipympl =0.9.4 - qtpy =2.4.2 - seaborn =0.13.2 From 96d89fb4682334d9848d20de8f45d000bc4db3db Mon Sep 17 00:00:00 2001 From: "autofix-ci[bot]" <114827586+autofix-ci[bot]@users.noreply.github.com> Date: Mon, 2 Dec 2024 22:33:27 +0000 Subject: [PATCH 11/16] [autofix.ci] apply automated fixes --- recipes/mne-python/construct.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes/mne-python/construct.yaml b/recipes/mne-python/construct.yaml index fd3229c9..37bb7c80 100644 --- a/recipes/mne-python/construct.yaml +++ b/recipes/mne-python/construct.yaml @@ -162,7 +162,7 @@ specs: - matplotlib-base =3.9.2 # allow_outdated - tornado =6.4.2 - pyside6 =6.8.0.2 - - qt6-main =6.8.0 + - qt6-main =6.8.1 - ipympl =0.9.4 - qtpy =2.4.2 - seaborn =0.13.2 From 5200ffa5095c1e25d587d001138f523cd14e05f5 Mon Sep 17 00:00:00 2001 From: Eric Larson Date: Mon, 2 Dec 2024 17:43:58 -0500 Subject: [PATCH 12/16] FIX: Dated --- recipes/mne-python/construct.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes/mne-python/construct.yaml b/recipes/mne-python/construct.yaml index 37bb7c80..240454c9 100644 --- a/recipes/mne-python/construct.yaml +++ b/recipes/mne-python/construct.yaml @@ -162,7 +162,7 @@ specs: - matplotlib-base =3.9.2 # allow_outdated - tornado =6.4.2 - pyside6 =6.8.0.2 - - qt6-main =6.8.1 + - qt6-main =6.8.0 # allow_outdated - ipympl =0.9.4 - qtpy =2.4.2 - seaborn =0.13.2 From 94cfd2cba7a7fb3b60f7361d94192c53937efdbb Mon Sep 17 00:00:00 2001 From: Eric Larson Date: Mon, 2 Dec 2024 17:47:53 -0500 Subject: [PATCH 13/16] MAINT: Auto --- .github/workflows/automerge.yml | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100644 .github/workflows/automerge.yml diff --git a/.github/workflows/automerge.yml b/.github/workflows/automerge.yml new file mode 100644 index 00000000..2c72f2e9 --- /dev/null +++ b/.github/workflows/automerge.yml @@ -0,0 +1,17 @@ +name: Bot auto-merge +on: pull_request # yamllint disable-line rule:truthy + +permissions: + contents: write + pull-requests: write + +jobs: + autobot: + runs-on: ubuntu-latest + if: (github.event.pull_request.user.login == 'dependabot[bot]' || github.event.pull_request.user.login == 'pre-commit-ci[bot]') && github.repository == 'mne-tools/mne-installers' + steps: + - name: Enable auto-merge for bot PRs + run: gh pr merge --auto --squash "$PR_URL" + env: + PR_URL: ${{github.event.pull_request.html_url}} + GH_TOKEN: ${{secrets.GITHUB_TOKEN}} From c617ccb2e992fe79f6bf2fb68c2ef27063af8876 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Mon, 2 Dec 2024 22:33:44 +0000 Subject: [PATCH 14/16] [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.8.0 → v0.8.1](https://github.com/astral-sh/ruff-pre-commit/compare/v0.8.0...v0.8.1) --- .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 e0ca68e5..a69d24b4 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -1,6 +1,6 @@ repos: - repo: https://github.com/astral-sh/ruff-pre-commit - rev: v0.8.0 + rev: v0.8.1 hooks: - id: ruff - id: ruff-format From 537c10de3308a442e0a05e791af5a5f3972a522f Mon Sep 17 00:00:00 2001 From: Eric Larson Date: Mon, 2 Dec 2024 17:54:41 -0500 Subject: [PATCH 15/16] FIX: PySide --- recipes/mne-python/construct.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/recipes/mne-python/construct.yaml b/recipes/mne-python/construct.yaml index 240454c9..de25a00d 100644 --- a/recipes/mne-python/construct.yaml +++ b/recipes/mne-python/construct.yaml @@ -161,8 +161,8 @@ specs: # https://github.com/conda-forge/matplotlib-feedstock/blob/main/recipe/meta.yaml - matplotlib-base =3.9.2 # allow_outdated - tornado =6.4.2 - - pyside6 =6.8.0.2 - - qt6-main =6.8.0 # allow_outdated + - pyside6 =6.7.3=*_1 # allow_outdated, 6.8.0.1 has a star-import bug + - qt6-main =6.7.3 # allow_outdated - ipympl =0.9.4 - qtpy =2.4.2 - seaborn =0.13.2 From 843354d47da988d8c4d0d175d06faededda8e784 Mon Sep 17 00:00:00 2001 From: Eric Larson Date: Mon, 2 Dec 2024 18:12:57 -0500 Subject: [PATCH 16/16] FIX: Pin --- environment.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/environment.yml b/environment.yml index d9432405..523f110e 100644 --- a/environment.yml +++ b/environment.yml @@ -5,7 +5,7 @@ channels: dependencies: - constructor >=3.6.0 - - conda-libmamba-solver + - conda-libmamba-solver <=24.9 - conda-standalone >=23.11.0 - menuinst - conda >=23.11.0