janware/jw-pkg
1
Code Pull requests Activity Actions

py-topdir.mk: Make pyright optional

Browse source 
Be prepared to not have working pyright. This is necessary, because the next commit will remove it for Debian.
Signed-off-by: Jan Lindemann <jan@janware.com>
This commit is contained in:
Jan Lindemann 2026-06-04 07:35:26 +02:00
commit b2f0fe2595
Signed by: Jan Lindemann
GPG key ID: 3750640C9E25DD61
1 changed files with 7 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

8
make/py-topdir.mk
View file

@ -1,5 +1,4 @@
TD_COPY_FILES += pyproject.toml TD_COPY_FILES += pyproject.toml
TD_GENERATE_FILES += pyrightconfig.json
PY_CHECK_EXCLUDE ?= PY_CHECK_EXCLUDE ?=
PY_SRC_ROOT += $(wildcard $(TOPDIR)/src $(TOPDIR)/tools) PY_SRC_ROOT += $(wildcard $(TOPDIR)/src $(TOPDIR)/tools)
@ -12,6 +11,11 @@ ifndef PY_CHECK_YAPF
PY_CHECK_YAPF := $(firstword $(wildcard /usr/bin/yapf /usr/bin/yapf3)) PY_CHECK_YAPF := $(firstword $(wildcard /usr/bin/yapf /usr/bin/yapf3))
endif endif
ifndef PY_CHECK_PYRIGHT
PY_CHECK_PYRIGHT := $(shell which pyright 2>/dev/null)
TD_GENERATE_FILES += pyrightconfig.json
endif
all: all:
format: py-format format: py-format
@ -24,7 +28,9 @@ ifneq ($(PY_CHECK_RUFF),)
$(PY_CHECK_RUFF) check $(addprefix --exclude ,$(PY_CHECK_EXCLUDE)) $(PY_SRC_ROOT) $(PY_CHECK_RUFF) check $(addprefix --exclude ,$(PY_CHECK_EXCLUDE)) $(PY_SRC_ROOT)
endif endif
mypy $(addprefix --exclude ,$(PY_CHECK_EXCLUDE)) $(PY_SRC_ROOT) mypy $(addprefix --exclude ,$(PY_CHECK_EXCLUDE)) $(PY_SRC_ROOT)
ifneq ($(PY_CHECK_PYRIGHT),)
pyright pyright
endif
py-check-format: py-check-format:
ifneq ($(PY_CHECK_YAPF),) ifneq ($(PY_CHECK_YAPF),)