diff --git a/src/rougail/convert/object_model.py b/src/rougail/convert/object_model.py index deadf3828..573d57159 100644 --- a/src/rougail/convert/object_model.py +++ b/src/rougail/convert/object_model.py @@ -477,6 +477,7 @@ class _VariableCalculation(Calculation): variable_in_calculation_path: str, variable_in_calculation: "Variable", variable_in_calculation_identifier: Optional[str], + key: str = None, ): if not variable_in_calculation: if not objectspace.force_optional: @@ -498,7 +499,10 @@ class _VariableCalculation(Calculation): param["optional"] = self.optional if variable_in_calculation_identifier: param["identifier"] = variable_in_calculation_identifier - params = {None: [param]} + if key: + params = {key: param} + else: + params = {None: [param]} if self.default_values: params["__default_value"] = self.default_values if self.allow_none: @@ -742,13 +746,15 @@ class VariablePropertyCalculation(_VariableCalculation): variable_in_calculation_path, variable_in_calculation, variable_in_calculation_identifier, + key="value" ) + params["prop"] = self.attribute_name if objectspace.force_optional and ( - not params[None] or "variable" not in params[None][0] + not params["value"] or "variable" not in params["value"] ): - params = {None: [None, None, False]} + params = {"value": None, "when": None, "inverse": False} else: - variable = params[None][0]["variable"] + variable = params["value"]["variable"] if self.when is not undefined: if self.version == "1.0": msg = _( @@ -780,7 +786,6 @@ class VariablePropertyCalculation(_VariableCalculation): inverse = False params["when"] = when params["inverse"] = inverse - params[None].insert(0, self.attribute_name) func = "variable_to_property" return { "function": func, @@ -899,7 +904,8 @@ class IdentifierPropertyCalculation(_IdentifierCalculation): ).format(self.attribute_name) raise DictConsistencyError params = { - None: [self.attribute_name, self.get_identifier()], + "prop": self.attribute_name, + "value": self.get_identifier(), "when": when, "inverse": inverse, } diff --git a/src/rougail/tiramisu.py b/src/rougail/tiramisu.py index 271909061..6e47a0057 100644 --- a/src/rougail/tiramisu.py +++ b/src/rougail/tiramisu.py @@ -36,7 +36,7 @@ from unicodedata import normalize, combining from jinja2 import StrictUndefined, DictLoader from jinja2.sandbox import SandboxedEnvironment from re import findall -from tiramisu import DynOptionDescription, calc_value, function_waiting_for_error +from tiramisu import DynOptionDescription, calc_value, function_waiting_for_error, undefined from tiramisu.error import ( ValueWarning, ConfigError, @@ -357,7 +357,9 @@ def jinja_to_function( return values -def variable_to_property(prop, value, when, inverse, **kwargs): +def variable_to_property(*, prop, value=undefined, when, inverse, **kwargs): + if value is undefined: + return None if isinstance(value, PropertiesOptionError): raise value from value if inverse: @@ -370,7 +372,7 @@ def variable_to_property(prop, value, when, inverse, **kwargs): @function_waiting_for_error def jinja_to_property(prop, when, inverse, **kwargs): value = func["jinja_to_function"](**kwargs) - return func["variable_to_property"](prop, value is not None, when, inverse) + return func["variable_to_property"](prop=prop, value=value is not None, when=when, inverse=inverse) @function_waiting_for_error diff --git a/tests/dictionaries/01_6number_integer/__init__.py b/tests/dictionaries/01_6number_integer/__init__.py deleted file mode 100644 index e69de29bb..000000000 diff --git a/tests/dictionaries/01_6number_integer/makedict/after.json b/tests/dictionaries/01_6number_integer/makedict/after.json deleted file mode 100644 index 359100c38..000000000 --- a/tests/dictionaries/01_6number_integer/makedict/after.json +++ /dev/null @@ -1,50 +0,0 @@ -{ - "rougail.var1": { - "owner": "default", - "value": [ - 0 - ] - }, - "rougail.var2": { - "owner": "default", - "value": [ - 0 - ] - }, - "rougail.var3": { - "owner": "default", - "value": [ - 0 - ] - }, - "rougail.var4": { - "owner": "default", - "value": [ - 10 - ] - }, - "rougail.var5": { - "owner": "default", - "value": [ - 10 - ] - }, - "rougail.var6": { - "owner": "default", - "value": [ - 10 - ] - }, - "rougail.var7": { - "owner": "default", - "value": [ - 0 - ] - }, - "rougail.var8": { - "owner": "default", - "value": [ - 0 - ] - } -} diff --git a/tests/dictionaries/01_6number_integer/makedict/base.json b/tests/dictionaries/01_6number_integer/makedict/base.json deleted file mode 100644 index dc357dcbc..000000000 --- a/tests/dictionaries/01_6number_integer/makedict/base.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "rougail.var1": [ - 0 - ], - "rougail.var2": [ - 0 - ], - "rougail.var3": [ - 0 - ], - "rougail.var4": [ - 10 - ], - "rougail.var5": [ - 10 - ], - "rougail.var6": [ - 10 - ], - "rougail.var7": [ - 0 - ], - "rougail.var8": [ - 0 - ] -} diff --git a/tests/dictionaries/01_6number_integer/makedict/before.json b/tests/dictionaries/01_6number_integer/makedict/before.json deleted file mode 100644 index 359100c38..000000000 --- a/tests/dictionaries/01_6number_integer/makedict/before.json +++ /dev/null @@ -1,50 +0,0 @@ -{ - "rougail.var1": { - "owner": "default", - "value": [ - 0 - ] - }, - "rougail.var2": { - "owner": "default", - "value": [ - 0 - ] - }, - "rougail.var3": { - "owner": "default", - "value": [ - 0 - ] - }, - "rougail.var4": { - "owner": "default", - "value": [ - 10 - ] - }, - "rougail.var5": { - "owner": "default", - "value": [ - 10 - ] - }, - "rougail.var6": { - "owner": "default", - "value": [ - 10 - ] - }, - "rougail.var7": { - "owner": "default", - "value": [ - 0 - ] - }, - "rougail.var8": { - "owner": "default", - "value": [ - 0 - ] - } -} diff --git a/tests/dictionaries/01_6number_integer/makedict/read_write.json b/tests/dictionaries/01_6number_integer/makedict/read_write.json deleted file mode 100644 index dc357dcbc..000000000 --- a/tests/dictionaries/01_6number_integer/makedict/read_write.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "rougail.var1": [ - 0 - ], - "rougail.var2": [ - 0 - ], - "rougail.var3": [ - 0 - ], - "rougail.var4": [ - 10 - ], - "rougail.var5": [ - 10 - ], - "rougail.var6": [ - 10 - ], - "rougail.var7": [ - 0 - ], - "rougail.var8": [ - 0 - ] -} diff --git a/tests/dictionaries/01_6number_integer/tiramisu/base.py b/tests/dictionaries/01_6number_integer/tiramisu/base.py deleted file mode 100644 index d58905fe9..000000000 --- a/tests/dictionaries/01_6number_integer/tiramisu/base.py +++ /dev/null @@ -1,22 +0,0 @@ -from tiramisu import * -from tiramisu.setting import ALLOWED_LEADER_PROPERTIES -from re import compile as re_compile -from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('../rougail-tests/funcs/test.py') -try: - groups.namespace -except: - groups.addgroup('namespace') -ALLOWED_LEADER_PROPERTIES.add("basic") -ALLOWED_LEADER_PROPERTIES.add("standard") -ALLOWED_LEADER_PROPERTIES.add("advanced") -option_2 = IntOption(name="var1", doc="the first variable", multi=True, default=[0], default_multi=0, properties=frozenset({"mandatory", "standard"}), informations={'ymlfiles': ['../rougail-tests/structures/01_6number_multi/rougail/00-base.yml'], 'type': 'integer'}) -option_3 = IntOption(name="var2", doc="the second variable", multi=True, default=[0], default_multi=0, properties=frozenset({"mandatory", "standard"}), informations={'ymlfiles': ['../rougail-tests/structures/01_6number_multi/rougail/00-base.yml'], 'type': 'integer'}) -option_4 = IntOption(name="var3", doc="the third variable", multi=True, default=[0], default_multi=0, properties=frozenset({"mandatory", "standard"}), informations={'ymlfiles': ['../rougail-tests/structures/01_6number_multi/rougail/00-base.yml'], 'type': 'integer'}) -option_5 = IntOption(name="var4", doc="the forth variable", multi=True, default=[10], default_multi=10, properties=frozenset({"mandatory", "standard"}), informations={'ymlfiles': ['../rougail-tests/structures/01_6number_multi/rougail/00-base.yml'], 'type': 'integer'}) -option_6 = IntOption(name="var5", doc="the fifth variable", multi=True, default=[10], default_multi=10, properties=frozenset({"mandatory", "standard"}), informations={'ymlfiles': ['../rougail-tests/structures/01_6number_multi/rougail/00-base.yml'], 'type': 'integer'}) -option_7 = IntOption(name="var6", doc="the sixth variable", multi=True, default=[10], default_multi=10, properties=frozenset({"mandatory", "standard"}), informations={'ymlfiles': ['../rougail-tests/structures/01_6number_multi/rougail/00-base.yml'], 'type': 'integer'}) -option_8 = IntOption(name="var7", doc="the seventh variable", multi=True, default=[0], default_multi=0, properties=frozenset({"mandatory", "standard"}), informations={'ymlfiles': ['../rougail-tests/structures/01_6number_multi/rougail/00-base.yml'], 'type': 'integer'}) -option_9 = IntOption(name="var8", doc="the eighth variable", multi=True, default=[0], default_multi=0, properties=frozenset({"mandatory", "standard"}), informations={'ymlfiles': ['../rougail-tests/structures/01_6number_multi/rougail/00-base.yml'], 'type': 'integer'}) -optiondescription_1 = OptionDescription(name="rougail", doc="Rougail", group_type=groups.namespace, children=[option_2, option_3, option_4, option_5, option_6, option_7, option_8, option_9], properties=frozenset({"standard"}), informations={'ymlfiles': ['']}) -option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_1]) diff --git a/tests/dictionaries/01_6number_integer/tiramisu/no_namespace.py b/tests/dictionaries/01_6number_integer/tiramisu/no_namespace.py deleted file mode 100644 index 1112f64ff..000000000 --- a/tests/dictionaries/01_6number_integer/tiramisu/no_namespace.py +++ /dev/null @@ -1,17 +0,0 @@ -from tiramisu import * -from tiramisu.setting import ALLOWED_LEADER_PROPERTIES -from re import compile as re_compile -from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('../rougail-tests/funcs/test.py') -ALLOWED_LEADER_PROPERTIES.add("basic") -ALLOWED_LEADER_PROPERTIES.add("standard") -ALLOWED_LEADER_PROPERTIES.add("advanced") -option_1 = IntOption(name="var1", doc="the first variable", multi=True, default=[0], default_multi=0, properties=frozenset({"mandatory", "standard"}), informations={'ymlfiles': ['../rougail-tests/structures/01_6number_multi/rougail/00-base.yml'], 'type': 'integer'}) -option_2 = IntOption(name="var2", doc="the second variable", multi=True, default=[0], default_multi=0, properties=frozenset({"mandatory", "standard"}), informations={'ymlfiles': ['../rougail-tests/structures/01_6number_multi/rougail/00-base.yml'], 'type': 'integer'}) -option_3 = IntOption(name="var3", doc="the third variable", multi=True, default=[0], default_multi=0, properties=frozenset({"mandatory", "standard"}), informations={'ymlfiles': ['../rougail-tests/structures/01_6number_multi/rougail/00-base.yml'], 'type': 'integer'}) -option_4 = IntOption(name="var4", doc="the forth variable", multi=True, default=[10], default_multi=10, properties=frozenset({"mandatory", "standard"}), informations={'ymlfiles': ['../rougail-tests/structures/01_6number_multi/rougail/00-base.yml'], 'type': 'integer'}) -option_5 = IntOption(name="var5", doc="the fifth variable", multi=True, default=[10], default_multi=10, properties=frozenset({"mandatory", "standard"}), informations={'ymlfiles': ['../rougail-tests/structures/01_6number_multi/rougail/00-base.yml'], 'type': 'integer'}) -option_6 = IntOption(name="var6", doc="the sixth variable", multi=True, default=[10], default_multi=10, properties=frozenset({"mandatory", "standard"}), informations={'ymlfiles': ['../rougail-tests/structures/01_6number_multi/rougail/00-base.yml'], 'type': 'integer'}) -option_7 = IntOption(name="var7", doc="the seventh variable", multi=True, default=[0], default_multi=0, properties=frozenset({"mandatory", "standard"}), informations={'ymlfiles': ['../rougail-tests/structures/01_6number_multi/rougail/00-base.yml'], 'type': 'integer'}) -option_8 = IntOption(name="var8", doc="the eighth variable", multi=True, default=[0], default_multi=0, properties=frozenset({"mandatory", "standard"}), informations={'ymlfiles': ['../rougail-tests/structures/01_6number_multi/rougail/00-base.yml'], 'type': 'integer'}) -option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1, option_2, option_3, option_4, option_5, option_6, option_7, option_8]) diff --git a/tests/dictionaries/04_1default_calculation_hidden/tiramisu/base.py b/tests/dictionaries/04_1default_calculation_hidden/tiramisu/base.py index 70078a59a..286be9ef0 100644 --- a/tests/dictionaries/04_1default_calculation_hidden/tiramisu/base.py +++ b/tests/dictionaries/04_1default_calculation_hidden/tiramisu/base.py @@ -12,7 +12,7 @@ ALLOWED_LEADER_PROPERTIES.add("standard") ALLOWED_LEADER_PROPERTIES.add("advanced") dict_env['default_rougail.var3'] = "{% if _.var1 == 'value' or _.var2 == 'blah' %}\nvalue\n{% endif %}\n" option_2 = StrOption(name="var1", doc="a first variable", default="value", properties=frozenset({"mandatory", "standard"}), informations={'ymlfiles': ['../rougail-tests/structures/04_1default_calculation_hidden/rougail/00-base.yml'], 'type': 'string'}) -option_3 = StrOption(name="var2", doc="a second variable", properties=frozenset({"basic", "mandatory", Calculation(func['variable_to_property'], Params((ParamValue("disabled"), ParamOption(option_2)), kwargs={'when': ParamValue("value"), 'inverse': ParamValue(False)}), help_function=func['variable_to_property'])}), informations={'ymlfiles': ['../rougail-tests/structures/04_1default_calculation_hidden/rougail/00-base.yml'], 'type': 'string'}) +option_3 = StrOption(name="var2", doc="a second variable", properties=frozenset({"basic", "mandatory", Calculation(func['variable_to_property'], Params((), kwargs={'value': ParamOption(option_2), 'prop': ParamValue("disabled"), 'when': ParamValue("value"), 'inverse': ParamValue(False)}), help_function=func['variable_to_property'])}), informations={'ymlfiles': ['../rougail-tests/structures/04_1default_calculation_hidden/rougail/00-base.yml'], 'type': 'string'}) option_4 = StrOption(name="var3", doc="a third variable", default=Calculation(func['jinja_to_function'], Params((), kwargs={'__internal_jinja': ParamValue("default_rougail.var3"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['../rougail-tests/structures/04_1default_calculation_hidden/rougail/00-base.yml']), '__internal_attribute': ParamValue("default"), '__internal_variable': ParamValue("rougail.var3"), '_.var2': ParamOption(option_3, notraisepropertyerror=True), '_.var1': ParamOption(option_2, notraisepropertyerror=True)})), properties=frozenset({"mandatory", "standard"}), informations={'ymlfiles': ['../rougail-tests/structures/04_1default_calculation_hidden/rougail/00-base.yml'], 'type': 'string'}) optiondescription_1 = OptionDescription(name="rougail", doc="Rougail", group_type=groups.namespace, children=[option_2, option_3, option_4], properties=frozenset({"basic"}), informations={'ymlfiles': ['']}) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_1]) diff --git a/tests/dictionaries/04_1default_calculation_hidden/tiramisu/no_namespace.py b/tests/dictionaries/04_1default_calculation_hidden/tiramisu/no_namespace.py index 83f7e671e..cb57be2c5 100644 --- a/tests/dictionaries/04_1default_calculation_hidden/tiramisu/no_namespace.py +++ b/tests/dictionaries/04_1default_calculation_hidden/tiramisu/no_namespace.py @@ -8,6 +8,6 @@ ALLOWED_LEADER_PROPERTIES.add("standard") ALLOWED_LEADER_PROPERTIES.add("advanced") dict_env['default_var3'] = "{% if _.var1 == 'value' or _.var2 == 'blah' %}\nvalue\n{% endif %}\n" option_1 = StrOption(name="var1", doc="a first variable", default="value", properties=frozenset({"mandatory", "standard"}), informations={'ymlfiles': ['../rougail-tests/structures/04_1default_calculation_hidden/rougail/00-base.yml'], 'type': 'string'}) -option_2 = StrOption(name="var2", doc="a second variable", properties=frozenset({"basic", "mandatory", Calculation(func['variable_to_property'], Params((ParamValue("disabled"), ParamOption(option_1)), kwargs={'when': ParamValue("value"), 'inverse': ParamValue(False)}), help_function=func['variable_to_property'])}), informations={'ymlfiles': ['../rougail-tests/structures/04_1default_calculation_hidden/rougail/00-base.yml'], 'type': 'string'}) +option_2 = StrOption(name="var2", doc="a second variable", properties=frozenset({"basic", "mandatory", Calculation(func['variable_to_property'], Params((), kwargs={'value': ParamOption(option_1), 'prop': ParamValue("disabled"), 'when': ParamValue("value"), 'inverse': ParamValue(False)}), help_function=func['variable_to_property'])}), informations={'ymlfiles': ['../rougail-tests/structures/04_1default_calculation_hidden/rougail/00-base.yml'], 'type': 'string'}) option_3 = StrOption(name="var3", doc="a third variable", default=Calculation(func['jinja_to_function'], Params((), kwargs={'__internal_jinja': ParamValue("default_var3"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['../rougail-tests/structures/04_1default_calculation_hidden/rougail/00-base.yml']), '__internal_attribute': ParamValue("default"), '__internal_variable': ParamValue("var3"), '_.var2': ParamOption(option_2, notraisepropertyerror=True), '_.var1': ParamOption(option_1, notraisepropertyerror=True)})), properties=frozenset({"mandatory", "standard"}), informations={'ymlfiles': ['../rougail-tests/structures/04_1default_calculation_hidden/rougail/00-base.yml'], 'type': 'string'}) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1, option_2, option_3]) diff --git a/tests/dictionaries/04_1default_calculation_hidden_2/tiramisu/base.py b/tests/dictionaries/04_1default_calculation_hidden_2/tiramisu/base.py index dc17d3533..9e1ee0eff 100644 --- a/tests/dictionaries/04_1default_calculation_hidden_2/tiramisu/base.py +++ b/tests/dictionaries/04_1default_calculation_hidden_2/tiramisu/base.py @@ -12,7 +12,7 @@ ALLOWED_LEADER_PROPERTIES.add("standard") ALLOWED_LEADER_PROPERTIES.add("advanced") dict_env['default_rougail.var3'] = "{% if _.var2 is propertyerror %}\nvalue\n{% endif %}\n" option_2 = StrOption(name="var1", doc="a first variable", default="value", properties=frozenset({"mandatory", "standard"}), informations={'ymlfiles': ['../rougail-tests/structures/04_1default_calculation_hidden_2/rougail/00-base.yml'], 'type': 'string'}) -option_3 = StrOption(name="var2", doc="a second variable", properties=frozenset({"basic", "mandatory", Calculation(func['variable_to_property'], Params((ParamValue("disabled"), ParamOption(option_2)), kwargs={'when': ParamValue("value"), 'inverse': ParamValue(False)}), help_function=func['variable_to_property'])}), informations={'ymlfiles': ['../rougail-tests/structures/04_1default_calculation_hidden_2/rougail/00-base.yml'], 'type': 'string'}) +option_3 = StrOption(name="var2", doc="a second variable", properties=frozenset({"basic", "mandatory", Calculation(func['variable_to_property'], Params((), kwargs={'value': ParamOption(option_2), 'prop': ParamValue("disabled"), 'when': ParamValue("value"), 'inverse': ParamValue(False)}), help_function=func['variable_to_property'])}), informations={'ymlfiles': ['../rougail-tests/structures/04_1default_calculation_hidden_2/rougail/00-base.yml'], 'type': 'string'}) option_4 = StrOption(name="var3", doc="a third variable", default=Calculation(func['jinja_to_function'], Params((), kwargs={'__internal_jinja': ParamValue("default_rougail.var3"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['../rougail-tests/structures/04_1default_calculation_hidden_2/rougail/00-base.yml']), '__internal_attribute': ParamValue("default"), '__internal_variable': ParamValue("rougail.var3"), '_.var2': ParamOption(option_3, notraisepropertyerror=True)})), properties=frozenset({"mandatory", "standard"}), informations={'ymlfiles': ['../rougail-tests/structures/04_1default_calculation_hidden_2/rougail/00-base.yml'], 'type': 'string'}) optiondescription_1 = OptionDescription(name="rougail", doc="Rougail", group_type=groups.namespace, children=[option_2, option_3, option_4], properties=frozenset({"basic"}), informations={'ymlfiles': ['']}) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_1]) diff --git a/tests/dictionaries/04_1default_calculation_hidden_2/tiramisu/no_namespace.py b/tests/dictionaries/04_1default_calculation_hidden_2/tiramisu/no_namespace.py index c9366d245..9e63721af 100644 --- a/tests/dictionaries/04_1default_calculation_hidden_2/tiramisu/no_namespace.py +++ b/tests/dictionaries/04_1default_calculation_hidden_2/tiramisu/no_namespace.py @@ -8,6 +8,6 @@ ALLOWED_LEADER_PROPERTIES.add("standard") ALLOWED_LEADER_PROPERTIES.add("advanced") dict_env['default_var3'] = "{% if _.var2 is propertyerror %}\nvalue\n{% endif %}\n" option_1 = StrOption(name="var1", doc="a first variable", default="value", properties=frozenset({"mandatory", "standard"}), informations={'ymlfiles': ['../rougail-tests/structures/04_1default_calculation_hidden_2/rougail/00-base.yml'], 'type': 'string'}) -option_2 = StrOption(name="var2", doc="a second variable", properties=frozenset({"basic", "mandatory", Calculation(func['variable_to_property'], Params((ParamValue("disabled"), ParamOption(option_1)), kwargs={'when': ParamValue("value"), 'inverse': ParamValue(False)}), help_function=func['variable_to_property'])}), informations={'ymlfiles': ['../rougail-tests/structures/04_1default_calculation_hidden_2/rougail/00-base.yml'], 'type': 'string'}) +option_2 = StrOption(name="var2", doc="a second variable", properties=frozenset({"basic", "mandatory", Calculation(func['variable_to_property'], Params((), kwargs={'value': ParamOption(option_1), 'prop': ParamValue("disabled"), 'when': ParamValue("value"), 'inverse': ParamValue(False)}), help_function=func['variable_to_property'])}), informations={'ymlfiles': ['../rougail-tests/structures/04_1default_calculation_hidden_2/rougail/00-base.yml'], 'type': 'string'}) option_3 = StrOption(name="var3", doc="a third variable", default=Calculation(func['jinja_to_function'], Params((), kwargs={'__internal_jinja': ParamValue("default_var3"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['../rougail-tests/structures/04_1default_calculation_hidden_2/rougail/00-base.yml']), '__internal_attribute': ParamValue("default"), '__internal_variable': ParamValue("var3"), '_.var2': ParamOption(option_2, notraisepropertyerror=True)})), properties=frozenset({"mandatory", "standard"}), informations={'ymlfiles': ['../rougail-tests/structures/04_1default_calculation_hidden_2/rougail/00-base.yml'], 'type': 'string'}) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1, option_2, option_3]) diff --git a/tests/dictionaries/04_1default_calculation_hidden_3/tiramisu/base.py b/tests/dictionaries/04_1default_calculation_hidden_3/tiramisu/base.py index 3b641cbe1..3e387eadf 100644 --- a/tests/dictionaries/04_1default_calculation_hidden_3/tiramisu/base.py +++ b/tests/dictionaries/04_1default_calculation_hidden_3/tiramisu/base.py @@ -12,7 +12,7 @@ ALLOWED_LEADER_PROPERTIES.add("standard") ALLOWED_LEADER_PROPERTIES.add("advanced") dict_env['default_rougail.var3'] = "{% if _.var1 == 'value' or _.var2 == 'blah' %}\nvalue\n{% endif %}\n" option_2 = StrOption(name="var1", doc="a first variable", default="value", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "standard"}), informations={'ymlfiles': ['../rougail-tests/structures/04_1default_calculation_hidden_3/rougail/00-base.yml'], 'type': 'string'}) -option_3 = StrOption(name="var2", doc="a second variable", properties=frozenset({"basic", "mandatory", Calculation(func['variable_to_property'], Params((ParamValue("disabled"), ParamOption(option_2)), kwargs={'when': ParamValue("value"), 'inverse': ParamValue(False)}), help_function=func['variable_to_property'])}), informations={'ymlfiles': ['../rougail-tests/structures/04_1default_calculation_hidden_3/rougail/00-base.yml'], 'type': 'string'}) +option_3 = StrOption(name="var2", doc="a second variable", properties=frozenset({"basic", "mandatory", Calculation(func['variable_to_property'], Params((), kwargs={'value': ParamOption(option_2), 'prop': ParamValue("disabled"), 'when': ParamValue("value"), 'inverse': ParamValue(False)}), help_function=func['variable_to_property'])}), informations={'ymlfiles': ['../rougail-tests/structures/04_1default_calculation_hidden_3/rougail/00-base.yml'], 'type': 'string'}) option_4 = StrOption(name="var3", doc="a third variable", default=Calculation(func['jinja_to_function'], Params((), kwargs={'__internal_jinja': ParamValue("default_rougail.var3"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['../rougail-tests/structures/04_1default_calculation_hidden_3/rougail/00-base.yml']), '__internal_attribute': ParamValue("default"), '__internal_variable': ParamValue("rougail.var3"), '_.var2': ParamOption(option_3, notraisepropertyerror=True), '_.var1': ParamOption(option_2, notraisepropertyerror=True)})), properties=frozenset({"mandatory", "standard"}), informations={'ymlfiles': ['../rougail-tests/structures/04_1default_calculation_hidden_3/rougail/00-base.yml'], 'type': 'string'}) optiondescription_1 = OptionDescription(name="rougail", doc="Rougail", group_type=groups.namespace, children=[option_2, option_3, option_4], properties=frozenset({"basic"}), informations={'ymlfiles': ['']}) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_1]) diff --git a/tests/dictionaries/04_1default_calculation_hidden_3/tiramisu/no_namespace.py b/tests/dictionaries/04_1default_calculation_hidden_3/tiramisu/no_namespace.py index 554931739..5b84aaae8 100644 --- a/tests/dictionaries/04_1default_calculation_hidden_3/tiramisu/no_namespace.py +++ b/tests/dictionaries/04_1default_calculation_hidden_3/tiramisu/no_namespace.py @@ -8,6 +8,6 @@ ALLOWED_LEADER_PROPERTIES.add("standard") ALLOWED_LEADER_PROPERTIES.add("advanced") dict_env['default_var3'] = "{% if _.var1 == 'value' or _.var2 == 'blah' %}\nvalue\n{% endif %}\n" option_1 = StrOption(name="var1", doc="a first variable", default="value", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "standard"}), informations={'ymlfiles': ['../rougail-tests/structures/04_1default_calculation_hidden_3/rougail/00-base.yml'], 'type': 'string'}) -option_2 = StrOption(name="var2", doc="a second variable", properties=frozenset({"basic", "mandatory", Calculation(func['variable_to_property'], Params((ParamValue("disabled"), ParamOption(option_1)), kwargs={'when': ParamValue("value"), 'inverse': ParamValue(False)}), help_function=func['variable_to_property'])}), informations={'ymlfiles': ['../rougail-tests/structures/04_1default_calculation_hidden_3/rougail/00-base.yml'], 'type': 'string'}) +option_2 = StrOption(name="var2", doc="a second variable", properties=frozenset({"basic", "mandatory", Calculation(func['variable_to_property'], Params((), kwargs={'value': ParamOption(option_1), 'prop': ParamValue("disabled"), 'when': ParamValue("value"), 'inverse': ParamValue(False)}), help_function=func['variable_to_property'])}), informations={'ymlfiles': ['../rougail-tests/structures/04_1default_calculation_hidden_3/rougail/00-base.yml'], 'type': 'string'}) option_3 = StrOption(name="var3", doc="a third variable", default=Calculation(func['jinja_to_function'], Params((), kwargs={'__internal_jinja': ParamValue("default_var3"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['../rougail-tests/structures/04_1default_calculation_hidden_3/rougail/00-base.yml']), '__internal_attribute': ParamValue("default"), '__internal_variable': ParamValue("var3"), '_.var2': ParamOption(option_2, notraisepropertyerror=True), '_.var1': ParamOption(option_1, notraisepropertyerror=True)})), properties=frozenset({"mandatory", "standard"}), informations={'ymlfiles': ['../rougail-tests/structures/04_1default_calculation_hidden_3/rougail/00-base.yml'], 'type': 'string'}) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1, option_2, option_3]) diff --git a/tests/dictionaries/04_1default_calculation_hidden_4/tiramisu/base.py b/tests/dictionaries/04_1default_calculation_hidden_4/tiramisu/base.py index b347c89d5..c077c6d59 100644 --- a/tests/dictionaries/04_1default_calculation_hidden_4/tiramisu/base.py +++ b/tests/dictionaries/04_1default_calculation_hidden_4/tiramisu/base.py @@ -12,7 +12,7 @@ ALLOWED_LEADER_PROPERTIES.add("standard") ALLOWED_LEADER_PROPERTIES.add("advanced") dict_env['default_rougail.var3'] = "{% if _.var1 == 'value' or _.var2 == 'blah' %}\nvalue\n{% endif %}\n" option_2 = StrOption(name="var1", doc="a first variable", default="value", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "standard"}), informations={'ymlfiles': ['../rougail-tests/structures/04_1default_calculation_hidden_4/rougail/00-base.yml'], 'type': 'string'}) -option_3 = StrOption(name="var2", doc="a second variable", properties=frozenset({"basic", "mandatory", Calculation(func['variable_to_property'], Params((ParamValue("disabled"), ParamOption(option_2)), kwargs={'when': ParamValue("value"), 'inverse': ParamValue(True)}), help_function=func['variable_to_property'])}), informations={'ymlfiles': ['../rougail-tests/structures/04_1default_calculation_hidden_4/rougail/00-base.yml'], 'type': 'string'}) +option_3 = StrOption(name="var2", doc="a second variable", properties=frozenset({"basic", "mandatory", Calculation(func['variable_to_property'], Params((), kwargs={'value': ParamOption(option_2), 'prop': ParamValue("disabled"), 'when': ParamValue("value"), 'inverse': ParamValue(True)}), help_function=func['variable_to_property'])}), informations={'ymlfiles': ['../rougail-tests/structures/04_1default_calculation_hidden_4/rougail/00-base.yml'], 'type': 'string'}) option_4 = StrOption(name="var3", doc="a third variable", default=Calculation(func['jinja_to_function'], Params((), kwargs={'__internal_jinja': ParamValue("default_rougail.var3"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['../rougail-tests/structures/04_1default_calculation_hidden_4/rougail/00-base.yml']), '__internal_attribute': ParamValue("default"), '__internal_variable': ParamValue("rougail.var3"), '_.var2': ParamOption(option_3, notraisepropertyerror=True), '_.var1': ParamOption(option_2, notraisepropertyerror=True)})), properties=frozenset({"mandatory", "standard"}), informations={'ymlfiles': ['../rougail-tests/structures/04_1default_calculation_hidden_4/rougail/00-base.yml'], 'type': 'string'}) optiondescription_1 = OptionDescription(name="rougail", doc="Rougail", group_type=groups.namespace, children=[option_2, option_3, option_4], properties=frozenset({"basic"}), informations={'ymlfiles': ['']}) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_1]) diff --git a/tests/dictionaries/04_1default_calculation_hidden_4/tiramisu/no_namespace.py b/tests/dictionaries/04_1default_calculation_hidden_4/tiramisu/no_namespace.py index 869037897..f5c2789d9 100644 --- a/tests/dictionaries/04_1default_calculation_hidden_4/tiramisu/no_namespace.py +++ b/tests/dictionaries/04_1default_calculation_hidden_4/tiramisu/no_namespace.py @@ -8,6 +8,6 @@ ALLOWED_LEADER_PROPERTIES.add("standard") ALLOWED_LEADER_PROPERTIES.add("advanced") dict_env['default_var3'] = "{% if _.var1 == 'value' or _.var2 == 'blah' %}\nvalue\n{% endif %}\n" option_1 = StrOption(name="var1", doc="a first variable", default="value", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "standard"}), informations={'ymlfiles': ['../rougail-tests/structures/04_1default_calculation_hidden_4/rougail/00-base.yml'], 'type': 'string'}) -option_2 = StrOption(name="var2", doc="a second variable", properties=frozenset({"basic", "mandatory", Calculation(func['variable_to_property'], Params((ParamValue("disabled"), ParamOption(option_1)), kwargs={'when': ParamValue("value"), 'inverse': ParamValue(True)}), help_function=func['variable_to_property'])}), informations={'ymlfiles': ['../rougail-tests/structures/04_1default_calculation_hidden_4/rougail/00-base.yml'], 'type': 'string'}) +option_2 = StrOption(name="var2", doc="a second variable", properties=frozenset({"basic", "mandatory", Calculation(func['variable_to_property'], Params((), kwargs={'value': ParamOption(option_1), 'prop': ParamValue("disabled"), 'when': ParamValue("value"), 'inverse': ParamValue(True)}), help_function=func['variable_to_property'])}), informations={'ymlfiles': ['../rougail-tests/structures/04_1default_calculation_hidden_4/rougail/00-base.yml'], 'type': 'string'}) option_3 = StrOption(name="var3", doc="a third variable", default=Calculation(func['jinja_to_function'], Params((), kwargs={'__internal_jinja': ParamValue("default_var3"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['../rougail-tests/structures/04_1default_calculation_hidden_4/rougail/00-base.yml']), '__internal_attribute': ParamValue("default"), '__internal_variable': ParamValue("var3"), '_.var2': ParamOption(option_2, notraisepropertyerror=True), '_.var1': ParamOption(option_1, notraisepropertyerror=True)})), properties=frozenset({"mandatory", "standard"}), informations={'ymlfiles': ['../rougail-tests/structures/04_1default_calculation_hidden_4/rougail/00-base.yml'], 'type': 'string'}) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1, option_2, option_3]) diff --git a/tests/dictionaries/04_1default_calculation_hidden_5/tiramisu/base.py b/tests/dictionaries/04_1default_calculation_hidden_5/tiramisu/base.py index e99dc25b5..e29130e6d 100644 --- a/tests/dictionaries/04_1default_calculation_hidden_5/tiramisu/base.py +++ b/tests/dictionaries/04_1default_calculation_hidden_5/tiramisu/base.py @@ -12,6 +12,6 @@ ALLOWED_LEADER_PROPERTIES.add("standard") ALLOWED_LEADER_PROPERTIES.add("advanced") option_2 = StrOption(name="var1", doc="a first variable", default="value", properties=frozenset({"mandatory", "standard"}), informations={'ymlfiles': ['../rougail-tests/structures/04_1default_calculation_hidden_5/rougail/00-base.yml'], 'type': 'string'}) option_3 = StrOption(name="var2", doc="a second variable", default=Calculation(func['calc_value'], Params((ParamOption(option_2)))), properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "standard"}), informations={'ymlfiles': ['../rougail-tests/structures/04_1default_calculation_hidden_5/rougail/00-base.yml'], 'type': 'string'}) -option_4 = StrOption(name="var3", doc="a third variable", properties=frozenset({"basic", "mandatory", Calculation(func['variable_to_property'], Params((ParamValue("disabled"), ParamOption(option_3)), kwargs={'when': ParamValue("value"), 'inverse': ParamValue(False)}), help_function=func['variable_to_property'])}), informations={'ymlfiles': ['../rougail-tests/structures/04_1default_calculation_hidden_5/rougail/00-base.yml'], 'type': 'string'}) +option_4 = StrOption(name="var3", doc="a third variable", properties=frozenset({"basic", "mandatory", Calculation(func['variable_to_property'], Params((), kwargs={'value': ParamOption(option_3), 'prop': ParamValue("disabled"), 'when': ParamValue("value"), 'inverse': ParamValue(False)}), help_function=func['variable_to_property'])}), informations={'ymlfiles': ['../rougail-tests/structures/04_1default_calculation_hidden_5/rougail/00-base.yml'], 'type': 'string'}) optiondescription_1 = OptionDescription(name="rougail", doc="Rougail", group_type=groups.namespace, children=[option_2, option_3, option_4], properties=frozenset({"basic"}), informations={'ymlfiles': ['']}) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_1]) diff --git a/tests/dictionaries/04_1default_calculation_hidden_5/tiramisu/no_namespace.py b/tests/dictionaries/04_1default_calculation_hidden_5/tiramisu/no_namespace.py index 0f847a80b..bea651453 100644 --- a/tests/dictionaries/04_1default_calculation_hidden_5/tiramisu/no_namespace.py +++ b/tests/dictionaries/04_1default_calculation_hidden_5/tiramisu/no_namespace.py @@ -8,5 +8,5 @@ ALLOWED_LEADER_PROPERTIES.add("standard") ALLOWED_LEADER_PROPERTIES.add("advanced") option_1 = StrOption(name="var1", doc="a first variable", default="value", properties=frozenset({"mandatory", "standard"}), informations={'ymlfiles': ['../rougail-tests/structures/04_1default_calculation_hidden_5/rougail/00-base.yml'], 'type': 'string'}) option_2 = StrOption(name="var2", doc="a second variable", default=Calculation(func['calc_value'], Params((ParamOption(option_1)))), properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "standard"}), informations={'ymlfiles': ['../rougail-tests/structures/04_1default_calculation_hidden_5/rougail/00-base.yml'], 'type': 'string'}) -option_3 = StrOption(name="var3", doc="a third variable", properties=frozenset({"basic", "mandatory", Calculation(func['variable_to_property'], Params((ParamValue("disabled"), ParamOption(option_2)), kwargs={'when': ParamValue("value"), 'inverse': ParamValue(False)}), help_function=func['variable_to_property'])}), informations={'ymlfiles': ['../rougail-tests/structures/04_1default_calculation_hidden_5/rougail/00-base.yml'], 'type': 'string'}) +option_3 = StrOption(name="var3", doc="a third variable", properties=frozenset({"basic", "mandatory", Calculation(func['variable_to_property'], Params((), kwargs={'value': ParamOption(option_2), 'prop': ParamValue("disabled"), 'when': ParamValue("value"), 'inverse': ParamValue(False)}), help_function=func['variable_to_property'])}), informations={'ymlfiles': ['../rougail-tests/structures/04_1default_calculation_hidden_5/rougail/00-base.yml'], 'type': 'string'}) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1, option_2, option_3]) diff --git a/tests/dictionaries/04_1default_calculation_hidden_6/tiramisu/base.py b/tests/dictionaries/04_1default_calculation_hidden_6/tiramisu/base.py index 2651e2e08..0bc69c65e 100644 --- a/tests/dictionaries/04_1default_calculation_hidden_6/tiramisu/base.py +++ b/tests/dictionaries/04_1default_calculation_hidden_6/tiramisu/base.py @@ -12,6 +12,6 @@ ALLOWED_LEADER_PROPERTIES.add("standard") ALLOWED_LEADER_PROPERTIES.add("advanced") option_2 = StrOption(name="var1", doc="a first variable", default="value", properties=frozenset({"mandatory", "standard"}), informations={'ymlfiles': ['../rougail-tests/structures/04_1default_calculation_hidden_6/rougail/00-base.yml'], 'type': 'string'}) option_3 = StrOption(name="var2", doc="a second variable", default=Calculation(func['calc_value'], Params((ParamOption(option_2)))), properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "standard"}), informations={'ymlfiles': ['../rougail-tests/structures/04_1default_calculation_hidden_6/rougail/00-base.yml'], 'type': 'string'}) -option_4 = StrOption(name="var3", doc="a third variable", properties=frozenset({"basic", "mandatory", Calculation(func['variable_to_property'], Params((ParamValue("disabled"), ParamOption(option_3)), kwargs={'when': ParamValue("value"), 'inverse': ParamValue(True)}), help_function=func['variable_to_property'])}), informations={'ymlfiles': ['../rougail-tests/structures/04_1default_calculation_hidden_6/rougail/00-base.yml'], 'type': 'string'}) +option_4 = StrOption(name="var3", doc="a third variable", properties=frozenset({"basic", "mandatory", Calculation(func['variable_to_property'], Params((), kwargs={'value': ParamOption(option_3), 'prop': ParamValue("disabled"), 'when': ParamValue("value"), 'inverse': ParamValue(True)}), help_function=func['variable_to_property'])}), informations={'ymlfiles': ['../rougail-tests/structures/04_1default_calculation_hidden_6/rougail/00-base.yml'], 'type': 'string'}) optiondescription_1 = OptionDescription(name="rougail", doc="Rougail", group_type=groups.namespace, children=[option_2, option_3, option_4], properties=frozenset({"basic"}), informations={'ymlfiles': ['']}) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_1]) diff --git a/tests/dictionaries/04_1default_calculation_hidden_6/tiramisu/no_namespace.py b/tests/dictionaries/04_1default_calculation_hidden_6/tiramisu/no_namespace.py index 0eff4e341..91fb8ae6e 100644 --- a/tests/dictionaries/04_1default_calculation_hidden_6/tiramisu/no_namespace.py +++ b/tests/dictionaries/04_1default_calculation_hidden_6/tiramisu/no_namespace.py @@ -8,5 +8,5 @@ ALLOWED_LEADER_PROPERTIES.add("standard") ALLOWED_LEADER_PROPERTIES.add("advanced") option_1 = StrOption(name="var1", doc="a first variable", default="value", properties=frozenset({"mandatory", "standard"}), informations={'ymlfiles': ['../rougail-tests/structures/04_1default_calculation_hidden_6/rougail/00-base.yml'], 'type': 'string'}) option_2 = StrOption(name="var2", doc="a second variable", default=Calculation(func['calc_value'], Params((ParamOption(option_1)))), properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "standard"}), informations={'ymlfiles': ['../rougail-tests/structures/04_1default_calculation_hidden_6/rougail/00-base.yml'], 'type': 'string'}) -option_3 = StrOption(name="var3", doc="a third variable", properties=frozenset({"basic", "mandatory", Calculation(func['variable_to_property'], Params((ParamValue("disabled"), ParamOption(option_2)), kwargs={'when': ParamValue("value"), 'inverse': ParamValue(True)}), help_function=func['variable_to_property'])}), informations={'ymlfiles': ['../rougail-tests/structures/04_1default_calculation_hidden_6/rougail/00-base.yml'], 'type': 'string'}) +option_3 = StrOption(name="var3", doc="a third variable", properties=frozenset({"basic", "mandatory", Calculation(func['variable_to_property'], Params((), kwargs={'value': ParamOption(option_2), 'prop': ParamValue("disabled"), 'when': ParamValue("value"), 'inverse': ParamValue(True)}), help_function=func['variable_to_property'])}), informations={'ymlfiles': ['../rougail-tests/structures/04_1default_calculation_hidden_6/rougail/00-base.yml'], 'type': 'string'}) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1, option_2, option_3]) diff --git a/tests/dictionaries/04_5disabled_calculation_optional_default/tiramisu/base.py b/tests/dictionaries/04_5disabled_calculation_optional_default/tiramisu/base.py index b9d589390..23a1c8d5b 100644 --- a/tests/dictionaries/04_5disabled_calculation_optional_default/tiramisu/base.py +++ b/tests/dictionaries/04_5disabled_calculation_optional_default/tiramisu/base.py @@ -13,7 +13,7 @@ ALLOWED_LEADER_PROPERTIES.add("advanced") option_2 = BoolOption(name="condition", doc="a condition", default=False, properties=frozenset({"mandatory", "standard"}), informations={'ymlfiles': ['../rougail-tests/structures/04_5disabled_calculation_optional_default/rougail/00-base.yml'], 'type': 'boolean'}) option_3 = StrOption(name="var1", doc="a first variable", properties=frozenset({"force_default_on_freeze", "standard"}), informations={'ymlfiles': ['../rougail-tests/structures/04_5disabled_calculation_optional_default/rougail/00-base.yml'], 'type': 'string'}) option_4 = StrOption(name="var2", doc="a first variable", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "standard"}), informations={'ymlfiles': ['../rougail-tests/structures/04_5disabled_calculation_optional_default/rougail/00-base.yml'], 'type': 'string'}) -option_5 = StrOption(name="var3", doc="a second variable", properties=frozenset({"force_default_on_freeze", "standard", Calculation(func['variable_to_property'], Params((ParamValue("hidden"), ParamOption(option_2)), kwargs={'when': ParamValue(True), 'inverse': ParamValue(False)}), help_function=func['variable_to_property']), Calculation(func['variable_to_property'], Params((ParamValue("frozen"), ParamOption(option_2)), kwargs={'when': ParamValue(True), 'inverse': ParamValue(False)}), help_function=func['variable_to_property'])}), informations={'ymlfiles': ['../rougail-tests/structures/04_5disabled_calculation_optional_default/rougail/00-base.yml'], 'type': 'string'}) -option_6 = StrOption(name="var4", doc="a forth variable", properties=frozenset({"force_default_on_freeze", "standard", Calculation(func['variable_to_property'], Params((ParamValue("hidden"), ParamOption(option_2)), kwargs={'when': ParamValue(True), 'inverse': ParamValue(False)}), help_function=func['variable_to_property']), Calculation(func['variable_to_property'], Params((ParamValue("frozen"), ParamOption(option_2)), kwargs={'when': ParamValue(True), 'inverse': ParamValue(False)}), help_function=func['variable_to_property'])}), informations={'ymlfiles': ['../rougail-tests/structures/04_5disabled_calculation_optional_default/rougail/00-base.yml'], 'type': 'string'}) +option_5 = StrOption(name="var3", doc="a second variable", properties=frozenset({"force_default_on_freeze", "standard", Calculation(func['variable_to_property'], Params((), kwargs={'value': ParamOption(option_2), 'prop': ParamValue("hidden"), 'when': ParamValue(True), 'inverse': ParamValue(False)}), help_function=func['variable_to_property']), Calculation(func['variable_to_property'], Params((), kwargs={'value': ParamOption(option_2), 'prop': ParamValue("frozen"), 'when': ParamValue(True), 'inverse': ParamValue(False)}), help_function=func['variable_to_property'])}), informations={'ymlfiles': ['../rougail-tests/structures/04_5disabled_calculation_optional_default/rougail/00-base.yml'], 'type': 'string'}) +option_6 = StrOption(name="var4", doc="a forth variable", properties=frozenset({"force_default_on_freeze", "standard", Calculation(func['variable_to_property'], Params((), kwargs={'value': ParamOption(option_2), 'prop': ParamValue("hidden"), 'when': ParamValue(True), 'inverse': ParamValue(False)}), help_function=func['variable_to_property']), Calculation(func['variable_to_property'], Params((), kwargs={'value': ParamOption(option_2), 'prop': ParamValue("frozen"), 'when': ParamValue(True), 'inverse': ParamValue(False)}), help_function=func['variable_to_property'])}), informations={'ymlfiles': ['../rougail-tests/structures/04_5disabled_calculation_optional_default/rougail/00-base.yml'], 'type': 'string'}) optiondescription_1 = OptionDescription(name="rougail", doc="Rougail", group_type=groups.namespace, children=[option_2, option_3, option_4, option_5, option_6], properties=frozenset({"standard"}), informations={'ymlfiles': ['']}) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_1]) diff --git a/tests/dictionaries/04_5disabled_calculation_optional_default/tiramisu/no_namespace.py b/tests/dictionaries/04_5disabled_calculation_optional_default/tiramisu/no_namespace.py index ec7f6cd98..900ef4588 100644 --- a/tests/dictionaries/04_5disabled_calculation_optional_default/tiramisu/no_namespace.py +++ b/tests/dictionaries/04_5disabled_calculation_optional_default/tiramisu/no_namespace.py @@ -9,6 +9,6 @@ ALLOWED_LEADER_PROPERTIES.add("advanced") option_1 = BoolOption(name="condition", doc="a condition", default=False, properties=frozenset({"mandatory", "standard"}), informations={'ymlfiles': ['../rougail-tests/structures/04_5disabled_calculation_optional_default/rougail/00-base.yml'], 'type': 'boolean'}) option_2 = StrOption(name="var1", doc="a first variable", properties=frozenset({"force_default_on_freeze", "standard"}), informations={'ymlfiles': ['../rougail-tests/structures/04_5disabled_calculation_optional_default/rougail/00-base.yml'], 'type': 'string'}) option_3 = StrOption(name="var2", doc="a first variable", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "standard"}), informations={'ymlfiles': ['../rougail-tests/structures/04_5disabled_calculation_optional_default/rougail/00-base.yml'], 'type': 'string'}) -option_4 = StrOption(name="var3", doc="a second variable", properties=frozenset({"force_default_on_freeze", "standard", Calculation(func['variable_to_property'], Params((ParamValue("hidden"), ParamOption(option_1)), kwargs={'when': ParamValue(True), 'inverse': ParamValue(False)}), help_function=func['variable_to_property']), Calculation(func['variable_to_property'], Params((ParamValue("frozen"), ParamOption(option_1)), kwargs={'when': ParamValue(True), 'inverse': ParamValue(False)}), help_function=func['variable_to_property'])}), informations={'ymlfiles': ['../rougail-tests/structures/04_5disabled_calculation_optional_default/rougail/00-base.yml'], 'type': 'string'}) -option_5 = StrOption(name="var4", doc="a forth variable", properties=frozenset({"force_default_on_freeze", "standard", Calculation(func['variable_to_property'], Params((ParamValue("hidden"), ParamOption(option_1)), kwargs={'when': ParamValue(True), 'inverse': ParamValue(False)}), help_function=func['variable_to_property']), Calculation(func['variable_to_property'], Params((ParamValue("frozen"), ParamOption(option_1)), kwargs={'when': ParamValue(True), 'inverse': ParamValue(False)}), help_function=func['variable_to_property'])}), informations={'ymlfiles': ['../rougail-tests/structures/04_5disabled_calculation_optional_default/rougail/00-base.yml'], 'type': 'string'}) +option_4 = StrOption(name="var3", doc="a second variable", properties=frozenset({"force_default_on_freeze", "standard", Calculation(func['variable_to_property'], Params((), kwargs={'value': ParamOption(option_1), 'prop': ParamValue("hidden"), 'when': ParamValue(True), 'inverse': ParamValue(False)}), help_function=func['variable_to_property']), Calculation(func['variable_to_property'], Params((), kwargs={'value': ParamOption(option_1), 'prop': ParamValue("frozen"), 'when': ParamValue(True), 'inverse': ParamValue(False)}), help_function=func['variable_to_property'])}), informations={'ymlfiles': ['../rougail-tests/structures/04_5disabled_calculation_optional_default/rougail/00-base.yml'], 'type': 'string'}) +option_5 = StrOption(name="var4", doc="a forth variable", properties=frozenset({"force_default_on_freeze", "standard", Calculation(func['variable_to_property'], Params((), kwargs={'value': ParamOption(option_1), 'prop': ParamValue("hidden"), 'when': ParamValue(True), 'inverse': ParamValue(False)}), help_function=func['variable_to_property']), Calculation(func['variable_to_property'], Params((), kwargs={'value': ParamOption(option_1), 'prop': ParamValue("frozen"), 'when': ParamValue(True), 'inverse': ParamValue(False)}), help_function=func['variable_to_property'])}), informations={'ymlfiles': ['../rougail-tests/structures/04_5disabled_calculation_optional_default/rougail/00-base.yml'], 'type': 'string'}) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1, option_2, option_3, option_4, option_5]) diff --git a/tests/dictionaries/04_5disabled_calculation_variable/tiramisu/base.py b/tests/dictionaries/04_5disabled_calculation_variable/tiramisu/base.py index ca58b7256..9cc4613ab 100644 --- a/tests/dictionaries/04_5disabled_calculation_variable/tiramisu/base.py +++ b/tests/dictionaries/04_5disabled_calculation_variable/tiramisu/base.py @@ -11,6 +11,6 @@ ALLOWED_LEADER_PROPERTIES.add("basic") ALLOWED_LEADER_PROPERTIES.add("standard") ALLOWED_LEADER_PROPERTIES.add("advanced") option_2 = BoolOption(name="condition", doc="a condition", default=False, properties=frozenset({"mandatory", "standard"}), informations={'ymlfiles': ['../rougail-tests/structures/04_5disabled_calculation_variable/rougail/00-base.yml'], 'type': 'boolean'}) -option_3 = StrOption(name="variable", doc="a variable", properties=frozenset({"basic", "mandatory", Calculation(func['variable_to_property'], Params((ParamValue("disabled"), ParamOption(option_2)), kwargs={'when': ParamValue(True), 'inverse': ParamValue(False)}), help_function=func['variable_to_property'])}), informations={'ymlfiles': ['../rougail-tests/structures/04_5disabled_calculation_variable/rougail/00-base.yml'], 'type': 'string'}) +option_3 = StrOption(name="variable", doc="a variable", properties=frozenset({"basic", "mandatory", Calculation(func['variable_to_property'], Params((), kwargs={'value': ParamOption(option_2), 'prop': ParamValue("disabled"), 'when': ParamValue(True), 'inverse': ParamValue(False)}), help_function=func['variable_to_property'])}), informations={'ymlfiles': ['../rougail-tests/structures/04_5disabled_calculation_variable/rougail/00-base.yml'], 'type': 'string'}) optiondescription_1 = OptionDescription(name="rougail", doc="Rougail", group_type=groups.namespace, children=[option_2, option_3], properties=frozenset({"basic"}), informations={'ymlfiles': ['']}) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_1]) diff --git a/tests/dictionaries/04_5disabled_calculation_variable/tiramisu/no_namespace.py b/tests/dictionaries/04_5disabled_calculation_variable/tiramisu/no_namespace.py index 8e52de850..0f92647cc 100644 --- a/tests/dictionaries/04_5disabled_calculation_variable/tiramisu/no_namespace.py +++ b/tests/dictionaries/04_5disabled_calculation_variable/tiramisu/no_namespace.py @@ -7,5 +7,5 @@ ALLOWED_LEADER_PROPERTIES.add("basic") ALLOWED_LEADER_PROPERTIES.add("standard") ALLOWED_LEADER_PROPERTIES.add("advanced") option_1 = BoolOption(name="condition", doc="a condition", default=False, properties=frozenset({"mandatory", "standard"}), informations={'ymlfiles': ['../rougail-tests/structures/04_5disabled_calculation_variable/rougail/00-base.yml'], 'type': 'boolean'}) -option_2 = StrOption(name="variable", doc="a variable", properties=frozenset({"basic", "mandatory", Calculation(func['variable_to_property'], Params((ParamValue("disabled"), ParamOption(option_1)), kwargs={'when': ParamValue(True), 'inverse': ParamValue(False)}), help_function=func['variable_to_property'])}), informations={'ymlfiles': ['../rougail-tests/structures/04_5disabled_calculation_variable/rougail/00-base.yml'], 'type': 'string'}) +option_2 = StrOption(name="variable", doc="a variable", properties=frozenset({"basic", "mandatory", Calculation(func['variable_to_property'], Params((), kwargs={'value': ParamOption(option_1), 'prop': ParamValue("disabled"), 'when': ParamValue(True), 'inverse': ParamValue(False)}), help_function=func['variable_to_property'])}), informations={'ymlfiles': ['../rougail-tests/structures/04_5disabled_calculation_variable/rougail/00-base.yml'], 'type': 'string'}) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1, option_2]) diff --git a/tests/dictionaries/04_5disabled_calculation_variable10/makedict/after.json b/tests/dictionaries/04_5disabled_calculation_variable10/makedict/after.json new file mode 100644 index 000000000..5995efe9d --- /dev/null +++ b/tests/dictionaries/04_5disabled_calculation_variable10/makedict/after.json @@ -0,0 +1,6 @@ +{ + "rougail.condition": { + "owner": "default", + "value": true + } +} diff --git a/tests/dictionaries/04_5disabled_calculation_variable10/makedict/base.json b/tests/dictionaries/04_5disabled_calculation_variable10/makedict/base.json new file mode 100644 index 000000000..18b52facb --- /dev/null +++ b/tests/dictionaries/04_5disabled_calculation_variable10/makedict/base.json @@ -0,0 +1,3 @@ +{ + "rougail.condition": true +} diff --git a/tests/dictionaries/04_5disabled_calculation_variable10/makedict/before.json b/tests/dictionaries/04_5disabled_calculation_variable10/makedict/before.json new file mode 100644 index 000000000..5995efe9d --- /dev/null +++ b/tests/dictionaries/04_5disabled_calculation_variable10/makedict/before.json @@ -0,0 +1,6 @@ +{ + "rougail.condition": { + "owner": "default", + "value": true + } +} diff --git a/tests/dictionaries/01_6number_integer/makedict/mandatory.json b/tests/dictionaries/04_5disabled_calculation_variable10/makedict/mandatory.json similarity index 100% rename from tests/dictionaries/01_6number_integer/makedict/mandatory.json rename to tests/dictionaries/04_5disabled_calculation_variable10/makedict/mandatory.json diff --git a/tests/dictionaries/04_5disabled_calculation_variable10/makedict/read_write.json b/tests/dictionaries/04_5disabled_calculation_variable10/makedict/read_write.json new file mode 100644 index 000000000..18b52facb --- /dev/null +++ b/tests/dictionaries/04_5disabled_calculation_variable10/makedict/read_write.json @@ -0,0 +1,3 @@ +{ + "rougail.condition": true +} diff --git a/tests/dictionaries/04_5disabled_calculation_variable10/tiramisu/base.py b/tests/dictionaries/04_5disabled_calculation_variable10/tiramisu/base.py new file mode 100644 index 000000000..008aacf1f --- /dev/null +++ b/tests/dictionaries/04_5disabled_calculation_variable10/tiramisu/base.py @@ -0,0 +1,16 @@ +from tiramisu import * +from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +from re import compile as re_compile +from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription +load_functions('../rougail-tests/funcs/test.py') +try: + groups.namespace +except: + groups.addgroup('namespace') +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("standard") +ALLOWED_LEADER_PROPERTIES.add("advanced") +option_2 = BoolOption(name="condition", doc="a condition", default=True, properties=frozenset({"mandatory", "standard"}), informations={'ymlfiles': ['../rougail-tests/structures/04_5disabled_calculation_variable10/rougail/00-base.yml'], 'type': 'boolean'}) +option_3 = StrOption(name="variable", doc="a variable", properties=frozenset({"basic", "mandatory", Calculation(func['variable_to_property'], Params((), kwargs={'value': ParamOption(option_2), 'prop': ParamValue("disabled"), 'when': ParamValue(True), 'inverse': ParamValue(False)}), help_function=func['variable_to_property'])}), informations={'ymlfiles': ['../rougail-tests/structures/04_5disabled_calculation_variable10/rougail/00-base.yml'], 'type': 'string'}) +optiondescription_1 = OptionDescription(name="rougail", doc="Rougail", group_type=groups.namespace, children=[option_2, option_3], properties=frozenset({"basic"}), informations={'ymlfiles': ['']}) +option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_1]) diff --git a/tests/dictionaries/04_5disabled_calculation_variable10/tiramisu/no_namespace.py b/tests/dictionaries/04_5disabled_calculation_variable10/tiramisu/no_namespace.py new file mode 100644 index 000000000..722fdf7d3 --- /dev/null +++ b/tests/dictionaries/04_5disabled_calculation_variable10/tiramisu/no_namespace.py @@ -0,0 +1,11 @@ +from tiramisu import * +from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +from re import compile as re_compile +from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription +load_functions('../rougail-tests/funcs/test.py') +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("standard") +ALLOWED_LEADER_PROPERTIES.add("advanced") +option_1 = BoolOption(name="condition", doc="a condition", default=True, properties=frozenset({"mandatory", "standard"}), informations={'ymlfiles': ['../rougail-tests/structures/04_5disabled_calculation_variable10/rougail/00-base.yml'], 'type': 'boolean'}) +option_2 = StrOption(name="variable", doc="a variable", properties=frozenset({"basic", "mandatory", Calculation(func['variable_to_property'], Params((), kwargs={'value': ParamOption(option_1), 'prop': ParamValue("disabled"), 'when': ParamValue(True), 'inverse': ParamValue(False)}), help_function=func['variable_to_property'])}), informations={'ymlfiles': ['../rougail-tests/structures/04_5disabled_calculation_variable10/rougail/00-base.yml'], 'type': 'string'}) +option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1, option_2]) diff --git a/tests/dictionaries/04_5disabled_calculation_variable2/tiramisu/base.py b/tests/dictionaries/04_5disabled_calculation_variable2/tiramisu/base.py index b363cffe3..db54beae8 100644 --- a/tests/dictionaries/04_5disabled_calculation_variable2/tiramisu/base.py +++ b/tests/dictionaries/04_5disabled_calculation_variable2/tiramisu/base.py @@ -11,6 +11,6 @@ ALLOWED_LEADER_PROPERTIES.add("basic") ALLOWED_LEADER_PROPERTIES.add("standard") ALLOWED_LEADER_PROPERTIES.add("advanced") option_2 = BoolOption(name="condition", doc="a condition", default=True, properties=frozenset({"mandatory", "standard"}), informations={'ymlfiles': ['../rougail-tests/structures/04_5disabled_calculation_variable2/rougail/00-base.yml'], 'type': 'boolean'}) -option_3 = StrOption(name="variable", doc="a variable", properties=frozenset({"basic", "mandatory", Calculation(func['variable_to_property'], Params((ParamValue("disabled"), ParamOption(option_2)), kwargs={'when': ParamValue(True), 'inverse': ParamValue(False)}), help_function=func['variable_to_property'])}), informations={'ymlfiles': ['../rougail-tests/structures/04_5disabled_calculation_variable2/rougail/00-base.yml'], 'type': 'string'}) +option_3 = StrOption(name="variable", doc="a variable", properties=frozenset({"basic", "mandatory", Calculation(func['variable_to_property'], Params((), kwargs={'value': ParamOption(option_2), 'prop': ParamValue("disabled"), 'when': ParamValue(True), 'inverse': ParamValue(False)}), help_function=func['variable_to_property'])}), informations={'ymlfiles': ['../rougail-tests/structures/04_5disabled_calculation_variable2/rougail/00-base.yml'], 'type': 'string'}) optiondescription_1 = OptionDescription(name="rougail", doc="Rougail", group_type=groups.namespace, children=[option_2, option_3], properties=frozenset({"basic"}), informations={'ymlfiles': ['']}) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_1]) diff --git a/tests/dictionaries/04_5disabled_calculation_variable2/tiramisu/no_namespace.py b/tests/dictionaries/04_5disabled_calculation_variable2/tiramisu/no_namespace.py index 398c5d35c..f33012645 100644 --- a/tests/dictionaries/04_5disabled_calculation_variable2/tiramisu/no_namespace.py +++ b/tests/dictionaries/04_5disabled_calculation_variable2/tiramisu/no_namespace.py @@ -7,5 +7,5 @@ ALLOWED_LEADER_PROPERTIES.add("basic") ALLOWED_LEADER_PROPERTIES.add("standard") ALLOWED_LEADER_PROPERTIES.add("advanced") option_1 = BoolOption(name="condition", doc="a condition", default=True, properties=frozenset({"mandatory", "standard"}), informations={'ymlfiles': ['../rougail-tests/structures/04_5disabled_calculation_variable2/rougail/00-base.yml'], 'type': 'boolean'}) -option_2 = StrOption(name="variable", doc="a variable", properties=frozenset({"basic", "mandatory", Calculation(func['variable_to_property'], Params((ParamValue("disabled"), ParamOption(option_1)), kwargs={'when': ParamValue(True), 'inverse': ParamValue(False)}), help_function=func['variable_to_property'])}), informations={'ymlfiles': ['../rougail-tests/structures/04_5disabled_calculation_variable2/rougail/00-base.yml'], 'type': 'string'}) +option_2 = StrOption(name="variable", doc="a variable", properties=frozenset({"basic", "mandatory", Calculation(func['variable_to_property'], Params((), kwargs={'value': ParamOption(option_1), 'prop': ParamValue("disabled"), 'when': ParamValue(True), 'inverse': ParamValue(False)}), help_function=func['variable_to_property'])}), informations={'ymlfiles': ['../rougail-tests/structures/04_5disabled_calculation_variable2/rougail/00-base.yml'], 'type': 'string'}) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1, option_2]) diff --git a/tests/dictionaries/04_5disabled_calculation_variable3/tiramisu/base.py b/tests/dictionaries/04_5disabled_calculation_variable3/tiramisu/base.py index 9d7a51795..bf9a4fe7e 100644 --- a/tests/dictionaries/04_5disabled_calculation_variable3/tiramisu/base.py +++ b/tests/dictionaries/04_5disabled_calculation_variable3/tiramisu/base.py @@ -11,6 +11,6 @@ ALLOWED_LEADER_PROPERTIES.add("basic") ALLOWED_LEADER_PROPERTIES.add("standard") ALLOWED_LEADER_PROPERTIES.add("advanced") option_2 = StrOption(name="condition", doc="a condition", default="yes", properties=frozenset({"mandatory", "standard"}), informations={'ymlfiles': ['../rougail-tests/structures/04_5disabled_calculation_variable3/rougail/00-base.yml'], 'type': 'string'}) -option_3 = StrOption(name="variable", doc="a variable", properties=frozenset({"basic", "mandatory", Calculation(func['variable_to_property'], Params((ParamValue("disabled"), ParamOption(option_2)), kwargs={'when': ParamValue("yes"), 'inverse': ParamValue(False)}), help_function=func['variable_to_property'])}), informations={'ymlfiles': ['../rougail-tests/structures/04_5disabled_calculation_variable3/rougail/00-base.yml'], 'type': 'string'}) +option_3 = StrOption(name="variable", doc="a variable", properties=frozenset({"basic", "mandatory", Calculation(func['variable_to_property'], Params((), kwargs={'value': ParamOption(option_2), 'prop': ParamValue("disabled"), 'when': ParamValue("yes"), 'inverse': ParamValue(False)}), help_function=func['variable_to_property'])}), informations={'ymlfiles': ['../rougail-tests/structures/04_5disabled_calculation_variable3/rougail/00-base.yml'], 'type': 'string'}) optiondescription_1 = OptionDescription(name="rougail", doc="Rougail", group_type=groups.namespace, children=[option_2, option_3], properties=frozenset({"basic"}), informations={'ymlfiles': ['']}) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_1]) diff --git a/tests/dictionaries/04_5disabled_calculation_variable3/tiramisu/no_namespace.py b/tests/dictionaries/04_5disabled_calculation_variable3/tiramisu/no_namespace.py index f9fa0b7d5..39b45508d 100644 --- a/tests/dictionaries/04_5disabled_calculation_variable3/tiramisu/no_namespace.py +++ b/tests/dictionaries/04_5disabled_calculation_variable3/tiramisu/no_namespace.py @@ -7,5 +7,5 @@ ALLOWED_LEADER_PROPERTIES.add("basic") ALLOWED_LEADER_PROPERTIES.add("standard") ALLOWED_LEADER_PROPERTIES.add("advanced") option_1 = StrOption(name="condition", doc="a condition", default="yes", properties=frozenset({"mandatory", "standard"}), informations={'ymlfiles': ['../rougail-tests/structures/04_5disabled_calculation_variable3/rougail/00-base.yml'], 'type': 'string'}) -option_2 = StrOption(name="variable", doc="a variable", properties=frozenset({"basic", "mandatory", Calculation(func['variable_to_property'], Params((ParamValue("disabled"), ParamOption(option_1)), kwargs={'when': ParamValue("yes"), 'inverse': ParamValue(False)}), help_function=func['variable_to_property'])}), informations={'ymlfiles': ['../rougail-tests/structures/04_5disabled_calculation_variable3/rougail/00-base.yml'], 'type': 'string'}) +option_2 = StrOption(name="variable", doc="a variable", properties=frozenset({"basic", "mandatory", Calculation(func['variable_to_property'], Params((), kwargs={'value': ParamOption(option_1), 'prop': ParamValue("disabled"), 'when': ParamValue("yes"), 'inverse': ParamValue(False)}), help_function=func['variable_to_property'])}), informations={'ymlfiles': ['../rougail-tests/structures/04_5disabled_calculation_variable3/rougail/00-base.yml'], 'type': 'string'}) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1, option_2]) diff --git a/tests/dictionaries/04_5disabled_calculation_variable4/tiramisu/base.py b/tests/dictionaries/04_5disabled_calculation_variable4/tiramisu/base.py index 0a3119d1c..8d44f0d93 100644 --- a/tests/dictionaries/04_5disabled_calculation_variable4/tiramisu/base.py +++ b/tests/dictionaries/04_5disabled_calculation_variable4/tiramisu/base.py @@ -11,6 +11,6 @@ ALLOWED_LEADER_PROPERTIES.add("basic") ALLOWED_LEADER_PROPERTIES.add("standard") ALLOWED_LEADER_PROPERTIES.add("advanced") option_2 = StrOption(name="condition", doc="a condition", default="yes", properties=frozenset({"mandatory", "standard"}), informations={'ymlfiles': ['../rougail-tests/structures/04_5disabled_calculation_variable4/rougail/00-base.yml'], 'type': 'string'}) -option_3 = StrOption(name="variable", doc="a variable", properties=frozenset({"basic", "mandatory", Calculation(func['variable_to_property'], Params((ParamValue("disabled"), ParamOption(option_2)), kwargs={'when': ParamValue("yes"), 'inverse': ParamValue(True)}), help_function=func['variable_to_property'])}), informations={'ymlfiles': ['../rougail-tests/structures/04_5disabled_calculation_variable4/rougail/00-base.yml'], 'type': 'string'}) +option_3 = StrOption(name="variable", doc="a variable", properties=frozenset({"basic", "mandatory", Calculation(func['variable_to_property'], Params((), kwargs={'value': ParamOption(option_2), 'prop': ParamValue("disabled"), 'when': ParamValue("yes"), 'inverse': ParamValue(True)}), help_function=func['variable_to_property'])}), informations={'ymlfiles': ['../rougail-tests/structures/04_5disabled_calculation_variable4/rougail/00-base.yml'], 'type': 'string'}) optiondescription_1 = OptionDescription(name="rougail", doc="Rougail", group_type=groups.namespace, children=[option_2, option_3], properties=frozenset({"basic"}), informations={'ymlfiles': ['']}) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_1]) diff --git a/tests/dictionaries/04_5disabled_calculation_variable4/tiramisu/no_namespace.py b/tests/dictionaries/04_5disabled_calculation_variable4/tiramisu/no_namespace.py index 71f7571ca..5a3cc8970 100644 --- a/tests/dictionaries/04_5disabled_calculation_variable4/tiramisu/no_namespace.py +++ b/tests/dictionaries/04_5disabled_calculation_variable4/tiramisu/no_namespace.py @@ -7,5 +7,5 @@ ALLOWED_LEADER_PROPERTIES.add("basic") ALLOWED_LEADER_PROPERTIES.add("standard") ALLOWED_LEADER_PROPERTIES.add("advanced") option_1 = StrOption(name="condition", doc="a condition", default="yes", properties=frozenset({"mandatory", "standard"}), informations={'ymlfiles': ['../rougail-tests/structures/04_5disabled_calculation_variable4/rougail/00-base.yml'], 'type': 'string'}) -option_2 = StrOption(name="variable", doc="a variable", properties=frozenset({"basic", "mandatory", Calculation(func['variable_to_property'], Params((ParamValue("disabled"), ParamOption(option_1)), kwargs={'when': ParamValue("yes"), 'inverse': ParamValue(True)}), help_function=func['variable_to_property'])}), informations={'ymlfiles': ['../rougail-tests/structures/04_5disabled_calculation_variable4/rougail/00-base.yml'], 'type': 'string'}) +option_2 = StrOption(name="variable", doc="a variable", properties=frozenset({"basic", "mandatory", Calculation(func['variable_to_property'], Params((), kwargs={'value': ParamOption(option_1), 'prop': ParamValue("disabled"), 'when': ParamValue("yes"), 'inverse': ParamValue(True)}), help_function=func['variable_to_property'])}), informations={'ymlfiles': ['../rougail-tests/structures/04_5disabled_calculation_variable4/rougail/00-base.yml'], 'type': 'string'}) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1, option_2]) diff --git a/tests/dictionaries/04_5disabled_calculation_variable5/makedict/after.json b/tests/dictionaries/04_5disabled_calculation_variable5/makedict/after.json new file mode 100644 index 000000000..faf93f9a0 --- /dev/null +++ b/tests/dictionaries/04_5disabled_calculation_variable5/makedict/after.json @@ -0,0 +1,10 @@ +{ + "rougail.condition": { + "owner": "default", + "value": false + }, + "rougail.variable": { + "owner": "default", + "value": null + } +} diff --git a/tests/dictionaries/04_5disabled_calculation_variable5/makedict/base.json b/tests/dictionaries/04_5disabled_calculation_variable5/makedict/base.json new file mode 100644 index 000000000..a4f33cc99 --- /dev/null +++ b/tests/dictionaries/04_5disabled_calculation_variable5/makedict/base.json @@ -0,0 +1,4 @@ +{ + "rougail.condition": false, + "rougail.variable": null +} diff --git a/tests/dictionaries/04_5disabled_calculation_variable5/makedict/before.json b/tests/dictionaries/04_5disabled_calculation_variable5/makedict/before.json new file mode 100644 index 000000000..faf93f9a0 --- /dev/null +++ b/tests/dictionaries/04_5disabled_calculation_variable5/makedict/before.json @@ -0,0 +1,10 @@ +{ + "rougail.condition": { + "owner": "default", + "value": false + }, + "rougail.variable": { + "owner": "default", + "value": null + } +} diff --git a/tests/dictionaries/04_5disabled_calculation_variable5/makedict/mandatory.json b/tests/dictionaries/04_5disabled_calculation_variable5/makedict/mandatory.json new file mode 100644 index 000000000..bdc34fddd --- /dev/null +++ b/tests/dictionaries/04_5disabled_calculation_variable5/makedict/mandatory.json @@ -0,0 +1 @@ +["rougail.variable"] \ No newline at end of file diff --git a/tests/dictionaries/04_5disabled_calculation_variable5/makedict/read_write.json b/tests/dictionaries/04_5disabled_calculation_variable5/makedict/read_write.json new file mode 100644 index 000000000..774ccc4b5 --- /dev/null +++ b/tests/dictionaries/04_5disabled_calculation_variable5/makedict/read_write.json @@ -0,0 +1,3 @@ +{ + "rougail.variable": null +} diff --git a/tests/dictionaries/04_5disabled_calculation_variable5/tiramisu/base.py b/tests/dictionaries/04_5disabled_calculation_variable5/tiramisu/base.py new file mode 100644 index 000000000..ebb202118 --- /dev/null +++ b/tests/dictionaries/04_5disabled_calculation_variable5/tiramisu/base.py @@ -0,0 +1,16 @@ +from tiramisu import * +from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +from re import compile as re_compile +from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription +load_functions('../rougail-tests/funcs/test.py') +try: + groups.namespace +except: + groups.addgroup('namespace') +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("standard") +ALLOWED_LEADER_PROPERTIES.add("advanced") +option_2 = BoolOption(name="condition", doc="a condition", default=False, properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "standard"}), informations={'ymlfiles': ['../rougail-tests/structures/04_5disabled_calculation_variable5/rougail/00-base.yml'], 'type': 'boolean'}) +option_3 = StrOption(name="variable", doc="a variable", properties=frozenset({"basic", "mandatory", Calculation(func['variable_to_property'], Params((), kwargs={'value': ParamOption(option_2), 'prop': ParamValue("disabled"), 'when': ParamValue(True), 'inverse': ParamValue(False)}), help_function=func['variable_to_property'])}), informations={'ymlfiles': ['../rougail-tests/structures/04_5disabled_calculation_variable5/rougail/00-base.yml'], 'type': 'string'}) +optiondescription_1 = OptionDescription(name="rougail", doc="Rougail", group_type=groups.namespace, children=[option_2, option_3], properties=frozenset({"basic"}), informations={'ymlfiles': ['']}) +option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_1]) diff --git a/tests/dictionaries/04_5disabled_calculation_variable5/tiramisu/no_namespace.py b/tests/dictionaries/04_5disabled_calculation_variable5/tiramisu/no_namespace.py new file mode 100644 index 000000000..888a32f45 --- /dev/null +++ b/tests/dictionaries/04_5disabled_calculation_variable5/tiramisu/no_namespace.py @@ -0,0 +1,11 @@ +from tiramisu import * +from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +from re import compile as re_compile +from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription +load_functions('../rougail-tests/funcs/test.py') +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("standard") +ALLOWED_LEADER_PROPERTIES.add("advanced") +option_1 = BoolOption(name="condition", doc="a condition", default=False, properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "standard"}), informations={'ymlfiles': ['../rougail-tests/structures/04_5disabled_calculation_variable5/rougail/00-base.yml'], 'type': 'boolean'}) +option_2 = StrOption(name="variable", doc="a variable", properties=frozenset({"basic", "mandatory", Calculation(func['variable_to_property'], Params((), kwargs={'value': ParamOption(option_1), 'prop': ParamValue("disabled"), 'when': ParamValue(True), 'inverse': ParamValue(False)}), help_function=func['variable_to_property'])}), informations={'ymlfiles': ['../rougail-tests/structures/04_5disabled_calculation_variable5/rougail/00-base.yml'], 'type': 'string'}) +option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1, option_2]) diff --git a/tests/dictionaries/04_5disabled_calculation_variable6/makedict/after.json b/tests/dictionaries/04_5disabled_calculation_variable6/makedict/after.json new file mode 100644 index 000000000..f9e638914 --- /dev/null +++ b/tests/dictionaries/04_5disabled_calculation_variable6/makedict/after.json @@ -0,0 +1,6 @@ +{ + "rougail.variable": { + "owner": "default", + "value": null + } +} diff --git a/tests/dictionaries/04_5disabled_calculation_variable6/makedict/base.json b/tests/dictionaries/04_5disabled_calculation_variable6/makedict/base.json new file mode 100644 index 000000000..774ccc4b5 --- /dev/null +++ b/tests/dictionaries/04_5disabled_calculation_variable6/makedict/base.json @@ -0,0 +1,3 @@ +{ + "rougail.variable": null +} diff --git a/tests/dictionaries/04_5disabled_calculation_variable6/makedict/before.json b/tests/dictionaries/04_5disabled_calculation_variable6/makedict/before.json new file mode 100644 index 000000000..f9e638914 --- /dev/null +++ b/tests/dictionaries/04_5disabled_calculation_variable6/makedict/before.json @@ -0,0 +1,6 @@ +{ + "rougail.variable": { + "owner": "default", + "value": null + } +} diff --git a/tests/dictionaries/04_5disabled_calculation_variable6/makedict/mandatory.json b/tests/dictionaries/04_5disabled_calculation_variable6/makedict/mandatory.json new file mode 100644 index 000000000..bdc34fddd --- /dev/null +++ b/tests/dictionaries/04_5disabled_calculation_variable6/makedict/mandatory.json @@ -0,0 +1 @@ +["rougail.variable"] \ No newline at end of file diff --git a/tests/dictionaries/04_5disabled_calculation_variable6/makedict/read_write.json b/tests/dictionaries/04_5disabled_calculation_variable6/makedict/read_write.json new file mode 100644 index 000000000..774ccc4b5 --- /dev/null +++ b/tests/dictionaries/04_5disabled_calculation_variable6/makedict/read_write.json @@ -0,0 +1,3 @@ +{ + "rougail.variable": null +} diff --git a/tests/dictionaries/04_5disabled_calculation_variable6/tiramisu/base.py b/tests/dictionaries/04_5disabled_calculation_variable6/tiramisu/base.py new file mode 100644 index 000000000..8ac7984f4 --- /dev/null +++ b/tests/dictionaries/04_5disabled_calculation_variable6/tiramisu/base.py @@ -0,0 +1,16 @@ +from tiramisu import * +from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +from re import compile as re_compile +from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription +load_functions('../rougail-tests/funcs/test.py') +try: + groups.namespace +except: + groups.addgroup('namespace') +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("standard") +ALLOWED_LEADER_PROPERTIES.add("advanced") +option_2 = BoolOption(name="condition", doc="a condition", default=False, properties=frozenset({"disabled", "mandatory", "standard"}), informations={'ymlfiles': ['../rougail-tests/structures/04_5disabled_calculation_variable6/rougail/00-base.yml'], 'type': 'boolean'}) +option_3 = StrOption(name="variable", doc="a variable", properties=frozenset({"basic", "mandatory", Calculation(func['variable_to_property'], Params((), kwargs={'value': ParamOption(option_2, notraisepropertyerror=True), 'prop': ParamValue("disabled"), 'when': ParamValue(True), 'inverse': ParamValue(False)}), help_function=func['variable_to_property'])}), informations={'ymlfiles': ['../rougail-tests/structures/04_5disabled_calculation_variable6/rougail/00-base.yml'], 'type': 'string'}) +optiondescription_1 = OptionDescription(name="rougail", doc="Rougail", group_type=groups.namespace, children=[option_2, option_3], properties=frozenset({"basic"}), informations={'ymlfiles': ['']}) +option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_1]) diff --git a/tests/dictionaries/04_5disabled_calculation_variable6/tiramisu/no_namespace.py b/tests/dictionaries/04_5disabled_calculation_variable6/tiramisu/no_namespace.py new file mode 100644 index 000000000..737998a06 --- /dev/null +++ b/tests/dictionaries/04_5disabled_calculation_variable6/tiramisu/no_namespace.py @@ -0,0 +1,11 @@ +from tiramisu import * +from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +from re import compile as re_compile +from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription +load_functions('../rougail-tests/funcs/test.py') +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("standard") +ALLOWED_LEADER_PROPERTIES.add("advanced") +option_1 = BoolOption(name="condition", doc="a condition", default=False, properties=frozenset({"disabled", "mandatory", "standard"}), informations={'ymlfiles': ['../rougail-tests/structures/04_5disabled_calculation_variable6/rougail/00-base.yml'], 'type': 'boolean'}) +option_2 = StrOption(name="variable", doc="a variable", properties=frozenset({"basic", "mandatory", Calculation(func['variable_to_property'], Params((), kwargs={'value': ParamOption(option_1, notraisepropertyerror=True), 'prop': ParamValue("disabled"), 'when': ParamValue(True), 'inverse': ParamValue(False)}), help_function=func['variable_to_property'])}), informations={'ymlfiles': ['../rougail-tests/structures/04_5disabled_calculation_variable6/rougail/00-base.yml'], 'type': 'string'}) +option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1, option_2]) diff --git a/tests/dictionaries/04_5disabled_calculation_variable7/makedict/after.json b/tests/dictionaries/04_5disabled_calculation_variable7/makedict/after.json new file mode 100644 index 000000000..faf93f9a0 --- /dev/null +++ b/tests/dictionaries/04_5disabled_calculation_variable7/makedict/after.json @@ -0,0 +1,10 @@ +{ + "rougail.condition": { + "owner": "default", + "value": false + }, + "rougail.variable": { + "owner": "default", + "value": null + } +} diff --git a/tests/dictionaries/04_5disabled_calculation_variable7/makedict/base.json b/tests/dictionaries/04_5disabled_calculation_variable7/makedict/base.json new file mode 100644 index 000000000..a4f33cc99 --- /dev/null +++ b/tests/dictionaries/04_5disabled_calculation_variable7/makedict/base.json @@ -0,0 +1,4 @@ +{ + "rougail.condition": false, + "rougail.variable": null +} diff --git a/tests/dictionaries/04_5disabled_calculation_variable7/makedict/before.json b/tests/dictionaries/04_5disabled_calculation_variable7/makedict/before.json new file mode 100644 index 000000000..faf93f9a0 --- /dev/null +++ b/tests/dictionaries/04_5disabled_calculation_variable7/makedict/before.json @@ -0,0 +1,10 @@ +{ + "rougail.condition": { + "owner": "default", + "value": false + }, + "rougail.variable": { + "owner": "default", + "value": null + } +} diff --git a/tests/dictionaries/04_5disabled_calculation_variable7/makedict/mandatory.json b/tests/dictionaries/04_5disabled_calculation_variable7/makedict/mandatory.json new file mode 100644 index 000000000..bdc34fddd --- /dev/null +++ b/tests/dictionaries/04_5disabled_calculation_variable7/makedict/mandatory.json @@ -0,0 +1 @@ +["rougail.variable"] \ No newline at end of file diff --git a/tests/dictionaries/04_5disabled_calculation_variable7/makedict/read_write.json b/tests/dictionaries/04_5disabled_calculation_variable7/makedict/read_write.json new file mode 100644 index 000000000..a4f33cc99 --- /dev/null +++ b/tests/dictionaries/04_5disabled_calculation_variable7/makedict/read_write.json @@ -0,0 +1,4 @@ +{ + "rougail.condition": false, + "rougail.variable": null +} diff --git a/tests/dictionaries/04_5disabled_calculation_variable7/tiramisu/base.py b/tests/dictionaries/04_5disabled_calculation_variable7/tiramisu/base.py new file mode 100644 index 000000000..3ab0ed26e --- /dev/null +++ b/tests/dictionaries/04_5disabled_calculation_variable7/tiramisu/base.py @@ -0,0 +1,16 @@ +from tiramisu import * +from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +from re import compile as re_compile +from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription +load_functions('../rougail-tests/funcs/test.py') +try: + groups.namespace +except: + groups.addgroup('namespace') +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("standard") +ALLOWED_LEADER_PROPERTIES.add("advanced") +option_2 = BoolOption(name="condition", doc="a condition", default=False, properties=frozenset({"mandatory", "standard"}), informations={'ymlfiles': ['../rougail-tests/structures/04_5disabled_calculation_variable7/rougail/00-base.yml'], 'type': 'boolean'}) +option_3 = StrOption(name="variable", doc="a variable", properties=frozenset({"basic", "mandatory", Calculation(func['variable_to_property'], Params((), kwargs={'value': ParamOption(option_2), 'prop': ParamValue("disabled"), 'when': ParamValue(True), 'inverse': ParamValue(False)}), help_function=func['variable_to_property'])}), informations={'ymlfiles': ['../rougail-tests/structures/04_5disabled_calculation_variable7/rougail/00-base.yml'], 'type': 'string'}) +optiondescription_1 = OptionDescription(name="rougail", doc="Rougail", group_type=groups.namespace, children=[option_2, option_3], properties=frozenset({"basic"}), informations={'ymlfiles': ['']}) +option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_1]) diff --git a/tests/dictionaries/04_5disabled_calculation_variable7/tiramisu/no_namespace.py b/tests/dictionaries/04_5disabled_calculation_variable7/tiramisu/no_namespace.py new file mode 100644 index 000000000..fb07579eb --- /dev/null +++ b/tests/dictionaries/04_5disabled_calculation_variable7/tiramisu/no_namespace.py @@ -0,0 +1,11 @@ +from tiramisu import * +from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +from re import compile as re_compile +from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription +load_functions('../rougail-tests/funcs/test.py') +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("standard") +ALLOWED_LEADER_PROPERTIES.add("advanced") +option_1 = BoolOption(name="condition", doc="a condition", default=False, properties=frozenset({"mandatory", "standard"}), informations={'ymlfiles': ['../rougail-tests/structures/04_5disabled_calculation_variable7/rougail/00-base.yml'], 'type': 'boolean'}) +option_2 = StrOption(name="variable", doc="a variable", properties=frozenset({"basic", "mandatory", Calculation(func['variable_to_property'], Params((), kwargs={'value': ParamOption(option_1), 'prop': ParamValue("disabled"), 'when': ParamValue(True), 'inverse': ParamValue(False)}), help_function=func['variable_to_property'])}), informations={'ymlfiles': ['../rougail-tests/structures/04_5disabled_calculation_variable7/rougail/00-base.yml'], 'type': 'string'}) +option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1, option_2]) diff --git a/tests/dictionaries/04_5disabled_calculation_variable8/makedict/after.json b/tests/dictionaries/04_5disabled_calculation_variable8/makedict/after.json new file mode 100644 index 000000000..5995efe9d --- /dev/null +++ b/tests/dictionaries/04_5disabled_calculation_variable8/makedict/after.json @@ -0,0 +1,6 @@ +{ + "rougail.condition": { + "owner": "default", + "value": true + } +} diff --git a/tests/dictionaries/04_5disabled_calculation_variable8/makedict/base.json b/tests/dictionaries/04_5disabled_calculation_variable8/makedict/base.json new file mode 100644 index 000000000..18b52facb --- /dev/null +++ b/tests/dictionaries/04_5disabled_calculation_variable8/makedict/base.json @@ -0,0 +1,3 @@ +{ + "rougail.condition": true +} diff --git a/tests/dictionaries/04_5disabled_calculation_variable8/makedict/before.json b/tests/dictionaries/04_5disabled_calculation_variable8/makedict/before.json new file mode 100644 index 000000000..5995efe9d --- /dev/null +++ b/tests/dictionaries/04_5disabled_calculation_variable8/makedict/before.json @@ -0,0 +1,6 @@ +{ + "rougail.condition": { + "owner": "default", + "value": true + } +} diff --git a/tests/dictionaries/04_5disabled_calculation_variable8/makedict/mandatory.json b/tests/dictionaries/04_5disabled_calculation_variable8/makedict/mandatory.json new file mode 100644 index 000000000..0637a088a --- /dev/null +++ b/tests/dictionaries/04_5disabled_calculation_variable8/makedict/mandatory.json @@ -0,0 +1 @@ +[] \ No newline at end of file diff --git a/tests/dictionaries/04_5disabled_calculation_variable8/makedict/read_write.json b/tests/dictionaries/04_5disabled_calculation_variable8/makedict/read_write.json new file mode 100644 index 000000000..0967ef424 --- /dev/null +++ b/tests/dictionaries/04_5disabled_calculation_variable8/makedict/read_write.json @@ -0,0 +1 @@ +{} diff --git a/tests/dictionaries/04_5disabled_calculation_variable8/tiramisu/base.py b/tests/dictionaries/04_5disabled_calculation_variable8/tiramisu/base.py new file mode 100644 index 000000000..18b353701 --- /dev/null +++ b/tests/dictionaries/04_5disabled_calculation_variable8/tiramisu/base.py @@ -0,0 +1,16 @@ +from tiramisu import * +from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +from re import compile as re_compile +from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription +load_functions('../rougail-tests/funcs/test.py') +try: + groups.namespace +except: + groups.addgroup('namespace') +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("standard") +ALLOWED_LEADER_PROPERTIES.add("advanced") +option_2 = BoolOption(name="condition", doc="a condition", default=True, properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "standard"}), informations={'ymlfiles': ['../rougail-tests/structures/04_5disabled_calculation_variable8/rougail/00-base.yml'], 'type': 'boolean'}) +option_3 = StrOption(name="variable", doc="a variable", properties=frozenset({"basic", "mandatory", Calculation(func['variable_to_property'], Params((), kwargs={'value': ParamOption(option_2), 'prop': ParamValue("disabled"), 'when': ParamValue(True), 'inverse': ParamValue(False)}), help_function=func['variable_to_property'])}), informations={'ymlfiles': ['../rougail-tests/structures/04_5disabled_calculation_variable8/rougail/00-base.yml'], 'type': 'string'}) +optiondescription_1 = OptionDescription(name="rougail", doc="Rougail", group_type=groups.namespace, children=[option_2, option_3], properties=frozenset({"basic"}), informations={'ymlfiles': ['']}) +option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_1]) diff --git a/tests/dictionaries/04_5disabled_calculation_variable8/tiramisu/no_namespace.py b/tests/dictionaries/04_5disabled_calculation_variable8/tiramisu/no_namespace.py new file mode 100644 index 000000000..3cb125e1d --- /dev/null +++ b/tests/dictionaries/04_5disabled_calculation_variable8/tiramisu/no_namespace.py @@ -0,0 +1,11 @@ +from tiramisu import * +from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +from re import compile as re_compile +from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription +load_functions('../rougail-tests/funcs/test.py') +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("standard") +ALLOWED_LEADER_PROPERTIES.add("advanced") +option_1 = BoolOption(name="condition", doc="a condition", default=True, properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "standard"}), informations={'ymlfiles': ['../rougail-tests/structures/04_5disabled_calculation_variable8/rougail/00-base.yml'], 'type': 'boolean'}) +option_2 = StrOption(name="variable", doc="a variable", properties=frozenset({"basic", "mandatory", Calculation(func['variable_to_property'], Params((), kwargs={'value': ParamOption(option_1), 'prop': ParamValue("disabled"), 'when': ParamValue(True), 'inverse': ParamValue(False)}), help_function=func['variable_to_property'])}), informations={'ymlfiles': ['../rougail-tests/structures/04_5disabled_calculation_variable8/rougail/00-base.yml'], 'type': 'string'}) +option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1, option_2]) diff --git a/tests/dictionaries/04_5disabled_calculation_variable9/makedict/after.json b/tests/dictionaries/04_5disabled_calculation_variable9/makedict/after.json new file mode 100644 index 000000000..f9e638914 --- /dev/null +++ b/tests/dictionaries/04_5disabled_calculation_variable9/makedict/after.json @@ -0,0 +1,6 @@ +{ + "rougail.variable": { + "owner": "default", + "value": null + } +} diff --git a/tests/dictionaries/04_5disabled_calculation_variable9/makedict/base.json b/tests/dictionaries/04_5disabled_calculation_variable9/makedict/base.json new file mode 100644 index 000000000..774ccc4b5 --- /dev/null +++ b/tests/dictionaries/04_5disabled_calculation_variable9/makedict/base.json @@ -0,0 +1,3 @@ +{ + "rougail.variable": null +} diff --git a/tests/dictionaries/04_5disabled_calculation_variable9/makedict/before.json b/tests/dictionaries/04_5disabled_calculation_variable9/makedict/before.json new file mode 100644 index 000000000..f9e638914 --- /dev/null +++ b/tests/dictionaries/04_5disabled_calculation_variable9/makedict/before.json @@ -0,0 +1,6 @@ +{ + "rougail.variable": { + "owner": "default", + "value": null + } +} diff --git a/tests/dictionaries/04_5disabled_calculation_variable9/makedict/mandatory.json b/tests/dictionaries/04_5disabled_calculation_variable9/makedict/mandatory.json new file mode 100644 index 000000000..bdc34fddd --- /dev/null +++ b/tests/dictionaries/04_5disabled_calculation_variable9/makedict/mandatory.json @@ -0,0 +1 @@ +["rougail.variable"] \ No newline at end of file diff --git a/tests/dictionaries/04_5disabled_calculation_variable9/makedict/read_write.json b/tests/dictionaries/04_5disabled_calculation_variable9/makedict/read_write.json new file mode 100644 index 000000000..774ccc4b5 --- /dev/null +++ b/tests/dictionaries/04_5disabled_calculation_variable9/makedict/read_write.json @@ -0,0 +1,3 @@ +{ + "rougail.variable": null +} diff --git a/tests/dictionaries/04_5disabled_calculation_variable9/tiramisu/base.py b/tests/dictionaries/04_5disabled_calculation_variable9/tiramisu/base.py new file mode 100644 index 000000000..276eaede1 --- /dev/null +++ b/tests/dictionaries/04_5disabled_calculation_variable9/tiramisu/base.py @@ -0,0 +1,16 @@ +from tiramisu import * +from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +from re import compile as re_compile +from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription +load_functions('../rougail-tests/funcs/test.py') +try: + groups.namespace +except: + groups.addgroup('namespace') +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("standard") +ALLOWED_LEADER_PROPERTIES.add("advanced") +option_2 = BoolOption(name="condition", doc="a condition", default=True, properties=frozenset({"disabled", "mandatory", "standard"}), informations={'ymlfiles': ['../rougail-tests/structures/04_5disabled_calculation_variable9/rougail/00-base.yml'], 'type': 'boolean'}) +option_3 = StrOption(name="variable", doc="a variable", properties=frozenset({"basic", "mandatory", Calculation(func['variable_to_property'], Params((), kwargs={'value': ParamOption(option_2, notraisepropertyerror=True), 'prop': ParamValue("disabled"), 'when': ParamValue(True), 'inverse': ParamValue(False)}), help_function=func['variable_to_property'])}), informations={'ymlfiles': ['../rougail-tests/structures/04_5disabled_calculation_variable9/rougail/00-base.yml'], 'type': 'string'}) +optiondescription_1 = OptionDescription(name="rougail", doc="Rougail", group_type=groups.namespace, children=[option_2, option_3], properties=frozenset({"basic"}), informations={'ymlfiles': ['']}) +option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_1]) diff --git a/tests/dictionaries/04_5disabled_calculation_variable9/tiramisu/no_namespace.py b/tests/dictionaries/04_5disabled_calculation_variable9/tiramisu/no_namespace.py new file mode 100644 index 000000000..0d10a56be --- /dev/null +++ b/tests/dictionaries/04_5disabled_calculation_variable9/tiramisu/no_namespace.py @@ -0,0 +1,11 @@ +from tiramisu import * +from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +from re import compile as re_compile +from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription +load_functions('../rougail-tests/funcs/test.py') +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("standard") +ALLOWED_LEADER_PROPERTIES.add("advanced") +option_1 = BoolOption(name="condition", doc="a condition", default=True, properties=frozenset({"disabled", "mandatory", "standard"}), informations={'ymlfiles': ['../rougail-tests/structures/04_5disabled_calculation_variable9/rougail/00-base.yml'], 'type': 'boolean'}) +option_2 = StrOption(name="variable", doc="a variable", properties=frozenset({"basic", "mandatory", Calculation(func['variable_to_property'], Params((), kwargs={'value': ParamOption(option_1, notraisepropertyerror=True), 'prop': ParamValue("disabled"), 'when': ParamValue(True), 'inverse': ParamValue(False)}), help_function=func['variable_to_property'])}), informations={'ymlfiles': ['../rougail-tests/structures/04_5disabled_calculation_variable9/rougail/00-base.yml'], 'type': 'string'}) +option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1, option_2]) diff --git a/tests/dictionaries/04_5disabled_calculation_variable_multi/tiramisu/base.py b/tests/dictionaries/04_5disabled_calculation_variable_multi/tiramisu/base.py index 4ccf946b1..d915fc78b 100644 --- a/tests/dictionaries/04_5disabled_calculation_variable_multi/tiramisu/base.py +++ b/tests/dictionaries/04_5disabled_calculation_variable_multi/tiramisu/base.py @@ -11,6 +11,6 @@ ALLOWED_LEADER_PROPERTIES.add("basic") ALLOWED_LEADER_PROPERTIES.add("standard") ALLOWED_LEADER_PROPERTIES.add("advanced") option_2 = BoolOption(name="condition", doc="a condition", default=False, properties=frozenset({"mandatory", "standard"}), informations={'ymlfiles': ['../rougail-tests/structures/04_5disabled_calculation_variable_multi/rougail/00-base.yml'], 'type': 'boolean'}) -option_3 = StrOption(name="variable", doc="a variable", multi=True, properties=frozenset({"basic", "mandatory", Calculation(func['variable_to_property'], Params((ParamValue("disabled"), ParamOption(option_2)), kwargs={'__internal_multi': ParamValue(True), 'when': ParamValue(True), 'inverse': ParamValue(False)}), help_function=func['variable_to_property'])}), informations={'ymlfiles': ['../rougail-tests/structures/04_5disabled_calculation_variable_multi/rougail/00-base.yml'], 'type': 'string'}) +option_3 = StrOption(name="variable", doc="a variable", multi=True, properties=frozenset({"basic", "mandatory", Calculation(func['variable_to_property'], Params((), kwargs={'value': ParamOption(option_2), '__internal_multi': ParamValue(True), 'prop': ParamValue("disabled"), 'when': ParamValue(True), 'inverse': ParamValue(False)}), help_function=func['variable_to_property'])}), informations={'ymlfiles': ['../rougail-tests/structures/04_5disabled_calculation_variable_multi/rougail/00-base.yml'], 'type': 'string'}) optiondescription_1 = OptionDescription(name="rougail", doc="Rougail", group_type=groups.namespace, children=[option_2, option_3], properties=frozenset({"basic"}), informations={'ymlfiles': ['']}) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_1]) diff --git a/tests/dictionaries/04_5disabled_calculation_variable_multi/tiramisu/no_namespace.py b/tests/dictionaries/04_5disabled_calculation_variable_multi/tiramisu/no_namespace.py index 26c793de5..fcc620705 100644 --- a/tests/dictionaries/04_5disabled_calculation_variable_multi/tiramisu/no_namespace.py +++ b/tests/dictionaries/04_5disabled_calculation_variable_multi/tiramisu/no_namespace.py @@ -7,5 +7,5 @@ ALLOWED_LEADER_PROPERTIES.add("basic") ALLOWED_LEADER_PROPERTIES.add("standard") ALLOWED_LEADER_PROPERTIES.add("advanced") option_1 = BoolOption(name="condition", doc="a condition", default=False, properties=frozenset({"mandatory", "standard"}), informations={'ymlfiles': ['../rougail-tests/structures/04_5disabled_calculation_variable_multi/rougail/00-base.yml'], 'type': 'boolean'}) -option_2 = StrOption(name="variable", doc="a variable", multi=True, properties=frozenset({"basic", "mandatory", Calculation(func['variable_to_property'], Params((ParamValue("disabled"), ParamOption(option_1)), kwargs={'__internal_multi': ParamValue(True), 'when': ParamValue(True), 'inverse': ParamValue(False)}), help_function=func['variable_to_property'])}), informations={'ymlfiles': ['../rougail-tests/structures/04_5disabled_calculation_variable_multi/rougail/00-base.yml'], 'type': 'string'}) +option_2 = StrOption(name="variable", doc="a variable", multi=True, properties=frozenset({"basic", "mandatory", Calculation(func['variable_to_property'], Params((), kwargs={'value': ParamOption(option_1), '__internal_multi': ParamValue(True), 'prop': ParamValue("disabled"), 'when': ParamValue(True), 'inverse': ParamValue(False)}), help_function=func['variable_to_property'])}), informations={'ymlfiles': ['../rougail-tests/structures/04_5disabled_calculation_variable_multi/rougail/00-base.yml'], 'type': 'string'}) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1, option_2]) diff --git a/tests/dictionaries/24_0family_hidden_condition_variable_sub_family/tiramisu/base.py b/tests/dictionaries/24_0family_hidden_condition_variable_sub_family/tiramisu/base.py index 10cb44e00..8af1fd27d 100644 --- a/tests/dictionaries/24_0family_hidden_condition_variable_sub_family/tiramisu/base.py +++ b/tests/dictionaries/24_0family_hidden_condition_variable_sub_family/tiramisu/base.py @@ -11,8 +11,8 @@ ALLOWED_LEADER_PROPERTIES.add("basic") ALLOWED_LEADER_PROPERTIES.add("standard") ALLOWED_LEADER_PROPERTIES.add("advanced") option_2 = BoolOption(name="condition", doc="the variable use has condition", default=True, properties=frozenset({"mandatory", "standard"}), informations={'ymlfiles': ['../rougail-tests/structures/24_0family_hidden_condition_variable_sub_family/rougail/00-base.yml'], 'type': 'boolean'}) -option_5 = StrOption(name="var1", doc="a variable", properties=frozenset({"force_default_on_freeze", "standard", Calculation(func['variable_to_property'], Params((ParamValue("frozen"), ParamOption(option_2)), kwargs={'when': ParamValue(True), 'inverse': ParamValue(False)}), help_function=func['variable_to_property'])}), informations={'ymlfiles': ['../rougail-tests/structures/24_0family_hidden_condition_variable_sub_family/rougail/00-base.yml'], 'type': 'string'}) +option_5 = StrOption(name="var1", doc="a variable", properties=frozenset({"force_default_on_freeze", "standard", Calculation(func['variable_to_property'], Params((), kwargs={'value': ParamOption(option_2), 'prop': ParamValue("frozen"), 'when': ParamValue(True), 'inverse': ParamValue(False)}), help_function=func['variable_to_property'])}), informations={'ymlfiles': ['../rougail-tests/structures/24_0family_hidden_condition_variable_sub_family/rougail/00-base.yml'], 'type': 'string'}) optiondescription_4 = OptionDescription(name="subfamily", doc="a subfamily", children=[option_5], properties=frozenset({"standard"}), informations={'ymlfiles': ['../rougail-tests/structures/24_0family_hidden_condition_variable_sub_family/rougail/00-base.yml']}) -optiondescription_3 = OptionDescription(name="family", doc="possibly hidden family", children=[optiondescription_4], properties=frozenset({"standard", Calculation(func['variable_to_property'], Params((ParamValue("hidden"), ParamOption(option_2)), kwargs={'when': ParamValue(True), 'inverse': ParamValue(False)}), help_function=func['variable_to_property'])}), informations={'ymlfiles': ['../rougail-tests/structures/24_0family_hidden_condition_variable_sub_family/rougail/00-base.yml']}) +optiondescription_3 = OptionDescription(name="family", doc="possibly hidden family", children=[optiondescription_4], properties=frozenset({"standard", Calculation(func['variable_to_property'], Params((), kwargs={'value': ParamOption(option_2), 'prop': ParamValue("hidden"), 'when': ParamValue(True), 'inverse': ParamValue(False)}), help_function=func['variable_to_property'])}), informations={'ymlfiles': ['../rougail-tests/structures/24_0family_hidden_condition_variable_sub_family/rougail/00-base.yml']}) optiondescription_1 = OptionDescription(name="rougail", doc="Rougail", group_type=groups.namespace, children=[option_2, optiondescription_3], properties=frozenset({"standard"}), informations={'ymlfiles': ['']}) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_1]) diff --git a/tests/dictionaries/24_0family_hidden_condition_variable_sub_family/tiramisu/no_namespace.py b/tests/dictionaries/24_0family_hidden_condition_variable_sub_family/tiramisu/no_namespace.py index 12302ed9e..f998e376e 100644 --- a/tests/dictionaries/24_0family_hidden_condition_variable_sub_family/tiramisu/no_namespace.py +++ b/tests/dictionaries/24_0family_hidden_condition_variable_sub_family/tiramisu/no_namespace.py @@ -7,7 +7,7 @@ ALLOWED_LEADER_PROPERTIES.add("basic") ALLOWED_LEADER_PROPERTIES.add("standard") ALLOWED_LEADER_PROPERTIES.add("advanced") option_1 = BoolOption(name="condition", doc="the variable use has condition", default=True, properties=frozenset({"mandatory", "standard"}), informations={'ymlfiles': ['../rougail-tests/structures/24_0family_hidden_condition_variable_sub_family/rougail/00-base.yml'], 'type': 'boolean'}) -option_4 = StrOption(name="var1", doc="a variable", properties=frozenset({"force_default_on_freeze", "standard", Calculation(func['variable_to_property'], Params((ParamValue("frozen"), ParamOption(option_1)), kwargs={'when': ParamValue(True), 'inverse': ParamValue(False)}), help_function=func['variable_to_property'])}), informations={'ymlfiles': ['../rougail-tests/structures/24_0family_hidden_condition_variable_sub_family/rougail/00-base.yml'], 'type': 'string'}) +option_4 = StrOption(name="var1", doc="a variable", properties=frozenset({"force_default_on_freeze", "standard", Calculation(func['variable_to_property'], Params((), kwargs={'value': ParamOption(option_1), 'prop': ParamValue("frozen"), 'when': ParamValue(True), 'inverse': ParamValue(False)}), help_function=func['variable_to_property'])}), informations={'ymlfiles': ['../rougail-tests/structures/24_0family_hidden_condition_variable_sub_family/rougail/00-base.yml'], 'type': 'string'}) optiondescription_3 = OptionDescription(name="subfamily", doc="a subfamily", children=[option_4], properties=frozenset({"standard"}), informations={'ymlfiles': ['../rougail-tests/structures/24_0family_hidden_condition_variable_sub_family/rougail/00-base.yml']}) -optiondescription_2 = OptionDescription(name="family", doc="possibly hidden family", children=[optiondescription_3], properties=frozenset({"standard", Calculation(func['variable_to_property'], Params((ParamValue("hidden"), ParamOption(option_1)), kwargs={'when': ParamValue(True), 'inverse': ParamValue(False)}), help_function=func['variable_to_property'])}), informations={'ymlfiles': ['../rougail-tests/structures/24_0family_hidden_condition_variable_sub_family/rougail/00-base.yml']}) +optiondescription_2 = OptionDescription(name="family", doc="possibly hidden family", children=[optiondescription_3], properties=frozenset({"standard", Calculation(func['variable_to_property'], Params((), kwargs={'value': ParamOption(option_1), 'prop': ParamValue("hidden"), 'when': ParamValue(True), 'inverse': ParamValue(False)}), help_function=func['variable_to_property'])}), informations={'ymlfiles': ['../rougail-tests/structures/24_0family_hidden_condition_variable_sub_family/rougail/00-base.yml']}) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1, optiondescription_2]) diff --git a/tests/dictionaries/24_0family_mandatory_condition_variable/tiramisu/base.py b/tests/dictionaries/24_0family_mandatory_condition_variable/tiramisu/base.py index 963252ac3..3d8c60f9c 100644 --- a/tests/dictionaries/24_0family_mandatory_condition_variable/tiramisu/base.py +++ b/tests/dictionaries/24_0family_mandatory_condition_variable/tiramisu/base.py @@ -11,6 +11,6 @@ ALLOWED_LEADER_PROPERTIES.add("basic") ALLOWED_LEADER_PROPERTIES.add("standard") ALLOWED_LEADER_PROPERTIES.add("advanced") option_2 = BoolOption(name="condition", doc="a condition", default=True, properties=frozenset({"mandatory", "standard"}), informations={'ymlfiles': ['../rougail-tests/structures/24_0family_mandatory_condition_variable/rougail/00-base.yml'], 'type': 'boolean'}) -option_3 = StrOption(name="var", doc="a variable", properties=frozenset({"standard", Calculation(func['variable_to_property'], Params((ParamValue("mandatory"), ParamOption(option_2)), kwargs={'when': ParamValue(True), 'inverse': ParamValue(False)}), help_function=func['variable_to_property'])}), informations={'ymlfiles': ['../rougail-tests/structures/24_0family_mandatory_condition_variable/rougail/00-base.yml'], 'type': 'string'}) +option_3 = StrOption(name="var", doc="a variable", properties=frozenset({"standard", Calculation(func['variable_to_property'], Params((), kwargs={'value': ParamOption(option_2), 'prop': ParamValue("mandatory"), 'when': ParamValue(True), 'inverse': ParamValue(False)}), help_function=func['variable_to_property'])}), informations={'ymlfiles': ['../rougail-tests/structures/24_0family_mandatory_condition_variable/rougail/00-base.yml'], 'type': 'string'}) optiondescription_1 = OptionDescription(name="rougail", doc="Rougail", group_type=groups.namespace, children=[option_2, option_3], properties=frozenset({"standard"}), informations={'ymlfiles': ['']}) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_1]) diff --git a/tests/dictionaries/24_0family_mandatory_condition_variable/tiramisu/no_namespace.py b/tests/dictionaries/24_0family_mandatory_condition_variable/tiramisu/no_namespace.py index bf4f9378e..5050555fc 100644 --- a/tests/dictionaries/24_0family_mandatory_condition_variable/tiramisu/no_namespace.py +++ b/tests/dictionaries/24_0family_mandatory_condition_variable/tiramisu/no_namespace.py @@ -7,5 +7,5 @@ ALLOWED_LEADER_PROPERTIES.add("basic") ALLOWED_LEADER_PROPERTIES.add("standard") ALLOWED_LEADER_PROPERTIES.add("advanced") option_1 = BoolOption(name="condition", doc="a condition", default=True, properties=frozenset({"mandatory", "standard"}), informations={'ymlfiles': ['../rougail-tests/structures/24_0family_mandatory_condition_variable/rougail/00-base.yml'], 'type': 'boolean'}) -option_2 = StrOption(name="var", doc="a variable", properties=frozenset({"standard", Calculation(func['variable_to_property'], Params((ParamValue("mandatory"), ParamOption(option_1)), kwargs={'when': ParamValue(True), 'inverse': ParamValue(False)}), help_function=func['variable_to_property'])}), informations={'ymlfiles': ['../rougail-tests/structures/24_0family_mandatory_condition_variable/rougail/00-base.yml'], 'type': 'string'}) +option_2 = StrOption(name="var", doc="a variable", properties=frozenset({"standard", Calculation(func['variable_to_property'], Params((), kwargs={'value': ParamOption(option_1), 'prop': ParamValue("mandatory"), 'when': ParamValue(True), 'inverse': ParamValue(False)}), help_function=func['variable_to_property'])}), informations={'ymlfiles': ['../rougail-tests/structures/24_0family_mandatory_condition_variable/rougail/00-base.yml'], 'type': 'string'}) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1, option_2]) diff --git a/tests/dictionaries/24_family_disabled_var_hidden/tiramisu/base.py b/tests/dictionaries/24_family_disabled_var_hidden/tiramisu/base.py index 925e767d8..a1c58c471 100644 --- a/tests/dictionaries/24_family_disabled_var_hidden/tiramisu/base.py +++ b/tests/dictionaries/24_family_disabled_var_hidden/tiramisu/base.py @@ -11,7 +11,7 @@ ALLOWED_LEADER_PROPERTIES.add("basic") ALLOWED_LEADER_PROPERTIES.add("standard") ALLOWED_LEADER_PROPERTIES.add("advanced") option_3 = BoolOption(name="var1", doc="A description", default=True, properties=frozenset({"mandatory", "standard"}), informations={'ymlfiles': ['../rougail-tests/structures/24_family_disabled_var_hidden/rougail/00-base.yml'], 'type': 'boolean'}) -option_4 = StrOption(name="var2", doc="A description", properties=frozenset({"basic", "force_default_on_freeze", "mandatory", Calculation(func['variable_to_property'], Params((ParamValue("hidden"), ParamOption(option_3)), kwargs={'when': ParamValue(True), 'inverse': ParamValue(False)}), help_function=func['variable_to_property']), Calculation(func['variable_to_property'], Params((ParamValue("frozen"), ParamOption(option_3)), kwargs={'when': ParamValue(True), 'inverse': ParamValue(False)}), help_function=func['variable_to_property'])}), informations={'ymlfiles': ['../rougail-tests/structures/24_family_disabled_var_hidden/rougail/00-base.yml'], 'type': 'string'}) +option_4 = StrOption(name="var2", doc="A description", properties=frozenset({"basic", "force_default_on_freeze", "mandatory", Calculation(func['variable_to_property'], Params((), kwargs={'value': ParamOption(option_3), 'prop': ParamValue("hidden"), 'when': ParamValue(True), 'inverse': ParamValue(False)}), help_function=func['variable_to_property']), Calculation(func['variable_to_property'], Params((), kwargs={'value': ParamOption(option_3), 'prop': ParamValue("frozen"), 'when': ParamValue(True), 'inverse': ParamValue(False)}), help_function=func['variable_to_property'])}), informations={'ymlfiles': ['../rougail-tests/structures/24_family_disabled_var_hidden/rougail/00-base.yml'], 'type': 'string'}) optiondescription_2 = OptionDescription(name="family", doc="family", children=[option_3, option_4], properties=frozenset({"basic", "disabled"}), informations={'ymlfiles': ['../rougail-tests/structures/24_family_disabled_var_hidden/rougail/00-base.yml']}) optiondescription_1 = OptionDescription(name="rougail", doc="Rougail", group_type=groups.namespace, children=[optiondescription_2], properties=frozenset({"basic"}), informations={'ymlfiles': ['']}) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_1]) diff --git a/tests/dictionaries/24_family_disabled_var_hidden/tiramisu/no_namespace.py b/tests/dictionaries/24_family_disabled_var_hidden/tiramisu/no_namespace.py index 80d4af14d..72bacf95c 100644 --- a/tests/dictionaries/24_family_disabled_var_hidden/tiramisu/no_namespace.py +++ b/tests/dictionaries/24_family_disabled_var_hidden/tiramisu/no_namespace.py @@ -7,6 +7,6 @@ ALLOWED_LEADER_PROPERTIES.add("basic") ALLOWED_LEADER_PROPERTIES.add("standard") ALLOWED_LEADER_PROPERTIES.add("advanced") option_2 = BoolOption(name="var1", doc="A description", default=True, properties=frozenset({"mandatory", "standard"}), informations={'ymlfiles': ['../rougail-tests/structures/24_family_disabled_var_hidden/rougail/00-base.yml'], 'type': 'boolean'}) -option_3 = StrOption(name="var2", doc="A description", properties=frozenset({"basic", "force_default_on_freeze", "mandatory", Calculation(func['variable_to_property'], Params((ParamValue("hidden"), ParamOption(option_2)), kwargs={'when': ParamValue(True), 'inverse': ParamValue(False)}), help_function=func['variable_to_property']), Calculation(func['variable_to_property'], Params((ParamValue("frozen"), ParamOption(option_2)), kwargs={'when': ParamValue(True), 'inverse': ParamValue(False)}), help_function=func['variable_to_property'])}), informations={'ymlfiles': ['../rougail-tests/structures/24_family_disabled_var_hidden/rougail/00-base.yml'], 'type': 'string'}) +option_3 = StrOption(name="var2", doc="A description", properties=frozenset({"basic", "force_default_on_freeze", "mandatory", Calculation(func['variable_to_property'], Params((), kwargs={'value': ParamOption(option_2), 'prop': ParamValue("hidden"), 'when': ParamValue(True), 'inverse': ParamValue(False)}), help_function=func['variable_to_property']), Calculation(func['variable_to_property'], Params((), kwargs={'value': ParamOption(option_2), 'prop': ParamValue("frozen"), 'when': ParamValue(True), 'inverse': ParamValue(False)}), help_function=func['variable_to_property'])}), informations={'ymlfiles': ['../rougail-tests/structures/24_family_disabled_var_hidden/rougail/00-base.yml'], 'type': 'string'}) optiondescription_1 = OptionDescription(name="family", doc="family", children=[option_2, option_3], properties=frozenset({"basic", "disabled"}), informations={'ymlfiles': ['../rougail-tests/structures/24_family_disabled_var_hidden/rougail/00-base.yml']}) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_1]) diff --git a/tests/dictionaries/60_5family_dynamic_calc_suffix_disabled/tiramisu/base.py b/tests/dictionaries/60_5family_dynamic_calc_suffix_disabled/tiramisu/base.py index 64cb022fb..168449969 100644 --- a/tests/dictionaries/60_5family_dynamic_calc_suffix_disabled/tiramisu/base.py +++ b/tests/dictionaries/60_5family_dynamic_calc_suffix_disabled/tiramisu/base.py @@ -10,7 +10,7 @@ except: ALLOWED_LEADER_PROPERTIES.add("basic") ALLOWED_LEADER_PROPERTIES.add("standard") ALLOWED_LEADER_PROPERTIES.add("advanced") -option_3 = StrOption(name="var", doc="A dynamic variable", properties=frozenset({"basic", "mandatory", Calculation(func['variable_to_property'], Params((ParamValue("disabled"), ParamIdentifier()), kwargs={'when': ParamValue("val1"), 'inverse': ParamValue(False)}), help_function=func['variable_to_property'])}), informations={'ymlfiles': ['../rougail-tests/structures/60_5family_dynamic_calc_suffix_disabled/rougail/00-base.yml'], 'type': 'string'}) +option_3 = StrOption(name="var", doc="A dynamic variable", properties=frozenset({"basic", "mandatory", Calculation(func['variable_to_property'], Params((), kwargs={'prop': ParamValue("disabled"), 'value': ParamIdentifier(), 'when': ParamValue("val1"), 'inverse': ParamValue(False)}), help_function=func['variable_to_property'])}), informations={'ymlfiles': ['../rougail-tests/structures/60_5family_dynamic_calc_suffix_disabled/rougail/00-base.yml'], 'type': 'string'}) optiondescription_2 = ConvertDynOptionDescription(name="dyn{{ identifier }}", doc="dyn{{ identifier }}", identifiers=["val1", "val2"], children=[option_3], properties=frozenset({"basic"}), informations={'ymlfiles': ['../rougail-tests/structures/60_5family_dynamic_calc_suffix_disabled/rougail/00-base.yml']}) optiondescription_1 = OptionDescription(name="rougail", doc="Rougail", group_type=groups.namespace, children=[optiondescription_2], properties=frozenset({"basic"}), informations={'ymlfiles': ['']}) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_1]) diff --git a/tests/test_1_flattener.py b/tests/test_1_flattener.py index d1d28f04d..7d14607d4 100644 --- a/tests/test_1_flattener.py +++ b/tests/test_1_flattener.py @@ -47,7 +47,7 @@ excludes = set([ ]) test_ok -= excludes test_raise -= excludes -# test_ok = ['60_0family_dynamic'] +# test_ok = ['04_5disabled_calculation_variable6'] #test_ok = [] # test_raise = ['80unknown_default_variable_inside_dynamic_family'] #test_raise = []