Jan Lindemann
9ba6c70dee
ruff tries to recursivley use every config file it finds and stumbles over a template:
/usr/bin/ruff check --select TC,FA --fix --unsafe-fixes . ruff failed Cause: Failed to parse /home/jan/local/src/jw.dev/proj/jw-pkg/conf/templates/pyproject.toml Cause: TOML parse error at line 3, column 3 | 3 | {mypypath} | ^ invalid key-value pair, expected keyLimiting it to the toplevel pyproject.toml by explicitly specifying --config fixes the behaviour, so that's what this commit does.
Signed-off-by: Jan Lindemann <jan@janware.com>
76 lines
2.3 KiB
Makefile
76 lines
2.3 KiB
Makefile
TD_COPY_FILES += pyproject.toml
|
|
|
|
PY_CHECK_EXCLUDE ?=
|
|
ifndef PY_CHECK_ROOTS
|
|
PY_CHECK_ROOTS += $(wildcard $(TOPDIR)/src $(TOPDIR)/tools)
|
|
endif
|
|
|
|
ifndef PY_CHECK_RUFF
|
|
PY_CHECK_RUFF := $(shell which ruff 2>/dev/null)
|
|
ifneq ($(PY_CHECK_RUFF),)
|
|
PY_CHECK_RUFF += --config pyproject.toml
|
|
endif
|
|
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:
|
|
|
|
format: py-format
|
|
check-syntax: py-check-syntax
|
|
check-format: py-check-format
|
|
|
|
py-check: py-check-syntax py-check-format
|
|
py-check-syntax:
|
|
ifneq ($(PY_CHECK_RUFF),)
|
|
$(PY_CHECK_RUFF) check $(addprefix --exclude ,$(PY_CHECK_EXCLUDE)) $(PY_CHECK_ROOTS)
|
|
endif
|
|
mypy $(addprefix --exclude ,$(PY_CHECK_EXCLUDE)) $(PY_CHECK_ROOTS)
|
|
ifneq ($(PY_CHECK_PYRIGHT),)
|
|
pyright $(PY_CHECK_ROOTS)
|
|
endif
|
|
|
|
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_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.topdir: clean.py-check
|
|
clean.py-check:
|
|
rm -rf .mypy_cache
|
|
|
|
pyrightconfig.json:
|
|
$(PYTHON) $(JWB_SCRIPT_DIR)/jw-pkg.py -p $(PROJECTS_DIR) -t $(TOPDIR) --topdir-format unaltered projects create-file --format pyright \
|
|
$(PROJECT) --field base=$(JW_PKG_CONF_BASE_DIR)/project/pyrightconfig-base.json $(addprefix --field include=,$(wildcard src/python tools/python)) > $@.tmp
|
|
mv $@.tmp $@
|