From 6beeb6b14a425e0ceaa8f6f35ffde326e544f620 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Mon, 4 Nov 2024 22:37:39 +0000 Subject: [PATCH 1/3] [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.7.1 → v0.7.2](https://github.com/astral-sh/ruff-pre-commit/compare/v0.7.1...v0.7.2) --- .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 775beca7..0d475671 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.7.1 + rev: v0.7.2 hooks: - id: ruff name: ruff lint expyfun From f4130df98b4893777281a2643853fd97d36042ed Mon Sep 17 00:00:00 2001 From: Eric Larson Date: Tue, 5 Nov 2024 14:29:39 -0500 Subject: [PATCH 2/3] FIX: What --- .github/workflows/tests.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 3bb5b156..202d039f 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -5,10 +5,10 @@ concurrency: on: # yamllint disable-line rule:truthy push: branches: - - '*' + - main pull_request: branches: - - '*' + - main jobs: job: @@ -25,7 +25,7 @@ jobs: - os: ubuntu-22.04 kind: pip python: '3.12' - # ARM64 will probably need to wait until + # ARM64 will probably need to wait until we transition to Pyglet 2 # - os: 'macos-latest' # arm64 # kind: 'conda' # python: '3.12' From 03017bc8c5f702f32b4e1f4c45998db9bbc71b46 Mon Sep 17 00:00:00 2001 From: Eric Larson Date: Tue, 5 Nov 2024 14:58:30 -0500 Subject: [PATCH 3/3] FIX: Default --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 57250e77..9040975a 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -44,7 +44,7 @@ addopts = """--durations=20 --doctest-modules -rfEXs --cov-report= --tb=short \ junit_family = "xunit2" # Set this pretty low to ensure we do not by default add really long tests, # or make changes that make things a lot slower -timeout = 5 +timeout = 10 usefixtures = "matplotlib_config" # Once SciPy updates not to have non-integer and non-tuple errors (1.2.0) we # should remove them from here.