Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
8 changes: 4 additions & 4 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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 }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/wheels.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
17 changes: 3 additions & 14 deletions prek.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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" },
Expand All @@ -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"],
},
]
Expand All @@ -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"],
},
]
Expand All @@ -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,
},
Expand Down