Jan Lindemann
f5249a58ef
All checks were successful
CI / Packaging - Kali Linux (pull_request) Successful in 5m32s
CI / Packaging - OpenSUSE Tumbleweed (pull_request) Successful in 5m49s
CI / Packaging test (pull_request) Successful in 0s
CI / Packaging - Kali Linux (push) Successful in 5m13s
CI / Packaging - OpenSUSE Tumbleweed (push) Successful in 5m28s
CI / Packaging test (push) Successful in 0s
defs.mk derives WHICH from the external which binary, first from a hardcoded /usr/bin/which path and then with a `which which` fallback, while the probes for time, ruff, pyright, and python3 call which directly. Systems that do not ship the which package, such as minimal containers, are left to the shell's PATH search. Define WHICH once in common.mk as the POSIX command -v builtin and drop the old definition from defs.mk. Route the remaining direct which calls through $(WHICH): - projects-dir.mk: TIME probe - py-check.mk: PY_CHECK_RUFF and PY_CHECK_PYRIGHT probes - py-version.mk: PYTHON lookup command -v runs in the /bin/sh that $(shell) already uses, so the build no longer depends on the which package. The builtin names that command -v reports for echo, test, pwd, and printf are safe, because every use of those variables runs through the shell, and the bash time keyword keeps the -p output format identical to the GNU time binary. Assisted-by: unsloth/Qwen3.8-27B-GGUF:Q4_K_M with pi.dev v1.3.0 Signed-off-by: Jan Lindemann <jan@janware.com>
100 lines
2.6 KiB
Makefile
100 lines
2.6 KiB
Makefile
.PHONY: \
|
|
all \
|
|
check \
|
|
format \
|
|
check-syntax \
|
|
check-format \
|
|
py-check \
|
|
py-check-syntax \
|
|
py-check-format \
|
|
py-format \
|
|
py-format-assignments \
|
|
py-check-annotation-imports \
|
|
py-format-annotation-imports \
|
|
clean \
|
|
clean.py-check
|
|
|
|
ifndef PY_CHECK_ROOTS
|
|
PY_CHECK_ROOTS = .
|
|
endif
|
|
|
|
ifndef PY_CHECK_MYPY
|
|
PY_CHECK_MYPY := mypy
|
|
endif
|
|
|
|
ifndef PY_CHECK_RUFF
|
|
PY_CHECK_RUFF := $(shell $(WHICH) ruff 2>/dev/null)
|
|
ifneq ($(PY_CHECK_RUFF),)
|
|
PY_CHECK_RUFF += --config $(TOPDIR)/pyproject.toml
|
|
endif
|
|
endif
|
|
|
|
ifndef PY_CHECK_ISORT
|
|
PY_CHECK_ISORT := $(firstword $(wildcard /usr/bin/isort))
|
|
endif
|
|
|
|
ifndef PY_CHECK_YAPF
|
|
PY_CHECK_YAPF := $(firstword $(wildcard /usr/bin/yapf /usr/bin/yapf3))
|
|
endif
|
|
|
|
ifndef PY_CHECK_PYRIGHT
|
|
PY_CHECK_PYRIGHT := $(shell $(WHICH) pyright 2>/dev/null)
|
|
TD_GENERATE_FILES += pyrightconfig.json
|
|
endif
|
|
|
|
all:
|
|
check: py-check
|
|
format: py-format
|
|
check-syntax: py-check-syntax
|
|
check-format: py-check-format
|
|
|
|
py-check: py-check-syntax py-check-format py-check-bad-patterns
|
|
|
|
py-check-syntax:
|
|
ifneq ($(PY_CHECK_RUFF),)
|
|
$(PY_CHECK_RUFF) check $(addprefix --exclude ,$(PY_CHECK_EXCLUDE)) $(PY_CHECK_ROOTS)
|
|
endif
|
|
$(PY_CHECK_MYPY) $(addprefix --exclude ,$(PY_CHECK_EXCLUDE)) $(PY_CHECK_ROOTS)
|
|
ifneq ($(PY_CHECK_PYRIGHT),)
|
|
$(PY_CHECK_PYRIGHT) $(PY_CHECK_ROOTS)
|
|
endif
|
|
|
|
py-check-bad-patterns:
|
|
if find $(PY_CHECK_ROOTS) -type f -name '*.py' -print0 | xargs -0 grep breakpoint; then exit 1; fi
|
|
if find $(PY_CHECK_ROOTS) -type f -name '*.py' -print0 | xargs -0 grep "^\s*).*#\s*export"; then exit 1; fi
|
|
|
|
py-check-format:
|
|
ifneq ($(PY_CHECK_YAPF),)
|
|
$(PY_CHECK_YAPF) --diff --recursive $(PY_CHECK_ROOTS)
|
|
endif
|
|
|
|
py-format:
|
|
find . -type f -name '*.py' -print0 | \
|
|
xargs -0 sed -i -E '1{/^# -\*- coding: utf-8 -\*-$$/{:a;N;/\n[[:space:]]*$$/ba;s/^# -\*- coding: utf-8 -\*-\n([[:space:]]*\n)*/ /;s/^ //}}'
|
|
ifneq ($(PY_CHECK_ISORT),)
|
|
$(PY_CHECK_ISORT) $(PY_CHECK_ROOTS)
|
|
endif
|
|
ifneq ($(PY_CHECK_YAPF),)
|
|
$(PY_CHECK_YAPF) --in-place --recursive $(PY_CHECK_ROOTS)
|
|
endif
|
|
|
|
py-format-assignments:
|
|
find $(PY_CHECK_ROOTS) \
|
|
-path './.git' -prune -o \
|
|
-type f -name '*.py' \
|
|
-execdir /usr/bin/sed -i 's/^\(\s\+[a-zA-Z0-9_]\+\)=\([^,[:space:]]\+\)\([,(]\)*\s*$$/\1 = \2\3/g' {} '+'
|
|
git diff --exit-code
|
|
|
|
py-check-annotation-imports:
|
|
ifneq ($(PY_CHECK_RUFF),)
|
|
$(PY_CHECK_RUFF) check --select TC,FA --diff --unsafe-fixes $(PY_CHECK_ROOTS)
|
|
endif
|
|
|
|
py-format-annotation-imports:
|
|
ifneq ($(PY_CHECK_RUFF),)
|
|
$(PY_CHECK_RUFF) check --select TC,FA --fix --unsafe-fixes $(PY_CHECK_ROOTS)
|
|
endif
|
|
|
|
clean: clean.py-check
|
|
clean.py-check:
|
|
rm -rf .mypy_cache .ruff_cache .pytest_cache
|