From 7fcf5d6fc9b27b1cac75cc1bbfe5368d8f35be50 Mon Sep 17 00:00:00 2001 From: Emmanuel Garette Date: Mon, 5 Aug 2024 18:09:13 +0200 Subject: [PATCH 01/12] user_data is not mandatory if empty --- src/rougail/config.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/rougail/config.py b/src/rougail/config.py index b68629e3e..1ae5e9304 100644 --- a/src/rougail/config.py +++ b/src/rougail/config.py @@ -324,6 +324,8 @@ suffix: {NAME}: description: Select for {NAME} hidden: true + mandatory: false + multi: true """.format(NAME=normalize_family(process), ) rougail_options += rougail_process From 6eafc16adb59d5ae62424b06c7303747056e3f7a Mon Sep 17 00:00:00 2001 From: gwen Date: Sat, 6 Jul 2024 14:49:54 +0200 Subject: [PATCH 02/12] add optional param in the schema ref #22 --- src/rougail/error.py | 12 + src/rougail/object_model.py | 224 ++++++++++++------ src/rougail/tiramisureflector.py | 120 ++++++---- .../dictionaries/rougail/00-base.yml | 4 +- .../tiramisu/no_namespace.py | 11 + .../__init__.py} | 0 .../dictionaries/rougail/00-base.yml | 13 + .../makedict/after.json | 12 + .../makedict/base.json | 6 + .../makedict/before.json | 12 + .../makedict/mandatory.json | 1 + .../tiramisu/base.py | 11 + .../tiramisu/multi.py | 16 ++ .../tiramisu/no_namespace.py | 10 + .../__init__.py | 0 .../dictionaries/rougail/00-base.yml | 13 + .../makedict/after.json | 12 + .../makedict/base.json | 6 + .../makedict/before.json | 12 + .../makedict/mandatory.json | 1 + .../tiramisu/base.py | 11 + .../tiramisu/multi.py | 16 ++ .../tiramisu/no_namespace.py | 10 + .../__init__.py | 0 .../dictionaries/rougail/00-base.yml | 8 + .../makedict/after.json | 6 + .../makedict/base.json | 3 + .../makedict/before.json | 6 + .../makedict/mandatory.json | 1 + .../tiramisu/base.py | 10 + .../tiramisu/multi.py | 14 ++ .../tiramisu/no_namespace.py | 9 + .../__init__.py | 0 .../dictionaries/rougail/00-base.yml | 13 + .../makedict/after.json | 16 ++ .../makedict/base.json | 10 + .../makedict/before.json | 16 ++ .../makedict/mandatory.json | 1 + .../tiramisu/base.py | 11 + .../tiramisu/multi.py | 16 ++ .../tiramisu/no_namespace.py | 10 + .../makedict/after.json | 17 ++ .../makedict/base.json | 8 + .../makedict/before.json | 17 ++ .../makedict/mandatory.json | 1 + .../80choice_variable_optional/__init__.py | 0 .../dictionaries/rougail/00-base.yml | 11 + .../80choice_variable_optional/errno_33 | 0 .../80family_dynamic_optional/__init__.py | 0 .../dictionaries/rougail/00-base.yml | 13 + .../80family_dynamic_optional/errno_33 | 0 .../dictionaries/rougail/00-base.yml | 39 ++- 52 files changed, 636 insertions(+), 153 deletions(-) create mode 100644 tests/dictionaries/00_9choice_variables/tiramisu/no_namespace.py rename tests/dictionaries/{00_9choice_variables/force_namespace => 00_9default_calculation_multi_optional/__init__.py} (100%) create mode 100644 tests/dictionaries/00_9default_calculation_multi_optional/dictionaries/rougail/00-base.yml create mode 100644 tests/dictionaries/00_9default_calculation_multi_optional/makedict/after.json create mode 100644 tests/dictionaries/00_9default_calculation_multi_optional/makedict/base.json create mode 100644 tests/dictionaries/00_9default_calculation_multi_optional/makedict/before.json create mode 100644 tests/dictionaries/00_9default_calculation_multi_optional/makedict/mandatory.json create mode 100644 tests/dictionaries/00_9default_calculation_multi_optional/tiramisu/base.py create mode 100644 tests/dictionaries/00_9default_calculation_multi_optional/tiramisu/multi.py create mode 100644 tests/dictionaries/00_9default_calculation_multi_optional/tiramisu/no_namespace.py create mode 100644 tests/dictionaries/00_9default_calculation_multi_optional2/__init__.py create mode 100644 tests/dictionaries/00_9default_calculation_multi_optional2/dictionaries/rougail/00-base.yml create mode 100644 tests/dictionaries/00_9default_calculation_multi_optional2/makedict/after.json create mode 100644 tests/dictionaries/00_9default_calculation_multi_optional2/makedict/base.json create mode 100644 tests/dictionaries/00_9default_calculation_multi_optional2/makedict/before.json create mode 100644 tests/dictionaries/00_9default_calculation_multi_optional2/makedict/mandatory.json create mode 100644 tests/dictionaries/00_9default_calculation_multi_optional2/tiramisu/base.py create mode 100644 tests/dictionaries/00_9default_calculation_multi_optional2/tiramisu/multi.py create mode 100644 tests/dictionaries/00_9default_calculation_multi_optional2/tiramisu/no_namespace.py create mode 100644 tests/dictionaries/00_9default_calculation_optional/__init__.py create mode 100644 tests/dictionaries/00_9default_calculation_optional/dictionaries/rougail/00-base.yml create mode 100644 tests/dictionaries/00_9default_calculation_optional/makedict/after.json create mode 100644 tests/dictionaries/00_9default_calculation_optional/makedict/base.json create mode 100644 tests/dictionaries/00_9default_calculation_optional/makedict/before.json create mode 100644 tests/dictionaries/00_9default_calculation_optional/makedict/mandatory.json create mode 100644 tests/dictionaries/00_9default_calculation_optional/tiramisu/base.py create mode 100644 tests/dictionaries/00_9default_calculation_optional/tiramisu/multi.py create mode 100644 tests/dictionaries/00_9default_calculation_optional/tiramisu/no_namespace.py create mode 100644 tests/dictionaries/00_9default_calculation_optional_exists/__init__.py create mode 100644 tests/dictionaries/00_9default_calculation_optional_exists/dictionaries/rougail/00-base.yml create mode 100644 tests/dictionaries/00_9default_calculation_optional_exists/makedict/after.json create mode 100644 tests/dictionaries/00_9default_calculation_optional_exists/makedict/base.json create mode 100644 tests/dictionaries/00_9default_calculation_optional_exists/makedict/before.json create mode 100644 tests/dictionaries/00_9default_calculation_optional_exists/makedict/mandatory.json create mode 100644 tests/dictionaries/00_9default_calculation_optional_exists/tiramisu/base.py create mode 100644 tests/dictionaries/00_9default_calculation_optional_exists/tiramisu/multi.py create mode 100644 tests/dictionaries/00_9default_calculation_optional_exists/tiramisu/no_namespace.py create mode 100644 tests/dictionaries/60_0family_dynamic_variable_suffix/makedict/after.json create mode 100644 tests/dictionaries/60_0family_dynamic_variable_suffix/makedict/base.json create mode 100644 tests/dictionaries/60_0family_dynamic_variable_suffix/makedict/before.json create mode 100644 tests/dictionaries/60_0family_dynamic_variable_suffix/makedict/mandatory.json create mode 100644 tests/dictionaries/80choice_variable_optional/__init__.py create mode 100644 tests/dictionaries/80choice_variable_optional/dictionaries/rougail/00-base.yml create mode 100644 tests/dictionaries/80choice_variable_optional/errno_33 create mode 100644 tests/dictionaries/80family_dynamic_optional/__init__.py create mode 100644 tests/dictionaries/80family_dynamic_optional/dictionaries/rougail/00-base.yml create mode 100644 tests/dictionaries/80family_dynamic_optional/errno_33 diff --git a/src/rougail/error.py b/src/rougail/error.py index aa2b27c0a..53f8b3f10 100644 --- a/src/rougail/error.py +++ b/src/rougail/error.py @@ -79,3 +79,15 @@ class UpgradeError(Exception): class NotFoundError(Exception): "not found error" pass + +## ---- specific exceptions ---- + +class VariableCalculationDependencyError(Exception): + """When an attribute is set, and + the target of this attribute doesn't exists. + """ + def __init__(self, msg, errno, xmlfiles): + if xmlfiles: + msg = _(f"{msg} in {display_xmlfiles(xmlfiles)}") + super().__init__(msg) + self.errno = errno diff --git a/src/rougail/object_model.py b/src/rougail/object_model.py index 03f429cbd..5c6ab31c1 100644 --- a/src/rougail/object_model.py +++ b/src/rougail/object_model.py @@ -31,7 +31,7 @@ from pydantic import ( ) from tiramisu import undefined from .utils import get_jinja_variable_to_param, get_realpath -from .error import DictConsistencyError +from .error import DictConsistencyError, VariableCalculationDependencyError BASETYPE = Union[StrictBool, StrictInt, StrictFloat, StrictStr, None] PROPERTY_ATTRIBUTE = ["frozen", "hidden", "disabled", "mandatory"] @@ -46,7 +46,7 @@ def convert_boolean(value: str) -> bool: return True elif value == "false": return False - elif value in ['', None]: + elif value in ["", None]: return None raise Exception(f'unknown boolean value "{value}"') @@ -61,34 +61,45 @@ CONVERT_OPTION = { "unix_filename": dict(opttype="FilenameOption", example="/tmp/myfile.txt"), "date": dict(opttype="DateOption", example="2000-01-01"), "unix_user": dict(opttype="UsernameOption", example="username"), - "ip": dict(opttype="IPOption", initkwargs={"allow_reserved": True}, example="1.1.1.1"), + "ip": dict( + opttype="IPOption", initkwargs={"allow_reserved": True}, example="1.1.1.1" + ), "cidr": dict(opttype="IPOption", initkwargs={"cidr": True}, example="1.1.1.0/24"), "netmask": dict(opttype="NetmaskOption", example="255.255.255.0"), "network": dict(opttype="NetworkOption", example="1.1.1.0"), - "network_cidr": dict(opttype="NetworkOption", initkwargs={"cidr": True}, example="1.1.1.0/24"), + "network_cidr": dict( + opttype="NetworkOption", initkwargs={"cidr": True}, example="1.1.1.0/24" + ), "broadcast": dict(opttype="BroadcastOption", example="1.1.1.255"), "netbios": dict( opttype="DomainnameOption", initkwargs={"type": "netbios", "warnings_only": True}, - example="example" + example="example", ), "domainname": dict( - opttype="DomainnameOption", initkwargs={"type": "domainname", "allow_ip": False}, - example="example.net" + opttype="DomainnameOption", + initkwargs={"type": "domainname", "allow_ip": False}, + example="example.net", ), "hostname": dict( - opttype="DomainnameOption", initkwargs={"type": "hostname", "allow_ip": False}, - example="example" + opttype="DomainnameOption", + initkwargs={"type": "hostname", "allow_ip": False}, + example="example", ), "web_address": dict( - opttype="URLOption", initkwargs={"allow_ip": False, "allow_without_dot": True}, - example="https://example.net" + opttype="URLOption", + initkwargs={"allow_ip": False, "allow_without_dot": True}, + example="https://example.net", + ), + "port": dict( + opttype="PortOption", initkwargs={"allow_private": True}, example="111" ), - "port": dict(opttype="PortOption", initkwargs={"allow_private": True}, example="111"), "mac": dict(opttype="MACOption", example="00:00:00:00:00"), "unix_permissions": dict( - opttype="PermissionsOption", initkwargs={"warnings_only": True}, func=int, - example="644" + opttype="PermissionsOption", + initkwargs={"warnings_only": True}, + func=int, + example="644", ), "choice": dict(opttype="ChoiceOption", example="a_choice"), # @@ -100,14 +111,15 @@ class Param(BaseModel): key: str model_config = ConfigDict(extra="forbid") - def __init__(self, - path, - attribute, - family_is_dynamic, - is_follower, - xmlfiles, - **kwargs, - ) -> None: + def __init__( + self, + path, + attribute, + family_is_dynamic, + is_follower, + xmlfiles, + **kwargs, + ) -> None: super().__init__(**kwargs) @@ -127,12 +139,13 @@ class SuffixParam(Param): type: str suffix: Optional[int] = None - def __init__(self, - **kwargs, - ) -> None: - if not kwargs['family_is_dynamic']: + def __init__( + self, + **kwargs, + ) -> None: + if not kwargs["family_is_dynamic"]: msg = f'suffix parameter for "{kwargs["attribute"]}" in "{kwargs["path"]}" cannot be set none dynamic family' - raise DictConsistencyError(msg, 10, kwargs['xmlfiles']) + raise DictConsistencyError(msg, 10, kwargs["xmlfiles"]) super().__init__(**kwargs) @@ -145,17 +158,17 @@ class InformationParam(Param): class IndexParam(Param): type: str - def __init__(self, - **kwargs, - ) -> None: + def __init__( + self, + **kwargs, + ) -> None: if not kwargs["is_follower"]: msg = f'the variable "{kwargs["path"]}" is not a follower, so cannot have index type for param in "{kwargs["attribute"]}"' - raise DictConsistencyError(msg, 25, kwargs['xmlfiles']) + raise DictConsistencyError(msg, 25, kwargs["xmlfiles"]) super().__init__(**kwargs) - PARAM_TYPES = { "any": AnyParam, "variable": VariableParam, @@ -170,8 +183,8 @@ class Calculation(BaseModel): path: str inside_list: bool version: str - ori_path: Optional[str]=None - default_values: Any=None + ori_path: Optional[str] = None + default_values: Any = None namespace: Optional[str] xmlfiles: List[str] @@ -195,7 +208,12 @@ class Calculation(BaseModel): else: path = self.ori_path variable, suffix = objectspace.paths.get_with_dynamic( - param["variable"], self.path_prefix, path, self.version, self.namespace, self.xmlfiles + param["variable"], + self.path_prefix, + path, + self.version, + self.namespace, + self.xmlfiles, ) if not variable: if not param.get("optional"): @@ -214,7 +232,12 @@ class Calculation(BaseModel): else: path = self.ori_path variable, suffix = objectspace.paths.get_with_dynamic( - param["variable"], self.path_prefix, path, self.version, self.namespace, self.xmlfiles + param["variable"], + self.path_prefix, + path, + self.version, + self.namespace, + self.xmlfiles, ) if not variable: msg = f'cannot find variable "{param["variable"]}" defined in "{self.attribute_name}" for "{self.path}"' @@ -231,7 +254,14 @@ class Calculation(BaseModel): class JinjaCalculation(Calculation): attribute_name: Literal[ - "frozen", "hidden", "mandatory", "disabled", "default", "validators", "choices", "dynamic" + "frozen", + "hidden", + "mandatory", + "disabled", + "default", + "validators", + "choices", + "dynamic", ] jinja: StrictStr params: Optional[List[Param]] = None @@ -264,7 +294,7 @@ class JinjaCalculation(Calculation): }, } if self.default_values: - default["params"]['__default_value'] = self.default_values + default["params"]["__default_value"] = self.default_values if add_help: default["help"] = function + "_help" if self.params: @@ -340,7 +370,7 @@ class JinjaCalculation(Calculation): False, objectspace, add_help=True, - params={None: [self.attribute_name], 'when': True, 'inverse': False}, + params={None: [self.attribute_name], "when": True, "inverse": False}, ) elif self.attribute_name == "choices": return_type = self.return_type @@ -362,31 +392,42 @@ class JinjaCalculation(Calculation): raise Exception("hu?") -class VariableCalculation(Calculation): - attribute_name: Literal[ - "default", "choices", "dynamic" - ] +class _VariableCalculation(Calculation): variable: StrictStr propertyerror: bool = True allow_none: bool = False - def get_params(self, - objectspace, - needs_multi: Optional[bool] = None, - ): + def get_variable(self, + objectspace, + ) -> "Variable": if self.ori_path is None: path = self.path else: path = self.ori_path variable, suffix = objectspace.paths.get_with_dynamic( - self.variable, self.path_prefix, path, self.version, self.namespace, self.xmlfiles + self.variable, + self.path_prefix, + path, + self.version, + self.namespace, + self.xmlfiles, ) + if variable and not isinstance(variable, objectspace.variable): + # FIXME remove the pfff + raise Exception("pfff it's a family") + return variable, suffix + + def get_params( + self, + objectspace, + variable: "Variable", + suffix: Optional[str], + *, + needs_multi: Optional[bool] = None, + ): if not variable: msg = f'Variable not found "{self.variable}" for attribut "{self.attribute_name}" for variable "{self.path}"' raise DictConsistencyError(msg, 88, self.xmlfiles) - if not isinstance(variable, objectspace.variable): - # FIXME remove the pfff - raise Exception("pfff it's a family") param = { "type": "variable", "variable": variable, @@ -396,7 +437,7 @@ class VariableCalculation(Calculation): param["suffix"] = suffix params = {None: [param]} if self.default_values: - params['__default_value'] = self.default_values + params["__default_value"] = self.default_values if self.allow_none: params["allow_none"] = True if needs_multi is None: @@ -406,11 +447,15 @@ class VariableCalculation(Calculation): needs_multi = self.path in objectspace.multis calc_variable_is_multi = variable.path in objectspace.multis if not calc_variable_is_multi: - if variable.path in objectspace.paths._dynamics and (suffix is None or suffix[-1] is None): + if variable.path in objectspace.paths._dynamics and ( + suffix is None or suffix[-1] is None + ): self_dyn_path = objectspace.paths._dynamics.get(self.path) if self_dyn_path is not None: var_dyn_path = objectspace.paths._dynamics[variable.path] - if self_dyn_path != var_dyn_path and not self_dyn_path.startswith(f'{var_dyn_path}.'): + if self_dyn_path != var_dyn_path and not self_dyn_path.startswith( + f"{var_dyn_path}." + ): calc_variable_is_multi = True else: calc_variable_is_multi = True @@ -430,18 +475,33 @@ class VariableCalculation(Calculation): raise DictConsistencyError(msg, 21, self.xmlfiles) return params + +class VariableCalculation(_VariableCalculation): + attribute_name: Literal["default", "choices", "dynamic"] + optional: bool = False + def to_function( self, objectspace, ) -> dict: - params = self.get_params(objectspace) + if self.attribute_name != "default" and self.optional is True: + msg = f'"{self.attribute_name}" variable shall not have an "optional" attribute for variable "{self.variable}"' + raise DictConsistencyError(msg, 33, self.xmlfiles) + variable, suffix = self.get_variable(objectspace) + if not variable and self.optional: + msg = f'the dependent variable was not found "{self.optional}" for attribute "{self.attribute_name}" in variable "{self.path}"' + raise VariableCalculationDependencyError(msg, 90, self.xmlfiles) + params = self.get_params(objectspace, + variable, + suffix, + ) return { "function": "calc_value", "params": params, } -class VariablePropertyCalculation(VariableCalculation): +class VariablePropertyCalculation(_VariableCalculation): attribute_name: Literal[*PROPERTY_ATTRIBUTE] when: Any = undefined when_not: Any = undefined @@ -450,10 +510,14 @@ class VariablePropertyCalculation(VariableCalculation): self, objectspace, ) -> dict: - params = self.get_params(objectspace, False) + variable, suffix = self.get_variable(objectspace) + params = self.get_params(objectspace, + variable, + suffix, + needs_multi=False,) variable = params[None][0]["variable"] if self.when is not undefined: - if self.version == '1.0': + if self.version == "1.0": msg = f'when is not allowed in format version 1.0 for attribute "{self.attribute_name}" for variable "{self.path}"' raise DictConsistencyError(msg, 103, variable.xmlfiles) if self.when_not is not undefined: @@ -462,7 +526,7 @@ class VariablePropertyCalculation(VariableCalculation): when = self.when inverse = False elif self.when_not is not undefined: - if self.version == '1.0': + if self.version == "1.0": msg = f'when_not is not allowed in format version 1.0 for attribute "{self.attribute_name}" for variable "{self.path}"' raise DictConsistencyError(msg, 104, variable.xmlfiles) when = self.when_not @@ -473,12 +537,13 @@ class VariablePropertyCalculation(VariableCalculation): when = True inverse = False params[None].insert(0, self.attribute_name) - params['when'] = when - params['inverse'] = inverse - return {"function": "variable_to_property", - "params": params, - "help": "variable_to_property", - } + params["when"] = when + params["inverse"] = inverse + return { + "function": "variable_to_property", + "params": params, + "help": "variable_to_property", + } class InformationCalculation(Calculation): @@ -490,10 +555,13 @@ class InformationCalculation(Calculation): self, objectspace, ) -> dict: - params = {None: [{ - "type": "information", - "information": self.information, - }] + params = { + None: [ + { + "type": "information", + "information": self.information, + } + ] } if self.variable: if self.ori_path is None: @@ -501,13 +569,18 @@ class InformationCalculation(Calculation): else: path = self.ori_path variable, suffix = objectspace.paths.get_with_dynamic( - self.variable, self.path_prefix, path, self.version, self.namespace, self.xmlfiles + self.variable, + self.path_prefix, + path, + self.version, + self.namespace, + self.xmlfiles, ) if variable is None or suffix is not None: raise Exception("pfff") params[None][0]["variable"] = variable if self.default_values: - params['__default_value'] = self.default_values + params["__default_value"] = self.default_values return { "function": "calc_value", "params": params, @@ -524,7 +597,7 @@ class SuffixCalculation(Calculation): ) -> dict: suffix = {"type": "suffix"} if self.suffix is not None: - suffix['suffix'] = self.suffix + suffix["suffix"] = self.suffix return { "function": "calc_value", "params": {None: [suffix]}, @@ -582,7 +655,7 @@ class Family(BaseModel): class Dynamic(Family): # None only for format 1.0 - variable: str=None + variable: str = None dynamic: Union[List[Union[StrictStr, Calculation]], Calculation] @@ -612,11 +685,6 @@ class Variable(BaseModel): model_config = ConfigDict(extra="forbid", arbitrary_types_allowed=True) -#class Choice(Variable): -# type: Literal["choice"] = "choice" -# choices: Union[List[BASETYPE_CALC], Calculation] - - class SymLink(BaseModel): type: Literal["symlink"] = "symlink" name: str diff --git a/src/rougail/tiramisureflector.py b/src/rougail/tiramisureflector.py index 445cd562c..c2d51bda9 100644 --- a/src/rougail/tiramisureflector.py +++ b/src/rougail/tiramisureflector.py @@ -33,7 +33,7 @@ from json import dumps from os.path import isfile, basename from .i18n import _ -from .error import DictConsistencyError +from .error import DictConsistencyError, VariableCalculationDependencyError from .utils import normalize_family from .object_model import Calculation, CONVERT_OPTION @@ -78,7 +78,9 @@ class TiramisuReflector: ) if self.objectspace.export_with_import: self.text["header"].extend( - ["from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription"] + [ + "from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription" + ] ) if funcs_paths: for funcs_path in sorted(funcs_paths, key=sorted_func_name): @@ -105,7 +107,7 @@ class TiramisuReflector: baseelt = BaseElt() self.objectspace.reflector_names[ baseelt.path - ] = f'option_0{self.objectspace.suffix}' + ] = f"option_0{self.objectspace.suffix}" basefamily = Family( baseelt, self, @@ -121,33 +123,33 @@ 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) + # 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( @@ -201,7 +203,9 @@ class Common: self.populate_attrib() if self.informations: for information in self.informations: - self.tiramisu.text['option'].append(f'{information}.set_option({self.option_name})') + self.tiramisu.text["option"].append( + f"{information}.set_option({self.option_name})" + ) return self.option_name def populate_attrib(self): @@ -275,7 +279,7 @@ class Common: informations = self.objectspace.informations.get(self.elt.path) if not informations: return - keys['informations'] = informations + keys["informations"] = informations def populate_param( self, @@ -299,14 +303,20 @@ class Common: if param["variable"].path == self.elt.path: return f'ParamSelfInformation("{param["information"]}", {default})' information_variable_path = param["variable"].path - information_variable = self.tiramisu.reflector_objects[information_variable_path] + information_variable = self.tiramisu.reflector_objects[ + information_variable_path + ] if information_variable_path not in self.calls: option_name = information_variable.get(self.calls, self.elt.path) return f'ParamInformation("{param["information"]}", {default}, option={option_name})' else: - information = f'ParamInformation("{param["information"]}", {default})' + information = ( + f'ParamInformation("{param["information"]}", {default})' + ) information_name = self.tiramisu.get_information_name() - self.tiramisu.text["option"].append(f'{information_name} = {information}') + self.tiramisu.text["option"].append( + f"{information_name} = {information}" + ) information_variable.informations.append(information_name) return information_name return f'ParamInformation("{param["information"]}", {default})' @@ -385,10 +395,11 @@ class Common: ret = ret + ")" return ret - def populate_calculation(self, - datas: Union[Calculation, str, list], - return_a_tuple: bool=False, - ) -> str: + def populate_calculation( + self, + datas: Union[Calculation, str, list], + return_a_tuple: bool = False, + ) -> str: if isinstance(datas, str): return self.convert_str(datas) if isinstance(datas, Calculation): @@ -398,15 +409,18 @@ class Common: params = [] for idx, data in enumerate(datas): if isinstance(data, Calculation): - params.append(self.calculation_value(data)) + try: + params.append(self.calculation_value(data)) + except VariableCalculationDependencyError: + pass elif isinstance(data, str): params.append(self.convert_str(data)) else: params.append(str(data)) if return_a_tuple: - ret = '(' + ret = "(" else: - ret = '[' + ret = "[" ret += ", ".join(params) if return_a_tuple: if len(params) <= 1: @@ -441,18 +455,28 @@ class Variable(Common): ) return if self.elt.type == "choice": - keys["values"] = self.populate_calculation(self.elt.choices, return_a_tuple=True) + keys["values"] = self.populate_calculation( + self.elt.choices, return_a_tuple=True + ) if self.elt.path in self.objectspace.multis: keys["multi"] = self.objectspace.multis[self.elt.path] - if not hasattr(self.elt, "default"): - print('FIXME CA EXISTE!!!') if hasattr(self.elt, "default") and self.elt.default is not None: - keys["default"] = self.populate_calculation(self.elt.default) + try: + keys["default"] = self.populate_calculation(self.elt.default) + except VariableCalculationDependencyError: + pass if self.elt.path in self.objectspace.default_multi: - keys["default_multi"] = self.populate_calculation(self.objectspace.default_multi[self.elt.path]) + try: + keys["default_multi"] = self.populate_calculation( + self.objectspace.default_multi[self.elt.path] + ) + except VariableCalculationDependencyError: + pass if self.elt.validators: keys["validators"] = self.populate_calculation(self.elt.validators) - for key, value in CONVERT_OPTION.get(self.elt.type, {}).get("initkwargs", {}).items(): + for key, value in ( + CONVERT_OPTION.get(self.elt.type, {}).get("initkwargs", {}).items() + ): if isinstance(value, str): value = self.convert_str(value) keys[key] = value diff --git a/tests/dictionaries/00_9choice_variables/dictionaries/rougail/00-base.yml b/tests/dictionaries/00_9choice_variables/dictionaries/rougail/00-base.yml index fee7f45f7..d72d8250a 100644 --- a/tests/dictionaries/00_9choice_variables/dictionaries/rougail/00-base.yml +++ b/tests/dictionaries/00_9choice_variables/dictionaries/rougail/00-base.yml @@ -7,7 +7,7 @@ my_variable: type: choice choices: - type: variable - variable: rougail.source_variable_1 + variable: _.source_variable_1 - type: variable - variable: rougail.source_variable_2 + variable: _.source_variable_2 default: val1 diff --git a/tests/dictionaries/00_9choice_variables/tiramisu/no_namespace.py b/tests/dictionaries/00_9choice_variables/tiramisu/no_namespace.py new file mode 100644 index 000000000..94943c699 --- /dev/null +++ b/tests/dictionaries/00_9choice_variables/tiramisu/no_namespace.py @@ -0,0 +1,11 @@ +from tiramisu import * +from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription +load_functions('tests/dictionaries/../eosfunc/test.py') +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("standard") +ALLOWED_LEADER_PROPERTIES.add("advanced") +option_1 = StrOption(name="source_variable_1", doc="the first source variable", default="val1", properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) +option_2 = StrOption(name="source_variable_2", doc="the second source variable", default="val2", properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) +option_3 = ChoiceOption(name="my_variable", doc="a variable", values=(Calculation(func['calc_value'], Params((ParamOption(option_1)))), Calculation(func['calc_value'], Params((ParamOption(option_2))))), default="val1", properties=frozenset({"mandatory", "standard"}), informations={'type': 'choice'}) +option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1, option_2, option_3]) diff --git a/tests/dictionaries/00_9choice_variables/force_namespace b/tests/dictionaries/00_9default_calculation_multi_optional/__init__.py similarity index 100% rename from tests/dictionaries/00_9choice_variables/force_namespace rename to tests/dictionaries/00_9default_calculation_multi_optional/__init__.py diff --git a/tests/dictionaries/00_9default_calculation_multi_optional/dictionaries/rougail/00-base.yml b/tests/dictionaries/00_9default_calculation_multi_optional/dictionaries/rougail/00-base.yml new file mode 100644 index 000000000..b7f77ba8c --- /dev/null +++ b/tests/dictionaries/00_9default_calculation_multi_optional/dictionaries/rougail/00-base.yml @@ -0,0 +1,13 @@ +--- +version: 1.1 +my_variable: + default: val1 +my_calculated_variable: + multi: true + default: + - type: variable + variable: _.my_variable + optional: true + - type: variable + variable: _.my_variable_unexists + optional: true diff --git a/tests/dictionaries/00_9default_calculation_multi_optional/makedict/after.json b/tests/dictionaries/00_9default_calculation_multi_optional/makedict/after.json new file mode 100644 index 000000000..032f832b4 --- /dev/null +++ b/tests/dictionaries/00_9default_calculation_multi_optional/makedict/after.json @@ -0,0 +1,12 @@ +{ + "rougail.my_variable": { + "owner": "default", + "value": "val1" + }, + "rougail.my_calculated_variable": { + "owner": "default", + "value": [ + "val1" + ] + } +} diff --git a/tests/dictionaries/00_9default_calculation_multi_optional/makedict/base.json b/tests/dictionaries/00_9default_calculation_multi_optional/makedict/base.json new file mode 100644 index 000000000..18351e962 --- /dev/null +++ b/tests/dictionaries/00_9default_calculation_multi_optional/makedict/base.json @@ -0,0 +1,6 @@ +{ + "rougail.my_variable": "val1", + "rougail.my_calculated_variable": [ + "val1" + ] +} diff --git a/tests/dictionaries/00_9default_calculation_multi_optional/makedict/before.json b/tests/dictionaries/00_9default_calculation_multi_optional/makedict/before.json new file mode 100644 index 000000000..032f832b4 --- /dev/null +++ b/tests/dictionaries/00_9default_calculation_multi_optional/makedict/before.json @@ -0,0 +1,12 @@ +{ + "rougail.my_variable": { + "owner": "default", + "value": "val1" + }, + "rougail.my_calculated_variable": { + "owner": "default", + "value": [ + "val1" + ] + } +} diff --git a/tests/dictionaries/00_9default_calculation_multi_optional/makedict/mandatory.json b/tests/dictionaries/00_9default_calculation_multi_optional/makedict/mandatory.json new file mode 100644 index 000000000..0637a088a --- /dev/null +++ b/tests/dictionaries/00_9default_calculation_multi_optional/makedict/mandatory.json @@ -0,0 +1 @@ +[] \ No newline at end of file diff --git a/tests/dictionaries/00_9default_calculation_multi_optional/tiramisu/base.py b/tests/dictionaries/00_9default_calculation_multi_optional/tiramisu/base.py new file mode 100644 index 000000000..04caf8637 --- /dev/null +++ b/tests/dictionaries/00_9default_calculation_multi_optional/tiramisu/base.py @@ -0,0 +1,11 @@ +from tiramisu import * +from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription +load_functions('tests/dictionaries/../eosfunc/test.py') +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("standard") +ALLOWED_LEADER_PROPERTIES.add("advanced") +option_2 = StrOption(name="my_variable", doc="my_variable", default="val1", properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) +option_3 = StrOption(name="my_calculated_variable", doc="my_calculated_variable", multi=True, default=[Calculation(func['calc_value'], Params((ParamOption(option_2))))], default_multi=Calculation(func['calc_value'], Params((ParamOption(option_2)))), properties=frozenset({"mandatory", "notempty", "standard"}), informations={'type': 'string'}) +optiondescription_1 = OptionDescription(name="rougail", doc="Rougail", children=[option_2, option_3], properties=frozenset({"standard"})) +option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_1]) diff --git a/tests/dictionaries/00_9default_calculation_multi_optional/tiramisu/multi.py b/tests/dictionaries/00_9default_calculation_multi_optional/tiramisu/multi.py new file mode 100644 index 000000000..646fdd657 --- /dev/null +++ b/tests/dictionaries/00_9default_calculation_multi_optional/tiramisu/multi.py @@ -0,0 +1,16 @@ +from tiramisu import * +from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription +load_functions('tests/dictionaries/../eosfunc/test.py') +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("standard") +ALLOWED_LEADER_PROPERTIES.add("advanced") +option_3 = StrOption(name="my_variable", doc="my_variable", default="val1", properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) +option_4 = StrOption(name="my_calculated_variable", doc="my_calculated_variable", multi=True, default=[Calculation(func['calc_value'], Params((ParamOption(option_3))))], default_multi=Calculation(func['calc_value'], Params((ParamOption(option_3)))), properties=frozenset({"mandatory", "notempty", "standard"}), informations={'type': 'string'}) +optiondescription_2 = OptionDescription(name="rougail", doc="Rougail", children=[option_3, option_4], properties=frozenset({"standard"})) +optiondescription_1 = OptionDescription(name="1", doc="1", children=[optiondescription_2], properties=frozenset({"standard"})) +option_7 = StrOption(name="my_variable", doc="my_variable", default="val1", properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) +option_8 = StrOption(name="my_calculated_variable", doc="my_calculated_variable", multi=True, default=[Calculation(func['calc_value'], Params((ParamOption(option_7))))], default_multi=Calculation(func['calc_value'], Params((ParamOption(option_7)))), properties=frozenset({"mandatory", "notempty", "standard"}), informations={'type': 'string'}) +optiondescription_6 = OptionDescription(name="rougail", doc="Rougail", children=[option_7, option_8], properties=frozenset({"standard"})) +optiondescription_5 = OptionDescription(name="2", doc="2", children=[optiondescription_6], properties=frozenset({"standard"})) +option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_1, optiondescription_5]) diff --git a/tests/dictionaries/00_9default_calculation_multi_optional/tiramisu/no_namespace.py b/tests/dictionaries/00_9default_calculation_multi_optional/tiramisu/no_namespace.py new file mode 100644 index 000000000..2796d5e6a --- /dev/null +++ b/tests/dictionaries/00_9default_calculation_multi_optional/tiramisu/no_namespace.py @@ -0,0 +1,10 @@ +from tiramisu import * +from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription +load_functions('tests/dictionaries/../eosfunc/test.py') +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("standard") +ALLOWED_LEADER_PROPERTIES.add("advanced") +option_1 = StrOption(name="my_variable", doc="my_variable", default="val1", properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) +option_2 = StrOption(name="my_calculated_variable", doc="my_calculated_variable", multi=True, default=[Calculation(func['calc_value'], Params((ParamOption(option_1))))], default_multi=Calculation(func['calc_value'], Params((ParamOption(option_1)))), properties=frozenset({"mandatory", "notempty", "standard"}), informations={'type': 'string'}) +option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1, option_2]) diff --git a/tests/dictionaries/00_9default_calculation_multi_optional2/__init__.py b/tests/dictionaries/00_9default_calculation_multi_optional2/__init__.py new file mode 100644 index 000000000..e69de29bb diff --git a/tests/dictionaries/00_9default_calculation_multi_optional2/dictionaries/rougail/00-base.yml b/tests/dictionaries/00_9default_calculation_multi_optional2/dictionaries/rougail/00-base.yml new file mode 100644 index 000000000..57a5ac530 --- /dev/null +++ b/tests/dictionaries/00_9default_calculation_multi_optional2/dictionaries/rougail/00-base.yml @@ -0,0 +1,13 @@ +--- +version: 1.1 +my_variable: + default: val1 +my_calculated_variable: + multi: true + default: + - type: variable + variable: _.my_variable_unexists + optional: true + - type: variable + variable: _.my_variable + optional: true diff --git a/tests/dictionaries/00_9default_calculation_multi_optional2/makedict/after.json b/tests/dictionaries/00_9default_calculation_multi_optional2/makedict/after.json new file mode 100644 index 000000000..032f832b4 --- /dev/null +++ b/tests/dictionaries/00_9default_calculation_multi_optional2/makedict/after.json @@ -0,0 +1,12 @@ +{ + "rougail.my_variable": { + "owner": "default", + "value": "val1" + }, + "rougail.my_calculated_variable": { + "owner": "default", + "value": [ + "val1" + ] + } +} diff --git a/tests/dictionaries/00_9default_calculation_multi_optional2/makedict/base.json b/tests/dictionaries/00_9default_calculation_multi_optional2/makedict/base.json new file mode 100644 index 000000000..18351e962 --- /dev/null +++ b/tests/dictionaries/00_9default_calculation_multi_optional2/makedict/base.json @@ -0,0 +1,6 @@ +{ + "rougail.my_variable": "val1", + "rougail.my_calculated_variable": [ + "val1" + ] +} diff --git a/tests/dictionaries/00_9default_calculation_multi_optional2/makedict/before.json b/tests/dictionaries/00_9default_calculation_multi_optional2/makedict/before.json new file mode 100644 index 000000000..032f832b4 --- /dev/null +++ b/tests/dictionaries/00_9default_calculation_multi_optional2/makedict/before.json @@ -0,0 +1,12 @@ +{ + "rougail.my_variable": { + "owner": "default", + "value": "val1" + }, + "rougail.my_calculated_variable": { + "owner": "default", + "value": [ + "val1" + ] + } +} diff --git a/tests/dictionaries/00_9default_calculation_multi_optional2/makedict/mandatory.json b/tests/dictionaries/00_9default_calculation_multi_optional2/makedict/mandatory.json new file mode 100644 index 000000000..0637a088a --- /dev/null +++ b/tests/dictionaries/00_9default_calculation_multi_optional2/makedict/mandatory.json @@ -0,0 +1 @@ +[] \ No newline at end of file diff --git a/tests/dictionaries/00_9default_calculation_multi_optional2/tiramisu/base.py b/tests/dictionaries/00_9default_calculation_multi_optional2/tiramisu/base.py new file mode 100644 index 000000000..cbe718bd1 --- /dev/null +++ b/tests/dictionaries/00_9default_calculation_multi_optional2/tiramisu/base.py @@ -0,0 +1,11 @@ +from tiramisu import * +from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription +load_functions('tests/dictionaries/../eosfunc/test.py') +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("standard") +ALLOWED_LEADER_PROPERTIES.add("advanced") +option_2 = StrOption(name="my_variable", doc="my_variable", default="val1", properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) +option_3 = StrOption(name="my_calculated_variable", doc="my_calculated_variable", multi=True, default=[Calculation(func['calc_value'], Params((ParamOption(option_2))))], properties=frozenset({"mandatory", "notempty", "standard"}), informations={'type': 'string'}) +optiondescription_1 = OptionDescription(name="rougail", doc="Rougail", children=[option_2, option_3], properties=frozenset({"standard"})) +option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_1]) diff --git a/tests/dictionaries/00_9default_calculation_multi_optional2/tiramisu/multi.py b/tests/dictionaries/00_9default_calculation_multi_optional2/tiramisu/multi.py new file mode 100644 index 000000000..085901031 --- /dev/null +++ b/tests/dictionaries/00_9default_calculation_multi_optional2/tiramisu/multi.py @@ -0,0 +1,16 @@ +from tiramisu import * +from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription +load_functions('tests/dictionaries/../eosfunc/test.py') +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("standard") +ALLOWED_LEADER_PROPERTIES.add("advanced") +option_3 = StrOption(name="my_variable", doc="my_variable", default="val1", properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) +option_4 = StrOption(name="my_calculated_variable", doc="my_calculated_variable", multi=True, default=[Calculation(func['calc_value'], Params((ParamOption(option_3))))], properties=frozenset({"mandatory", "notempty", "standard"}), informations={'type': 'string'}) +optiondescription_2 = OptionDescription(name="rougail", doc="Rougail", children=[option_3, option_4], properties=frozenset({"standard"})) +optiondescription_1 = OptionDescription(name="1", doc="1", children=[optiondescription_2], properties=frozenset({"standard"})) +option_7 = StrOption(name="my_variable", doc="my_variable", default="val1", properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) +option_8 = StrOption(name="my_calculated_variable", doc="my_calculated_variable", multi=True, default=[Calculation(func['calc_value'], Params((ParamOption(option_7))))], properties=frozenset({"mandatory", "notempty", "standard"}), informations={'type': 'string'}) +optiondescription_6 = OptionDescription(name="rougail", doc="Rougail", children=[option_7, option_8], properties=frozenset({"standard"})) +optiondescription_5 = OptionDescription(name="2", doc="2", children=[optiondescription_6], properties=frozenset({"standard"})) +option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_1, optiondescription_5]) diff --git a/tests/dictionaries/00_9default_calculation_multi_optional2/tiramisu/no_namespace.py b/tests/dictionaries/00_9default_calculation_multi_optional2/tiramisu/no_namespace.py new file mode 100644 index 000000000..2b6888d61 --- /dev/null +++ b/tests/dictionaries/00_9default_calculation_multi_optional2/tiramisu/no_namespace.py @@ -0,0 +1,10 @@ +from tiramisu import * +from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription +load_functions('tests/dictionaries/../eosfunc/test.py') +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("standard") +ALLOWED_LEADER_PROPERTIES.add("advanced") +option_1 = StrOption(name="my_variable", doc="my_variable", default="val1", properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) +option_2 = StrOption(name="my_calculated_variable", doc="my_calculated_variable", multi=True, default=[Calculation(func['calc_value'], Params((ParamOption(option_1))))], properties=frozenset({"mandatory", "notempty", "standard"}), informations={'type': 'string'}) +option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1, option_2]) diff --git a/tests/dictionaries/00_9default_calculation_optional/__init__.py b/tests/dictionaries/00_9default_calculation_optional/__init__.py new file mode 100644 index 000000000..e69de29bb diff --git a/tests/dictionaries/00_9default_calculation_optional/dictionaries/rougail/00-base.yml b/tests/dictionaries/00_9default_calculation_optional/dictionaries/rougail/00-base.yml new file mode 100644 index 000000000..7e8c316dc --- /dev/null +++ b/tests/dictionaries/00_9default_calculation_optional/dictionaries/rougail/00-base.yml @@ -0,0 +1,8 @@ +--- +version: 1.1 +my_calculated_variable: + multi: true + default: + type: variable + variable: _.my_variable + optional: true diff --git a/tests/dictionaries/00_9default_calculation_optional/makedict/after.json b/tests/dictionaries/00_9default_calculation_optional/makedict/after.json new file mode 100644 index 000000000..41dc6a1a6 --- /dev/null +++ b/tests/dictionaries/00_9default_calculation_optional/makedict/after.json @@ -0,0 +1,6 @@ +{ + "rougail.my_calculated_variable": { + "owner": "default", + "value": [] + } +} diff --git a/tests/dictionaries/00_9default_calculation_optional/makedict/base.json b/tests/dictionaries/00_9default_calculation_optional/makedict/base.json new file mode 100644 index 000000000..d981df165 --- /dev/null +++ b/tests/dictionaries/00_9default_calculation_optional/makedict/base.json @@ -0,0 +1,3 @@ +{ + "rougail.my_calculated_variable": [] +} diff --git a/tests/dictionaries/00_9default_calculation_optional/makedict/before.json b/tests/dictionaries/00_9default_calculation_optional/makedict/before.json new file mode 100644 index 000000000..41dc6a1a6 --- /dev/null +++ b/tests/dictionaries/00_9default_calculation_optional/makedict/before.json @@ -0,0 +1,6 @@ +{ + "rougail.my_calculated_variable": { + "owner": "default", + "value": [] + } +} diff --git a/tests/dictionaries/00_9default_calculation_optional/makedict/mandatory.json b/tests/dictionaries/00_9default_calculation_optional/makedict/mandatory.json new file mode 100644 index 000000000..c17d1a357 --- /dev/null +++ b/tests/dictionaries/00_9default_calculation_optional/makedict/mandatory.json @@ -0,0 +1 @@ +["rougail.my_calculated_variable"] \ No newline at end of file diff --git a/tests/dictionaries/00_9default_calculation_optional/tiramisu/base.py b/tests/dictionaries/00_9default_calculation_optional/tiramisu/base.py new file mode 100644 index 000000000..0d5bcd8b0 --- /dev/null +++ b/tests/dictionaries/00_9default_calculation_optional/tiramisu/base.py @@ -0,0 +1,10 @@ +from tiramisu import * +from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription +load_functions('tests/dictionaries/../eosfunc/test.py') +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("standard") +ALLOWED_LEADER_PROPERTIES.add("advanced") +option_2 = StrOption(name="my_calculated_variable", doc="my_calculated_variable", multi=True, properties=frozenset({"mandatory", "notempty", "standard"}), informations={'type': 'string'}) +optiondescription_1 = OptionDescription(name="rougail", doc="Rougail", children=[option_2], properties=frozenset({"standard"})) +option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_1]) diff --git a/tests/dictionaries/00_9default_calculation_optional/tiramisu/multi.py b/tests/dictionaries/00_9default_calculation_optional/tiramisu/multi.py new file mode 100644 index 000000000..79139942d --- /dev/null +++ b/tests/dictionaries/00_9default_calculation_optional/tiramisu/multi.py @@ -0,0 +1,14 @@ +from tiramisu import * +from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription +load_functions('tests/dictionaries/../eosfunc/test.py') +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("standard") +ALLOWED_LEADER_PROPERTIES.add("advanced") +option_3 = StrOption(name="my_calculated_variable", doc="my_calculated_variable", multi=True, properties=frozenset({"mandatory", "notempty", "standard"}), informations={'type': 'string'}) +optiondescription_2 = OptionDescription(name="rougail", doc="Rougail", children=[option_3], properties=frozenset({"standard"})) +optiondescription_1 = OptionDescription(name="1", doc="1", children=[optiondescription_2], properties=frozenset({"standard"})) +option_6 = StrOption(name="my_calculated_variable", doc="my_calculated_variable", multi=True, properties=frozenset({"mandatory", "notempty", "standard"}), informations={'type': 'string'}) +optiondescription_5 = OptionDescription(name="rougail", doc="Rougail", children=[option_6], properties=frozenset({"standard"})) +optiondescription_4 = OptionDescription(name="2", doc="2", children=[optiondescription_5], properties=frozenset({"standard"})) +option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_1, optiondescription_4]) diff --git a/tests/dictionaries/00_9default_calculation_optional/tiramisu/no_namespace.py b/tests/dictionaries/00_9default_calculation_optional/tiramisu/no_namespace.py new file mode 100644 index 000000000..b89359806 --- /dev/null +++ b/tests/dictionaries/00_9default_calculation_optional/tiramisu/no_namespace.py @@ -0,0 +1,9 @@ +from tiramisu import * +from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription +load_functions('tests/dictionaries/../eosfunc/test.py') +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("standard") +ALLOWED_LEADER_PROPERTIES.add("advanced") +option_1 = StrOption(name="my_calculated_variable", doc="my_calculated_variable", multi=True, properties=frozenset({"mandatory", "notempty", "standard"}), informations={'type': 'string'}) +option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1]) diff --git a/tests/dictionaries/00_9default_calculation_optional_exists/__init__.py b/tests/dictionaries/00_9default_calculation_optional_exists/__init__.py new file mode 100644 index 000000000..e69de29bb diff --git a/tests/dictionaries/00_9default_calculation_optional_exists/dictionaries/rougail/00-base.yml b/tests/dictionaries/00_9default_calculation_optional_exists/dictionaries/rougail/00-base.yml new file mode 100644 index 000000000..b002d90ce --- /dev/null +++ b/tests/dictionaries/00_9default_calculation_optional_exists/dictionaries/rougail/00-base.yml @@ -0,0 +1,13 @@ +--- +version: 1.1 +my_variable: + multi: true + default: + - val1 + - val2 +my_calculated_variable: + multi: true + default: + type: variable + variable: _.my_variable + optional: true diff --git a/tests/dictionaries/00_9default_calculation_optional_exists/makedict/after.json b/tests/dictionaries/00_9default_calculation_optional_exists/makedict/after.json new file mode 100644 index 000000000..0fa2df16d --- /dev/null +++ b/tests/dictionaries/00_9default_calculation_optional_exists/makedict/after.json @@ -0,0 +1,16 @@ +{ + "rougail.my_variable": { + "owner": "default", + "value": [ + "val1", + "val2" + ] + }, + "rougail.my_calculated_variable": { + "owner": "default", + "value": [ + "val1", + "val2" + ] + } +} diff --git a/tests/dictionaries/00_9default_calculation_optional_exists/makedict/base.json b/tests/dictionaries/00_9default_calculation_optional_exists/makedict/base.json new file mode 100644 index 000000000..3519cfe58 --- /dev/null +++ b/tests/dictionaries/00_9default_calculation_optional_exists/makedict/base.json @@ -0,0 +1,10 @@ +{ + "rougail.my_variable": [ + "val1", + "val2" + ], + "rougail.my_calculated_variable": [ + "val1", + "val2" + ] +} diff --git a/tests/dictionaries/00_9default_calculation_optional_exists/makedict/before.json b/tests/dictionaries/00_9default_calculation_optional_exists/makedict/before.json new file mode 100644 index 000000000..0fa2df16d --- /dev/null +++ b/tests/dictionaries/00_9default_calculation_optional_exists/makedict/before.json @@ -0,0 +1,16 @@ +{ + "rougail.my_variable": { + "owner": "default", + "value": [ + "val1", + "val2" + ] + }, + "rougail.my_calculated_variable": { + "owner": "default", + "value": [ + "val1", + "val2" + ] + } +} diff --git a/tests/dictionaries/00_9default_calculation_optional_exists/makedict/mandatory.json b/tests/dictionaries/00_9default_calculation_optional_exists/makedict/mandatory.json new file mode 100644 index 000000000..0637a088a --- /dev/null +++ b/tests/dictionaries/00_9default_calculation_optional_exists/makedict/mandatory.json @@ -0,0 +1 @@ +[] \ No newline at end of file diff --git a/tests/dictionaries/00_9default_calculation_optional_exists/tiramisu/base.py b/tests/dictionaries/00_9default_calculation_optional_exists/tiramisu/base.py new file mode 100644 index 000000000..07274410f --- /dev/null +++ b/tests/dictionaries/00_9default_calculation_optional_exists/tiramisu/base.py @@ -0,0 +1,11 @@ +from tiramisu import * +from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription +load_functions('tests/dictionaries/../eosfunc/test.py') +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("standard") +ALLOWED_LEADER_PROPERTIES.add("advanced") +option_2 = StrOption(name="my_variable", doc="my_variable", multi=True, default=["val1", "val2"], default_multi="val1", properties=frozenset({"mandatory", "notempty", "standard"}), informations={'type': 'string'}) +option_3 = StrOption(name="my_calculated_variable", doc="my_calculated_variable", multi=True, default=Calculation(func['calc_value'], Params((ParamOption(option_2)))), properties=frozenset({"mandatory", "notempty", "standard"}), informations={'type': 'string'}) +optiondescription_1 = OptionDescription(name="rougail", doc="Rougail", children=[option_2, option_3], properties=frozenset({"standard"})) +option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_1]) diff --git a/tests/dictionaries/00_9default_calculation_optional_exists/tiramisu/multi.py b/tests/dictionaries/00_9default_calculation_optional_exists/tiramisu/multi.py new file mode 100644 index 000000000..70d8f0a7e --- /dev/null +++ b/tests/dictionaries/00_9default_calculation_optional_exists/tiramisu/multi.py @@ -0,0 +1,16 @@ +from tiramisu import * +from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription +load_functions('tests/dictionaries/../eosfunc/test.py') +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("standard") +ALLOWED_LEADER_PROPERTIES.add("advanced") +option_3 = StrOption(name="my_variable", doc="my_variable", multi=True, default=["val1", "val2"], default_multi="val1", properties=frozenset({"mandatory", "notempty", "standard"}), informations={'type': 'string'}) +option_4 = StrOption(name="my_calculated_variable", doc="my_calculated_variable", multi=True, default=Calculation(func['calc_value'], Params((ParamOption(option_3)))), properties=frozenset({"mandatory", "notempty", "standard"}), informations={'type': 'string'}) +optiondescription_2 = OptionDescription(name="rougail", doc="Rougail", children=[option_3, option_4], properties=frozenset({"standard"})) +optiondescription_1 = OptionDescription(name="1", doc="1", children=[optiondescription_2], properties=frozenset({"standard"})) +option_7 = StrOption(name="my_variable", doc="my_variable", multi=True, default=["val1", "val2"], default_multi="val1", properties=frozenset({"mandatory", "notempty", "standard"}), informations={'type': 'string'}) +option_8 = StrOption(name="my_calculated_variable", doc="my_calculated_variable", multi=True, default=Calculation(func['calc_value'], Params((ParamOption(option_7)))), properties=frozenset({"mandatory", "notempty", "standard"}), informations={'type': 'string'}) +optiondescription_6 = OptionDescription(name="rougail", doc="Rougail", children=[option_7, option_8], properties=frozenset({"standard"})) +optiondescription_5 = OptionDescription(name="2", doc="2", children=[optiondescription_6], properties=frozenset({"standard"})) +option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_1, optiondescription_5]) diff --git a/tests/dictionaries/00_9default_calculation_optional_exists/tiramisu/no_namespace.py b/tests/dictionaries/00_9default_calculation_optional_exists/tiramisu/no_namespace.py new file mode 100644 index 000000000..6492b865b --- /dev/null +++ b/tests/dictionaries/00_9default_calculation_optional_exists/tiramisu/no_namespace.py @@ -0,0 +1,10 @@ +from tiramisu import * +from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription +load_functions('tests/dictionaries/../eosfunc/test.py') +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("standard") +ALLOWED_LEADER_PROPERTIES.add("advanced") +option_1 = StrOption(name="my_variable", doc="my_variable", multi=True, default=["val1", "val2"], default_multi="val1", properties=frozenset({"mandatory", "notempty", "standard"}), informations={'type': 'string'}) +option_2 = StrOption(name="my_calculated_variable", doc="my_calculated_variable", multi=True, default=Calculation(func['calc_value'], Params((ParamOption(option_1)))), properties=frozenset({"mandatory", "notempty", "standard"}), informations={'type': 'string'}) +option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1, option_2]) diff --git a/tests/dictionaries/60_0family_dynamic_variable_suffix/makedict/after.json b/tests/dictionaries/60_0family_dynamic_variable_suffix/makedict/after.json new file mode 100644 index 000000000..576f571b3 --- /dev/null +++ b/tests/dictionaries/60_0family_dynamic_variable_suffix/makedict/after.json @@ -0,0 +1,17 @@ +{ + "rougail.var": { + "owner": "default", + "value": [ + "val1", + "val2" + ] + }, + "rougail.dynval1.var": { + "owner": "default", + "value": "a value" + }, + "rougail.dynval2.var": { + "owner": "default", + "value": "a value" + } +} diff --git a/tests/dictionaries/60_0family_dynamic_variable_suffix/makedict/base.json b/tests/dictionaries/60_0family_dynamic_variable_suffix/makedict/base.json new file mode 100644 index 000000000..f343fedb2 --- /dev/null +++ b/tests/dictionaries/60_0family_dynamic_variable_suffix/makedict/base.json @@ -0,0 +1,8 @@ +{ + "rougail.var": [ + "val1", + "val2" + ], + "rougail.dynval1.var": "a value", + "rougail.dynval2.var": "a value" +} diff --git a/tests/dictionaries/60_0family_dynamic_variable_suffix/makedict/before.json b/tests/dictionaries/60_0family_dynamic_variable_suffix/makedict/before.json new file mode 100644 index 000000000..576f571b3 --- /dev/null +++ b/tests/dictionaries/60_0family_dynamic_variable_suffix/makedict/before.json @@ -0,0 +1,17 @@ +{ + "rougail.var": { + "owner": "default", + "value": [ + "val1", + "val2" + ] + }, + "rougail.dynval1.var": { + "owner": "default", + "value": "a value" + }, + "rougail.dynval2.var": { + "owner": "default", + "value": "a value" + } +} diff --git a/tests/dictionaries/60_0family_dynamic_variable_suffix/makedict/mandatory.json b/tests/dictionaries/60_0family_dynamic_variable_suffix/makedict/mandatory.json new file mode 100644 index 000000000..0637a088a --- /dev/null +++ b/tests/dictionaries/60_0family_dynamic_variable_suffix/makedict/mandatory.json @@ -0,0 +1 @@ +[] \ No newline at end of file diff --git a/tests/dictionaries/80choice_variable_optional/__init__.py b/tests/dictionaries/80choice_variable_optional/__init__.py new file mode 100644 index 000000000..e69de29bb diff --git a/tests/dictionaries/80choice_variable_optional/dictionaries/rougail/00-base.yml b/tests/dictionaries/80choice_variable_optional/dictionaries/rougail/00-base.yml new file mode 100644 index 000000000..b2cd51fa0 --- /dev/null +++ b/tests/dictionaries/80choice_variable_optional/dictionaries/rougail/00-base.yml @@ -0,0 +1,11 @@ +--- +version: '1.1' +var1: + - a + - b + - c +var2: + choices: + type: variable + variable: _.var1 + optional: true diff --git a/tests/dictionaries/80choice_variable_optional/errno_33 b/tests/dictionaries/80choice_variable_optional/errno_33 new file mode 100644 index 000000000..e69de29bb diff --git a/tests/dictionaries/80family_dynamic_optional/__init__.py b/tests/dictionaries/80family_dynamic_optional/__init__.py new file mode 100644 index 000000000..e69de29bb diff --git a/tests/dictionaries/80family_dynamic_optional/dictionaries/rougail/00-base.yml b/tests/dictionaries/80family_dynamic_optional/dictionaries/rougail/00-base.yml new file mode 100644 index 000000000..3b03d76da --- /dev/null +++ b/tests/dictionaries/80family_dynamic_optional/dictionaries/rougail/00-base.yml @@ -0,0 +1,13 @@ +--- +version: '1.1' +varname: + default: + - val1 +dyn{{ suffix }}: + type: dynamic + dynamic: + type: variable + variable: _.varname + optional: true + vardyn: + type: string diff --git a/tests/dictionaries/80family_dynamic_optional/errno_33 b/tests/dictionaries/80family_dynamic_optional/errno_33 new file mode 100644 index 000000000..e69de29bb diff --git a/tests/dictionaries/80valid_enum_multi_variable/dictionaries/rougail/00-base.yml b/tests/dictionaries/80valid_enum_multi_variable/dictionaries/rougail/00-base.yml index 47544b8a5..ab8fcfb83 100644 --- a/tests/dictionaries/80valid_enum_multi_variable/dictionaries/rougail/00-base.yml +++ b/tests/dictionaries/80valid_enum_multi_variable/dictionaries/rougail/00-base.yml @@ -1,27 +1,16 @@ -general: - mode_conteneur_actif: - type: choice - description: No change - default: a - choices: +--- +version: '1.1' +var: + - a + - b + - c +var2: + - a + - b + - c +var3: + choices: - type: variable - variable: rougail.general.var + variable: _.var - type: variable - variable: rougail.general.var2 - var: - type: string - description: New variable - multi: true - default: - - a - - b - - c - var2: - type: string - description: New variable - multi: true - default: - - a - - b - - c -version: '1.0' + variable: _.var2 From db565527eceacb5f998d3c51d36034522de9df8f Mon Sep 17 00:00:00 2001 From: Emmanuel Garette Date: Thu, 8 Aug 2024 09:04:49 +0200 Subject: [PATCH 03/12] toto --- src/rougail/config.py | 30 ++++++---- src/rougail/convert.py | 16 ++--- .../structural_commandline/annotator.py | 58 +++++++++++++------ src/rougail/structural_commandline/config.py | 42 ++++++++++++++ .../structural_commandline/object_model.py | 7 ++- 5 files changed, 118 insertions(+), 35 deletions(-) create mode 100644 src/rougail/structural_commandline/config.py diff --git a/src/rougail/config.py b/src/rougail/config.py index 1ae5e9304..d75250f80 100644 --- a/src/rougail/config.py +++ b/src/rougail/config.py @@ -136,6 +136,12 @@ class _RougailConfig: class FakeRougailConvert(RougailConvert): + def __init__(self, + add_extra_options: bool, + ) -> None: + self.add_extra_options = add_extra_options + super().__init__({}) + def load_config(self, rougailconfig: 'RougailConfig', ) -> None: @@ -149,10 +155,12 @@ class FakeRougailConvert(RougailConvert): self.export_with_import = True self.internal_functions = [] self.plugins = ['structural_commandline'] + self.add_extra_options = self.add_extra_options def get_rougail_config(*, - backward_compatibility=True, + backward_compatibility: bool=True, + add_extra_options: bool=True, ) -> _RougailConfig: if backward_compatibility: main_namespace_default = 'rougail' @@ -178,7 +186,7 @@ main_dictionaries: main_namespace: description: Main namespace name default: MAIN_MAMESPACE_DEFAULT - alternative_name: n + alternative_name: s mandatory: false extra_dictionaries: description: Extra namespaces @@ -191,12 +199,12 @@ extra_dictionaries: {% endif %} names: description: 'Extra namespace name' -# alternative_name: e + alternative_name: e multi: true mandatory: false directories: description: Directories where extra dictionary files are placed -# alternative_name: d + alternative_name: d type: unix_filename params: allow_relative: true @@ -279,9 +287,9 @@ suffix: mandatory: false commandline: false """.replace('MAIN_MAMESPACE_DEFAULT', main_namespace_default) - processes = {'output': [], + processes = {'structural': [], + 'output': [], 'user data': [], - # 'structural': [], } for module in get_sub_modules().values(): data = module.get_rougail_config() @@ -302,13 +310,15 @@ suffix: ) for obj in objects: rougail_process += f" - {obj['name']}\n" - if process == 'user data': - rougail_process +=""" multi: true + if process == 'structural': + rougail_process += " commandline: false" + elif process == 'user data': + rougail_process += """ multi: true mandatory: false """ hidden_outputs = [process['name'] for process in processes['output'] if not process.get('allow_user_data', True)] if hidden_outputs: - rougail_process +=""" hidden: + rougail_process += """ hidden: type: jinja jinja: | """ @@ -329,7 +339,7 @@ suffix: """.format(NAME=normalize_family(process), ) rougail_options += rougail_process - convert = FakeRougailConvert({}) + convert = FakeRougailConvert(add_extra_options) convert._init() convert.namespace = None convert.parse_root_file( diff --git a/src/rougail/convert.py b/src/rougail/convert.py index d267b20f9..200a2cd3a 100644 --- a/src/rougail/convert.py +++ b/src/rougail/convert.py @@ -317,6 +317,7 @@ class Informations: class ParserVariable: def __init__(self, rougailconfig): self.load_config(rougailconfig) + self.rougailconfig = rougailconfig self.paths = Paths(self.main_namespace) self.families = [] self.variables = [] @@ -332,9 +333,6 @@ class ParserVariable: self.convert_options = list(CONVERT_OPTION) self.convert_options.extend(self.custom_types) # - self.family = Family - self.dynamic = Dynamic - # self.exclude_imports = [] self.informations = Informations() self.properties = Property() @@ -363,12 +361,14 @@ class ParserVariable: self.base_option_name = rougailconfig["base_option_name"] self.export_with_import = rougailconfig["export_with_import"] self.internal_functions = rougailconfig["internal_functions"] + self.add_extra_options = rougailconfig["structural_commandline.add_extra_options"] self.plugins = [] def _init(self): if self.is_init: return variable = Variable + family = Family if self.plugins: root = Path(__file__).parent for plugin in self.plugins: @@ -376,13 +376,15 @@ class ParserVariable: if not module_path.is_file(): continue module = load_modules(f'rougail.{plugin}.object_model', str(module_path)) - if 'Variable' not in module.__all__: - continue - variable = type(variable.__name__ + '_' + plugin, (Variable, module.Variable), {}) + if 'Variable' in module.__all__: + variable = type(variable.__name__ + '_' + plugin, (variable, module.Variable), {}) + if 'Family' in module.__all__: + family = type(family.__name__ + '_' + plugin, (family, module.Family), {}) self.variable = variable + self.family = family + self.dynamic = type(Dynamic.__name__, (Dynamic, family), {}) hint = get_type_hints(self.dynamic) # FIXME: only for format 1.0 - hint["variable"] = str self.family_types = hint["type"].__args__ # pylint: disable=W0201 self.family_attrs = frozenset( # pylint: disable=W0201 set(hint) - {"name", "path", "xmlfiles"} | {"redefine"} diff --git a/src/rougail/structural_commandline/annotator.py b/src/rougail/structural_commandline/annotator.py index 2e5ad8f46..812eb082c 100644 --- a/src/rougail/structural_commandline/annotator.py +++ b/src/rougail/structural_commandline/annotator.py @@ -20,34 +20,58 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA """ from rougail.annotator.variable import Walk +from rougail.utils import _ +from rougail.error import DictConsistencyError class Annotator(Walk): """Annotate value""" - level = 5 + level = 80 def __init__(self, objectspace, *args) -> None: if not objectspace.paths: return self.objectspace = objectspace - self.manage_alternative_name() - self.not_for_commandline() - - def manage_alternative_name(self) -> None: + not_for_commandlines = [] + for family in self.get_families(): + if family.commandline: + continue + self.not_for_commandline(family) + not_for_commandlines.append(family.path + '.') for variable in self.get_variables(): if variable.type == 'symlink': continue - if not variable.alternative_name: - continue - alternative_name = variable.alternative_name variable_path = variable.path - if '.' not in variable_path: - path = alternative_name + for family_path in not_for_commandlines: + if variable_path.startswith(family_path): + break else: - path = variable_path.rsplit('.', 1)[0] + '.' + alternative_name - self.objectspace.add_variable(alternative_name, {'type': 'symlink', 'path': path, 'opt': variable}, variable.xmlfiles, False, False, variable.version) + if not variable.commandline: + self.not_for_commandline(variable) + else: + self.manage_alternative_name(variable) + self.manage_negative_description(variable) - def not_for_commandline(self) -> None: - for variable in self.get_variables(): - if not hasattr(variable, 'commandline') or variable.commandline: - continue - self.objectspace.properties.add(variable.path, 'not_for_commandline', True) + def not_for_commandline(self, variable) -> None: + self.objectspace.properties.add(variable.path, 'not_for_commandline', True) + + def manage_alternative_name(self, variable) -> None: + if not variable.alternative_name: + return + alternative_name = variable.alternative_name + variable_path = variable.path + if '.' not in variable_path: + path = alternative_name + else: + path = variable_path.rsplit('.', 1)[0] + '.' + alternative_name + self.objectspace.add_variable(alternative_name, {'type': 'symlink', 'path': path, 'opt': variable}, variable.xmlfiles, False, False, variable.version) + + def manage_negative_description(self, variable) -> None: + if not variable.negative_description: + if variable.type == 'boolean' and not self.objectspace.add_extra_options: + raise DictConsistencyError(_(f'negative_description is mandatory for boolean variable, but "{variable.path}" hasn\'t'), 200, variable.xmlfiles) + return + if variable.type != 'boolean': + raise DictConsistencyError(_(f'negative_description is only available for boolean variable, but "{variable.path}" is "{variable.type}"'), 200, variable.xmlfiles) + self.objectspace.informations.add( + variable.path, "negative_description", variable.negative_description + ) diff --git a/src/rougail/structural_commandline/config.py b/src/rougail/structural_commandline/config.py new file mode 100644 index 000000000..a8ac11264 --- /dev/null +++ b/src/rougail/structural_commandline/config.py @@ -0,0 +1,42 @@ +""" +Config file for Rougail-structural_commandline + +Silique (https://www.silique.fr) +Copyright (C) 2024 + +distribued with GPL-2 or later license + +This program is free software; you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation; either version 2 of the License, or +(at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License +along with this program; if not, write to the Free Software +Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +""" +def get_rougail_config(*, + backward_compatibility=True, + ) -> dict: + options = """ +structural_commandline: + description: Configuration rougail-structural_commandline + commandline: false + add_extra_options: + description: Add extra options to tiramisu-cmdline-parser + default: true +""" + return {'name': 'exporter', + 'process': 'structural', + 'options': options, + 'level': 20, + } + + +__all__ = ('get_rougail_config') + diff --git a/src/rougail/structural_commandline/object_model.py b/src/rougail/structural_commandline/object_model.py index 21318e6f6..fe5446e2e 100644 --- a/src/rougail/structural_commandline/object_model.py +++ b/src/rougail/structural_commandline/object_model.py @@ -26,6 +26,11 @@ from pydantic import BaseModel class Variable(BaseModel): alternative_name: Optional[str]=None commandline: bool=True + negative_description: Optional[str]=None -__all__ = ('Variable',) +class Family(BaseModel): + commandline: bool=True + + +__all__ = ('Variable', 'Family') From 4017bf784086c6e56afa64c1958ba681e7c81bdb Mon Sep 17 00:00:00 2001 From: Emmanuel Garette Date: Sun, 25 Aug 2024 12:22:22 +0200 Subject: [PATCH 04/12] add 'whole' attribute to variable --- src/rougail/object_model.py | 1 + src/rougail/tiramisu.py | 3 +-- src/rougail/tiramisureflector.py | 13 ++++++++---- .../04_5validators_multi/__init__.py | 0 .../dictionaries/rougail/00-base.yml | 15 ++++++++++++++ .../04_5validators_multi/makedict/after.json | 9 +++++++++ .../04_5validators_multi/makedict/base.json | 6 ++++++ .../04_5validators_multi/makedict/before.json | 9 +++++++++ .../makedict/mandatory.json | 1 + .../04_5validators_multi/tiramisu/base.py | 11 ++++++++++ .../04_5validators_multi/tiramisu/multi.py | 16 +++++++++++++++ .../tiramisu/no_namespace.py | 10 ++++++++++ .../04_5validators_multi2/__init__.py | 0 .../dictionaries/rougail/00-base.yml | 20 +++++++++++++++++++ .../04_5validators_multi2/makedict/after.json | 9 +++++++++ .../04_5validators_multi2/makedict/base.json | 6 ++++++ .../makedict/before.json | 9 +++++++++ .../makedict/mandatory.json | 1 + .../04_5validators_multi2/tiramisu/base.py | 11 ++++++++++ .../04_5validators_multi2/tiramisu/multi.py | 16 +++++++++++++++ .../tiramisu/no_namespace.py | 10 ++++++++++ tests/test_1_flattener.py | 2 +- 22 files changed, 171 insertions(+), 7 deletions(-) create mode 100644 tests/dictionaries/04_5validators_multi/__init__.py create mode 100644 tests/dictionaries/04_5validators_multi/dictionaries/rougail/00-base.yml create mode 100644 tests/dictionaries/04_5validators_multi/makedict/after.json create mode 100644 tests/dictionaries/04_5validators_multi/makedict/base.json create mode 100644 tests/dictionaries/04_5validators_multi/makedict/before.json create mode 100644 tests/dictionaries/04_5validators_multi/makedict/mandatory.json create mode 100644 tests/dictionaries/04_5validators_multi/tiramisu/base.py create mode 100644 tests/dictionaries/04_5validators_multi/tiramisu/multi.py create mode 100644 tests/dictionaries/04_5validators_multi/tiramisu/no_namespace.py create mode 100644 tests/dictionaries/04_5validators_multi2/__init__.py create mode 100644 tests/dictionaries/04_5validators_multi2/dictionaries/rougail/00-base.yml create mode 100644 tests/dictionaries/04_5validators_multi2/makedict/after.json create mode 100644 tests/dictionaries/04_5validators_multi2/makedict/base.json create mode 100644 tests/dictionaries/04_5validators_multi2/makedict/before.json create mode 100644 tests/dictionaries/04_5validators_multi2/makedict/mandatory.json create mode 100644 tests/dictionaries/04_5validators_multi2/tiramisu/base.py create mode 100644 tests/dictionaries/04_5validators_multi2/tiramisu/multi.py create mode 100644 tests/dictionaries/04_5validators_multi2/tiramisu/no_namespace.py diff --git a/src/rougail/object_model.py b/src/rougail/object_model.py index 5c6ab31c1..493f4064a 100644 --- a/src/rougail/object_model.py +++ b/src/rougail/object_model.py @@ -132,6 +132,7 @@ class VariableParam(Param): type: str variable: str propertyerror: bool = True + whole: bool = False optional: bool = False diff --git a/src/rougail/tiramisu.py b/src/rougail/tiramisu.py index cfcd3e175..40ea9c794 100644 --- a/src/rougail/tiramisu.py +++ b/src/rougail/tiramisu.py @@ -41,10 +41,9 @@ from .utils import normalize_family global func -func = {} dict_env = {} ENV = SandboxedEnvironment(loader=DictLoader(dict_env), undefined=StrictUndefined) -ENV.filters = func +func = ENV.filters ENV.compile_templates('jinja_caches', zip=None) diff --git a/src/rougail/tiramisureflector.py b/src/rougail/tiramisureflector.py index c2d51bda9..20e91a38d 100644 --- a/src/rougail/tiramisureflector.py +++ b/src/rougail/tiramisureflector.py @@ -332,6 +332,7 @@ class Common: param.get("propertyerror", True), param.get("suffix"), param.get("dynamic"), + param.get('whole', False), ) if param["type"] == "any": if isinstance(param["value"], str): @@ -343,15 +344,19 @@ class Common: def build_option_param( self, - param, + variable, propertyerror, suffix: Optional[str], dynamic, + whole: bool, ) -> str: """build variable parameters""" - if param.path == self.elt.path: - return "ParamSelfOption(whole=False)" - option_name = self.tiramisu.reflector_objects[param.path].get( + if variable.path == self.elt.path: + return f"ParamSelfOption(whole={whole})" + if whole: + msg = f'variable param "{variable.path}" has whole attribute but it\'s not allowed for external variable' + raise DictConsistencyError(msg, 34, self.elt.xmlfiles) + option_name = self.tiramisu.reflector_objects[variable.path].get( self.calls, self.elt.path ) params = [f"{option_name}"] diff --git a/tests/dictionaries/04_5validators_multi/__init__.py b/tests/dictionaries/04_5validators_multi/__init__.py new file mode 100644 index 000000000..e69de29bb diff --git a/tests/dictionaries/04_5validators_multi/dictionaries/rougail/00-base.yml b/tests/dictionaries/04_5validators_multi/dictionaries/rougail/00-base.yml new file mode 100644 index 000000000..81714725f --- /dev/null +++ b/tests/dictionaries/04_5validators_multi/dictionaries/rougail/00-base.yml @@ -0,0 +1,15 @@ +--- +version: 1.1 +var1: + description: a second variable + multi: true + default: + - 'no' + - 'yes' + validators: + - type: jinja + jinja: | + {% if _.var1 | length > 9 %} + length must be less than 10 + {% endif %} + description: check length is less than 10 diff --git a/tests/dictionaries/04_5validators_multi/makedict/after.json b/tests/dictionaries/04_5validators_multi/makedict/after.json new file mode 100644 index 000000000..45a7b8795 --- /dev/null +++ b/tests/dictionaries/04_5validators_multi/makedict/after.json @@ -0,0 +1,9 @@ +{ + "rougail.var1": { + "owner": "default", + "value": [ + "no", + "yes" + ] + } +} diff --git a/tests/dictionaries/04_5validators_multi/makedict/base.json b/tests/dictionaries/04_5validators_multi/makedict/base.json new file mode 100644 index 000000000..8a8a50173 --- /dev/null +++ b/tests/dictionaries/04_5validators_multi/makedict/base.json @@ -0,0 +1,6 @@ +{ + "rougail.var1": [ + "no", + "yes" + ] +} diff --git a/tests/dictionaries/04_5validators_multi/makedict/before.json b/tests/dictionaries/04_5validators_multi/makedict/before.json new file mode 100644 index 000000000..45a7b8795 --- /dev/null +++ b/tests/dictionaries/04_5validators_multi/makedict/before.json @@ -0,0 +1,9 @@ +{ + "rougail.var1": { + "owner": "default", + "value": [ + "no", + "yes" + ] + } +} diff --git a/tests/dictionaries/04_5validators_multi/makedict/mandatory.json b/tests/dictionaries/04_5validators_multi/makedict/mandatory.json new file mode 100644 index 000000000..0637a088a --- /dev/null +++ b/tests/dictionaries/04_5validators_multi/makedict/mandatory.json @@ -0,0 +1 @@ +[] \ No newline at end of file diff --git a/tests/dictionaries/04_5validators_multi/tiramisu/base.py b/tests/dictionaries/04_5validators_multi/tiramisu/base.py new file mode 100644 index 000000000..960cd949b --- /dev/null +++ b/tests/dictionaries/04_5validators_multi/tiramisu/base.py @@ -0,0 +1,11 @@ +from tiramisu import * +from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription +load_functions('tests/dictionaries/../eosfunc/test.py') +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("standard") +ALLOWED_LEADER_PROPERTIES.add("advanced") +dict_env['validators_rougail.var1'] = "{% if _.var1 | length > 9 %}\nlength must be less than 10\n{% endif %}\n" +option_2 = StrOption(name="var1", doc="a second variable", multi=True, default=["no", "yes"], default_multi="no", validators=[Calculation(func['valid_with_jinja'], Params((), kwargs={'__internal_jinja': ParamValue("validators_rougail.var1"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '_.var1': ParamSelfOption(whole=False)}))], properties=frozenset({"mandatory", "notempty", "standard"}), informations={'type': 'string'}) +optiondescription_1 = OptionDescription(name="rougail", doc="Rougail", children=[option_2], properties=frozenset({"standard"})) +option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_1]) diff --git a/tests/dictionaries/04_5validators_multi/tiramisu/multi.py b/tests/dictionaries/04_5validators_multi/tiramisu/multi.py new file mode 100644 index 000000000..fde8be7ff --- /dev/null +++ b/tests/dictionaries/04_5validators_multi/tiramisu/multi.py @@ -0,0 +1,16 @@ +from tiramisu import * +from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription +load_functions('tests/dictionaries/../eosfunc/test.py') +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("standard") +ALLOWED_LEADER_PROPERTIES.add("advanced") +dict_env['validators_1.rougail.var1'] = "{% if _.var1 | length > 9 %}\nlength must be less than 10\n{% endif %}\n" +dict_env['validators_2.rougail.var1'] = "{% if _.var1 | length > 9 %}\nlength must be less than 10\n{% endif %}\n" +option_3 = StrOption(name="var1", doc="a second variable", multi=True, default=["no", "yes"], default_multi="no", validators=[Calculation(func['valid_with_jinja'], Params((), kwargs={'__internal_jinja': ParamValue("validators_1.rougail.var1"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '_.var1': ParamSelfOption(whole=False)}))], properties=frozenset({"mandatory", "notempty", "standard"}), informations={'type': 'string'}) +optiondescription_2 = OptionDescription(name="rougail", doc="Rougail", children=[option_3], properties=frozenset({"standard"})) +optiondescription_1 = OptionDescription(name="1", doc="1", children=[optiondescription_2], properties=frozenset({"standard"})) +option_6 = StrOption(name="var1", doc="a second variable", multi=True, default=["no", "yes"], default_multi="no", validators=[Calculation(func['valid_with_jinja'], Params((), kwargs={'__internal_jinja': ParamValue("validators_2.rougail.var1"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '_.var1': ParamSelfOption(whole=False)}))], properties=frozenset({"mandatory", "notempty", "standard"}), informations={'type': 'string'}) +optiondescription_5 = OptionDescription(name="rougail", doc="Rougail", children=[option_6], properties=frozenset({"standard"})) +optiondescription_4 = OptionDescription(name="2", doc="2", children=[optiondescription_5], properties=frozenset({"standard"})) +option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_1, optiondescription_4]) diff --git a/tests/dictionaries/04_5validators_multi/tiramisu/no_namespace.py b/tests/dictionaries/04_5validators_multi/tiramisu/no_namespace.py new file mode 100644 index 000000000..5d732ead8 --- /dev/null +++ b/tests/dictionaries/04_5validators_multi/tiramisu/no_namespace.py @@ -0,0 +1,10 @@ +from tiramisu import * +from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription +load_functions('tests/dictionaries/../eosfunc/test.py') +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("standard") +ALLOWED_LEADER_PROPERTIES.add("advanced") +dict_env['validators_var1'] = "{% if _.var1 | length > 9 %}\nlength must be less than 10\n{% endif %}\n" +option_1 = StrOption(name="var1", doc="a second variable", multi=True, default=["no", "yes"], default_multi="no", validators=[Calculation(func['valid_with_jinja'], Params((), kwargs={'__internal_jinja': ParamValue("validators_var1"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '_': ParamValue({}), '_.var1': ParamSelfOption(whole=False)}))], properties=frozenset({"mandatory", "notempty", "standard"}), informations={'type': 'string'}) +option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1]) diff --git a/tests/dictionaries/04_5validators_multi2/__init__.py b/tests/dictionaries/04_5validators_multi2/__init__.py new file mode 100644 index 000000000..e69de29bb diff --git a/tests/dictionaries/04_5validators_multi2/dictionaries/rougail/00-base.yml b/tests/dictionaries/04_5validators_multi2/dictionaries/rougail/00-base.yml new file mode 100644 index 000000000..20178d7d4 --- /dev/null +++ b/tests/dictionaries/04_5validators_multi2/dictionaries/rougail/00-base.yml @@ -0,0 +1,20 @@ +--- +version: 1.1 +var1: + description: a second variable + multi: true + default: + - 'no' + - 'yes' + validators: + - type: jinja + params: + values: + type: variable + variable: _.var1 + whole: true + jinja: | + {% if values | length > 2 %} + length must be less than 3 + {% endif %} + description: check length is less than 3 diff --git a/tests/dictionaries/04_5validators_multi2/makedict/after.json b/tests/dictionaries/04_5validators_multi2/makedict/after.json new file mode 100644 index 000000000..45a7b8795 --- /dev/null +++ b/tests/dictionaries/04_5validators_multi2/makedict/after.json @@ -0,0 +1,9 @@ +{ + "rougail.var1": { + "owner": "default", + "value": [ + "no", + "yes" + ] + } +} diff --git a/tests/dictionaries/04_5validators_multi2/makedict/base.json b/tests/dictionaries/04_5validators_multi2/makedict/base.json new file mode 100644 index 000000000..8a8a50173 --- /dev/null +++ b/tests/dictionaries/04_5validators_multi2/makedict/base.json @@ -0,0 +1,6 @@ +{ + "rougail.var1": [ + "no", + "yes" + ] +} diff --git a/tests/dictionaries/04_5validators_multi2/makedict/before.json b/tests/dictionaries/04_5validators_multi2/makedict/before.json new file mode 100644 index 000000000..45a7b8795 --- /dev/null +++ b/tests/dictionaries/04_5validators_multi2/makedict/before.json @@ -0,0 +1,9 @@ +{ + "rougail.var1": { + "owner": "default", + "value": [ + "no", + "yes" + ] + } +} diff --git a/tests/dictionaries/04_5validators_multi2/makedict/mandatory.json b/tests/dictionaries/04_5validators_multi2/makedict/mandatory.json new file mode 100644 index 000000000..0637a088a --- /dev/null +++ b/tests/dictionaries/04_5validators_multi2/makedict/mandatory.json @@ -0,0 +1 @@ +[] \ No newline at end of file diff --git a/tests/dictionaries/04_5validators_multi2/tiramisu/base.py b/tests/dictionaries/04_5validators_multi2/tiramisu/base.py new file mode 100644 index 000000000..39f2cf95a --- /dev/null +++ b/tests/dictionaries/04_5validators_multi2/tiramisu/base.py @@ -0,0 +1,11 @@ +from tiramisu import * +from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription +load_functions('tests/dictionaries/../eosfunc/test.py') +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("standard") +ALLOWED_LEADER_PROPERTIES.add("advanced") +dict_env['validators_rougail.var1'] = "{% if values | length > 2 %}\nlength must be less than 3\n{% endif %}\n" +option_2 = StrOption(name="var1", doc="a second variable", multi=True, default=["no", "yes"], default_multi="no", validators=[Calculation(func['valid_with_jinja'], Params((), kwargs={'__internal_jinja': ParamValue("validators_rougail.var1"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), 'values': ParamSelfOption(whole=True)}))], properties=frozenset({"mandatory", "notempty", "standard"}), informations={'type': 'string'}) +optiondescription_1 = OptionDescription(name="rougail", doc="Rougail", children=[option_2], properties=frozenset({"standard"})) +option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_1]) diff --git a/tests/dictionaries/04_5validators_multi2/tiramisu/multi.py b/tests/dictionaries/04_5validators_multi2/tiramisu/multi.py new file mode 100644 index 000000000..d00a58292 --- /dev/null +++ b/tests/dictionaries/04_5validators_multi2/tiramisu/multi.py @@ -0,0 +1,16 @@ +from tiramisu import * +from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription +load_functions('tests/dictionaries/../eosfunc/test.py') +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("standard") +ALLOWED_LEADER_PROPERTIES.add("advanced") +dict_env['validators_1.rougail.var1'] = "{% if values | length > 2 %}\nlength must be less than 3\n{% endif %}\n" +dict_env['validators_2.rougail.var1'] = "{% if values | length > 2 %}\nlength must be less than 3\n{% endif %}\n" +option_3 = StrOption(name="var1", doc="a second variable", multi=True, default=["no", "yes"], default_multi="no", validators=[Calculation(func['valid_with_jinja'], Params((), kwargs={'__internal_jinja': ParamValue("validators_1.rougail.var1"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), 'values': ParamSelfOption(whole=True)}))], properties=frozenset({"mandatory", "notempty", "standard"}), informations={'type': 'string'}) +optiondescription_2 = OptionDescription(name="rougail", doc="Rougail", children=[option_3], properties=frozenset({"standard"})) +optiondescription_1 = OptionDescription(name="1", doc="1", children=[optiondescription_2], properties=frozenset({"standard"})) +option_6 = StrOption(name="var1", doc="a second variable", multi=True, default=["no", "yes"], default_multi="no", validators=[Calculation(func['valid_with_jinja'], Params((), kwargs={'__internal_jinja': ParamValue("validators_2.rougail.var1"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), 'values': ParamSelfOption(whole=True)}))], properties=frozenset({"mandatory", "notempty", "standard"}), informations={'type': 'string'}) +optiondescription_5 = OptionDescription(name="rougail", doc="Rougail", children=[option_6], properties=frozenset({"standard"})) +optiondescription_4 = OptionDescription(name="2", doc="2", children=[optiondescription_5], properties=frozenset({"standard"})) +option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_1, optiondescription_4]) diff --git a/tests/dictionaries/04_5validators_multi2/tiramisu/no_namespace.py b/tests/dictionaries/04_5validators_multi2/tiramisu/no_namespace.py new file mode 100644 index 000000000..105c5ac2b --- /dev/null +++ b/tests/dictionaries/04_5validators_multi2/tiramisu/no_namespace.py @@ -0,0 +1,10 @@ +from tiramisu import * +from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription +load_functions('tests/dictionaries/../eosfunc/test.py') +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("standard") +ALLOWED_LEADER_PROPERTIES.add("advanced") +dict_env['validators_var1'] = "{% if values | length > 2 %}\nlength must be less than 3\n{% endif %}\n" +option_1 = StrOption(name="var1", doc="a second variable", multi=True, default=["no", "yes"], default_multi="no", validators=[Calculation(func['valid_with_jinja'], Params((), kwargs={'__internal_jinja': ParamValue("validators_var1"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), 'values': ParamSelfOption(whole=True)}))], properties=frozenset({"mandatory", "notempty", "standard"}), informations={'type': 'string'}) +option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1]) diff --git a/tests/test_1_flattener.py b/tests/test_1_flattener.py index 97cca2382..2edb961f9 100644 --- a/tests/test_1_flattener.py +++ b/tests/test_1_flattener.py @@ -180,7 +180,7 @@ def test_error_dictionary(test_dir_error): errno = [] rougailconfig = RougailConfig.copy() rougailconfig['main_namespace'] = 'Rougail' - eolobj = load_rougail_object(test_dir_, rougailconfig) + eolobj = load_rougail_object(test_dir_, rougailconfig, namespace=True) if eolobj is None: return for i in listdir(test_dir_): From 3741a0b5489adf9a7b6077dc83f57e6df4d7a6d9 Mon Sep 17 00:00:00 2001 From: Emmanuel Garette Date: Sun, 25 Aug 2024 12:23:06 +0200 Subject: [PATCH 05/12] corrections --- src/rougail/__init__.py | 8 ++++++-- src/rougail/config.py | 28 ++++++++++++++++++++++++++-- 2 files changed, 32 insertions(+), 4 deletions(-) diff --git a/src/rougail/__init__.py b/src/rougail/__init__.py index d4dc1a00f..dbc7a277e 100644 --- a/src/rougail/__init__.py +++ b/src/rougail/__init__.py @@ -28,7 +28,7 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA """ from tiramisu import Config -from copy import copy +from warnings import warn from .convert import RougailConvert from .config import RougailConfig @@ -69,7 +69,7 @@ class Rougail: """Add a prefix""" self.converted.parse_directories(path_prefix) - def get_config(self): + def run(self): """Get Tiramisu Config""" if not self.config: tiram_obj = self.converted.save(self.rougailconfig["tiramisu_cache"]) @@ -83,5 +83,9 @@ class Rougail: self.config.property.read_write() return self.config + def get_config(self): + warn("get_config is deprecated, use run instead", DeprecationWarning, stacklevel=2) + return self.run() + __ALL__ = ("Rougail", "RougailConfig", "RougailUpgrade") diff --git a/src/rougail/config.py b/src/rougail/config.py index d75250f80..50a72bc13 100644 --- a/src/rougail/config.py +++ b/src/rougail/config.py @@ -131,9 +131,33 @@ class _RougailConfig: def get_leadership(self, option ) -> dict: - leader, *followers = option.value.get().values() + leader = None + followers = [] + for opt, value in option.value.get().items(): + if opt.issymlinkoption(): + continue + if leader is None: + leader = value + else: + followers.append(value) return dict(zip(leader, followers)) + def parse(self, config) -> str: + for option in config: + if option.isoptiondescription(): + yield from self.parse(option) + elif not option.issymlinkoption(): + yield f'{option.path()}: {option.value.get()}' + + def __repr__(self): + self.config.property.read_write() + try: + values = "\n".join(self.parse(self.config)) + except Exception as err: + values = str(err) + self.config.property.read_only() + return values + class FakeRougailConvert(RougailConvert): def __init__(self, @@ -199,7 +223,7 @@ extra_dictionaries: {% endif %} names: description: 'Extra namespace name' - alternative_name: e + alternative_name: x multi: true mandatory: false directories: From b4b058afd866245a2358d5b9b25c7371c7bf961b Mon Sep 17 00:00:00 2001 From: Emmanuel Garette Date: Thu, 29 Aug 2024 08:32:08 +0200 Subject: [PATCH 06/12] feat(#23): define easily a regexoption --- src/rougail/tiramisureflector.py | 8 ++++++ tests/dictionaries/00_0empty/tiramisu/base.py | 1 + .../dictionaries/00_0empty/tiramisu/multi.py | 1 + .../00_0empty/tiramisu/no_namespace.py | 1 + .../00_0version_underscore/tiramisu/base.py | 1 + .../00_0version_underscore/tiramisu/multi.py | 1 + .../tiramisu/no_namespace.py | 1 + .../00_1empty_variable/tiramisu/base.py | 1 + .../00_1empty_variable/tiramisu/multi.py | 1 + .../tiramisu/no_namespace.py | 1 + .../dictionaries/rougail/00-base.yml | 1 - .../00_2default_calculated/tiramisu/base.py | 1 + .../00_2default_calculated/tiramisu/multi.py | 1 + .../tiramisu/no_namespace.py | 1 + .../dictionaries/rougail/00-base.yml | 1 - .../tiramisu/base.py | 1 + .../tiramisu/multi.py | 1 + .../tiramisu/no_namespace.py | 1 + .../00_4load_subfolder/tiramisu/base.py | 1 + .../00_4load_subfolder/tiramisu/multi.py | 1 + .../tiramisu/no_namespace.py | 1 + .../00_5load_notype/tiramisu/base.py | 1 + .../00_5load_notype/tiramisu/multi.py | 1 + .../00_5load_notype/tiramisu/no_namespace.py | 1 + .../dictionaries/00_6boolean/tiramisu/base.py | 1 + .../00_6boolean/tiramisu/multi.py | 1 + .../00_6boolean/tiramisu/no_namespace.py | 1 + .../00_6boolean_no_mandatory/tiramisu/base.py | 1 + .../tiramisu/multi.py | 1 + .../tiramisu/no_namespace.py | 1 + .../dictionaries/00_6choice/tiramisu/base.py | 1 + .../dictionaries/00_6choice/tiramisu/multi.py | 1 + .../00_6choice/tiramisu/no_namespace.py | 1 + .../dictionaries/rougail/00-base.yml | 1 - .../00_6choice_calculation/tiramisu/base.py | 1 + .../00_6choice_calculation/tiramisu/multi.py | 1 + .../tiramisu/no_namespace.py | 1 + .../dictionaries/rougail/00-base.yml | 1 - .../00_6choice_variable/tiramisu/base.py | 1 + .../00_6choice_variable/tiramisu/multi.py | 1 + .../tiramisu/no_namespace.py | 1 + .../dictionaries/00_6custom/tiramisu/base.py | 1 + .../dictionaries/00_6custom/tiramisu/multi.py | 1 + .../00_6custom/tiramisu/no_namespace.py | 1 + .../00_6domainname/tiramisu/base.py | 1 + .../00_6domainname/tiramisu/multi.py | 1 + .../00_6domainname/tiramisu/no_namespace.py | 1 + .../00_6domainname_params/tiramisu/base.py | 1 + .../00_6domainname_params/tiramisu/multi.py | 1 + .../tiramisu/no_namespace.py | 1 + tests/dictionaries/00_6float/tiramisu/base.py | 1 + .../dictionaries/00_6float/tiramisu/multi.py | 1 + .../00_6float/tiramisu/no_namespace.py | 1 + .../dictionaries/00_6number/tiramisu/base.py | 1 + .../dictionaries/00_6number/tiramisu/multi.py | 1 + .../00_6number/tiramisu/no_namespace.py | 1 + .../__init__.py | 0 .../dictionaries/rougail/00-base.yml | 6 ++++ .../00_6regexp/makedict/after.json | 6 ++++ .../00_6regexp/makedict/base.json | 3 ++ .../00_6regexp/makedict/before.json | 6 ++++ .../00_6regexp/makedict/mandatory.json | 1 + .../dictionaries/00_6regexp/tiramisu/base.py | 16 +++++++++++ .../dictionaries/00_6regexp/tiramisu/multi.py | 25 +++++++++++++++++ .../00_6regexp/tiramisu/no_namespace.py | 15 ++++++++++ .../dictionaries/00_6string/tiramisu/base.py | 1 + .../dictionaries/00_6string/tiramisu/multi.py | 1 + .../00_6string/tiramisu/no_namespace.py | 1 + .../00_7choice_quote/tiramisu/base.py | 1 + .../00_7choice_quote/tiramisu/multi.py | 1 + .../00_7choice_quote/tiramisu/no_namespace.py | 1 + .../00_7help_quote/tiramisu/base.py | 1 + .../00_7help_quote/tiramisu/multi.py | 1 + .../00_7help_quote/tiramisu/no_namespace.py | 1 + .../00_7value_doublequote/tiramisu/base.py | 1 + .../00_7value_doublequote/tiramisu/multi.py | 1 + .../tiramisu/no_namespace.py | 1 + .../00_7value_doublequote2/tiramisu/base.py | 1 + .../00_7value_doublequote2/tiramisu/multi.py | 1 + .../tiramisu/no_namespace.py | 1 + .../00_7value_doublequote3/tiramisu/base.py | 1 + .../00_7value_doublequote3/tiramisu/multi.py | 1 + .../tiramisu/no_namespace.py | 1 + .../00_7value_quote/tiramisu/base.py | 1 + .../00_7value_quote/tiramisu/multi.py | 1 + .../00_7value_quote/tiramisu/no_namespace.py | 1 + .../dictionaries/rougail/00-base.yml | 1 - .../tiramisu/base.py | 1 + .../tiramisu/multi.py | 1 + .../tiramisu/no_namespace.py | 1 + tests/dictionaries/00_8test/tiramisu/base.py | 1 + tests/dictionaries/00_8test/tiramisu/multi.py | 1 + .../00_8test/tiramisu/no_namespace.py | 1 + .../tiramisu/base.py | 1 + .../tiramisu/multi.py | 1 + .../tiramisu/no_namespace.py | 1 + .../dictionaries/rougail/00-base.yml | 6 ++-- .../00_9choice_variables/tiramisu/base.py | 1 + .../00_9choice_variables/tiramisu/multi.py | 1 + .../tiramisu/no_namespace.py | 1 + .../dictionaries/rougail/00-base.yml | 1 - .../00_9default_calculation/tiramisu/base.py | 1 + .../00_9default_calculation/tiramisu/multi.py | 1 + .../tiramisu/no_namespace.py | 1 + .../dictionaries/rougail/00-base.yml | 1 - .../tiramisu/base.py | 1 + .../tiramisu/multi.py | 1 + .../tiramisu/no_namespace.py | 1 + .../dictionaries/rougail/00-base.yml | 1 - .../tiramisu/base.py | 1 + .../tiramisu/multi.py | 1 + .../tiramisu/no_namespace.py | 1 + .../dictionaries/rougail/00-base.yml | 6 ++-- .../tiramisu/base.py | 1 + .../tiramisu/multi.py | 1 + .../tiramisu/no_namespace.py | 1 + .../dictionaries/rougail/00-base.yml | 6 ++-- .../tiramisu/base.py | 1 + .../tiramisu/multi.py | 1 + .../tiramisu/no_namespace.py | 1 + .../dictionaries/rougail/00-base.yml | 1 - .../tiramisu/base.py | 1 + .../tiramisu/multi.py | 1 + .../tiramisu/no_namespace.py | 1 + .../dictionaries/rougail/00-base.yml | 1 - .../tiramisu/base.py | 1 + .../tiramisu/multi.py | 1 + .../tiramisu/no_namespace.py | 1 + .../dictionaries/rougail/00-base.yml | 4 --- .../tiramisu/base.py | 1 + .../tiramisu/multi.py | 1 + .../tiramisu/no_namespace.py | 1 + .../tiramisu/base.py | 1 + .../tiramisu/multi.py | 1 + .../tiramisu/no_namespace.py | 1 + .../dictionaries/rougail/00-base.yml | 2 -- .../00_9default_integer/tiramisu/base.py | 1 + .../00_9default_integer/tiramisu/multi.py | 1 + .../tiramisu/no_namespace.py | 1 + .../00_9extra/dictionaries/extra/00-base.yml | 1 - tests/dictionaries/00_9extra/tiramisu/base.py | 1 + .../dictionaries/00_9extra/tiramisu/multi.py | 1 + .../dictionaries/extra/00-base.yml | 4 --- .../00_9extra_calculation/tiramisu/base.py | 1 + .../00_9extra_calculation/tiramisu/multi.py | 1 + .../01_6boolean_multi/tiramisu/base.py | 1 + .../01_6boolean_multi/tiramisu/multi.py | 1 + .../tiramisu/no_namespace.py | 1 + .../01_6custom_multi/tiramisu/base.py | 1 + .../01_6custom_multi/tiramisu/multi.py | 1 + .../01_6custom_multi/tiramisu/no_namespace.py | 1 + .../01_6float_multi/tiramisu/base.py | 1 + .../01_6float_multi/tiramisu/multi.py | 1 + .../01_6float_multi/tiramisu/no_namespace.py | 1 + .../01_6number_multi/tiramisu/base.py | 1 + .../01_6number_multi/tiramisu/multi.py | 1 + .../01_6number_multi/tiramisu/no_namespace.py | 1 + .../01_6string_multi/tiramisu/base.py | 1 + .../01_6string_multi/tiramisu/multi.py | 1 + .../01_6string_multi/tiramisu/no_namespace.py | 1 + .../tiramisu/base.py | 1 + .../tiramisu/multi.py | 1 + .../tiramisu/no_namespace.py | 1 + .../tiramisu/base.py | 1 + .../tiramisu/multi.py | 1 + .../tiramisu/no_namespace.py | 1 + .../01_7value_multi_quote/tiramisu/base.py | 1 + .../01_7value_multi_quote/tiramisu/multi.py | 1 + .../tiramisu/no_namespace.py | 1 + .../dictionaries/rougail/00-base.yml | 1 - .../tiramisu/base.py | 1 + .../tiramisu/multi.py | 1 + .../tiramisu/no_namespace.py | 1 + .../dictionaries/rougail/00-base.yml | 1 - .../tiramisu/base.py | 1 + .../tiramisu/multi.py | 1 + .../tiramisu/no_namespace.py | 1 + .../04_0type_param/tiramisu/base.py | 1 + .../04_0type_param/tiramisu/multi.py | 1 + .../04_0type_param/tiramisu/no_namespace.py | 1 + .../04_1auto_save/tiramisu/base.py | 1 + .../04_1auto_save/tiramisu/multi.py | 1 + .../04_1auto_save/tiramisu/no_namespace.py | 1 + .../dictionaries/rougail/00-base.yml | 1 - .../tiramisu/base.py | 1 + .../tiramisu/multi.py | 1 + .../tiramisu/no_namespace.py | 1 + .../dictionaries/rougail/00-base.yml | 2 -- .../tiramisu/base.py | 1 + .../tiramisu/multi.py | 1 + .../tiramisu/no_namespace.py | 1 + .../04_1auto_save_and_hidden/tiramisu/base.py | 1 + .../tiramisu/multi.py | 1 + .../tiramisu/no_namespace.py | 1 + .../dictionaries/rougail/00-base.yml | 2 -- .../04_5disabled_calculation/tiramisu/base.py | 1 + .../tiramisu/multi.py | 1 + .../dictionaries/rougail/00-base.yml | 4 --- .../tiramisu/base.py | 1 + .../tiramisu/multi.py | 1 + .../dictionaries/rougail/00-base.yml | 20 ++++++------- .../tiramisu/base.py | 11 ++++---- .../tiramisu/multi.py | 21 +++++++------- .../tiramisu/no_namespace.py | 11 ++++---- .../dictionaries/rougail/00-base.yml | 1 - .../tiramisu/base.py | 1 + .../tiramisu/multi.py | 1 + .../tiramisu/no_namespace.py | 1 + .../dictionaries/rougail/00-base.yml | 1 - .../tiramisu/base.py | 1 + .../tiramisu/multi.py | 1 + .../tiramisu/no_namespace.py | 1 + .../dictionaries/rougail/00-base.yml | 1 - .../tiramisu/base.py | 1 + .../tiramisu/multi.py | 1 + .../tiramisu/no_namespace.py | 1 + .../dictionaries/rougail/00-base.yml | 1 - .../tiramisu/base.py | 1 + .../tiramisu/multi.py | 1 + .../tiramisu/no_namespace.py | 1 + .../dictionaries/rougail/00-base.yml | 2 -- .../04_5hidden_calculation/tiramisu/base.py | 1 + .../04_5hidden_calculation/tiramisu/multi.py | 1 + .../dictionaries/rougail/00-base.yml | 4 --- .../04_5hidden_calculation2/tiramisu/base.py | 1 + .../04_5hidden_calculation2/tiramisu/multi.py | 1 + .../dictionaries/rougail/00-base.yml | 4 --- .../tiramisu/base.py | 1 + .../tiramisu/multi.py | 1 + .../dictionaries/rougail/00-base.yml | 3 +- .../04_5validators/tiramisu/base.py | 1 + .../04_5validators/tiramisu/multi.py | 1 + .../04_5validators/tiramisu/no_namespace.py | 1 + .../dictionaries/rougail/00-base.yml | 3 +- .../04_5validators_differ/tiramisu/base.py | 1 + .../04_5validators_differ/tiramisu/multi.py | 1 + .../tiramisu/no_namespace.py | 1 + .../dictionaries/rougail/00-base.yml | 3 +- .../tiramisu/base.py | 1 + .../tiramisu/multi.py | 1 + .../tiramisu/no_namespace.py | 1 + .../dictionaries/rougail/00-base.yml | 3 +- .../tiramisu/base.py | 1 + .../tiramisu/multi.py | 1 + .../tiramisu/no_namespace.py | 1 + .../dictionaries/rougail/00-base.yml | 3 +- .../04_5validators_ipnetmask/tiramisu/base.py | 1 + .../tiramisu/multi.py | 1 + .../tiramisu/no_namespace.py | 1 + .../dictionaries/rougail/00-base.yml | 3 +- .../04_5validators_multi/tiramisu/base.py | 1 + .../04_5validators_multi/tiramisu/multi.py | 1 + .../tiramisu/no_namespace.py | 1 + .../dictionaries/rougail/00-base.yml | 4 +-- .../04_5validators_multi2/tiramisu/base.py | 1 + .../04_5validators_multi2/tiramisu/multi.py | 1 + .../tiramisu/no_namespace.py | 1 + .../dictionaries/rougail/00-base.yml | 8 ++---- .../tiramisu/base.py | 1 + .../tiramisu/multi.py | 1 + .../tiramisu/no_namespace.py | 1 + .../05_0multi_not_uniq/tiramisu/base.py | 1 + .../05_0multi_not_uniq/tiramisu/multi.py | 1 + .../tiramisu/no_namespace.py | 1 + .../05_0multi_uniq/tiramisu/base.py | 1 + .../05_0multi_uniq/tiramisu/multi.py | 1 + .../05_0multi_uniq/tiramisu/no_namespace.py | 1 + .../12_1auto_save_expert/tiramisu/base.py | 1 + .../12_1auto_save_expert/tiramisu/multi.py | 1 + .../tiramisu/no_namespace.py | 1 + .../16_0redefine_description/tiramisu/base.py | 1 + .../tiramisu/multi.py | 1 + .../tiramisu/no_namespace.py | 1 + .../dictionaries/rougail/01-base.yml | 1 - .../tiramisu/base.py | 1 + .../tiramisu/multi.py | 1 + .../tiramisu/no_namespace.py | 1 + .../tiramisu/base.py | 1 + .../tiramisu/multi.py | 1 + .../tiramisu/no_namespace.py | 1 + .../16_5exists_nonexists/tiramisu/base.py | 1 + .../16_5exists_nonexists/tiramisu/multi.py | 1 + .../tiramisu/no_namespace.py | 1 + .../16_5exists_redefine/tiramisu/base.py | 1 + .../16_5exists_redefine/tiramisu/multi.py | 1 + .../tiramisu/no_namespace.py | 1 + .../dictionaries/rougail/00-base.yml | 1 - .../dictionaries/rougail/01-base.yml | 1 - .../16_5redefine_calculation/tiramisu/base.py | 1 + .../tiramisu/multi.py | 1 + .../tiramisu/no_namespace.py | 1 + .../16_5redefine_choice/tiramisu/base.py | 1 + .../16_5redefine_choice/tiramisu/multi.py | 1 + .../tiramisu/no_namespace.py | 1 + .../16_5redefine_default/tiramisu/base.py | 1 + .../16_5redefine_default/tiramisu/multi.py | 1 + .../tiramisu/no_namespace.py | 1 + .../dictionaries/rougail/00-base.yml | 1 - .../tiramisu/base.py | 1 + .../tiramisu/multi.py | 1 + .../tiramisu/no_namespace.py | 1 + .../16_5redefine_family/tiramisu/base.py | 1 + .../16_5redefine_family/tiramisu/multi.py | 1 + .../tiramisu/no_namespace.py | 1 + .../16_5redefine_help/tiramisu/base.py | 1 + .../16_5redefine_help/tiramisu/multi.py | 1 + .../tiramisu/no_namespace.py | 1 + .../16_5redefine_hidden/tiramisu/base.py | 1 + .../16_5redefine_hidden/tiramisu/multi.py | 1 + .../tiramisu/no_namespace.py | 1 + .../16_5redefine_multi/tiramisu/base.py | 1 + .../16_5redefine_multi/tiramisu/multi.py | 1 + .../tiramisu/no_namespace.py | 1 + .../dictionaries/rougail/00-base.yml | 1 - .../tiramisu/base.py | 1 + .../tiramisu/multi.py | 1 + .../tiramisu/no_namespace.py | 1 + .../16_5test_redefine/tiramisu/base.py | 1 + .../16_5test_redefine/tiramisu/multi.py | 1 + .../tiramisu/no_namespace.py | 1 + .../16_6choice_redefine/tiramisu/base.py | 1 + .../16_6choice_redefine/tiramisu/multi.py | 1 + .../tiramisu/no_namespace.py | 1 + .../16exists_exists/tiramisu/base.py | 1 + .../16exists_exists/tiramisu/multi.py | 1 + .../16exists_exists/tiramisu/no_namespace.py | 1 + .../17_5redefine_leadership/tiramisu/base.py | 1 + .../17_5redefine_leadership/tiramisu/multi.py | 1 + .../tiramisu/no_namespace.py | 1 + .../20_0empty_family/tiramisu/base.py | 1 + .../20_0empty_family/tiramisu/multi.py | 1 + .../20_0empty_family/tiramisu/no_namespace.py | 1 + .../20_0family_append/tiramisu/base.py | 1 + .../20_0family_append/tiramisu/multi.py | 1 + .../tiramisu/no_namespace.py | 1 + .../20_0family_underscore/tiramisu/base.py | 1 + .../20_0family_underscore/tiramisu/multi.py | 1 + .../tiramisu/no_namespace.py | 1 + .../20_0multi_family/tiramisu/base.py | 1 + .../20_0multi_family/tiramisu/multi.py | 1 + .../20_0multi_family/tiramisu/no_namespace.py | 1 + .../20_0multi_family_basic/tiramisu/base.py | 1 + .../20_0multi_family_basic/tiramisu/multi.py | 1 + .../tiramisu/no_namespace.py | 1 + .../20_0multi_family_expert/tiramisu/base.py | 1 + .../20_0multi_family_expert/tiramisu/multi.py | 1 + .../tiramisu/no_namespace.py | 1 + .../20_0multi_family_order/tiramisu/base.py | 1 + .../20_0multi_family_order/tiramisu/multi.py | 1 + .../tiramisu/no_namespace.py | 1 + .../dictionaries/rougail/00-base.yml | 3 +- .../dictionaries/rougail/01-base.yml | 3 +- .../tiramisu/base.py | 1 + .../tiramisu/multi.py | 1 + .../tiramisu/no_namespace.py | 1 + .../20_1empty_subfamily/tiramisu/base.py | 1 + .../20_1empty_subfamily/tiramisu/multi.py | 1 + .../tiramisu/no_namespace.py | 1 + .../tiramisu/base.py | 1 + .../tiramisu/multi.py | 1 + .../tiramisu/no_namespace.py | 1 + .../dictionaries/rougail/00-base.yml | 1 - .../tiramisu/base.py | 1 + .../tiramisu/multi.py | 1 + .../dictionaries/rougail/00-base.yml | 1 - .../tiramisu/base.py | 1 + .../tiramisu/multi.py | 1 + .../dictionaries/rougail/00-base.yml | 1 - .../tiramisu/base.py | 1 + .../tiramisu/multi.py | 1 + .../tiramisu/no_namespace.py | 1 + .../dictionaries/rougail/00-base.yml | 1 - .../tiramisu/base.py | 1 + .../tiramisu/multi.py | 1 + .../tiramisu/no_namespace.py | 1 + .../dictionaries/rougail/00-base.yml | 2 -- .../tiramisu/base.py | 1 + .../tiramisu/multi.py | 1 + .../dictionaries/rougail/00-base.yml | 2 -- .../tiramisu/base.py | 1 + .../tiramisu/multi.py | 1 + .../tiramisu/no_namespace.py | 1 + .../dictionaries/rougail/00-base.yml | 1 - .../tiramisu/base.py | 1 + .../tiramisu/multi.py | 1 + .../tiramisu/no_namespace.py | 1 + .../dictionaries/rougail/00-base.yml | 1 - .../tiramisu/base.py | 1 + .../tiramisu/multi.py | 1 + .../tiramisu/no_namespace.py | 1 + .../40_0leadership/tiramisu/base.py | 1 + .../40_0leadership/tiramisu/multi.py | 1 + .../40_0leadership/tiramisu/no_namespace.py | 1 + .../40_0leadership_diff_name/tiramisu/base.py | 1 + .../tiramisu/multi.py | 1 + .../tiramisu/no_namespace.py | 1 + .../40_0leadership_empty/tiramisu/base.py | 1 + .../40_0leadership_empty/tiramisu/multi.py | 1 + .../tiramisu/no_namespace.py | 1 + .../dictionaries/rougail/00-base.yml | 1 - .../tiramisu/base.py | 1 + .../tiramisu/multi.py | 1 + .../tiramisu/no_namespace.py | 1 + .../tiramisu/base.py | 1 + .../tiramisu/multi.py | 1 + .../dictionaries/rougail/00-base.yml | 1 - .../tiramisu/base.py | 1 + .../tiramisu/multi.py | 1 + .../tiramisu/base.py | 1 + .../tiramisu/multi.py | 1 + .../tiramisu/no_namespace.py | 1 + .../tiramisu/base.py | 1 + .../tiramisu/multi.py | 1 + .../tiramisu/no_namespace.py | 1 + .../tiramisu/base.py | 1 + .../tiramisu/multi.py | 1 + .../dictionaries/rougail/00-base.yml | 1 - .../tiramisu/base.py | 1 + .../tiramisu/multi.py | 1 + .../dictionaries/rougail/00-base.yml | 1 - .../tiramisu/base.py | 1 + .../tiramisu/multi.py | 1 + .../tiramisu/base.py | 1 + .../tiramisu/multi.py | 1 + .../tiramisu/no_namespace.py | 1 + .../dictionaries/rougail/00-base.yml | 2 -- .../40_8calculation_boolean/tiramisu/base.py | 1 + .../40_8calculation_boolean/tiramisu/multi.py | 1 + .../tiramisu/no_namespace.py | 1 + .../dictionaries/rougail/00-base.yml | 1 - .../tiramisu/base.py | 1 + .../tiramisu/multi.py | 1 + .../dictionaries/rougail/00-base.yml | 2 -- .../40_8calculation_integer/tiramisu/base.py | 1 + .../40_8calculation_integer/tiramisu/multi.py | 1 + .../dictionaries/rougail/00-base.yml | 6 ++-- .../tiramisu/base.py | 1 + .../tiramisu/multi.py | 1 + .../tiramisu/no_namespace.py | 1 + .../dictionaries/rougail/00-base.yml | 1 - .../tiramisu/base.py | 1 + .../tiramisu/multi.py | 1 + .../tiramisu/no_namespace.py | 1 + .../dictionaries/rougail/00-base.yml | 1 - .../tiramisu/base.py | 1 + .../tiramisu/multi.py | 1 + .../tiramisu/no_namespace.py | 1 + .../41_0choice_leader/tiramisu/base.py | 1 + .../41_0choice_leader/tiramisu/multi.py | 1 + .../tiramisu/no_namespace.py | 1 + .../44_0leadership_hidden/tiramisu/base.py | 1 + .../44_0leadership_hidden/tiramisu/multi.py | 1 + .../tiramisu/no_namespace.py | 1 + .../tiramisu/base.py | 1 + .../tiramisu/multi.py | 1 + .../tiramisu/no_namespace.py | 1 + .../tiramisu/base.py | 1 + .../tiramisu/multi.py | 1 + .../tiramisu/no_namespace.py | 1 + .../dictionaries/rougail/00-base.yml | 1 - .../tiramisu/base.py | 1 + .../tiramisu/multi.py | 1 + .../44_4leadership_mandatory/tiramisu/base.py | 1 + .../tiramisu/multi.py | 1 + .../tiramisu/no_namespace.py | 1 + .../tiramisu/base.py | 1 + .../tiramisu/multi.py | 1 + .../tiramisu/no_namespace.py | 1 + .../dictionaries/rougail/00-base.yml | 1 - .../tiramisu/base.py | 1 + .../tiramisu/multi.py | 1 + .../tiramisu/no_namespace.py | 1 + .../dictionaries/rougail/00-base.yml | 1 - .../tiramisu/base.py | 1 + .../tiramisu/multi.py | 1 + .../tiramisu/no_namespace.py | 1 + .../dictionaries/rougail/00-base.yml | 2 -- .../tiramisu/base.py | 1 + .../tiramisu/multi.py | 1 + .../dictionaries/rougail/00-base.yml | 2 -- .../60_0family_dynamic/tiramisu/base.py | 1 + .../60_0family_dynamic/tiramisu/multi.py | 1 + .../tiramisu/no_namespace.py | 1 + .../60_0family_dynamic_1_0/tiramisu/base.py | 1 + .../60_0family_dynamic_1_0/tiramisu/multi.py | 1 + .../tiramisu/base.py | 1 + .../tiramisu/multi.py | 1 + .../60_0family_dynamic_1_1/tiramisu/base.py | 1 + .../60_0family_dynamic_1_1/tiramisu/multi.py | 1 + .../tiramisu/no_namespace.py | 1 + .../dictionaries/rougail/00-base.yml | 3 -- .../tiramisu/base.py | 1 + .../tiramisu/multi.py | 1 + .../dictionaries/rougail/00-base.yml | 1 - .../tiramisu/base.py | 1 + .../tiramisu/multi.py | 1 + .../tiramisu/no_namespace.py | 1 + .../dictionaries/rougail/00-base.yml | 2 -- .../tiramisu/base.py | 1 + .../tiramisu/multi.py | 1 + .../tiramisu/no_namespace.py | 1 + .../dictionaries/rougail/00-base.yml | 2 -- .../tiramisu/base.py | 1 + .../tiramisu/multi.py | 1 + .../tiramisu/no_namespace.py | 1 + .../60_0family_empty/tiramisu/base.py | 1 + .../60_0family_empty/tiramisu/multi.py | 1 + .../60_0family_empty/tiramisu/no_namespace.py | 1 + .../60_0family_hidden/tiramisu/base.py | 1 + .../60_0family_hidden/tiramisu/multi.py | 1 + .../tiramisu/no_namespace.py | 1 + .../60_0family_mode/tiramisu/base.py | 1 + .../60_0family_mode/tiramisu/multi.py | 1 + .../60_0family_mode/tiramisu/no_namespace.py | 1 + .../dictionaries/rougail/00-base.yml | 2 -- .../60_1family_dynamic_jinja/tiramisu/base.py | 1 + .../tiramisu/multi.py | 1 + .../tiramisu/no_namespace.py | 1 + .../dictionaries/rougail/00-base.yml | 3 -- .../tiramisu/base.py | 1 + .../tiramisu/multi.py | 1 + .../tiramisu/no_namespace.py | 1 + .../dictionaries/rougail/00-base.yml | 3 -- .../tiramisu/base.py | 1 + .../tiramisu/multi.py | 1 + .../tiramisu/no_namespace.py | 1 + .../dictionaries/rougail/00-base.yml | 3 -- .../tiramisu/base.py | 1 + .../tiramisu/multi.py | 1 + .../tiramisu/no_namespace.py | 1 + .../dictionaries/rougail/00-base.yml | 3 -- .../60_5family_dynamic_calc2/tiramisu/base.py | 1 + .../tiramisu/multi.py | 1 + .../dictionaries/rougail/00-base.yml | 4 --- .../tiramisu/base.py | 1 + .../tiramisu/multi.py | 1 + .../dictionaries/rougail/00-base.yml | 2 -- .../tiramisu/base.py | 1 + .../tiramisu/multi.py | 1 + .../tiramisu/no_namespace.py | 1 + .../__init__.py} | 0 .../dictionaries/rougail/00-base.yml | 11 ++++++++ .../force_namespace | 0 .../makedict/after.json | 6 ++++ .../makedict/base.json | 3 ++ .../makedict/before.json | 6 ++++ .../makedict/mandatory.json | 1 + .../tiramisu/base.py | 12 ++++++++ .../tiramisu/multi.py | 17 +++++++++++ .../dictionaries/rougail/00-base.yml | 3 -- .../tiramisu/base.py | 1 + .../tiramisu/multi.py | 1 + .../tiramisu/no_namespace.py | 1 + .../dictionaries/rougail/00-base.yml | 3 -- .../tiramisu/base.py | 1 + .../tiramisu/multi.py | 1 + .../tiramisu/no_namespace.py | 1 + .../dictionaries/rougail/00-base.yml | 2 -- .../tiramisu/base.py | 1 + .../tiramisu/multi.py | 1 + .../tiramisu/no_namespace.py | 1 + .../dictionaries/rougail/00-base.yml | 6 ---- .../tiramisu/base.py | 1 + .../tiramisu/multi.py | 1 + .../dictionaries/rougail/00-base.yml | 3 -- .../tiramisu/base.py | 1 + .../tiramisu/multi.py | 1 + .../dictionaries/rougail/00-base.yml | 5 ---- .../tiramisu/base.py | 1 + .../tiramisu/multi.py | 1 + .../dictionaries/rougail/00-base.yml | 3 -- .../tiramisu/base.py | 1 + .../tiramisu/multi.py | 1 + .../tiramisu/no_namespace.py | 1 + .../dictionaries/rougail/00-base.yml | 5 ---- .../tiramisu/base.py | 1 + .../tiramisu/multi.py | 1 + .../dictionaries/rougail/00-base.yml | 2 -- .../tiramisu/base.py | 1 + .../tiramisu/multi.py | 1 + .../tiramisu/no_namespace.py | 1 + .../dictionaries/rougail/00-base.yml | 6 ---- .../tiramisu/base.py | 1 + .../tiramisu/multi.py | 1 + .../dictionaries/extra/00-base.yml | 2 -- .../60_9extra_dynamic/tiramisu/base.py | 1 + .../60_9extra_dynamic/tiramisu/multi.py | 1 + .../dictionaries/extra/00-base.yml | 2 -- .../60_9extra_dynamic_extra/tiramisu/base.py | 1 + .../60_9extra_dynamic_extra/tiramisu/multi.py | 1 + .../dictionaries/rougail/00-base.yml | 4 +-- .../tiramisu/base.py | 1 + .../tiramisu/multi.py | 1 + .../tiramisu/no_namespace.py | 1 + .../tiramisu/base.py | 1 + .../tiramisu/multi.py | 1 + .../tiramisu/no_namespace.py | 1 + .../dictionaries/rougail/00-base.yml | 1 - .../dictionaries/extra1/00-base.yml | 1 - .../dictionaries/extra1/00-base.yml | 1 - .../dictionaries/rougail/00-base.yml | 2 -- .../dictionaries/rougail/00-base.yml | 2 -- .../dictionaries/rougail/00-base.yml | 28 ------------------- .../dictionaries/rougail/00-base.yml | 1 - .../dictionaries/rougail/00-base.yml | 1 - .../dictionaries/rougail/00-base.yml | 3 +- .../dictionaries/rougail/00-base.yml | 6 ++-- .../dictionaries/rougail/00-base.yml | 1 - 608 files changed, 678 insertions(+), 269 deletions(-) rename tests/dictionaries/{80leadership_auto_save => 00_6regexp}/__init__.py (100%) create mode 100644 tests/dictionaries/00_6regexp/dictionaries/rougail/00-base.yml create mode 100644 tests/dictionaries/00_6regexp/makedict/after.json create mode 100644 tests/dictionaries/00_6regexp/makedict/base.json create mode 100644 tests/dictionaries/00_6regexp/makedict/before.json create mode 100644 tests/dictionaries/00_6regexp/makedict/mandatory.json create mode 100644 tests/dictionaries/00_6regexp/tiramisu/base.py create mode 100644 tests/dictionaries/00_6regexp/tiramisu/multi.py create mode 100644 tests/dictionaries/00_6regexp/tiramisu/no_namespace.py rename tests/dictionaries/{80leadership_auto_save/errno_29 => 60_5family_dynamic_calc_suffix_disabled/__init__.py} (100%) create mode 100644 tests/dictionaries/60_5family_dynamic_calc_suffix_disabled/dictionaries/rougail/00-base.yml create mode 100644 tests/dictionaries/60_5family_dynamic_calc_suffix_disabled/force_namespace create mode 100644 tests/dictionaries/60_5family_dynamic_calc_suffix_disabled/makedict/after.json create mode 100644 tests/dictionaries/60_5family_dynamic_calc_suffix_disabled/makedict/base.json create mode 100644 tests/dictionaries/60_5family_dynamic_calc_suffix_disabled/makedict/before.json create mode 100644 tests/dictionaries/60_5family_dynamic_calc_suffix_disabled/makedict/mandatory.json create mode 100644 tests/dictionaries/60_5family_dynamic_calc_suffix_disabled/tiramisu/base.py create mode 100644 tests/dictionaries/60_5family_dynamic_calc_suffix_disabled/tiramisu/multi.py delete mode 100644 tests/dictionaries/80leadership_auto_save/dictionaries/rougail/00-base.yml diff --git a/src/rougail/tiramisureflector.py b/src/rougail/tiramisureflector.py index 20e91a38d..dfc985709 100644 --- a/src/rougail/tiramisureflector.py +++ b/src/rougail/tiramisureflector.py @@ -74,6 +74,7 @@ class TiramisuReflector: [ "from tiramisu import *", "from tiramisu.setting import ALLOWED_LEADER_PROPERTIES", + "from re import compile as re_compile", ] ) if self.objectspace.export_with_import: @@ -463,6 +464,13 @@ class Variable(Common): keys["values"] = self.populate_calculation( self.elt.choices, return_a_tuple=True ) + if self.elt.type == 'regexp': + self.object_type = 'Regexp_' + self.option_name + self.tiramisu.text['header'].append(f'''class {self.object_type}(RegexpOption): + __slots__ = tuple() + _type = 'value' +{self.object_type}._regexp = re_compile(r"{self.elt.regexp}") +''') if self.elt.path in self.objectspace.multis: keys["multi"] = self.objectspace.multis[self.elt.path] if hasattr(self.elt, "default") and self.elt.default is not None: diff --git a/tests/dictionaries/00_0empty/tiramisu/base.py b/tests/dictionaries/00_0empty/tiramisu/base.py index 42f38a285..502023bc9 100644 --- a/tests/dictionaries/00_0empty/tiramisu/base.py +++ b/tests/dictionaries/00_0empty/tiramisu/base.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/00_0empty/tiramisu/multi.py b/tests/dictionaries/00_0empty/tiramisu/multi.py index 581c41dfc..a2108b17e 100644 --- a/tests/dictionaries/00_0empty/tiramisu/multi.py +++ b/tests/dictionaries/00_0empty/tiramisu/multi.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/00_0empty/tiramisu/no_namespace.py b/tests/dictionaries/00_0empty/tiramisu/no_namespace.py index 42f38a285..502023bc9 100644 --- a/tests/dictionaries/00_0empty/tiramisu/no_namespace.py +++ b/tests/dictionaries/00_0empty/tiramisu/no_namespace.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/00_0version_underscore/tiramisu/base.py b/tests/dictionaries/00_0version_underscore/tiramisu/base.py index 8256b1d04..202819bb9 100644 --- a/tests/dictionaries/00_0version_underscore/tiramisu/base.py +++ b/tests/dictionaries/00_0version_underscore/tiramisu/base.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/00_0version_underscore/tiramisu/multi.py b/tests/dictionaries/00_0version_underscore/tiramisu/multi.py index ef8cd1bb9..fa45a6c30 100644 --- a/tests/dictionaries/00_0version_underscore/tiramisu/multi.py +++ b/tests/dictionaries/00_0version_underscore/tiramisu/multi.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/00_0version_underscore/tiramisu/no_namespace.py b/tests/dictionaries/00_0version_underscore/tiramisu/no_namespace.py index 222f5011e..95eaca0bc 100644 --- a/tests/dictionaries/00_0version_underscore/tiramisu/no_namespace.py +++ b/tests/dictionaries/00_0version_underscore/tiramisu/no_namespace.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/00_1empty_variable/tiramisu/base.py b/tests/dictionaries/00_1empty_variable/tiramisu/base.py index e08270c6c..940fce0fc 100644 --- a/tests/dictionaries/00_1empty_variable/tiramisu/base.py +++ b/tests/dictionaries/00_1empty_variable/tiramisu/base.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/00_1empty_variable/tiramisu/multi.py b/tests/dictionaries/00_1empty_variable/tiramisu/multi.py index ce191d222..8b2997730 100644 --- a/tests/dictionaries/00_1empty_variable/tiramisu/multi.py +++ b/tests/dictionaries/00_1empty_variable/tiramisu/multi.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/00_1empty_variable/tiramisu/no_namespace.py b/tests/dictionaries/00_1empty_variable/tiramisu/no_namespace.py index 2cb1bd04b..ccd9166bb 100644 --- a/tests/dictionaries/00_1empty_variable/tiramisu/no_namespace.py +++ b/tests/dictionaries/00_1empty_variable/tiramisu/no_namespace.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/00_2default_calculated/dictionaries/rougail/00-base.yml b/tests/dictionaries/00_2default_calculated/dictionaries/rougail/00-base.yml index e65c48b7a..665a99c93 100644 --- a/tests/dictionaries/00_2default_calculated/dictionaries/rougail/00-base.yml +++ b/tests/dictionaries/00_2default_calculated/dictionaries/rougail/00-base.yml @@ -5,7 +5,6 @@ var2: description: a second variable multi: true default: - type: jinja jinja: | {{ _.var1 }} description: the value of var1 diff --git a/tests/dictionaries/00_2default_calculated/tiramisu/base.py b/tests/dictionaries/00_2default_calculated/tiramisu/base.py index 1feb0bae2..6f1ef07ca 100644 --- a/tests/dictionaries/00_2default_calculated/tiramisu/base.py +++ b/tests/dictionaries/00_2default_calculated/tiramisu/base.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/00_2default_calculated/tiramisu/multi.py b/tests/dictionaries/00_2default_calculated/tiramisu/multi.py index 692b118ba..3f401c063 100644 --- a/tests/dictionaries/00_2default_calculated/tiramisu/multi.py +++ b/tests/dictionaries/00_2default_calculated/tiramisu/multi.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/00_2default_calculated/tiramisu/no_namespace.py b/tests/dictionaries/00_2default_calculated/tiramisu/no_namespace.py index 27554a0a2..70c9e66d7 100644 --- a/tests/dictionaries/00_2default_calculated/tiramisu/no_namespace.py +++ b/tests/dictionaries/00_2default_calculated/tiramisu/no_namespace.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/00_2default_calculated_multi/dictionaries/rougail/00-base.yml b/tests/dictionaries/00_2default_calculated_multi/dictionaries/rougail/00-base.yml index f5cc78aee..d2d4efb58 100644 --- a/tests/dictionaries/00_2default_calculated_multi/dictionaries/rougail/00-base.yml +++ b/tests/dictionaries/00_2default_calculated_multi/dictionaries/rougail/00-base.yml @@ -8,7 +8,6 @@ var2: description: a second variable multi: true default: - type: jinja jinja: | {% for val in _.var1 %} {{ val }} diff --git a/tests/dictionaries/00_2default_calculated_multi/tiramisu/base.py b/tests/dictionaries/00_2default_calculated_multi/tiramisu/base.py index 976b0a264..cb974fadf 100644 --- a/tests/dictionaries/00_2default_calculated_multi/tiramisu/base.py +++ b/tests/dictionaries/00_2default_calculated_multi/tiramisu/base.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/00_2default_calculated_multi/tiramisu/multi.py b/tests/dictionaries/00_2default_calculated_multi/tiramisu/multi.py index ecdbb01e5..f07d7608f 100644 --- a/tests/dictionaries/00_2default_calculated_multi/tiramisu/multi.py +++ b/tests/dictionaries/00_2default_calculated_multi/tiramisu/multi.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/00_2default_calculated_multi/tiramisu/no_namespace.py b/tests/dictionaries/00_2default_calculated_multi/tiramisu/no_namespace.py index a755c9d3b..c7b4ff469 100644 --- a/tests/dictionaries/00_2default_calculated_multi/tiramisu/no_namespace.py +++ b/tests/dictionaries/00_2default_calculated_multi/tiramisu/no_namespace.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/00_4load_subfolder/tiramisu/base.py b/tests/dictionaries/00_4load_subfolder/tiramisu/base.py index 72d7634ed..674a62205 100644 --- a/tests/dictionaries/00_4load_subfolder/tiramisu/base.py +++ b/tests/dictionaries/00_4load_subfolder/tiramisu/base.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/00_4load_subfolder/tiramisu/multi.py b/tests/dictionaries/00_4load_subfolder/tiramisu/multi.py index e7fa3e366..b012f389b 100644 --- a/tests/dictionaries/00_4load_subfolder/tiramisu/multi.py +++ b/tests/dictionaries/00_4load_subfolder/tiramisu/multi.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/00_4load_subfolder/tiramisu/no_namespace.py b/tests/dictionaries/00_4load_subfolder/tiramisu/no_namespace.py index e785bfed6..c174783e8 100644 --- a/tests/dictionaries/00_4load_subfolder/tiramisu/no_namespace.py +++ b/tests/dictionaries/00_4load_subfolder/tiramisu/no_namespace.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/00_5load_notype/tiramisu/base.py b/tests/dictionaries/00_5load_notype/tiramisu/base.py index bac48815f..3a1ddb8d1 100644 --- a/tests/dictionaries/00_5load_notype/tiramisu/base.py +++ b/tests/dictionaries/00_5load_notype/tiramisu/base.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/00_5load_notype/tiramisu/multi.py b/tests/dictionaries/00_5load_notype/tiramisu/multi.py index f6996a17f..2c8b0af19 100644 --- a/tests/dictionaries/00_5load_notype/tiramisu/multi.py +++ b/tests/dictionaries/00_5load_notype/tiramisu/multi.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/00_5load_notype/tiramisu/no_namespace.py b/tests/dictionaries/00_5load_notype/tiramisu/no_namespace.py index 4d4361bee..89e566655 100644 --- a/tests/dictionaries/00_5load_notype/tiramisu/no_namespace.py +++ b/tests/dictionaries/00_5load_notype/tiramisu/no_namespace.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/00_6boolean/tiramisu/base.py b/tests/dictionaries/00_6boolean/tiramisu/base.py index 4f1578ce4..542169595 100644 --- a/tests/dictionaries/00_6boolean/tiramisu/base.py +++ b/tests/dictionaries/00_6boolean/tiramisu/base.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/00_6boolean/tiramisu/multi.py b/tests/dictionaries/00_6boolean/tiramisu/multi.py index 56f9edf32..e9d07f6cf 100644 --- a/tests/dictionaries/00_6boolean/tiramisu/multi.py +++ b/tests/dictionaries/00_6boolean/tiramisu/multi.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/00_6boolean/tiramisu/no_namespace.py b/tests/dictionaries/00_6boolean/tiramisu/no_namespace.py index 81f9afc8f..409556674 100644 --- a/tests/dictionaries/00_6boolean/tiramisu/no_namespace.py +++ b/tests/dictionaries/00_6boolean/tiramisu/no_namespace.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/00_6boolean_no_mandatory/tiramisu/base.py b/tests/dictionaries/00_6boolean_no_mandatory/tiramisu/base.py index 3a3a7a7a7..d8a202523 100644 --- a/tests/dictionaries/00_6boolean_no_mandatory/tiramisu/base.py +++ b/tests/dictionaries/00_6boolean_no_mandatory/tiramisu/base.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/00_6boolean_no_mandatory/tiramisu/multi.py b/tests/dictionaries/00_6boolean_no_mandatory/tiramisu/multi.py index a7e1f981b..186290bc7 100644 --- a/tests/dictionaries/00_6boolean_no_mandatory/tiramisu/multi.py +++ b/tests/dictionaries/00_6boolean_no_mandatory/tiramisu/multi.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/00_6boolean_no_mandatory/tiramisu/no_namespace.py b/tests/dictionaries/00_6boolean_no_mandatory/tiramisu/no_namespace.py index 239ec9ff7..b1df0ba0d 100644 --- a/tests/dictionaries/00_6boolean_no_mandatory/tiramisu/no_namespace.py +++ b/tests/dictionaries/00_6boolean_no_mandatory/tiramisu/no_namespace.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/00_6choice/tiramisu/base.py b/tests/dictionaries/00_6choice/tiramisu/base.py index 0b23cd55c..8853e008e 100644 --- a/tests/dictionaries/00_6choice/tiramisu/base.py +++ b/tests/dictionaries/00_6choice/tiramisu/base.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/00_6choice/tiramisu/multi.py b/tests/dictionaries/00_6choice/tiramisu/multi.py index fbf45e2ad..33f677117 100644 --- a/tests/dictionaries/00_6choice/tiramisu/multi.py +++ b/tests/dictionaries/00_6choice/tiramisu/multi.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/00_6choice/tiramisu/no_namespace.py b/tests/dictionaries/00_6choice/tiramisu/no_namespace.py index 050f22005..614fae5e4 100644 --- a/tests/dictionaries/00_6choice/tiramisu/no_namespace.py +++ b/tests/dictionaries/00_6choice/tiramisu/no_namespace.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/00_6choice_calculation/dictionaries/rougail/00-base.yml b/tests/dictionaries/00_6choice_calculation/dictionaries/rougail/00-base.yml index dd4777941..1d03c4647 100644 --- a/tests/dictionaries/00_6choice_calculation/dictionaries/rougail/00-base.yml +++ b/tests/dictionaries/00_6choice_calculation/dictionaries/rougail/00-base.yml @@ -4,7 +4,6 @@ var: description: a variable default: 9 choices: - type: jinja jinja: | {% for n in trange(0, 10) %} {{ n }} diff --git a/tests/dictionaries/00_6choice_calculation/tiramisu/base.py b/tests/dictionaries/00_6choice_calculation/tiramisu/base.py index 5a3c5d67b..0e4698a2c 100644 --- a/tests/dictionaries/00_6choice_calculation/tiramisu/base.py +++ b/tests/dictionaries/00_6choice_calculation/tiramisu/base.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/00_6choice_calculation/tiramisu/multi.py b/tests/dictionaries/00_6choice_calculation/tiramisu/multi.py index 798549b81..1aa6b87d7 100644 --- a/tests/dictionaries/00_6choice_calculation/tiramisu/multi.py +++ b/tests/dictionaries/00_6choice_calculation/tiramisu/multi.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/00_6choice_calculation/tiramisu/no_namespace.py b/tests/dictionaries/00_6choice_calculation/tiramisu/no_namespace.py index 8aa806558..e43c9a948 100644 --- a/tests/dictionaries/00_6choice_calculation/tiramisu/no_namespace.py +++ b/tests/dictionaries/00_6choice_calculation/tiramisu/no_namespace.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/00_6choice_variable/dictionaries/rougail/00-base.yml b/tests/dictionaries/00_6choice_variable/dictionaries/rougail/00-base.yml index c33a775a2..466b18105 100644 --- a/tests/dictionaries/00_6choice_variable/dictionaries/rougail/00-base.yml +++ b/tests/dictionaries/00_6choice_variable/dictionaries/rougail/00-base.yml @@ -8,5 +8,4 @@ var2: description: a first variable default: a choices: - type: variable variable: _.var1 diff --git a/tests/dictionaries/00_6choice_variable/tiramisu/base.py b/tests/dictionaries/00_6choice_variable/tiramisu/base.py index 6ff66ff41..6a1c78978 100644 --- a/tests/dictionaries/00_6choice_variable/tiramisu/base.py +++ b/tests/dictionaries/00_6choice_variable/tiramisu/base.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/00_6choice_variable/tiramisu/multi.py b/tests/dictionaries/00_6choice_variable/tiramisu/multi.py index bb997522b..0812085e9 100644 --- a/tests/dictionaries/00_6choice_variable/tiramisu/multi.py +++ b/tests/dictionaries/00_6choice_variable/tiramisu/multi.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/00_6choice_variable/tiramisu/no_namespace.py b/tests/dictionaries/00_6choice_variable/tiramisu/no_namespace.py index 4083f4bc5..0dc88364a 100644 --- a/tests/dictionaries/00_6choice_variable/tiramisu/no_namespace.py +++ b/tests/dictionaries/00_6choice_variable/tiramisu/no_namespace.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/00_6custom/tiramisu/base.py b/tests/dictionaries/00_6custom/tiramisu/base.py index ec3f9bd5b..2f0f4801e 100644 --- a/tests/dictionaries/00_6custom/tiramisu/base.py +++ b/tests/dictionaries/00_6custom/tiramisu/base.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/00_6custom/tiramisu/multi.py b/tests/dictionaries/00_6custom/tiramisu/multi.py index b138fad33..14054f083 100644 --- a/tests/dictionaries/00_6custom/tiramisu/multi.py +++ b/tests/dictionaries/00_6custom/tiramisu/multi.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/00_6custom/tiramisu/no_namespace.py b/tests/dictionaries/00_6custom/tiramisu/no_namespace.py index b8db67d92..8196ed1b3 100644 --- a/tests/dictionaries/00_6custom/tiramisu/no_namespace.py +++ b/tests/dictionaries/00_6custom/tiramisu/no_namespace.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/00_6domainname/tiramisu/base.py b/tests/dictionaries/00_6domainname/tiramisu/base.py index c6044d4b7..5c24669cb 100644 --- a/tests/dictionaries/00_6domainname/tiramisu/base.py +++ b/tests/dictionaries/00_6domainname/tiramisu/base.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/00_6domainname/tiramisu/multi.py b/tests/dictionaries/00_6domainname/tiramisu/multi.py index bc3ebcef2..e57f013ef 100644 --- a/tests/dictionaries/00_6domainname/tiramisu/multi.py +++ b/tests/dictionaries/00_6domainname/tiramisu/multi.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/00_6domainname/tiramisu/no_namespace.py b/tests/dictionaries/00_6domainname/tiramisu/no_namespace.py index 54e370a36..c2cf1043c 100644 --- a/tests/dictionaries/00_6domainname/tiramisu/no_namespace.py +++ b/tests/dictionaries/00_6domainname/tiramisu/no_namespace.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/00_6domainname_params/tiramisu/base.py b/tests/dictionaries/00_6domainname_params/tiramisu/base.py index 414e06f7f..f303a80f4 100644 --- a/tests/dictionaries/00_6domainname_params/tiramisu/base.py +++ b/tests/dictionaries/00_6domainname_params/tiramisu/base.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/00_6domainname_params/tiramisu/multi.py b/tests/dictionaries/00_6domainname_params/tiramisu/multi.py index 41f313101..9e9ebe742 100644 --- a/tests/dictionaries/00_6domainname_params/tiramisu/multi.py +++ b/tests/dictionaries/00_6domainname_params/tiramisu/multi.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/00_6domainname_params/tiramisu/no_namespace.py b/tests/dictionaries/00_6domainname_params/tiramisu/no_namespace.py index 6a7781fdb..77cfae4d1 100644 --- a/tests/dictionaries/00_6domainname_params/tiramisu/no_namespace.py +++ b/tests/dictionaries/00_6domainname_params/tiramisu/no_namespace.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/00_6float/tiramisu/base.py b/tests/dictionaries/00_6float/tiramisu/base.py index a3dd8aff6..78062ddb8 100644 --- a/tests/dictionaries/00_6float/tiramisu/base.py +++ b/tests/dictionaries/00_6float/tiramisu/base.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/00_6float/tiramisu/multi.py b/tests/dictionaries/00_6float/tiramisu/multi.py index d3a2b4883..322ed89ec 100644 --- a/tests/dictionaries/00_6float/tiramisu/multi.py +++ b/tests/dictionaries/00_6float/tiramisu/multi.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/00_6float/tiramisu/no_namespace.py b/tests/dictionaries/00_6float/tiramisu/no_namespace.py index 69c359dd9..6fd927bd7 100644 --- a/tests/dictionaries/00_6float/tiramisu/no_namespace.py +++ b/tests/dictionaries/00_6float/tiramisu/no_namespace.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/00_6number/tiramisu/base.py b/tests/dictionaries/00_6number/tiramisu/base.py index 884285b62..9b59737a5 100644 --- a/tests/dictionaries/00_6number/tiramisu/base.py +++ b/tests/dictionaries/00_6number/tiramisu/base.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/00_6number/tiramisu/multi.py b/tests/dictionaries/00_6number/tiramisu/multi.py index d9a4b8cf1..116ba6559 100644 --- a/tests/dictionaries/00_6number/tiramisu/multi.py +++ b/tests/dictionaries/00_6number/tiramisu/multi.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/00_6number/tiramisu/no_namespace.py b/tests/dictionaries/00_6number/tiramisu/no_namespace.py index 7b2e1c989..bc22f4c99 100644 --- a/tests/dictionaries/00_6number/tiramisu/no_namespace.py +++ b/tests/dictionaries/00_6number/tiramisu/no_namespace.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/80leadership_auto_save/__init__.py b/tests/dictionaries/00_6regexp/__init__.py similarity index 100% rename from tests/dictionaries/80leadership_auto_save/__init__.py rename to tests/dictionaries/00_6regexp/__init__.py diff --git a/tests/dictionaries/00_6regexp/dictionaries/rougail/00-base.yml b/tests/dictionaries/00_6regexp/dictionaries/rougail/00-base.yml new file mode 100644 index 000000000..4ae94d9aa --- /dev/null +++ b/tests/dictionaries/00_6regexp/dictionaries/rougail/00-base.yml @@ -0,0 +1,6 @@ +--- +version: '1.1' +var: + description: a first variable + regexp: "^#(?:[0-9a-f]{3}){1,2}$" + default: "#a1a1a1" diff --git a/tests/dictionaries/00_6regexp/makedict/after.json b/tests/dictionaries/00_6regexp/makedict/after.json new file mode 100644 index 000000000..6ff65a2ba --- /dev/null +++ b/tests/dictionaries/00_6regexp/makedict/after.json @@ -0,0 +1,6 @@ +{ + "rougail.var": { + "owner": "default", + "value": "#a1a1a1" + } +} diff --git a/tests/dictionaries/00_6regexp/makedict/base.json b/tests/dictionaries/00_6regexp/makedict/base.json new file mode 100644 index 000000000..1d285fa84 --- /dev/null +++ b/tests/dictionaries/00_6regexp/makedict/base.json @@ -0,0 +1,3 @@ +{ + "rougail.var": "#a1a1a1" +} diff --git a/tests/dictionaries/00_6regexp/makedict/before.json b/tests/dictionaries/00_6regexp/makedict/before.json new file mode 100644 index 000000000..6ff65a2ba --- /dev/null +++ b/tests/dictionaries/00_6regexp/makedict/before.json @@ -0,0 +1,6 @@ +{ + "rougail.var": { + "owner": "default", + "value": "#a1a1a1" + } +} diff --git a/tests/dictionaries/00_6regexp/makedict/mandatory.json b/tests/dictionaries/00_6regexp/makedict/mandatory.json new file mode 100644 index 000000000..0637a088a --- /dev/null +++ b/tests/dictionaries/00_6regexp/makedict/mandatory.json @@ -0,0 +1 @@ +[] \ No newline at end of file diff --git a/tests/dictionaries/00_6regexp/tiramisu/base.py b/tests/dictionaries/00_6regexp/tiramisu/base.py new file mode 100644 index 000000000..8c51ba288 --- /dev/null +++ b/tests/dictionaries/00_6regexp/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('tests/dictionaries/../eosfunc/test.py') +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("standard") +ALLOWED_LEADER_PROPERTIES.add("advanced") +class Regexp_option_2(RegexpOption): + __slots__ = tuple() + _type = 'value' +Regexp_option_2._regexp = re_compile(r"^#(?:[0-9a-f]{3}){1,2}$") + +option_2 = Regexp_option_2(name="var", doc="a first variable", default="#a1a1a1", properties=frozenset({"mandatory", "standard"}), informations={'type': 'regexp'}) +optiondescription_1 = OptionDescription(name="rougail", doc="Rougail", children=[option_2], properties=frozenset({"standard"})) +option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_1]) diff --git a/tests/dictionaries/00_6regexp/tiramisu/multi.py b/tests/dictionaries/00_6regexp/tiramisu/multi.py new file mode 100644 index 000000000..50e4bd86e --- /dev/null +++ b/tests/dictionaries/00_6regexp/tiramisu/multi.py @@ -0,0 +1,25 @@ +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('tests/dictionaries/../eosfunc/test.py') +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("standard") +ALLOWED_LEADER_PROPERTIES.add("advanced") +class Regexp_option_3(RegexpOption): + __slots__ = tuple() + _type = 'value' +Regexp_option_3._regexp = re_compile(r"^#(?:[0-9a-f]{3}){1,2}$") + +class Regexp_option_6(RegexpOption): + __slots__ = tuple() + _type = 'value' +Regexp_option_6._regexp = re_compile(r"^#(?:[0-9a-f]{3}){1,2}$") + +option_3 = Regexp_option_3(name="var", doc="a first variable", default="#a1a1a1", properties=frozenset({"mandatory", "standard"}), informations={'type': 'regexp'}) +optiondescription_2 = OptionDescription(name="rougail", doc="Rougail", children=[option_3], properties=frozenset({"standard"})) +optiondescription_1 = OptionDescription(name="1", doc="1", children=[optiondescription_2], properties=frozenset({"standard"})) +option_6 = Regexp_option_6(name="var", doc="a first variable", default="#a1a1a1", properties=frozenset({"mandatory", "standard"}), informations={'type': 'regexp'}) +optiondescription_5 = OptionDescription(name="rougail", doc="Rougail", children=[option_6], properties=frozenset({"standard"})) +optiondescription_4 = OptionDescription(name="2", doc="2", children=[optiondescription_5], properties=frozenset({"standard"})) +option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_1, optiondescription_4]) diff --git a/tests/dictionaries/00_6regexp/tiramisu/no_namespace.py b/tests/dictionaries/00_6regexp/tiramisu/no_namespace.py new file mode 100644 index 000000000..e022fc59d --- /dev/null +++ b/tests/dictionaries/00_6regexp/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('tests/dictionaries/../eosfunc/test.py') +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("standard") +ALLOWED_LEADER_PROPERTIES.add("advanced") +class Regexp_option_1(RegexpOption): + __slots__ = tuple() + _type = 'value' +Regexp_option_1._regexp = re_compile(r"^#(?:[0-9a-f]{3}){1,2}$") + +option_1 = Regexp_option_1(name="var", doc="a first variable", default="#a1a1a1", properties=frozenset({"mandatory", "standard"}), informations={'type': 'regexp'}) +option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1]) diff --git a/tests/dictionaries/00_6string/tiramisu/base.py b/tests/dictionaries/00_6string/tiramisu/base.py index 7d94c76ed..31d37ecd7 100644 --- a/tests/dictionaries/00_6string/tiramisu/base.py +++ b/tests/dictionaries/00_6string/tiramisu/base.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/00_6string/tiramisu/multi.py b/tests/dictionaries/00_6string/tiramisu/multi.py index e2a20311e..bb922d328 100644 --- a/tests/dictionaries/00_6string/tiramisu/multi.py +++ b/tests/dictionaries/00_6string/tiramisu/multi.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/00_6string/tiramisu/no_namespace.py b/tests/dictionaries/00_6string/tiramisu/no_namespace.py index 4ba8115ab..46baaf11d 100644 --- a/tests/dictionaries/00_6string/tiramisu/no_namespace.py +++ b/tests/dictionaries/00_6string/tiramisu/no_namespace.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/00_7choice_quote/tiramisu/base.py b/tests/dictionaries/00_7choice_quote/tiramisu/base.py index fec873fb7..c4a07dbc0 100644 --- a/tests/dictionaries/00_7choice_quote/tiramisu/base.py +++ b/tests/dictionaries/00_7choice_quote/tiramisu/base.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/00_7choice_quote/tiramisu/multi.py b/tests/dictionaries/00_7choice_quote/tiramisu/multi.py index 99ba28dce..53093206f 100644 --- a/tests/dictionaries/00_7choice_quote/tiramisu/multi.py +++ b/tests/dictionaries/00_7choice_quote/tiramisu/multi.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/00_7choice_quote/tiramisu/no_namespace.py b/tests/dictionaries/00_7choice_quote/tiramisu/no_namespace.py index fbb3be8ab..aa750bc13 100644 --- a/tests/dictionaries/00_7choice_quote/tiramisu/no_namespace.py +++ b/tests/dictionaries/00_7choice_quote/tiramisu/no_namespace.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/00_7help_quote/tiramisu/base.py b/tests/dictionaries/00_7help_quote/tiramisu/base.py index cfc54192c..49eef2b49 100644 --- a/tests/dictionaries/00_7help_quote/tiramisu/base.py +++ b/tests/dictionaries/00_7help_quote/tiramisu/base.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/00_7help_quote/tiramisu/multi.py b/tests/dictionaries/00_7help_quote/tiramisu/multi.py index 71cbddc85..ce2f802cf 100644 --- a/tests/dictionaries/00_7help_quote/tiramisu/multi.py +++ b/tests/dictionaries/00_7help_quote/tiramisu/multi.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/00_7help_quote/tiramisu/no_namespace.py b/tests/dictionaries/00_7help_quote/tiramisu/no_namespace.py index 6d98c516f..ac7d9bec2 100644 --- a/tests/dictionaries/00_7help_quote/tiramisu/no_namespace.py +++ b/tests/dictionaries/00_7help_quote/tiramisu/no_namespace.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/00_7value_doublequote/tiramisu/base.py b/tests/dictionaries/00_7value_doublequote/tiramisu/base.py index 380bc13b9..0b3503902 100644 --- a/tests/dictionaries/00_7value_doublequote/tiramisu/base.py +++ b/tests/dictionaries/00_7value_doublequote/tiramisu/base.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/00_7value_doublequote/tiramisu/multi.py b/tests/dictionaries/00_7value_doublequote/tiramisu/multi.py index 66d67aa47..4966bb96d 100644 --- a/tests/dictionaries/00_7value_doublequote/tiramisu/multi.py +++ b/tests/dictionaries/00_7value_doublequote/tiramisu/multi.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/00_7value_doublequote/tiramisu/no_namespace.py b/tests/dictionaries/00_7value_doublequote/tiramisu/no_namespace.py index 908fa2b5f..269b70226 100644 --- a/tests/dictionaries/00_7value_doublequote/tiramisu/no_namespace.py +++ b/tests/dictionaries/00_7value_doublequote/tiramisu/no_namespace.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/00_7value_doublequote2/tiramisu/base.py b/tests/dictionaries/00_7value_doublequote2/tiramisu/base.py index 751ca7f4c..1dba552e7 100644 --- a/tests/dictionaries/00_7value_doublequote2/tiramisu/base.py +++ b/tests/dictionaries/00_7value_doublequote2/tiramisu/base.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/00_7value_doublequote2/tiramisu/multi.py b/tests/dictionaries/00_7value_doublequote2/tiramisu/multi.py index 47a45c6bb..5bbf144ad 100644 --- a/tests/dictionaries/00_7value_doublequote2/tiramisu/multi.py +++ b/tests/dictionaries/00_7value_doublequote2/tiramisu/multi.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/00_7value_doublequote2/tiramisu/no_namespace.py b/tests/dictionaries/00_7value_doublequote2/tiramisu/no_namespace.py index da2fbba64..495ba597c 100644 --- a/tests/dictionaries/00_7value_doublequote2/tiramisu/no_namespace.py +++ b/tests/dictionaries/00_7value_doublequote2/tiramisu/no_namespace.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/00_7value_doublequote3/tiramisu/base.py b/tests/dictionaries/00_7value_doublequote3/tiramisu/base.py index 1f99cf92f..a91c2df88 100644 --- a/tests/dictionaries/00_7value_doublequote3/tiramisu/base.py +++ b/tests/dictionaries/00_7value_doublequote3/tiramisu/base.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/00_7value_doublequote3/tiramisu/multi.py b/tests/dictionaries/00_7value_doublequote3/tiramisu/multi.py index dfdd0b5e8..0f8bfa62a 100644 --- a/tests/dictionaries/00_7value_doublequote3/tiramisu/multi.py +++ b/tests/dictionaries/00_7value_doublequote3/tiramisu/multi.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/00_7value_doublequote3/tiramisu/no_namespace.py b/tests/dictionaries/00_7value_doublequote3/tiramisu/no_namespace.py index a9daf3654..3a3385ad2 100644 --- a/tests/dictionaries/00_7value_doublequote3/tiramisu/no_namespace.py +++ b/tests/dictionaries/00_7value_doublequote3/tiramisu/no_namespace.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/00_7value_quote/tiramisu/base.py b/tests/dictionaries/00_7value_quote/tiramisu/base.py index 7c0a2f533..9ceda4223 100644 --- a/tests/dictionaries/00_7value_quote/tiramisu/base.py +++ b/tests/dictionaries/00_7value_quote/tiramisu/base.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/00_7value_quote/tiramisu/multi.py b/tests/dictionaries/00_7value_quote/tiramisu/multi.py index 77da1110c..80d750f66 100644 --- a/tests/dictionaries/00_7value_quote/tiramisu/multi.py +++ b/tests/dictionaries/00_7value_quote/tiramisu/multi.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/00_7value_quote/tiramisu/no_namespace.py b/tests/dictionaries/00_7value_quote/tiramisu/no_namespace.py index f42b06498..1480a0efb 100644 --- a/tests/dictionaries/00_7value_quote/tiramisu/no_namespace.py +++ b/tests/dictionaries/00_7value_quote/tiramisu/no_namespace.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/00_8calculation_information/dictionaries/rougail/00-base.yml b/tests/dictionaries/00_8calculation_information/dictionaries/rougail/00-base.yml index fe5effe0c..58a188b35 100644 --- a/tests/dictionaries/00_8calculation_information/dictionaries/rougail/00-base.yml +++ b/tests/dictionaries/00_8calculation_information/dictionaries/rougail/00-base.yml @@ -3,7 +3,6 @@ version: '1.1' variable: description: a variable default: - type: jinja jinja: | {{test_information }} params: diff --git a/tests/dictionaries/00_8calculation_information/tiramisu/base.py b/tests/dictionaries/00_8calculation_information/tiramisu/base.py index d9d2ef6cf..a47f12528 100644 --- a/tests/dictionaries/00_8calculation_information/tiramisu/base.py +++ b/tests/dictionaries/00_8calculation_information/tiramisu/base.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/00_8calculation_information/tiramisu/multi.py b/tests/dictionaries/00_8calculation_information/tiramisu/multi.py index 0ba8a4d6f..33c84c54a 100644 --- a/tests/dictionaries/00_8calculation_information/tiramisu/multi.py +++ b/tests/dictionaries/00_8calculation_information/tiramisu/multi.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/00_8calculation_information/tiramisu/no_namespace.py b/tests/dictionaries/00_8calculation_information/tiramisu/no_namespace.py index c30e90f08..d00814f7e 100644 --- a/tests/dictionaries/00_8calculation_information/tiramisu/no_namespace.py +++ b/tests/dictionaries/00_8calculation_information/tiramisu/no_namespace.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/00_8test/tiramisu/base.py b/tests/dictionaries/00_8test/tiramisu/base.py index 9a340a592..6fee30fdb 100644 --- a/tests/dictionaries/00_8test/tiramisu/base.py +++ b/tests/dictionaries/00_8test/tiramisu/base.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/00_8test/tiramisu/multi.py b/tests/dictionaries/00_8test/tiramisu/multi.py index caeef9917..c3bba8b40 100644 --- a/tests/dictionaries/00_8test/tiramisu/multi.py +++ b/tests/dictionaries/00_8test/tiramisu/multi.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/00_8test/tiramisu/no_namespace.py b/tests/dictionaries/00_8test/tiramisu/no_namespace.py index d16a8f80d..833e6f54a 100644 --- a/tests/dictionaries/00_8test/tiramisu/no_namespace.py +++ b/tests/dictionaries/00_8test/tiramisu/no_namespace.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/00_9choice_variable_multi/tiramisu/base.py b/tests/dictionaries/00_9choice_variable_multi/tiramisu/base.py index 1b4c3a732..c67d7bcb9 100644 --- a/tests/dictionaries/00_9choice_variable_multi/tiramisu/base.py +++ b/tests/dictionaries/00_9choice_variable_multi/tiramisu/base.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/00_9choice_variable_multi/tiramisu/multi.py b/tests/dictionaries/00_9choice_variable_multi/tiramisu/multi.py index 72d8475b3..b63c46f56 100644 --- a/tests/dictionaries/00_9choice_variable_multi/tiramisu/multi.py +++ b/tests/dictionaries/00_9choice_variable_multi/tiramisu/multi.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/00_9choice_variable_multi/tiramisu/no_namespace.py b/tests/dictionaries/00_9choice_variable_multi/tiramisu/no_namespace.py index 1e797e50e..ebf29c94d 100644 --- a/tests/dictionaries/00_9choice_variable_multi/tiramisu/no_namespace.py +++ b/tests/dictionaries/00_9choice_variable_multi/tiramisu/no_namespace.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/00_9choice_variables/dictionaries/rougail/00-base.yml b/tests/dictionaries/00_9choice_variables/dictionaries/rougail/00-base.yml index d72d8250a..b08b48c89 100644 --- a/tests/dictionaries/00_9choice_variables/dictionaries/rougail/00-base.yml +++ b/tests/dictionaries/00_9choice_variables/dictionaries/rougail/00-base.yml @@ -6,8 +6,6 @@ my_variable: description: a variable type: choice choices: - - type: variable - variable: _.source_variable_1 - - type: variable - variable: _.source_variable_2 + - variable: _.source_variable_1 + - variable: _.source_variable_2 default: val1 diff --git a/tests/dictionaries/00_9choice_variables/tiramisu/base.py b/tests/dictionaries/00_9choice_variables/tiramisu/base.py index c1cdc2412..2e48ad0f0 100644 --- a/tests/dictionaries/00_9choice_variables/tiramisu/base.py +++ b/tests/dictionaries/00_9choice_variables/tiramisu/base.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/00_9choice_variables/tiramisu/multi.py b/tests/dictionaries/00_9choice_variables/tiramisu/multi.py index 4b963cb8c..d4e760ad9 100644 --- a/tests/dictionaries/00_9choice_variables/tiramisu/multi.py +++ b/tests/dictionaries/00_9choice_variables/tiramisu/multi.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/00_9choice_variables/tiramisu/no_namespace.py b/tests/dictionaries/00_9choice_variables/tiramisu/no_namespace.py index 94943c699..99312a1e1 100644 --- a/tests/dictionaries/00_9choice_variables/tiramisu/no_namespace.py +++ b/tests/dictionaries/00_9choice_variables/tiramisu/no_namespace.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/00_9default_calculation/dictionaries/rougail/00-base.yml b/tests/dictionaries/00_9default_calculation/dictionaries/rougail/00-base.yml index 33c22c08b..dfaf11e12 100644 --- a/tests/dictionaries/00_9default_calculation/dictionaries/rougail/00-base.yml +++ b/tests/dictionaries/00_9default_calculation/dictionaries/rougail/00-base.yml @@ -3,7 +3,6 @@ version: '1.1' variable: description: a variable default: - type: jinja jinja: | {{ param1 }}_{{ param2 }}_{{ param3 }}_{{ param4 }} params: diff --git a/tests/dictionaries/00_9default_calculation/tiramisu/base.py b/tests/dictionaries/00_9default_calculation/tiramisu/base.py index c9e1d1e07..394466a0b 100644 --- a/tests/dictionaries/00_9default_calculation/tiramisu/base.py +++ b/tests/dictionaries/00_9default_calculation/tiramisu/base.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/00_9default_calculation/tiramisu/multi.py b/tests/dictionaries/00_9default_calculation/tiramisu/multi.py index 1d8d97e5a..df86343ea 100644 --- a/tests/dictionaries/00_9default_calculation/tiramisu/multi.py +++ b/tests/dictionaries/00_9default_calculation/tiramisu/multi.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/00_9default_calculation/tiramisu/no_namespace.py b/tests/dictionaries/00_9default_calculation/tiramisu/no_namespace.py index 011cf1cac..0cf64f60e 100644 --- a/tests/dictionaries/00_9default_calculation/tiramisu/no_namespace.py +++ b/tests/dictionaries/00_9default_calculation/tiramisu/no_namespace.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/00_9default_calculation_information/dictionaries/rougail/00-base.yml b/tests/dictionaries/00_9default_calculation_information/dictionaries/rougail/00-base.yml index e2ef8d19f..490363f06 100644 --- a/tests/dictionaries/00_9default_calculation_information/dictionaries/rougail/00-base.yml +++ b/tests/dictionaries/00_9default_calculation_information/dictionaries/rougail/00-base.yml @@ -3,7 +3,6 @@ version: '1.1' var: description: a variable default: - type: jinja jinja: '{{ information }}' params: information: diff --git a/tests/dictionaries/00_9default_calculation_information/tiramisu/base.py b/tests/dictionaries/00_9default_calculation_information/tiramisu/base.py index 2211ad7f1..7968e6036 100644 --- a/tests/dictionaries/00_9default_calculation_information/tiramisu/base.py +++ b/tests/dictionaries/00_9default_calculation_information/tiramisu/base.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/00_9default_calculation_information/tiramisu/multi.py b/tests/dictionaries/00_9default_calculation_information/tiramisu/multi.py index a5274df02..1bd80aabb 100644 --- a/tests/dictionaries/00_9default_calculation_information/tiramisu/multi.py +++ b/tests/dictionaries/00_9default_calculation_information/tiramisu/multi.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/00_9default_calculation_information/tiramisu/no_namespace.py b/tests/dictionaries/00_9default_calculation_information/tiramisu/no_namespace.py index 4ab167558..f1b068740 100644 --- a/tests/dictionaries/00_9default_calculation_information/tiramisu/no_namespace.py +++ b/tests/dictionaries/00_9default_calculation_information/tiramisu/no_namespace.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/00_9default_calculation_information_other_variable/dictionaries/rougail/00-base.yml b/tests/dictionaries/00_9default_calculation_information_other_variable/dictionaries/rougail/00-base.yml index 0b8a20922..9a92c7474 100644 --- a/tests/dictionaries/00_9default_calculation_information_other_variable/dictionaries/rougail/00-base.yml +++ b/tests/dictionaries/00_9default_calculation_information_other_variable/dictionaries/rougail/00-base.yml @@ -4,7 +4,6 @@ var1: # a first variable var2: description: a second variable default: - type: jinja jinja: | {{ information }} params: diff --git a/tests/dictionaries/00_9default_calculation_information_other_variable/tiramisu/base.py b/tests/dictionaries/00_9default_calculation_information_other_variable/tiramisu/base.py index b6b269338..bbf1be65e 100644 --- a/tests/dictionaries/00_9default_calculation_information_other_variable/tiramisu/base.py +++ b/tests/dictionaries/00_9default_calculation_information_other_variable/tiramisu/base.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/00_9default_calculation_information_other_variable/tiramisu/multi.py b/tests/dictionaries/00_9default_calculation_information_other_variable/tiramisu/multi.py index 0ca5a9f54..37dcefe2f 100644 --- a/tests/dictionaries/00_9default_calculation_information_other_variable/tiramisu/multi.py +++ b/tests/dictionaries/00_9default_calculation_information_other_variable/tiramisu/multi.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/00_9default_calculation_information_other_variable/tiramisu/no_namespace.py b/tests/dictionaries/00_9default_calculation_information_other_variable/tiramisu/no_namespace.py index db626d74c..483446106 100644 --- a/tests/dictionaries/00_9default_calculation_information_other_variable/tiramisu/no_namespace.py +++ b/tests/dictionaries/00_9default_calculation_information_other_variable/tiramisu/no_namespace.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/00_9default_calculation_multi_optional/dictionaries/rougail/00-base.yml b/tests/dictionaries/00_9default_calculation_multi_optional/dictionaries/rougail/00-base.yml index b7f77ba8c..a7e65c039 100644 --- a/tests/dictionaries/00_9default_calculation_multi_optional/dictionaries/rougail/00-base.yml +++ b/tests/dictionaries/00_9default_calculation_multi_optional/dictionaries/rougail/00-base.yml @@ -5,9 +5,7 @@ my_variable: my_calculated_variable: multi: true default: - - type: variable - variable: _.my_variable + - variable: _.my_variable optional: true - - type: variable - variable: _.my_variable_unexists + - variable: _.my_variable_unexists optional: true diff --git a/tests/dictionaries/00_9default_calculation_multi_optional/tiramisu/base.py b/tests/dictionaries/00_9default_calculation_multi_optional/tiramisu/base.py index 04caf8637..09e1f9458 100644 --- a/tests/dictionaries/00_9default_calculation_multi_optional/tiramisu/base.py +++ b/tests/dictionaries/00_9default_calculation_multi_optional/tiramisu/base.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/00_9default_calculation_multi_optional/tiramisu/multi.py b/tests/dictionaries/00_9default_calculation_multi_optional/tiramisu/multi.py index 646fdd657..6617b15f9 100644 --- a/tests/dictionaries/00_9default_calculation_multi_optional/tiramisu/multi.py +++ b/tests/dictionaries/00_9default_calculation_multi_optional/tiramisu/multi.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/00_9default_calculation_multi_optional/tiramisu/no_namespace.py b/tests/dictionaries/00_9default_calculation_multi_optional/tiramisu/no_namespace.py index 2796d5e6a..2df77f6b5 100644 --- a/tests/dictionaries/00_9default_calculation_multi_optional/tiramisu/no_namespace.py +++ b/tests/dictionaries/00_9default_calculation_multi_optional/tiramisu/no_namespace.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/00_9default_calculation_multi_optional2/dictionaries/rougail/00-base.yml b/tests/dictionaries/00_9default_calculation_multi_optional2/dictionaries/rougail/00-base.yml index 57a5ac530..ca1582efd 100644 --- a/tests/dictionaries/00_9default_calculation_multi_optional2/dictionaries/rougail/00-base.yml +++ b/tests/dictionaries/00_9default_calculation_multi_optional2/dictionaries/rougail/00-base.yml @@ -5,9 +5,7 @@ my_variable: my_calculated_variable: multi: true default: - - type: variable - variable: _.my_variable_unexists + - variable: _.my_variable_unexists optional: true - - type: variable - variable: _.my_variable + - variable: _.my_variable optional: true diff --git a/tests/dictionaries/00_9default_calculation_multi_optional2/tiramisu/base.py b/tests/dictionaries/00_9default_calculation_multi_optional2/tiramisu/base.py index cbe718bd1..d0f60ef8b 100644 --- a/tests/dictionaries/00_9default_calculation_multi_optional2/tiramisu/base.py +++ b/tests/dictionaries/00_9default_calculation_multi_optional2/tiramisu/base.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/00_9default_calculation_multi_optional2/tiramisu/multi.py b/tests/dictionaries/00_9default_calculation_multi_optional2/tiramisu/multi.py index 085901031..4620b87b6 100644 --- a/tests/dictionaries/00_9default_calculation_multi_optional2/tiramisu/multi.py +++ b/tests/dictionaries/00_9default_calculation_multi_optional2/tiramisu/multi.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/00_9default_calculation_multi_optional2/tiramisu/no_namespace.py b/tests/dictionaries/00_9default_calculation_multi_optional2/tiramisu/no_namespace.py index 2b6888d61..a9aab7c5f 100644 --- a/tests/dictionaries/00_9default_calculation_multi_optional2/tiramisu/no_namespace.py +++ b/tests/dictionaries/00_9default_calculation_multi_optional2/tiramisu/no_namespace.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/00_9default_calculation_optional/dictionaries/rougail/00-base.yml b/tests/dictionaries/00_9default_calculation_optional/dictionaries/rougail/00-base.yml index 7e8c316dc..c20c2b254 100644 --- a/tests/dictionaries/00_9default_calculation_optional/dictionaries/rougail/00-base.yml +++ b/tests/dictionaries/00_9default_calculation_optional/dictionaries/rougail/00-base.yml @@ -3,6 +3,5 @@ version: 1.1 my_calculated_variable: multi: true default: - type: variable variable: _.my_variable optional: true diff --git a/tests/dictionaries/00_9default_calculation_optional/tiramisu/base.py b/tests/dictionaries/00_9default_calculation_optional/tiramisu/base.py index 0d5bcd8b0..b4153e70a 100644 --- a/tests/dictionaries/00_9default_calculation_optional/tiramisu/base.py +++ b/tests/dictionaries/00_9default_calculation_optional/tiramisu/base.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/00_9default_calculation_optional/tiramisu/multi.py b/tests/dictionaries/00_9default_calculation_optional/tiramisu/multi.py index 79139942d..642e31e0c 100644 --- a/tests/dictionaries/00_9default_calculation_optional/tiramisu/multi.py +++ b/tests/dictionaries/00_9default_calculation_optional/tiramisu/multi.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/00_9default_calculation_optional/tiramisu/no_namespace.py b/tests/dictionaries/00_9default_calculation_optional/tiramisu/no_namespace.py index b89359806..803ec272e 100644 --- a/tests/dictionaries/00_9default_calculation_optional/tiramisu/no_namespace.py +++ b/tests/dictionaries/00_9default_calculation_optional/tiramisu/no_namespace.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/00_9default_calculation_optional_exists/dictionaries/rougail/00-base.yml b/tests/dictionaries/00_9default_calculation_optional_exists/dictionaries/rougail/00-base.yml index b002d90ce..094c6d883 100644 --- a/tests/dictionaries/00_9default_calculation_optional_exists/dictionaries/rougail/00-base.yml +++ b/tests/dictionaries/00_9default_calculation_optional_exists/dictionaries/rougail/00-base.yml @@ -8,6 +8,5 @@ my_variable: my_calculated_variable: multi: true default: - type: variable variable: _.my_variable optional: true diff --git a/tests/dictionaries/00_9default_calculation_optional_exists/tiramisu/base.py b/tests/dictionaries/00_9default_calculation_optional_exists/tiramisu/base.py index 07274410f..d654f7c75 100644 --- a/tests/dictionaries/00_9default_calculation_optional_exists/tiramisu/base.py +++ b/tests/dictionaries/00_9default_calculation_optional_exists/tiramisu/base.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/00_9default_calculation_optional_exists/tiramisu/multi.py b/tests/dictionaries/00_9default_calculation_optional_exists/tiramisu/multi.py index 70d8f0a7e..17af46843 100644 --- a/tests/dictionaries/00_9default_calculation_optional_exists/tiramisu/multi.py +++ b/tests/dictionaries/00_9default_calculation_optional_exists/tiramisu/multi.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/00_9default_calculation_optional_exists/tiramisu/no_namespace.py b/tests/dictionaries/00_9default_calculation_optional_exists/tiramisu/no_namespace.py index 6492b865b..c156d4c34 100644 --- a/tests/dictionaries/00_9default_calculation_optional_exists/tiramisu/no_namespace.py +++ b/tests/dictionaries/00_9default_calculation_optional_exists/tiramisu/no_namespace.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/00_9default_calculation_param_optional/dictionaries/rougail/00-base.yml b/tests/dictionaries/00_9default_calculation_param_optional/dictionaries/rougail/00-base.yml index 70a80b98f..de32a7e7a 100644 --- a/tests/dictionaries/00_9default_calculation_param_optional/dictionaries/rougail/00-base.yml +++ b/tests/dictionaries/00_9default_calculation_param_optional/dictionaries/rougail/00-base.yml @@ -3,7 +3,6 @@ version: '1.1' var1: description: a first variable default: - type: jinja jinja: '{% if var2 is defined %} {{ var2 }} {% elif var3 is defined %} @@ -16,15 +15,12 @@ var1: ' params: var2: - type: variable variable: _.var2 optional: true var3: - type: variable variable: _.var3 optional: true var4: - type: variable variable: _.unknown_family.var optional: true description: returns a value diff --git a/tests/dictionaries/00_9default_calculation_param_optional/tiramisu/base.py b/tests/dictionaries/00_9default_calculation_param_optional/tiramisu/base.py index e379a9f29..2cc2b921e 100644 --- a/tests/dictionaries/00_9default_calculation_param_optional/tiramisu/base.py +++ b/tests/dictionaries/00_9default_calculation_param_optional/tiramisu/base.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/00_9default_calculation_param_optional/tiramisu/multi.py b/tests/dictionaries/00_9default_calculation_param_optional/tiramisu/multi.py index 868ae82b8..2223f148b 100644 --- a/tests/dictionaries/00_9default_calculation_param_optional/tiramisu/multi.py +++ b/tests/dictionaries/00_9default_calculation_param_optional/tiramisu/multi.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/00_9default_calculation_param_optional/tiramisu/no_namespace.py b/tests/dictionaries/00_9default_calculation_param_optional/tiramisu/no_namespace.py index 0f4d41121..bbe111441 100644 --- a/tests/dictionaries/00_9default_calculation_param_optional/tiramisu/no_namespace.py +++ b/tests/dictionaries/00_9default_calculation_param_optional/tiramisu/no_namespace.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/00_9default_information_other_variable/tiramisu/base.py b/tests/dictionaries/00_9default_information_other_variable/tiramisu/base.py index cb91291fb..f35a79ee9 100644 --- a/tests/dictionaries/00_9default_information_other_variable/tiramisu/base.py +++ b/tests/dictionaries/00_9default_information_other_variable/tiramisu/base.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/00_9default_information_other_variable/tiramisu/multi.py b/tests/dictionaries/00_9default_information_other_variable/tiramisu/multi.py index 6e640f653..0826899f0 100644 --- a/tests/dictionaries/00_9default_information_other_variable/tiramisu/multi.py +++ b/tests/dictionaries/00_9default_information_other_variable/tiramisu/multi.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/00_9default_information_other_variable/tiramisu/no_namespace.py b/tests/dictionaries/00_9default_information_other_variable/tiramisu/no_namespace.py index e7ab7d4e1..725e75e3b 100644 --- a/tests/dictionaries/00_9default_information_other_variable/tiramisu/no_namespace.py +++ b/tests/dictionaries/00_9default_information_other_variable/tiramisu/no_namespace.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/00_9default_integer/dictionaries/rougail/00-base.yml b/tests/dictionaries/00_9default_integer/dictionaries/rougail/00-base.yml index ab8d02967..9513e4b34 100644 --- a/tests/dictionaries/00_9default_integer/dictionaries/rougail/00-base.yml +++ b/tests/dictionaries/00_9default_integer/dictionaries/rougail/00-base.yml @@ -2,10 +2,8 @@ version: '1.1' var: description: a variable - type: choice default: 9 choices: - type: jinja jinja: |+ {% for item in trange(0, 10) %} {{ item }} diff --git a/tests/dictionaries/00_9default_integer/tiramisu/base.py b/tests/dictionaries/00_9default_integer/tiramisu/base.py index b7e8b6197..f6905e9b6 100644 --- a/tests/dictionaries/00_9default_integer/tiramisu/base.py +++ b/tests/dictionaries/00_9default_integer/tiramisu/base.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/00_9default_integer/tiramisu/multi.py b/tests/dictionaries/00_9default_integer/tiramisu/multi.py index 29d645ec6..ae7ead55d 100644 --- a/tests/dictionaries/00_9default_integer/tiramisu/multi.py +++ b/tests/dictionaries/00_9default_integer/tiramisu/multi.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/00_9default_integer/tiramisu/no_namespace.py b/tests/dictionaries/00_9default_integer/tiramisu/no_namespace.py index 86d68f689..384817920 100644 --- a/tests/dictionaries/00_9default_integer/tiramisu/no_namespace.py +++ b/tests/dictionaries/00_9default_integer/tiramisu/no_namespace.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/00_9extra/dictionaries/extra/00-base.yml b/tests/dictionaries/00_9extra/dictionaries/extra/00-base.yml index 7d8c29e22..0416ef6b2 100644 --- a/tests/dictionaries/00_9extra/dictionaries/extra/00-base.yml +++ b/tests/dictionaries/00_9extra/dictionaries/extra/00-base.yml @@ -3,6 +3,5 @@ version: '1.1' variable: description: a variable default: - type: jinja jinja: 'no' description: return no diff --git a/tests/dictionaries/00_9extra/tiramisu/base.py b/tests/dictionaries/00_9extra/tiramisu/base.py index 2d2b99e07..a7f3192e5 100644 --- a/tests/dictionaries/00_9extra/tiramisu/base.py +++ b/tests/dictionaries/00_9extra/tiramisu/base.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/00_9extra/tiramisu/multi.py b/tests/dictionaries/00_9extra/tiramisu/multi.py index 2206e9d04..c3a4470af 100644 --- a/tests/dictionaries/00_9extra/tiramisu/multi.py +++ b/tests/dictionaries/00_9extra/tiramisu/multi.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/00_9extra_calculation/dictionaries/extra/00-base.yml b/tests/dictionaries/00_9extra_calculation/dictionaries/extra/00-base.yml index a86b0961d..d0ece2dad 100644 --- a/tests/dictionaries/00_9extra_calculation/dictionaries/extra/00-base.yml +++ b/tests/dictionaries/00_9extra_calculation/dictionaries/extra/00-base.yml @@ -3,23 +3,19 @@ version: '1.1' variable1: description: a first variable default: - type: variable variable: rougail.variable variable2: description: a second variable default: - type: jinja jinja: | {{ rougail.variable }} description: copy the value of rougail.variable variable3: description: a third variable default: - type: jinja jinja: | {{ variable }} params: variable: - type: variable variable: rougail.variable description: copy the value of rougail.variable diff --git a/tests/dictionaries/00_9extra_calculation/tiramisu/base.py b/tests/dictionaries/00_9extra_calculation/tiramisu/base.py index c17744f65..de1998c79 100644 --- a/tests/dictionaries/00_9extra_calculation/tiramisu/base.py +++ b/tests/dictionaries/00_9extra_calculation/tiramisu/base.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/00_9extra_calculation/tiramisu/multi.py b/tests/dictionaries/00_9extra_calculation/tiramisu/multi.py index d976509e6..2d67f7f06 100644 --- a/tests/dictionaries/00_9extra_calculation/tiramisu/multi.py +++ b/tests/dictionaries/00_9extra_calculation/tiramisu/multi.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/01_6boolean_multi/tiramisu/base.py b/tests/dictionaries/01_6boolean_multi/tiramisu/base.py index 22e6334df..16f2c382c 100644 --- a/tests/dictionaries/01_6boolean_multi/tiramisu/base.py +++ b/tests/dictionaries/01_6boolean_multi/tiramisu/base.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/01_6boolean_multi/tiramisu/multi.py b/tests/dictionaries/01_6boolean_multi/tiramisu/multi.py index f965dbb0b..ec585778e 100644 --- a/tests/dictionaries/01_6boolean_multi/tiramisu/multi.py +++ b/tests/dictionaries/01_6boolean_multi/tiramisu/multi.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/01_6boolean_multi/tiramisu/no_namespace.py b/tests/dictionaries/01_6boolean_multi/tiramisu/no_namespace.py index bee2ca3cc..011d8b2be 100644 --- a/tests/dictionaries/01_6boolean_multi/tiramisu/no_namespace.py +++ b/tests/dictionaries/01_6boolean_multi/tiramisu/no_namespace.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/01_6custom_multi/tiramisu/base.py b/tests/dictionaries/01_6custom_multi/tiramisu/base.py index fe2e5e635..10533654c 100644 --- a/tests/dictionaries/01_6custom_multi/tiramisu/base.py +++ b/tests/dictionaries/01_6custom_multi/tiramisu/base.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/01_6custom_multi/tiramisu/multi.py b/tests/dictionaries/01_6custom_multi/tiramisu/multi.py index 1a2d8508b..8d3fb7db6 100644 --- a/tests/dictionaries/01_6custom_multi/tiramisu/multi.py +++ b/tests/dictionaries/01_6custom_multi/tiramisu/multi.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/01_6custom_multi/tiramisu/no_namespace.py b/tests/dictionaries/01_6custom_multi/tiramisu/no_namespace.py index 8c61139f6..3c185d1c1 100644 --- a/tests/dictionaries/01_6custom_multi/tiramisu/no_namespace.py +++ b/tests/dictionaries/01_6custom_multi/tiramisu/no_namespace.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/01_6float_multi/tiramisu/base.py b/tests/dictionaries/01_6float_multi/tiramisu/base.py index 0554fb206..265d30f7f 100644 --- a/tests/dictionaries/01_6float_multi/tiramisu/base.py +++ b/tests/dictionaries/01_6float_multi/tiramisu/base.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/01_6float_multi/tiramisu/multi.py b/tests/dictionaries/01_6float_multi/tiramisu/multi.py index ede00de91..84b2dee97 100644 --- a/tests/dictionaries/01_6float_multi/tiramisu/multi.py +++ b/tests/dictionaries/01_6float_multi/tiramisu/multi.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/01_6float_multi/tiramisu/no_namespace.py b/tests/dictionaries/01_6float_multi/tiramisu/no_namespace.py index bf708fd9c..230888f64 100644 --- a/tests/dictionaries/01_6float_multi/tiramisu/no_namespace.py +++ b/tests/dictionaries/01_6float_multi/tiramisu/no_namespace.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/01_6number_multi/tiramisu/base.py b/tests/dictionaries/01_6number_multi/tiramisu/base.py index 08534ce5c..2f5853e1e 100644 --- a/tests/dictionaries/01_6number_multi/tiramisu/base.py +++ b/tests/dictionaries/01_6number_multi/tiramisu/base.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/01_6number_multi/tiramisu/multi.py b/tests/dictionaries/01_6number_multi/tiramisu/multi.py index 7ba41303c..f9ef54276 100644 --- a/tests/dictionaries/01_6number_multi/tiramisu/multi.py +++ b/tests/dictionaries/01_6number_multi/tiramisu/multi.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/01_6number_multi/tiramisu/no_namespace.py b/tests/dictionaries/01_6number_multi/tiramisu/no_namespace.py index c9c8e3836..2e5c6e73a 100644 --- a/tests/dictionaries/01_6number_multi/tiramisu/no_namespace.py +++ b/tests/dictionaries/01_6number_multi/tiramisu/no_namespace.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/01_6string_multi/tiramisu/base.py b/tests/dictionaries/01_6string_multi/tiramisu/base.py index 1482c7121..47664935d 100644 --- a/tests/dictionaries/01_6string_multi/tiramisu/base.py +++ b/tests/dictionaries/01_6string_multi/tiramisu/base.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/01_6string_multi/tiramisu/multi.py b/tests/dictionaries/01_6string_multi/tiramisu/multi.py index d6cdec9af..1583a71e0 100644 --- a/tests/dictionaries/01_6string_multi/tiramisu/multi.py +++ b/tests/dictionaries/01_6string_multi/tiramisu/multi.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/01_6string_multi/tiramisu/no_namespace.py b/tests/dictionaries/01_6string_multi/tiramisu/no_namespace.py index d7fe03147..9f6132d59 100644 --- a/tests/dictionaries/01_6string_multi/tiramisu/no_namespace.py +++ b/tests/dictionaries/01_6string_multi/tiramisu/no_namespace.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/01_7value_multi_doublequote/tiramisu/base.py b/tests/dictionaries/01_7value_multi_doublequote/tiramisu/base.py index 36f523e10..3d9870ba9 100644 --- a/tests/dictionaries/01_7value_multi_doublequote/tiramisu/base.py +++ b/tests/dictionaries/01_7value_multi_doublequote/tiramisu/base.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/01_7value_multi_doublequote/tiramisu/multi.py b/tests/dictionaries/01_7value_multi_doublequote/tiramisu/multi.py index 0247a5074..9cdd25de6 100644 --- a/tests/dictionaries/01_7value_multi_doublequote/tiramisu/multi.py +++ b/tests/dictionaries/01_7value_multi_doublequote/tiramisu/multi.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/01_7value_multi_doublequote/tiramisu/no_namespace.py b/tests/dictionaries/01_7value_multi_doublequote/tiramisu/no_namespace.py index 77fefe57b..ab3b2f105 100644 --- a/tests/dictionaries/01_7value_multi_doublequote/tiramisu/no_namespace.py +++ b/tests/dictionaries/01_7value_multi_doublequote/tiramisu/no_namespace.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/01_7value_multi_doublequote2/tiramisu/base.py b/tests/dictionaries/01_7value_multi_doublequote2/tiramisu/base.py index d6d54dd3d..6bbb832ab 100644 --- a/tests/dictionaries/01_7value_multi_doublequote2/tiramisu/base.py +++ b/tests/dictionaries/01_7value_multi_doublequote2/tiramisu/base.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/01_7value_multi_doublequote2/tiramisu/multi.py b/tests/dictionaries/01_7value_multi_doublequote2/tiramisu/multi.py index e18344e4d..0e43fc56f 100644 --- a/tests/dictionaries/01_7value_multi_doublequote2/tiramisu/multi.py +++ b/tests/dictionaries/01_7value_multi_doublequote2/tiramisu/multi.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/01_7value_multi_doublequote2/tiramisu/no_namespace.py b/tests/dictionaries/01_7value_multi_doublequote2/tiramisu/no_namespace.py index 4080b1ae4..613c41348 100644 --- a/tests/dictionaries/01_7value_multi_doublequote2/tiramisu/no_namespace.py +++ b/tests/dictionaries/01_7value_multi_doublequote2/tiramisu/no_namespace.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/01_7value_multi_quote/tiramisu/base.py b/tests/dictionaries/01_7value_multi_quote/tiramisu/base.py index 80139233b..149a437a5 100644 --- a/tests/dictionaries/01_7value_multi_quote/tiramisu/base.py +++ b/tests/dictionaries/01_7value_multi_quote/tiramisu/base.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/01_7value_multi_quote/tiramisu/multi.py b/tests/dictionaries/01_7value_multi_quote/tiramisu/multi.py index e97608f5f..8395fdaa0 100644 --- a/tests/dictionaries/01_7value_multi_quote/tiramisu/multi.py +++ b/tests/dictionaries/01_7value_multi_quote/tiramisu/multi.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/01_7value_multi_quote/tiramisu/no_namespace.py b/tests/dictionaries/01_7value_multi_quote/tiramisu/no_namespace.py index 522c59a67..2f3fdd4c7 100644 --- a/tests/dictionaries/01_7value_multi_quote/tiramisu/no_namespace.py +++ b/tests/dictionaries/01_7value_multi_quote/tiramisu/no_namespace.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/01_8calculation_information_multi/dictionaries/rougail/00-base.yml b/tests/dictionaries/01_8calculation_information_multi/dictionaries/rougail/00-base.yml index 3e2081ed3..a2236456e 100644 --- a/tests/dictionaries/01_8calculation_information_multi/dictionaries/rougail/00-base.yml +++ b/tests/dictionaries/01_8calculation_information_multi/dictionaries/rougail/00-base.yml @@ -4,7 +4,6 @@ variable: description: a variable multi: true default: - type: jinja jinja: | {{test_information }} params: diff --git a/tests/dictionaries/01_8calculation_information_multi/tiramisu/base.py b/tests/dictionaries/01_8calculation_information_multi/tiramisu/base.py index ede22bb6a..067597421 100644 --- a/tests/dictionaries/01_8calculation_information_multi/tiramisu/base.py +++ b/tests/dictionaries/01_8calculation_information_multi/tiramisu/base.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/01_8calculation_information_multi/tiramisu/multi.py b/tests/dictionaries/01_8calculation_information_multi/tiramisu/multi.py index 61076b7cd..3d1df2c80 100644 --- a/tests/dictionaries/01_8calculation_information_multi/tiramisu/multi.py +++ b/tests/dictionaries/01_8calculation_information_multi/tiramisu/multi.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/01_8calculation_information_multi/tiramisu/no_namespace.py b/tests/dictionaries/01_8calculation_information_multi/tiramisu/no_namespace.py index 92ed52897..dc3bb348f 100644 --- a/tests/dictionaries/01_8calculation_information_multi/tiramisu/no_namespace.py +++ b/tests/dictionaries/01_8calculation_information_multi/tiramisu/no_namespace.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/01_9choice_variable_multi/dictionaries/rougail/00-base.yml b/tests/dictionaries/01_9choice_variable_multi/dictionaries/rougail/00-base.yml index 94f2012f2..9ebf8cbf4 100644 --- a/tests/dictionaries/01_9choice_variable_multi/dictionaries/rougail/00-base.yml +++ b/tests/dictionaries/01_9choice_variable_multi/dictionaries/rougail/00-base.yml @@ -7,5 +7,4 @@ variable1: # a first variable variable2: description: a second variable choices: - type: variable variable: _.variable1 diff --git a/tests/dictionaries/01_9choice_variable_multi/tiramisu/base.py b/tests/dictionaries/01_9choice_variable_multi/tiramisu/base.py index d531bbc31..3b593a800 100644 --- a/tests/dictionaries/01_9choice_variable_multi/tiramisu/base.py +++ b/tests/dictionaries/01_9choice_variable_multi/tiramisu/base.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/01_9choice_variable_multi/tiramisu/multi.py b/tests/dictionaries/01_9choice_variable_multi/tiramisu/multi.py index eddf0bc02..a8b9efdf8 100644 --- a/tests/dictionaries/01_9choice_variable_multi/tiramisu/multi.py +++ b/tests/dictionaries/01_9choice_variable_multi/tiramisu/multi.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/01_9choice_variable_multi/tiramisu/no_namespace.py b/tests/dictionaries/01_9choice_variable_multi/tiramisu/no_namespace.py index eefe49707..1bc84d578 100644 --- a/tests/dictionaries/01_9choice_variable_multi/tiramisu/no_namespace.py +++ b/tests/dictionaries/01_9choice_variable_multi/tiramisu/no_namespace.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/04_0type_param/tiramisu/base.py b/tests/dictionaries/04_0type_param/tiramisu/base.py index c9db95e01..9f2efb0e1 100644 --- a/tests/dictionaries/04_0type_param/tiramisu/base.py +++ b/tests/dictionaries/04_0type_param/tiramisu/base.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/04_0type_param/tiramisu/multi.py b/tests/dictionaries/04_0type_param/tiramisu/multi.py index d8650bd0d..7f025ec93 100644 --- a/tests/dictionaries/04_0type_param/tiramisu/multi.py +++ b/tests/dictionaries/04_0type_param/tiramisu/multi.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/04_0type_param/tiramisu/no_namespace.py b/tests/dictionaries/04_0type_param/tiramisu/no_namespace.py index c6c2ae3af..07b2d0e77 100644 --- a/tests/dictionaries/04_0type_param/tiramisu/no_namespace.py +++ b/tests/dictionaries/04_0type_param/tiramisu/no_namespace.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/04_1auto_save/tiramisu/base.py b/tests/dictionaries/04_1auto_save/tiramisu/base.py index 599328789..ddb1370c8 100644 --- a/tests/dictionaries/04_1auto_save/tiramisu/base.py +++ b/tests/dictionaries/04_1auto_save/tiramisu/base.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/04_1auto_save/tiramisu/multi.py b/tests/dictionaries/04_1auto_save/tiramisu/multi.py index 807d0471d..2f769d816 100644 --- a/tests/dictionaries/04_1auto_save/tiramisu/multi.py +++ b/tests/dictionaries/04_1auto_save/tiramisu/multi.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/04_1auto_save/tiramisu/no_namespace.py b/tests/dictionaries/04_1auto_save/tiramisu/no_namespace.py index 2827a5e61..47363e0de 100644 --- a/tests/dictionaries/04_1auto_save/tiramisu/no_namespace.py +++ b/tests/dictionaries/04_1auto_save/tiramisu/no_namespace.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/04_1auto_save_and_calculated/dictionaries/rougail/00-base.yml b/tests/dictionaries/04_1auto_save_and_calculated/dictionaries/rougail/00-base.yml index 2341063e1..a1a3facb6 100644 --- a/tests/dictionaries/04_1auto_save_and_calculated/dictionaries/rougail/00-base.yml +++ b/tests/dictionaries/04_1auto_save_and_calculated/dictionaries/rougail/00-base.yml @@ -5,5 +5,4 @@ var2: description: a second variable auto_save: true default: - type: variable variable: _.var1 diff --git a/tests/dictionaries/04_1auto_save_and_calculated/tiramisu/base.py b/tests/dictionaries/04_1auto_save_and_calculated/tiramisu/base.py index 42e1a01c9..773a8f055 100644 --- a/tests/dictionaries/04_1auto_save_and_calculated/tiramisu/base.py +++ b/tests/dictionaries/04_1auto_save_and_calculated/tiramisu/base.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/04_1auto_save_and_calculated/tiramisu/multi.py b/tests/dictionaries/04_1auto_save_and_calculated/tiramisu/multi.py index 68de71b8c..2c44d14d0 100644 --- a/tests/dictionaries/04_1auto_save_and_calculated/tiramisu/multi.py +++ b/tests/dictionaries/04_1auto_save_and_calculated/tiramisu/multi.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/04_1auto_save_and_calculated/tiramisu/no_namespace.py b/tests/dictionaries/04_1auto_save_and_calculated/tiramisu/no_namespace.py index a24d58655..b1a73613a 100644 --- a/tests/dictionaries/04_1auto_save_and_calculated/tiramisu/no_namespace.py +++ b/tests/dictionaries/04_1auto_save_and_calculated/tiramisu/no_namespace.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/04_1auto_save_and_calculated_hidden/dictionaries/rougail/00-base.yml b/tests/dictionaries/04_1auto_save_and_calculated_hidden/dictionaries/rougail/00-base.yml index 6751b2ed6..dde478e80 100644 --- a/tests/dictionaries/04_1auto_save_and_calculated_hidden/dictionaries/rougail/00-base.yml +++ b/tests/dictionaries/04_1auto_save_and_calculated_hidden/dictionaries/rougail/00-base.yml @@ -5,13 +5,11 @@ var2: description: a second variable auto_save: true hidden: - type: jinja jinja: | {% if _.var1 == "yes" %} _.var1 is yes {% endif %} description: only if the variable var1 has value "yes" default: - type: jinja jinja: 'yes' description: the value is always yes diff --git a/tests/dictionaries/04_1auto_save_and_calculated_hidden/tiramisu/base.py b/tests/dictionaries/04_1auto_save_and_calculated_hidden/tiramisu/base.py index 056fecb9e..152195456 100644 --- a/tests/dictionaries/04_1auto_save_and_calculated_hidden/tiramisu/base.py +++ b/tests/dictionaries/04_1auto_save_and_calculated_hidden/tiramisu/base.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/04_1auto_save_and_calculated_hidden/tiramisu/multi.py b/tests/dictionaries/04_1auto_save_and_calculated_hidden/tiramisu/multi.py index 385cf0108..05c644308 100644 --- a/tests/dictionaries/04_1auto_save_and_calculated_hidden/tiramisu/multi.py +++ b/tests/dictionaries/04_1auto_save_and_calculated_hidden/tiramisu/multi.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/04_1auto_save_and_calculated_hidden/tiramisu/no_namespace.py b/tests/dictionaries/04_1auto_save_and_calculated_hidden/tiramisu/no_namespace.py index ffae50a5b..e44910e21 100644 --- a/tests/dictionaries/04_1auto_save_and_calculated_hidden/tiramisu/no_namespace.py +++ b/tests/dictionaries/04_1auto_save_and_calculated_hidden/tiramisu/no_namespace.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/04_1auto_save_and_hidden/tiramisu/base.py b/tests/dictionaries/04_1auto_save_and_hidden/tiramisu/base.py index 45f648628..349f0eebb 100644 --- a/tests/dictionaries/04_1auto_save_and_hidden/tiramisu/base.py +++ b/tests/dictionaries/04_1auto_save_and_hidden/tiramisu/base.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/04_1auto_save_and_hidden/tiramisu/multi.py b/tests/dictionaries/04_1auto_save_and_hidden/tiramisu/multi.py index d448eae2a..0d651b7bc 100644 --- a/tests/dictionaries/04_1auto_save_and_hidden/tiramisu/multi.py +++ b/tests/dictionaries/04_1auto_save_and_hidden/tiramisu/multi.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/04_1auto_save_and_hidden/tiramisu/no_namespace.py b/tests/dictionaries/04_1auto_save_and_hidden/tiramisu/no_namespace.py index 519c0a119..9dd4f3b42 100644 --- a/tests/dictionaries/04_1auto_save_and_hidden/tiramisu/no_namespace.py +++ b/tests/dictionaries/04_1auto_save_and_hidden/tiramisu/no_namespace.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/04_5disabled_calculation/dictionaries/rougail/00-base.yml b/tests/dictionaries/04_5disabled_calculation/dictionaries/rougail/00-base.yml index c369c8fa7..d26513a32 100644 --- a/tests/dictionaries/04_5disabled_calculation/dictionaries/rougail/00-base.yml +++ b/tests/dictionaries/04_5disabled_calculation/dictionaries/rougail/00-base.yml @@ -4,7 +4,6 @@ condition: "no" # a conditional variable variable1: description: a first variable disabled: - type: jinja jinja: | {% if _.condition == "yes" %} condition is yes @@ -13,7 +12,6 @@ variable1: variable2: description: a second variable disabled: - type: jinja jinja: | {% if _.condition == "yes" %} condition is yes diff --git a/tests/dictionaries/04_5disabled_calculation/tiramisu/base.py b/tests/dictionaries/04_5disabled_calculation/tiramisu/base.py index c6c53e23a..4837a824a 100644 --- a/tests/dictionaries/04_5disabled_calculation/tiramisu/base.py +++ b/tests/dictionaries/04_5disabled_calculation/tiramisu/base.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/04_5disabled_calculation/tiramisu/multi.py b/tests/dictionaries/04_5disabled_calculation/tiramisu/multi.py index 30e7cce82..6d639c4bd 100644 --- a/tests/dictionaries/04_5disabled_calculation/tiramisu/multi.py +++ b/tests/dictionaries/04_5disabled_calculation/tiramisu/multi.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/04_5disabled_calculation_default/dictionaries/rougail/00-base.yml b/tests/dictionaries/04_5disabled_calculation_default/dictionaries/rougail/00-base.yml index 7c32bf060..0c4a6c0e7 100644 --- a/tests/dictionaries/04_5disabled_calculation_default/dictionaries/rougail/00-base.yml +++ b/tests/dictionaries/04_5disabled_calculation_default/dictionaries/rougail/00-base.yml @@ -4,28 +4,24 @@ condition: "no" # a condition var1: description: a first variable disabled: - type: jinja jinja: | {% if _.condition == "yes" %} condition is yes {% endif %} description: if condition is yes default: - type: jinja jinja: | {{ _.condition }} description: the value of condition var2: description: a second variable disabled: - type: jinja jinja: | {% if rougail.condition == "yes" %} condition is yes {% endif %} description: if condition is yes default: - type: jinja jinja: | {{ rougail.condition }} description: the value of condition diff --git a/tests/dictionaries/04_5disabled_calculation_default/tiramisu/base.py b/tests/dictionaries/04_5disabled_calculation_default/tiramisu/base.py index 4e5bc3982..c2c8d2952 100644 --- a/tests/dictionaries/04_5disabled_calculation_default/tiramisu/base.py +++ b/tests/dictionaries/04_5disabled_calculation_default/tiramisu/base.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/04_5disabled_calculation_default/tiramisu/multi.py b/tests/dictionaries/04_5disabled_calculation_default/tiramisu/multi.py index 8eff634f0..57ced81af 100644 --- a/tests/dictionaries/04_5disabled_calculation_default/tiramisu/multi.py +++ b/tests/dictionaries/04_5disabled_calculation_default/tiramisu/multi.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/04_5disabled_calculation_optional/dictionaries/rougail/00-base.yml b/tests/dictionaries/04_5disabled_calculation_optional/dictionaries/rougail/00-base.yml index 0a0f219fe..e35a10463 100644 --- a/tests/dictionaries/04_5disabled_calculation_optional/dictionaries/rougail/00-base.yml +++ b/tests/dictionaries/04_5disabled_calculation_optional/dictionaries/rougail/00-base.yml @@ -4,32 +4,28 @@ condition: "no" # a condition var1: description: a first variable hidden: - type: jinja jinja: | {% if unknown is not defined %} unknown is undefined {% elif unknown == "no" %} unknown is no {% endif %} - params: - unknown: - type: variable - variable: _.unknown - optional: true + params: + unknown: + variable: _.unknown + optional: true description: calculation from an unknown variable var2: description: a second variable hidden: - type: jinja jinja: | {% if condition is not defined %} condition is undefined {% elif condition == "no" %} condition is no {% endif %} - params: - condition: - type: variable - variable: _.condition - optional: true + params: + condition: + variable: _.condition + optional: true description: calculation from an condition variable diff --git a/tests/dictionaries/04_5disabled_calculation_optional/tiramisu/base.py b/tests/dictionaries/04_5disabled_calculation_optional/tiramisu/base.py index ab7a38914..1e9af889f 100644 --- a/tests/dictionaries/04_5disabled_calculation_optional/tiramisu/base.py +++ b/tests/dictionaries/04_5disabled_calculation_optional/tiramisu/base.py @@ -1,16 +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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") ALLOWED_LEADER_PROPERTIES.add("standard") ALLOWED_LEADER_PROPERTIES.add("advanced") -dict_env['hidden_rougail.var1'] = "{% if unknown is not defined %}\nunknown is undefined\n{% elif unknown == \"no\" %}\nunknown is no\n{% endif %}\nparams:\n unknown:\n type: variable\n variable: _.unknown\n optional: true\n" -dict_env['frozen_rougail.var1'] = "{% if unknown is not defined %}\nunknown is undefined\n{% elif unknown == \"no\" %}\nunknown is no\n{% endif %}\nparams:\n unknown:\n type: variable\n variable: _.unknown\n optional: true\n" -dict_env['hidden_rougail.var2'] = "{% if condition is not defined %}\ncondition is undefined\n{% elif condition == \"no\" %}\ncondition is no\n{% endif %}\nparams:\n condition:\n type: variable\n variable: _.condition\n optional: true\n" -dict_env['frozen_rougail.var2'] = "{% if condition is not defined %}\ncondition is undefined\n{% elif condition == \"no\" %}\ncondition is no\n{% endif %}\nparams:\n condition:\n type: variable\n variable: _.condition\n optional: true\n" +dict_env['hidden_rougail.var1'] = "{% if unknown is not defined %}\nunknown is undefined\n{% elif unknown == \"no\" %}\nunknown is no\n{% endif %}\n" +dict_env['frozen_rougail.var1'] = "{% if unknown is not defined %}\nunknown is undefined\n{% elif unknown == \"no\" %}\nunknown is no\n{% endif %}\n" +dict_env['hidden_rougail.var2'] = "{% if condition is not defined %}\ncondition is undefined\n{% elif condition == \"no\" %}\ncondition is no\n{% endif %}\n" +dict_env['frozen_rougail.var2'] = "{% if condition is not defined %}\ncondition is undefined\n{% elif condition == \"no\" %}\ncondition is no\n{% endif %}\n" option_2 = StrOption(name="condition", doc="a condition", default="no", properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) option_3 = StrOption(name="var1", doc="a first variable", properties=frozenset({"basic", "force_default_on_freeze", "mandatory", Calculation(func['jinja_to_property'], Params((ParamValue("hidden")), kwargs={'__internal_jinja': ParamValue("hidden_rougail.var1"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), 'when': ParamValue(True), 'inverse': ParamValue(False)}), help_function=func['jinja_to_property_help']), Calculation(func['jinja_to_property'], Params((ParamValue("frozen")), kwargs={'__internal_jinja': ParamValue("frozen_rougail.var1"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), 'when': ParamValue(True), 'inverse': ParamValue(False)}), help_function=func['jinja_to_property_help'])}), informations={'type': 'string'}) -option_4 = StrOption(name="var2", doc="a second variable", properties=frozenset({"basic", "force_default_on_freeze", "mandatory", Calculation(func['jinja_to_property'], Params((ParamValue("hidden")), kwargs={'__internal_jinja': ParamValue("hidden_rougail.var2"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), 'when': ParamValue(True), 'inverse': ParamValue(False)}), help_function=func['jinja_to_property_help']), Calculation(func['jinja_to_property'], Params((ParamValue("frozen")), kwargs={'__internal_jinja': ParamValue("frozen_rougail.var2"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), 'when': ParamValue(True), 'inverse': ParamValue(False)}), help_function=func['jinja_to_property_help'])}), informations={'type': 'string'}) +option_4 = StrOption(name="var2", doc="a second variable", properties=frozenset({"basic", "force_default_on_freeze", "mandatory", Calculation(func['jinja_to_property'], Params((ParamValue("hidden")), kwargs={'__internal_jinja': ParamValue("hidden_rougail.var2"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), 'condition': ParamOption(option_2), 'when': ParamValue(True), 'inverse': ParamValue(False)}), help_function=func['jinja_to_property_help']), Calculation(func['jinja_to_property'], Params((ParamValue("frozen")), kwargs={'__internal_jinja': ParamValue("frozen_rougail.var2"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), 'condition': ParamOption(option_2), 'when': ParamValue(True), 'inverse': ParamValue(False)}), help_function=func['jinja_to_property_help'])}), informations={'type': 'string'}) optiondescription_1 = OptionDescription(name="rougail", doc="Rougail", children=[option_2, option_3, option_4], properties=frozenset({"basic"})) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_1]) diff --git a/tests/dictionaries/04_5disabled_calculation_optional/tiramisu/multi.py b/tests/dictionaries/04_5disabled_calculation_optional/tiramisu/multi.py index 835f4f4e6..25393a813 100644 --- a/tests/dictionaries/04_5disabled_calculation_optional/tiramisu/multi.py +++ b/tests/dictionaries/04_5disabled_calculation_optional/tiramisu/multi.py @@ -1,26 +1,27 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") ALLOWED_LEADER_PROPERTIES.add("standard") ALLOWED_LEADER_PROPERTIES.add("advanced") -dict_env['hidden_1.rougail.var1'] = "{% if unknown is not defined %}\nunknown is undefined\n{% elif unknown == \"no\" %}\nunknown is no\n{% endif %}\nparams:\n unknown:\n type: variable\n variable: _.unknown\n optional: true\n" -dict_env['frozen_1.rougail.var1'] = "{% if unknown is not defined %}\nunknown is undefined\n{% elif unknown == \"no\" %}\nunknown is no\n{% endif %}\nparams:\n unknown:\n type: variable\n variable: _.unknown\n optional: true\n" -dict_env['hidden_1.rougail.var2'] = "{% if condition is not defined %}\ncondition is undefined\n{% elif condition == \"no\" %}\ncondition is no\n{% endif %}\nparams:\n condition:\n type: variable\n variable: _.condition\n optional: true\n" -dict_env['frozen_1.rougail.var2'] = "{% if condition is not defined %}\ncondition is undefined\n{% elif condition == \"no\" %}\ncondition is no\n{% endif %}\nparams:\n condition:\n type: variable\n variable: _.condition\n optional: true\n" -dict_env['hidden_2.rougail.var1'] = "{% if unknown is not defined %}\nunknown is undefined\n{% elif unknown == \"no\" %}\nunknown is no\n{% endif %}\nparams:\n unknown:\n type: variable\n variable: _.unknown\n optional: true\n" -dict_env['frozen_2.rougail.var1'] = "{% if unknown is not defined %}\nunknown is undefined\n{% elif unknown == \"no\" %}\nunknown is no\n{% endif %}\nparams:\n unknown:\n type: variable\n variable: _.unknown\n optional: true\n" -dict_env['hidden_2.rougail.var2'] = "{% if condition is not defined %}\ncondition is undefined\n{% elif condition == \"no\" %}\ncondition is no\n{% endif %}\nparams:\n condition:\n type: variable\n variable: _.condition\n optional: true\n" -dict_env['frozen_2.rougail.var2'] = "{% if condition is not defined %}\ncondition is undefined\n{% elif condition == \"no\" %}\ncondition is no\n{% endif %}\nparams:\n condition:\n type: variable\n variable: _.condition\n optional: true\n" +dict_env['hidden_1.rougail.var1'] = "{% if unknown is not defined %}\nunknown is undefined\n{% elif unknown == \"no\" %}\nunknown is no\n{% endif %}\n" +dict_env['frozen_1.rougail.var1'] = "{% if unknown is not defined %}\nunknown is undefined\n{% elif unknown == \"no\" %}\nunknown is no\n{% endif %}\n" +dict_env['hidden_1.rougail.var2'] = "{% if condition is not defined %}\ncondition is undefined\n{% elif condition == \"no\" %}\ncondition is no\n{% endif %}\n" +dict_env['frozen_1.rougail.var2'] = "{% if condition is not defined %}\ncondition is undefined\n{% elif condition == \"no\" %}\ncondition is no\n{% endif %}\n" +dict_env['hidden_2.rougail.var1'] = "{% if unknown is not defined %}\nunknown is undefined\n{% elif unknown == \"no\" %}\nunknown is no\n{% endif %}\n" +dict_env['frozen_2.rougail.var1'] = "{% if unknown is not defined %}\nunknown is undefined\n{% elif unknown == \"no\" %}\nunknown is no\n{% endif %}\n" +dict_env['hidden_2.rougail.var2'] = "{% if condition is not defined %}\ncondition is undefined\n{% elif condition == \"no\" %}\ncondition is no\n{% endif %}\n" +dict_env['frozen_2.rougail.var2'] = "{% if condition is not defined %}\ncondition is undefined\n{% elif condition == \"no\" %}\ncondition is no\n{% endif %}\n" option_3 = StrOption(name="condition", doc="a condition", default="no", properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) option_4 = StrOption(name="var1", doc="a first variable", properties=frozenset({"basic", "force_default_on_freeze", "mandatory", Calculation(func['jinja_to_property'], Params((ParamValue("hidden")), kwargs={'__internal_jinja': ParamValue("hidden_1.rougail.var1"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), 'when': ParamValue(True), 'inverse': ParamValue(False)}), help_function=func['jinja_to_property_help']), Calculation(func['jinja_to_property'], Params((ParamValue("frozen")), kwargs={'__internal_jinja': ParamValue("frozen_1.rougail.var1"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), 'when': ParamValue(True), 'inverse': ParamValue(False)}), help_function=func['jinja_to_property_help'])}), informations={'type': 'string'}) -option_5 = StrOption(name="var2", doc="a second variable", properties=frozenset({"basic", "force_default_on_freeze", "mandatory", Calculation(func['jinja_to_property'], Params((ParamValue("hidden")), kwargs={'__internal_jinja': ParamValue("hidden_1.rougail.var2"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), 'when': ParamValue(True), 'inverse': ParamValue(False)}), help_function=func['jinja_to_property_help']), Calculation(func['jinja_to_property'], Params((ParamValue("frozen")), kwargs={'__internal_jinja': ParamValue("frozen_1.rougail.var2"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), 'when': ParamValue(True), 'inverse': ParamValue(False)}), help_function=func['jinja_to_property_help'])}), informations={'type': 'string'}) +option_5 = StrOption(name="var2", doc="a second variable", properties=frozenset({"basic", "force_default_on_freeze", "mandatory", Calculation(func['jinja_to_property'], Params((ParamValue("hidden")), kwargs={'__internal_jinja': ParamValue("hidden_1.rougail.var2"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), 'condition': ParamOption(option_3), 'when': ParamValue(True), 'inverse': ParamValue(False)}), help_function=func['jinja_to_property_help']), Calculation(func['jinja_to_property'], Params((ParamValue("frozen")), kwargs={'__internal_jinja': ParamValue("frozen_1.rougail.var2"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), 'condition': ParamOption(option_3), 'when': ParamValue(True), 'inverse': ParamValue(False)}), help_function=func['jinja_to_property_help'])}), informations={'type': 'string'}) optiondescription_2 = OptionDescription(name="rougail", doc="Rougail", children=[option_3, option_4, option_5], properties=frozenset({"basic"})) optiondescription_1 = OptionDescription(name="1", doc="1", children=[optiondescription_2], properties=frozenset({"basic"})) option_8 = StrOption(name="condition", doc="a condition", default="no", properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) option_9 = StrOption(name="var1", doc="a first variable", properties=frozenset({"basic", "force_default_on_freeze", "mandatory", Calculation(func['jinja_to_property'], Params((ParamValue("hidden")), kwargs={'__internal_jinja': ParamValue("hidden_2.rougail.var1"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), 'when': ParamValue(True), 'inverse': ParamValue(False)}), help_function=func['jinja_to_property_help']), Calculation(func['jinja_to_property'], Params((ParamValue("frozen")), kwargs={'__internal_jinja': ParamValue("frozen_2.rougail.var1"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), 'when': ParamValue(True), 'inverse': ParamValue(False)}), help_function=func['jinja_to_property_help'])}), informations={'type': 'string'}) -option_10 = StrOption(name="var2", doc="a second variable", properties=frozenset({"basic", "force_default_on_freeze", "mandatory", Calculation(func['jinja_to_property'], Params((ParamValue("hidden")), kwargs={'__internal_jinja': ParamValue("hidden_2.rougail.var2"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), 'when': ParamValue(True), 'inverse': ParamValue(False)}), help_function=func['jinja_to_property_help']), Calculation(func['jinja_to_property'], Params((ParamValue("frozen")), kwargs={'__internal_jinja': ParamValue("frozen_2.rougail.var2"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), 'when': ParamValue(True), 'inverse': ParamValue(False)}), help_function=func['jinja_to_property_help'])}), informations={'type': 'string'}) +option_10 = StrOption(name="var2", doc="a second variable", properties=frozenset({"basic", "force_default_on_freeze", "mandatory", Calculation(func['jinja_to_property'], Params((ParamValue("hidden")), kwargs={'__internal_jinja': ParamValue("hidden_2.rougail.var2"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), 'condition': ParamOption(option_8), 'when': ParamValue(True), 'inverse': ParamValue(False)}), help_function=func['jinja_to_property_help']), Calculation(func['jinja_to_property'], Params((ParamValue("frozen")), kwargs={'__internal_jinja': ParamValue("frozen_2.rougail.var2"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), 'condition': ParamOption(option_8), 'when': ParamValue(True), 'inverse': ParamValue(False)}), help_function=func['jinja_to_property_help'])}), informations={'type': 'string'}) optiondescription_7 = OptionDescription(name="rougail", doc="Rougail", children=[option_8, option_9, option_10], properties=frozenset({"basic"})) optiondescription_6 = OptionDescription(name="2", doc="2", children=[optiondescription_7], properties=frozenset({"basic"})) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_1, optiondescription_6]) diff --git a/tests/dictionaries/04_5disabled_calculation_optional/tiramisu/no_namespace.py b/tests/dictionaries/04_5disabled_calculation_optional/tiramisu/no_namespace.py index 3da01d3f8..e996e6be0 100644 --- a/tests/dictionaries/04_5disabled_calculation_optional/tiramisu/no_namespace.py +++ b/tests/dictionaries/04_5disabled_calculation_optional/tiramisu/no_namespace.py @@ -1,15 +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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") ALLOWED_LEADER_PROPERTIES.add("standard") ALLOWED_LEADER_PROPERTIES.add("advanced") -dict_env['hidden_var1'] = "{% if unknown is not defined %}\nunknown is undefined\n{% elif unknown == \"no\" %}\nunknown is no\n{% endif %}\nparams:\n unknown:\n type: variable\n variable: _.unknown\n optional: true\n" -dict_env['frozen_var1'] = "{% if unknown is not defined %}\nunknown is undefined\n{% elif unknown == \"no\" %}\nunknown is no\n{% endif %}\nparams:\n unknown:\n type: variable\n variable: _.unknown\n optional: true\n" -dict_env['hidden_var2'] = "{% if condition is not defined %}\ncondition is undefined\n{% elif condition == \"no\" %}\ncondition is no\n{% endif %}\nparams:\n condition:\n type: variable\n variable: _.condition\n optional: true\n" -dict_env['frozen_var2'] = "{% if condition is not defined %}\ncondition is undefined\n{% elif condition == \"no\" %}\ncondition is no\n{% endif %}\nparams:\n condition:\n type: variable\n variable: _.condition\n optional: true\n" +dict_env['hidden_var1'] = "{% if unknown is not defined %}\nunknown is undefined\n{% elif unknown == \"no\" %}\nunknown is no\n{% endif %}\n" +dict_env['frozen_var1'] = "{% if unknown is not defined %}\nunknown is undefined\n{% elif unknown == \"no\" %}\nunknown is no\n{% endif %}\n" +dict_env['hidden_var2'] = "{% if condition is not defined %}\ncondition is undefined\n{% elif condition == \"no\" %}\ncondition is no\n{% endif %}\n" +dict_env['frozen_var2'] = "{% if condition is not defined %}\ncondition is undefined\n{% elif condition == \"no\" %}\ncondition is no\n{% endif %}\n" option_1 = StrOption(name="condition", doc="a condition", default="no", properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) option_2 = StrOption(name="var1", doc="a first variable", properties=frozenset({"basic", "force_default_on_freeze", "mandatory", Calculation(func['jinja_to_property'], Params((ParamValue("hidden")), kwargs={'__internal_jinja': ParamValue("hidden_var1"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), 'when': ParamValue(True), 'inverse': ParamValue(False), 'unknown': ParamValue({})}), help_function=func['jinja_to_property_help']), Calculation(func['jinja_to_property'], Params((ParamValue("frozen")), kwargs={'__internal_jinja': ParamValue("frozen_var1"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), 'when': ParamValue(True), 'inverse': ParamValue(False), 'unknown': ParamValue({})}), help_function=func['jinja_to_property_help'])}), informations={'type': 'string'}) -option_3 = StrOption(name="var2", doc="a second variable", properties=frozenset({"basic", "force_default_on_freeze", "mandatory", Calculation(func['jinja_to_property'], Params((ParamValue("hidden")), kwargs={'__internal_jinja': ParamValue("hidden_var2"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), 'when': ParamValue(True), 'inverse': ParamValue(False), 'condition': ParamOption(option_1)}), help_function=func['jinja_to_property_help']), Calculation(func['jinja_to_property'], Params((ParamValue("frozen")), kwargs={'__internal_jinja': ParamValue("frozen_var2"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), 'when': ParamValue(True), 'inverse': ParamValue(False), 'condition': ParamOption(option_1)}), help_function=func['jinja_to_property_help'])}), informations={'type': 'string'}) +option_3 = StrOption(name="var2", doc="a second variable", properties=frozenset({"basic", "force_default_on_freeze", "mandatory", Calculation(func['jinja_to_property'], Params((ParamValue("hidden")), kwargs={'__internal_jinja': ParamValue("hidden_var2"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), 'condition': ParamOption(option_1), 'when': ParamValue(True), 'inverse': ParamValue(False)}), help_function=func['jinja_to_property_help']), Calculation(func['jinja_to_property'], Params((ParamValue("frozen")), kwargs={'__internal_jinja': ParamValue("frozen_var2"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), 'condition': ParamOption(option_1), 'when': ParamValue(True), 'inverse': ParamValue(False)}), help_function=func['jinja_to_property_help'])}), informations={'type': 'string'}) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1, option_2, option_3]) diff --git a/tests/dictionaries/04_5disabled_calculation_variable/dictionaries/rougail/00-base.yml b/tests/dictionaries/04_5disabled_calculation_variable/dictionaries/rougail/00-base.yml index cbe4c0ab6..403274bbc 100644 --- a/tests/dictionaries/04_5disabled_calculation_variable/dictionaries/rougail/00-base.yml +++ b/tests/dictionaries/04_5disabled_calculation_variable/dictionaries/rougail/00-base.yml @@ -4,5 +4,4 @@ condition: false # a condition variable: description: a variable disabled: - type: variable variable: _.condition diff --git a/tests/dictionaries/04_5disabled_calculation_variable/tiramisu/base.py b/tests/dictionaries/04_5disabled_calculation_variable/tiramisu/base.py index 776b9f139..23453fff8 100644 --- a/tests/dictionaries/04_5disabled_calculation_variable/tiramisu/base.py +++ b/tests/dictionaries/04_5disabled_calculation_variable/tiramisu/base.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/04_5disabled_calculation_variable/tiramisu/multi.py b/tests/dictionaries/04_5disabled_calculation_variable/tiramisu/multi.py index 7dc06c876..5823ef0eb 100644 --- a/tests/dictionaries/04_5disabled_calculation_variable/tiramisu/multi.py +++ b/tests/dictionaries/04_5disabled_calculation_variable/tiramisu/multi.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") 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 d41f68ac6..fa6c63deb 100644 --- a/tests/dictionaries/04_5disabled_calculation_variable/tiramisu/no_namespace.py +++ b/tests/dictionaries/04_5disabled_calculation_variable/tiramisu/no_namespace.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/04_5disabled_calculation_variable2/dictionaries/rougail/00-base.yml b/tests/dictionaries/04_5disabled_calculation_variable2/dictionaries/rougail/00-base.yml index 9ece4a961..ea102327c 100644 --- a/tests/dictionaries/04_5disabled_calculation_variable2/dictionaries/rougail/00-base.yml +++ b/tests/dictionaries/04_5disabled_calculation_variable2/dictionaries/rougail/00-base.yml @@ -4,5 +4,4 @@ condition: true # a condition variable: description: a variable disabled: - type: variable variable: _.condition diff --git a/tests/dictionaries/04_5disabled_calculation_variable2/tiramisu/base.py b/tests/dictionaries/04_5disabled_calculation_variable2/tiramisu/base.py index 65be5ecbb..99523f6c4 100644 --- a/tests/dictionaries/04_5disabled_calculation_variable2/tiramisu/base.py +++ b/tests/dictionaries/04_5disabled_calculation_variable2/tiramisu/base.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/04_5disabled_calculation_variable2/tiramisu/multi.py b/tests/dictionaries/04_5disabled_calculation_variable2/tiramisu/multi.py index f30d17a47..d54c36bac 100644 --- a/tests/dictionaries/04_5disabled_calculation_variable2/tiramisu/multi.py +++ b/tests/dictionaries/04_5disabled_calculation_variable2/tiramisu/multi.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") 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 e0f329b6d..5b60384bc 100644 --- a/tests/dictionaries/04_5disabled_calculation_variable2/tiramisu/no_namespace.py +++ b/tests/dictionaries/04_5disabled_calculation_variable2/tiramisu/no_namespace.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/04_5disabled_calculation_variable3/dictionaries/rougail/00-base.yml b/tests/dictionaries/04_5disabled_calculation_variable3/dictionaries/rougail/00-base.yml index 72bee6630..feefba2cc 100644 --- a/tests/dictionaries/04_5disabled_calculation_variable3/dictionaries/rougail/00-base.yml +++ b/tests/dictionaries/04_5disabled_calculation_variable3/dictionaries/rougail/00-base.yml @@ -4,6 +4,5 @@ condition: "yes" # a condition variable: description: a variable disabled: - type: variable variable: _.condition when: "yes" diff --git a/tests/dictionaries/04_5disabled_calculation_variable3/tiramisu/base.py b/tests/dictionaries/04_5disabled_calculation_variable3/tiramisu/base.py index fb73afb08..97c1aabb0 100644 --- a/tests/dictionaries/04_5disabled_calculation_variable3/tiramisu/base.py +++ b/tests/dictionaries/04_5disabled_calculation_variable3/tiramisu/base.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/04_5disabled_calculation_variable3/tiramisu/multi.py b/tests/dictionaries/04_5disabled_calculation_variable3/tiramisu/multi.py index 364417320..27a5501d0 100644 --- a/tests/dictionaries/04_5disabled_calculation_variable3/tiramisu/multi.py +++ b/tests/dictionaries/04_5disabled_calculation_variable3/tiramisu/multi.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") 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 1b3976193..8926153cd 100644 --- a/tests/dictionaries/04_5disabled_calculation_variable3/tiramisu/no_namespace.py +++ b/tests/dictionaries/04_5disabled_calculation_variable3/tiramisu/no_namespace.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/04_5disabled_calculation_variable4/dictionaries/rougail/00-base.yml b/tests/dictionaries/04_5disabled_calculation_variable4/dictionaries/rougail/00-base.yml index 0884c8ee6..e6464de80 100644 --- a/tests/dictionaries/04_5disabled_calculation_variable4/dictionaries/rougail/00-base.yml +++ b/tests/dictionaries/04_5disabled_calculation_variable4/dictionaries/rougail/00-base.yml @@ -4,6 +4,5 @@ condition: "yes" # a condition variable: description: a variable disabled: - type: variable variable: _.condition when_not: "yes" diff --git a/tests/dictionaries/04_5disabled_calculation_variable4/tiramisu/base.py b/tests/dictionaries/04_5disabled_calculation_variable4/tiramisu/base.py index fb77f3012..f5fec12e4 100644 --- a/tests/dictionaries/04_5disabled_calculation_variable4/tiramisu/base.py +++ b/tests/dictionaries/04_5disabled_calculation_variable4/tiramisu/base.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/04_5disabled_calculation_variable4/tiramisu/multi.py b/tests/dictionaries/04_5disabled_calculation_variable4/tiramisu/multi.py index 627f246d3..a7ae4322a 100644 --- a/tests/dictionaries/04_5disabled_calculation_variable4/tiramisu/multi.py +++ b/tests/dictionaries/04_5disabled_calculation_variable4/tiramisu/multi.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") 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 9ed1b721e..f70a85f13 100644 --- a/tests/dictionaries/04_5disabled_calculation_variable4/tiramisu/no_namespace.py +++ b/tests/dictionaries/04_5disabled_calculation_variable4/tiramisu/no_namespace.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/04_5hidden_calculation/dictionaries/rougail/00-base.yml b/tests/dictionaries/04_5hidden_calculation/dictionaries/rougail/00-base.yml index 5d4b822f1..a235b9b22 100644 --- a/tests/dictionaries/04_5hidden_calculation/dictionaries/rougail/00-base.yml +++ b/tests/dictionaries/04_5hidden_calculation/dictionaries/rougail/00-base.yml @@ -5,7 +5,6 @@ var1: description: a first variable default: "no" hidden: - type: jinja jinja: | {% if _.condition == "yes" %} condition is yes @@ -15,7 +14,6 @@ var2: description: a second variable default: "no" hidden: - type: jinja jinja: | {% if rougail.condition == "yes" %} condition is yes diff --git a/tests/dictionaries/04_5hidden_calculation/tiramisu/base.py b/tests/dictionaries/04_5hidden_calculation/tiramisu/base.py index 06b2c9c5e..5d9447b80 100644 --- a/tests/dictionaries/04_5hidden_calculation/tiramisu/base.py +++ b/tests/dictionaries/04_5hidden_calculation/tiramisu/base.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/04_5hidden_calculation/tiramisu/multi.py b/tests/dictionaries/04_5hidden_calculation/tiramisu/multi.py index 370503caf..e63391e63 100644 --- a/tests/dictionaries/04_5hidden_calculation/tiramisu/multi.py +++ b/tests/dictionaries/04_5hidden_calculation/tiramisu/multi.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/04_5hidden_calculation2/dictionaries/rougail/00-base.yml b/tests/dictionaries/04_5hidden_calculation2/dictionaries/rougail/00-base.yml index da9a0af20..d455a5a08 100644 --- a/tests/dictionaries/04_5hidden_calculation2/dictionaries/rougail/00-base.yml +++ b/tests/dictionaries/04_5hidden_calculation2/dictionaries/rougail/00-base.yml @@ -4,28 +4,24 @@ condition: "no" # a condition var1: description: a first variable hidden: - type: jinja jinja: | {% if _.condition != "yes" %} condition is yes {% endif %} description: if condition is yes default: - type: jinja jinja: | {{ _.condition }} description: the value of condition var2: description: a second variable hidden: - type: jinja jinja: | {% if rougail.condition != "yes" %} condition is yes {% endif %} description: if condition is yes default: - type: jinja jinja: | {{ rougail.condition }} description: the value of condition diff --git a/tests/dictionaries/04_5hidden_calculation2/tiramisu/base.py b/tests/dictionaries/04_5hidden_calculation2/tiramisu/base.py index 9ccc51c39..f15ac3324 100644 --- a/tests/dictionaries/04_5hidden_calculation2/tiramisu/base.py +++ b/tests/dictionaries/04_5hidden_calculation2/tiramisu/base.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/04_5hidden_calculation2/tiramisu/multi.py b/tests/dictionaries/04_5hidden_calculation2/tiramisu/multi.py index 8367cc2ba..212b5d509 100644 --- a/tests/dictionaries/04_5hidden_calculation2/tiramisu/multi.py +++ b/tests/dictionaries/04_5hidden_calculation2/tiramisu/multi.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/04_5hidden_calculation_default_calculation/dictionaries/rougail/00-base.yml b/tests/dictionaries/04_5hidden_calculation_default_calculation/dictionaries/rougail/00-base.yml index d074f5c20..a3080fe5a 100644 --- a/tests/dictionaries/04_5hidden_calculation_default_calculation/dictionaries/rougail/00-base.yml +++ b/tests/dictionaries/04_5hidden_calculation_default_calculation/dictionaries/rougail/00-base.yml @@ -4,28 +4,24 @@ condition: "no" # a condition var1: description: a first variable hidden: - type: jinja jinja: | {% if _.condition == "yes" %} condition is yes {% endif %} description: if condition is yes default: - type: jinja jinja: | {{ _.condition }} description: returns the condition value var2: description: a second variable hidden: - type: jinja jinja: | {% if rougail.condition == "yes" %} condition is yes {% endif %} description: if condition is yes default: - type: jinja jinja: | {{ rougail.condition }} description: returns the condition value diff --git a/tests/dictionaries/04_5hidden_calculation_default_calculation/tiramisu/base.py b/tests/dictionaries/04_5hidden_calculation_default_calculation/tiramisu/base.py index b1e7fc473..27fdf7afd 100644 --- a/tests/dictionaries/04_5hidden_calculation_default_calculation/tiramisu/base.py +++ b/tests/dictionaries/04_5hidden_calculation_default_calculation/tiramisu/base.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/04_5hidden_calculation_default_calculation/tiramisu/multi.py b/tests/dictionaries/04_5hidden_calculation_default_calculation/tiramisu/multi.py index fa28549ee..886367268 100644 --- a/tests/dictionaries/04_5hidden_calculation_default_calculation/tiramisu/multi.py +++ b/tests/dictionaries/04_5hidden_calculation_default_calculation/tiramisu/multi.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/04_5validators/dictionaries/rougail/00-base.yml b/tests/dictionaries/04_5validators/dictionaries/rougail/00-base.yml index 332fadd8c..ca145a58f 100644 --- a/tests/dictionaries/04_5validators/dictionaries/rougail/00-base.yml +++ b/tests/dictionaries/04_5validators/dictionaries/rougail/00-base.yml @@ -4,8 +4,7 @@ int: description: A number type: number validators: - - type: jinja - jinja: | + - jinja: | {% if _.int > 100 %} value is too high {% endif %} diff --git a/tests/dictionaries/04_5validators/tiramisu/base.py b/tests/dictionaries/04_5validators/tiramisu/base.py index cc054b5d0..d60406294 100644 --- a/tests/dictionaries/04_5validators/tiramisu/base.py +++ b/tests/dictionaries/04_5validators/tiramisu/base.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/04_5validators/tiramisu/multi.py b/tests/dictionaries/04_5validators/tiramisu/multi.py index 8d5b233a2..bb44562a8 100644 --- a/tests/dictionaries/04_5validators/tiramisu/multi.py +++ b/tests/dictionaries/04_5validators/tiramisu/multi.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/04_5validators/tiramisu/no_namespace.py b/tests/dictionaries/04_5validators/tiramisu/no_namespace.py index b85e030fc..bcd52985e 100644 --- a/tests/dictionaries/04_5validators/tiramisu/no_namespace.py +++ b/tests/dictionaries/04_5validators/tiramisu/no_namespace.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/04_5validators_differ/dictionaries/rougail/00-base.yml b/tests/dictionaries/04_5validators_differ/dictionaries/rougail/00-base.yml index 358f631bb..999a94b97 100644 --- a/tests/dictionaries/04_5validators_differ/dictionaries/rougail/00-base.yml +++ b/tests/dictionaries/04_5validators_differ/dictionaries/rougail/00-base.yml @@ -5,8 +5,7 @@ var1: type: string default: oui validators: - - type: jinja - jinja: | + - jinja: | {% if _.var1 == _.var2 %} var1 must be different than var2 {% endif %} diff --git a/tests/dictionaries/04_5validators_differ/tiramisu/base.py b/tests/dictionaries/04_5validators_differ/tiramisu/base.py index 7785a794c..8d2def34f 100644 --- a/tests/dictionaries/04_5validators_differ/tiramisu/base.py +++ b/tests/dictionaries/04_5validators_differ/tiramisu/base.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/04_5validators_differ/tiramisu/multi.py b/tests/dictionaries/04_5validators_differ/tiramisu/multi.py index 21c28d6ab..625f5bdc0 100644 --- a/tests/dictionaries/04_5validators_differ/tiramisu/multi.py +++ b/tests/dictionaries/04_5validators_differ/tiramisu/multi.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/04_5validators_differ/tiramisu/no_namespace.py b/tests/dictionaries/04_5validators_differ/tiramisu/no_namespace.py index 8f1570375..27fc0307a 100644 --- a/tests/dictionaries/04_5validators_differ/tiramisu/no_namespace.py +++ b/tests/dictionaries/04_5validators_differ/tiramisu/no_namespace.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/04_5validators_in_network/dictionaries/rougail/00-base.yml b/tests/dictionaries/04_5validators_in_network/dictionaries/rougail/00-base.yml index 76aa7e5c8..1397e66b4 100644 --- a/tests/dictionaries/04_5validators_in_network/dictionaries/rougail/00-base.yml +++ b/tests/dictionaries/04_5validators_in_network/dictionaries/rougail/00-base.yml @@ -10,8 +10,7 @@ ip_address: description: an IP type: ip validators: - - type: jinja - jinja: | + - jinja: | {% if not _.ip_address | valid_in_network(_.network_address_eth0, _.netmask_address_eth0) %} {{ _.ip_address }} is not in network {{ _.network_address_eth0 }}/{{ _.netmask_address_eth0 }} {% endif %} diff --git a/tests/dictionaries/04_5validators_in_network/tiramisu/base.py b/tests/dictionaries/04_5validators_in_network/tiramisu/base.py index 544fcc134..3db66e443 100644 --- a/tests/dictionaries/04_5validators_in_network/tiramisu/base.py +++ b/tests/dictionaries/04_5validators_in_network/tiramisu/base.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/04_5validators_in_network/tiramisu/multi.py b/tests/dictionaries/04_5validators_in_network/tiramisu/multi.py index fc78abf2c..b47695bf1 100644 --- a/tests/dictionaries/04_5validators_in_network/tiramisu/multi.py +++ b/tests/dictionaries/04_5validators_in_network/tiramisu/multi.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/04_5validators_in_network/tiramisu/no_namespace.py b/tests/dictionaries/04_5validators_in_network/tiramisu/no_namespace.py index 198213efc..b84302731 100644 --- a/tests/dictionaries/04_5validators_in_network/tiramisu/no_namespace.py +++ b/tests/dictionaries/04_5validators_in_network/tiramisu/no_namespace.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/04_5validators_in_network_cidr/dictionaries/rougail/00-base.yml b/tests/dictionaries/04_5validators_in_network_cidr/dictionaries/rougail/00-base.yml index 443d5215d..23fb578d7 100644 --- a/tests/dictionaries/04_5validators_in_network_cidr/dictionaries/rougail/00-base.yml +++ b/tests/dictionaries/04_5validators_in_network_cidr/dictionaries/rougail/00-base.yml @@ -7,8 +7,7 @@ ip_address: description: an IP type: ip validators: - - type: jinja - jinja: | + - jinja: | {% if not _.ip_address | valid_in_network(_.network_address_eth0) %} {{ _.ip_address }} is not in network {{ _.network_address_eth0 }} {% endif %} diff --git a/tests/dictionaries/04_5validators_in_network_cidr/tiramisu/base.py b/tests/dictionaries/04_5validators_in_network_cidr/tiramisu/base.py index 780431ca3..ff671ba0b 100644 --- a/tests/dictionaries/04_5validators_in_network_cidr/tiramisu/base.py +++ b/tests/dictionaries/04_5validators_in_network_cidr/tiramisu/base.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/04_5validators_in_network_cidr/tiramisu/multi.py b/tests/dictionaries/04_5validators_in_network_cidr/tiramisu/multi.py index 202cd970e..ae35bbc93 100644 --- a/tests/dictionaries/04_5validators_in_network_cidr/tiramisu/multi.py +++ b/tests/dictionaries/04_5validators_in_network_cidr/tiramisu/multi.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/04_5validators_in_network_cidr/tiramisu/no_namespace.py b/tests/dictionaries/04_5validators_in_network_cidr/tiramisu/no_namespace.py index 778292d49..64d4891cf 100644 --- a/tests/dictionaries/04_5validators_in_network_cidr/tiramisu/no_namespace.py +++ b/tests/dictionaries/04_5validators_in_network_cidr/tiramisu/no_namespace.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/04_5validators_ipnetmask/dictionaries/rougail/00-base.yml b/tests/dictionaries/04_5validators_ipnetmask/dictionaries/rougail/00-base.yml index 156c0582b..169e1ac89 100644 --- a/tests/dictionaries/04_5validators_ipnetmask/dictionaries/rougail/00-base.yml +++ b/tests/dictionaries/04_5validators_ipnetmask/dictionaries/rougail/00-base.yml @@ -7,8 +7,7 @@ netmask_address_eth0: description: Netmask address type: netmask validators: - - type: jinja - jinja: | + - jinja: | {% if not _.netmask_address_eth0 | valid_in_network(_.network_address_eth0) %} {{ _.netmask_address_eth0 }} is not a netmask for network {{ _.network_address_eth0 }} {% endif %} diff --git a/tests/dictionaries/04_5validators_ipnetmask/tiramisu/base.py b/tests/dictionaries/04_5validators_ipnetmask/tiramisu/base.py index 029cd7364..727f3f492 100644 --- a/tests/dictionaries/04_5validators_ipnetmask/tiramisu/base.py +++ b/tests/dictionaries/04_5validators_ipnetmask/tiramisu/base.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/04_5validators_ipnetmask/tiramisu/multi.py b/tests/dictionaries/04_5validators_ipnetmask/tiramisu/multi.py index 0077c4515..ff1517867 100644 --- a/tests/dictionaries/04_5validators_ipnetmask/tiramisu/multi.py +++ b/tests/dictionaries/04_5validators_ipnetmask/tiramisu/multi.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/04_5validators_ipnetmask/tiramisu/no_namespace.py b/tests/dictionaries/04_5validators_ipnetmask/tiramisu/no_namespace.py index baa49011b..61d27e3de 100644 --- a/tests/dictionaries/04_5validators_ipnetmask/tiramisu/no_namespace.py +++ b/tests/dictionaries/04_5validators_ipnetmask/tiramisu/no_namespace.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/04_5validators_multi/dictionaries/rougail/00-base.yml b/tests/dictionaries/04_5validators_multi/dictionaries/rougail/00-base.yml index 81714725f..8168c3a8b 100644 --- a/tests/dictionaries/04_5validators_multi/dictionaries/rougail/00-base.yml +++ b/tests/dictionaries/04_5validators_multi/dictionaries/rougail/00-base.yml @@ -7,8 +7,7 @@ var1: - 'no' - 'yes' validators: - - type: jinja - jinja: | + - jinja: | {% if _.var1 | length > 9 %} length must be less than 10 {% endif %} diff --git a/tests/dictionaries/04_5validators_multi/tiramisu/base.py b/tests/dictionaries/04_5validators_multi/tiramisu/base.py index 960cd949b..8fe189cf2 100644 --- a/tests/dictionaries/04_5validators_multi/tiramisu/base.py +++ b/tests/dictionaries/04_5validators_multi/tiramisu/base.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/04_5validators_multi/tiramisu/multi.py b/tests/dictionaries/04_5validators_multi/tiramisu/multi.py index fde8be7ff..b41d44768 100644 --- a/tests/dictionaries/04_5validators_multi/tiramisu/multi.py +++ b/tests/dictionaries/04_5validators_multi/tiramisu/multi.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/04_5validators_multi/tiramisu/no_namespace.py b/tests/dictionaries/04_5validators_multi/tiramisu/no_namespace.py index 5d732ead8..358934c49 100644 --- a/tests/dictionaries/04_5validators_multi/tiramisu/no_namespace.py +++ b/tests/dictionaries/04_5validators_multi/tiramisu/no_namespace.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/04_5validators_multi2/dictionaries/rougail/00-base.yml b/tests/dictionaries/04_5validators_multi2/dictionaries/rougail/00-base.yml index 20178d7d4..5af353f9d 100644 --- a/tests/dictionaries/04_5validators_multi2/dictionaries/rougail/00-base.yml +++ b/tests/dictionaries/04_5validators_multi2/dictionaries/rougail/00-base.yml @@ -7,10 +7,8 @@ var1: - 'no' - 'yes' validators: - - type: jinja - params: + - params: values: - type: variable variable: _.var1 whole: true jinja: | diff --git a/tests/dictionaries/04_5validators_multi2/tiramisu/base.py b/tests/dictionaries/04_5validators_multi2/tiramisu/base.py index 39f2cf95a..bc4f871ab 100644 --- a/tests/dictionaries/04_5validators_multi2/tiramisu/base.py +++ b/tests/dictionaries/04_5validators_multi2/tiramisu/base.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/04_5validators_multi2/tiramisu/multi.py b/tests/dictionaries/04_5validators_multi2/tiramisu/multi.py index d00a58292..c54f20717 100644 --- a/tests/dictionaries/04_5validators_multi2/tiramisu/multi.py +++ b/tests/dictionaries/04_5validators_multi2/tiramisu/multi.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/04_5validators_multi2/tiramisu/no_namespace.py b/tests/dictionaries/04_5validators_multi2/tiramisu/no_namespace.py index 105c5ac2b..b8678ab27 100644 --- a/tests/dictionaries/04_5validators_multi2/tiramisu/no_namespace.py +++ b/tests/dictionaries/04_5validators_multi2/tiramisu/no_namespace.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/04_7validators_variable_optional/dictionaries/rougail/00-base.yml b/tests/dictionaries/04_7validators_variable_optional/dictionaries/rougail/00-base.yml index 289b30bc2..310d0f2bb 100644 --- a/tests/dictionaries/04_7validators_variable_optional/dictionaries/rougail/00-base.yml +++ b/tests/dictionaries/04_7validators_variable_optional/dictionaries/rougail/00-base.yml @@ -5,25 +5,21 @@ general: # a family description: a first number type: number validators: - - type: jinja - jinja: | + - jinja: | {% if _.int == int2 %} int and int2 must be different {% endif %} params: int2: - type: variable variable: _.int2 optional: true description: int and int2 must be different - - type: jinja - jinja: | + - jinja: | {% if _.int == int3 %} int and int3 must be different {% endif %} params: int3: - type: variable variable: _.int3 optional: true description: int and int3 must be different diff --git a/tests/dictionaries/04_7validators_variable_optional/tiramisu/base.py b/tests/dictionaries/04_7validators_variable_optional/tiramisu/base.py index 0a115382e..adde9af46 100644 --- a/tests/dictionaries/04_7validators_variable_optional/tiramisu/base.py +++ b/tests/dictionaries/04_7validators_variable_optional/tiramisu/base.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/04_7validators_variable_optional/tiramisu/multi.py b/tests/dictionaries/04_7validators_variable_optional/tiramisu/multi.py index 3cd6cea0c..14b95e6ad 100644 --- a/tests/dictionaries/04_7validators_variable_optional/tiramisu/multi.py +++ b/tests/dictionaries/04_7validators_variable_optional/tiramisu/multi.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/04_7validators_variable_optional/tiramisu/no_namespace.py b/tests/dictionaries/04_7validators_variable_optional/tiramisu/no_namespace.py index ebde86433..4ee9c7526 100644 --- a/tests/dictionaries/04_7validators_variable_optional/tiramisu/no_namespace.py +++ b/tests/dictionaries/04_7validators_variable_optional/tiramisu/no_namespace.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/05_0multi_not_uniq/tiramisu/base.py b/tests/dictionaries/05_0multi_not_uniq/tiramisu/base.py index 368ba3c0f..a69b37065 100644 --- a/tests/dictionaries/05_0multi_not_uniq/tiramisu/base.py +++ b/tests/dictionaries/05_0multi_not_uniq/tiramisu/base.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/05_0multi_not_uniq/tiramisu/multi.py b/tests/dictionaries/05_0multi_not_uniq/tiramisu/multi.py index a10c2b78a..cb594174b 100644 --- a/tests/dictionaries/05_0multi_not_uniq/tiramisu/multi.py +++ b/tests/dictionaries/05_0multi_not_uniq/tiramisu/multi.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/05_0multi_not_uniq/tiramisu/no_namespace.py b/tests/dictionaries/05_0multi_not_uniq/tiramisu/no_namespace.py index d99c06326..d1b401960 100644 --- a/tests/dictionaries/05_0multi_not_uniq/tiramisu/no_namespace.py +++ b/tests/dictionaries/05_0multi_not_uniq/tiramisu/no_namespace.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/05_0multi_uniq/tiramisu/base.py b/tests/dictionaries/05_0multi_uniq/tiramisu/base.py index deda50d0e..1e6f3cf16 100644 --- a/tests/dictionaries/05_0multi_uniq/tiramisu/base.py +++ b/tests/dictionaries/05_0multi_uniq/tiramisu/base.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/05_0multi_uniq/tiramisu/multi.py b/tests/dictionaries/05_0multi_uniq/tiramisu/multi.py index 845d82605..034607dd4 100644 --- a/tests/dictionaries/05_0multi_uniq/tiramisu/multi.py +++ b/tests/dictionaries/05_0multi_uniq/tiramisu/multi.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/05_0multi_uniq/tiramisu/no_namespace.py b/tests/dictionaries/05_0multi_uniq/tiramisu/no_namespace.py index 6b55dd85c..eb650ed25 100644 --- a/tests/dictionaries/05_0multi_uniq/tiramisu/no_namespace.py +++ b/tests/dictionaries/05_0multi_uniq/tiramisu/no_namespace.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/12_1auto_save_expert/tiramisu/base.py b/tests/dictionaries/12_1auto_save_expert/tiramisu/base.py index 7bb63b2aa..9c6631fc7 100644 --- a/tests/dictionaries/12_1auto_save_expert/tiramisu/base.py +++ b/tests/dictionaries/12_1auto_save_expert/tiramisu/base.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/12_1auto_save_expert/tiramisu/multi.py b/tests/dictionaries/12_1auto_save_expert/tiramisu/multi.py index 132b591a8..261c76cfe 100644 --- a/tests/dictionaries/12_1auto_save_expert/tiramisu/multi.py +++ b/tests/dictionaries/12_1auto_save_expert/tiramisu/multi.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/12_1auto_save_expert/tiramisu/no_namespace.py b/tests/dictionaries/12_1auto_save_expert/tiramisu/no_namespace.py index 5d5f43576..434bcc5bd 100644 --- a/tests/dictionaries/12_1auto_save_expert/tiramisu/no_namespace.py +++ b/tests/dictionaries/12_1auto_save_expert/tiramisu/no_namespace.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/16_0redefine_description/tiramisu/base.py b/tests/dictionaries/16_0redefine_description/tiramisu/base.py index 1df317c78..743ec5cf3 100644 --- a/tests/dictionaries/16_0redefine_description/tiramisu/base.py +++ b/tests/dictionaries/16_0redefine_description/tiramisu/base.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/16_0redefine_description/tiramisu/multi.py b/tests/dictionaries/16_0redefine_description/tiramisu/multi.py index 85636cfad..d6ff81eed 100644 --- a/tests/dictionaries/16_0redefine_description/tiramisu/multi.py +++ b/tests/dictionaries/16_0redefine_description/tiramisu/multi.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/16_0redefine_description/tiramisu/no_namespace.py b/tests/dictionaries/16_0redefine_description/tiramisu/no_namespace.py index 76d4f9ae5..cedc40a63 100644 --- a/tests/dictionaries/16_0redefine_description/tiramisu/no_namespace.py +++ b/tests/dictionaries/16_0redefine_description/tiramisu/no_namespace.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/16_2family_redefine_calculation/dictionaries/rougail/01-base.yml b/tests/dictionaries/16_2family_redefine_calculation/dictionaries/rougail/01-base.yml index 0cfa452b0..098e9303e 100644 --- a/tests/dictionaries/16_2family_redefine_calculation/dictionaries/rougail/01-base.yml +++ b/tests/dictionaries/16_2family_redefine_calculation/dictionaries/rougail/01-base.yml @@ -3,6 +3,5 @@ version: '1.0' family: redefine: true disabled: - type: jinja jinja: | true diff --git a/tests/dictionaries/16_2family_redefine_calculation/tiramisu/base.py b/tests/dictionaries/16_2family_redefine_calculation/tiramisu/base.py index f8c68f834..24ad80be1 100644 --- a/tests/dictionaries/16_2family_redefine_calculation/tiramisu/base.py +++ b/tests/dictionaries/16_2family_redefine_calculation/tiramisu/base.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/16_2family_redefine_calculation/tiramisu/multi.py b/tests/dictionaries/16_2family_redefine_calculation/tiramisu/multi.py index dcd35c7e3..3050048ea 100644 --- a/tests/dictionaries/16_2family_redefine_calculation/tiramisu/multi.py +++ b/tests/dictionaries/16_2family_redefine_calculation/tiramisu/multi.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/16_2family_redefine_calculation/tiramisu/no_namespace.py b/tests/dictionaries/16_2family_redefine_calculation/tiramisu/no_namespace.py index ad28d0d60..2138bab07 100644 --- a/tests/dictionaries/16_2family_redefine_calculation/tiramisu/no_namespace.py +++ b/tests/dictionaries/16_2family_redefine_calculation/tiramisu/no_namespace.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/16_2family_redefine_disabled/tiramisu/base.py b/tests/dictionaries/16_2family_redefine_disabled/tiramisu/base.py index 6507076f3..0fd38b83f 100644 --- a/tests/dictionaries/16_2family_redefine_disabled/tiramisu/base.py +++ b/tests/dictionaries/16_2family_redefine_disabled/tiramisu/base.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/16_2family_redefine_disabled/tiramisu/multi.py b/tests/dictionaries/16_2family_redefine_disabled/tiramisu/multi.py index 81d558327..fa21ec0b5 100644 --- a/tests/dictionaries/16_2family_redefine_disabled/tiramisu/multi.py +++ b/tests/dictionaries/16_2family_redefine_disabled/tiramisu/multi.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/16_2family_redefine_disabled/tiramisu/no_namespace.py b/tests/dictionaries/16_2family_redefine_disabled/tiramisu/no_namespace.py index e2c5696b1..0954076d9 100644 --- a/tests/dictionaries/16_2family_redefine_disabled/tiramisu/no_namespace.py +++ b/tests/dictionaries/16_2family_redefine_disabled/tiramisu/no_namespace.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/16_5exists_nonexists/tiramisu/base.py b/tests/dictionaries/16_5exists_nonexists/tiramisu/base.py index 4cb5fc0a2..631014f21 100644 --- a/tests/dictionaries/16_5exists_nonexists/tiramisu/base.py +++ b/tests/dictionaries/16_5exists_nonexists/tiramisu/base.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/16_5exists_nonexists/tiramisu/multi.py b/tests/dictionaries/16_5exists_nonexists/tiramisu/multi.py index cd7d650f8..ccf1a44de 100644 --- a/tests/dictionaries/16_5exists_nonexists/tiramisu/multi.py +++ b/tests/dictionaries/16_5exists_nonexists/tiramisu/multi.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/16_5exists_nonexists/tiramisu/no_namespace.py b/tests/dictionaries/16_5exists_nonexists/tiramisu/no_namespace.py index a36a6d059..41d253240 100644 --- a/tests/dictionaries/16_5exists_nonexists/tiramisu/no_namespace.py +++ b/tests/dictionaries/16_5exists_nonexists/tiramisu/no_namespace.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/16_5exists_redefine/tiramisu/base.py b/tests/dictionaries/16_5exists_redefine/tiramisu/base.py index 551677f11..8f82c90ce 100644 --- a/tests/dictionaries/16_5exists_redefine/tiramisu/base.py +++ b/tests/dictionaries/16_5exists_redefine/tiramisu/base.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/16_5exists_redefine/tiramisu/multi.py b/tests/dictionaries/16_5exists_redefine/tiramisu/multi.py index c9e1d64b5..8f8dd4d21 100644 --- a/tests/dictionaries/16_5exists_redefine/tiramisu/multi.py +++ b/tests/dictionaries/16_5exists_redefine/tiramisu/multi.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/16_5exists_redefine/tiramisu/no_namespace.py b/tests/dictionaries/16_5exists_redefine/tiramisu/no_namespace.py index 1c90a523f..64bedd850 100644 --- a/tests/dictionaries/16_5exists_redefine/tiramisu/no_namespace.py +++ b/tests/dictionaries/16_5exists_redefine/tiramisu/no_namespace.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/16_5redefine_calculation/dictionaries/rougail/00-base.yml b/tests/dictionaries/16_5redefine_calculation/dictionaries/rougail/00-base.yml index 582a32f08..20889f115 100644 --- a/tests/dictionaries/16_5redefine_calculation/dictionaries/rougail/00-base.yml +++ b/tests/dictionaries/16_5redefine_calculation/dictionaries/rougail/00-base.yml @@ -3,6 +3,5 @@ version: '1.1' variable: description: a variable default: - type: jinja jinja: 'no' description: returns no diff --git a/tests/dictionaries/16_5redefine_calculation/dictionaries/rougail/01-base.yml b/tests/dictionaries/16_5redefine_calculation/dictionaries/rougail/01-base.yml index 90b6443fa..48eb5bbac 100644 --- a/tests/dictionaries/16_5redefine_calculation/dictionaries/rougail/01-base.yml +++ b/tests/dictionaries/16_5redefine_calculation/dictionaries/rougail/01-base.yml @@ -3,6 +3,5 @@ version: '1.1' variable: redefine: true default: - type: jinja jinja: 'yes' description: returns yes diff --git a/tests/dictionaries/16_5redefine_calculation/tiramisu/base.py b/tests/dictionaries/16_5redefine_calculation/tiramisu/base.py index 062f3b741..3b82710cb 100644 --- a/tests/dictionaries/16_5redefine_calculation/tiramisu/base.py +++ b/tests/dictionaries/16_5redefine_calculation/tiramisu/base.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/16_5redefine_calculation/tiramisu/multi.py b/tests/dictionaries/16_5redefine_calculation/tiramisu/multi.py index d52da8119..5694154ca 100644 --- a/tests/dictionaries/16_5redefine_calculation/tiramisu/multi.py +++ b/tests/dictionaries/16_5redefine_calculation/tiramisu/multi.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/16_5redefine_calculation/tiramisu/no_namespace.py b/tests/dictionaries/16_5redefine_calculation/tiramisu/no_namespace.py index d387e668e..5e7d4ff6f 100644 --- a/tests/dictionaries/16_5redefine_calculation/tiramisu/no_namespace.py +++ b/tests/dictionaries/16_5redefine_calculation/tiramisu/no_namespace.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/16_5redefine_choice/tiramisu/base.py b/tests/dictionaries/16_5redefine_choice/tiramisu/base.py index 2f39d3297..ed2fd60b0 100644 --- a/tests/dictionaries/16_5redefine_choice/tiramisu/base.py +++ b/tests/dictionaries/16_5redefine_choice/tiramisu/base.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/16_5redefine_choice/tiramisu/multi.py b/tests/dictionaries/16_5redefine_choice/tiramisu/multi.py index 128931b5b..626319a6e 100644 --- a/tests/dictionaries/16_5redefine_choice/tiramisu/multi.py +++ b/tests/dictionaries/16_5redefine_choice/tiramisu/multi.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/16_5redefine_choice/tiramisu/no_namespace.py b/tests/dictionaries/16_5redefine_choice/tiramisu/no_namespace.py index f7569d70b..ca3a694b9 100644 --- a/tests/dictionaries/16_5redefine_choice/tiramisu/no_namespace.py +++ b/tests/dictionaries/16_5redefine_choice/tiramisu/no_namespace.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/16_5redefine_default/tiramisu/base.py b/tests/dictionaries/16_5redefine_default/tiramisu/base.py index 8b8d97b1d..2f6bd6234 100644 --- a/tests/dictionaries/16_5redefine_default/tiramisu/base.py +++ b/tests/dictionaries/16_5redefine_default/tiramisu/base.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/16_5redefine_default/tiramisu/multi.py b/tests/dictionaries/16_5redefine_default/tiramisu/multi.py index 1c981eab2..9f4cbe11c 100644 --- a/tests/dictionaries/16_5redefine_default/tiramisu/multi.py +++ b/tests/dictionaries/16_5redefine_default/tiramisu/multi.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/16_5redefine_default/tiramisu/no_namespace.py b/tests/dictionaries/16_5redefine_default/tiramisu/no_namespace.py index 32c4dac1b..29373d00e 100644 --- a/tests/dictionaries/16_5redefine_default/tiramisu/no_namespace.py +++ b/tests/dictionaries/16_5redefine_default/tiramisu/no_namespace.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/16_5redefine_default_calculation/dictionaries/rougail/00-base.yml b/tests/dictionaries/16_5redefine_default_calculation/dictionaries/rougail/00-base.yml index ab9661186..3f44bad41 100644 --- a/tests/dictionaries/16_5redefine_default_calculation/dictionaries/rougail/00-base.yml +++ b/tests/dictionaries/16_5redefine_default_calculation/dictionaries/rougail/00-base.yml @@ -3,5 +3,4 @@ version: '1.1' variable: description: a variable default: - type: jinja jinja: 'yes' diff --git a/tests/dictionaries/16_5redefine_default_calculation/tiramisu/base.py b/tests/dictionaries/16_5redefine_default_calculation/tiramisu/base.py index 56d1c5871..32a264701 100644 --- a/tests/dictionaries/16_5redefine_default_calculation/tiramisu/base.py +++ b/tests/dictionaries/16_5redefine_default_calculation/tiramisu/base.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/16_5redefine_default_calculation/tiramisu/multi.py b/tests/dictionaries/16_5redefine_default_calculation/tiramisu/multi.py index f3aaf4ef6..845b55b01 100644 --- a/tests/dictionaries/16_5redefine_default_calculation/tiramisu/multi.py +++ b/tests/dictionaries/16_5redefine_default_calculation/tiramisu/multi.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/16_5redefine_default_calculation/tiramisu/no_namespace.py b/tests/dictionaries/16_5redefine_default_calculation/tiramisu/no_namespace.py index 91d10779d..c2ce765c9 100644 --- a/tests/dictionaries/16_5redefine_default_calculation/tiramisu/no_namespace.py +++ b/tests/dictionaries/16_5redefine_default_calculation/tiramisu/no_namespace.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/16_5redefine_family/tiramisu/base.py b/tests/dictionaries/16_5redefine_family/tiramisu/base.py index 6259b407c..affbde487 100644 --- a/tests/dictionaries/16_5redefine_family/tiramisu/base.py +++ b/tests/dictionaries/16_5redefine_family/tiramisu/base.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/16_5redefine_family/tiramisu/multi.py b/tests/dictionaries/16_5redefine_family/tiramisu/multi.py index 5cbadc13c..ef542f00a 100644 --- a/tests/dictionaries/16_5redefine_family/tiramisu/multi.py +++ b/tests/dictionaries/16_5redefine_family/tiramisu/multi.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/16_5redefine_family/tiramisu/no_namespace.py b/tests/dictionaries/16_5redefine_family/tiramisu/no_namespace.py index 1772d0a1d..e200bbcd0 100644 --- a/tests/dictionaries/16_5redefine_family/tiramisu/no_namespace.py +++ b/tests/dictionaries/16_5redefine_family/tiramisu/no_namespace.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/16_5redefine_help/tiramisu/base.py b/tests/dictionaries/16_5redefine_help/tiramisu/base.py index bbee67d5b..f2cd9b138 100644 --- a/tests/dictionaries/16_5redefine_help/tiramisu/base.py +++ b/tests/dictionaries/16_5redefine_help/tiramisu/base.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/16_5redefine_help/tiramisu/multi.py b/tests/dictionaries/16_5redefine_help/tiramisu/multi.py index 1ebdc01c6..61e9f51b4 100644 --- a/tests/dictionaries/16_5redefine_help/tiramisu/multi.py +++ b/tests/dictionaries/16_5redefine_help/tiramisu/multi.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/16_5redefine_help/tiramisu/no_namespace.py b/tests/dictionaries/16_5redefine_help/tiramisu/no_namespace.py index fac596a6b..0fc654e09 100644 --- a/tests/dictionaries/16_5redefine_help/tiramisu/no_namespace.py +++ b/tests/dictionaries/16_5redefine_help/tiramisu/no_namespace.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/16_5redefine_hidden/tiramisu/base.py b/tests/dictionaries/16_5redefine_hidden/tiramisu/base.py index 626dc1c59..633ce4630 100644 --- a/tests/dictionaries/16_5redefine_hidden/tiramisu/base.py +++ b/tests/dictionaries/16_5redefine_hidden/tiramisu/base.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/16_5redefine_hidden/tiramisu/multi.py b/tests/dictionaries/16_5redefine_hidden/tiramisu/multi.py index 36709eaed..95209fa57 100644 --- a/tests/dictionaries/16_5redefine_hidden/tiramisu/multi.py +++ b/tests/dictionaries/16_5redefine_hidden/tiramisu/multi.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/16_5redefine_hidden/tiramisu/no_namespace.py b/tests/dictionaries/16_5redefine_hidden/tiramisu/no_namespace.py index b80eb5c1b..9dfe776b6 100644 --- a/tests/dictionaries/16_5redefine_hidden/tiramisu/no_namespace.py +++ b/tests/dictionaries/16_5redefine_hidden/tiramisu/no_namespace.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/16_5redefine_multi/tiramisu/base.py b/tests/dictionaries/16_5redefine_multi/tiramisu/base.py index 57ad41d3b..4d4d0153b 100644 --- a/tests/dictionaries/16_5redefine_multi/tiramisu/base.py +++ b/tests/dictionaries/16_5redefine_multi/tiramisu/base.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/16_5redefine_multi/tiramisu/multi.py b/tests/dictionaries/16_5redefine_multi/tiramisu/multi.py index 86fb4af4e..a8a628363 100644 --- a/tests/dictionaries/16_5redefine_multi/tiramisu/multi.py +++ b/tests/dictionaries/16_5redefine_multi/tiramisu/multi.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/16_5redefine_multi/tiramisu/no_namespace.py b/tests/dictionaries/16_5redefine_multi/tiramisu/no_namespace.py index 3be06206c..5c3a890f8 100644 --- a/tests/dictionaries/16_5redefine_multi/tiramisu/no_namespace.py +++ b/tests/dictionaries/16_5redefine_multi/tiramisu/no_namespace.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/16_5redefine_remove_disable_calculation/dictionaries/rougail/00-base.yml b/tests/dictionaries/16_5redefine_remove_disable_calculation/dictionaries/rougail/00-base.yml index 327667608..27259ee3d 100644 --- a/tests/dictionaries/16_5redefine_remove_disable_calculation/dictionaries/rougail/00-base.yml +++ b/tests/dictionaries/16_5redefine_remove_disable_calculation/dictionaries/rougail/00-base.yml @@ -4,7 +4,6 @@ condition: "no" # a condition variable: description: a variable disabled: - type: jinja jinja: | {% if _.condition == "yes" %} true diff --git a/tests/dictionaries/16_5redefine_remove_disable_calculation/tiramisu/base.py b/tests/dictionaries/16_5redefine_remove_disable_calculation/tiramisu/base.py index bf6fe9aed..39532257d 100644 --- a/tests/dictionaries/16_5redefine_remove_disable_calculation/tiramisu/base.py +++ b/tests/dictionaries/16_5redefine_remove_disable_calculation/tiramisu/base.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/16_5redefine_remove_disable_calculation/tiramisu/multi.py b/tests/dictionaries/16_5redefine_remove_disable_calculation/tiramisu/multi.py index 18df94c63..e6917b21c 100644 --- a/tests/dictionaries/16_5redefine_remove_disable_calculation/tiramisu/multi.py +++ b/tests/dictionaries/16_5redefine_remove_disable_calculation/tiramisu/multi.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/16_5redefine_remove_disable_calculation/tiramisu/no_namespace.py b/tests/dictionaries/16_5redefine_remove_disable_calculation/tiramisu/no_namespace.py index d7a9b72fd..511d214a5 100644 --- a/tests/dictionaries/16_5redefine_remove_disable_calculation/tiramisu/no_namespace.py +++ b/tests/dictionaries/16_5redefine_remove_disable_calculation/tiramisu/no_namespace.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/16_5test_redefine/tiramisu/base.py b/tests/dictionaries/16_5test_redefine/tiramisu/base.py index be0f08014..399cafef0 100644 --- a/tests/dictionaries/16_5test_redefine/tiramisu/base.py +++ b/tests/dictionaries/16_5test_redefine/tiramisu/base.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/16_5test_redefine/tiramisu/multi.py b/tests/dictionaries/16_5test_redefine/tiramisu/multi.py index 0e3f358bf..b0328b7fb 100644 --- a/tests/dictionaries/16_5test_redefine/tiramisu/multi.py +++ b/tests/dictionaries/16_5test_redefine/tiramisu/multi.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/16_5test_redefine/tiramisu/no_namespace.py b/tests/dictionaries/16_5test_redefine/tiramisu/no_namespace.py index d78d7221b..cb54605d0 100644 --- a/tests/dictionaries/16_5test_redefine/tiramisu/no_namespace.py +++ b/tests/dictionaries/16_5test_redefine/tiramisu/no_namespace.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/16_6choice_redefine/tiramisu/base.py b/tests/dictionaries/16_6choice_redefine/tiramisu/base.py index c908a59aa..0818f19fb 100644 --- a/tests/dictionaries/16_6choice_redefine/tiramisu/base.py +++ b/tests/dictionaries/16_6choice_redefine/tiramisu/base.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/16_6choice_redefine/tiramisu/multi.py b/tests/dictionaries/16_6choice_redefine/tiramisu/multi.py index 6296524b3..bcbf238ff 100644 --- a/tests/dictionaries/16_6choice_redefine/tiramisu/multi.py +++ b/tests/dictionaries/16_6choice_redefine/tiramisu/multi.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/16_6choice_redefine/tiramisu/no_namespace.py b/tests/dictionaries/16_6choice_redefine/tiramisu/no_namespace.py index 2e7d06e8c..df3de6274 100644 --- a/tests/dictionaries/16_6choice_redefine/tiramisu/no_namespace.py +++ b/tests/dictionaries/16_6choice_redefine/tiramisu/no_namespace.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/16exists_exists/tiramisu/base.py b/tests/dictionaries/16exists_exists/tiramisu/base.py index 7083c5f4e..75808e319 100644 --- a/tests/dictionaries/16exists_exists/tiramisu/base.py +++ b/tests/dictionaries/16exists_exists/tiramisu/base.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/16exists_exists/tiramisu/multi.py b/tests/dictionaries/16exists_exists/tiramisu/multi.py index f00c8f7e9..c8adce004 100644 --- a/tests/dictionaries/16exists_exists/tiramisu/multi.py +++ b/tests/dictionaries/16exists_exists/tiramisu/multi.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/16exists_exists/tiramisu/no_namespace.py b/tests/dictionaries/16exists_exists/tiramisu/no_namespace.py index 995514200..90b80ff1c 100644 --- a/tests/dictionaries/16exists_exists/tiramisu/no_namespace.py +++ b/tests/dictionaries/16exists_exists/tiramisu/no_namespace.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/17_5redefine_leadership/tiramisu/base.py b/tests/dictionaries/17_5redefine_leadership/tiramisu/base.py index 1dbe9fa26..3c9c064ff 100644 --- a/tests/dictionaries/17_5redefine_leadership/tiramisu/base.py +++ b/tests/dictionaries/17_5redefine_leadership/tiramisu/base.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/17_5redefine_leadership/tiramisu/multi.py b/tests/dictionaries/17_5redefine_leadership/tiramisu/multi.py index 924621b1f..113613bab 100644 --- a/tests/dictionaries/17_5redefine_leadership/tiramisu/multi.py +++ b/tests/dictionaries/17_5redefine_leadership/tiramisu/multi.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/17_5redefine_leadership/tiramisu/no_namespace.py b/tests/dictionaries/17_5redefine_leadership/tiramisu/no_namespace.py index 92361560a..5a2035e1a 100644 --- a/tests/dictionaries/17_5redefine_leadership/tiramisu/no_namespace.py +++ b/tests/dictionaries/17_5redefine_leadership/tiramisu/no_namespace.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/20_0empty_family/tiramisu/base.py b/tests/dictionaries/20_0empty_family/tiramisu/base.py index 51a1b59a1..c800d9e33 100644 --- a/tests/dictionaries/20_0empty_family/tiramisu/base.py +++ b/tests/dictionaries/20_0empty_family/tiramisu/base.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/20_0empty_family/tiramisu/multi.py b/tests/dictionaries/20_0empty_family/tiramisu/multi.py index 472635ec3..9357fd228 100644 --- a/tests/dictionaries/20_0empty_family/tiramisu/multi.py +++ b/tests/dictionaries/20_0empty_family/tiramisu/multi.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/20_0empty_family/tiramisu/no_namespace.py b/tests/dictionaries/20_0empty_family/tiramisu/no_namespace.py index 42f38a285..502023bc9 100644 --- a/tests/dictionaries/20_0empty_family/tiramisu/no_namespace.py +++ b/tests/dictionaries/20_0empty_family/tiramisu/no_namespace.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/20_0family_append/tiramisu/base.py b/tests/dictionaries/20_0family_append/tiramisu/base.py index 933e700e9..5e8ed973c 100644 --- a/tests/dictionaries/20_0family_append/tiramisu/base.py +++ b/tests/dictionaries/20_0family_append/tiramisu/base.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/20_0family_append/tiramisu/multi.py b/tests/dictionaries/20_0family_append/tiramisu/multi.py index e7fd0c292..9a16533e3 100644 --- a/tests/dictionaries/20_0family_append/tiramisu/multi.py +++ b/tests/dictionaries/20_0family_append/tiramisu/multi.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/20_0family_append/tiramisu/no_namespace.py b/tests/dictionaries/20_0family_append/tiramisu/no_namespace.py index b0889dfd7..add0ad523 100644 --- a/tests/dictionaries/20_0family_append/tiramisu/no_namespace.py +++ b/tests/dictionaries/20_0family_append/tiramisu/no_namespace.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/20_0family_underscore/tiramisu/base.py b/tests/dictionaries/20_0family_underscore/tiramisu/base.py index 2a753d366..c32c0b629 100644 --- a/tests/dictionaries/20_0family_underscore/tiramisu/base.py +++ b/tests/dictionaries/20_0family_underscore/tiramisu/base.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/20_0family_underscore/tiramisu/multi.py b/tests/dictionaries/20_0family_underscore/tiramisu/multi.py index 6816d3f0b..334adc1eb 100644 --- a/tests/dictionaries/20_0family_underscore/tiramisu/multi.py +++ b/tests/dictionaries/20_0family_underscore/tiramisu/multi.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/20_0family_underscore/tiramisu/no_namespace.py b/tests/dictionaries/20_0family_underscore/tiramisu/no_namespace.py index 3ec174955..231f86320 100644 --- a/tests/dictionaries/20_0family_underscore/tiramisu/no_namespace.py +++ b/tests/dictionaries/20_0family_underscore/tiramisu/no_namespace.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/20_0multi_family/tiramisu/base.py b/tests/dictionaries/20_0multi_family/tiramisu/base.py index 83e2b2c6a..46a5541de 100644 --- a/tests/dictionaries/20_0multi_family/tiramisu/base.py +++ b/tests/dictionaries/20_0multi_family/tiramisu/base.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/20_0multi_family/tiramisu/multi.py b/tests/dictionaries/20_0multi_family/tiramisu/multi.py index ea11b3c18..9076fa749 100644 --- a/tests/dictionaries/20_0multi_family/tiramisu/multi.py +++ b/tests/dictionaries/20_0multi_family/tiramisu/multi.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/20_0multi_family/tiramisu/no_namespace.py b/tests/dictionaries/20_0multi_family/tiramisu/no_namespace.py index 3f24899fd..f12bfcad9 100644 --- a/tests/dictionaries/20_0multi_family/tiramisu/no_namespace.py +++ b/tests/dictionaries/20_0multi_family/tiramisu/no_namespace.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/20_0multi_family_basic/tiramisu/base.py b/tests/dictionaries/20_0multi_family_basic/tiramisu/base.py index f57c84db4..6f0ff441d 100644 --- a/tests/dictionaries/20_0multi_family_basic/tiramisu/base.py +++ b/tests/dictionaries/20_0multi_family_basic/tiramisu/base.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/20_0multi_family_basic/tiramisu/multi.py b/tests/dictionaries/20_0multi_family_basic/tiramisu/multi.py index 9aa89573e..6da2d2d80 100644 --- a/tests/dictionaries/20_0multi_family_basic/tiramisu/multi.py +++ b/tests/dictionaries/20_0multi_family_basic/tiramisu/multi.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/20_0multi_family_basic/tiramisu/no_namespace.py b/tests/dictionaries/20_0multi_family_basic/tiramisu/no_namespace.py index efc9dbd10..c2c0181fa 100644 --- a/tests/dictionaries/20_0multi_family_basic/tiramisu/no_namespace.py +++ b/tests/dictionaries/20_0multi_family_basic/tiramisu/no_namespace.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/20_0multi_family_expert/tiramisu/base.py b/tests/dictionaries/20_0multi_family_expert/tiramisu/base.py index 6680b5e18..43ad5d3ad 100644 --- a/tests/dictionaries/20_0multi_family_expert/tiramisu/base.py +++ b/tests/dictionaries/20_0multi_family_expert/tiramisu/base.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/20_0multi_family_expert/tiramisu/multi.py b/tests/dictionaries/20_0multi_family_expert/tiramisu/multi.py index 51e7357c1..0a21a72ce 100644 --- a/tests/dictionaries/20_0multi_family_expert/tiramisu/multi.py +++ b/tests/dictionaries/20_0multi_family_expert/tiramisu/multi.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/20_0multi_family_expert/tiramisu/no_namespace.py b/tests/dictionaries/20_0multi_family_expert/tiramisu/no_namespace.py index 13d04d0c8..6f318dc59 100644 --- a/tests/dictionaries/20_0multi_family_expert/tiramisu/no_namespace.py +++ b/tests/dictionaries/20_0multi_family_expert/tiramisu/no_namespace.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/20_0multi_family_order/tiramisu/base.py b/tests/dictionaries/20_0multi_family_order/tiramisu/base.py index 49d4f7264..adb7e425e 100644 --- a/tests/dictionaries/20_0multi_family_order/tiramisu/base.py +++ b/tests/dictionaries/20_0multi_family_order/tiramisu/base.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/20_0multi_family_order/tiramisu/multi.py b/tests/dictionaries/20_0multi_family_order/tiramisu/multi.py index b412717ea..3e2bdb309 100644 --- a/tests/dictionaries/20_0multi_family_order/tiramisu/multi.py +++ b/tests/dictionaries/20_0multi_family_order/tiramisu/multi.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/20_0multi_family_order/tiramisu/no_namespace.py b/tests/dictionaries/20_0multi_family_order/tiramisu/no_namespace.py index c9850b986..ae6578ff9 100644 --- a/tests/dictionaries/20_0multi_family_order/tiramisu/no_namespace.py +++ b/tests/dictionaries/20_0multi_family_order/tiramisu/no_namespace.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/20_0validators_differ_redefine/dictionaries/rougail/00-base.yml b/tests/dictionaries/20_0validators_differ_redefine/dictionaries/rougail/00-base.yml index f40779f74..52ffb3180 100644 --- a/tests/dictionaries/20_0validators_differ_redefine/dictionaries/rougail/00-base.yml +++ b/tests/dictionaries/20_0validators_differ_redefine/dictionaries/rougail/00-base.yml @@ -6,8 +6,7 @@ var3: description: a third variable default: "yes" validators: - - type: jinja - jinja: | + - jinja: | {% if _.var3 == _.var1 %} var3 must be different than var1 {% endif %} diff --git a/tests/dictionaries/20_0validators_differ_redefine/dictionaries/rougail/01-base.yml b/tests/dictionaries/20_0validators_differ_redefine/dictionaries/rougail/01-base.yml index 124181846..fd9bb17dc 100644 --- a/tests/dictionaries/20_0validators_differ_redefine/dictionaries/rougail/01-base.yml +++ b/tests/dictionaries/20_0validators_differ_redefine/dictionaries/rougail/01-base.yml @@ -3,8 +3,7 @@ version: '1.1' var3: redefine: true validators: - - type: jinja - jinja: | + - jinja: | {% if _.var3 == _.var2 %} var3 must be different than var2 {% endif %} diff --git a/tests/dictionaries/20_0validators_differ_redefine/tiramisu/base.py b/tests/dictionaries/20_0validators_differ_redefine/tiramisu/base.py index 7855206aa..cd2d41b1e 100644 --- a/tests/dictionaries/20_0validators_differ_redefine/tiramisu/base.py +++ b/tests/dictionaries/20_0validators_differ_redefine/tiramisu/base.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/20_0validators_differ_redefine/tiramisu/multi.py b/tests/dictionaries/20_0validators_differ_redefine/tiramisu/multi.py index 035ba4921..97d1097d2 100644 --- a/tests/dictionaries/20_0validators_differ_redefine/tiramisu/multi.py +++ b/tests/dictionaries/20_0validators_differ_redefine/tiramisu/multi.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/20_0validators_differ_redefine/tiramisu/no_namespace.py b/tests/dictionaries/20_0validators_differ_redefine/tiramisu/no_namespace.py index 7ea287374..872880b54 100644 --- a/tests/dictionaries/20_0validators_differ_redefine/tiramisu/no_namespace.py +++ b/tests/dictionaries/20_0validators_differ_redefine/tiramisu/no_namespace.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/20_1empty_subfamily/tiramisu/base.py b/tests/dictionaries/20_1empty_subfamily/tiramisu/base.py index 51a1b59a1..c800d9e33 100644 --- a/tests/dictionaries/20_1empty_subfamily/tiramisu/base.py +++ b/tests/dictionaries/20_1empty_subfamily/tiramisu/base.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/20_1empty_subfamily/tiramisu/multi.py b/tests/dictionaries/20_1empty_subfamily/tiramisu/multi.py index 73b501019..2e874a701 100644 --- a/tests/dictionaries/20_1empty_subfamily/tiramisu/multi.py +++ b/tests/dictionaries/20_1empty_subfamily/tiramisu/multi.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/20_1empty_subfamily/tiramisu/no_namespace.py b/tests/dictionaries/20_1empty_subfamily/tiramisu/no_namespace.py index 42f38a285..502023bc9 100644 --- a/tests/dictionaries/20_1empty_subfamily/tiramisu/no_namespace.py +++ b/tests/dictionaries/20_1empty_subfamily/tiramisu/no_namespace.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/20_9default_information_parent/tiramisu/base.py b/tests/dictionaries/20_9default_information_parent/tiramisu/base.py index 3fbb01f5e..9b7152a74 100644 --- a/tests/dictionaries/20_9default_information_parent/tiramisu/base.py +++ b/tests/dictionaries/20_9default_information_parent/tiramisu/base.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/20_9default_information_parent/tiramisu/multi.py b/tests/dictionaries/20_9default_information_parent/tiramisu/multi.py index 90c463ec5..418c1ae85 100644 --- a/tests/dictionaries/20_9default_information_parent/tiramisu/multi.py +++ b/tests/dictionaries/20_9default_information_parent/tiramisu/multi.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/20_9default_information_parent/tiramisu/no_namespace.py b/tests/dictionaries/20_9default_information_parent/tiramisu/no_namespace.py index 114d632f0..991a00ae4 100644 --- a/tests/dictionaries/20_9default_information_parent/tiramisu/no_namespace.py +++ b/tests/dictionaries/20_9default_information_parent/tiramisu/no_namespace.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/24_0family_hidden_condition/dictionaries/rougail/00-base.yml b/tests/dictionaries/24_0family_hidden_condition/dictionaries/rougail/00-base.yml index 2b6831851..0ea4593a5 100644 --- a/tests/dictionaries/24_0family_hidden_condition/dictionaries/rougail/00-base.yml +++ b/tests/dictionaries/24_0family_hidden_condition/dictionaries/rougail/00-base.yml @@ -4,7 +4,6 @@ condition: "no" # the variable use has condition family: description: possibly hidden family hidden: - type: jinja jinja: | {% if rougail.condition == "yes" %} condition is yes diff --git a/tests/dictionaries/24_0family_hidden_condition/tiramisu/base.py b/tests/dictionaries/24_0family_hidden_condition/tiramisu/base.py index 798477863..1f9a58915 100644 --- a/tests/dictionaries/24_0family_hidden_condition/tiramisu/base.py +++ b/tests/dictionaries/24_0family_hidden_condition/tiramisu/base.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/24_0family_hidden_condition/tiramisu/multi.py b/tests/dictionaries/24_0family_hidden_condition/tiramisu/multi.py index f7ceddb9f..6cd1ccd10 100644 --- a/tests/dictionaries/24_0family_hidden_condition/tiramisu/multi.py +++ b/tests/dictionaries/24_0family_hidden_condition/tiramisu/multi.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/24_0family_hidden_condition_boolean/dictionaries/rougail/00-base.yml b/tests/dictionaries/24_0family_hidden_condition_boolean/dictionaries/rougail/00-base.yml index f7e258f52..ab867df45 100644 --- a/tests/dictionaries/24_0family_hidden_condition_boolean/dictionaries/rougail/00-base.yml +++ b/tests/dictionaries/24_0family_hidden_condition_boolean/dictionaries/rougail/00-base.yml @@ -4,7 +4,6 @@ condition: false # a conditional variable family: description: a family hidden: - type: jinja jinja: | {% if not rougail.condition %} condition is false diff --git a/tests/dictionaries/24_0family_hidden_condition_boolean/tiramisu/base.py b/tests/dictionaries/24_0family_hidden_condition_boolean/tiramisu/base.py index c533144c7..89859583d 100644 --- a/tests/dictionaries/24_0family_hidden_condition_boolean/tiramisu/base.py +++ b/tests/dictionaries/24_0family_hidden_condition_boolean/tiramisu/base.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/24_0family_hidden_condition_boolean/tiramisu/multi.py b/tests/dictionaries/24_0family_hidden_condition_boolean/tiramisu/multi.py index 62e93f3cc..46d043f8d 100644 --- a/tests/dictionaries/24_0family_hidden_condition_boolean/tiramisu/multi.py +++ b/tests/dictionaries/24_0family_hidden_condition_boolean/tiramisu/multi.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/24_0family_hidden_condition_sub_family/dictionaries/rougail/00-base.yml b/tests/dictionaries/24_0family_hidden_condition_sub_family/dictionaries/rougail/00-base.yml index 46ad8637b..ad0154795 100644 --- a/tests/dictionaries/24_0family_hidden_condition_sub_family/dictionaries/rougail/00-base.yml +++ b/tests/dictionaries/24_0family_hidden_condition_sub_family/dictionaries/rougail/00-base.yml @@ -4,7 +4,6 @@ condition: "no" # the variable use has condition family: description: possibly hidden family hidden: - type: jinja jinja: | {% if _.condition == "yes" %} condition is yes diff --git a/tests/dictionaries/24_0family_hidden_condition_sub_family/tiramisu/base.py b/tests/dictionaries/24_0family_hidden_condition_sub_family/tiramisu/base.py index 37f2bab84..ccabd8ead 100644 --- a/tests/dictionaries/24_0family_hidden_condition_sub_family/tiramisu/base.py +++ b/tests/dictionaries/24_0family_hidden_condition_sub_family/tiramisu/base.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/24_0family_hidden_condition_sub_family/tiramisu/multi.py b/tests/dictionaries/24_0family_hidden_condition_sub_family/tiramisu/multi.py index 909c7e25a..a4436adc4 100644 --- a/tests/dictionaries/24_0family_hidden_condition_sub_family/tiramisu/multi.py +++ b/tests/dictionaries/24_0family_hidden_condition_sub_family/tiramisu/multi.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/24_0family_hidden_condition_sub_family/tiramisu/no_namespace.py b/tests/dictionaries/24_0family_hidden_condition_sub_family/tiramisu/no_namespace.py index 6d911a1f4..96c1495f1 100644 --- a/tests/dictionaries/24_0family_hidden_condition_sub_family/tiramisu/no_namespace.py +++ b/tests/dictionaries/24_0family_hidden_condition_sub_family/tiramisu/no_namespace.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/24_0family_hidden_condition_variable_sub_family/dictionaries/rougail/00-base.yml b/tests/dictionaries/24_0family_hidden_condition_variable_sub_family/dictionaries/rougail/00-base.yml index 9ea5285c4..b7216f691 100644 --- a/tests/dictionaries/24_0family_hidden_condition_variable_sub_family/dictionaries/rougail/00-base.yml +++ b/tests/dictionaries/24_0family_hidden_condition_variable_sub_family/dictionaries/rougail/00-base.yml @@ -4,7 +4,6 @@ condition: true # the variable use has condition family: description: possibly hidden family hidden: - type: variable variable: _.condition subfamily: # a subfamily var1: # a variable 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 5833f8ebd..58a9a863d 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 @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/24_0family_hidden_condition_variable_sub_family/tiramisu/multi.py b/tests/dictionaries/24_0family_hidden_condition_variable_sub_family/tiramisu/multi.py index 3c736b606..e176508a3 100644 --- a/tests/dictionaries/24_0family_hidden_condition_variable_sub_family/tiramisu/multi.py +++ b/tests/dictionaries/24_0family_hidden_condition_variable_sub_family/tiramisu/multi.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") 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 a726a87a5..cd157c186 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 @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/24_0family_hidden_condition_with_variable/dictionaries/rougail/00-base.yml b/tests/dictionaries/24_0family_hidden_condition_with_variable/dictionaries/rougail/00-base.yml index 76e0cd031..0eeca7e03 100644 --- a/tests/dictionaries/24_0family_hidden_condition_with_variable/dictionaries/rougail/00-base.yml +++ b/tests/dictionaries/24_0family_hidden_condition_with_variable/dictionaries/rougail/00-base.yml @@ -5,7 +5,6 @@ condition2: false # a second conditional variable family: description: a family hidden: - type: jinja jinja: | {% if not rougail.condition1 %} condition1 is false @@ -14,7 +13,6 @@ family: variable: description: a variable hidden: - type: jinja jinja: | {% if rougail.condition2 %} condition2 is true diff --git a/tests/dictionaries/24_0family_hidden_condition_with_variable/tiramisu/base.py b/tests/dictionaries/24_0family_hidden_condition_with_variable/tiramisu/base.py index 1cfc4e437..f504ac39c 100644 --- a/tests/dictionaries/24_0family_hidden_condition_with_variable/tiramisu/base.py +++ b/tests/dictionaries/24_0family_hidden_condition_with_variable/tiramisu/base.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/24_0family_hidden_condition_with_variable/tiramisu/multi.py b/tests/dictionaries/24_0family_hidden_condition_with_variable/tiramisu/multi.py index e4ae54a24..3af191db9 100644 --- a/tests/dictionaries/24_0family_hidden_condition_with_variable/tiramisu/multi.py +++ b/tests/dictionaries/24_0family_hidden_condition_with_variable/tiramisu/multi.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/24_0family_hidden_param_condition_sub_family/dictionaries/rougail/00-base.yml b/tests/dictionaries/24_0family_hidden_param_condition_sub_family/dictionaries/rougail/00-base.yml index 894723f1a..6c64302d8 100644 --- a/tests/dictionaries/24_0family_hidden_param_condition_sub_family/dictionaries/rougail/00-base.yml +++ b/tests/dictionaries/24_0family_hidden_param_condition_sub_family/dictionaries/rougail/00-base.yml @@ -4,14 +4,12 @@ condition: "no" # the variable use has condition family: description: possibly hidden family hidden: - type: jinja jinja: | {% if condition == "yes" %} condition is yes {% endif %} params: condition: - type: variable variable: _.condition description: if condition is yes sub_family: # a subfamily diff --git a/tests/dictionaries/24_0family_hidden_param_condition_sub_family/tiramisu/base.py b/tests/dictionaries/24_0family_hidden_param_condition_sub_family/tiramisu/base.py index 2963c2ef4..ed273767b 100644 --- a/tests/dictionaries/24_0family_hidden_param_condition_sub_family/tiramisu/base.py +++ b/tests/dictionaries/24_0family_hidden_param_condition_sub_family/tiramisu/base.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/24_0family_hidden_param_condition_sub_family/tiramisu/multi.py b/tests/dictionaries/24_0family_hidden_param_condition_sub_family/tiramisu/multi.py index 28c6a6d00..ee1fffdaa 100644 --- a/tests/dictionaries/24_0family_hidden_param_condition_sub_family/tiramisu/multi.py +++ b/tests/dictionaries/24_0family_hidden_param_condition_sub_family/tiramisu/multi.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/24_0family_hidden_param_condition_sub_family/tiramisu/no_namespace.py b/tests/dictionaries/24_0family_hidden_param_condition_sub_family/tiramisu/no_namespace.py index 3245c78d3..9fe500a77 100644 --- a/tests/dictionaries/24_0family_hidden_param_condition_sub_family/tiramisu/no_namespace.py +++ b/tests/dictionaries/24_0family_hidden_param_condition_sub_family/tiramisu/no_namespace.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/24_0family_mandatory_condition/dictionaries/rougail/00-base.yml b/tests/dictionaries/24_0family_mandatory_condition/dictionaries/rougail/00-base.yml index c192ea077..e00f2c193 100644 --- a/tests/dictionaries/24_0family_mandatory_condition/dictionaries/rougail/00-base.yml +++ b/tests/dictionaries/24_0family_mandatory_condition/dictionaries/rougail/00-base.yml @@ -4,7 +4,6 @@ condition: "no" # a condition var: description: a variable mandatory: - type: jinja jinja: | {% if _.condition == "yes" %} condition is yes diff --git a/tests/dictionaries/24_0family_mandatory_condition/tiramisu/base.py b/tests/dictionaries/24_0family_mandatory_condition/tiramisu/base.py index e40133fbb..0e324469d 100644 --- a/tests/dictionaries/24_0family_mandatory_condition/tiramisu/base.py +++ b/tests/dictionaries/24_0family_mandatory_condition/tiramisu/base.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/24_0family_mandatory_condition/tiramisu/multi.py b/tests/dictionaries/24_0family_mandatory_condition/tiramisu/multi.py index 17b84c4eb..dfeffe654 100644 --- a/tests/dictionaries/24_0family_mandatory_condition/tiramisu/multi.py +++ b/tests/dictionaries/24_0family_mandatory_condition/tiramisu/multi.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/24_0family_mandatory_condition/tiramisu/no_namespace.py b/tests/dictionaries/24_0family_mandatory_condition/tiramisu/no_namespace.py index 4aedb872d..c6a811604 100644 --- a/tests/dictionaries/24_0family_mandatory_condition/tiramisu/no_namespace.py +++ b/tests/dictionaries/24_0family_mandatory_condition/tiramisu/no_namespace.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/24_0family_mandatory_condition_variable/dictionaries/rougail/00-base.yml b/tests/dictionaries/24_0family_mandatory_condition_variable/dictionaries/rougail/00-base.yml index 20e3c0071..d335b1d54 100644 --- a/tests/dictionaries/24_0family_mandatory_condition_variable/dictionaries/rougail/00-base.yml +++ b/tests/dictionaries/24_0family_mandatory_condition_variable/dictionaries/rougail/00-base.yml @@ -4,5 +4,4 @@ condition: true # a condition var: description: a variable mandatory: - type: variable variable: _.condition 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 19e0d10de..687a7e3d8 100644 --- a/tests/dictionaries/24_0family_mandatory_condition_variable/tiramisu/base.py +++ b/tests/dictionaries/24_0family_mandatory_condition_variable/tiramisu/base.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/24_0family_mandatory_condition_variable/tiramisu/multi.py b/tests/dictionaries/24_0family_mandatory_condition_variable/tiramisu/multi.py index 4256d2a5a..03c61d21e 100644 --- a/tests/dictionaries/24_0family_mandatory_condition_variable/tiramisu/multi.py +++ b/tests/dictionaries/24_0family_mandatory_condition_variable/tiramisu/multi.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") 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 c5b2e0d4d..3d5401861 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 @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/40_0leadership/tiramisu/base.py b/tests/dictionaries/40_0leadership/tiramisu/base.py index 1d8085838..97e1783f8 100644 --- a/tests/dictionaries/40_0leadership/tiramisu/base.py +++ b/tests/dictionaries/40_0leadership/tiramisu/base.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/40_0leadership/tiramisu/multi.py b/tests/dictionaries/40_0leadership/tiramisu/multi.py index f7e191356..a773e0b39 100644 --- a/tests/dictionaries/40_0leadership/tiramisu/multi.py +++ b/tests/dictionaries/40_0leadership/tiramisu/multi.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/40_0leadership/tiramisu/no_namespace.py b/tests/dictionaries/40_0leadership/tiramisu/no_namespace.py index abb8cc731..de7dc7f99 100644 --- a/tests/dictionaries/40_0leadership/tiramisu/no_namespace.py +++ b/tests/dictionaries/40_0leadership/tiramisu/no_namespace.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/40_0leadership_diff_name/tiramisu/base.py b/tests/dictionaries/40_0leadership_diff_name/tiramisu/base.py index 1ea4ab867..75b19a54f 100644 --- a/tests/dictionaries/40_0leadership_diff_name/tiramisu/base.py +++ b/tests/dictionaries/40_0leadership_diff_name/tiramisu/base.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/40_0leadership_diff_name/tiramisu/multi.py b/tests/dictionaries/40_0leadership_diff_name/tiramisu/multi.py index 78f4cd272..082782ef3 100644 --- a/tests/dictionaries/40_0leadership_diff_name/tiramisu/multi.py +++ b/tests/dictionaries/40_0leadership_diff_name/tiramisu/multi.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/40_0leadership_diff_name/tiramisu/no_namespace.py b/tests/dictionaries/40_0leadership_diff_name/tiramisu/no_namespace.py index 291c04f97..96f2b152f 100644 --- a/tests/dictionaries/40_0leadership_diff_name/tiramisu/no_namespace.py +++ b/tests/dictionaries/40_0leadership_diff_name/tiramisu/no_namespace.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/40_0leadership_empty/tiramisu/base.py b/tests/dictionaries/40_0leadership_empty/tiramisu/base.py index 51a1b59a1..c800d9e33 100644 --- a/tests/dictionaries/40_0leadership_empty/tiramisu/base.py +++ b/tests/dictionaries/40_0leadership_empty/tiramisu/base.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/40_0leadership_empty/tiramisu/multi.py b/tests/dictionaries/40_0leadership_empty/tiramisu/multi.py index 472635ec3..9357fd228 100644 --- a/tests/dictionaries/40_0leadership_empty/tiramisu/multi.py +++ b/tests/dictionaries/40_0leadership_empty/tiramisu/multi.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/40_0leadership_empty/tiramisu/no_namespace.py b/tests/dictionaries/40_0leadership_empty/tiramisu/no_namespace.py index 42f38a285..502023bc9 100644 --- a/tests/dictionaries/40_0leadership_empty/tiramisu/no_namespace.py +++ b/tests/dictionaries/40_0leadership_empty/tiramisu/no_namespace.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/40_0leadership_follower_default_calculation/dictionaries/rougail/00-base.yml b/tests/dictionaries/40_0leadership_follower_default_calculation/dictionaries/rougail/00-base.yml index 42da800b1..e7bc667ff 100644 --- a/tests/dictionaries/40_0leadership_follower_default_calculation/dictionaries/rougail/00-base.yml +++ b/tests/dictionaries/40_0leadership_follower_default_calculation/dictionaries/rougail/00-base.yml @@ -8,7 +8,6 @@ leader: follower2: description: a second follower default: - type: jinja jinja: | {{ _.follower1 }} description: returns follower1 value diff --git a/tests/dictionaries/40_0leadership_follower_default_calculation/tiramisu/base.py b/tests/dictionaries/40_0leadership_follower_default_calculation/tiramisu/base.py index b67f4a07a..bf5997991 100644 --- a/tests/dictionaries/40_0leadership_follower_default_calculation/tiramisu/base.py +++ b/tests/dictionaries/40_0leadership_follower_default_calculation/tiramisu/base.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/40_0leadership_follower_default_calculation/tiramisu/multi.py b/tests/dictionaries/40_0leadership_follower_default_calculation/tiramisu/multi.py index 97d7feb0e..d7c5de4e5 100644 --- a/tests/dictionaries/40_0leadership_follower_default_calculation/tiramisu/multi.py +++ b/tests/dictionaries/40_0leadership_follower_default_calculation/tiramisu/multi.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/40_0leadership_follower_default_calculation/tiramisu/no_namespace.py b/tests/dictionaries/40_0leadership_follower_default_calculation/tiramisu/no_namespace.py index 9f4e401d8..53d9dcce5 100644 --- a/tests/dictionaries/40_0leadership_follower_default_calculation/tiramisu/no_namespace.py +++ b/tests/dictionaries/40_0leadership_follower_default_calculation/tiramisu/no_namespace.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/40_0leadership_follower_default_submulti/tiramisu/base.py b/tests/dictionaries/40_0leadership_follower_default_submulti/tiramisu/base.py index f7e21b2e4..8f764c261 100644 --- a/tests/dictionaries/40_0leadership_follower_default_submulti/tiramisu/base.py +++ b/tests/dictionaries/40_0leadership_follower_default_submulti/tiramisu/base.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/40_0leadership_follower_default_submulti/tiramisu/multi.py b/tests/dictionaries/40_0leadership_follower_default_submulti/tiramisu/multi.py index a824d46d2..926698c8e 100644 --- a/tests/dictionaries/40_0leadership_follower_default_submulti/tiramisu/multi.py +++ b/tests/dictionaries/40_0leadership_follower_default_submulti/tiramisu/multi.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/40_0leadership_follower_default_submulti_calculation/dictionaries/rougail/00-base.yml b/tests/dictionaries/40_0leadership_follower_default_submulti_calculation/dictionaries/rougail/00-base.yml index 24ad28adf..2d9a58093 100644 --- a/tests/dictionaries/40_0leadership_follower_default_submulti_calculation/dictionaries/rougail/00-base.yml +++ b/tests/dictionaries/40_0leadership_follower_default_submulti_calculation/dictionaries/rougail/00-base.yml @@ -11,5 +11,4 @@ leader: description: the follower2 multi: true default: - type: variable variable: _.follower1 diff --git a/tests/dictionaries/40_0leadership_follower_default_submulti_calculation/tiramisu/base.py b/tests/dictionaries/40_0leadership_follower_default_submulti_calculation/tiramisu/base.py index 3e21a3be6..4bfc8bf92 100644 --- a/tests/dictionaries/40_0leadership_follower_default_submulti_calculation/tiramisu/base.py +++ b/tests/dictionaries/40_0leadership_follower_default_submulti_calculation/tiramisu/base.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/40_0leadership_follower_default_submulti_calculation/tiramisu/multi.py b/tests/dictionaries/40_0leadership_follower_default_submulti_calculation/tiramisu/multi.py index 727d3f75d..4c9831414 100644 --- a/tests/dictionaries/40_0leadership_follower_default_submulti_calculation/tiramisu/multi.py +++ b/tests/dictionaries/40_0leadership_follower_default_submulti_calculation/tiramisu/multi.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/40_0leadership_follower_default_value/tiramisu/base.py b/tests/dictionaries/40_0leadership_follower_default_value/tiramisu/base.py index 9845c3c21..b8cf05b19 100644 --- a/tests/dictionaries/40_0leadership_follower_default_value/tiramisu/base.py +++ b/tests/dictionaries/40_0leadership_follower_default_value/tiramisu/base.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/40_0leadership_follower_default_value/tiramisu/multi.py b/tests/dictionaries/40_0leadership_follower_default_value/tiramisu/multi.py index 5f7e7c34c..ea40df054 100644 --- a/tests/dictionaries/40_0leadership_follower_default_value/tiramisu/multi.py +++ b/tests/dictionaries/40_0leadership_follower_default_value/tiramisu/multi.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/40_0leadership_follower_default_value/tiramisu/no_namespace.py b/tests/dictionaries/40_0leadership_follower_default_value/tiramisu/no_namespace.py index 718a7aecc..68cd8f0b3 100644 --- a/tests/dictionaries/40_0leadership_follower_default_value/tiramisu/no_namespace.py +++ b/tests/dictionaries/40_0leadership_follower_default_value/tiramisu/no_namespace.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/40_1leadership_append_follower/tiramisu/base.py b/tests/dictionaries/40_1leadership_append_follower/tiramisu/base.py index 7c5f59950..78b619bbc 100644 --- a/tests/dictionaries/40_1leadership_append_follower/tiramisu/base.py +++ b/tests/dictionaries/40_1leadership_append_follower/tiramisu/base.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/40_1leadership_append_follower/tiramisu/multi.py b/tests/dictionaries/40_1leadership_append_follower/tiramisu/multi.py index 7f01621d6..709a75518 100644 --- a/tests/dictionaries/40_1leadership_append_follower/tiramisu/multi.py +++ b/tests/dictionaries/40_1leadership_append_follower/tiramisu/multi.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/40_1leadership_append_follower/tiramisu/no_namespace.py b/tests/dictionaries/40_1leadership_append_follower/tiramisu/no_namespace.py index 995578119..dfcbb3e0b 100644 --- a/tests/dictionaries/40_1leadership_append_follower/tiramisu/no_namespace.py +++ b/tests/dictionaries/40_1leadership_append_follower/tiramisu/no_namespace.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/40_2leadership_calculation_index/tiramisu/base.py b/tests/dictionaries/40_2leadership_calculation_index/tiramisu/base.py index 9628cffc6..49bd44dea 100644 --- a/tests/dictionaries/40_2leadership_calculation_index/tiramisu/base.py +++ b/tests/dictionaries/40_2leadership_calculation_index/tiramisu/base.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/40_2leadership_calculation_index/tiramisu/multi.py b/tests/dictionaries/40_2leadership_calculation_index/tiramisu/multi.py index 82d5bd5d3..408810687 100644 --- a/tests/dictionaries/40_2leadership_calculation_index/tiramisu/multi.py +++ b/tests/dictionaries/40_2leadership_calculation_index/tiramisu/multi.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/40_2leadership_calculation_param_index/dictionaries/rougail/00-base.yml b/tests/dictionaries/40_2leadership_calculation_param_index/dictionaries/rougail/00-base.yml index a54737c32..2a63e4059 100644 --- a/tests/dictionaries/40_2leadership_calculation_param_index/dictionaries/rougail/00-base.yml +++ b/tests/dictionaries/40_2leadership_calculation_param_index/dictionaries/rougail/00-base.yml @@ -11,7 +11,6 @@ leader: description: a follower type: number default: - type: jinja jinja: '{{ index }}' params: index: 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 9c7ffebf8..9c390fa4a 100644 --- a/tests/dictionaries/40_2leadership_calculation_param_index/tiramisu/base.py +++ b/tests/dictionaries/40_2leadership_calculation_param_index/tiramisu/base.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/40_2leadership_calculation_param_index/tiramisu/multi.py b/tests/dictionaries/40_2leadership_calculation_param_index/tiramisu/multi.py index 498e4a51f..31951964a 100644 --- a/tests/dictionaries/40_2leadership_calculation_param_index/tiramisu/multi.py +++ b/tests/dictionaries/40_2leadership_calculation_param_index/tiramisu/multi.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/40_2leadership_leader_calculation/dictionaries/rougail/00-base.yml b/tests/dictionaries/40_2leadership_leader_calculation/dictionaries/rougail/00-base.yml index 36f395c6f..7689f222d 100644 --- a/tests/dictionaries/40_2leadership_leader_calculation/dictionaries/rougail/00-base.yml +++ b/tests/dictionaries/40_2leadership_leader_calculation/dictionaries/rougail/00-base.yml @@ -7,7 +7,6 @@ leader: description: a leader multi: true default: - type: jinja jinja: | val1 val2 diff --git a/tests/dictionaries/40_2leadership_leader_calculation/tiramisu/base.py b/tests/dictionaries/40_2leadership_leader_calculation/tiramisu/base.py index 4f04a5506..67a2aeba8 100644 --- a/tests/dictionaries/40_2leadership_leader_calculation/tiramisu/base.py +++ b/tests/dictionaries/40_2leadership_leader_calculation/tiramisu/base.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/40_2leadership_leader_calculation/tiramisu/multi.py b/tests/dictionaries/40_2leadership_leader_calculation/tiramisu/multi.py index bf899640e..d9be2e114 100644 --- a/tests/dictionaries/40_2leadership_leader_calculation/tiramisu/multi.py +++ b/tests/dictionaries/40_2leadership_leader_calculation/tiramisu/multi.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/40_6leadership_follower_multi/tiramisu/base.py b/tests/dictionaries/40_6leadership_follower_multi/tiramisu/base.py index ab8f54b83..e6634ddb0 100644 --- a/tests/dictionaries/40_6leadership_follower_multi/tiramisu/base.py +++ b/tests/dictionaries/40_6leadership_follower_multi/tiramisu/base.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/40_6leadership_follower_multi/tiramisu/multi.py b/tests/dictionaries/40_6leadership_follower_multi/tiramisu/multi.py index 7fba44b64..39cd10d98 100644 --- a/tests/dictionaries/40_6leadership_follower_multi/tiramisu/multi.py +++ b/tests/dictionaries/40_6leadership_follower_multi/tiramisu/multi.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/40_6leadership_follower_multi/tiramisu/no_namespace.py b/tests/dictionaries/40_6leadership_follower_multi/tiramisu/no_namespace.py index 05817ecaf..ae68a6a2e 100644 --- a/tests/dictionaries/40_6leadership_follower_multi/tiramisu/no_namespace.py +++ b/tests/dictionaries/40_6leadership_follower_multi/tiramisu/no_namespace.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/40_8calculation_boolean/dictionaries/rougail/00-base.yml b/tests/dictionaries/40_8calculation_boolean/dictionaries/rougail/00-base.yml index 091ed9d65..f09a9564f 100644 --- a/tests/dictionaries/40_8calculation_boolean/dictionaries/rougail/00-base.yml +++ b/tests/dictionaries/40_8calculation_boolean/dictionaries/rougail/00-base.yml @@ -6,7 +6,6 @@ multi1: type: boolean multi: true default: - type: jinja jinja: | {% if _.bool %} True @@ -20,7 +19,6 @@ multi2: type: boolean multi: true default: - type: jinja jinja: | {% if not _.bool %} True diff --git a/tests/dictionaries/40_8calculation_boolean/tiramisu/base.py b/tests/dictionaries/40_8calculation_boolean/tiramisu/base.py index 27aef5c2f..0451b3f83 100644 --- a/tests/dictionaries/40_8calculation_boolean/tiramisu/base.py +++ b/tests/dictionaries/40_8calculation_boolean/tiramisu/base.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/40_8calculation_boolean/tiramisu/multi.py b/tests/dictionaries/40_8calculation_boolean/tiramisu/multi.py index 958594a12..9260d241e 100644 --- a/tests/dictionaries/40_8calculation_boolean/tiramisu/multi.py +++ b/tests/dictionaries/40_8calculation_boolean/tiramisu/multi.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/40_8calculation_boolean/tiramisu/no_namespace.py b/tests/dictionaries/40_8calculation_boolean/tiramisu/no_namespace.py index 866ff6c1b..55f435be9 100644 --- a/tests/dictionaries/40_8calculation_boolean/tiramisu/no_namespace.py +++ b/tests/dictionaries/40_8calculation_boolean/tiramisu/no_namespace.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/40_8calculation_boolean_return_none/dictionaries/rougail/00-base.yml b/tests/dictionaries/40_8calculation_boolean_return_none/dictionaries/rougail/00-base.yml index d5399f707..fafc141bf 100644 --- a/tests/dictionaries/40_8calculation_boolean_return_none/dictionaries/rougail/00-base.yml +++ b/tests/dictionaries/40_8calculation_boolean_return_none/dictionaries/rougail/00-base.yml @@ -5,7 +5,6 @@ var2: description: a second variable type: boolean default: - type: jinja jinja: | {% if rougail.var1 == 'no' %} false diff --git a/tests/dictionaries/40_8calculation_boolean_return_none/tiramisu/base.py b/tests/dictionaries/40_8calculation_boolean_return_none/tiramisu/base.py index 14b1371d4..f383b0888 100644 --- a/tests/dictionaries/40_8calculation_boolean_return_none/tiramisu/base.py +++ b/tests/dictionaries/40_8calculation_boolean_return_none/tiramisu/base.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/40_8calculation_boolean_return_none/tiramisu/multi.py b/tests/dictionaries/40_8calculation_boolean_return_none/tiramisu/multi.py index c446d642a..aeaa194ca 100644 --- a/tests/dictionaries/40_8calculation_boolean_return_none/tiramisu/multi.py +++ b/tests/dictionaries/40_8calculation_boolean_return_none/tiramisu/multi.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/40_8calculation_integer/dictionaries/rougail/00-base.yml b/tests/dictionaries/40_8calculation_integer/dictionaries/rougail/00-base.yml index 1ca8b2de6..f51c098ef 100644 --- a/tests/dictionaries/40_8calculation_integer/dictionaries/rougail/00-base.yml +++ b/tests/dictionaries/40_8calculation_integer/dictionaries/rougail/00-base.yml @@ -5,7 +5,6 @@ int1: description: first integer variable type: number default: - type: jinja jinja: | {% if rougail.bool %}1{% else %}2{% endif %} description: if bool returns 1 otherwise return 2 @@ -13,7 +12,6 @@ int2: description: second integer variable type: number default: - type: jinja jinja: | {% if not rougail.bool %}3{% else %}4{% endif %} description: if bool returns 3 otherwise return 4 diff --git a/tests/dictionaries/40_8calculation_integer/tiramisu/base.py b/tests/dictionaries/40_8calculation_integer/tiramisu/base.py index a7a77c663..2c09da488 100644 --- a/tests/dictionaries/40_8calculation_integer/tiramisu/base.py +++ b/tests/dictionaries/40_8calculation_integer/tiramisu/base.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/40_8calculation_integer/tiramisu/multi.py b/tests/dictionaries/40_8calculation_integer/tiramisu/multi.py index 6a46e8d9d..47b44869d 100644 --- a/tests/dictionaries/40_8calculation_integer/tiramisu/multi.py +++ b/tests/dictionaries/40_8calculation_integer/tiramisu/multi.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/40_8calculation_multi_variable/dictionaries/rougail/00-base.yml b/tests/dictionaries/40_8calculation_multi_variable/dictionaries/rougail/00-base.yml index 02a7bdc8f..aa2a2ae21 100644 --- a/tests/dictionaries/40_8calculation_multi_variable/dictionaries/rougail/00-base.yml +++ b/tests/dictionaries/40_8calculation_multi_variable/dictionaries/rougail/00-base.yml @@ -3,9 +3,7 @@ version: '1.1' var: description: a first variable default: - - type: variable - variable: _.var2 - - type: variable - variable: _.var3 + - variable: _.var2 + - variable: _.var3 var2: "no" # a second variable var3: "yes" # a third variable diff --git a/tests/dictionaries/40_8calculation_multi_variable/tiramisu/base.py b/tests/dictionaries/40_8calculation_multi_variable/tiramisu/base.py index 9f61cd7da..2ab359c4a 100644 --- a/tests/dictionaries/40_8calculation_multi_variable/tiramisu/base.py +++ b/tests/dictionaries/40_8calculation_multi_variable/tiramisu/base.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/40_8calculation_multi_variable/tiramisu/multi.py b/tests/dictionaries/40_8calculation_multi_variable/tiramisu/multi.py index af6d3d518..4e09a344b 100644 --- a/tests/dictionaries/40_8calculation_multi_variable/tiramisu/multi.py +++ b/tests/dictionaries/40_8calculation_multi_variable/tiramisu/multi.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/40_8calculation_multi_variable/tiramisu/no_namespace.py b/tests/dictionaries/40_8calculation_multi_variable/tiramisu/no_namespace.py index 98f94e340..79e23b55f 100644 --- a/tests/dictionaries/40_8calculation_multi_variable/tiramisu/no_namespace.py +++ b/tests/dictionaries/40_8calculation_multi_variable/tiramisu/no_namespace.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/40_8calculation_multi_variable_parent/dictionaries/rougail/00-base.yml b/tests/dictionaries/40_8calculation_multi_variable_parent/dictionaries/rougail/00-base.yml index 803a59d31..9ecfde9a3 100644 --- a/tests/dictionaries/40_8calculation_multi_variable_parent/dictionaries/rougail/00-base.yml +++ b/tests/dictionaries/40_8calculation_multi_variable_parent/dictionaries/rougail/00-base.yml @@ -5,5 +5,4 @@ fam1: # a family var: description: a calculated variable default: - type: variable variable: __.var diff --git a/tests/dictionaries/40_8calculation_multi_variable_parent/tiramisu/base.py b/tests/dictionaries/40_8calculation_multi_variable_parent/tiramisu/base.py index 5d7514aa6..d81bbcc11 100644 --- a/tests/dictionaries/40_8calculation_multi_variable_parent/tiramisu/base.py +++ b/tests/dictionaries/40_8calculation_multi_variable_parent/tiramisu/base.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/40_8calculation_multi_variable_parent/tiramisu/multi.py b/tests/dictionaries/40_8calculation_multi_variable_parent/tiramisu/multi.py index d13240f74..051984373 100644 --- a/tests/dictionaries/40_8calculation_multi_variable_parent/tiramisu/multi.py +++ b/tests/dictionaries/40_8calculation_multi_variable_parent/tiramisu/multi.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/40_8calculation_multi_variable_parent/tiramisu/no_namespace.py b/tests/dictionaries/40_8calculation_multi_variable_parent/tiramisu/no_namespace.py index da1d98ea6..4995e8177 100644 --- a/tests/dictionaries/40_8calculation_multi_variable_parent/tiramisu/no_namespace.py +++ b/tests/dictionaries/40_8calculation_multi_variable_parent/tiramisu/no_namespace.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/40_8calculation_multi_variable_parent2/dictionaries/rougail/00-base.yml b/tests/dictionaries/40_8calculation_multi_variable_parent2/dictionaries/rougail/00-base.yml index 6f89d5017..e890f42b4 100644 --- a/tests/dictionaries/40_8calculation_multi_variable_parent2/dictionaries/rougail/00-base.yml +++ b/tests/dictionaries/40_8calculation_multi_variable_parent2/dictionaries/rougail/00-base.yml @@ -6,5 +6,4 @@ fam2: # second family var: description: a varaible default: - type: variable variable: __.fam1.var diff --git a/tests/dictionaries/40_8calculation_multi_variable_parent2/tiramisu/base.py b/tests/dictionaries/40_8calculation_multi_variable_parent2/tiramisu/base.py index 1abf1ddda..9697b8290 100644 --- a/tests/dictionaries/40_8calculation_multi_variable_parent2/tiramisu/base.py +++ b/tests/dictionaries/40_8calculation_multi_variable_parent2/tiramisu/base.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/40_8calculation_multi_variable_parent2/tiramisu/multi.py b/tests/dictionaries/40_8calculation_multi_variable_parent2/tiramisu/multi.py index 9352bf35a..17ad2f6e9 100644 --- a/tests/dictionaries/40_8calculation_multi_variable_parent2/tiramisu/multi.py +++ b/tests/dictionaries/40_8calculation_multi_variable_parent2/tiramisu/multi.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/40_8calculation_multi_variable_parent2/tiramisu/no_namespace.py b/tests/dictionaries/40_8calculation_multi_variable_parent2/tiramisu/no_namespace.py index 4d8611b51..793fa6a47 100644 --- a/tests/dictionaries/40_8calculation_multi_variable_parent2/tiramisu/no_namespace.py +++ b/tests/dictionaries/40_8calculation_multi_variable_parent2/tiramisu/no_namespace.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/41_0choice_leader/tiramisu/base.py b/tests/dictionaries/41_0choice_leader/tiramisu/base.py index 06f5eab0b..59d5f4be7 100644 --- a/tests/dictionaries/41_0choice_leader/tiramisu/base.py +++ b/tests/dictionaries/41_0choice_leader/tiramisu/base.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/41_0choice_leader/tiramisu/multi.py b/tests/dictionaries/41_0choice_leader/tiramisu/multi.py index e90da02bb..21a14ba5f 100644 --- a/tests/dictionaries/41_0choice_leader/tiramisu/multi.py +++ b/tests/dictionaries/41_0choice_leader/tiramisu/multi.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/41_0choice_leader/tiramisu/no_namespace.py b/tests/dictionaries/41_0choice_leader/tiramisu/no_namespace.py index 41403397b..03e43cbce 100644 --- a/tests/dictionaries/41_0choice_leader/tiramisu/no_namespace.py +++ b/tests/dictionaries/41_0choice_leader/tiramisu/no_namespace.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/44_0leadership_hidden/tiramisu/base.py b/tests/dictionaries/44_0leadership_hidden/tiramisu/base.py index 32c313838..04b43cf43 100644 --- a/tests/dictionaries/44_0leadership_hidden/tiramisu/base.py +++ b/tests/dictionaries/44_0leadership_hidden/tiramisu/base.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/44_0leadership_hidden/tiramisu/multi.py b/tests/dictionaries/44_0leadership_hidden/tiramisu/multi.py index 58f82a551..6a95ddfe3 100644 --- a/tests/dictionaries/44_0leadership_hidden/tiramisu/multi.py +++ b/tests/dictionaries/44_0leadership_hidden/tiramisu/multi.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/44_0leadership_hidden/tiramisu/no_namespace.py b/tests/dictionaries/44_0leadership_hidden/tiramisu/no_namespace.py index 817760061..12afb2481 100644 --- a/tests/dictionaries/44_0leadership_hidden/tiramisu/no_namespace.py +++ b/tests/dictionaries/44_0leadership_hidden/tiramisu/no_namespace.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/44_0leadership_leader_hidden/tiramisu/base.py b/tests/dictionaries/44_0leadership_leader_hidden/tiramisu/base.py index 32c313838..04b43cf43 100644 --- a/tests/dictionaries/44_0leadership_leader_hidden/tiramisu/base.py +++ b/tests/dictionaries/44_0leadership_leader_hidden/tiramisu/base.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/44_0leadership_leader_hidden/tiramisu/multi.py b/tests/dictionaries/44_0leadership_leader_hidden/tiramisu/multi.py index 58f82a551..6a95ddfe3 100644 --- a/tests/dictionaries/44_0leadership_leader_hidden/tiramisu/multi.py +++ b/tests/dictionaries/44_0leadership_leader_hidden/tiramisu/multi.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/44_0leadership_leader_hidden/tiramisu/no_namespace.py b/tests/dictionaries/44_0leadership_leader_hidden/tiramisu/no_namespace.py index 817760061..12afb2481 100644 --- a/tests/dictionaries/44_0leadership_leader_hidden/tiramisu/no_namespace.py +++ b/tests/dictionaries/44_0leadership_leader_hidden/tiramisu/no_namespace.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/44_1leadership_append_hidden_follower/tiramisu/base.py b/tests/dictionaries/44_1leadership_append_hidden_follower/tiramisu/base.py index f900f3848..62392c88e 100644 --- a/tests/dictionaries/44_1leadership_append_hidden_follower/tiramisu/base.py +++ b/tests/dictionaries/44_1leadership_append_hidden_follower/tiramisu/base.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/44_1leadership_append_hidden_follower/tiramisu/multi.py b/tests/dictionaries/44_1leadership_append_hidden_follower/tiramisu/multi.py index 772af172b..f4328c69e 100644 --- a/tests/dictionaries/44_1leadership_append_hidden_follower/tiramisu/multi.py +++ b/tests/dictionaries/44_1leadership_append_hidden_follower/tiramisu/multi.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/44_1leadership_append_hidden_follower/tiramisu/no_namespace.py b/tests/dictionaries/44_1leadership_append_hidden_follower/tiramisu/no_namespace.py index 7071ed470..4a1fe6252 100644 --- a/tests/dictionaries/44_1leadership_append_hidden_follower/tiramisu/no_namespace.py +++ b/tests/dictionaries/44_1leadership_append_hidden_follower/tiramisu/no_namespace.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/44_4disabled_calcultion_follower/dictionaries/rougail/00-base.yml b/tests/dictionaries/44_4disabled_calcultion_follower/dictionaries/rougail/00-base.yml index 404cbf90d..745c34e28 100644 --- a/tests/dictionaries/44_4disabled_calcultion_follower/dictionaries/rougail/00-base.yml +++ b/tests/dictionaries/44_4disabled_calcultion_follower/dictionaries/rougail/00-base.yml @@ -11,7 +11,6 @@ leader: follower: description: a follower disabled: - type: jinja jinja: | {% if rougail.condition == "yes" %} condition is yes diff --git a/tests/dictionaries/44_4disabled_calcultion_follower/tiramisu/base.py b/tests/dictionaries/44_4disabled_calcultion_follower/tiramisu/base.py index d0ef07f83..d36029f67 100644 --- a/tests/dictionaries/44_4disabled_calcultion_follower/tiramisu/base.py +++ b/tests/dictionaries/44_4disabled_calcultion_follower/tiramisu/base.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/44_4disabled_calcultion_follower/tiramisu/multi.py b/tests/dictionaries/44_4disabled_calcultion_follower/tiramisu/multi.py index 8cd00f91b..956f2e185 100644 --- a/tests/dictionaries/44_4disabled_calcultion_follower/tiramisu/multi.py +++ b/tests/dictionaries/44_4disabled_calcultion_follower/tiramisu/multi.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/44_4leadership_mandatory/tiramisu/base.py b/tests/dictionaries/44_4leadership_mandatory/tiramisu/base.py index 562cf2699..8306ffbe5 100644 --- a/tests/dictionaries/44_4leadership_mandatory/tiramisu/base.py +++ b/tests/dictionaries/44_4leadership_mandatory/tiramisu/base.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/44_4leadership_mandatory/tiramisu/multi.py b/tests/dictionaries/44_4leadership_mandatory/tiramisu/multi.py index 243774a5e..465e1cf2a 100644 --- a/tests/dictionaries/44_4leadership_mandatory/tiramisu/multi.py +++ b/tests/dictionaries/44_4leadership_mandatory/tiramisu/multi.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/44_4leadership_mandatory/tiramisu/no_namespace.py b/tests/dictionaries/44_4leadership_mandatory/tiramisu/no_namespace.py index 53dac2e39..41bdce37d 100644 --- a/tests/dictionaries/44_4leadership_mandatory/tiramisu/no_namespace.py +++ b/tests/dictionaries/44_4leadership_mandatory/tiramisu/no_namespace.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/44_4leadership_mandatory_follower/tiramisu/base.py b/tests/dictionaries/44_4leadership_mandatory_follower/tiramisu/base.py index 342fe0f9f..4cba31acd 100644 --- a/tests/dictionaries/44_4leadership_mandatory_follower/tiramisu/base.py +++ b/tests/dictionaries/44_4leadership_mandatory_follower/tiramisu/base.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/44_4leadership_mandatory_follower/tiramisu/multi.py b/tests/dictionaries/44_4leadership_mandatory_follower/tiramisu/multi.py index 4070b2dac..89f56c9d7 100644 --- a/tests/dictionaries/44_4leadership_mandatory_follower/tiramisu/multi.py +++ b/tests/dictionaries/44_4leadership_mandatory_follower/tiramisu/multi.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/44_4leadership_mandatory_follower/tiramisu/no_namespace.py b/tests/dictionaries/44_4leadership_mandatory_follower/tiramisu/no_namespace.py index 314ab0e3f..a75ed6de3 100644 --- a/tests/dictionaries/44_4leadership_mandatory_follower/tiramisu/no_namespace.py +++ b/tests/dictionaries/44_4leadership_mandatory_follower/tiramisu/no_namespace.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/44_5leadership_leader_hidden_calculation/dictionaries/rougail/00-base.yml b/tests/dictionaries/44_5leadership_leader_hidden_calculation/dictionaries/rougail/00-base.yml index a5666061c..b5bb499c6 100644 --- a/tests/dictionaries/44_5leadership_leader_hidden_calculation/dictionaries/rougail/00-base.yml +++ b/tests/dictionaries/44_5leadership_leader_hidden_calculation/dictionaries/rougail/00-base.yml @@ -8,7 +8,6 @@ leader: description: a leader multi: true hidden: - type: jinja jinja: | {% if __.condition == "no" %} condition is no diff --git a/tests/dictionaries/44_5leadership_leader_hidden_calculation/tiramisu/base.py b/tests/dictionaries/44_5leadership_leader_hidden_calculation/tiramisu/base.py index 9b4cf6acb..494714037 100644 --- a/tests/dictionaries/44_5leadership_leader_hidden_calculation/tiramisu/base.py +++ b/tests/dictionaries/44_5leadership_leader_hidden_calculation/tiramisu/base.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/44_5leadership_leader_hidden_calculation/tiramisu/multi.py b/tests/dictionaries/44_5leadership_leader_hidden_calculation/tiramisu/multi.py index c47edf3c1..442eb8bfb 100644 --- a/tests/dictionaries/44_5leadership_leader_hidden_calculation/tiramisu/multi.py +++ b/tests/dictionaries/44_5leadership_leader_hidden_calculation/tiramisu/multi.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/44_5leadership_leader_hidden_calculation/tiramisu/no_namespace.py b/tests/dictionaries/44_5leadership_leader_hidden_calculation/tiramisu/no_namespace.py index 6ac0d3438..2e1423d9c 100644 --- a/tests/dictionaries/44_5leadership_leader_hidden_calculation/tiramisu/no_namespace.py +++ b/tests/dictionaries/44_5leadership_leader_hidden_calculation/tiramisu/no_namespace.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/44_6leadership_follower_disabled_calculation/dictionaries/rougail/00-base.yml b/tests/dictionaries/44_6leadership_follower_disabled_calculation/dictionaries/rougail/00-base.yml index 417a00ac5..5d553dfeb 100644 --- a/tests/dictionaries/44_6leadership_follower_disabled_calculation/dictionaries/rougail/00-base.yml +++ b/tests/dictionaries/44_6leadership_follower_disabled_calculation/dictionaries/rougail/00-base.yml @@ -10,7 +10,6 @@ leader: follower: description: a follower disabled: - type: jinja jinja: | {% if __.condition == "yes" %}true{% else %}false{% endif %} description: if condition is yes diff --git a/tests/dictionaries/44_6leadership_follower_disabled_calculation/tiramisu/base.py b/tests/dictionaries/44_6leadership_follower_disabled_calculation/tiramisu/base.py index 840654731..58f371c7a 100644 --- a/tests/dictionaries/44_6leadership_follower_disabled_calculation/tiramisu/base.py +++ b/tests/dictionaries/44_6leadership_follower_disabled_calculation/tiramisu/base.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/44_6leadership_follower_disabled_calculation/tiramisu/multi.py b/tests/dictionaries/44_6leadership_follower_disabled_calculation/tiramisu/multi.py index 572f943e6..5669ed027 100644 --- a/tests/dictionaries/44_6leadership_follower_disabled_calculation/tiramisu/multi.py +++ b/tests/dictionaries/44_6leadership_follower_disabled_calculation/tiramisu/multi.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/44_6leadership_follower_disabled_calculation/tiramisu/no_namespace.py b/tests/dictionaries/44_6leadership_follower_disabled_calculation/tiramisu/no_namespace.py index 9b8bf78a8..3559e060f 100644 --- a/tests/dictionaries/44_6leadership_follower_disabled_calculation/tiramisu/no_namespace.py +++ b/tests/dictionaries/44_6leadership_follower_disabled_calculation/tiramisu/no_namespace.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/44_9calculated_default_leadership_leader/dictionaries/rougail/00-base.yml b/tests/dictionaries/44_9calculated_default_leadership_leader/dictionaries/rougail/00-base.yml index 384df12dc..f2c6c9d8f 100644 --- a/tests/dictionaries/44_9calculated_default_leadership_leader/dictionaries/rougail/00-base.yml +++ b/tests/dictionaries/44_9calculated_default_leadership_leader/dictionaries/rougail/00-base.yml @@ -9,12 +9,10 @@ leader: follower: description: a follower disabled: - type: jinja jinja: | {% if _.leader == "a" %} the value of "leader" is "a" {% endif %} description: if the value of "leader" is "a" default: - type: variable variable: _.leader diff --git a/tests/dictionaries/44_9calculated_default_leadership_leader/tiramisu/base.py b/tests/dictionaries/44_9calculated_default_leadership_leader/tiramisu/base.py index 659fe00f0..7e02bbe16 100644 --- a/tests/dictionaries/44_9calculated_default_leadership_leader/tiramisu/base.py +++ b/tests/dictionaries/44_9calculated_default_leadership_leader/tiramisu/base.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/44_9calculated_default_leadership_leader/tiramisu/multi.py b/tests/dictionaries/44_9calculated_default_leadership_leader/tiramisu/multi.py index 149e87fad..cc93c1ef1 100644 --- a/tests/dictionaries/44_9calculated_default_leadership_leader/tiramisu/multi.py +++ b/tests/dictionaries/44_9calculated_default_leadership_leader/tiramisu/multi.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/60_0family_dynamic/dictionaries/rougail/00-base.yml b/tests/dictionaries/60_0family_dynamic/dictionaries/rougail/00-base.yml index c867f2851..83db9b7b1 100644 --- a/tests/dictionaries/60_0family_dynamic/dictionaries/rougail/00-base.yml +++ b/tests/dictionaries/60_0family_dynamic/dictionaries/rougail/00-base.yml @@ -5,8 +5,6 @@ var: # A suffix variable - val2 "dyn{{ suffix }}": description: A dynamic family - type: dynamic dynamic: - type: variable variable: _.var var: # A dynamic variable diff --git a/tests/dictionaries/60_0family_dynamic/tiramisu/base.py b/tests/dictionaries/60_0family_dynamic/tiramisu/base.py index afc1b918a..aaddd9cfd 100644 --- a/tests/dictionaries/60_0family_dynamic/tiramisu/base.py +++ b/tests/dictionaries/60_0family_dynamic/tiramisu/base.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/60_0family_dynamic/tiramisu/multi.py b/tests/dictionaries/60_0family_dynamic/tiramisu/multi.py index 852ac7e8f..29a1ea024 100644 --- a/tests/dictionaries/60_0family_dynamic/tiramisu/multi.py +++ b/tests/dictionaries/60_0family_dynamic/tiramisu/multi.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/60_0family_dynamic/tiramisu/no_namespace.py b/tests/dictionaries/60_0family_dynamic/tiramisu/no_namespace.py index e989606f7..a512cb96a 100644 --- a/tests/dictionaries/60_0family_dynamic/tiramisu/no_namespace.py +++ b/tests/dictionaries/60_0family_dynamic/tiramisu/no_namespace.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/60_0family_dynamic_1_0/tiramisu/base.py b/tests/dictionaries/60_0family_dynamic_1_0/tiramisu/base.py index 6c4f85b40..6e57df868 100644 --- a/tests/dictionaries/60_0family_dynamic_1_0/tiramisu/base.py +++ b/tests/dictionaries/60_0family_dynamic_1_0/tiramisu/base.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/60_0family_dynamic_1_0/tiramisu/multi.py b/tests/dictionaries/60_0family_dynamic_1_0/tiramisu/multi.py index 77fbca917..b4797e48c 100644 --- a/tests/dictionaries/60_0family_dynamic_1_0/tiramisu/multi.py +++ b/tests/dictionaries/60_0family_dynamic_1_0/tiramisu/multi.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/60_0family_dynamic_1_0_type/tiramisu/base.py b/tests/dictionaries/60_0family_dynamic_1_0_type/tiramisu/base.py index b7d51a5fe..c1019844e 100644 --- a/tests/dictionaries/60_0family_dynamic_1_0_type/tiramisu/base.py +++ b/tests/dictionaries/60_0family_dynamic_1_0_type/tiramisu/base.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/60_0family_dynamic_1_0_type/tiramisu/multi.py b/tests/dictionaries/60_0family_dynamic_1_0_type/tiramisu/multi.py index af0094447..2cc003ef5 100644 --- a/tests/dictionaries/60_0family_dynamic_1_0_type/tiramisu/multi.py +++ b/tests/dictionaries/60_0family_dynamic_1_0_type/tiramisu/multi.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/60_0family_dynamic_1_1/tiramisu/base.py b/tests/dictionaries/60_0family_dynamic_1_1/tiramisu/base.py index 653353737..81da6747b 100644 --- a/tests/dictionaries/60_0family_dynamic_1_1/tiramisu/base.py +++ b/tests/dictionaries/60_0family_dynamic_1_1/tiramisu/base.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/60_0family_dynamic_1_1/tiramisu/multi.py b/tests/dictionaries/60_0family_dynamic_1_1/tiramisu/multi.py index 59298dbc2..15a57de71 100644 --- a/tests/dictionaries/60_0family_dynamic_1_1/tiramisu/multi.py +++ b/tests/dictionaries/60_0family_dynamic_1_1/tiramisu/multi.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/60_0family_dynamic_1_1/tiramisu/no_namespace.py b/tests/dictionaries/60_0family_dynamic_1_1/tiramisu/no_namespace.py index 161606cc1..cdd08bba9 100644 --- a/tests/dictionaries/60_0family_dynamic_1_1/tiramisu/no_namespace.py +++ b/tests/dictionaries/60_0family_dynamic_1_1/tiramisu/no_namespace.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/60_0family_dynamic_jinja_number/dictionaries/rougail/00-base.yml b/tests/dictionaries/60_0family_dynamic_jinja_number/dictionaries/rougail/00-base.yml index ee78a38e0..e4b9f832a 100644 --- a/tests/dictionaries/60_0family_dynamic_jinja_number/dictionaries/rougail/00-base.yml +++ b/tests/dictionaries/60_0family_dynamic_jinja_number/dictionaries/rougail/00-base.yml @@ -5,15 +5,12 @@ var: # a suffix variable - 2 "dyn{{ suffix }}": description: a dynamic family - type: dynamic dynamic: - type: variable variable: _.var var: val # a variable inside dynamic family var2: description: a variable default: - type: jinja jinja: | {{ rougail.dyn1.var }} description: get the value of rougail.dyn1.var 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 f54b0519e..b28d8f0c3 100644 --- a/tests/dictionaries/60_0family_dynamic_jinja_number/tiramisu/base.py +++ b/tests/dictionaries/60_0family_dynamic_jinja_number/tiramisu/base.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/60_0family_dynamic_jinja_number/tiramisu/multi.py b/tests/dictionaries/60_0family_dynamic_jinja_number/tiramisu/multi.py index 7798ce0b9..6a1844152 100644 --- a/tests/dictionaries/60_0family_dynamic_jinja_number/tiramisu/multi.py +++ b/tests/dictionaries/60_0family_dynamic_jinja_number/tiramisu/multi.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/60_0family_dynamic_static/dictionaries/rougail/00-base.yml b/tests/dictionaries/60_0family_dynamic_static/dictionaries/rougail/00-base.yml index bf80238f5..d5233a6cf 100644 --- a/tests/dictionaries/60_0family_dynamic_static/dictionaries/rougail/00-base.yml +++ b/tests/dictionaries/60_0family_dynamic_static/dictionaries/rougail/00-base.yml @@ -2,7 +2,6 @@ version: '1.1' "dyn{{ suffix }}": description: a dynamic family - type: dynamic dynamic: - val1 - val2 diff --git a/tests/dictionaries/60_0family_dynamic_static/tiramisu/base.py b/tests/dictionaries/60_0family_dynamic_static/tiramisu/base.py index 7050ebbf6..1252442eb 100644 --- a/tests/dictionaries/60_0family_dynamic_static/tiramisu/base.py +++ b/tests/dictionaries/60_0family_dynamic_static/tiramisu/base.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/60_0family_dynamic_static/tiramisu/multi.py b/tests/dictionaries/60_0family_dynamic_static/tiramisu/multi.py index 45656e080..aae144f56 100644 --- a/tests/dictionaries/60_0family_dynamic_static/tiramisu/multi.py +++ b/tests/dictionaries/60_0family_dynamic_static/tiramisu/multi.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/60_0family_dynamic_static/tiramisu/no_namespace.py b/tests/dictionaries/60_0family_dynamic_static/tiramisu/no_namespace.py index f3da8d1c2..b0e5e6750 100644 --- a/tests/dictionaries/60_0family_dynamic_static/tiramisu/no_namespace.py +++ b/tests/dictionaries/60_0family_dynamic_static/tiramisu/no_namespace.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/60_0family_dynamic_variable_empty/dictionaries/rougail/00-base.yml b/tests/dictionaries/60_0family_dynamic_variable_empty/dictionaries/rougail/00-base.yml index ba4982e0a..e4b1f100d 100644 --- a/tests/dictionaries/60_0family_dynamic_variable_empty/dictionaries/rougail/00-base.yml +++ b/tests/dictionaries/60_0family_dynamic_variable_empty/dictionaries/rougail/00-base.yml @@ -3,8 +3,6 @@ version: '1.1' var: [] # a suffix variable "dyn{{ suffix }}": description: a dynamic family - type: dynamic dynamic: - type: variable variable: _.var var: val # a variable inside dynamic family diff --git a/tests/dictionaries/60_0family_dynamic_variable_empty/tiramisu/base.py b/tests/dictionaries/60_0family_dynamic_variable_empty/tiramisu/base.py index 6f92b50c1..526a0bfdb 100644 --- a/tests/dictionaries/60_0family_dynamic_variable_empty/tiramisu/base.py +++ b/tests/dictionaries/60_0family_dynamic_variable_empty/tiramisu/base.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/60_0family_dynamic_variable_empty/tiramisu/multi.py b/tests/dictionaries/60_0family_dynamic_variable_empty/tiramisu/multi.py index fc4a2cfdf..72e4917fe 100644 --- a/tests/dictionaries/60_0family_dynamic_variable_empty/tiramisu/multi.py +++ b/tests/dictionaries/60_0family_dynamic_variable_empty/tiramisu/multi.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/60_0family_dynamic_variable_empty/tiramisu/no_namespace.py b/tests/dictionaries/60_0family_dynamic_variable_empty/tiramisu/no_namespace.py index 74714c075..5491f695a 100644 --- a/tests/dictionaries/60_0family_dynamic_variable_empty/tiramisu/no_namespace.py +++ b/tests/dictionaries/60_0family_dynamic_variable_empty/tiramisu/no_namespace.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/60_0family_dynamic_variable_suffix/dictionaries/rougail/00-base.yml b/tests/dictionaries/60_0family_dynamic_variable_suffix/dictionaries/rougail/00-base.yml index 5ab26aa38..b5cd6cb9c 100644 --- a/tests/dictionaries/60_0family_dynamic_variable_suffix/dictionaries/rougail/00-base.yml +++ b/tests/dictionaries/60_0family_dynamic_variable_suffix/dictionaries/rougail/00-base.yml @@ -5,8 +5,6 @@ var: # A suffix variable - val2 "dyn{{ suffix }}": description: A dynamic family - type: dynamic dynamic: - type: variable variable: _.var var: a value # A dynamic variable with suffix {{ suffix }} diff --git a/tests/dictionaries/60_0family_dynamic_variable_suffix/tiramisu/base.py b/tests/dictionaries/60_0family_dynamic_variable_suffix/tiramisu/base.py index 5caff85bb..7781962d3 100644 --- a/tests/dictionaries/60_0family_dynamic_variable_suffix/tiramisu/base.py +++ b/tests/dictionaries/60_0family_dynamic_variable_suffix/tiramisu/base.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/60_0family_dynamic_variable_suffix/tiramisu/multi.py b/tests/dictionaries/60_0family_dynamic_variable_suffix/tiramisu/multi.py index 65fc02b60..675712445 100644 --- a/tests/dictionaries/60_0family_dynamic_variable_suffix/tiramisu/multi.py +++ b/tests/dictionaries/60_0family_dynamic_variable_suffix/tiramisu/multi.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/60_0family_dynamic_variable_suffix/tiramisu/no_namespace.py b/tests/dictionaries/60_0family_dynamic_variable_suffix/tiramisu/no_namespace.py index 783cf60a4..7f704dd73 100644 --- a/tests/dictionaries/60_0family_dynamic_variable_suffix/tiramisu/no_namespace.py +++ b/tests/dictionaries/60_0family_dynamic_variable_suffix/tiramisu/no_namespace.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/60_0family_empty/tiramisu/base.py b/tests/dictionaries/60_0family_empty/tiramisu/base.py index 51a1b59a1..c800d9e33 100644 --- a/tests/dictionaries/60_0family_empty/tiramisu/base.py +++ b/tests/dictionaries/60_0family_empty/tiramisu/base.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/60_0family_empty/tiramisu/multi.py b/tests/dictionaries/60_0family_empty/tiramisu/multi.py index 472635ec3..9357fd228 100644 --- a/tests/dictionaries/60_0family_empty/tiramisu/multi.py +++ b/tests/dictionaries/60_0family_empty/tiramisu/multi.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/60_0family_empty/tiramisu/no_namespace.py b/tests/dictionaries/60_0family_empty/tiramisu/no_namespace.py index 42f38a285..502023bc9 100644 --- a/tests/dictionaries/60_0family_empty/tiramisu/no_namespace.py +++ b/tests/dictionaries/60_0family_empty/tiramisu/no_namespace.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/60_0family_hidden/tiramisu/base.py b/tests/dictionaries/60_0family_hidden/tiramisu/base.py index a827a3a29..29204c8f3 100644 --- a/tests/dictionaries/60_0family_hidden/tiramisu/base.py +++ b/tests/dictionaries/60_0family_hidden/tiramisu/base.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/60_0family_hidden/tiramisu/multi.py b/tests/dictionaries/60_0family_hidden/tiramisu/multi.py index b98297624..83cf2c412 100644 --- a/tests/dictionaries/60_0family_hidden/tiramisu/multi.py +++ b/tests/dictionaries/60_0family_hidden/tiramisu/multi.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/60_0family_hidden/tiramisu/no_namespace.py b/tests/dictionaries/60_0family_hidden/tiramisu/no_namespace.py index 1f2d98a26..ab7e151f3 100644 --- a/tests/dictionaries/60_0family_hidden/tiramisu/no_namespace.py +++ b/tests/dictionaries/60_0family_hidden/tiramisu/no_namespace.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/60_0family_mode/tiramisu/base.py b/tests/dictionaries/60_0family_mode/tiramisu/base.py index 4b585925c..6115a9da6 100644 --- a/tests/dictionaries/60_0family_mode/tiramisu/base.py +++ b/tests/dictionaries/60_0family_mode/tiramisu/base.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/60_0family_mode/tiramisu/multi.py b/tests/dictionaries/60_0family_mode/tiramisu/multi.py index e9b91e1a7..4b1c41b92 100644 --- a/tests/dictionaries/60_0family_mode/tiramisu/multi.py +++ b/tests/dictionaries/60_0family_mode/tiramisu/multi.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/60_0family_mode/tiramisu/no_namespace.py b/tests/dictionaries/60_0family_mode/tiramisu/no_namespace.py index 23a7413e4..e45d0c098 100644 --- a/tests/dictionaries/60_0family_mode/tiramisu/no_namespace.py +++ b/tests/dictionaries/60_0family_mode/tiramisu/no_namespace.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/60_1family_dynamic_jinja/dictionaries/rougail/00-base.yml b/tests/dictionaries/60_1family_dynamic_jinja/dictionaries/rougail/00-base.yml index 5c811b03a..c2c3242bf 100644 --- a/tests/dictionaries/60_1family_dynamic_jinja/dictionaries/rougail/00-base.yml +++ b/tests/dictionaries/60_1family_dynamic_jinja/dictionaries/rougail/00-base.yml @@ -5,9 +5,7 @@ var: # a suffix variable - val2 "dyn{{ suffix }}": description: A dynamic family - type: dynamic dynamic: - type: jinja jinja: | {% for val in _.var %} {{ loop.index }} diff --git a/tests/dictionaries/60_1family_dynamic_jinja/tiramisu/base.py b/tests/dictionaries/60_1family_dynamic_jinja/tiramisu/base.py index 32be32ee9..c5574b969 100644 --- a/tests/dictionaries/60_1family_dynamic_jinja/tiramisu/base.py +++ b/tests/dictionaries/60_1family_dynamic_jinja/tiramisu/base.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/60_1family_dynamic_jinja/tiramisu/multi.py b/tests/dictionaries/60_1family_dynamic_jinja/tiramisu/multi.py index 276161b60..f0c5b1baf 100644 --- a/tests/dictionaries/60_1family_dynamic_jinja/tiramisu/multi.py +++ b/tests/dictionaries/60_1family_dynamic_jinja/tiramisu/multi.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/60_1family_dynamic_jinja/tiramisu/no_namespace.py b/tests/dictionaries/60_1family_dynamic_jinja/tiramisu/no_namespace.py index cb68dc7ec..c6bf91c06 100644 --- a/tests/dictionaries/60_1family_dynamic_jinja/tiramisu/no_namespace.py +++ b/tests/dictionaries/60_1family_dynamic_jinja/tiramisu/no_namespace.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/60_2family_dynamic_jinja_fill_sub_group/dictionaries/rougail/00-base.yml b/tests/dictionaries/60_2family_dynamic_jinja_fill_sub_group/dictionaries/rougail/00-base.yml index e101e40be..d6a075b04 100644 --- a/tests/dictionaries/60_2family_dynamic_jinja_fill_sub_group/dictionaries/rougail/00-base.yml +++ b/tests/dictionaries/60_2family_dynamic_jinja_fill_sub_group/dictionaries/rougail/00-base.yml @@ -5,16 +5,13 @@ var1: # a suffix variable - val2 "dyn{{ suffix }}": description: a dynamic family - type: dynamic dynamic: - type: variable variable: _.var1 family: # a family var: # with a variable var2: description: a second variable default: - type: jinja jinja: | {{ _.dynval1.family.var }} description: the value of var diff --git a/tests/dictionaries/60_2family_dynamic_jinja_fill_sub_group/tiramisu/base.py b/tests/dictionaries/60_2family_dynamic_jinja_fill_sub_group/tiramisu/base.py index cbefa472a..5ed2d43fa 100644 --- a/tests/dictionaries/60_2family_dynamic_jinja_fill_sub_group/tiramisu/base.py +++ b/tests/dictionaries/60_2family_dynamic_jinja_fill_sub_group/tiramisu/base.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/60_2family_dynamic_jinja_fill_sub_group/tiramisu/multi.py b/tests/dictionaries/60_2family_dynamic_jinja_fill_sub_group/tiramisu/multi.py index 9b52967a3..221c4496e 100644 --- a/tests/dictionaries/60_2family_dynamic_jinja_fill_sub_group/tiramisu/multi.py +++ b/tests/dictionaries/60_2family_dynamic_jinja_fill_sub_group/tiramisu/multi.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/60_2family_dynamic_jinja_fill_sub_group/tiramisu/no_namespace.py b/tests/dictionaries/60_2family_dynamic_jinja_fill_sub_group/tiramisu/no_namespace.py index d677a2dbb..00c481ea3 100644 --- a/tests/dictionaries/60_2family_dynamic_jinja_fill_sub_group/tiramisu/no_namespace.py +++ b/tests/dictionaries/60_2family_dynamic_jinja_fill_sub_group/tiramisu/no_namespace.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/60_2family_dynamic_jinja_fill_sub_group_2/dictionaries/rougail/00-base.yml b/tests/dictionaries/60_2family_dynamic_jinja_fill_sub_group_2/dictionaries/rougail/00-base.yml index 655921ff5..90af81993 100644 --- a/tests/dictionaries/60_2family_dynamic_jinja_fill_sub_group_2/dictionaries/rougail/00-base.yml +++ b/tests/dictionaries/60_2family_dynamic_jinja_fill_sub_group_2/dictionaries/rougail/00-base.yml @@ -5,9 +5,7 @@ var: # a suffix variable - val2 "dyn{{ suffix }}": description: a dynamic family - type: dynamic dynamic: - type: variable variable: _.var family: description: a family inside dynamic family @@ -18,7 +16,6 @@ var: # a suffix variable var2: description: a varible outside dynamic family default: - type: jinja jinja: | {{ _.dynval1.family.var }} description: the value of var diff --git a/tests/dictionaries/60_2family_dynamic_jinja_fill_sub_group_2/tiramisu/base.py b/tests/dictionaries/60_2family_dynamic_jinja_fill_sub_group_2/tiramisu/base.py index 2e1398196..e169f2d9b 100644 --- a/tests/dictionaries/60_2family_dynamic_jinja_fill_sub_group_2/tiramisu/base.py +++ b/tests/dictionaries/60_2family_dynamic_jinja_fill_sub_group_2/tiramisu/base.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/60_2family_dynamic_jinja_fill_sub_group_2/tiramisu/multi.py b/tests/dictionaries/60_2family_dynamic_jinja_fill_sub_group_2/tiramisu/multi.py index bcc4197ce..af6c2250a 100644 --- a/tests/dictionaries/60_2family_dynamic_jinja_fill_sub_group_2/tiramisu/multi.py +++ b/tests/dictionaries/60_2family_dynamic_jinja_fill_sub_group_2/tiramisu/multi.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/60_2family_dynamic_jinja_fill_sub_group_2/tiramisu/no_namespace.py b/tests/dictionaries/60_2family_dynamic_jinja_fill_sub_group_2/tiramisu/no_namespace.py index 888a01984..2b1c5acb6 100644 --- a/tests/dictionaries/60_2family_dynamic_jinja_fill_sub_group_2/tiramisu/no_namespace.py +++ b/tests/dictionaries/60_2family_dynamic_jinja_fill_sub_group_2/tiramisu/no_namespace.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/60_2family_dynamic_outside_calc/dictionaries/rougail/00-base.yml b/tests/dictionaries/60_2family_dynamic_outside_calc/dictionaries/rougail/00-base.yml index cb401308f..8c2815f44 100644 --- a/tests/dictionaries/60_2family_dynamic_outside_calc/dictionaries/rougail/00-base.yml +++ b/tests/dictionaries/60_2family_dynamic_outside_calc/dictionaries/rougail/00-base.yml @@ -5,15 +5,12 @@ var1: # a suffx variable - val2 "dyn{{ suffix }}": description: a dynamic family - type: dynamic dynamic: - type: variable variable: _.var1 var: val # a dynamic variable newvar: description: a second variable default: - type: jinja jinja: | {{ _.dynval1.var }} description: the value of var diff --git a/tests/dictionaries/60_2family_dynamic_outside_calc/tiramisu/base.py b/tests/dictionaries/60_2family_dynamic_outside_calc/tiramisu/base.py index 14c4c3e68..460d21d99 100644 --- a/tests/dictionaries/60_2family_dynamic_outside_calc/tiramisu/base.py +++ b/tests/dictionaries/60_2family_dynamic_outside_calc/tiramisu/base.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/60_2family_dynamic_outside_calc/tiramisu/multi.py b/tests/dictionaries/60_2family_dynamic_outside_calc/tiramisu/multi.py index 91fdfb9ff..1c942dc2d 100644 --- a/tests/dictionaries/60_2family_dynamic_outside_calc/tiramisu/multi.py +++ b/tests/dictionaries/60_2family_dynamic_outside_calc/tiramisu/multi.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/60_2family_dynamic_outside_calc/tiramisu/no_namespace.py b/tests/dictionaries/60_2family_dynamic_outside_calc/tiramisu/no_namespace.py index 137727fa1..5f5e8a762 100644 --- a/tests/dictionaries/60_2family_dynamic_outside_calc/tiramisu/no_namespace.py +++ b/tests/dictionaries/60_2family_dynamic_outside_calc/tiramisu/no_namespace.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/60_5family_dynamic_calc2/dictionaries/rougail/00-base.yml b/tests/dictionaries/60_5family_dynamic_calc2/dictionaries/rougail/00-base.yml index 845a0e54b..f52902f65 100644 --- a/tests/dictionaries/60_5family_dynamic_calc2/dictionaries/rougail/00-base.yml +++ b/tests/dictionaries/60_5family_dynamic_calc2/dictionaries/rougail/00-base.yml @@ -6,13 +6,10 @@ var: # A suffix variable var2: # a second variable "dyn{{ suffix }}": description: A dynamic family - type: dynamic dynamic: - type: variable variable: _.var propertyerror: false hidden: - type: jinja #FIXME RELATIVE __.var2 jinja: | {% if rougail.var2 == "no" %} diff --git a/tests/dictionaries/60_5family_dynamic_calc2/tiramisu/base.py b/tests/dictionaries/60_5family_dynamic_calc2/tiramisu/base.py index ab29a018d..a695ef4e7 100644 --- a/tests/dictionaries/60_5family_dynamic_calc2/tiramisu/base.py +++ b/tests/dictionaries/60_5family_dynamic_calc2/tiramisu/base.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/60_5family_dynamic_calc2/tiramisu/multi.py b/tests/dictionaries/60_5family_dynamic_calc2/tiramisu/multi.py index 7f2d2e5a7..c069e8048 100644 --- a/tests/dictionaries/60_5family_dynamic_calc2/tiramisu/multi.py +++ b/tests/dictionaries/60_5family_dynamic_calc2/tiramisu/multi.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/60_5family_dynamic_calc_suffix/dictionaries/rougail/00-base.yml b/tests/dictionaries/60_5family_dynamic_calc_suffix/dictionaries/rougail/00-base.yml index 9c85872c0..8a8cd363b 100644 --- a/tests/dictionaries/60_5family_dynamic_calc_suffix/dictionaries/rougail/00-base.yml +++ b/tests/dictionaries/60_5family_dynamic_calc_suffix/dictionaries/rougail/00-base.yml @@ -6,9 +6,7 @@ var1: - val1 - val2 "dyn{{ suffix }}": - type: dynamic dynamic: - type: variable variable: _.var1 propertyerror: false var: @@ -16,11 +14,9 @@ var1: var2: description: A variable calculated default: - type: jinja jinja: | {{ vardyn }} params: vardyn: - type: variable variable: rougail.dynval1.var description: from rougail.dynval1.var diff --git a/tests/dictionaries/60_5family_dynamic_calc_suffix/tiramisu/base.py b/tests/dictionaries/60_5family_dynamic_calc_suffix/tiramisu/base.py index 4120ac8a4..2a4357d8c 100644 --- a/tests/dictionaries/60_5family_dynamic_calc_suffix/tiramisu/base.py +++ b/tests/dictionaries/60_5family_dynamic_calc_suffix/tiramisu/base.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/60_5family_dynamic_calc_suffix/tiramisu/multi.py b/tests/dictionaries/60_5family_dynamic_calc_suffix/tiramisu/multi.py index 1cf041ce4..2d96b2a5e 100644 --- a/tests/dictionaries/60_5family_dynamic_calc_suffix/tiramisu/multi.py +++ b/tests/dictionaries/60_5family_dynamic_calc_suffix/tiramisu/multi.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/60_5family_dynamic_calc_suffix2/dictionaries/rougail/00-base.yml b/tests/dictionaries/60_5family_dynamic_calc_suffix2/dictionaries/rougail/00-base.yml index 341b0bfa2..638ec08da 100644 --- a/tests/dictionaries/60_5family_dynamic_calc_suffix2/dictionaries/rougail/00-base.yml +++ b/tests/dictionaries/60_5family_dynamic_calc_suffix2/dictionaries/rougail/00-base.yml @@ -5,9 +5,7 @@ var: # a suffix variable - val2 "dyn{{ suffix }}": description: a dynamic family - type: dynamic dynamic: - type: variable variable: _.var var: description: Suffix has value diff --git a/tests/dictionaries/60_5family_dynamic_calc_suffix2/tiramisu/base.py b/tests/dictionaries/60_5family_dynamic_calc_suffix2/tiramisu/base.py index 8c8b469d9..3a80490df 100644 --- a/tests/dictionaries/60_5family_dynamic_calc_suffix2/tiramisu/base.py +++ b/tests/dictionaries/60_5family_dynamic_calc_suffix2/tiramisu/base.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/60_5family_dynamic_calc_suffix2/tiramisu/multi.py b/tests/dictionaries/60_5family_dynamic_calc_suffix2/tiramisu/multi.py index ffb5f0449..9a8eafa8c 100644 --- a/tests/dictionaries/60_5family_dynamic_calc_suffix2/tiramisu/multi.py +++ b/tests/dictionaries/60_5family_dynamic_calc_suffix2/tiramisu/multi.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/60_5family_dynamic_calc_suffix2/tiramisu/no_namespace.py b/tests/dictionaries/60_5family_dynamic_calc_suffix2/tiramisu/no_namespace.py index b19178c79..047d060e4 100644 --- a/tests/dictionaries/60_5family_dynamic_calc_suffix2/tiramisu/no_namespace.py +++ b/tests/dictionaries/60_5family_dynamic_calc_suffix2/tiramisu/no_namespace.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/80leadership_auto_save/errno_29 b/tests/dictionaries/60_5family_dynamic_calc_suffix_disabled/__init__.py similarity index 100% rename from tests/dictionaries/80leadership_auto_save/errno_29 rename to tests/dictionaries/60_5family_dynamic_calc_suffix_disabled/__init__.py diff --git a/tests/dictionaries/60_5family_dynamic_calc_suffix_disabled/dictionaries/rougail/00-base.yml b/tests/dictionaries/60_5family_dynamic_calc_suffix_disabled/dictionaries/rougail/00-base.yml new file mode 100644 index 000000000..a2be47de5 --- /dev/null +++ b/tests/dictionaries/60_5family_dynamic_calc_suffix_disabled/dictionaries/rougail/00-base.yml @@ -0,0 +1,11 @@ +--- +version: '1.1' +"dyn{{ suffix }}": + dynamic: + - val1 + - val2 + var: + description: A dynamic variable + disabled: + type: suffix + when: 'val1' diff --git a/tests/dictionaries/60_5family_dynamic_calc_suffix_disabled/force_namespace b/tests/dictionaries/60_5family_dynamic_calc_suffix_disabled/force_namespace new file mode 100644 index 000000000..e69de29bb diff --git a/tests/dictionaries/60_5family_dynamic_calc_suffix_disabled/makedict/after.json b/tests/dictionaries/60_5family_dynamic_calc_suffix_disabled/makedict/after.json new file mode 100644 index 000000000..9064d4981 --- /dev/null +++ b/tests/dictionaries/60_5family_dynamic_calc_suffix_disabled/makedict/after.json @@ -0,0 +1,6 @@ +{ + "rougail.dynval2.var": { + "owner": "default", + "value": null + } +} diff --git a/tests/dictionaries/60_5family_dynamic_calc_suffix_disabled/makedict/base.json b/tests/dictionaries/60_5family_dynamic_calc_suffix_disabled/makedict/base.json new file mode 100644 index 000000000..655a2af68 --- /dev/null +++ b/tests/dictionaries/60_5family_dynamic_calc_suffix_disabled/makedict/base.json @@ -0,0 +1,3 @@ +{ + "rougail.dynval2.var": null +} diff --git a/tests/dictionaries/60_5family_dynamic_calc_suffix_disabled/makedict/before.json b/tests/dictionaries/60_5family_dynamic_calc_suffix_disabled/makedict/before.json new file mode 100644 index 000000000..9064d4981 --- /dev/null +++ b/tests/dictionaries/60_5family_dynamic_calc_suffix_disabled/makedict/before.json @@ -0,0 +1,6 @@ +{ + "rougail.dynval2.var": { + "owner": "default", + "value": null + } +} diff --git a/tests/dictionaries/60_5family_dynamic_calc_suffix_disabled/makedict/mandatory.json b/tests/dictionaries/60_5family_dynamic_calc_suffix_disabled/makedict/mandatory.json new file mode 100644 index 000000000..39f0bafd4 --- /dev/null +++ b/tests/dictionaries/60_5family_dynamic_calc_suffix_disabled/makedict/mandatory.json @@ -0,0 +1 @@ +["rougail.dynval2.var"] \ No newline at end of file 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 new file mode 100644 index 000000000..7b0738b0a --- /dev/null +++ b/tests/dictionaries/60_5family_dynamic_calc_suffix_disabled/tiramisu/base.py @@ -0,0 +1,12 @@ +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('tests/dictionaries/../eosfunc/test.py') +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"), ParamSuffix()), kwargs={'when': ParamValue("val1"), 'inverse': ParamValue(False)}), help_function=func['variable_to_property'])}), informations={'type': 'string'}) +optiondescription_2 = ConvertDynOptionDescription(name="dyn{{ suffix }}", doc="dyn{{ suffix }}", suffixes=["val1", "val2"], children=[option_3], properties=frozenset({"basic"})) +optiondescription_1 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_2], properties=frozenset({"basic"})) +option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_1]) diff --git a/tests/dictionaries/60_5family_dynamic_calc_suffix_disabled/tiramisu/multi.py b/tests/dictionaries/60_5family_dynamic_calc_suffix_disabled/tiramisu/multi.py new file mode 100644 index 000000000..458098733 --- /dev/null +++ b/tests/dictionaries/60_5family_dynamic_calc_suffix_disabled/tiramisu/multi.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('tests/dictionaries/../eosfunc/test.py') +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("standard") +ALLOWED_LEADER_PROPERTIES.add("advanced") +option_4 = StrOption(name="var", doc="A dynamic variable", properties=frozenset({"basic", "mandatory", Calculation(func['variable_to_property'], Params((ParamValue("disabled"), ParamSuffix()), kwargs={'when': ParamValue("val1"), 'inverse': ParamValue(False)}), help_function=func['variable_to_property'])}), informations={'type': 'string'}) +optiondescription_3 = ConvertDynOptionDescription(name="dyn{{ suffix }}", doc="dyn{{ suffix }}", suffixes=["val1", "val2"], children=[option_4], properties=frozenset({"basic"})) +optiondescription_2 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_3], properties=frozenset({"basic"})) +optiondescription_1 = OptionDescription(name="1", doc="1", children=[optiondescription_2], properties=frozenset({"basic"})) +option_8 = StrOption(name="var", doc="A dynamic variable", properties=frozenset({"basic", "mandatory", Calculation(func['variable_to_property'], Params((ParamValue("disabled"), ParamSuffix()), kwargs={'when': ParamValue("val1"), 'inverse': ParamValue(False)}), help_function=func['variable_to_property'])}), informations={'type': 'string'}) +optiondescription_7 = ConvertDynOptionDescription(name="dyn{{ suffix }}", doc="dyn{{ suffix }}", suffixes=["val1", "val2"], children=[option_8], properties=frozenset({"basic"})) +optiondescription_6 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_7], properties=frozenset({"basic"})) +optiondescription_5 = OptionDescription(name="2", doc="2", children=[optiondescription_6], properties=frozenset({"basic"})) +option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_1, optiondescription_5]) diff --git a/tests/dictionaries/60_5family_dynamic_calc_suffix_param/dictionaries/rougail/00-base.yml b/tests/dictionaries/60_5family_dynamic_calc_suffix_param/dictionaries/rougail/00-base.yml index fb54fc8a8..57893b4a1 100644 --- a/tests/dictionaries/60_5family_dynamic_calc_suffix_param/dictionaries/rougail/00-base.yml +++ b/tests/dictionaries/60_5family_dynamic_calc_suffix_param/dictionaries/rougail/00-base.yml @@ -5,14 +5,11 @@ var: # A suffix variable - val2 "dyn{{ suffix }}": description: A dynamic family - type: dynamic dynamic: - type: variable variable: _.var var: description: A dynamic variable default: - type: jinja jinja: | {{ suffix }} params: diff --git a/tests/dictionaries/60_5family_dynamic_calc_suffix_param/tiramisu/base.py b/tests/dictionaries/60_5family_dynamic_calc_suffix_param/tiramisu/base.py index 070d79ea0..4e884e60b 100644 --- a/tests/dictionaries/60_5family_dynamic_calc_suffix_param/tiramisu/base.py +++ b/tests/dictionaries/60_5family_dynamic_calc_suffix_param/tiramisu/base.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/60_5family_dynamic_calc_suffix_param/tiramisu/multi.py b/tests/dictionaries/60_5family_dynamic_calc_suffix_param/tiramisu/multi.py index a297946a3..79e14ba79 100644 --- a/tests/dictionaries/60_5family_dynamic_calc_suffix_param/tiramisu/multi.py +++ b/tests/dictionaries/60_5family_dynamic_calc_suffix_param/tiramisu/multi.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/60_5family_dynamic_calc_suffix_param/tiramisu/no_namespace.py b/tests/dictionaries/60_5family_dynamic_calc_suffix_param/tiramisu/no_namespace.py index 989189709..6b3b10345 100644 --- a/tests/dictionaries/60_5family_dynamic_calc_suffix_param/tiramisu/no_namespace.py +++ b/tests/dictionaries/60_5family_dynamic_calc_suffix_param/tiramisu/no_namespace.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/60_5family_dynamic_calc_variable/dictionaries/rougail/00-base.yml b/tests/dictionaries/60_5family_dynamic_calc_variable/dictionaries/rougail/00-base.yml index f11947bd9..e9d060155 100644 --- a/tests/dictionaries/60_5family_dynamic_calc_variable/dictionaries/rougail/00-base.yml +++ b/tests/dictionaries/60_5family_dynamic_calc_variable/dictionaries/rougail/00-base.yml @@ -6,9 +6,7 @@ var1: - val1 - val2 "dyn{{ suffix }}": - type: dynamic dynamic: - type: variable variable: _.var1 propertyerror: false var: @@ -16,5 +14,4 @@ var1: var2: description: A variable calculated default: - type: variable variable: _.dynval1.var diff --git a/tests/dictionaries/60_5family_dynamic_calc_variable/tiramisu/base.py b/tests/dictionaries/60_5family_dynamic_calc_variable/tiramisu/base.py index cd1160c95..557b35e3f 100644 --- a/tests/dictionaries/60_5family_dynamic_calc_variable/tiramisu/base.py +++ b/tests/dictionaries/60_5family_dynamic_calc_variable/tiramisu/base.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/60_5family_dynamic_calc_variable/tiramisu/multi.py b/tests/dictionaries/60_5family_dynamic_calc_variable/tiramisu/multi.py index c2a6d39a4..fe165f220 100644 --- a/tests/dictionaries/60_5family_dynamic_calc_variable/tiramisu/multi.py +++ b/tests/dictionaries/60_5family_dynamic_calc_variable/tiramisu/multi.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/60_5family_dynamic_calc_variable/tiramisu/no_namespace.py b/tests/dictionaries/60_5family_dynamic_calc_variable/tiramisu/no_namespace.py index 706a44a48..f445eb916 100644 --- a/tests/dictionaries/60_5family_dynamic_calc_variable/tiramisu/no_namespace.py +++ b/tests/dictionaries/60_5family_dynamic_calc_variable/tiramisu/no_namespace.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/60_5family_dynamic_hidden_suffix/dictionaries/rougail/00-base.yml b/tests/dictionaries/60_5family_dynamic_hidden_suffix/dictionaries/rougail/00-base.yml index ec12af928..5b2f7af9b 100644 --- a/tests/dictionaries/60_5family_dynamic_hidden_suffix/dictionaries/rougail/00-base.yml +++ b/tests/dictionaries/60_5family_dynamic_hidden_suffix/dictionaries/rougail/00-base.yml @@ -2,12 +2,10 @@ version: '1.1' "dyn{{ suffix }}": description: a dynamic family - type: dynamic dynamic: - val1 - val2 hidden: - type: jinja jinja: | {% if suffix == 'val2' %} disabled diff --git a/tests/dictionaries/60_5family_dynamic_hidden_suffix/tiramisu/base.py b/tests/dictionaries/60_5family_dynamic_hidden_suffix/tiramisu/base.py index e7088407e..535964d2e 100644 --- a/tests/dictionaries/60_5family_dynamic_hidden_suffix/tiramisu/base.py +++ b/tests/dictionaries/60_5family_dynamic_hidden_suffix/tiramisu/base.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/60_5family_dynamic_hidden_suffix/tiramisu/multi.py b/tests/dictionaries/60_5family_dynamic_hidden_suffix/tiramisu/multi.py index 0477f1dd8..80da277ed 100644 --- a/tests/dictionaries/60_5family_dynamic_hidden_suffix/tiramisu/multi.py +++ b/tests/dictionaries/60_5family_dynamic_hidden_suffix/tiramisu/multi.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/60_5family_dynamic_hidden_suffix/tiramisu/no_namespace.py b/tests/dictionaries/60_5family_dynamic_hidden_suffix/tiramisu/no_namespace.py index 0a66fab6e..682bb3778 100644 --- a/tests/dictionaries/60_5family_dynamic_hidden_suffix/tiramisu/no_namespace.py +++ b/tests/dictionaries/60_5family_dynamic_hidden_suffix/tiramisu/no_namespace.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/60_5family_dynamic_unknown_suffix/dictionaries/rougail/00-base.yml b/tests/dictionaries/60_5family_dynamic_unknown_suffix/dictionaries/rougail/00-base.yml index 22233e8fd..6efe76a0f 100644 --- a/tests/dictionaries/60_5family_dynamic_unknown_suffix/dictionaries/rougail/00-base.yml +++ b/tests/dictionaries/60_5family_dynamic_unknown_suffix/dictionaries/rougail/00-base.yml @@ -6,9 +6,7 @@ var: # a suffix variable "{{ suffix }}_dyn": description: a dynamic family - type: dynamic dynamic: - type: variable variable: _.var var1: description: a variable 1 @@ -17,20 +15,16 @@ var: # a suffix variable var2: description: a variable 2 default: - type: variable variable: rougail.{{ suffix }}_dyn.var1 var3: description: a variable 3 default: - type: variable variable: _.var1 var4: description: a variable 4 default: - type: variable variable: rougail.val4_dyn.var1 disabled: - type: jinja jinja: | {% if 'val4' not in __.var %} val4 is not a valid value diff --git a/tests/dictionaries/60_5family_dynamic_unknown_suffix/tiramisu/base.py b/tests/dictionaries/60_5family_dynamic_unknown_suffix/tiramisu/base.py index 087fa9e5b..de9b88b35 100644 --- a/tests/dictionaries/60_5family_dynamic_unknown_suffix/tiramisu/base.py +++ b/tests/dictionaries/60_5family_dynamic_unknown_suffix/tiramisu/base.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/60_5family_dynamic_unknown_suffix/tiramisu/multi.py b/tests/dictionaries/60_5family_dynamic_unknown_suffix/tiramisu/multi.py index 7e9e55497..1b6823bc7 100644 --- a/tests/dictionaries/60_5family_dynamic_unknown_suffix/tiramisu/multi.py +++ b/tests/dictionaries/60_5family_dynamic_unknown_suffix/tiramisu/multi.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/60_5family_dynamic_variable_outside/dictionaries/rougail/00-base.yml b/tests/dictionaries/60_5family_dynamic_variable_outside/dictionaries/rougail/00-base.yml index f98472ed3..383baba26 100644 --- a/tests/dictionaries/60_5family_dynamic_variable_outside/dictionaries/rougail/00-base.yml +++ b/tests/dictionaries/60_5family_dynamic_variable_outside/dictionaries/rougail/00-base.yml @@ -5,9 +5,7 @@ var: # a suffix variable - val2 "my_dyn_family_{{ suffix }}": description: a dynamic family - type: dynamic dynamic: - type: variable variable: _.var var: description: a variable inside a dynamic family @@ -18,5 +16,4 @@ var2: description: a variable multi: true default: - type: variable variable: "rougail.my_dyn_family_{{ suffix }}.var" diff --git a/tests/dictionaries/60_5family_dynamic_variable_outside/tiramisu/base.py b/tests/dictionaries/60_5family_dynamic_variable_outside/tiramisu/base.py index 93854caee..ae8315c38 100644 --- a/tests/dictionaries/60_5family_dynamic_variable_outside/tiramisu/base.py +++ b/tests/dictionaries/60_5family_dynamic_variable_outside/tiramisu/base.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/60_5family_dynamic_variable_outside/tiramisu/multi.py b/tests/dictionaries/60_5family_dynamic_variable_outside/tiramisu/multi.py index b27bf0880..c63dc647d 100644 --- a/tests/dictionaries/60_5family_dynamic_variable_outside/tiramisu/multi.py +++ b/tests/dictionaries/60_5family_dynamic_variable_outside/tiramisu/multi.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/60_5family_dynamic_variable_outside_sub_suffix/dictionaries/rougail/00-base.yml b/tests/dictionaries/60_5family_dynamic_variable_outside_sub_suffix/dictionaries/rougail/00-base.yml index 145779dbe..710b5420b 100644 --- a/tests/dictionaries/60_5family_dynamic_variable_outside_sub_suffix/dictionaries/rougail/00-base.yml +++ b/tests/dictionaries/60_5family_dynamic_variable_outside_sub_suffix/dictionaries/rougail/00-base.yml @@ -5,16 +5,12 @@ var: # a suffix variable - val2 "my_dyn_family_{{ suffix }}": description: a dynamic family - type: dynamic dynamic: - type: variable variable: _.var propertyerror: false "subdyn_{{ suffix }}": description: a sub dynamic family - type: dynamic dynamic: - type: variable variable: rougail.var var: description: a variable inside a sub dynamic family @@ -25,5 +21,4 @@ var2: mandatory: false multi: true default: - type: variable variable: "rougail.my_dyn_family_val1.subdyn_{{ suffix }}.var" diff --git a/tests/dictionaries/60_5family_dynamic_variable_outside_sub_suffix/tiramisu/base.py b/tests/dictionaries/60_5family_dynamic_variable_outside_sub_suffix/tiramisu/base.py index c65ba7a77..af2be9e92 100644 --- a/tests/dictionaries/60_5family_dynamic_variable_outside_sub_suffix/tiramisu/base.py +++ b/tests/dictionaries/60_5family_dynamic_variable_outside_sub_suffix/tiramisu/base.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/60_5family_dynamic_variable_outside_sub_suffix/tiramisu/multi.py b/tests/dictionaries/60_5family_dynamic_variable_outside_sub_suffix/tiramisu/multi.py index 44ab55297..c004f7e32 100644 --- a/tests/dictionaries/60_5family_dynamic_variable_outside_sub_suffix/tiramisu/multi.py +++ b/tests/dictionaries/60_5family_dynamic_variable_outside_sub_suffix/tiramisu/multi.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/60_5family_dynamic_variable_outside_suffix/dictionaries/rougail/00-base.yml b/tests/dictionaries/60_5family_dynamic_variable_outside_suffix/dictionaries/rougail/00-base.yml index 6f7ca9f3a..0e42e2107 100644 --- a/tests/dictionaries/60_5family_dynamic_variable_outside_suffix/dictionaries/rougail/00-base.yml +++ b/tests/dictionaries/60_5family_dynamic_variable_outside_suffix/dictionaries/rougail/00-base.yml @@ -5,9 +5,7 @@ var: # a suffix variable - val2 "dyn_{{ suffix }}": description: a dynamic family - type: dynamic dynamic: - type: variable variable: _.var var: description: a variable inside dynamic family @@ -16,5 +14,4 @@ var: # a suffix variable var2: description: a variable default: - type: variable variable: _.dyn_val1.var diff --git a/tests/dictionaries/60_5family_dynamic_variable_outside_suffix/tiramisu/base.py b/tests/dictionaries/60_5family_dynamic_variable_outside_suffix/tiramisu/base.py index 96cb8fc89..6e2f82350 100644 --- a/tests/dictionaries/60_5family_dynamic_variable_outside_suffix/tiramisu/base.py +++ b/tests/dictionaries/60_5family_dynamic_variable_outside_suffix/tiramisu/base.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/60_5family_dynamic_variable_outside_suffix/tiramisu/multi.py b/tests/dictionaries/60_5family_dynamic_variable_outside_suffix/tiramisu/multi.py index b7414c653..170f6d812 100644 --- a/tests/dictionaries/60_5family_dynamic_variable_outside_suffix/tiramisu/multi.py +++ b/tests/dictionaries/60_5family_dynamic_variable_outside_suffix/tiramisu/multi.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/60_5family_dynamic_variable_outside_suffix/tiramisu/no_namespace.py b/tests/dictionaries/60_5family_dynamic_variable_outside_suffix/tiramisu/no_namespace.py index cb06d963b..059c1b2e9 100644 --- a/tests/dictionaries/60_5family_dynamic_variable_outside_suffix/tiramisu/no_namespace.py +++ b/tests/dictionaries/60_5family_dynamic_variable_outside_suffix/tiramisu/no_namespace.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/60_6family_dynamic_inside/dictionaries/rougail/00-base.yml b/tests/dictionaries/60_6family_dynamic_inside/dictionaries/rougail/00-base.yml index d45b203ba..c8c556f76 100644 --- a/tests/dictionaries/60_6family_dynamic_inside/dictionaries/rougail/00-base.yml +++ b/tests/dictionaries/60_6family_dynamic_inside/dictionaries/rougail/00-base.yml @@ -6,9 +6,7 @@ var: # a suffix variable "{{ suffix }}_dyn": description: a dynamic family - type: dynamic dynamic: - type: variable variable: _.var var1: description: value is suffix @@ -17,15 +15,12 @@ var: # a suffix variable var2: description: value is first variable default: - type: variable variable: rougail.{{ suffix }}_dyn.var1 var3: description: value is relative first variable default: - type: variable variable: _.var1 var4: description: value is first variable of val1 default: - type: variable variable: rougail.val1_dyn.var1 diff --git a/tests/dictionaries/60_6family_dynamic_inside/tiramisu/base.py b/tests/dictionaries/60_6family_dynamic_inside/tiramisu/base.py index 434dedae7..f3e11862c 100644 --- a/tests/dictionaries/60_6family_dynamic_inside/tiramisu/base.py +++ b/tests/dictionaries/60_6family_dynamic_inside/tiramisu/base.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/60_6family_dynamic_inside/tiramisu/multi.py b/tests/dictionaries/60_6family_dynamic_inside/tiramisu/multi.py index 1daa2841b..b537b0e6d 100644 --- a/tests/dictionaries/60_6family_dynamic_inside/tiramisu/multi.py +++ b/tests/dictionaries/60_6family_dynamic_inside/tiramisu/multi.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/60_6family_dynamic_leadership/dictionaries/rougail/00-base.yml b/tests/dictionaries/60_6family_dynamic_leadership/dictionaries/rougail/00-base.yml index e9f2a1e04..825a79320 100644 --- a/tests/dictionaries/60_6family_dynamic_leadership/dictionaries/rougail/00-base.yml +++ b/tests/dictionaries/60_6family_dynamic_leadership/dictionaries/rougail/00-base.yml @@ -5,9 +5,7 @@ var: # a suffix variable - val2 "dyn{{ suffix }}": description: a dynamic family - type: dynamic dynamic: - type: variable variable: _.var leadership: description: a leadership diff --git a/tests/dictionaries/60_6family_dynamic_leadership/tiramisu/base.py b/tests/dictionaries/60_6family_dynamic_leadership/tiramisu/base.py index 160420db7..ab65d9d06 100644 --- a/tests/dictionaries/60_6family_dynamic_leadership/tiramisu/base.py +++ b/tests/dictionaries/60_6family_dynamic_leadership/tiramisu/base.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/60_6family_dynamic_leadership/tiramisu/multi.py b/tests/dictionaries/60_6family_dynamic_leadership/tiramisu/multi.py index d76a217db..9e79dc1cd 100644 --- a/tests/dictionaries/60_6family_dynamic_leadership/tiramisu/multi.py +++ b/tests/dictionaries/60_6family_dynamic_leadership/tiramisu/multi.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/60_6family_dynamic_leadership/tiramisu/no_namespace.py b/tests/dictionaries/60_6family_dynamic_leadership/tiramisu/no_namespace.py index c7eaee9f2..4d70cc995 100644 --- a/tests/dictionaries/60_6family_dynamic_leadership/tiramisu/no_namespace.py +++ b/tests/dictionaries/60_6family_dynamic_leadership/tiramisu/no_namespace.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/60_6family_dynamic_sub_dynamic/dictionaries/rougail/00-base.yml b/tests/dictionaries/60_6family_dynamic_sub_dynamic/dictionaries/rougail/00-base.yml index 4e88baa0d..239139f0f 100644 --- a/tests/dictionaries/60_6family_dynamic_sub_dynamic/dictionaries/rougail/00-base.yml +++ b/tests/dictionaries/60_6family_dynamic_sub_dynamic/dictionaries/rougail/00-base.yml @@ -5,15 +5,12 @@ var: # A suffix variable - val2 "dyn{{ suffix }}": description: A dynamic family - type: dynamic dynamic: - type: variable variable: _.var var: description: A dynamic variable multi: true default: - type: jinja jinja: | {% for val in __.var %} t{{ val }} @@ -21,9 +18,7 @@ var: # A suffix variable description: add 't' to each var value "dyn_{{ suffix }}": description: a Second dynamic variable - type: dynamic dynamic: - type: variable variable: "rougail.dyn{{ suffix }}.var" var: description: A variable dynamic @@ -37,7 +32,6 @@ var: # A suffix variable var_suffixes: description: merge suffixes default: - type: jinja jinja: | {{ s1 }}-{{ s2 }} params: diff --git a/tests/dictionaries/60_6family_dynamic_sub_dynamic/tiramisu/base.py b/tests/dictionaries/60_6family_dynamic_sub_dynamic/tiramisu/base.py index 1a93927f7..812d3d71c 100644 --- a/tests/dictionaries/60_6family_dynamic_sub_dynamic/tiramisu/base.py +++ b/tests/dictionaries/60_6family_dynamic_sub_dynamic/tiramisu/base.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/60_6family_dynamic_sub_dynamic/tiramisu/multi.py b/tests/dictionaries/60_6family_dynamic_sub_dynamic/tiramisu/multi.py index a1f8baebf..af5be31c5 100644 --- a/tests/dictionaries/60_6family_dynamic_sub_dynamic/tiramisu/multi.py +++ b/tests/dictionaries/60_6family_dynamic_sub_dynamic/tiramisu/multi.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/60_9extra_dynamic/dictionaries/extra/00-base.yml b/tests/dictionaries/60_9extra_dynamic/dictionaries/extra/00-base.yml index 1740b2d9e..cbd6b1a2e 100644 --- a/tests/dictionaries/60_9extra_dynamic/dictionaries/extra/00-base.yml +++ b/tests/dictionaries/60_9extra_dynamic/dictionaries/extra/00-base.yml @@ -1,8 +1,6 @@ --- version: 1.1 dyn_{{ suffix }}: - type: dynamic dynamic: - type: variable variable: rougail.var var: diff --git a/tests/dictionaries/60_9extra_dynamic/tiramisu/base.py b/tests/dictionaries/60_9extra_dynamic/tiramisu/base.py index e60fb50e0..17d747b83 100644 --- a/tests/dictionaries/60_9extra_dynamic/tiramisu/base.py +++ b/tests/dictionaries/60_9extra_dynamic/tiramisu/base.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/60_9extra_dynamic/tiramisu/multi.py b/tests/dictionaries/60_9extra_dynamic/tiramisu/multi.py index f6fee974e..4f4a21e15 100644 --- a/tests/dictionaries/60_9extra_dynamic/tiramisu/multi.py +++ b/tests/dictionaries/60_9extra_dynamic/tiramisu/multi.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/60_9extra_dynamic_extra/dictionaries/extra/00-base.yml b/tests/dictionaries/60_9extra_dynamic_extra/dictionaries/extra/00-base.yml index fbd09ed71..5e8adbcb2 100644 --- a/tests/dictionaries/60_9extra_dynamic_extra/dictionaries/extra/00-base.yml +++ b/tests/dictionaries/60_9extra_dynamic_extra/dictionaries/extra/00-base.yml @@ -3,8 +3,6 @@ version: '1.1' var: # a varaible - a "dyn_{{ suffix }}": - type: dynamic dynamic: - type: variable variable: _.var var: diff --git a/tests/dictionaries/60_9extra_dynamic_extra/tiramisu/base.py b/tests/dictionaries/60_9extra_dynamic_extra/tiramisu/base.py index b55b93c19..7e176a5be 100644 --- a/tests/dictionaries/60_9extra_dynamic_extra/tiramisu/base.py +++ b/tests/dictionaries/60_9extra_dynamic_extra/tiramisu/base.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/60_9extra_dynamic_extra/tiramisu/multi.py b/tests/dictionaries/60_9extra_dynamic_extra/tiramisu/multi.py index f7244ce0b..6cb9ea8f9 100644 --- a/tests/dictionaries/60_9extra_dynamic_extra/tiramisu/multi.py +++ b/tests/dictionaries/60_9extra_dynamic_extra/tiramisu/multi.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/60_9family_dynamic_calc_both/dictionaries/rougail/00-base.yml b/tests/dictionaries/60_9family_dynamic_calc_both/dictionaries/rougail/00-base.yml index f9cb51dd8..b5936d129 100644 --- a/tests/dictionaries/60_9family_dynamic_calc_both/dictionaries/rougail/00-base.yml +++ b/tests/dictionaries/60_9family_dynamic_calc_both/dictionaries/rougail/00-base.yml @@ -2,10 +2,8 @@ version: '1.1' var: val2 # a suffix variable "dyn{{ suffix }}": - type: dynamic description: a dynamic family dynamic: - val1 - - type: variable - variable: _.var + - variable: _.var vardyn: # a dynamic variable diff --git a/tests/dictionaries/60_9family_dynamic_calc_both/tiramisu/base.py b/tests/dictionaries/60_9family_dynamic_calc_both/tiramisu/base.py index 1c7256124..2f5f78a55 100644 --- a/tests/dictionaries/60_9family_dynamic_calc_both/tiramisu/base.py +++ b/tests/dictionaries/60_9family_dynamic_calc_both/tiramisu/base.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/60_9family_dynamic_calc_both/tiramisu/multi.py b/tests/dictionaries/60_9family_dynamic_calc_both/tiramisu/multi.py index 9d5a1b7a2..277e37a2f 100644 --- a/tests/dictionaries/60_9family_dynamic_calc_both/tiramisu/multi.py +++ b/tests/dictionaries/60_9family_dynamic_calc_both/tiramisu/multi.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/60_9family_dynamic_calc_both/tiramisu/no_namespace.py b/tests/dictionaries/60_9family_dynamic_calc_both/tiramisu/no_namespace.py index 6ff3613e0..1ea5aa7bb 100644 --- a/tests/dictionaries/60_9family_dynamic_calc_both/tiramisu/no_namespace.py +++ b/tests/dictionaries/60_9family_dynamic_calc_both/tiramisu/no_namespace.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/68_0family_leadership_mode/tiramisu/base.py b/tests/dictionaries/68_0family_leadership_mode/tiramisu/base.py index db9473c41..ec9b766fd 100644 --- a/tests/dictionaries/68_0family_leadership_mode/tiramisu/base.py +++ b/tests/dictionaries/68_0family_leadership_mode/tiramisu/base.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/68_0family_leadership_mode/tiramisu/multi.py b/tests/dictionaries/68_0family_leadership_mode/tiramisu/multi.py index 6d1f7ba9c..821bc7152 100644 --- a/tests/dictionaries/68_0family_leadership_mode/tiramisu/multi.py +++ b/tests/dictionaries/68_0family_leadership_mode/tiramisu/multi.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/68_0family_leadership_mode/tiramisu/no_namespace.py b/tests/dictionaries/68_0family_leadership_mode/tiramisu/no_namespace.py index 573e4c380..e7b4aa9a1 100644 --- a/tests/dictionaries/68_0family_leadership_mode/tiramisu/no_namespace.py +++ b/tests/dictionaries/68_0family_leadership_mode/tiramisu/no_namespace.py @@ -1,5 +1,6 @@ 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('tests/dictionaries/../eosfunc/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") diff --git a/tests/dictionaries/80choice_variable_optional/dictionaries/rougail/00-base.yml b/tests/dictionaries/80choice_variable_optional/dictionaries/rougail/00-base.yml index b2cd51fa0..3d6ae07c5 100644 --- a/tests/dictionaries/80choice_variable_optional/dictionaries/rougail/00-base.yml +++ b/tests/dictionaries/80choice_variable_optional/dictionaries/rougail/00-base.yml @@ -6,6 +6,5 @@ var1: - c var2: choices: - type: variable variable: _.var1 optional: true diff --git a/tests/dictionaries/80extra_externalspaceauto/dictionaries/extra1/00-base.yml b/tests/dictionaries/80extra_externalspaceauto/dictionaries/extra1/00-base.yml index df9f2c619..d73dcc829 100644 --- a/tests/dictionaries/80extra_externalspaceauto/dictionaries/extra1/00-base.yml +++ b/tests/dictionaries/80extra_externalspaceauto/dictionaries/extra1/00-base.yml @@ -2,5 +2,4 @@ version: '1.0' extra1: default: - type: variable variable: extra.extra_var diff --git a/tests/dictionaries/80extra_externalspacecondition/dictionaries/extra1/00-base.yml b/tests/dictionaries/80extra_externalspacecondition/dictionaries/extra1/00-base.yml index 3494c8ca0..5bba8c7e7 100644 --- a/tests/dictionaries/80extra_externalspacecondition/dictionaries/extra1/00-base.yml +++ b/tests/dictionaries/80extra_externalspacecondition/dictionaries/extra1/00-base.yml @@ -2,7 +2,6 @@ version: '1.0' external: disabled: - type: jinja jinja: | {% if extra.variable == "no" %} disabled diff --git a/tests/dictionaries/80family_dynamic_not_multi/dictionaries/rougail/00-base.yml b/tests/dictionaries/80family_dynamic_not_multi/dictionaries/rougail/00-base.yml index d3fb4b47f..81ec73267 100644 --- a/tests/dictionaries/80family_dynamic_not_multi/dictionaries/rougail/00-base.yml +++ b/tests/dictionaries/80family_dynamic_not_multi/dictionaries/rougail/00-base.yml @@ -3,9 +3,7 @@ version: '1.1' varname: default: val1 dyn{{ suffix }}: - type: dynamic dynamic: - type: variable variable: _.varname vardyn: type: string diff --git a/tests/dictionaries/80family_dynamic_optional/dictionaries/rougail/00-base.yml b/tests/dictionaries/80family_dynamic_optional/dictionaries/rougail/00-base.yml index 3b03d76da..a91767b68 100644 --- a/tests/dictionaries/80family_dynamic_optional/dictionaries/rougail/00-base.yml +++ b/tests/dictionaries/80family_dynamic_optional/dictionaries/rougail/00-base.yml @@ -4,9 +4,7 @@ varname: default: - val1 dyn{{ suffix }}: - type: dynamic dynamic: - type: variable variable: _.varname optional: true vardyn: diff --git a/tests/dictionaries/80leadership_auto_save/dictionaries/rougail/00-base.yml b/tests/dictionaries/80leadership_auto_save/dictionaries/rougail/00-base.yml deleted file mode 100644 index 6ccabd449..000000000 --- a/tests/dictionaries/80leadership_auto_save/dictionaries/rougail/00-base.yml +++ /dev/null @@ -1,28 +0,0 @@ -server_deployed: - type: boolean -general: - mode_conteneur_actif: - type: string - description: No change - default: non - leader: - description: leader - type: leadership - leader: - type: string - description: leader - multi: true - follower1: - type: string - description: follower1 - default: - type: jinja - jinja: '{{ "valfill" | calc_val }}' - follower2: - type: string - description: follower2 - auto_save: true - default: - type: jinja - jinja: '{{ rougail.general.leader.follower1 | calc_val }}' -version: '1.0' diff --git a/tests/dictionaries/80mode_leadership_conflict/dictionaries/rougail/00-base.yml b/tests/dictionaries/80mode_leadership_conflict/dictionaries/rougail/00-base.yml index 7fe5bf583..7a899b608 100644 --- a/tests/dictionaries/80mode_leadership_conflict/dictionaries/rougail/00-base.yml +++ b/tests/dictionaries/80mode_leadership_conflict/dictionaries/rougail/00-base.yml @@ -14,7 +14,6 @@ leadermode: multi: true mode: advanced default: - type: jinja jinja: '{{ "valfill" | calc_list }}' follower1: type: string diff --git a/tests/dictionaries/80no_leadership_index/dictionaries/rougail/00-base.yml b/tests/dictionaries/80no_leadership_index/dictionaries/rougail/00-base.yml index db2e1244e..f95df55af 100644 --- a/tests/dictionaries/80no_leadership_index/dictionaries/rougail/00-base.yml +++ b/tests/dictionaries/80no_leadership_index/dictionaries/rougail/00-base.yml @@ -2,7 +2,6 @@ version: '1.0' my_variable: default: - type: jinja jinja: '{{ index }}' params: index: diff --git a/tests/dictionaries/80valid_enum_multi_param/dictionaries/rougail/00-base.yml b/tests/dictionaries/80valid_enum_multi_param/dictionaries/rougail/00-base.yml index d26a3f74d..bba4e09a4 100644 --- a/tests/dictionaries/80valid_enum_multi_param/dictionaries/rougail/00-base.yml +++ b/tests/dictionaries/80valid_enum_multi_param/dictionaries/rougail/00-base.yml @@ -4,8 +4,7 @@ mode_conteneur_actif: type: choice default: a choices: - - type: variable - variable: _.var + - variable: _.var - d var: multi: true diff --git a/tests/dictionaries/80valid_enum_multi_variable/dictionaries/rougail/00-base.yml b/tests/dictionaries/80valid_enum_multi_variable/dictionaries/rougail/00-base.yml index ab8fcfb83..310eac606 100644 --- a/tests/dictionaries/80valid_enum_multi_variable/dictionaries/rougail/00-base.yml +++ b/tests/dictionaries/80valid_enum_multi_variable/dictionaries/rougail/00-base.yml @@ -10,7 +10,5 @@ var2: - c var3: choices: - - type: variable - variable: _.var - - type: variable - variable: _.var2 + - variable: _.var + - variable: _.var2 diff --git a/tests/dictionaries/80valid_enum_none_multi_variable/dictionaries/rougail/00-base.yml b/tests/dictionaries/80valid_enum_none_multi_variable/dictionaries/rougail/00-base.yml index b074bda9a..8fae7817b 100644 --- a/tests/dictionaries/80valid_enum_none_multi_variable/dictionaries/rougail/00-base.yml +++ b/tests/dictionaries/80valid_enum_none_multi_variable/dictionaries/rougail/00-base.yml @@ -4,7 +4,6 @@ mode_conteneur_actif: type: choice default: a choices: - type: variable variable: _.var var: default: a From 3177d11f13fc791779363b6dfc569f73cf3a9e24 Mon Sep 17 00:00:00 2001 From: Emmanuel Garette Date: Thu, 29 Aug 2024 08:34:51 +0200 Subject: [PATCH 07/12] feat(#21): add examples attributes --- src/rougail/annotator/variable.py | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/src/rougail/annotator/variable.py b/src/rougail/annotator/variable.py index 474899c38..b94f7e740 100644 --- a/src/rougail/annotator/variable.py +++ b/src/rougail/annotator/variable.py @@ -77,6 +77,7 @@ class Annotator(Walk): # pylint: disable=R0903 self.basic_types = {str: "string", int: "number", bool: "boolean", float: "float"} self.convert_variable() self.convert_test() + self.convert_examples() self.convert_help() self.verify_choices() @@ -105,6 +106,8 @@ class Annotator(Walk): # pylint: disable=R0903 # choice type inference from the `choices` attribute if variable.choices is not None: variable.type = "choice" + elif variable.regexp is not None: + variable.type = "regexp" elif variable.default not in [None, []]: if isinstance(variable.default, list): tested_value = variable.default[0] @@ -143,8 +146,11 @@ class Annotator(Walk): # pylint: disable=R0903 variable.hidden = family.hidden variable.hidden = None if variable.choices is not None and variable.type != 'choice': - msg = _(f'the variable "{variable.path}" has choice attribut but has not the "choice" type') + msg = _(f'the variable "{variable.path}" has choices attribut but has not the "choice" type') raise DictConsistencyError(msg, 11, variable.xmlfiles) + if variable.regexp is not None and variable.type != 'regexp': + msg = _(f'the variable "{variable.path}" has regexp attribut but has not the "regexp" type') + raise DictConsistencyError(msg, 37, variable.xmlfiles) def convert_test(self): """Convert variable tests value""" @@ -152,12 +158,22 @@ class Annotator(Walk): # pylint: disable=R0903 if variable.type == "symlink": continue if variable.test is None: - # with we want remove test, we set "" has test value continue self.objectspace.informations.add( variable.path, "test", tuple(variable.test) ) + def convert_examples(self): + """Convert variable tests value""" + for variable in self.get_variables(): + if variable.type == "symlink": + continue + if variable.examples is None: + continue + self.objectspace.informations.add( + variable.path, "examples", tuple(variable.examples) + ) + def convert_help(self): """Convert variable help""" for variable in self.get_variables(): From ee9d0b388ac6e9d8a3f14bf73f1fcffa15aafd3c Mon Sep 17 00:00:00 2001 From: Emmanuel Garette Date: Sun, 1 Sep 2024 12:15:19 +0200 Subject: [PATCH 08/12] feat: in structural commandline very is there is conflict alternative name --- src/rougail/structural_commandline/annotator.py | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/src/rougail/structural_commandline/annotator.py b/src/rougail/structural_commandline/annotator.py index 812eb082c..0b5d63c0a 100644 --- a/src/rougail/structural_commandline/annotator.py +++ b/src/rougail/structural_commandline/annotator.py @@ -30,6 +30,7 @@ class Annotator(Walk): def __init__(self, objectspace, *args) -> None: if not objectspace.paths: return + self.alternative_names = {} self.objectspace = objectspace not_for_commandlines = [] for family in self.get_families(): @@ -59,6 +60,17 @@ class Annotator(Walk): return alternative_name = variable.alternative_name variable_path = variable.path + all_letters = '' + for letter in alternative_name: + all_letters += letter + if all_letters == 'h': + msg = _(f'alternative_name "{alternative_name}" conflict with "--help"') + raise DictConsistencyError(msg, 202, variable.xmlfiles) + if all_letters in self.alternative_names: + msg = _(f'conflict alternative_name "{alternative_name}": "{variable_path}" and "{self.alternative_names[all_letters]}"') + raise DictConsistencyError(msg, 202, variable.xmlfiles) + + self.alternative_names[alternative_name] = variable_path if '.' not in variable_path: path = alternative_name else: @@ -71,7 +83,7 @@ class Annotator(Walk): raise DictConsistencyError(_(f'negative_description is mandatory for boolean variable, but "{variable.path}" hasn\'t'), 200, variable.xmlfiles) return if variable.type != 'boolean': - raise DictConsistencyError(_(f'negative_description is only available for boolean variable, but "{variable.path}" is "{variable.type}"'), 200, variable.xmlfiles) + raise DictConsistencyError(_(f'negative_description is only available for boolean variable, but "{variable.path}" is "{variable.type}"'), 201, variable.xmlfiles) self.objectspace.informations.add( variable.path, "negative_description", variable.negative_description ) From 29cabb37c2ca49c6ad33402f2a5acdf07f5ff55e Mon Sep 17 00:00:00 2001 From: Emmanuel Garette Date: Sun, 1 Sep 2024 12:20:57 +0200 Subject: [PATCH 09/12] fix: auto_save in follower is now allowed in tiramisu --- src/rougail/annotator/family.py | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/rougail/annotator/family.py b/src/rougail/annotator/family.py index 6f327517d..313b1f7bd 100644 --- a/src/rougail/annotator/family.py +++ b/src/rougail/annotator/family.py @@ -244,9 +244,6 @@ class Annotator(Walk): leader: "self.objectspace.variable", follower: "self.objectspace.variable", ) -> None: - if follower.auto_save is True: - msg = _(f'leader/followers "{follower.name}" could not be auto_save') - raise DictConsistencyError(msg, 29, follower.xmlfiles) if leader == follower: # it's a leader if not leader.mode: From d360203bf8a63d596ba2b81288cad8c70049bce6 Mon Sep 17 00:00:00 2001 From: Emmanuel Garette Date: Mon, 2 Sep 2024 15:47:33 +0200 Subject: [PATCH 10/12] feat: use suffix in property calculation --- src/rougail/config.py | 13 ++++----- src/rougail/object_model.py | 58 ++++++++++++++++++++++++++++++++----- 2 files changed, 56 insertions(+), 15 deletions(-) diff --git a/src/rougail/config.py b/src/rougail/config.py index 50a72bc13..8b01b1462 100644 --- a/src/rougail/config.py +++ b/src/rougail/config.py @@ -216,19 +216,16 @@ extra_dictionaries: description: Extra namespaces type: leadership disabled: - type: jinja - jinja: | - {% if not main_namespace %} - main_namespace not available - {% endif %} + variable: main_namespace + when: null names: description: 'Extra namespace name' - alternative_name: x + alternative_name: xn multi: true mandatory: false directories: description: Directories where extra dictionary files are placed - alternative_name: d + alternative_name: xd type: unix_filename params: allow_relative: true @@ -238,7 +235,7 @@ extra_dictionaries: multi: true functions_files: description: File with functions - alternative_name: f + alternative_name: c type: unix_filename params: allow_relative: true diff --git a/src/rougail/object_model.py b/src/rougail/object_model.py index 493f4064a..333a028fe 100644 --- a/src/rougail/object_model.py +++ b/src/rougail/object_model.py @@ -102,6 +102,7 @@ CONVERT_OPTION = { example="644", ), "choice": dict(opttype="ChoiceOption", example="a_choice"), + "regexp": dict(opttype="RegexpOption"), # "symlink": dict(opttype="SymLinkOption"), } @@ -588,20 +589,61 @@ class InformationCalculation(Calculation): } -class SuffixCalculation(Calculation): - attribute_name: Literal["default", "choice", "dynamic"] +class _SuffixCalculation(Calculation): suffix: Optional[int] = None + def get_suffix(self) -> dict: + suffix = {"type": "suffix"} + if self.suffix is not None: + suffix["suffix"] = self.suffix + return suffix + + +class SuffixCalculation(_SuffixCalculation): + attribute_name: Literal["default", "choice", "dynamic"] + def to_function( self, objectspace, ) -> dict: - suffix = {"type": "suffix"} - if self.suffix is not None: - suffix["suffix"] = self.suffix return { "function": "calc_value", - "params": {None: [suffix]}, + "params": {None: [self.get_suffix()]}, + } + + +class SuffixPropertyCalculation(_SuffixCalculation): + attribute_name: Literal[*PROPERTY_ATTRIBUTE] + when: Any = undefined + when_not: Any = undefined + + def to_function( + self, + objectspace, + ) -> dict: + if self.version == "1.0": + msg = f'when is not allowed in format version 1.0 for attribute "{self.attribute_name}"' + raise DictConsistencyError(msg, 105, variable.xmlfiles) + if self.when is not undefined: + if self.when_not is not undefined: + msg = f'the suffix has an invalid attribute "{self.attribute_name}", when and when_not cannot set together' + raise DictConsistencyError(msg, 35, variable.xmlfiles) + when = self.when + inverse = False + elif self.when_not is not undefined: + when = self.when_not + inverse = True + else: + msg = f'the suffix has an invalid attribute "{self.attribute_name}", when and when_not cannot set together' + raise DictConsistencyError + params = {None: [self.attribute_name, self.get_suffix()], + "when": when, + "inverse": inverse, + } + return { + "function": "variable_to_property", + "params": params, + "help": "variable_to_property", } @@ -632,7 +674,7 @@ CALCULATION_PROPERTY_TYPES = { "jinja": JinjaCalculation, "variable": VariablePropertyCalculation, "information": InformationCalculation, - "suffix": SuffixCalculation, + "suffix": SuffixPropertyCalculation, "index": IndexCalculation, } BASETYPE_CALC = Union[StrictBool, StrictInt, StrictFloat, StrictStr, Calculation, None] @@ -667,6 +709,7 @@ class Variable(BaseModel): description: Optional[str] = None default: Union[List[BASETYPE_CALC], BASETYPE_CALC] = None choices: Optional[Union[List[BASETYPE_CALC], Calculation]] = None + regexp: Optional[str] = None params: Optional[List[Param]] = None validators: Optional[List[Calculation]] = None multi: Optional[bool] = None @@ -678,6 +721,7 @@ class Variable(BaseModel): auto_save: bool = False mode: Optional[str] = None test: Optional[list] = None + examples: Optional[list] = None path: str namespace: Optional[str] version: str From aaf832c12d22dea5be5f56c7d5036ddd12966018 Mon Sep 17 00:00:00 2001 From: Emmanuel Garette Date: Mon, 2 Sep 2024 16:05:42 +0200 Subject: [PATCH 11/12] fix: type is not always mandatory --- src/rougail/convert.py | 37 +++++++++++++++++++++++++++++++------ 1 file changed, 31 insertions(+), 6 deletions(-) diff --git a/src/rougail/convert.py b/src/rougail/convert.py index 200a2cd3a..21dcd94ff 100644 --- a/src/rougail/convert.py +++ b/src/rougail/convert.py @@ -590,7 +590,18 @@ class ParserVariable: extra_attrs = set(family_obj) - self.family_attrs if extra_attrs: raise Exception(f"extra attrs ... {extra_attrs}") - if self.get_family_or_variable_type(family_obj) == "dynamic": + obj_type = self.get_family_or_variable_type(family_obj) + if obj_type is None: + # auto set type + if '_dynamic' in family_obj: + dynamic = family_obj['_dynamic'] + elif 'dynamic' in family_obj: + dynamic = family_obj['dynamic'] + else: + dynamic = None + if isinstance(dynamic, (list, dict)): + family_obj['type'] = obj_type = 'dynamic' + if obj_type == "dynamic": family_is_dynamic = True parent_dynamic = path if '{{ suffix }}' not in name: @@ -999,11 +1010,16 @@ class ParserVariable: calculations = calculations[0] else: calculations = calculations[1] - return ( - attribute in calculations - and isinstance(value, dict) - and value.get("type") in CALCULATION_TYPES - ) + if not isinstance(value, dict) or attribute not in calculations: + return False + if 'type' in value: + return value['type'] in CALCULATION_TYPES + # auto set type + typ = set(CALCULATION_TYPES) & set(value) + if len(typ) == 1: + value['type'] = list(typ)[0] + return True + return False def set_calculation( self, @@ -1036,6 +1052,11 @@ class ParserVariable: raise Exception("params must be a dict") params = [] for key, val in calculation_object["params"].items(): + if isinstance(val, dict) and "type" not in val: + # auto set type + param_typ = set(CALCULATION_TYPES) & set(val) + if len(param_typ) == 1: + val['type'] = list(param_typ)[0] if not isinstance(val, dict) or "type" not in val: param_typ = "any" val = { @@ -1214,6 +1235,8 @@ class RougailConvert(ParserVariable): objects, filename, ) + if objects is None: + return self.parse_root_file(filename, path, version, @@ -1268,6 +1291,8 @@ class RougailConvert(ParserVariable): filename: str, ) -> None: """version is mandatory in YAML file""" + if obj is None: + obj = {} for name in ["_version", "version"]: if name not in obj: continue From e99d0fde3c5cbab57b20d5f46d65ac14e9d42c18 Mon Sep 17 00:00:00 2001 From: Emmanuel Garette Date: Wed, 4 Sep 2024 16:31:45 +0200 Subject: [PATCH 12/12] copy type/params and multi if default value is a variable calculation (#9, #31 and #34) Reviewed-on: https://forge.cloud.silique.fr/stove/rougail/pulls/34 Co-authored-by: Emmanuel Garette Co-committed-by: Emmanuel Garette --- docs/fill.rst | 18 ++++++++++ src/rougail/annotator/family.py | 1 - src/rougail/annotator/variable.py | 34 +++++++++++++++++-- .../__init__.py | 0 .../dictionaries/rougail/00-base.yml | 13 +++++++ .../makedict/after.json | 10 ++++++ .../makedict/base.json | 4 +++ .../makedict/before.json | 10 ++++++ .../makedict/mandatory.json | 1 + .../tiramisu/base.py | 11 ++++++ .../tiramisu/multi.py | 16 +++++++++ .../tiramisu/no_namespace.py | 10 ++++++ tests/test_1_flattener.py | 2 ++ 13 files changed, 126 insertions(+), 4 deletions(-) create mode 100644 tests/dictionaries/00_2default_calculated_variable_transitive/__init__.py create mode 100644 tests/dictionaries/00_2default_calculated_variable_transitive/dictionaries/rougail/00-base.yml create mode 100644 tests/dictionaries/00_2default_calculated_variable_transitive/makedict/after.json create mode 100644 tests/dictionaries/00_2default_calculated_variable_transitive/makedict/base.json create mode 100644 tests/dictionaries/00_2default_calculated_variable_transitive/makedict/before.json create mode 100644 tests/dictionaries/00_2default_calculated_variable_transitive/makedict/mandatory.json create mode 100644 tests/dictionaries/00_2default_calculated_variable_transitive/tiramisu/base.py create mode 100644 tests/dictionaries/00_2default_calculated_variable_transitive/tiramisu/multi.py create mode 100644 tests/dictionaries/00_2default_calculated_variable_transitive/tiramisu/no_namespace.py diff --git a/docs/fill.rst b/docs/fill.rst index af3ba0b54..d796bff25 100644 --- a/docs/fill.rst +++ b/docs/fill.rst @@ -394,6 +394,24 @@ Copy a variable in another: type: variable variable: _.my_variable +Copy the default value from a variable, means copy type, params and multi attribute too if not define in second variable. + +.. code-block:: yaml + + --- + version: 1.1 + my_variable: + multi: true + type: domainname + params: + allow_ip: true + my_calculated_variable: + default: + type: variable + variable: _.var1 + +Here my_calculated_variable is a domainname variable with parameter allow_ip=True and multi to true. + Copy one variable to another if the source has no `property` problem: .. code-block:: yaml diff --git a/src/rougail/annotator/family.py b/src/rougail/annotator/family.py index 313b1f7bd..5b17fa79a 100644 --- a/src/rougail/annotator/family.py +++ b/src/rougail/annotator/family.py @@ -30,7 +30,6 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA from typing import Optional from rougail.i18n import _ from rougail.error import DictConsistencyError -from rougail.utils import get_realpath from rougail.annotator.variable import Walk from rougail.object_model import VariableCalculation diff --git a/src/rougail/annotator/variable.py b/src/rougail/annotator/variable.py index b94f7e740..90d5835cc 100644 --- a/src/rougail/annotator/variable.py +++ b/src/rougail/annotator/variable.py @@ -30,7 +30,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA from rougail.i18n import _ from rougail.error import DictConsistencyError -from rougail.object_model import Calculation +from rougail.object_model import Calculation, VariableCalculation from tiramisu.error import display_list @@ -83,11 +83,16 @@ class Annotator(Walk): # pylint: disable=R0903 def convert_variable(self): """convert variable""" + for variable in self.get_variables(): + if variable.version != "1.0": + if variable.type == "symlink": + continue + self._convert_variable_inference(variable) for variable in self.get_variables(): if variable.type == "symlink": continue if variable.version != "1.0": - self._convert_variable_inference(variable) + self._default_variable_copy_informations(variable) if variable.multi is None: variable.multi = False if variable.type is None: @@ -115,12 +120,35 @@ class Annotator(Walk): # pylint: disable=R0903 tested_value = variable.default variable.type = self.basic_types.get(type(tested_value), None) # variable has no multi attribute - if variable.multi is None: + if variable.multi is None and not (variable.type is None and isinstance(variable.default, VariableCalculation)): if variable.path in self.objectspace.leaders: variable.multi = True else: variable.multi = isinstance(variable.default, list) + def _default_variable_copy_informations( + self, + variable, + ) -> None: + # if a variable has a variable as default value, that means the type/params or multi should has same value + if variable.type is not None or not isinstance(variable.default, VariableCalculation): + return + # copy type and params + calculated_variable_path = variable.default.variable + calculated_variable, suffix = self.objectspace.paths.get_with_dynamic( + calculated_variable_path, variable.default.path_prefix, variable.path, variable.version, variable.namespace, variable.xmlfiles + ) + variable.type = calculated_variable.type + if variable.params is None and calculated_variable.params is not None: + variable.params = calculated_variable.params + # copy multi attribut + if variable.multi is None: + calculated_path = calculated_variable.path + if calculated_path in self.objectspace.leaders and variable.path in self.objectspace.followers and calculated_path.rsplit('.')[0] == variable.path.rsplit('.')[0]: + variable.multi = False + else: + variable.multi = calculated_variable.multi + def _convert_variable( self, variable: dict, diff --git a/tests/dictionaries/00_2default_calculated_variable_transitive/__init__.py b/tests/dictionaries/00_2default_calculated_variable_transitive/__init__.py new file mode 100644 index 000000000..e69de29bb diff --git a/tests/dictionaries/00_2default_calculated_variable_transitive/dictionaries/rougail/00-base.yml b/tests/dictionaries/00_2default_calculated_variable_transitive/dictionaries/rougail/00-base.yml new file mode 100644 index 000000000..81a09e501 --- /dev/null +++ b/tests/dictionaries/00_2default_calculated_variable_transitive/dictionaries/rougail/00-base.yml @@ -0,0 +1,13 @@ +--- +version: 1.1 +var1: + description: a first variable + multi: true + type: domainname + params: + allow_ip: true +var2: + description: a second variable + default: + type: variable + variable: _.var1 diff --git a/tests/dictionaries/00_2default_calculated_variable_transitive/makedict/after.json b/tests/dictionaries/00_2default_calculated_variable_transitive/makedict/after.json new file mode 100644 index 000000000..2c76fb1fd --- /dev/null +++ b/tests/dictionaries/00_2default_calculated_variable_transitive/makedict/after.json @@ -0,0 +1,10 @@ +{ + "rougail.var1": { + "owner": "default", + "value": [] + }, + "rougail.var2": { + "owner": "default", + "value": [] + } +} diff --git a/tests/dictionaries/00_2default_calculated_variable_transitive/makedict/base.json b/tests/dictionaries/00_2default_calculated_variable_transitive/makedict/base.json new file mode 100644 index 000000000..687890720 --- /dev/null +++ b/tests/dictionaries/00_2default_calculated_variable_transitive/makedict/base.json @@ -0,0 +1,4 @@ +{ + "rougail.var1": [], + "rougail.var2": [] +} diff --git a/tests/dictionaries/00_2default_calculated_variable_transitive/makedict/before.json b/tests/dictionaries/00_2default_calculated_variable_transitive/makedict/before.json new file mode 100644 index 000000000..2c76fb1fd --- /dev/null +++ b/tests/dictionaries/00_2default_calculated_variable_transitive/makedict/before.json @@ -0,0 +1,10 @@ +{ + "rougail.var1": { + "owner": "default", + "value": [] + }, + "rougail.var2": { + "owner": "default", + "value": [] + } +} diff --git a/tests/dictionaries/00_2default_calculated_variable_transitive/makedict/mandatory.json b/tests/dictionaries/00_2default_calculated_variable_transitive/makedict/mandatory.json new file mode 100644 index 000000000..8c67ac5f8 --- /dev/null +++ b/tests/dictionaries/00_2default_calculated_variable_transitive/makedict/mandatory.json @@ -0,0 +1 @@ +["rougail.var1", "rougail.var2"] \ No newline at end of file diff --git a/tests/dictionaries/00_2default_calculated_variable_transitive/tiramisu/base.py b/tests/dictionaries/00_2default_calculated_variable_transitive/tiramisu/base.py new file mode 100644 index 000000000..50a814961 --- /dev/null +++ b/tests/dictionaries/00_2default_calculated_variable_transitive/tiramisu/base.py @@ -0,0 +1,11 @@ +from tiramisu import * +from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription +load_functions('tests/dictionaries/../eosfunc/test.py') +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("standard") +ALLOWED_LEADER_PROPERTIES.add("advanced") +option_2 = DomainnameOption(name="var1", doc="a first variable", multi=True, type="domainname", allow_ip=True, properties=frozenset({"basic", "mandatory", "notempty"}), informations={'type': 'domainname'}) +option_3 = DomainnameOption(name="var2", doc="a second variable", multi=True, default=Calculation(func['calc_value'], Params((ParamOption(option_2)))), type="domainname", allow_ip=True, properties=frozenset({"mandatory", "notempty", "standard"}), informations={'type': 'domainname'}) +optiondescription_1 = OptionDescription(name="rougail", doc="Rougail", children=[option_2, option_3], properties=frozenset({"basic"})) +option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_1]) diff --git a/tests/dictionaries/00_2default_calculated_variable_transitive/tiramisu/multi.py b/tests/dictionaries/00_2default_calculated_variable_transitive/tiramisu/multi.py new file mode 100644 index 000000000..87aa50795 --- /dev/null +++ b/tests/dictionaries/00_2default_calculated_variable_transitive/tiramisu/multi.py @@ -0,0 +1,16 @@ +from tiramisu import * +from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription +load_functions('tests/dictionaries/../eosfunc/test.py') +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("standard") +ALLOWED_LEADER_PROPERTIES.add("advanced") +option_3 = DomainnameOption(name="var1", doc="a first variable", multi=True, type="domainname", allow_ip=True, properties=frozenset({"basic", "mandatory", "notempty"}), informations={'type': 'domainname'}) +option_4 = DomainnameOption(name="var2", doc="a second variable", multi=True, default=Calculation(func['calc_value'], Params((ParamOption(option_3)))), type="domainname", allow_ip=True, properties=frozenset({"mandatory", "notempty", "standard"}), informations={'type': 'domainname'}) +optiondescription_2 = OptionDescription(name="rougail", doc="Rougail", children=[option_3, option_4], properties=frozenset({"basic"})) +optiondescription_1 = OptionDescription(name="1", doc="1", children=[optiondescription_2], properties=frozenset({"basic"})) +option_7 = DomainnameOption(name="var1", doc="a first variable", multi=True, type="domainname", allow_ip=True, properties=frozenset({"basic", "mandatory", "notempty"}), informations={'type': 'domainname'}) +option_8 = DomainnameOption(name="var2", doc="a second variable", multi=True, default=Calculation(func['calc_value'], Params((ParamOption(option_7)))), type="domainname", allow_ip=True, properties=frozenset({"mandatory", "notempty", "standard"}), informations={'type': 'domainname'}) +optiondescription_6 = OptionDescription(name="rougail", doc="Rougail", children=[option_7, option_8], properties=frozenset({"basic"})) +optiondescription_5 = OptionDescription(name="2", doc="2", children=[optiondescription_6], properties=frozenset({"basic"})) +option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_1, optiondescription_5]) diff --git a/tests/dictionaries/00_2default_calculated_variable_transitive/tiramisu/no_namespace.py b/tests/dictionaries/00_2default_calculated_variable_transitive/tiramisu/no_namespace.py new file mode 100644 index 000000000..1b3e95c94 --- /dev/null +++ b/tests/dictionaries/00_2default_calculated_variable_transitive/tiramisu/no_namespace.py @@ -0,0 +1,10 @@ +from tiramisu import * +from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription +load_functions('tests/dictionaries/../eosfunc/test.py') +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("standard") +ALLOWED_LEADER_PROPERTIES.add("advanced") +option_1 = DomainnameOption(name="var1", doc="a first variable", multi=True, type="domainname", allow_ip=True, properties=frozenset({"basic", "mandatory", "notempty"}), informations={'type': 'domainname'}) +option_2 = DomainnameOption(name="var2", doc="a second variable", multi=True, default=Calculation(func['calc_value'], Params((ParamOption(option_1)))), type="domainname", allow_ip=True, properties=frozenset({"mandatory", "notempty", "standard"}), informations={'type': 'domainname'}) +option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1, option_2]) diff --git a/tests/test_1_flattener.py b/tests/test_1_flattener.py index 2edb961f9..8ccd54c8d 100644 --- a/tests/test_1_flattener.py +++ b/tests/test_1_flattener.py @@ -46,8 +46,10 @@ test_multi = True #test_multi = False test_base = test_multi #test_base = True +#test_base = False test_no_namespace = test_multi #test_no_namespace = True +#test_no_namespace = False ORI_DIR = getcwd()