diff --git a/python/meson.build b/python/meson.build index 71809df..80fb864 100644 --- a/python/meson.build +++ b/python/meson.build @@ -5,7 +5,7 @@ project( ).stdout().strip('\n'), # 'online.fxreader.uv', # ['c', 'cpp'], - version: '0.1.5.16+27.9', + version: '0.1.5.16+27.11', # default_options: [ # 'cpp_std=c++23', # # 'prefer_static=true', diff --git a/python/online/fxreader/pr34/commands_typed/cli.py b/python/online/fxreader/pr34/commands_typed/cli.py index db7293d..a76caa6 100644 --- a/python/online/fxreader/pr34/commands_typed/cli.py +++ b/python/online/fxreader/pr34/commands_typed/cli.py @@ -628,9 +628,12 @@ class CLI(abc.ABC): pyproject2['tool'] = [] pyproject_tool = pyproject2['tool'] - assert isinstance(pyproject_tool, tomlkit.items.Array) + # assert isinstance(pyproject_tool, tomlkit.items.Array) + assert isinstance(pyproject_tool, tomlkit.items.Table) - pyproject_tool.extend(module.tool) + for k, v in module.tool.items(): + assert not k in pyproject_tool + pyproject_tool[k] = v del p del pyproject_tool diff --git a/python/online/fxreader/pr34/commands_typed/cli_bootstrap.py b/python/online/fxreader/pr34/commands_typed/cli_bootstrap.py index 1987543..259392c 100644 --- a/python/online/fxreader/pr34/commands_typed/cli_bootstrap.py +++ b/python/online/fxreader/pr34/commands_typed/cli_bootstrap.py @@ -39,7 +39,7 @@ class PyProject: class Module: name: str meson: Optional[pathlib.Path] = None - tool: list[Any] = dataclasses.field(default_factory=lambda : []) + tool: dict[str, Any] = dataclasses.field(default_factory=lambda : dict()) path: pathlib.Path dependencies: dict[str, list[str]] @@ -150,9 +150,14 @@ def pyproject_load( module.meson = pathlib.Path(o['meson']) if 'tool' in o: - assert isinstance(o['tool'], list) + assert isinstance(o['tool'], dict) - module.tool.extend(o['tool']) + assert all([ + isinstance(o, str) + for o in o['tool'] + ]) + + module.tool.update(o['tool']) res.modules.append(module) diff --git a/releases/whl/online_fxreader_pr34-0.1.5.16+27.10-py3-none-any.whl b/releases/whl/online_fxreader_pr34-0.1.5.16+27.10-py3-none-any.whl new file mode 100644 index 0000000..9d36afb --- /dev/null +++ b/releases/whl/online_fxreader_pr34-0.1.5.16+27.10-py3-none-any.whl @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:be90dd9d5f80df201c8de47b63a6d7250545f5421a1e14f2803b597132c96aff +size 71901 diff --git a/releases/whl/online_fxreader_pr34-0.1.5.16+27.11-py3-none-any.whl b/releases/whl/online_fxreader_pr34-0.1.5.16+27.11-py3-none-any.whl new file mode 100644 index 0000000..cc77152 --- /dev/null +++ b/releases/whl/online_fxreader_pr34-0.1.5.16+27.11-py3-none-any.whl @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:04ecbb7f7ef8a50172df7db15a9768d2d4129e44a194f47f6df314a701646c6c +size 71939