From dfeffa2872fd765a248b967a4c276c19716582ae Mon Sep 17 00:00:00 2001 From: Ben Jeffery Date: Tue, 9 Sep 2025 10:39:53 +0100 Subject: [PATCH 1/2] Use reusable lint workflow --- .github/workflows/tests.yml | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index a9336365..454c3df0 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -9,17 +9,7 @@ on: jobs: pre-commit: name: Lint - runs-on: ubuntu-24.04 - steps: - - name: Cancel Previous Runs - uses: styfle/cancel-workflow-action@0.12.1 - with: - access_token: ${{ github.token }} - - uses: actions/checkout@v4.2.2 - - uses: actions/setup-python@v5.4.0 - with: - python-version: '3.12' - - uses: pre-commit/action@v3.0.1 + uses: tskit-dev/.github/.github/workflows/lint.yml@v1 test: name: Python From f9ef3ceac91f6fcbafce40009986facd80177602 Mon Sep 17 00:00:00 2001 From: Ben Jeffery Date: Tue, 9 Sep 2025 12:45:19 +0100 Subject: [PATCH 2/2] Update pre-commit hooks --- .github/workflows/tests.yml | 2 +- .pre-commit-config.yaml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 454c3df0..fcd891a1 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -9,7 +9,7 @@ on: jobs: pre-commit: name: Lint - uses: tskit-dev/.github/.github/workflows/lint.yml@v1 + uses: tskit-dev/.github/.github/workflows/lint.yml@v2 test: name: Python diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 4eaa9d54..23598127 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -1,6 +1,6 @@ repos: - repo: https://github.com/pre-commit/pre-commit-hooks - rev: v5.0.0 + rev: v6.0.0 hooks: - id: check-merge-conflict - id: debug-statements @@ -8,7 +8,7 @@ repos: - id: check-case-conflict - id: check-yaml - repo: https://github.com/astral-sh/ruff-pre-commit - rev: v0.11.0 + rev: v0.12.12 hooks: - id: ruff args: [ "--fix", "--config", "ruff.toml" ]