[+] fix module:switch for tool key
This commit is contained in:
parent
68901a4ec5
commit
a8f57337ad
@ -5,7 +5,7 @@ project(
|
|||||||
).stdout().strip('\n'),
|
).stdout().strip('\n'),
|
||||||
# 'online.fxreader.uv',
|
# 'online.fxreader.uv',
|
||||||
# ['c', 'cpp'],
|
# ['c', 'cpp'],
|
||||||
version: '0.1.5.16+27.9',
|
version: '0.1.5.16+27.11',
|
||||||
# default_options: [
|
# default_options: [
|
||||||
# 'cpp_std=c++23',
|
# 'cpp_std=c++23',
|
||||||
# # 'prefer_static=true',
|
# # 'prefer_static=true',
|
||||||
|
@ -628,9 +628,12 @@ class CLI(abc.ABC):
|
|||||||
pyproject2['tool'] = []
|
pyproject2['tool'] = []
|
||||||
|
|
||||||
pyproject_tool = 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 p
|
||||||
del pyproject_tool
|
del pyproject_tool
|
||||||
|
@ -39,7 +39,7 @@ class PyProject:
|
|||||||
class Module:
|
class Module:
|
||||||
name: str
|
name: str
|
||||||
meson: Optional[pathlib.Path] = None
|
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
|
path: pathlib.Path
|
||||||
dependencies: dict[str, list[str]]
|
dependencies: dict[str, list[str]]
|
||||||
@ -150,9 +150,14 @@ def pyproject_load(
|
|||||||
module.meson = pathlib.Path(o['meson'])
|
module.meson = pathlib.Path(o['meson'])
|
||||||
|
|
||||||
if 'tool' in o:
|
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)
|
res.modules.append(module)
|
||||||
|
|
||||||
|
BIN
releases/whl/online_fxreader_pr34-0.1.5.16+27.10-py3-none-any.whl
(Stored with Git LFS)
Normal file
BIN
releases/whl/online_fxreader_pr34-0.1.5.16+27.10-py3-none-any.whl
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
releases/whl/online_fxreader_pr34-0.1.5.16+27.11-py3-none-any.whl
(Stored with Git LFS)
Normal file
BIN
releases/whl/online_fxreader_pr34-0.1.5.16+27.11-py3-none-any.whl
(Stored with Git LFS)
Normal file
Binary file not shown.
Loading…
Reference in New Issue
Block a user