Compare commits
No commits in common. "6b0a0d8e56704bc4b62038a6e39594dfd88a0c23" and "01e0d1de5c2b78439b78bd9b6e2358a9eea4a307" have entirely different histories.
6b0a0d8e56
...
01e0d1de5c
4 changed files with 3 additions and 20 deletions
|
|
@ -4,7 +4,7 @@ requires = ["flit_core >=3.8.0,<4"]
|
||||||
|
|
||||||
[project]
|
[project]
|
||||||
name = "tiramisu"
|
name = "tiramisu"
|
||||||
version = "5.2.0a19"
|
version = "5.2.0a18"
|
||||||
authors = [{name = "Emmanuel Garette", email = "gnunux@gnunux.info"}]
|
authors = [{name = "Emmanuel Garette", email = "gnunux@gnunux.info"}]
|
||||||
readme = "README.md"
|
readme = "README.md"
|
||||||
description = "an options controller tool"
|
description = "an options controller tool"
|
||||||
|
|
|
||||||
|
|
@ -1128,15 +1128,3 @@ def test_default_calc():
|
||||||
od2 = OptionDescription('root', '', [od1])
|
od2 = OptionDescription('root', '', [od1])
|
||||||
cfg = Config(od2)
|
cfg = Config(od2)
|
||||||
assert parse_od_get(cfg.value.get()) == {'od.interface0.var1': [{'od.interface0.var1': 'leader1', 'od.interface0.var2': ['leader1']}, {'od.interface0.var1': 'leader2', 'od.interface0.var2': ['leader2']}]}
|
assert parse_od_get(cfg.value.get()) == {'od.interface0.var1': [{'od.interface0.var1': 'leader1', 'od.interface0.var2': ['leader1']}, {'od.interface0.var1': 'leader2', 'od.interface0.var2': ['leader2']}]}
|
||||||
|
|
||||||
|
|
||||||
def test_default_set_calc():
|
|
||||||
var1 = StrOption('var1', "", multi=True, properties=frozenset({"mandatory", "novalidator", "force_store_value"}))
|
|
||||||
var2 = StrOption('var2', "", default_multi=[Calculation(calc_value, Params((ParamOption(var1))))], multi=submulti, properties=frozenset({"mandatory",}))
|
|
||||||
leader = Leadership('interface0', '', [var1, var2])
|
|
||||||
od1 = OptionDescription('od', '', [leader])
|
|
||||||
od2 = OptionDescription('root', '', [od1])
|
|
||||||
cfg = Config(od2)
|
|
||||||
cfg.property.read_write()
|
|
||||||
cfg.option('od.interface0.var1').value.set(Calculation(calc_value, Params(ParamValue(['leader1', 'leader2']))))
|
|
||||||
assert parse_od_get(cfg.value.get()) == {'od.interface0.var1': [{'od.interface0.var1': 'leader1', 'od.interface0.var2': ['leader1']}, {'od.interface0.var1': 'leader2', 'od.interface0.var2': ['leader2']}]}
|
|
||||||
|
|
|
||||||
|
|
@ -1 +1 @@
|
||||||
__version__ = "5.2.0a19"
|
__version__ = "5.2.0a18"
|
||||||
|
|
|
||||||
|
|
@ -318,18 +318,13 @@ class Values:
|
||||||
elif isinstance(value, list):
|
elif isinstance(value, list):
|
||||||
# copy
|
# copy
|
||||||
value = value.copy()
|
value = value.copy()
|
||||||
elif isinstance(value, Calculation):
|
|
||||||
value, _has_calculation = get_calculated_value(
|
|
||||||
subconfig,
|
|
||||||
value,
|
|
||||||
)
|
|
||||||
self._setvalue(
|
self._setvalue(
|
||||||
subconfig,
|
subconfig,
|
||||||
ori_value,
|
ori_value,
|
||||||
owner,
|
owner,
|
||||||
)
|
)
|
||||||
if (
|
if (
|
||||||
"force_store_value" in self_properties
|
"force_store_value" in setting_properties
|
||||||
and subconfig.option.impl_is_leader()
|
and subconfig.option.impl_is_leader()
|
||||||
):
|
):
|
||||||
leader = subconfig.option.impl_get_leadership()
|
leader = subconfig.option.impl_get_leadership()
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue