janware/jw-pkg
1
Code Pull requests Activity Actions

cmds / lib: Fix more static checker findings

Browse source 
Fix more errors and warnings produced by "make check" as reported by CI and a pyright upgrade.
Signed-off-by: Jan Lindemann <jan@janware.com>
This commit is contained in:
Jan Lindemann 2026-06-01 07:45:22 +02:00
commit 24928c6f5d
Signed by: Jan Lindemann
GPG key ID: 3750640C9E25DD61
16 changed files with 123 additions and 122 deletions
Download patch file Download diff file Expand all files Collapse all files

33
src/python/jw/pkg/cmds/projects/CmdCreatePkgConfig.py
View file

@ -3,13 +3,14 @@ from argparse import ArgumentParser, Namespace
from .Cmd import Cmd, Parent
from .lib.templates import tmpl_render
class CmdCreatePkgConfig(Cmd): # export
def __init__(self, parent: Parent) -> None:
super().__init__(parent,
'create-pkg-config',
help='Generate a pkg-config file for a module')
super().__init__(
parent,
'create-pkg-config',
help = 'Generate a pkg-config file for a module'
)
@staticmethod
def __cleanup_requires(string: str) -> str:
@ -28,17 +29,17 @@ class CmdCreatePkgConfig(Cmd): # export
def add_arguments(self, parser: ArgumentParser) -> None:
super().add_arguments(parser)
parser.add_argument('-F', '--project-descr-file', default=None)
parser.add_argument('-d', '--description', default=None)
parser.add_argument('-n', '--name', default=None)
parser.add_argument('-s', '--summary', default=None)
parser.add_argument('-p', '--prefix', default=None)
parser.add_argument('-v', '--version', default=None)
parser.add_argument('-c', '--cflags', default=None)
parser.add_argument('-l', '--libflags', default=None)
parser.add_argument('-r', '--requires-run', default=None)
parser.add_argument('-R', '--requires-build', default=None)
parser.add_argument('-V', '--variables', nargs='*')
parser.add_argument('-F', '--project-descr-file', default = None)
parser.add_argument('-d', '--description', default = None)
parser.add_argument('-n', '--name', default = None)
parser.add_argument('-s', '--summary', default = None)
parser.add_argument('-p', '--prefix', default = None)
parser.add_argument('-v', '--version', default = None)
parser.add_argument('-c', '--cflags', default = None)
parser.add_argument('-l', '--libflags', default = None)
parser.add_argument('-r', '--requires-run', default = None)
parser.add_argument('-R', '--requires-build', default = None)
parser.add_argument('-V', '--variables', nargs = '*')
async def _run(self, args: Namespace) -> None:
project_conf_var_keys = [
@ -47,7 +48,7 @@ class CmdCreatePkgConfig(Cmd): # export
'requires_run',
'requires_build',
]
merged: dict[str, str|None] = {}
merged: dict[str, str | None] = {}
for key in project_conf_var_keys:
val = getattr(args, key)
if val is not None and args.project_descr_file: