@@ -6,3 +6,6 @@
# coverage data and reports
/.coverage
/htmlcov/
+
+# ruff cache
+/.ruff_cache/
@@ -26,6 +26,7 @@ tests = [
"pytest >= 7.0",
"coverage >= 7.0",
"pytest-cov >= 4.0",
+ "ruff >= 0.5",
]
[project.scripts]
@@ -50,3 +51,10 @@ path = "src/wic/cli.py"
# leftover files under the pytest base temp directory.
tmp_path_retention_policy = "failed"
tmp_path_retention_count = 1
+
+[tool.ruff]
+# For now only the test suite is actually linted (run-tests.sh
+# --lint-tests passes the tests/ path); the wic source under src/ is
+# not yet ruff-clean and is left out until its findings are fixed (see
+# tests/docs/linting.md). --lint-src can still be run to preview the
+# source findings, but it is reported, not enforced.
deleted file mode 100644
new file mode 100644
@@ -0,0 +1,39 @@
+# Linting
+
+## Contents
+
+- [Running the linter](#running-the-linter)
+- [tests/ must be clean](#tests-must-be-clean)
+- [src/ is not linted yet](#src-is-not-linted-yet)
+
+The test suite is linted with [ruff](https://docs.astral.sh/ruff/). It
+is configured in `pyproject.toml` (`[tool.ruff]`).
+
+## Running the linter
+
+The runner exposes ruff through two separate modes, each used on its
+own:
+
+```bash
+tests/run-tests.sh --lint-tests # ruff over tests/
+tests/run-tests.sh --lint-src # ruff over src/ (preview only)
+```
+
+A lint mode cannot be combined with coverage, with the other lint
+mode, or with pytest arguments; the runner rejects such combinations.
+
+## tests/ must be clean
+
+Our own test code is held to a clean bar: `tests/run-tests.sh
+--lint-tests` reports nothing. If you add a test that trips a rule, fix
+the test before the change lands.
+
+## src/ is not linted yet
+
+`--lint-src` runs ruff over the wic source, but the source is **not**
+yet ruff-clean, so its findings are a preview report rather than a
+gate: the runner prints them and exits with ruff's status, but nothing
+in the suite asserts on them. Treating `src/` findings as a hard
+failure now would block every run on fixes that have not landed. Once
+the source is cleaned up, `src/` can be promoted to the same clean bar
+as `tests/`.
@@ -14,23 +14,34 @@ usage() {
cat <<'USAGE'
Usage:
tests/run-tests.sh [--coverage] [--html [DIR]] [pytest args]
+ tests/run-tests.sh --lint-tests
+ tests/run-tests.sh --lint-src
Options:
--coverage also measure branch coverage of src/wic and print a
terminal report listing the lines that were missed
--html [DIR] also write an HTML coverage report (default dir:
htmlcov/); implies --coverage
+ --lint-tests run ruff over tests/ and exit; the test suite is held
+ to a clean bar, so this must report nothing
+ --lint-src run ruff over src/ and exit; src/ is not yet ruff-clean,
+ so this is a preview report and is not enforced
-h, --help show this help and exit
Anything else is passed straight through to pytest (for example a
path, -k EXPR, or -v). With no such argument the whole suite under
tests/ is run.
+The two lint modes each run on their own; they cannot be combined with
+coverage, with each other, or with pytest arguments.
+
Examples:
tests/run-tests.sh # whole suite
tests/run-tests.sh --coverage # + terminal coverage report
tests/run-tests.sh --html # + HTML report in htmlcov/
tests/run-tests.sh --html /tmp/cov # + HTML report in /tmp/cov
+ tests/run-tests.sh --lint-tests # ruff over tests/
+ tests/run-tests.sh --lint-src # ruff over src/ (preview)
tests/run-tests.sh -k filemap -v # pass args through to pytest
tests/run-tests.sh tests/unit # a single tier or file
@@ -44,6 +55,8 @@ PY="${PYTHON:-python3}"
coverage=0
html=0
html_dir="htmlcov"
+lint_tests=0
+lint_src=0
pytest_args=()
while [ $# -gt 0 ]; do
case "$1" in
@@ -60,6 +73,12 @@ while [ $# -gt 0 ]; do
*) html_dir="$2"; shift ;;
esac
;;
+ --lint-tests)
+ lint_tests=1
+ ;;
+ --lint-src)
+ lint_src=1
+ ;;
-h|--help)
usage
exit 0
@@ -78,6 +97,34 @@ done
cd "$REPO_ROOT"
+# The lint modes run ruff and exit, so each must be used on its own.
+# Reject combining them with coverage, with each other, or with pytest
+# arguments loudly instead of silently ignoring the extras.
+if [ $((lint_tests + lint_src)) -gt 0 ]; then
+ if [ "$lint_tests" -eq 1 ] && [ "$lint_src" -eq 1 ]; then
+ echo "error: --lint-tests and --lint-src cannot be combined." >&2
+ echo " run one lint mode at a time." >&2
+ exit 2
+ fi
+ if [ "$coverage" -eq 1 ] || [ "$html" -eq 1 ] || [ ${#pytest_args[@]} -gt 0 ]; then
+ echo "error: a lint mode must be used on its own." >&2
+ echo " lint, or drop the lint flag to run the suite." >&2
+ exit 2
+ fi
+ if ! "$PY" -c "import ruff" >/dev/null 2>&1 && ! command -v ruff >/dev/null 2>&1; then
+ echo "error: lint requested but ruff is not installed." >&2
+ echo " run: $PY -m pip install -e \".[tests]\"" >&2
+ exit 1
+ fi
+ if [ "$lint_tests" -eq 1 ]; then
+ # The test suite is held to a clean bar; a finding here is a bug
+ # in our own test code and must be fixed.
+ exec "$PY" -m ruff check tests
+ fi
+ # src/ is not yet ruff-clean; this is a preview report, not a gate.
+ exec "$PY" -m ruff check src
+fi
+
# Make sure the interpreter that will run pytest can actually import wic.
# The suites pass even without an install (each adds src/ to sys.path),
# but the session banner and any install-dependent behaviour would be
A test suite is only trustworthy if its own code is clean, so this commit brings ruff into the runner and holds the test tree to a clean bar. It also makes it easy to preview what ruff thinks of the wic source, without yet enforcing it. pyproject.toml gains ruff in the tests extra and a [tool.ruff] section. The configuration is deliberately minimal for now: the test suite is the only tree under an enforced clean bar; the wic source under src/ is not yet ruff-clean and is reported, not gated. run-tests.sh gains two lint modes, each used on its own: - --lint-tests runs ruff over tests/ and exits. The test suite must report nothing; a finding here is a bug in our own test code and is expected to be fixed. - --lint-src runs ruff over src/ and exits. The source is not yet ruff-clean, so this is a preview: the runner prints ruff's findings and exits with its status, but nothing in the suite asserts on them. Keeping the two trees on separate flags means cleaning up the source later does not disturb the test-tree gate. A lint mode cannot be combined with coverage, with the other lint mode, or with pytest arguments; the runner rejects such combinations loudly rather than silently dropping the extras. If ruff is not installed it fails with the install command. tests/docs/linting.md documents the two modes and why src/ is held back for now. That file replaces the tests/docs/.gitkeep placeholder, which is no longer needed now that the directory has real content. .gitignore learns to ignore ruff's .ruff_cache/ directory. AI-Generated: codex/claude-opus 4.7 (xhigh) Signed-off-by: Trevor Woerner <twoerner@gmail.com> --- changes in v2: - v1 submitted the entire test suite as a single commit; v2 breaks the work into a reviewable series, and this patch is one step of it. --- .gitignore | 3 +++ pyproject.toml | 8 ++++++++ tests/docs/.gitkeep | 0 tests/docs/linting.md | 39 +++++++++++++++++++++++++++++++++++ tests/run-tests.sh | 47 +++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 97 insertions(+) delete mode 100644 tests/docs/.gitkeep create mode 100644 tests/docs/linting.md