From 99dddf20a9ccc49ad5c412f2330374c5d4a0e38c Mon Sep 17 00:00:00 2001 From: Emmanuel Garette Date: Tue, 23 Sep 2025 20:30:16 +0200 Subject: [PATCH] feat(#25): add integer type which will replace number type --- src/rougail/annotator/variable.py | 9 ++++++- src/rougail/convert/object_model.py | 7 ++++- src/rougail/convert/tiramisureflector.py | 27 ------------------- src/rougail/tiramisu.py | 2 ++ .../00_6choice_calculation/tiramisu/base.py | 2 +- .../tiramisu/no_namespace.py | 2 +- .../dictionaries/00_6integer/tiramisu/base.py | 20 ++++++++++++++ .../00_6integer/tiramisu/no_namespace.py | 15 +++++++++++ .../dictionaries/00_6number/tiramisu/base.py | 12 ++++----- .../00_6number/tiramisu/no_namespace.py | 12 ++++----- .../00_9default_integer/tiramisu/base.py | 2 +- .../tiramisu/no_namespace.py | 2 +- .../00_9default_number/tiramisu/base.py | 16 +++++++++++ .../tiramisu/no_namespace.py | 11 ++++++++ .../01_6integer_multi/tiramisu/base.py | 22 +++++++++++++++ .../tiramisu/no_namespace.py | 17 ++++++++++++ .../__init__.py | 0 .../makedict/after.json | 0 .../makedict/base.json | 0 .../makedict/before.json | 0 .../makedict/mandatory.json | 0 .../makedict/read_write.json | 0 .../tiramisu/base.py | 16 +++++------ .../tiramisu/no_namespace.py | 16 +++++------ .../04_0type_param/tiramisu/base.py | 2 +- .../04_0type_param/tiramisu/no_namespace.py | 2 +- .../04_0type_param_integer/tiramisu/base.py | 15 +++++++++++ .../tiramisu/no_namespace.py | 10 +++++++ .../04_5validators/tiramisu/base.py | 2 +- .../04_5validators/tiramisu/no_namespace.py | 2 +- .../04_5validators_multi3/tiramisu/base.py | 2 +- .../tiramisu/no_namespace.py | 2 +- .../tiramisu/base.py | 4 +-- .../tiramisu/no_namespace.py | 4 +-- .../tiramisu/base.py | 2 +- .../tiramisu/base.py | 2 +- .../40_8calculation_integer/tiramisu/base.py | 4 +-- .../__init__.py | 0 .../makedict/after.json | 0 .../makedict/base.json | 0 .../makedict/before.json | 0 .../makedict/mandatory.json | 0 .../makedict/read_write.json | 0 .../tiramisu/base.py | 8 +++--- .../tiramisu/base.py | 2 +- 45 files changed, 193 insertions(+), 80 deletions(-) create mode 100644 tests/dictionaries/00_6integer/tiramisu/base.py create mode 100644 tests/dictionaries/00_6integer/tiramisu/no_namespace.py create mode 100644 tests/dictionaries/00_9default_number/tiramisu/base.py create mode 100644 tests/dictionaries/00_9default_number/tiramisu/no_namespace.py create mode 100644 tests/dictionaries/01_6integer_multi/tiramisu/base.py create mode 100644 tests/dictionaries/01_6integer_multi/tiramisu/no_namespace.py rename tests/dictionaries/{01_6number_multi => 01_6number_integer}/__init__.py (100%) rename tests/dictionaries/{01_6number_multi => 01_6number_integer}/makedict/after.json (100%) rename tests/dictionaries/{01_6number_multi => 01_6number_integer}/makedict/base.json (100%) rename tests/dictionaries/{01_6number_multi => 01_6number_integer}/makedict/before.json (100%) rename tests/dictionaries/{01_6number_multi => 01_6number_integer}/makedict/mandatory.json (100%) rename tests/dictionaries/{01_6number_multi => 01_6number_integer}/makedict/read_write.json (100%) rename tests/dictionaries/{01_6number_multi => 01_6number_integer}/tiramisu/base.py (96%) rename tests/dictionaries/{01_6number_multi => 01_6number_integer}/tiramisu/no_namespace.py (96%) create mode 100644 tests/dictionaries/04_0type_param_integer/tiramisu/base.py create mode 100644 tests/dictionaries/04_0type_param_integer/tiramisu/no_namespace.py rename tests/dictionaries/{60_0family_dynamic_jinja_number_empty => 60_0family_dynamic_jinja_integer_empty}/__init__.py (100%) rename tests/dictionaries/{60_0family_dynamic_jinja_number_empty => 60_0family_dynamic_jinja_integer_empty}/makedict/after.json (100%) rename tests/dictionaries/{60_0family_dynamic_jinja_number_empty => 60_0family_dynamic_jinja_integer_empty}/makedict/base.json (100%) rename tests/dictionaries/{60_0family_dynamic_jinja_number_empty => 60_0family_dynamic_jinja_integer_empty}/makedict/before.json (100%) rename tests/dictionaries/{60_0family_dynamic_jinja_number_empty => 60_0family_dynamic_jinja_integer_empty}/makedict/mandatory.json (100%) rename tests/dictionaries/{60_0family_dynamic_jinja_number_empty => 60_0family_dynamic_jinja_integer_empty}/makedict/read_write.json (100%) rename tests/dictionaries/{60_0family_dynamic_jinja_number_empty => 60_0family_dynamic_jinja_integer_empty}/tiramisu/base.py (71%) diff --git a/src/rougail/annotator/variable.py b/src/rougail/annotator/variable.py index 7874a2b52..baa1af4bb 100644 --- a/src/rougail/annotator/variable.py +++ b/src/rougail/annotator/variable.py @@ -30,6 +30,9 @@ from rougail.i18n import _ from rougail.utils import calc_multi_for_type_variable from rougail.error import DictConsistencyError from rougail.convert.object_model import Calculation, VariableCalculation +from rougail.tiramisu import display_xmlfiles, RENAME_TYPE + +from warnings import warn class Walk: @@ -66,7 +69,7 @@ class Annotator(Walk): # pylint: disable=R0903 # default type inference from a default value with :term:`basic types` self.basic_types = { str: "string", - int: "number", + int: "integer", bool: "boolean", float: "float", } @@ -111,6 +114,10 @@ class Annotator(Walk): # pylint: disable=R0903 for variable in self.get_variables(): if variable.type == "symlink": continue + if variable.type in RENAME_TYPE: + warning = f'the variable "{ variable.path }" has a depreciated type "{variable.type}", please use "{RENAME_TYPE[variable.type]}" instead in {display_xmlfiles(variable.xmlfiles)}' + warn(warning) + variable.type = RENAME_TYPE[variable.type] self.objectspace.informations.add( variable.path, "ymlfiles", variable.xmlfiles ) diff --git a/src/rougail/convert/object_model.py b/src/rougail/convert/object_model.py index a1c8758e4..a13030dde 100644 --- a/src/rougail/convert/object_model.py +++ b/src/rougail/convert/object_model.py @@ -17,6 +17,7 @@ You should have received a copy of the GNU Lesser General Public License along with this program. If not, see . """ +from warnings import warn from typing import Optional, Union, get_type_hints, Any, Literal, List, Dict, Iterator from pydantic import ( BaseModel, @@ -36,7 +37,7 @@ from ..utils import ( ) from ..i18n import _ from ..error import DictConsistencyError, VariableCalculationDependencyError -from ..tiramisu import CONVERT_OPTION +from ..tiramisu import CONVERT_OPTION, RENAME_TYPE, display_xmlfiles BASETYPE = Union[StrictBool, StrictInt, StrictFloat, StrictStr, None] @@ -304,6 +305,10 @@ class JinjaCalculation(Calculation): jinja_path = f"{self.attribute_name}_{self.path}_{idx}" idx += 1 objectspace.jinja[jinja_path] = self.jinja + if return_type in RENAME_TYPE: + warning = f'the variable "{ self.path }" has a depreciated return_type "{return_type}", please use "{RENAME_TYPE[return_type]}" instead in {display_xmlfiles(variable.xmlfiles)}' + warn(warning) + return_type = RENAME_TYPE[return_type] default = { "function": function, "params": { diff --git a/src/rougail/convert/tiramisureflector.py b/src/rougail/convert/tiramisureflector.py index bd5c7e4c2..8f95027fe 100644 --- a/src/rougail/convert/tiramisureflector.py +++ b/src/rougail/convert/tiramisureflector.py @@ -126,33 +126,6 @@ class TiramisuReflector: elt, self, ) - # else: - # path_prefixes = self.objectspace.paths.get_path_prefixes() - # for path_prefix in path_prefixes: - # space = self.objectspace.space.variables[path_prefix] - # self.set_name(space) - # baseprefix = Family( - # space, - # self, - # ) - # basefamily.add(baseprefix) - # for elt in self.reorder_family(space): - # self.populate_family( - # baseprefix, - # elt, - # ) - # if not hasattr(baseprefix.elt, "information"): - # baseprefix.elt.information = self.objectspace.information( - # baseprefix.elt.xmlfiles - # ) - # for key, value in self.objectspace.paths.get_providers_path( - # path_prefix - # ).items(): - # setattr(baseprefix.elt.information, key, value) - # for key, value in self.objectspace.paths.get_suppliers_path( - # path_prefix - # ).items(): - # setattr(baseprefix.elt.information, key, value) baseelt.name = normalize_family(self.objectspace.base_option_name) baseelt.description = self.objectspace.base_option_name self.reflector_objects[baseelt.path].get( diff --git a/src/rougail/tiramisu.py b/src/rougail/tiramisu.py index 7aff74792..60b816e48 100644 --- a/src/rougail/tiramisu.py +++ b/src/rougail/tiramisu.py @@ -81,6 +81,7 @@ def convert_boolean(value: str) -> bool: CONVERT_OPTION = { "string": dict(opttype="StrOption", example="example"), "number": dict(opttype="IntOption", func=int, example=42), + "integer": dict(opttype="IntOption", func=int, example=42), "float": dict(opttype="FloatOption", func=float, example=1.42), "boolean": dict(opttype="BoolOption", func=convert_boolean), "secret": dict(opttype="PasswordOption", example="secrets"), @@ -133,6 +134,7 @@ CONVERT_OPTION = { # "symlink": dict(opttype="SymLinkOption"), } +RENAME_TYPE = {'number': 'integer'} def get_identifier_from_dynamic_family(true_name, name) -> str: diff --git a/tests/dictionaries/00_6choice_calculation/tiramisu/base.py b/tests/dictionaries/00_6choice_calculation/tiramisu/base.py index 03b22f30d..7d86a301d 100644 --- a/tests/dictionaries/00_6choice_calculation/tiramisu/base.py +++ b/tests/dictionaries/00_6choice_calculation/tiramisu/base.py @@ -11,6 +11,6 @@ ALLOWED_LEADER_PROPERTIES.add("basic") ALLOWED_LEADER_PROPERTIES.add("standard") ALLOWED_LEADER_PROPERTIES.add("advanced") dict_env['choices_rougail.var'] = "{% for n in trange(0, 10) %}\n{{ n }}\n{% endfor %}\n" -option_2 = ChoiceOption(name="var", doc="a variable", values=Calculation(func['jinja_to_function'], Params((), kwargs={'__internal_jinja': ParamValue("choices_rougail.var"), '__internal_type': ParamValue("number"), '__internal_multi': ParamValue(True), '__internal_files': ParamValue(['../rougail-tests/structures/00_6choice_calculation/rougail/00-base.yml']), '__internal_attribute': ParamValue("choices"), '__internal_variable': ParamValue("rougail.var")})), default=9, properties=frozenset({"mandatory", "standard"}), informations={'ymlfiles': ['../rougail-tests/structures/00_6choice_calculation/rougail/00-base.yml'], 'type': 'choice'}) +option_2 = ChoiceOption(name="var", doc="a variable", values=Calculation(func['jinja_to_function'], Params((), kwargs={'__internal_jinja': ParamValue("choices_rougail.var"), '__internal_type': ParamValue("integer"), '__internal_multi': ParamValue(True), '__internal_files': ParamValue(['../rougail-tests/structures/00_6choice_calculation/rougail/00-base.yml']), '__internal_attribute': ParamValue("choices"), '__internal_variable': ParamValue("rougail.var")})), default=9, properties=frozenset({"mandatory", "standard"}), informations={'ymlfiles': ['../rougail-tests/structures/00_6choice_calculation/rougail/00-base.yml'], 'type': 'choice'}) optiondescription_1 = OptionDescription(name="rougail", doc="Rougail", group_type=groups.namespace, children=[option_2], properties=frozenset({"standard"}), informations={'ymlfiles': ['']}) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_1]) diff --git a/tests/dictionaries/00_6choice_calculation/tiramisu/no_namespace.py b/tests/dictionaries/00_6choice_calculation/tiramisu/no_namespace.py index 0f65a7aa9..2c6a8d8e8 100644 --- a/tests/dictionaries/00_6choice_calculation/tiramisu/no_namespace.py +++ b/tests/dictionaries/00_6choice_calculation/tiramisu/no_namespace.py @@ -7,5 +7,5 @@ ALLOWED_LEADER_PROPERTIES.add("basic") ALLOWED_LEADER_PROPERTIES.add("standard") ALLOWED_LEADER_PROPERTIES.add("advanced") dict_env['choices_var'] = "{% for n in trange(0, 10) %}\n{{ n }}\n{% endfor %}\n" -option_1 = ChoiceOption(name="var", doc="a variable", values=Calculation(func['jinja_to_function'], Params((), kwargs={'__internal_jinja': ParamValue("choices_var"), '__internal_type': ParamValue("number"), '__internal_multi': ParamValue(True), '__internal_files': ParamValue(['../rougail-tests/structures/00_6choice_calculation/rougail/00-base.yml']), '__internal_attribute': ParamValue("choices"), '__internal_variable': ParamValue("var")})), default=9, properties=frozenset({"mandatory", "standard"}), informations={'ymlfiles': ['../rougail-tests/structures/00_6choice_calculation/rougail/00-base.yml'], 'type': 'choice'}) +option_1 = ChoiceOption(name="var", doc="a variable", values=Calculation(func['jinja_to_function'], Params((), kwargs={'__internal_jinja': ParamValue("choices_var"), '__internal_type': ParamValue("integer"), '__internal_multi': ParamValue(True), '__internal_files': ParamValue(['../rougail-tests/structures/00_6choice_calculation/rougail/00-base.yml']), '__internal_attribute': ParamValue("choices"), '__internal_variable': ParamValue("var")})), default=9, properties=frozenset({"mandatory", "standard"}), informations={'ymlfiles': ['../rougail-tests/structures/00_6choice_calculation/rougail/00-base.yml'], 'type': 'choice'}) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1]) diff --git a/tests/dictionaries/00_6integer/tiramisu/base.py b/tests/dictionaries/00_6integer/tiramisu/base.py new file mode 100644 index 000000000..b9a176355 --- /dev/null +++ b/tests/dictionaries/00_6integer/tiramisu/base.py @@ -0,0 +1,20 @@ +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", default=0, properties=frozenset({"mandatory", "standard"}), informations={'ymlfiles': ['../rougail-tests/structures/00_6integer/rougail/00-base.yml'], 'type': 'integer'}) +option_3 = IntOption(name="var2", doc="the second variable", default=0, properties=frozenset({"mandatory", "standard"}), informations={'ymlfiles': ['../rougail-tests/structures/00_6integer/rougail/00-base.yml'], 'type': 'integer'}) +option_4 = IntOption(name="var3", doc="the third variable", default=0, properties=frozenset({"mandatory", "standard"}), informations={'ymlfiles': ['../rougail-tests/structures/00_6integer/rougail/00-base.yml'], 'type': 'integer'}) +option_5 = IntOption(name="var4", doc="this forth variable", default=10, properties=frozenset({"mandatory", "standard"}), informations={'ymlfiles': ['../rougail-tests/structures/00_6integer/rougail/00-base.yml'], 'type': 'integer'}) +option_6 = IntOption(name="var5", doc="the fifth variable", default=10, properties=frozenset({"mandatory", "standard"}), informations={'ymlfiles': ['../rougail-tests/structures/00_6integer/rougail/00-base.yml'], 'type': 'integer'}) +option_7 = IntOption(name="var6", doc="the sixth variable", default=10, properties=frozenset({"mandatory", "standard"}), informations={'ymlfiles': ['../rougail-tests/structures/00_6integer/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], properties=frozenset({"standard"}), informations={'ymlfiles': ['']}) +option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_1]) diff --git a/tests/dictionaries/00_6integer/tiramisu/no_namespace.py b/tests/dictionaries/00_6integer/tiramisu/no_namespace.py new file mode 100644 index 000000000..c42c9178b --- /dev/null +++ b/tests/dictionaries/00_6integer/tiramisu/no_namespace.py @@ -0,0 +1,15 @@ +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", default=0, properties=frozenset({"mandatory", "standard"}), informations={'ymlfiles': ['../rougail-tests/structures/00_6integer/rougail/00-base.yml'], 'type': 'integer'}) +option_2 = IntOption(name="var2", doc="the second variable", default=0, properties=frozenset({"mandatory", "standard"}), informations={'ymlfiles': ['../rougail-tests/structures/00_6integer/rougail/00-base.yml'], 'type': 'integer'}) +option_3 = IntOption(name="var3", doc="the third variable", default=0, properties=frozenset({"mandatory", "standard"}), informations={'ymlfiles': ['../rougail-tests/structures/00_6integer/rougail/00-base.yml'], 'type': 'integer'}) +option_4 = IntOption(name="var4", doc="this forth variable", default=10, properties=frozenset({"mandatory", "standard"}), informations={'ymlfiles': ['../rougail-tests/structures/00_6integer/rougail/00-base.yml'], 'type': 'integer'}) +option_5 = IntOption(name="var5", doc="the fifth variable", default=10, properties=frozenset({"mandatory", "standard"}), informations={'ymlfiles': ['../rougail-tests/structures/00_6integer/rougail/00-base.yml'], 'type': 'integer'}) +option_6 = IntOption(name="var6", doc="the sixth variable", default=10, properties=frozenset({"mandatory", "standard"}), informations={'ymlfiles': ['../rougail-tests/structures/00_6integer/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]) diff --git a/tests/dictionaries/00_6number/tiramisu/base.py b/tests/dictionaries/00_6number/tiramisu/base.py index aa89d984d..4dd8b7144 100644 --- a/tests/dictionaries/00_6number/tiramisu/base.py +++ b/tests/dictionaries/00_6number/tiramisu/base.py @@ -10,11 +10,11 @@ except: ALLOWED_LEADER_PROPERTIES.add("basic") ALLOWED_LEADER_PROPERTIES.add("standard") ALLOWED_LEADER_PROPERTIES.add("advanced") -option_2 = IntOption(name="var1", doc="the first variable", default=0, properties=frozenset({"mandatory", "standard"}), informations={'ymlfiles': ['../rougail-tests/structures/00_6number/rougail/00-base.yml'], 'type': 'number'}) -option_3 = IntOption(name="var2", doc="the second variable", default=0, properties=frozenset({"mandatory", "standard"}), informations={'ymlfiles': ['../rougail-tests/structures/00_6number/rougail/00-base.yml'], 'type': 'number'}) -option_4 = IntOption(name="var3", doc="the third variable", default=0, properties=frozenset({"mandatory", "standard"}), informations={'ymlfiles': ['../rougail-tests/structures/00_6number/rougail/00-base.yml'], 'type': 'number'}) -option_5 = IntOption(name="var4", doc="this forth variable", default=10, properties=frozenset({"mandatory", "standard"}), informations={'ymlfiles': ['../rougail-tests/structures/00_6number/rougail/00-base.yml'], 'type': 'number'}) -option_6 = IntOption(name="var5", doc="the fifth variable", default=10, properties=frozenset({"mandatory", "standard"}), informations={'ymlfiles': ['../rougail-tests/structures/00_6number/rougail/00-base.yml'], 'type': 'number'}) -option_7 = IntOption(name="var6", doc="the sixth variable", default=10, properties=frozenset({"mandatory", "standard"}), informations={'ymlfiles': ['../rougail-tests/structures/00_6number/rougail/00-base.yml'], 'type': 'number'}) +option_2 = IntOption(name="var1", doc="the first variable", default=0, properties=frozenset({"mandatory", "standard"}), informations={'ymlfiles': ['../rougail-tests/structures/00_6number/rougail/00-base.yml'], 'type': 'integer'}) +option_3 = IntOption(name="var2", doc="the second variable", default=0, properties=frozenset({"mandatory", "standard"}), informations={'ymlfiles': ['../rougail-tests/structures/00_6number/rougail/00-base.yml'], 'type': 'integer'}) +option_4 = IntOption(name="var3", doc="the third variable", default=0, properties=frozenset({"mandatory", "standard"}), informations={'ymlfiles': ['../rougail-tests/structures/00_6number/rougail/00-base.yml'], 'type': 'integer'}) +option_5 = IntOption(name="var4", doc="this forth variable", default=10, properties=frozenset({"mandatory", "standard"}), informations={'ymlfiles': ['../rougail-tests/structures/00_6number/rougail/00-base.yml'], 'type': 'integer'}) +option_6 = IntOption(name="var5", doc="the fifth variable", default=10, properties=frozenset({"mandatory", "standard"}), informations={'ymlfiles': ['../rougail-tests/structures/00_6number/rougail/00-base.yml'], 'type': 'integer'}) +option_7 = IntOption(name="var6", doc="the sixth variable", default=10, properties=frozenset({"mandatory", "standard"}), informations={'ymlfiles': ['../rougail-tests/structures/00_6number/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], properties=frozenset({"standard"}), informations={'ymlfiles': ['']}) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_1]) diff --git a/tests/dictionaries/00_6number/tiramisu/no_namespace.py b/tests/dictionaries/00_6number/tiramisu/no_namespace.py index af9709c00..e6fba3704 100644 --- a/tests/dictionaries/00_6number/tiramisu/no_namespace.py +++ b/tests/dictionaries/00_6number/tiramisu/no_namespace.py @@ -6,10 +6,10 @@ 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", default=0, properties=frozenset({"mandatory", "standard"}), informations={'ymlfiles': ['../rougail-tests/structures/00_6number/rougail/00-base.yml'], 'type': 'number'}) -option_2 = IntOption(name="var2", doc="the second variable", default=0, properties=frozenset({"mandatory", "standard"}), informations={'ymlfiles': ['../rougail-tests/structures/00_6number/rougail/00-base.yml'], 'type': 'number'}) -option_3 = IntOption(name="var3", doc="the third variable", default=0, properties=frozenset({"mandatory", "standard"}), informations={'ymlfiles': ['../rougail-tests/structures/00_6number/rougail/00-base.yml'], 'type': 'number'}) -option_4 = IntOption(name="var4", doc="this forth variable", default=10, properties=frozenset({"mandatory", "standard"}), informations={'ymlfiles': ['../rougail-tests/structures/00_6number/rougail/00-base.yml'], 'type': 'number'}) -option_5 = IntOption(name="var5", doc="the fifth variable", default=10, properties=frozenset({"mandatory", "standard"}), informations={'ymlfiles': ['../rougail-tests/structures/00_6number/rougail/00-base.yml'], 'type': 'number'}) -option_6 = IntOption(name="var6", doc="the sixth variable", default=10, properties=frozenset({"mandatory", "standard"}), informations={'ymlfiles': ['../rougail-tests/structures/00_6number/rougail/00-base.yml'], 'type': 'number'}) +option_1 = IntOption(name="var1", doc="the first variable", default=0, properties=frozenset({"mandatory", "standard"}), informations={'ymlfiles': ['../rougail-tests/structures/00_6number/rougail/00-base.yml'], 'type': 'integer'}) +option_2 = IntOption(name="var2", doc="the second variable", default=0, properties=frozenset({"mandatory", "standard"}), informations={'ymlfiles': ['../rougail-tests/structures/00_6number/rougail/00-base.yml'], 'type': 'integer'}) +option_3 = IntOption(name="var3", doc="the third variable", default=0, properties=frozenset({"mandatory", "standard"}), informations={'ymlfiles': ['../rougail-tests/structures/00_6number/rougail/00-base.yml'], 'type': 'integer'}) +option_4 = IntOption(name="var4", doc="this forth variable", default=10, properties=frozenset({"mandatory", "standard"}), informations={'ymlfiles': ['../rougail-tests/structures/00_6number/rougail/00-base.yml'], 'type': 'integer'}) +option_5 = IntOption(name="var5", doc="the fifth variable", default=10, properties=frozenset({"mandatory", "standard"}), informations={'ymlfiles': ['../rougail-tests/structures/00_6number/rougail/00-base.yml'], 'type': 'integer'}) +option_6 = IntOption(name="var6", doc="the sixth variable", default=10, properties=frozenset({"mandatory", "standard"}), informations={'ymlfiles': ['../rougail-tests/structures/00_6number/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]) diff --git a/tests/dictionaries/00_9default_integer/tiramisu/base.py b/tests/dictionaries/00_9default_integer/tiramisu/base.py index 8c66c5211..987d8888e 100644 --- a/tests/dictionaries/00_9default_integer/tiramisu/base.py +++ b/tests/dictionaries/00_9default_integer/tiramisu/base.py @@ -11,6 +11,6 @@ ALLOWED_LEADER_PROPERTIES.add("basic") ALLOWED_LEADER_PROPERTIES.add("standard") ALLOWED_LEADER_PROPERTIES.add("advanced") dict_env['choices_rougail.var'] = "{% for item in trange(0, 10) %}\n{{ item }}\n{%- endfor %}\n" -option_2 = ChoiceOption(name="var", doc="a variable", values=Calculation(func['jinja_to_function'], Params((), kwargs={'__internal_jinja': ParamValue("choices_rougail.var"), '__internal_type': ParamValue("number"), '__internal_multi': ParamValue(True), '__internal_files': ParamValue(['../rougail-tests/structures/00_9default_integer/rougail/00-base.yml']), '__internal_attribute': ParamValue("choices"), '__internal_variable': ParamValue("rougail.var")})), default=9, properties=frozenset({"mandatory", "standard"}), informations={'ymlfiles': ['../rougail-tests/structures/00_9default_integer/rougail/00-base.yml'], 'type': 'choice'}) +option_2 = ChoiceOption(name="var", doc="a variable", values=Calculation(func['jinja_to_function'], Params((), kwargs={'__internal_jinja': ParamValue("choices_rougail.var"), '__internal_type': ParamValue("integer"), '__internal_multi': ParamValue(True), '__internal_files': ParamValue(['../rougail-tests/structures/00_9default_integer/rougail/00-base.yml']), '__internal_attribute': ParamValue("choices"), '__internal_variable': ParamValue("rougail.var")})), default=9, properties=frozenset({"mandatory", "standard"}), informations={'ymlfiles': ['../rougail-tests/structures/00_9default_integer/rougail/00-base.yml'], 'type': 'choice'}) optiondescription_1 = OptionDescription(name="rougail", doc="Rougail", group_type=groups.namespace, children=[option_2], properties=frozenset({"standard"}), informations={'ymlfiles': ['']}) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_1]) diff --git a/tests/dictionaries/00_9default_integer/tiramisu/no_namespace.py b/tests/dictionaries/00_9default_integer/tiramisu/no_namespace.py index 523f4d016..cbc1f03bd 100644 --- a/tests/dictionaries/00_9default_integer/tiramisu/no_namespace.py +++ b/tests/dictionaries/00_9default_integer/tiramisu/no_namespace.py @@ -7,5 +7,5 @@ ALLOWED_LEADER_PROPERTIES.add("basic") ALLOWED_LEADER_PROPERTIES.add("standard") ALLOWED_LEADER_PROPERTIES.add("advanced") dict_env['choices_var'] = "{% for item in trange(0, 10) %}\n{{ item }}\n{%- endfor %}\n" -option_1 = ChoiceOption(name="var", doc="a variable", values=Calculation(func['jinja_to_function'], Params((), kwargs={'__internal_jinja': ParamValue("choices_var"), '__internal_type': ParamValue("number"), '__internal_multi': ParamValue(True), '__internal_files': ParamValue(['../rougail-tests/structures/00_9default_integer/rougail/00-base.yml']), '__internal_attribute': ParamValue("choices"), '__internal_variable': ParamValue("var")})), default=9, properties=frozenset({"mandatory", "standard"}), informations={'ymlfiles': ['../rougail-tests/structures/00_9default_integer/rougail/00-base.yml'], 'type': 'choice'}) +option_1 = ChoiceOption(name="var", doc="a variable", values=Calculation(func['jinja_to_function'], Params((), kwargs={'__internal_jinja': ParamValue("choices_var"), '__internal_type': ParamValue("integer"), '__internal_multi': ParamValue(True), '__internal_files': ParamValue(['../rougail-tests/structures/00_9default_integer/rougail/00-base.yml']), '__internal_attribute': ParamValue("choices"), '__internal_variable': ParamValue("var")})), default=9, properties=frozenset({"mandatory", "standard"}), informations={'ymlfiles': ['../rougail-tests/structures/00_9default_integer/rougail/00-base.yml'], 'type': 'choice'}) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1]) diff --git a/tests/dictionaries/00_9default_number/tiramisu/base.py b/tests/dictionaries/00_9default_number/tiramisu/base.py new file mode 100644 index 000000000..408af538f --- /dev/null +++ b/tests/dictionaries/00_9default_number/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") +dict_env['choices_rougail.var'] = "{% for item in trange(0, 10) %}\n{{ item }}\n{%- endfor %}\n" +option_2 = ChoiceOption(name="var", doc="a variable", values=Calculation(func['jinja_to_function'], Params((), kwargs={'__internal_jinja': ParamValue("choices_rougail.var"), '__internal_type': ParamValue("integer"), '__internal_multi': ParamValue(True), '__internal_files': ParamValue(['../rougail-tests/structures/00_9default_number/rougail/00-base.yml']), '__internal_attribute': ParamValue("choices"), '__internal_variable': ParamValue("rougail.var")})), default=9, properties=frozenset({"mandatory", "standard"}), informations={'ymlfiles': ['../rougail-tests/structures/00_9default_number/rougail/00-base.yml'], 'type': 'choice'}) +optiondescription_1 = OptionDescription(name="rougail", doc="Rougail", group_type=groups.namespace, children=[option_2], properties=frozenset({"standard"}), informations={'ymlfiles': ['']}) +option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_1]) diff --git a/tests/dictionaries/00_9default_number/tiramisu/no_namespace.py b/tests/dictionaries/00_9default_number/tiramisu/no_namespace.py new file mode 100644 index 000000000..f8d8d716c --- /dev/null +++ b/tests/dictionaries/00_9default_number/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") +dict_env['choices_var'] = "{% for item in trange(0, 10) %}\n{{ item }}\n{%- endfor %}\n" +option_1 = ChoiceOption(name="var", doc="a variable", values=Calculation(func['jinja_to_function'], Params((), kwargs={'__internal_jinja': ParamValue("choices_var"), '__internal_type': ParamValue("integer"), '__internal_multi': ParamValue(True), '__internal_files': ParamValue(['../rougail-tests/structures/00_9default_number/rougail/00-base.yml']), '__internal_attribute': ParamValue("choices"), '__internal_variable': ParamValue("var")})), default=9, properties=frozenset({"mandatory", "standard"}), informations={'ymlfiles': ['../rougail-tests/structures/00_9default_number/rougail/00-base.yml'], 'type': 'choice'}) +option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1]) diff --git a/tests/dictionaries/01_6integer_multi/tiramisu/base.py b/tests/dictionaries/01_6integer_multi/tiramisu/base.py new file mode 100644 index 000000000..480d00c82 --- /dev/null +++ b/tests/dictionaries/01_6integer_multi/tiramisu/base.py @@ -0,0 +1,22 @@ +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_6integer_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_6integer_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_6integer_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_6integer_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_6integer_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_6integer_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_6integer_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_6integer_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_6integer_multi/tiramisu/no_namespace.py b/tests/dictionaries/01_6integer_multi/tiramisu/no_namespace.py new file mode 100644 index 000000000..af81afc35 --- /dev/null +++ b/tests/dictionaries/01_6integer_multi/tiramisu/no_namespace.py @@ -0,0 +1,17 @@ +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_6integer_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_6integer_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_6integer_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_6integer_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_6integer_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_6integer_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_6integer_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_6integer_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/01_6number_multi/__init__.py b/tests/dictionaries/01_6number_integer/__init__.py similarity index 100% rename from tests/dictionaries/01_6number_multi/__init__.py rename to tests/dictionaries/01_6number_integer/__init__.py diff --git a/tests/dictionaries/01_6number_multi/makedict/after.json b/tests/dictionaries/01_6number_integer/makedict/after.json similarity index 100% rename from tests/dictionaries/01_6number_multi/makedict/after.json rename to tests/dictionaries/01_6number_integer/makedict/after.json diff --git a/tests/dictionaries/01_6number_multi/makedict/base.json b/tests/dictionaries/01_6number_integer/makedict/base.json similarity index 100% rename from tests/dictionaries/01_6number_multi/makedict/base.json rename to tests/dictionaries/01_6number_integer/makedict/base.json diff --git a/tests/dictionaries/01_6number_multi/makedict/before.json b/tests/dictionaries/01_6number_integer/makedict/before.json similarity index 100% rename from tests/dictionaries/01_6number_multi/makedict/before.json rename to tests/dictionaries/01_6number_integer/makedict/before.json diff --git a/tests/dictionaries/01_6number_multi/makedict/mandatory.json b/tests/dictionaries/01_6number_integer/makedict/mandatory.json similarity index 100% rename from tests/dictionaries/01_6number_multi/makedict/mandatory.json rename to tests/dictionaries/01_6number_integer/makedict/mandatory.json diff --git a/tests/dictionaries/01_6number_multi/makedict/read_write.json b/tests/dictionaries/01_6number_integer/makedict/read_write.json similarity index 100% rename from tests/dictionaries/01_6number_multi/makedict/read_write.json rename to tests/dictionaries/01_6number_integer/makedict/read_write.json diff --git a/tests/dictionaries/01_6number_multi/tiramisu/base.py b/tests/dictionaries/01_6number_integer/tiramisu/base.py similarity index 96% rename from tests/dictionaries/01_6number_multi/tiramisu/base.py rename to tests/dictionaries/01_6number_integer/tiramisu/base.py index a6cd83d47..d58905fe9 100644 --- a/tests/dictionaries/01_6number_multi/tiramisu/base.py +++ b/tests/dictionaries/01_6number_integer/tiramisu/base.py @@ -10,13 +10,13 @@ except: 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': 'number'}) -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': 'number'}) -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': 'number'}) -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': 'number'}) -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': 'number'}) -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': 'number'}) -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': 'number'}) -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': 'number'}) +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_multi/tiramisu/no_namespace.py b/tests/dictionaries/01_6number_integer/tiramisu/no_namespace.py similarity index 96% rename from tests/dictionaries/01_6number_multi/tiramisu/no_namespace.py rename to tests/dictionaries/01_6number_integer/tiramisu/no_namespace.py index 9bbeb9b03..1112f64ff 100644 --- a/tests/dictionaries/01_6number_multi/tiramisu/no_namespace.py +++ b/tests/dictionaries/01_6number_integer/tiramisu/no_namespace.py @@ -6,12 +6,12 @@ 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': 'number'}) -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': 'number'}) -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': 'number'}) -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': 'number'}) -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': 'number'}) -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': 'number'}) -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': 'number'}) -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': 'number'}) +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_0type_param/tiramisu/base.py b/tests/dictionaries/04_0type_param/tiramisu/base.py index 3c66fda4b..44f46045a 100644 --- a/tests/dictionaries/04_0type_param/tiramisu/base.py +++ b/tests/dictionaries/04_0type_param/tiramisu/base.py @@ -10,6 +10,6 @@ except: ALLOWED_LEADER_PROPERTIES.add("basic") ALLOWED_LEADER_PROPERTIES.add("standard") ALLOWED_LEADER_PROPERTIES.add("advanced") -option_2 = IntOption(name="int", doc="A limited number", default=10, min_number=0, max_number=100, properties=frozenset({"mandatory", "standard"}), informations={'ymlfiles': ['../rougail-tests/structures/04_0type_param/rougail/00-base.yml'], 'type': 'number'}) +option_2 = IntOption(name="int", doc="A limited number", default=10, min_number=0, max_number=100, properties=frozenset({"mandatory", "standard"}), informations={'ymlfiles': ['../rougail-tests/structures/04_0type_param/rougail/00-base.yml'], 'type': 'integer'}) optiondescription_1 = OptionDescription(name="rougail", doc="Rougail", group_type=groups.namespace, children=[option_2], properties=frozenset({"standard"}), informations={'ymlfiles': ['']}) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_1]) diff --git a/tests/dictionaries/04_0type_param/tiramisu/no_namespace.py b/tests/dictionaries/04_0type_param/tiramisu/no_namespace.py index a79ecacf9..5f2daf2f0 100644 --- a/tests/dictionaries/04_0type_param/tiramisu/no_namespace.py +++ b/tests/dictionaries/04_0type_param/tiramisu/no_namespace.py @@ -6,5 +6,5 @@ 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="int", doc="A limited number", default=10, min_number=0, max_number=100, properties=frozenset({"mandatory", "standard"}), informations={'ymlfiles': ['../rougail-tests/structures/04_0type_param/rougail/00-base.yml'], 'type': 'number'}) +option_1 = IntOption(name="int", doc="A limited number", default=10, min_number=0, max_number=100, properties=frozenset({"mandatory", "standard"}), informations={'ymlfiles': ['../rougail-tests/structures/04_0type_param/rougail/00-base.yml'], 'type': 'integer'}) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1]) diff --git a/tests/dictionaries/04_0type_param_integer/tiramisu/base.py b/tests/dictionaries/04_0type_param_integer/tiramisu/base.py new file mode 100644 index 000000000..24f866b27 --- /dev/null +++ b/tests/dictionaries/04_0type_param_integer/tiramisu/base.py @@ -0,0 +1,15 @@ +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="int", doc="A limited integer", default=10, min_integer=0, max_integer=100, properties=frozenset({"mandatory", "standard"}), informations={'ymlfiles': ['../rougail-tests/structures/04_0type_param_integer/rougail/00-base.yml'], 'type': 'integer'}) +optiondescription_1 = OptionDescription(name="rougail", doc="Rougail", group_type=groups.namespace, children=[option_2], properties=frozenset({"standard"}), informations={'ymlfiles': ['']}) +option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_1]) diff --git a/tests/dictionaries/04_0type_param_integer/tiramisu/no_namespace.py b/tests/dictionaries/04_0type_param_integer/tiramisu/no_namespace.py new file mode 100644 index 000000000..a04327ef6 --- /dev/null +++ b/tests/dictionaries/04_0type_param_integer/tiramisu/no_namespace.py @@ -0,0 +1,10 @@ +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="int", doc="A limited integer", default=10, min_integer=0, max_integer=100, properties=frozenset({"mandatory", "standard"}), informations={'ymlfiles': ['../rougail-tests/structures/04_0type_param_integer/rougail/00-base.yml'], 'type': 'integer'}) +option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1]) diff --git a/tests/dictionaries/04_5validators/tiramisu/base.py b/tests/dictionaries/04_5validators/tiramisu/base.py index 55438f8a1..496e0b8a4 100644 --- a/tests/dictionaries/04_5validators/tiramisu/base.py +++ b/tests/dictionaries/04_5validators/tiramisu/base.py @@ -11,6 +11,6 @@ ALLOWED_LEADER_PROPERTIES.add("basic") ALLOWED_LEADER_PROPERTIES.add("standard") ALLOWED_LEADER_PROPERTIES.add("advanced") dict_env['validators_rougail.int'] = "{% if _.int > 100 %}\nvalue is too high\n{% endif %}\n" -option_2 = IntOption(name="int", doc="A number", validators=[Calculation(func['valid_with_jinja'], Params((), kwargs={'__internal_jinja': ParamValue("validators_rougail.int"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['../rougail-tests/structures/04_5validators/rougail/00-base.yml']), '__internal_attribute': ParamValue("validators"), '__internal_variable': ParamValue("rougail.int"), '_.int': ParamSelfOption(whole=False)}))], properties=frozenset({"basic", "mandatory"}), informations={'ymlfiles': ['../rougail-tests/structures/04_5validators/rougail/00-base.yml'], 'type': 'number'}) +option_2 = IntOption(name="int", doc="An integer", validators=[Calculation(func['valid_with_jinja'], Params((), kwargs={'__internal_jinja': ParamValue("validators_rougail.int"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['../rougail-tests/structures/04_5validators/rougail/00-base.yml']), '__internal_attribute': ParamValue("validators"), '__internal_variable': ParamValue("rougail.int"), '_.int': ParamSelfOption(whole=False)}))], properties=frozenset({"basic", "mandatory"}), informations={'ymlfiles': ['../rougail-tests/structures/04_5validators/rougail/00-base.yml'], 'type': 'integer'}) optiondescription_1 = OptionDescription(name="rougail", doc="Rougail", group_type=groups.namespace, children=[option_2], properties=frozenset({"basic"}), informations={'ymlfiles': ['']}) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_1]) diff --git a/tests/dictionaries/04_5validators/tiramisu/no_namespace.py b/tests/dictionaries/04_5validators/tiramisu/no_namespace.py index 3bea3538b..525228836 100644 --- a/tests/dictionaries/04_5validators/tiramisu/no_namespace.py +++ b/tests/dictionaries/04_5validators/tiramisu/no_namespace.py @@ -7,5 +7,5 @@ ALLOWED_LEADER_PROPERTIES.add("basic") ALLOWED_LEADER_PROPERTIES.add("standard") ALLOWED_LEADER_PROPERTIES.add("advanced") dict_env['validators_int'] = "{% if _.int > 100 %}\nvalue is too high\n{% endif %}\n" -option_1 = IntOption(name="int", doc="A number", validators=[Calculation(func['valid_with_jinja'], Params((), kwargs={'__internal_jinja': ParamValue("validators_int"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['../rougail-tests/structures/04_5validators/rougail/00-base.yml']), '__internal_attribute': ParamValue("validators"), '__internal_variable': ParamValue("int"), '_.int': ParamSelfOption(whole=False)}))], properties=frozenset({"basic", "mandatory"}), informations={'ymlfiles': ['../rougail-tests/structures/04_5validators/rougail/00-base.yml'], 'type': 'number'}) +option_1 = IntOption(name="int", doc="An integer", validators=[Calculation(func['valid_with_jinja'], Params((), kwargs={'__internal_jinja': ParamValue("validators_int"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['../rougail-tests/structures/04_5validators/rougail/00-base.yml']), '__internal_attribute': ParamValue("validators"), '__internal_variable': ParamValue("int"), '_.int': ParamSelfOption(whole=False)}))], properties=frozenset({"basic", "mandatory"}), informations={'ymlfiles': ['../rougail-tests/structures/04_5validators/rougail/00-base.yml'], 'type': 'integer'}) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1]) diff --git a/tests/dictionaries/04_5validators_multi3/tiramisu/base.py b/tests/dictionaries/04_5validators_multi3/tiramisu/base.py index c606efd84..4585e179e 100644 --- a/tests/dictionaries/04_5validators_multi3/tiramisu/base.py +++ b/tests/dictionaries/04_5validators_multi3/tiramisu/base.py @@ -11,6 +11,6 @@ ALLOWED_LEADER_PROPERTIES.add("basic") ALLOWED_LEADER_PROPERTIES.add("standard") ALLOWED_LEADER_PROPERTIES.add("advanced") dict_env['validators_rougail.var1'] = "{% if _.var1 != index %}\n value != than index\n{% endif %}" -option_2 = IntOption(name="var1", doc="a second variable", multi=True, default=[0, 1, 2], default_multi=0, validators=[Calculation(func['valid_with_jinja'], Params((), kwargs={'__internal_jinja': ParamValue("validators_rougail.var1"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['../rougail-tests/structures/04_5validators_multi3/rougail/00-base.yml']), '__internal_attribute': ParamValue("validators"), '__internal_variable': ParamValue("rougail.var1"), 'index': ParamIndex(), '_.var1': ParamSelfOption(whole=False)}))], properties=frozenset({"mandatory", "standard"}), informations={'ymlfiles': ['../rougail-tests/structures/04_5validators_multi3/rougail/00-base.yml'], 'type': 'number', 'test': (0,)}) +option_2 = IntOption(name="var1", doc="a second variable", multi=True, default=[0, 1, 2], default_multi=0, validators=[Calculation(func['valid_with_jinja'], Params((), kwargs={'__internal_jinja': ParamValue("validators_rougail.var1"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['../rougail-tests/structures/04_5validators_multi3/rougail/00-base.yml']), '__internal_attribute': ParamValue("validators"), '__internal_variable': ParamValue("rougail.var1"), 'index': ParamIndex(), '_.var1': ParamSelfOption(whole=False)}))], properties=frozenset({"mandatory", "standard"}), informations={'ymlfiles': ['../rougail-tests/structures/04_5validators_multi3/rougail/00-base.yml'], 'type': 'integer', 'test': (0,)}) optiondescription_1 = OptionDescription(name="rougail", doc="Rougail", group_type=groups.namespace, children=[option_2], properties=frozenset({"standard"}), informations={'ymlfiles': ['']}) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_1]) diff --git a/tests/dictionaries/04_5validators_multi3/tiramisu/no_namespace.py b/tests/dictionaries/04_5validators_multi3/tiramisu/no_namespace.py index 6b6835367..bb4c13c71 100644 --- a/tests/dictionaries/04_5validators_multi3/tiramisu/no_namespace.py +++ b/tests/dictionaries/04_5validators_multi3/tiramisu/no_namespace.py @@ -7,5 +7,5 @@ ALLOWED_LEADER_PROPERTIES.add("basic") ALLOWED_LEADER_PROPERTIES.add("standard") ALLOWED_LEADER_PROPERTIES.add("advanced") dict_env['validators_var1'] = "{% if _.var1 != index %}\n value != than index\n{% endif %}" -option_1 = IntOption(name="var1", doc="a second variable", multi=True, default=[0, 1, 2], default_multi=0, validators=[Calculation(func['valid_with_jinja'], Params((), kwargs={'__internal_jinja': ParamValue("validators_var1"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['../rougail-tests/structures/04_5validators_multi3/rougail/00-base.yml']), '__internal_attribute': ParamValue("validators"), '__internal_variable': ParamValue("var1"), 'index': ParamIndex(), '_.var1': ParamSelfOption(whole=False)}))], properties=frozenset({"mandatory", "standard"}), informations={'ymlfiles': ['../rougail-tests/structures/04_5validators_multi3/rougail/00-base.yml'], 'type': 'number', 'test': (0,)}) +option_1 = IntOption(name="var1", doc="a second variable", multi=True, default=[0, 1, 2], default_multi=0, validators=[Calculation(func['valid_with_jinja'], Params((), kwargs={'__internal_jinja': ParamValue("validators_var1"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['../rougail-tests/structures/04_5validators_multi3/rougail/00-base.yml']), '__internal_attribute': ParamValue("validators"), '__internal_variable': ParamValue("var1"), 'index': ParamIndex(), '_.var1': ParamSelfOption(whole=False)}))], properties=frozenset({"mandatory", "standard"}), informations={'ymlfiles': ['../rougail-tests/structures/04_5validators_multi3/rougail/00-base.yml'], 'type': 'integer', 'test': (0,)}) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1]) diff --git a/tests/dictionaries/24_7validators_variable_optional/tiramisu/base.py b/tests/dictionaries/24_7validators_variable_optional/tiramisu/base.py index f589d9b40..404c710cf 100644 --- a/tests/dictionaries/24_7validators_variable_optional/tiramisu/base.py +++ b/tests/dictionaries/24_7validators_variable_optional/tiramisu/base.py @@ -12,8 +12,8 @@ ALLOWED_LEADER_PROPERTIES.add("standard") ALLOWED_LEADER_PROPERTIES.add("advanced") dict_env['validators_rougail.general.int'] = "{% if _.int == int2 %}\nint and int2 must be different\n{% endif %}\n" dict_env['validators_rougail.general.int_0'] = "{% if int3 is defined and _.int == int3 %}\nint and int3 must be different\n{% endif %}\n" -option_4 = IntOption(name="int2", doc="a second number", default=1, properties=frozenset({"mandatory", "standard"}), informations={'ymlfiles': ['../rougail-tests/structures/24_7validators_variable_optional/rougail/00-base.yml'], 'type': 'number'}) -option_3 = IntOption(name="int", doc="a first number", validators=[Calculation(func['valid_with_jinja'], Params((), kwargs={'__internal_jinja': ParamValue("validators_rougail.general.int"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['../rougail-tests/structures/24_7validators_variable_optional/rougail/00-base.yml']), '__internal_attribute': ParamValue("validators"), '__internal_variable': ParamValue("rougail.general.int"), 'int2': ParamOption(option_4), '_.int': ParamSelfOption(whole=False)})), Calculation(func['valid_with_jinja'], Params((), kwargs={'__internal_jinja': ParamValue("validators_rougail.general.int_0"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['../rougail-tests/structures/24_7validators_variable_optional/rougail/00-base.yml']), '__internal_attribute': ParamValue("validators"), '__internal_variable': ParamValue("rougail.general.int"), '_.int': ParamSelfOption(whole=False)}))], properties=frozenset({"basic", "mandatory"}), informations={'ymlfiles': ['../rougail-tests/structures/24_7validators_variable_optional/rougail/00-base.yml'], 'type': 'number', 'test': (5,)}) +option_4 = IntOption(name="int2", doc="a second integer", default=1, properties=frozenset({"mandatory", "standard"}), informations={'ymlfiles': ['../rougail-tests/structures/24_7validators_variable_optional/rougail/00-base.yml'], 'type': 'integer'}) +option_3 = IntOption(name="int", doc="a first integer", validators=[Calculation(func['valid_with_jinja'], Params((), kwargs={'__internal_jinja': ParamValue("validators_rougail.general.int"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['../rougail-tests/structures/24_7validators_variable_optional/rougail/00-base.yml']), '__internal_attribute': ParamValue("validators"), '__internal_variable': ParamValue("rougail.general.int"), 'int2': ParamOption(option_4), '_.int': ParamSelfOption(whole=False)})), Calculation(func['valid_with_jinja'], Params((), kwargs={'__internal_jinja': ParamValue("validators_rougail.general.int_0"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['../rougail-tests/structures/24_7validators_variable_optional/rougail/00-base.yml']), '__internal_attribute': ParamValue("validators"), '__internal_variable': ParamValue("rougail.general.int"), '_.int': ParamSelfOption(whole=False)}))], properties=frozenset({"basic", "mandatory"}), informations={'ymlfiles': ['../rougail-tests/structures/24_7validators_variable_optional/rougail/00-base.yml'], 'type': 'integer', 'test': (5,)}) optiondescription_2 = OptionDescription(name="general", doc="a family", children=[option_3, option_4], properties=frozenset({"basic"}), informations={'ymlfiles': ['../rougail-tests/structures/24_7validators_variable_optional/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_7validators_variable_optional/tiramisu/no_namespace.py b/tests/dictionaries/24_7validators_variable_optional/tiramisu/no_namespace.py index dae6e2639..fc01c34ac 100644 --- a/tests/dictionaries/24_7validators_variable_optional/tiramisu/no_namespace.py +++ b/tests/dictionaries/24_7validators_variable_optional/tiramisu/no_namespace.py @@ -8,7 +8,7 @@ ALLOWED_LEADER_PROPERTIES.add("standard") ALLOWED_LEADER_PROPERTIES.add("advanced") dict_env['validators_general.int'] = "{% if _.int == int2 %}\nint and int2 must be different\n{% endif %}\n" dict_env['validators_general.int_0'] = "{% if int3 is defined and _.int == int3 %}\nint and int3 must be different\n{% endif %}\n" -option_3 = IntOption(name="int2", doc="a second number", default=1, properties=frozenset({"mandatory", "standard"}), informations={'ymlfiles': ['../rougail-tests/structures/24_7validators_variable_optional/rougail/00-base.yml'], 'type': 'number'}) -option_2 = IntOption(name="int", doc="a first number", validators=[Calculation(func['valid_with_jinja'], Params((), kwargs={'__internal_jinja': ParamValue("validators_general.int"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['../rougail-tests/structures/24_7validators_variable_optional/rougail/00-base.yml']), '__internal_attribute': ParamValue("validators"), '__internal_variable': ParamValue("general.int"), 'int2': ParamOption(option_3), '_.int': ParamSelfOption(whole=False)})), Calculation(func['valid_with_jinja'], Params((), kwargs={'__internal_jinja': ParamValue("validators_general.int_0"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['../rougail-tests/structures/24_7validators_variable_optional/rougail/00-base.yml']), '__internal_attribute': ParamValue("validators"), '__internal_variable': ParamValue("general.int"), '_.int': ParamSelfOption(whole=False)}))], properties=frozenset({"basic", "mandatory"}), informations={'ymlfiles': ['../rougail-tests/structures/24_7validators_variable_optional/rougail/00-base.yml'], 'type': 'number', 'test': (5,)}) +option_3 = IntOption(name="int2", doc="a second integer", default=1, properties=frozenset({"mandatory", "standard"}), informations={'ymlfiles': ['../rougail-tests/structures/24_7validators_variable_optional/rougail/00-base.yml'], 'type': 'integer'}) +option_2 = IntOption(name="int", doc="a first integer", validators=[Calculation(func['valid_with_jinja'], Params((), kwargs={'__internal_jinja': ParamValue("validators_general.int"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['../rougail-tests/structures/24_7validators_variable_optional/rougail/00-base.yml']), '__internal_attribute': ParamValue("validators"), '__internal_variable': ParamValue("general.int"), 'int2': ParamOption(option_3), '_.int': ParamSelfOption(whole=False)})), Calculation(func['valid_with_jinja'], Params((), kwargs={'__internal_jinja': ParamValue("validators_general.int_0"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['../rougail-tests/structures/24_7validators_variable_optional/rougail/00-base.yml']), '__internal_attribute': ParamValue("validators"), '__internal_variable': ParamValue("general.int"), '_.int': ParamSelfOption(whole=False)}))], properties=frozenset({"basic", "mandatory"}), informations={'ymlfiles': ['../rougail-tests/structures/24_7validators_variable_optional/rougail/00-base.yml'], 'type': 'integer', 'test': (5,)}) optiondescription_1 = OptionDescription(name="general", doc="a family", children=[option_2, option_3], properties=frozenset({"basic"}), informations={'ymlfiles': ['../rougail-tests/structures/24_7validators_variable_optional/rougail/00-base.yml']}) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_1]) diff --git a/tests/dictionaries/40_2leadership_calculation_index/tiramisu/base.py b/tests/dictionaries/40_2leadership_calculation_index/tiramisu/base.py index 5b73667c4..5fee39a8f 100644 --- a/tests/dictionaries/40_2leadership_calculation_index/tiramisu/base.py +++ b/tests/dictionaries/40_2leadership_calculation_index/tiramisu/base.py @@ -11,7 +11,7 @@ ALLOWED_LEADER_PROPERTIES.add("basic") ALLOWED_LEADER_PROPERTIES.add("standard") ALLOWED_LEADER_PROPERTIES.add("advanced") option_3 = StrOption(name="leader", doc="a leader", multi=True, default=["a", "b", "c"], properties=frozenset({"mandatory", "standard"}), informations={'ymlfiles': ['../rougail-tests/structures/40_2leadership_calculation_index/rougail/00-base.yml'], 'type': 'string'}) -option_4 = IntOption(name="follower1", doc="a follower", multi=True, default=Calculation(func['calc_value'], Params((ParamIndex()))), properties=frozenset({"mandatory", "standard"}), informations={'ymlfiles': ['../rougail-tests/structures/40_2leadership_calculation_index/rougail/00-base.yml'], 'type': 'number'}) +option_4 = IntOption(name="follower1", doc="a follower", multi=True, default=Calculation(func['calc_value'], Params((ParamIndex()))), properties=frozenset({"mandatory", "standard"}), informations={'ymlfiles': ['../rougail-tests/structures/40_2leadership_calculation_index/rougail/00-base.yml'], 'type': 'integer'}) optiondescription_2 = Leadership(name="leader", doc="a leadership", children=[option_3, option_4], properties=frozenset({"standard"}), informations={'ymlfiles': ['../rougail-tests/structures/40_2leadership_calculation_index/rougail/00-base.yml']}) optiondescription_1 = OptionDescription(name="rougail", doc="Rougail", group_type=groups.namespace, children=[optiondescription_2], properties=frozenset({"standard"}), informations={'ymlfiles': ['']}) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_1]) diff --git a/tests/dictionaries/40_2leadership_calculation_param_index/tiramisu/base.py b/tests/dictionaries/40_2leadership_calculation_param_index/tiramisu/base.py index bd94ff7d4..eb0337186 100644 --- a/tests/dictionaries/40_2leadership_calculation_param_index/tiramisu/base.py +++ b/tests/dictionaries/40_2leadership_calculation_param_index/tiramisu/base.py @@ -12,7 +12,7 @@ ALLOWED_LEADER_PROPERTIES.add("standard") ALLOWED_LEADER_PROPERTIES.add("advanced") dict_env['default_rougail.leader.follower1'] = "{{ index }}" option_3 = StrOption(name="leader", doc="a leader", multi=True, default=["a", "b", "c"], properties=frozenset({"mandatory", "standard"}), informations={'ymlfiles': ['../rougail-tests/structures/40_2leadership_calculation_param_index/rougail/00-base.yml'], 'type': 'string'}) -option_4 = IntOption(name="follower1", doc="a follower", multi=True, default=Calculation(func['jinja_to_function'], Params((), kwargs={'__internal_jinja': ParamValue("default_rougail.leader.follower1"), '__internal_type': ParamValue("number"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['../rougail-tests/structures/40_2leadership_calculation_param_index/rougail/00-base.yml']), '__internal_attribute': ParamValue("default"), '__internal_variable': ParamValue("rougail.leader.follower1"), 'index': ParamIndex()})), properties=frozenset({"mandatory", "standard"}), informations={'ymlfiles': ['../rougail-tests/structures/40_2leadership_calculation_param_index/rougail/00-base.yml'], 'type': 'number'}) +option_4 = IntOption(name="follower1", doc="a follower", multi=True, default=Calculation(func['jinja_to_function'], Params((), kwargs={'__internal_jinja': ParamValue("default_rougail.leader.follower1"), '__internal_type': ParamValue("integer"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['../rougail-tests/structures/40_2leadership_calculation_param_index/rougail/00-base.yml']), '__internal_attribute': ParamValue("default"), '__internal_variable': ParamValue("rougail.leader.follower1"), 'index': ParamIndex()})), properties=frozenset({"mandatory", "standard"}), informations={'ymlfiles': ['../rougail-tests/structures/40_2leadership_calculation_param_index/rougail/00-base.yml'], 'type': 'integer'}) optiondescription_2 = Leadership(name="leader", doc="leadership", children=[option_3, option_4], properties=frozenset({"standard"}), informations={'ymlfiles': ['../rougail-tests/structures/40_2leadership_calculation_param_index/rougail/00-base.yml']}) optiondescription_1 = OptionDescription(name="rougail", doc="Rougail", group_type=groups.namespace, children=[optiondescription_2], properties=frozenset({"standard"}), informations={'ymlfiles': ['']}) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_1]) diff --git a/tests/dictionaries/40_8calculation_integer/tiramisu/base.py b/tests/dictionaries/40_8calculation_integer/tiramisu/base.py index c0a3a5525..c002dc8de 100644 --- a/tests/dictionaries/40_8calculation_integer/tiramisu/base.py +++ b/tests/dictionaries/40_8calculation_integer/tiramisu/base.py @@ -13,7 +13,7 @@ ALLOWED_LEADER_PROPERTIES.add("advanced") dict_env['default_rougail.int1'] = "{% if rougail.bool %}1{% else %}2{% endif %}\n" dict_env['default_rougail.int2'] = "{% if not rougail.bool %}3{% else %}4{% endif %}\n" option_2 = BoolOption(name="bool", doc="a boolean variable", default=False, properties=frozenset({"mandatory", "standard"}), informations={'ymlfiles': ['../rougail-tests/structures/40_8calculation_integer/rougail/00-base.yml'], 'type': 'boolean'}) -option_3 = IntOption(name="int1", doc="first integer variable", default=Calculation(func['jinja_to_function'], Params((), kwargs={'__internal_jinja': ParamValue("default_rougail.int1"), '__internal_type': ParamValue("number"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['../rougail-tests/structures/40_8calculation_integer/rougail/00-base.yml']), '__internal_attribute': ParamValue("default"), '__internal_variable': ParamValue("rougail.int1"), 'rougail.bool': ParamOption(option_2, notraisepropertyerror=True)})), properties=frozenset({"mandatory", "standard"}), informations={'ymlfiles': ['../rougail-tests/structures/40_8calculation_integer/rougail/00-base.yml'], 'type': 'number'}) -option_4 = IntOption(name="int2", doc="second integer variable", default=Calculation(func['jinja_to_function'], Params((), kwargs={'__internal_jinja': ParamValue("default_rougail.int2"), '__internal_type': ParamValue("number"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['../rougail-tests/structures/40_8calculation_integer/rougail/00-base.yml']), '__internal_attribute': ParamValue("default"), '__internal_variable': ParamValue("rougail.int2"), 'rougail.bool': ParamOption(option_2, notraisepropertyerror=True)})), properties=frozenset({"mandatory", "standard"}), informations={'ymlfiles': ['../rougail-tests/structures/40_8calculation_integer/rougail/00-base.yml'], 'type': 'number'}) +option_3 = IntOption(name="int1", doc="first integer variable", default=Calculation(func['jinja_to_function'], Params((), kwargs={'__internal_jinja': ParamValue("default_rougail.int1"), '__internal_type': ParamValue("integer"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['../rougail-tests/structures/40_8calculation_integer/rougail/00-base.yml']), '__internal_attribute': ParamValue("default"), '__internal_variable': ParamValue("rougail.int1"), 'rougail.bool': ParamOption(option_2, notraisepropertyerror=True)})), properties=frozenset({"mandatory", "standard"}), informations={'ymlfiles': ['../rougail-tests/structures/40_8calculation_integer/rougail/00-base.yml'], 'type': 'integer'}) +option_4 = IntOption(name="int2", doc="second integer variable", default=Calculation(func['jinja_to_function'], Params((), kwargs={'__internal_jinja': ParamValue("default_rougail.int2"), '__internal_type': ParamValue("integer"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['../rougail-tests/structures/40_8calculation_integer/rougail/00-base.yml']), '__internal_attribute': ParamValue("default"), '__internal_variable': ParamValue("rougail.int2"), 'rougail.bool': ParamOption(option_2, notraisepropertyerror=True)})), properties=frozenset({"mandatory", "standard"}), informations={'ymlfiles': ['../rougail-tests/structures/40_8calculation_integer/rougail/00-base.yml'], 'type': 'integer'}) optiondescription_1 = OptionDescription(name="rougail", doc="Rougail", group_type=groups.namespace, children=[option_2, option_3, option_4], properties=frozenset({"standard"}), informations={'ymlfiles': ['']}) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_1]) diff --git a/tests/dictionaries/60_0family_dynamic_jinja_number_empty/__init__.py b/tests/dictionaries/60_0family_dynamic_jinja_integer_empty/__init__.py similarity index 100% rename from tests/dictionaries/60_0family_dynamic_jinja_number_empty/__init__.py rename to tests/dictionaries/60_0family_dynamic_jinja_integer_empty/__init__.py diff --git a/tests/dictionaries/60_0family_dynamic_jinja_number_empty/makedict/after.json b/tests/dictionaries/60_0family_dynamic_jinja_integer_empty/makedict/after.json similarity index 100% rename from tests/dictionaries/60_0family_dynamic_jinja_number_empty/makedict/after.json rename to tests/dictionaries/60_0family_dynamic_jinja_integer_empty/makedict/after.json diff --git a/tests/dictionaries/60_0family_dynamic_jinja_number_empty/makedict/base.json b/tests/dictionaries/60_0family_dynamic_jinja_integer_empty/makedict/base.json similarity index 100% rename from tests/dictionaries/60_0family_dynamic_jinja_number_empty/makedict/base.json rename to tests/dictionaries/60_0family_dynamic_jinja_integer_empty/makedict/base.json diff --git a/tests/dictionaries/60_0family_dynamic_jinja_number_empty/makedict/before.json b/tests/dictionaries/60_0family_dynamic_jinja_integer_empty/makedict/before.json similarity index 100% rename from tests/dictionaries/60_0family_dynamic_jinja_number_empty/makedict/before.json rename to tests/dictionaries/60_0family_dynamic_jinja_integer_empty/makedict/before.json diff --git a/tests/dictionaries/60_0family_dynamic_jinja_number_empty/makedict/mandatory.json b/tests/dictionaries/60_0family_dynamic_jinja_integer_empty/makedict/mandatory.json similarity index 100% rename from tests/dictionaries/60_0family_dynamic_jinja_number_empty/makedict/mandatory.json rename to tests/dictionaries/60_0family_dynamic_jinja_integer_empty/makedict/mandatory.json diff --git a/tests/dictionaries/60_0family_dynamic_jinja_number_empty/makedict/read_write.json b/tests/dictionaries/60_0family_dynamic_jinja_integer_empty/makedict/read_write.json similarity index 100% rename from tests/dictionaries/60_0family_dynamic_jinja_number_empty/makedict/read_write.json rename to tests/dictionaries/60_0family_dynamic_jinja_integer_empty/makedict/read_write.json diff --git a/tests/dictionaries/60_0family_dynamic_jinja_number_empty/tiramisu/base.py b/tests/dictionaries/60_0family_dynamic_jinja_integer_empty/tiramisu/base.py similarity index 71% rename from tests/dictionaries/60_0family_dynamic_jinja_number_empty/tiramisu/base.py rename to tests/dictionaries/60_0family_dynamic_jinja_integer_empty/tiramisu/base.py index b6414867e..49f4e4610 100644 --- a/tests/dictionaries/60_0family_dynamic_jinja_number_empty/tiramisu/base.py +++ b/tests/dictionaries/60_0family_dynamic_jinja_integer_empty/tiramisu/base.py @@ -11,9 +11,9 @@ ALLOWED_LEADER_PROPERTIES.add("basic") ALLOWED_LEADER_PROPERTIES.add("standard") ALLOWED_LEADER_PROPERTIES.add("advanced") dict_env['default_rougail.var2'] = "{% if rougail.dyn1 is defined %}\n{{ rougail.dyn1.var }}\n{% endif %}\n" -option_2 = IntOption(name="var", doc="a suffix variable", multi=True, properties=frozenset({"standard"}), informations={'ymlfiles': ['../rougail-tests/structures/60_0family_dynamic_jinja_number_empty/rougail/00-base.yml'], 'type': 'number', 'test': (1, 2)}) -option_4 = StrOption(name="var", doc="a variable inside dynamic family", default="val", properties=frozenset({"mandatory", "standard"}), informations={'ymlfiles': ['../rougail-tests/structures/60_0family_dynamic_jinja_number_empty/rougail/00-base.yml'], 'type': 'string'}) -optiondescription_3 = ConvertDynOptionDescription(name="dyn{{ identifier }}", doc="a dynamic family", identifiers=Calculation(func['calc_value'], Params((ParamOption(option_2)))), children=[option_4], properties=frozenset({"standard"}), informations={'dynamic_variable': 'rougail.var', 'ymlfiles': ['../rougail-tests/structures/60_0family_dynamic_jinja_number_empty/rougail/00-base.yml']}) -option_5 = StrOption(name="var2", doc="a variable", default=Calculation(func['jinja_to_function'], Params((), kwargs={'__internal_jinja': ParamValue("default_rougail.var2"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['../rougail-tests/structures/60_0family_dynamic_jinja_number_empty/rougail/00-base.yml']), '__internal_attribute': ParamValue("default"), '__internal_variable': ParamValue("rougail.var2"), 'rougail.dyn1.var': ParamDynOption(option_4, ["1"], optional=True, notraisepropertyerror=True)})), properties=frozenset({"mandatory", "standard"}), informations={'ymlfiles': ['../rougail-tests/structures/60_0family_dynamic_jinja_number_empty/rougail/00-base.yml'], 'type': 'string'}) +option_2 = IntOption(name="var", doc="a suffix variable", multi=True, properties=frozenset({"standard"}), informations={'ymlfiles': ['../rougail-tests/structures/60_0family_dynamic_jinja_integer_empty/rougail/00-base.yml'], 'type': 'integer', 'test': (1, 2)}) +option_4 = StrOption(name="var", doc="a variable inside dynamic family", default="val", properties=frozenset({"mandatory", "standard"}), informations={'ymlfiles': ['../rougail-tests/structures/60_0family_dynamic_jinja_integer_empty/rougail/00-base.yml'], 'type': 'string'}) +optiondescription_3 = ConvertDynOptionDescription(name="dyn{{ identifier }}", doc="a dynamic family", identifiers=Calculation(func['calc_value'], Params((ParamOption(option_2)))), children=[option_4], properties=frozenset({"standard"}), informations={'dynamic_variable': 'rougail.var', 'ymlfiles': ['../rougail-tests/structures/60_0family_dynamic_jinja_integer_empty/rougail/00-base.yml']}) +option_5 = StrOption(name="var2", doc="a variable", default=Calculation(func['jinja_to_function'], Params((), kwargs={'__internal_jinja': ParamValue("default_rougail.var2"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['../rougail-tests/structures/60_0family_dynamic_jinja_integer_empty/rougail/00-base.yml']), '__internal_attribute': ParamValue("default"), '__internal_variable': ParamValue("rougail.var2"), 'rougail.dyn1.var': ParamDynOption(option_4, ["1"], optional=True, notraisepropertyerror=True)})), properties=frozenset({"mandatory", "standard"}), informations={'ymlfiles': ['../rougail-tests/structures/60_0family_dynamic_jinja_integer_empty/rougail/00-base.yml'], 'type': 'string'}) optiondescription_1 = OptionDescription(name="rougail", doc="Rougail", group_type=groups.namespace, children=[option_2, optiondescription_3, option_5], properties=frozenset({"standard"}), informations={'ymlfiles': ['']}) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_1]) diff --git a/tests/dictionaries/60_0family_dynamic_jinja_number/tiramisu/base.py b/tests/dictionaries/60_0family_dynamic_jinja_number/tiramisu/base.py index f415048a9..57edeb378 100644 --- a/tests/dictionaries/60_0family_dynamic_jinja_number/tiramisu/base.py +++ b/tests/dictionaries/60_0family_dynamic_jinja_number/tiramisu/base.py @@ -11,7 +11,7 @@ ALLOWED_LEADER_PROPERTIES.add("basic") ALLOWED_LEADER_PROPERTIES.add("standard") ALLOWED_LEADER_PROPERTIES.add("advanced") dict_env['default_rougail.var2'] = "{{ rougail.dyn1.var }}\n" -option_2 = IntOption(name="var", doc="a suffix variable", multi=True, default=[1, 2], default_multi=1, properties=frozenset({"mandatory", "standard"}), informations={'ymlfiles': ['../rougail-tests/structures/60_0family_dynamic_jinja_number/rougail/00-base.yml'], 'type': 'number'}) +option_2 = IntOption(name="var", doc="a suffix variable", multi=True, default=[1, 2], default_multi=1, properties=frozenset({"mandatory", "standard"}), informations={'ymlfiles': ['../rougail-tests/structures/60_0family_dynamic_jinja_number/rougail/00-base.yml'], 'type': 'integer'}) option_4 = StrOption(name="var", doc="a variable inside dynamic family", default="val", properties=frozenset({"mandatory", "standard"}), informations={'ymlfiles': ['../rougail-tests/structures/60_0family_dynamic_jinja_number/rougail/00-base.yml'], 'type': 'string'}) optiondescription_3 = ConvertDynOptionDescription(name="dyn{{ identifier }}", doc="a dynamic family", identifiers=Calculation(func['calc_value'], Params((ParamOption(option_2)))), children=[option_4], properties=frozenset({"standard"}), informations={'dynamic_variable': 'rougail.var', 'ymlfiles': ['../rougail-tests/structures/60_0family_dynamic_jinja_number/rougail/00-base.yml']}) option_5 = StrOption(name="var2", doc="a variable", default=Calculation(func['jinja_to_function'], Params((), kwargs={'__internal_jinja': ParamValue("default_rougail.var2"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['../rougail-tests/structures/60_0family_dynamic_jinja_number/rougail/00-base.yml']), '__internal_attribute': ParamValue("default"), '__internal_variable': ParamValue("rougail.var2"), 'rougail.dyn1.var': ParamDynOption(option_4, ["1"], optional=True, notraisepropertyerror=True)})), properties=frozenset({"mandatory", "standard"}), informations={'ymlfiles': ['../rougail-tests/structures/60_0family_dynamic_jinja_number/rougail/00-base.yml'], 'type': 'string'})