diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml index 8c68874945..51b911ca57 100644 --- a/.github/workflows/docs.yml +++ b/.github/workflows/docs.yml @@ -12,7 +12,7 @@ env: jobs: Docs: - uses: tskit-dev/.github/.github/workflows/docs.yml@v12 + uses: tskit-dev/.github/.github/workflows/docs.yml@v14 with: pyproject-directory: python additional-apt-packages: doxygen diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index 4826bfc17b..82ff02f86a 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -5,6 +5,6 @@ on: jobs: Lint: - uses: tskit-dev/.github/.github/workflows/lint.yml@v12 + uses: tskit-dev/.github/.github/workflows/lint.yml@v14 with: pyproject-directory: python diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 0846488b48..ae0398c7a9 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -13,21 +13,21 @@ jobs: packaging: name: Python packaging - uses: tskit-dev/.github/.github/workflows/python-packaging.yml@v12 + uses: tskit-dev/.github/.github/workflows/python-packaging.yml@v14 with: pyproject-directory: python cli-test-cmd: tskit --help test-c: name: C tests - uses: tskit-dev/.github/.github/workflows/c-tests.yml@v12 + uses: tskit-dev/.github/.github/workflows/c-tests.yml@v14 with: library-directory: c secrets: inherit test-python-c: name: Python-C tests - uses: tskit-dev/.github/.github/workflows/python-c-tests.yml@v12 + uses: tskit-dev/.github/.github/workflows/python-c-tests.yml@v14 with: tests: python/tests/test_python_c.py python/tests/test_dict_encoding.py pyproject-directory: python @@ -36,7 +36,7 @@ jobs: test: name: Python - uses: tskit-dev/.github/.github/workflows/python-tests.yml@v12 + uses: tskit-dev/.github/.github/workflows/python-tests.yml@v14 with: os: ${{ matrix.os }} python-version: ${{ matrix.python }} diff --git a/.github/workflows/wheels.yml b/.github/workflows/wheels.yml index c45863ef8a..d15b8e378e 100644 --- a/.github/workflows/wheels.yml +++ b/.github/workflows/wheels.yml @@ -8,7 +8,7 @@ on: jobs: build-wheels: - uses: tskit-dev/.github/.github/workflows/build-wheels.yml@v12 + uses: tskit-dev/.github/.github/workflows/build-wheels.yml@v14 with: pyproject-directory: python diff --git a/prek.toml b/prek.toml index 7c5c2aeeaf..94f1a73982 100644 --- a/prek.toml +++ b/prek.toml @@ -4,22 +4,11 @@ # rules implementing lint workflows. We do not use any remote # workflow repos. -# files = { glob = [ -# "tskit/**", -# "benchmark/**", -# "tests/**", -# "_tskitmodule.c", -# "*.toml", -# "docs/**", -# ]} - exclude = { glob = ["c/subprojects/**"]} [[repos]] repo = "builtin" hooks = [ - # { id = "trailing-whitespace" }, - # { id = "end-of-file-fixer" }, { id = "check-added-large-files" }, { id = "check-merge-conflict" }, { id = "mixed-line-ending" }, @@ -35,7 +24,7 @@ hooks = [ id = "ruff-check", name = "ruff check", language = "system", - entry = "ruff check --fix --force-exclude", + entry = "uv run --project=python --only-group=lint ruff check --fix --force-exclude", types = ["python"], }, ] @@ -47,7 +36,7 @@ hooks = [ id = "ruff-format", name = "ruff format", language = "system", - entry = "ruff format --force-exclude", + entry = "uv run --project=python --only-group=lint ruff format --force-exclude", types = ["python"], }, ] @@ -59,7 +48,7 @@ hooks = [ id = "clang-format", name = "clang-format", language = "system", - entry = "clang-format -i", + entry = "uv run --project=python --only-group=lint clang-format -i", types = ["c"], verbose = true, },