diff --git a/tests/dictionaries/00_0empty/dictionaries/rougail/.gitkeep b/tests/dictionaries/00_0empty/dictionaries/rougail/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/tests/dictionaries/00_0empty/tiramisu/base.py b/tests/dictionaries/00_0empty/tiramisu/base.py index 9caa6cdd8..546fc18a6 100644 --- a/tests/dictionaries/00_0empty/tiramisu/base.py +++ b/tests/dictionaries/00_0empty/tiramisu/base.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') try: groups.namespace except: diff --git a/tests/dictionaries/00_0empty/tiramisu/multi.py b/tests/dictionaries/00_0empty/tiramisu/multi.py index 3960b199f..c37d2b51d 100644 --- a/tests/dictionaries/00_0empty/tiramisu/multi.py +++ b/tests/dictionaries/00_0empty/tiramisu/multi.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') try: groups.namespace except: diff --git a/tests/dictionaries/00_0empty/tiramisu/no_namespace.py b/tests/dictionaries/00_0empty/tiramisu/no_namespace.py index 502023bc9..e4e37cbdb 100644 --- a/tests/dictionaries/00_0empty/tiramisu/no_namespace.py +++ b/tests/dictionaries/00_0empty/tiramisu/no_namespace.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") ALLOWED_LEADER_PROPERTIES.add("standard") ALLOWED_LEADER_PROPERTIES.add("advanced") diff --git a/tests/dictionaries/00_0version_underscore/dictionaries/rougail/00-base.yml b/tests/dictionaries/00_0version_underscore/dictionaries/rougail/00-base.yml deleted file mode 100644 index fa4dbc9ac..000000000 --- a/tests/dictionaries/00_0version_underscore/dictionaries/rougail/00-base.yml +++ /dev/null @@ -1,3 +0,0 @@ ---- -_version: '1.1' -version: # a variable diff --git a/tests/dictionaries/00_0version_underscore/tiramisu/base.py b/tests/dictionaries/00_0version_underscore/tiramisu/base.py index d367bc371..40b0bd14e 100644 --- a/tests/dictionaries/00_0version_underscore/tiramisu/base.py +++ b/tests/dictionaries/00_0version_underscore/tiramisu/base.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') try: groups.namespace except: diff --git a/tests/dictionaries/00_0version_underscore/tiramisu/multi.py b/tests/dictionaries/00_0version_underscore/tiramisu/multi.py index ab3f567b0..b0deb2f96 100644 --- a/tests/dictionaries/00_0version_underscore/tiramisu/multi.py +++ b/tests/dictionaries/00_0version_underscore/tiramisu/multi.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') try: groups.namespace except: diff --git a/tests/dictionaries/00_0version_underscore/tiramisu/no_namespace.py b/tests/dictionaries/00_0version_underscore/tiramisu/no_namespace.py index 95eaca0bc..4c1b71f73 100644 --- a/tests/dictionaries/00_0version_underscore/tiramisu/no_namespace.py +++ b/tests/dictionaries/00_0version_underscore/tiramisu/no_namespace.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") ALLOWED_LEADER_PROPERTIES.add("standard") ALLOWED_LEADER_PROPERTIES.add("advanced") diff --git a/tests/dictionaries/00_1empty_variable/dictionaries/rougail/00-base.yml b/tests/dictionaries/00_1empty_variable/dictionaries/rougail/00-base.yml deleted file mode 100644 index 7bee2df00..000000000 --- a/tests/dictionaries/00_1empty_variable/dictionaries/rougail/00-base.yml +++ /dev/null @@ -1,3 +0,0 @@ ---- -version: '1.0' -empty: diff --git a/tests/dictionaries/00_1empty_variable/tiramisu/base.py b/tests/dictionaries/00_1empty_variable/tiramisu/base.py index f6892c677..b8292d9e7 100644 --- a/tests/dictionaries/00_1empty_variable/tiramisu/base.py +++ b/tests/dictionaries/00_1empty_variable/tiramisu/base.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') try: groups.namespace except: diff --git a/tests/dictionaries/00_1empty_variable/tiramisu/multi.py b/tests/dictionaries/00_1empty_variable/tiramisu/multi.py index 32fc5ca8f..8081474ee 100644 --- a/tests/dictionaries/00_1empty_variable/tiramisu/multi.py +++ b/tests/dictionaries/00_1empty_variable/tiramisu/multi.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') try: groups.namespace except: diff --git a/tests/dictionaries/00_1empty_variable/tiramisu/no_namespace.py b/tests/dictionaries/00_1empty_variable/tiramisu/no_namespace.py index ccd9166bb..b7da97125 100644 --- a/tests/dictionaries/00_1empty_variable/tiramisu/no_namespace.py +++ b/tests/dictionaries/00_1empty_variable/tiramisu/no_namespace.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") ALLOWED_LEADER_PROPERTIES.add("standard") ALLOWED_LEADER_PROPERTIES.add("advanced") diff --git a/tests/dictionaries/00_2default_calculated/dictionaries/rougail/00-base.yml b/tests/dictionaries/00_2default_calculated/dictionaries/rougail/00-base.yml deleted file mode 100644 index 665a99c93..000000000 --- a/tests/dictionaries/00_2default_calculated/dictionaries/rougail/00-base.yml +++ /dev/null @@ -1,10 +0,0 @@ ---- -version: 1.1 -var1: "no" # a first variable -var2: - description: a second variable - multi: true - default: - 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 baedd0d85..9515b36f4 100644 --- a/tests/dictionaries/00_2default_calculated/tiramisu/base.py +++ b/tests/dictionaries/00_2default_calculated/tiramisu/base.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') try: groups.namespace except: @@ -12,6 +12,6 @@ ALLOWED_LEADER_PROPERTIES.add("standard") ALLOWED_LEADER_PROPERTIES.add("advanced") dict_env['default_rougail.var2'] = "{{ _.var1 }}\n" option_2 = StrOption(name="var1", doc="a first variable", default="no", properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) -option_3 = StrOption(name="var2", doc="a second variable", multi=True, default=Calculation(func['jinja_to_function'], Params((), kwargs={'__internal_jinja': ParamValue("default_rougail.var2"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(True), '__internal_files': ParamValue(['tests/dictionaries/00_2default_calculated/dictionaries/rougail/00-base.yml']), '__internal_attribute': ParamValue("default"), '__internal_variable': ParamValue("rougail.var2"), '_.var1': ParamOption(option_2, notraisepropertyerror=True)})), properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) +option_3 = StrOption(name="var2", doc="a second variable", multi=True, default=Calculation(func['jinja_to_function'], Params((), kwargs={'__internal_jinja': ParamValue("default_rougail.var2"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(True), '__internal_files': ParamValue(['../rougail-tests/structures/00_2default_calculated/rougail/00-base.yml']), '__internal_attribute': ParamValue("default"), '__internal_variable': ParamValue("rougail.var2"), '_.var1': ParamOption(option_2, notraisepropertyerror=True)})), properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) optiondescription_1 = OptionDescription(name="rougail", doc="Rougail", group_type=groups.namespace, children=[option_2, option_3], properties=frozenset({"standard"})) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_1]) diff --git a/tests/dictionaries/00_2default_calculated/tiramisu/multi.py b/tests/dictionaries/00_2default_calculated/tiramisu/multi.py index e74c63a39..2278ea7c5 100644 --- a/tests/dictionaries/00_2default_calculated/tiramisu/multi.py +++ b/tests/dictionaries/00_2default_calculated/tiramisu/multi.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') try: groups.namespace except: @@ -13,11 +13,11 @@ ALLOWED_LEADER_PROPERTIES.add("advanced") dict_env['default_1.rougail.var2'] = "{{ _.var1 }}\n" dict_env['default_2.rougail.var2'] = "{{ _.var1 }}\n" option_3 = StrOption(name="var1", doc="a first variable", default="no", properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) -option_4 = StrOption(name="var2", doc="a second variable", multi=True, default=Calculation(func['jinja_to_function'], Params((), kwargs={'__internal_jinja': ParamValue("default_1.rougail.var2"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(True), '__internal_files': ParamValue(['tests/dictionaries/00_2default_calculated/dictionaries/rougail/00-base.yml']), '__internal_attribute': ParamValue("default"), '__internal_variable': ParamValue("1.rougail.var2"), '_.var1': ParamOption(option_3, notraisepropertyerror=True)})), properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) +option_4 = StrOption(name="var2", doc="a second variable", multi=True, default=Calculation(func['jinja_to_function'], Params((), kwargs={'__internal_jinja': ParamValue("default_1.rougail.var2"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(True), '__internal_files': ParamValue(['../rougail-tests/structures/00_2default_calculated/rougail/00-base.yml']), '__internal_attribute': ParamValue("default"), '__internal_variable': ParamValue("1.rougail.var2"), '_.var1': ParamOption(option_3, notraisepropertyerror=True)})), properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) optiondescription_2 = OptionDescription(name="rougail", doc="Rougail", group_type=groups.namespace, 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="var1", doc="a first variable", default="no", properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) -option_8 = StrOption(name="var2", doc="a second variable", multi=True, default=Calculation(func['jinja_to_function'], Params((), kwargs={'__internal_jinja': ParamValue("default_2.rougail.var2"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(True), '__internal_files': ParamValue(['tests/dictionaries/00_2default_calculated/dictionaries/rougail/00-base.yml']), '__internal_attribute': ParamValue("default"), '__internal_variable': ParamValue("2.rougail.var2"), '_.var1': ParamOption(option_7, notraisepropertyerror=True)})), properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) +option_8 = StrOption(name="var2", doc="a second variable", multi=True, default=Calculation(func['jinja_to_function'], Params((), kwargs={'__internal_jinja': ParamValue("default_2.rougail.var2"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(True), '__internal_files': ParamValue(['../rougail-tests/structures/00_2default_calculated/rougail/00-base.yml']), '__internal_attribute': ParamValue("default"), '__internal_variable': ParamValue("2.rougail.var2"), '_.var1': ParamOption(option_7, notraisepropertyerror=True)})), properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) optiondescription_6 = OptionDescription(name="rougail", doc="Rougail", group_type=groups.namespace, 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_2default_calculated/tiramisu/no_namespace.py b/tests/dictionaries/00_2default_calculated/tiramisu/no_namespace.py index 8c35c2ea8..3af6b4121 100644 --- a/tests/dictionaries/00_2default_calculated/tiramisu/no_namespace.py +++ b/tests/dictionaries/00_2default_calculated/tiramisu/no_namespace.py @@ -2,11 +2,11 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") ALLOWED_LEADER_PROPERTIES.add("standard") ALLOWED_LEADER_PROPERTIES.add("advanced") dict_env['default_var2'] = "{{ _.var1 }}\n" option_1 = StrOption(name="var1", doc="a first variable", default="no", properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) -option_2 = StrOption(name="var2", doc="a second variable", multi=True, default=Calculation(func['jinja_to_function'], Params((), kwargs={'__internal_jinja': ParamValue("default_var2"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(True), '__internal_files': ParamValue(['tests/dictionaries/00_2default_calculated/dictionaries/rougail/00-base.yml']), '__internal_attribute': ParamValue("default"), '__internal_variable': ParamValue("var2"), '_.var1': ParamOption(option_1, notraisepropertyerror=True)})), properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) +option_2 = StrOption(name="var2", doc="a second variable", multi=True, default=Calculation(func['jinja_to_function'], Params((), kwargs={'__internal_jinja': ParamValue("default_var2"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(True), '__internal_files': ParamValue(['../rougail-tests/structures/00_2default_calculated/rougail/00-base.yml']), '__internal_attribute': ParamValue("default"), '__internal_variable': ParamValue("var2"), '_.var1': ParamOption(option_1, notraisepropertyerror=True)})), properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1, option_2]) 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 deleted file mode 100644 index d2d4efb58..000000000 --- a/tests/dictionaries/00_2default_calculated_multi/dictionaries/rougail/00-base.yml +++ /dev/null @@ -1,15 +0,0 @@ ---- -version: 1.1 -var1: # a first variable - - 'no' - - 'yes' - - maybe -var2: - description: a second variable - multi: true - default: - jinja: | - {% for val in _.var1 %} - {{ val }} - {% endfor %} - description: the value of _.var1 diff --git a/tests/dictionaries/00_2default_calculated_multi/tiramisu/base.py b/tests/dictionaries/00_2default_calculated_multi/tiramisu/base.py index bd74c28f0..5ac8173b3 100644 --- a/tests/dictionaries/00_2default_calculated_multi/tiramisu/base.py +++ b/tests/dictionaries/00_2default_calculated_multi/tiramisu/base.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') try: groups.namespace except: @@ -12,6 +12,6 @@ ALLOWED_LEADER_PROPERTIES.add("standard") ALLOWED_LEADER_PROPERTIES.add("advanced") dict_env['default_rougail.var2'] = "{% for val in _.var1 %}\n{{ val }}\n{% endfor %}\n" option_2 = StrOption(name="var1", doc="a first variable", multi=True, default=["no", "yes", "maybe"], default_multi="no", properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) -option_3 = StrOption(name="var2", doc="a second variable", multi=True, default=Calculation(func['jinja_to_function'], Params((), kwargs={'__internal_jinja': ParamValue("default_rougail.var2"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(True), '__internal_files': ParamValue(['tests/dictionaries/00_2default_calculated_multi/dictionaries/rougail/00-base.yml']), '__internal_attribute': ParamValue("default"), '__internal_variable': ParamValue("rougail.var2"), '_.var1': ParamOption(option_2, notraisepropertyerror=True)})), properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) +option_3 = StrOption(name="var2", doc="a second variable", multi=True, default=Calculation(func['jinja_to_function'], Params((), kwargs={'__internal_jinja': ParamValue("default_rougail.var2"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(True), '__internal_files': ParamValue(['../rougail-tests/structures/00_2default_calculated_multi/rougail/00-base.yml']), '__internal_attribute': ParamValue("default"), '__internal_variable': ParamValue("rougail.var2"), '_.var1': ParamOption(option_2, notraisepropertyerror=True)})), properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) optiondescription_1 = OptionDescription(name="rougail", doc="Rougail", group_type=groups.namespace, children=[option_2, option_3], properties=frozenset({"standard"})) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_1]) diff --git a/tests/dictionaries/00_2default_calculated_multi/tiramisu/multi.py b/tests/dictionaries/00_2default_calculated_multi/tiramisu/multi.py index b3803701e..b0eb07f56 100644 --- a/tests/dictionaries/00_2default_calculated_multi/tiramisu/multi.py +++ b/tests/dictionaries/00_2default_calculated_multi/tiramisu/multi.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') try: groups.namespace except: @@ -13,11 +13,11 @@ ALLOWED_LEADER_PROPERTIES.add("advanced") dict_env['default_1.rougail.var2'] = "{% for val in _.var1 %}\n{{ val }}\n{% endfor %}\n" dict_env['default_2.rougail.var2'] = "{% for val in _.var1 %}\n{{ val }}\n{% endfor %}\n" option_3 = StrOption(name="var1", doc="a first variable", multi=True, default=["no", "yes", "maybe"], default_multi="no", properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) -option_4 = StrOption(name="var2", doc="a second variable", multi=True, default=Calculation(func['jinja_to_function'], Params((), kwargs={'__internal_jinja': ParamValue("default_1.rougail.var2"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(True), '__internal_files': ParamValue(['tests/dictionaries/00_2default_calculated_multi/dictionaries/rougail/00-base.yml']), '__internal_attribute': ParamValue("default"), '__internal_variable': ParamValue("1.rougail.var2"), '_.var1': ParamOption(option_3, notraisepropertyerror=True)})), properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) +option_4 = StrOption(name="var2", doc="a second variable", multi=True, default=Calculation(func['jinja_to_function'], Params((), kwargs={'__internal_jinja': ParamValue("default_1.rougail.var2"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(True), '__internal_files': ParamValue(['../rougail-tests/structures/00_2default_calculated_multi/rougail/00-base.yml']), '__internal_attribute': ParamValue("default"), '__internal_variable': ParamValue("1.rougail.var2"), '_.var1': ParamOption(option_3, notraisepropertyerror=True)})), properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) optiondescription_2 = OptionDescription(name="rougail", doc="Rougail", group_type=groups.namespace, 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="var1", doc="a first variable", multi=True, default=["no", "yes", "maybe"], default_multi="no", properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) -option_8 = StrOption(name="var2", doc="a second variable", multi=True, default=Calculation(func['jinja_to_function'], Params((), kwargs={'__internal_jinja': ParamValue("default_2.rougail.var2"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(True), '__internal_files': ParamValue(['tests/dictionaries/00_2default_calculated_multi/dictionaries/rougail/00-base.yml']), '__internal_attribute': ParamValue("default"), '__internal_variable': ParamValue("2.rougail.var2"), '_.var1': ParamOption(option_7, notraisepropertyerror=True)})), properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) +option_8 = StrOption(name="var2", doc="a second variable", multi=True, default=Calculation(func['jinja_to_function'], Params((), kwargs={'__internal_jinja': ParamValue("default_2.rougail.var2"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(True), '__internal_files': ParamValue(['../rougail-tests/structures/00_2default_calculated_multi/rougail/00-base.yml']), '__internal_attribute': ParamValue("default"), '__internal_variable': ParamValue("2.rougail.var2"), '_.var1': ParamOption(option_7, notraisepropertyerror=True)})), properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) optiondescription_6 = OptionDescription(name="rougail", doc="Rougail", group_type=groups.namespace, 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_2default_calculated_multi/tiramisu/no_namespace.py b/tests/dictionaries/00_2default_calculated_multi/tiramisu/no_namespace.py index e8efdaf80..285bd886e 100644 --- a/tests/dictionaries/00_2default_calculated_multi/tiramisu/no_namespace.py +++ b/tests/dictionaries/00_2default_calculated_multi/tiramisu/no_namespace.py @@ -2,11 +2,11 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") ALLOWED_LEADER_PROPERTIES.add("standard") ALLOWED_LEADER_PROPERTIES.add("advanced") dict_env['default_var2'] = "{% for val in _.var1 %}\n{{ val }}\n{% endfor %}\n" option_1 = StrOption(name="var1", doc="a first variable", multi=True, default=["no", "yes", "maybe"], default_multi="no", properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) -option_2 = StrOption(name="var2", doc="a second variable", multi=True, default=Calculation(func['jinja_to_function'], Params((), kwargs={'__internal_jinja': ParamValue("default_var2"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(True), '__internal_files': ParamValue(['tests/dictionaries/00_2default_calculated_multi/dictionaries/rougail/00-base.yml']), '__internal_attribute': ParamValue("default"), '__internal_variable': ParamValue("var2"), '_.var1': ParamOption(option_1, notraisepropertyerror=True)})), properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) +option_2 = StrOption(name="var2", doc="a second variable", multi=True, default=Calculation(func['jinja_to_function'], Params((), kwargs={'__internal_jinja': ParamValue("default_var2"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(True), '__internal_files': ParamValue(['../rougail-tests/structures/00_2default_calculated_multi/rougail/00-base.yml']), '__internal_attribute': ParamValue("default"), '__internal_variable': ParamValue("var2"), '_.var1': ParamOption(option_1, notraisepropertyerror=True)})), properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1, option_2]) 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 deleted file mode 100644 index 3d86fd5fd..000000000 --- a/tests/dictionaries/00_2default_calculated_variable_transitive/dictionaries/rougail/00-base.yml +++ /dev/null @@ -1,15 +0,0 @@ ---- -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/tiramisu/base.py b/tests/dictionaries/00_2default_calculated_variable_transitive/tiramisu/base.py index 1084a993d..b45debe29 100644 --- a/tests/dictionaries/00_2default_calculated_variable_transitive/tiramisu/base.py +++ b/tests/dictionaries/00_2default_calculated_variable_transitive/tiramisu/base.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') try: groups.namespace except: diff --git a/tests/dictionaries/00_2default_calculated_variable_transitive/tiramisu/multi.py b/tests/dictionaries/00_2default_calculated_variable_transitive/tiramisu/multi.py index 7b6ade76c..b5426eab2 100644 --- a/tests/dictionaries/00_2default_calculated_variable_transitive/tiramisu/multi.py +++ b/tests/dictionaries/00_2default_calculated_variable_transitive/tiramisu/multi.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') try: groups.namespace except: 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 index c72f967f6..534712ebd 100644 --- a/tests/dictionaries/00_2default_calculated_variable_transitive/tiramisu/no_namespace.py +++ b/tests/dictionaries/00_2default_calculated_variable_transitive/tiramisu/no_namespace.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") ALLOWED_LEADER_PROPERTIES.add("standard") ALLOWED_LEADER_PROPERTIES.add("advanced") diff --git a/tests/dictionaries/00_4load_subfolder/dictionaries/rougail/99-base.yml b/tests/dictionaries/00_4load_subfolder/dictionaries/rougail/99-base.yml deleted file mode 100644 index 15f83a3b6..000000000 --- a/tests/dictionaries/00_4load_subfolder/dictionaries/rougail/99-base.yml +++ /dev/null @@ -1,4 +0,0 @@ ---- -version: '1.0' -var1: - description: a variable diff --git a/tests/dictionaries/00_4load_subfolder/dictionaries/rougail2/00-base.yml b/tests/dictionaries/00_4load_subfolder/dictionaries/rougail2/00-base.yml deleted file mode 100644 index 64c78946f..000000000 --- a/tests/dictionaries/00_4load_subfolder/dictionaries/rougail2/00-base.yml +++ /dev/null @@ -1,4 +0,0 @@ ---- -version: "1.0" -var2: - description: a variable diff --git a/tests/dictionaries/00_4load_subfolder/tiramisu/base.py b/tests/dictionaries/00_4load_subfolder/tiramisu/base.py index 535505d17..45fb531f5 100644 --- a/tests/dictionaries/00_4load_subfolder/tiramisu/base.py +++ b/tests/dictionaries/00_4load_subfolder/tiramisu/base.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') try: groups.namespace except: diff --git a/tests/dictionaries/00_4load_subfolder/tiramisu/multi.py b/tests/dictionaries/00_4load_subfolder/tiramisu/multi.py index abd1b639e..4ea35d407 100644 --- a/tests/dictionaries/00_4load_subfolder/tiramisu/multi.py +++ b/tests/dictionaries/00_4load_subfolder/tiramisu/multi.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') try: groups.namespace except: diff --git a/tests/dictionaries/00_4load_subfolder/tiramisu/no_namespace.py b/tests/dictionaries/00_4load_subfolder/tiramisu/no_namespace.py index c174783e8..e385a2acd 100644 --- a/tests/dictionaries/00_4load_subfolder/tiramisu/no_namespace.py +++ b/tests/dictionaries/00_4load_subfolder/tiramisu/no_namespace.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") ALLOWED_LEADER_PROPERTIES.add("standard") ALLOWED_LEADER_PROPERTIES.add("advanced") diff --git a/tests/dictionaries/00_5load_notype/dictionaries/rougail/00-base.yml b/tests/dictionaries/00_5load_notype/dictionaries/rougail/00-base.yml deleted file mode 100644 index 7a9ab1f11..000000000 --- a/tests/dictionaries/00_5load_notype/dictionaries/rougail/00-base.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -version: '1.0' -without_type: - description: a variable - default: non diff --git a/tests/dictionaries/00_5load_notype/tiramisu/base.py b/tests/dictionaries/00_5load_notype/tiramisu/base.py index 349f4d499..67665cb01 100644 --- a/tests/dictionaries/00_5load_notype/tiramisu/base.py +++ b/tests/dictionaries/00_5load_notype/tiramisu/base.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') try: groups.namespace except: diff --git a/tests/dictionaries/00_5load_notype/tiramisu/multi.py b/tests/dictionaries/00_5load_notype/tiramisu/multi.py index 764572398..ddb56e8c4 100644 --- a/tests/dictionaries/00_5load_notype/tiramisu/multi.py +++ b/tests/dictionaries/00_5load_notype/tiramisu/multi.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') try: groups.namespace except: diff --git a/tests/dictionaries/00_5load_notype/tiramisu/no_namespace.py b/tests/dictionaries/00_5load_notype/tiramisu/no_namespace.py index 89e566655..5cef0e45b 100644 --- a/tests/dictionaries/00_5load_notype/tiramisu/no_namespace.py +++ b/tests/dictionaries/00_5load_notype/tiramisu/no_namespace.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") ALLOWED_LEADER_PROPERTIES.add("standard") ALLOWED_LEADER_PROPERTIES.add("advanced") diff --git a/tests/dictionaries/00_6boolean/dictionaries/rougail/00-base.yml b/tests/dictionaries/00_6boolean/dictionaries/rougail/00-base.yml deleted file mode 100644 index e650e6877..000000000 --- a/tests/dictionaries/00_6boolean/dictionaries/rougail/00-base.yml +++ /dev/null @@ -1,18 +0,0 @@ ---- -version: '1.1' -var1: true # the first variable -var2: - description: the second variable - default: true -var3: - description: the third variable - type: boolean - default: true -var4: false # the forth variable -var5: - description: the fifth variable - default: false -var6: - description: the sixth variable - type: boolean - default: false diff --git a/tests/dictionaries/00_6boolean/tiramisu/base.py b/tests/dictionaries/00_6boolean/tiramisu/base.py index a97296fc7..501e43113 100644 --- a/tests/dictionaries/00_6boolean/tiramisu/base.py +++ b/tests/dictionaries/00_6boolean/tiramisu/base.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') try: groups.namespace except: diff --git a/tests/dictionaries/00_6boolean/tiramisu/multi.py b/tests/dictionaries/00_6boolean/tiramisu/multi.py index 8dd541586..e3f64f1ca 100644 --- a/tests/dictionaries/00_6boolean/tiramisu/multi.py +++ b/tests/dictionaries/00_6boolean/tiramisu/multi.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') try: groups.namespace except: diff --git a/tests/dictionaries/00_6boolean/tiramisu/no_namespace.py b/tests/dictionaries/00_6boolean/tiramisu/no_namespace.py index 409556674..d1030d961 100644 --- a/tests/dictionaries/00_6boolean/tiramisu/no_namespace.py +++ b/tests/dictionaries/00_6boolean/tiramisu/no_namespace.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") ALLOWED_LEADER_PROPERTIES.add("standard") ALLOWED_LEADER_PROPERTIES.add("advanced") diff --git a/tests/dictionaries/00_6boolean_no_mandatory/dictionaries/rougail/00-base.yml b/tests/dictionaries/00_6boolean_no_mandatory/dictionaries/rougail/00-base.yml deleted file mode 100644 index c68e04467..000000000 --- a/tests/dictionaries/00_6boolean_no_mandatory/dictionaries/rougail/00-base.yml +++ /dev/null @@ -1,6 +0,0 @@ ---- -version: '1.1' -variable: - description: a variable - type: boolean - mandatory: false diff --git a/tests/dictionaries/00_6boolean_no_mandatory/tiramisu/base.py b/tests/dictionaries/00_6boolean_no_mandatory/tiramisu/base.py index aaa152e37..9d68e34c1 100644 --- a/tests/dictionaries/00_6boolean_no_mandatory/tiramisu/base.py +++ b/tests/dictionaries/00_6boolean_no_mandatory/tiramisu/base.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') try: groups.namespace except: diff --git a/tests/dictionaries/00_6boolean_no_mandatory/tiramisu/multi.py b/tests/dictionaries/00_6boolean_no_mandatory/tiramisu/multi.py index d744af298..19ce4eb4b 100644 --- a/tests/dictionaries/00_6boolean_no_mandatory/tiramisu/multi.py +++ b/tests/dictionaries/00_6boolean_no_mandatory/tiramisu/multi.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') try: groups.namespace except: 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 b1df0ba0d..a871913b4 100644 --- a/tests/dictionaries/00_6boolean_no_mandatory/tiramisu/no_namespace.py +++ b/tests/dictionaries/00_6boolean_no_mandatory/tiramisu/no_namespace.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") ALLOWED_LEADER_PROPERTIES.add("standard") ALLOWED_LEADER_PROPERTIES.add("advanced") diff --git a/tests/dictionaries/00_6choice/dictionaries/rougail/00-base.yml b/tests/dictionaries/00_6choice/dictionaries/rougail/00-base.yml deleted file mode 100644 index 87b8acaab..000000000 --- a/tests/dictionaries/00_6choice/dictionaries/rougail/00-base.yml +++ /dev/null @@ -1,42 +0,0 @@ ---- -version: '1.1' -var1: - description: the first variable - choices: - - a - - b - - c -var2: - description: the second variable - choices: - - a - - b - - c -var3: - description: the third variable - choices: - - a - - b - - c - mandatory: false -var4: - description: the forth variable - choices: - - null - - b - - c - mandatory: false -var5: - description: the fifth variable - choices: - - a - - b - - c - default: a -var6: - description: the sixth variable - choices: - - 1 - - 2 - - 3 - default: 1 diff --git a/tests/dictionaries/00_6choice/tiramisu/base.py b/tests/dictionaries/00_6choice/tiramisu/base.py index 8810037d3..67c2d94f7 100644 --- a/tests/dictionaries/00_6choice/tiramisu/base.py +++ b/tests/dictionaries/00_6choice/tiramisu/base.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') try: groups.namespace except: diff --git a/tests/dictionaries/00_6choice/tiramisu/multi.py b/tests/dictionaries/00_6choice/tiramisu/multi.py index 0959665cd..0120be4dc 100644 --- a/tests/dictionaries/00_6choice/tiramisu/multi.py +++ b/tests/dictionaries/00_6choice/tiramisu/multi.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') try: groups.namespace except: diff --git a/tests/dictionaries/00_6choice/tiramisu/no_namespace.py b/tests/dictionaries/00_6choice/tiramisu/no_namespace.py index 614fae5e4..9b7f27370 100644 --- a/tests/dictionaries/00_6choice/tiramisu/no_namespace.py +++ b/tests/dictionaries/00_6choice/tiramisu/no_namespace.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") ALLOWED_LEADER_PROPERTIES.add("standard") ALLOWED_LEADER_PROPERTIES.add("advanced") diff --git a/tests/dictionaries/00_6choice_calculation/dictionaries/rougail/00-base.yml b/tests/dictionaries/00_6choice_calculation/dictionaries/rougail/00-base.yml deleted file mode 100644 index 1d03c4647..000000000 --- a/tests/dictionaries/00_6choice_calculation/dictionaries/rougail/00-base.yml +++ /dev/null @@ -1,12 +0,0 @@ ---- -version: 1.1 -var: - description: a variable - default: 9 - choices: - jinja: | - {% for n in trange(0, 10) %} - {{ n }} - {% endfor %} - return_type: 'number' - description: choices is 0 to 9 diff --git a/tests/dictionaries/00_6choice_calculation/tiramisu/base.py b/tests/dictionaries/00_6choice_calculation/tiramisu/base.py index 87b0b64b1..7fd239cd3 100644 --- a/tests/dictionaries/00_6choice_calculation/tiramisu/base.py +++ b/tests/dictionaries/00_6choice_calculation/tiramisu/base.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') try: groups.namespace except: @@ -11,6 +11,6 @@ ALLOWED_LEADER_PROPERTIES.add("basic") ALLOWED_LEADER_PROPERTIES.add("standard") ALLOWED_LEADER_PROPERTIES.add("advanced") dict_env['choices_rougail.var'] = "{% for n in trange(0, 10) %}\n{{ n }}\n{% endfor %}\n" -option_2 = ChoiceOption(name="var", doc="a variable", values=Calculation(func['jinja_to_function'], Params((), kwargs={'__internal_jinja': ParamValue("choices_rougail.var"), '__internal_type': ParamValue("number"), '__internal_multi': ParamValue(True), '__internal_files': ParamValue(['tests/dictionaries/00_6choice_calculation/dictionaries/rougail/00-base.yml']), '__internal_attribute': ParamValue("choices"), '__internal_variable': ParamValue("rougail.var")})), default=9, properties=frozenset({"mandatory", "standard"}), informations={'type': 'choice'}) +option_2 = ChoiceOption(name="var", doc="a variable", values=Calculation(func['jinja_to_function'], Params((), kwargs={'__internal_jinja': ParamValue("choices_rougail.var"), '__internal_type': ParamValue("number"), '__internal_multi': ParamValue(True), '__internal_files': ParamValue(['../rougail-tests/structures/00_6choice_calculation/rougail/00-base.yml']), '__internal_attribute': ParamValue("choices"), '__internal_variable': ParamValue("rougail.var")})), default=9, properties=frozenset({"mandatory", "standard"}), informations={'type': 'choice'}) optiondescription_1 = OptionDescription(name="rougail", doc="Rougail", group_type=groups.namespace, children=[option_2], properties=frozenset({"standard"})) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_1]) diff --git a/tests/dictionaries/00_6choice_calculation/tiramisu/multi.py b/tests/dictionaries/00_6choice_calculation/tiramisu/multi.py index 75f05515b..2a7288664 100644 --- a/tests/dictionaries/00_6choice_calculation/tiramisu/multi.py +++ b/tests/dictionaries/00_6choice_calculation/tiramisu/multi.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') try: groups.namespace except: @@ -12,10 +12,10 @@ ALLOWED_LEADER_PROPERTIES.add("standard") ALLOWED_LEADER_PROPERTIES.add("advanced") dict_env['choices_1.rougail.var'] = "{% for n in trange(0, 10) %}\n{{ n }}\n{% endfor %}\n" dict_env['choices_2.rougail.var'] = "{% for n in trange(0, 10) %}\n{{ n }}\n{% endfor %}\n" -option_3 = ChoiceOption(name="var", doc="a variable", values=Calculation(func['jinja_to_function'], Params((), kwargs={'__internal_jinja': ParamValue("choices_1.rougail.var"), '__internal_type': ParamValue("number"), '__internal_multi': ParamValue(True), '__internal_files': ParamValue(['tests/dictionaries/00_6choice_calculation/dictionaries/rougail/00-base.yml']), '__internal_attribute': ParamValue("choices"), '__internal_variable': ParamValue("1.rougail.var")})), default=9, properties=frozenset({"mandatory", "standard"}), informations={'type': 'choice'}) +option_3 = ChoiceOption(name="var", doc="a variable", values=Calculation(func['jinja_to_function'], Params((), kwargs={'__internal_jinja': ParamValue("choices_1.rougail.var"), '__internal_type': ParamValue("number"), '__internal_multi': ParamValue(True), '__internal_files': ParamValue(['../rougail-tests/structures/00_6choice_calculation/rougail/00-base.yml']), '__internal_attribute': ParamValue("choices"), '__internal_variable': ParamValue("1.rougail.var")})), default=9, properties=frozenset({"mandatory", "standard"}), informations={'type': 'choice'}) optiondescription_2 = OptionDescription(name="rougail", doc="Rougail", group_type=groups.namespace, children=[option_3], properties=frozenset({"standard"})) optiondescription_1 = OptionDescription(name="1", doc="1", children=[optiondescription_2], properties=frozenset({"standard"})) -option_6 = ChoiceOption(name="var", doc="a variable", values=Calculation(func['jinja_to_function'], Params((), kwargs={'__internal_jinja': ParamValue("choices_2.rougail.var"), '__internal_type': ParamValue("number"), '__internal_multi': ParamValue(True), '__internal_files': ParamValue(['tests/dictionaries/00_6choice_calculation/dictionaries/rougail/00-base.yml']), '__internal_attribute': ParamValue("choices"), '__internal_variable': ParamValue("2.rougail.var")})), default=9, properties=frozenset({"mandatory", "standard"}), informations={'type': 'choice'}) +option_6 = ChoiceOption(name="var", doc="a variable", values=Calculation(func['jinja_to_function'], Params((), kwargs={'__internal_jinja': ParamValue("choices_2.rougail.var"), '__internal_type': ParamValue("number"), '__internal_multi': ParamValue(True), '__internal_files': ParamValue(['../rougail-tests/structures/00_6choice_calculation/rougail/00-base.yml']), '__internal_attribute': ParamValue("choices"), '__internal_variable': ParamValue("2.rougail.var")})), default=9, properties=frozenset({"mandatory", "standard"}), informations={'type': 'choice'}) optiondescription_5 = OptionDescription(name="rougail", doc="Rougail", group_type=groups.namespace, 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_6choice_calculation/tiramisu/no_namespace.py b/tests/dictionaries/00_6choice_calculation/tiramisu/no_namespace.py index ce515bef1..b043ceed0 100644 --- a/tests/dictionaries/00_6choice_calculation/tiramisu/no_namespace.py +++ b/tests/dictionaries/00_6choice_calculation/tiramisu/no_namespace.py @@ -2,10 +2,10 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") ALLOWED_LEADER_PROPERTIES.add("standard") ALLOWED_LEADER_PROPERTIES.add("advanced") dict_env['choices_var'] = "{% for n in trange(0, 10) %}\n{{ n }}\n{% endfor %}\n" -option_1 = ChoiceOption(name="var", doc="a variable", values=Calculation(func['jinja_to_function'], Params((), kwargs={'__internal_jinja': ParamValue("choices_var"), '__internal_type': ParamValue("number"), '__internal_multi': ParamValue(True), '__internal_files': ParamValue(['tests/dictionaries/00_6choice_calculation/dictionaries/rougail/00-base.yml']), '__internal_attribute': ParamValue("choices"), '__internal_variable': ParamValue("var")})), default=9, properties=frozenset({"mandatory", "standard"}), informations={'type': 'choice'}) +option_1 = ChoiceOption(name="var", doc="a variable", values=Calculation(func['jinja_to_function'], Params((), kwargs={'__internal_jinja': ParamValue("choices_var"), '__internal_type': ParamValue("number"), '__internal_multi': ParamValue(True), '__internal_files': ParamValue(['../rougail-tests/structures/00_6choice_calculation/rougail/00-base.yml']), '__internal_attribute': ParamValue("choices"), '__internal_variable': ParamValue("var")})), default=9, properties=frozenset({"mandatory", "standard"}), informations={'type': 'choice'}) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1]) diff --git a/tests/dictionaries/00_6choice_variable/dictionaries/rougail/00-base.yml b/tests/dictionaries/00_6choice_variable/dictionaries/rougail/00-base.yml deleted file mode 100644 index 466b18105..000000000 --- a/tests/dictionaries/00_6choice_variable/dictionaries/rougail/00-base.yml +++ /dev/null @@ -1,11 +0,0 @@ ---- -version: '1.1' -var1: # a second variable - - a - - b - - c -var2: - description: a first variable - default: a - choices: - variable: _.var1 diff --git a/tests/dictionaries/00_6choice_variable/tiramisu/base.py b/tests/dictionaries/00_6choice_variable/tiramisu/base.py index b696e2acf..98ceae675 100644 --- a/tests/dictionaries/00_6choice_variable/tiramisu/base.py +++ b/tests/dictionaries/00_6choice_variable/tiramisu/base.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') try: groups.namespace except: diff --git a/tests/dictionaries/00_6choice_variable/tiramisu/multi.py b/tests/dictionaries/00_6choice_variable/tiramisu/multi.py index 2f0e079de..04b8e2493 100644 --- a/tests/dictionaries/00_6choice_variable/tiramisu/multi.py +++ b/tests/dictionaries/00_6choice_variable/tiramisu/multi.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') try: groups.namespace except: diff --git a/tests/dictionaries/00_6choice_variable/tiramisu/no_namespace.py b/tests/dictionaries/00_6choice_variable/tiramisu/no_namespace.py index 19af4f707..a295d4ce4 100644 --- a/tests/dictionaries/00_6choice_variable/tiramisu/no_namespace.py +++ b/tests/dictionaries/00_6choice_variable/tiramisu/no_namespace.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") ALLOWED_LEADER_PROPERTIES.add("standard") ALLOWED_LEADER_PROPERTIES.add("advanced") diff --git a/tests/dictionaries/00_6custom/dictionaries/rougail/00-base.yml b/tests/dictionaries/00_6custom/dictionaries/rougail/00-base.yml deleted file mode 100644 index c10ea6b53..000000000 --- a/tests/dictionaries/00_6custom/dictionaries/rougail/00-base.yml +++ /dev/null @@ -1,9 +0,0 @@ ---- -version: '1.1' -custom1: - description: the first variable - type: custom -custom2: - description: the seconf variable - type: custom - default: value diff --git a/tests/dictionaries/00_6custom/tiramisu/base.py b/tests/dictionaries/00_6custom/tiramisu/base.py index 659f107d5..31b3bc7f9 100644 --- a/tests/dictionaries/00_6custom/tiramisu/base.py +++ b/tests/dictionaries/00_6custom/tiramisu/base.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') try: groups.namespace except: diff --git a/tests/dictionaries/00_6custom/tiramisu/multi.py b/tests/dictionaries/00_6custom/tiramisu/multi.py index 374cfe3aa..1eb35731b 100644 --- a/tests/dictionaries/00_6custom/tiramisu/multi.py +++ b/tests/dictionaries/00_6custom/tiramisu/multi.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') try: groups.namespace except: diff --git a/tests/dictionaries/00_6custom/tiramisu/no_namespace.py b/tests/dictionaries/00_6custom/tiramisu/no_namespace.py index 8196ed1b3..d60ca48b7 100644 --- a/tests/dictionaries/00_6custom/tiramisu/no_namespace.py +++ b/tests/dictionaries/00_6custom/tiramisu/no_namespace.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") ALLOWED_LEADER_PROPERTIES.add("standard") ALLOWED_LEADER_PROPERTIES.add("advanced") diff --git a/tests/dictionaries/00_6domainname/dictionaries/rougail/00-base.yml b/tests/dictionaries/00_6domainname/dictionaries/rougail/00-base.yml deleted file mode 100644 index 5e8f4a04c..000000000 --- a/tests/dictionaries/00_6domainname/dictionaries/rougail/00-base.yml +++ /dev/null @@ -1,6 +0,0 @@ ---- -version: '1.1' -variable: - description: a domain name variable - type: domainname - default: my.domain.name diff --git a/tests/dictionaries/00_6domainname/tiramisu/base.py b/tests/dictionaries/00_6domainname/tiramisu/base.py index 3b181a88f..1e48bd75e 100644 --- a/tests/dictionaries/00_6domainname/tiramisu/base.py +++ b/tests/dictionaries/00_6domainname/tiramisu/base.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') try: groups.namespace except: diff --git a/tests/dictionaries/00_6domainname/tiramisu/multi.py b/tests/dictionaries/00_6domainname/tiramisu/multi.py index 706dee547..371a7c225 100644 --- a/tests/dictionaries/00_6domainname/tiramisu/multi.py +++ b/tests/dictionaries/00_6domainname/tiramisu/multi.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') try: groups.namespace except: diff --git a/tests/dictionaries/00_6domainname/tiramisu/no_namespace.py b/tests/dictionaries/00_6domainname/tiramisu/no_namespace.py index c2cf1043c..d8c4fe070 100644 --- a/tests/dictionaries/00_6domainname/tiramisu/no_namespace.py +++ b/tests/dictionaries/00_6domainname/tiramisu/no_namespace.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") ALLOWED_LEADER_PROPERTIES.add("standard") ALLOWED_LEADER_PROPERTIES.add("advanced") diff --git a/tests/dictionaries/00_6domainname_params/dictionaries/rougail/00-base.yml b/tests/dictionaries/00_6domainname_params/dictionaries/rougail/00-base.yml deleted file mode 100644 index 90cbf9378..000000000 --- a/tests/dictionaries/00_6domainname_params/dictionaries/rougail/00-base.yml +++ /dev/null @@ -1,8 +0,0 @@ ---- -version: '1.1' -variable: - description: a domain name variable - type: domainname - default: my.domain.name - params: - allow_ip: true diff --git a/tests/dictionaries/00_6domainname_params/tiramisu/base.py b/tests/dictionaries/00_6domainname_params/tiramisu/base.py index ddf2c697a..0f1313964 100644 --- a/tests/dictionaries/00_6domainname_params/tiramisu/base.py +++ b/tests/dictionaries/00_6domainname_params/tiramisu/base.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') try: groups.namespace except: diff --git a/tests/dictionaries/00_6domainname_params/tiramisu/multi.py b/tests/dictionaries/00_6domainname_params/tiramisu/multi.py index 1d33c6d33..60ae192cb 100644 --- a/tests/dictionaries/00_6domainname_params/tiramisu/multi.py +++ b/tests/dictionaries/00_6domainname_params/tiramisu/multi.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') try: groups.namespace except: diff --git a/tests/dictionaries/00_6domainname_params/tiramisu/no_namespace.py b/tests/dictionaries/00_6domainname_params/tiramisu/no_namespace.py index 77cfae4d1..162870dc8 100644 --- a/tests/dictionaries/00_6domainname_params/tiramisu/no_namespace.py +++ b/tests/dictionaries/00_6domainname_params/tiramisu/no_namespace.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") ALLOWED_LEADER_PROPERTIES.add("standard") ALLOWED_LEADER_PROPERTIES.add("advanced") diff --git a/tests/dictionaries/00_6float/dictionaries/rougail/00-base.yml b/tests/dictionaries/00_6float/dictionaries/rougail/00-base.yml deleted file mode 100644 index 5373264e6..000000000 --- a/tests/dictionaries/00_6float/dictionaries/rougail/00-base.yml +++ /dev/null @@ -1,18 +0,0 @@ ---- -version: '1.1' -var1: 0.0 # the first variable -var2: - description: the second variable - default: 0.0 -var3: - description: the third variable - type: float - default: 0.0 -var4: 10.1 # the forth variable -var5: - description: the fifth variable - default: 10.1 -var6: - description: the sixth variable - type: float - default: 10.1 diff --git a/tests/dictionaries/00_6float/tiramisu/base.py b/tests/dictionaries/00_6float/tiramisu/base.py index 7b6330c97..6515b49e0 100644 --- a/tests/dictionaries/00_6float/tiramisu/base.py +++ b/tests/dictionaries/00_6float/tiramisu/base.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') try: groups.namespace except: diff --git a/tests/dictionaries/00_6float/tiramisu/multi.py b/tests/dictionaries/00_6float/tiramisu/multi.py index 1bb450a1c..903aeaaf4 100644 --- a/tests/dictionaries/00_6float/tiramisu/multi.py +++ b/tests/dictionaries/00_6float/tiramisu/multi.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') try: groups.namespace except: diff --git a/tests/dictionaries/00_6float/tiramisu/no_namespace.py b/tests/dictionaries/00_6float/tiramisu/no_namespace.py index 6fd927bd7..9ff1f63c4 100644 --- a/tests/dictionaries/00_6float/tiramisu/no_namespace.py +++ b/tests/dictionaries/00_6float/tiramisu/no_namespace.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") ALLOWED_LEADER_PROPERTIES.add("standard") ALLOWED_LEADER_PROPERTIES.add("advanced") diff --git a/tests/dictionaries/00_6number/dictionaries/rougail/00-base.yml b/tests/dictionaries/00_6number/dictionaries/rougail/00-base.yml deleted file mode 100644 index 86273c72b..000000000 --- a/tests/dictionaries/00_6number/dictionaries/rougail/00-base.yml +++ /dev/null @@ -1,18 +0,0 @@ ---- -version: '1.1' -var1: 0 # the first variable -var2: - description: the second variable - default: 0 -var3: - description: the third variable - type: number - default: 0 -var4: 10 # this forth variable -var5: - description: the fifth variable - default: 10 -var6: - description: the sixth variable - type: number - default: 10 diff --git a/tests/dictionaries/00_6number/tiramisu/base.py b/tests/dictionaries/00_6number/tiramisu/base.py index 4dd10150d..a964fe8df 100644 --- a/tests/dictionaries/00_6number/tiramisu/base.py +++ b/tests/dictionaries/00_6number/tiramisu/base.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') try: groups.namespace except: diff --git a/tests/dictionaries/00_6number/tiramisu/multi.py b/tests/dictionaries/00_6number/tiramisu/multi.py index 40fcddb37..4875cf792 100644 --- a/tests/dictionaries/00_6number/tiramisu/multi.py +++ b/tests/dictionaries/00_6number/tiramisu/multi.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') try: groups.namespace except: diff --git a/tests/dictionaries/00_6number/tiramisu/no_namespace.py b/tests/dictionaries/00_6number/tiramisu/no_namespace.py index bc22f4c99..e91655fee 100644 --- a/tests/dictionaries/00_6number/tiramisu/no_namespace.py +++ b/tests/dictionaries/00_6number/tiramisu/no_namespace.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") ALLOWED_LEADER_PROPERTIES.add("standard") ALLOWED_LEADER_PROPERTIES.add("advanced") diff --git a/tests/dictionaries/00_6port/dictionaries/rougail/00-base.yml b/tests/dictionaries/00_6port/dictionaries/rougail/00-base.yml deleted file mode 100644 index da85b9809..000000000 --- a/tests/dictionaries/00_6port/dictionaries/rougail/00-base.yml +++ /dev/null @@ -1,13 +0,0 @@ ---- -version: '1.1' -variable1: - description: a port variable - type: port -variable2: - description: a port variable with default value - type: port - default: '8080' -variable3: - description: a port variable with integer default value - type: port - default: 8080 diff --git a/tests/dictionaries/00_6port/tiramisu/base.py b/tests/dictionaries/00_6port/tiramisu/base.py index 6bb24744b..672457e47 100644 --- a/tests/dictionaries/00_6port/tiramisu/base.py +++ b/tests/dictionaries/00_6port/tiramisu/base.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') try: groups.namespace except: diff --git a/tests/dictionaries/00_6port/tiramisu/multi.py b/tests/dictionaries/00_6port/tiramisu/multi.py index 7768b0dd2..e6c225420 100644 --- a/tests/dictionaries/00_6port/tiramisu/multi.py +++ b/tests/dictionaries/00_6port/tiramisu/multi.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') try: groups.namespace except: diff --git a/tests/dictionaries/00_6port/tiramisu/no_namespace.py b/tests/dictionaries/00_6port/tiramisu/no_namespace.py index e34b6b243..54bfe1563 100644 --- a/tests/dictionaries/00_6port/tiramisu/no_namespace.py +++ b/tests/dictionaries/00_6port/tiramisu/no_namespace.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") ALLOWED_LEADER_PROPERTIES.add("standard") ALLOWED_LEADER_PROPERTIES.add("advanced") diff --git a/tests/dictionaries/00_6regexp/dictionaries/rougail/00-base.yml b/tests/dictionaries/00_6regexp/dictionaries/rougail/00-base.yml deleted file mode 100644 index d03d259c7..000000000 --- a/tests/dictionaries/00_6regexp/dictionaries/rougail/00-base.yml +++ /dev/null @@ -1,9 +0,0 @@ ---- -version: '1.1' -var: - description: a first variable - regexp: "^#(?:[0-9a-f]{3}){1,2}$" - default: "#a1a1a1" - test: - - "#b1b1b1" - - "#b2b2b2" diff --git a/tests/dictionaries/00_6regexp/tiramisu/base.py b/tests/dictionaries/00_6regexp/tiramisu/base.py index 006e7f821..7851aa096 100644 --- a/tests/dictionaries/00_6regexp/tiramisu/base.py +++ b/tests/dictionaries/00_6regexp/tiramisu/base.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') try: groups.namespace except: diff --git a/tests/dictionaries/00_6regexp/tiramisu/multi.py b/tests/dictionaries/00_6regexp/tiramisu/multi.py index b980db191..7926b7819 100644 --- a/tests/dictionaries/00_6regexp/tiramisu/multi.py +++ b/tests/dictionaries/00_6regexp/tiramisu/multi.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') try: groups.namespace except: diff --git a/tests/dictionaries/00_6regexp/tiramisu/no_namespace.py b/tests/dictionaries/00_6regexp/tiramisu/no_namespace.py index 1d7ea5f95..b3093828f 100644 --- a/tests/dictionaries/00_6regexp/tiramisu/no_namespace.py +++ b/tests/dictionaries/00_6regexp/tiramisu/no_namespace.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") ALLOWED_LEADER_PROPERTIES.add("standard") ALLOWED_LEADER_PROPERTIES.add("advanced") diff --git a/tests/dictionaries/00_6string/dictionaries/rougail/00-base.yml b/tests/dictionaries/00_6string/dictionaries/rougail/00-base.yml deleted file mode 100644 index 2d4852424..000000000 --- a/tests/dictionaries/00_6string/dictionaries/rougail/00-base.yml +++ /dev/null @@ -1,17 +0,0 @@ ---- -version: '1.1' -var1: # the first variable -var2: - description: the second variable - default: -var3: - description: the third variable - type: string -var4: value # the forth variable -var5: - description: the fifth variable - default: value -var6: - description: the sixth variable - type: string - default: value diff --git a/tests/dictionaries/00_6string/tiramisu/base.py b/tests/dictionaries/00_6string/tiramisu/base.py index 49c21be99..ba060ac82 100644 --- a/tests/dictionaries/00_6string/tiramisu/base.py +++ b/tests/dictionaries/00_6string/tiramisu/base.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') try: groups.namespace except: diff --git a/tests/dictionaries/00_6string/tiramisu/multi.py b/tests/dictionaries/00_6string/tiramisu/multi.py index e331396c6..881e59c43 100644 --- a/tests/dictionaries/00_6string/tiramisu/multi.py +++ b/tests/dictionaries/00_6string/tiramisu/multi.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') try: groups.namespace except: diff --git a/tests/dictionaries/00_6string/tiramisu/no_namespace.py b/tests/dictionaries/00_6string/tiramisu/no_namespace.py index 46baaf11d..7abe8689b 100644 --- a/tests/dictionaries/00_6string/tiramisu/no_namespace.py +++ b/tests/dictionaries/00_6string/tiramisu/no_namespace.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") ALLOWED_LEADER_PROPERTIES.add("standard") ALLOWED_LEADER_PROPERTIES.add("advanced") diff --git a/tests/dictionaries/00_7choice_quote/dictionaries/rougail/00-base.yml b/tests/dictionaries/00_7choice_quote/dictionaries/rougail/00-base.yml deleted file mode 100644 index c05ce4ebf..000000000 --- a/tests/dictionaries/00_7choice_quote/dictionaries/rougail/00-base.yml +++ /dev/null @@ -1,10 +0,0 @@ ---- -version: '1.0' -var: - type: choice - description: A choice - default: quote' - choices: - - quote' - - quote" - - quote"' diff --git a/tests/dictionaries/00_7choice_quote/tiramisu/base.py b/tests/dictionaries/00_7choice_quote/tiramisu/base.py index c3cb7d78e..05c79c251 100644 --- a/tests/dictionaries/00_7choice_quote/tiramisu/base.py +++ b/tests/dictionaries/00_7choice_quote/tiramisu/base.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') try: groups.namespace except: diff --git a/tests/dictionaries/00_7choice_quote/tiramisu/multi.py b/tests/dictionaries/00_7choice_quote/tiramisu/multi.py index c9d3d4197..1f1f05c1b 100644 --- a/tests/dictionaries/00_7choice_quote/tiramisu/multi.py +++ b/tests/dictionaries/00_7choice_quote/tiramisu/multi.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') try: groups.namespace except: diff --git a/tests/dictionaries/00_7choice_quote/tiramisu/no_namespace.py b/tests/dictionaries/00_7choice_quote/tiramisu/no_namespace.py index aa750bc13..0c9371363 100644 --- a/tests/dictionaries/00_7choice_quote/tiramisu/no_namespace.py +++ b/tests/dictionaries/00_7choice_quote/tiramisu/no_namespace.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") ALLOWED_LEADER_PROPERTIES.add("standard") ALLOWED_LEADER_PROPERTIES.add("advanced") diff --git a/tests/dictionaries/00_7help_quote/dictionaries/rougail/00-base.yml b/tests/dictionaries/00_7help_quote/dictionaries/rougail/00-base.yml deleted file mode 100644 index b946de55d..000000000 --- a/tests/dictionaries/00_7help_quote/dictionaries/rougail/00-base.yml +++ /dev/null @@ -1,8 +0,0 @@ ---- -version: '1.0' -var1: - description: the first variable - help: message with ' -var2: - description: the second variable - help: message with " diff --git a/tests/dictionaries/00_7help_quote/tiramisu/base.py b/tests/dictionaries/00_7help_quote/tiramisu/base.py index d038bbfa4..855c53c95 100644 --- a/tests/dictionaries/00_7help_quote/tiramisu/base.py +++ b/tests/dictionaries/00_7help_quote/tiramisu/base.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') try: groups.namespace except: diff --git a/tests/dictionaries/00_7help_quote/tiramisu/multi.py b/tests/dictionaries/00_7help_quote/tiramisu/multi.py index 34a49bf09..08ffc8fc4 100644 --- a/tests/dictionaries/00_7help_quote/tiramisu/multi.py +++ b/tests/dictionaries/00_7help_quote/tiramisu/multi.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') try: groups.namespace except: diff --git a/tests/dictionaries/00_7help_quote/tiramisu/no_namespace.py b/tests/dictionaries/00_7help_quote/tiramisu/no_namespace.py index ac7d9bec2..eecc2afda 100644 --- a/tests/dictionaries/00_7help_quote/tiramisu/no_namespace.py +++ b/tests/dictionaries/00_7help_quote/tiramisu/no_namespace.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") ALLOWED_LEADER_PROPERTIES.add("standard") ALLOWED_LEADER_PROPERTIES.add("advanced") diff --git a/tests/dictionaries/00_7value_doublequote/dictionaries/rougail/00-base.yml b/tests/dictionaries/00_7value_doublequote/dictionaries/rougail/00-base.yml deleted file mode 100644 index aa2f61b10..000000000 --- a/tests/dictionaries/00_7value_doublequote/dictionaries/rougail/00-base.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -version: '1.1' -variable: - description: a variable - default: quote" diff --git a/tests/dictionaries/00_7value_doublequote/tiramisu/base.py b/tests/dictionaries/00_7value_doublequote/tiramisu/base.py index 52c7f745b..a8f7a6132 100644 --- a/tests/dictionaries/00_7value_doublequote/tiramisu/base.py +++ b/tests/dictionaries/00_7value_doublequote/tiramisu/base.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') try: groups.namespace except: diff --git a/tests/dictionaries/00_7value_doublequote/tiramisu/multi.py b/tests/dictionaries/00_7value_doublequote/tiramisu/multi.py index e99187961..7880b1ee6 100644 --- a/tests/dictionaries/00_7value_doublequote/tiramisu/multi.py +++ b/tests/dictionaries/00_7value_doublequote/tiramisu/multi.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') try: groups.namespace except: diff --git a/tests/dictionaries/00_7value_doublequote/tiramisu/no_namespace.py b/tests/dictionaries/00_7value_doublequote/tiramisu/no_namespace.py index 269b70226..db727a5ad 100644 --- a/tests/dictionaries/00_7value_doublequote/tiramisu/no_namespace.py +++ b/tests/dictionaries/00_7value_doublequote/tiramisu/no_namespace.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") ALLOWED_LEADER_PROPERTIES.add("standard") ALLOWED_LEADER_PROPERTIES.add("advanced") diff --git a/tests/dictionaries/00_7value_doublequote2/dictionaries/rougail/00-base.yml b/tests/dictionaries/00_7value_doublequote2/dictionaries/rougail/00-base.yml deleted file mode 100644 index 100cf5cc3..000000000 --- a/tests/dictionaries/00_7value_doublequote2/dictionaries/rougail/00-base.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -version: '1.1' -variable: - description: a variable - default: quote'" diff --git a/tests/dictionaries/00_7value_doublequote2/tiramisu/base.py b/tests/dictionaries/00_7value_doublequote2/tiramisu/base.py index 05b2e8b7d..4a2a6121f 100644 --- a/tests/dictionaries/00_7value_doublequote2/tiramisu/base.py +++ b/tests/dictionaries/00_7value_doublequote2/tiramisu/base.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') try: groups.namespace except: diff --git a/tests/dictionaries/00_7value_doublequote2/tiramisu/multi.py b/tests/dictionaries/00_7value_doublequote2/tiramisu/multi.py index b6c3c6001..5e8ee7a19 100644 --- a/tests/dictionaries/00_7value_doublequote2/tiramisu/multi.py +++ b/tests/dictionaries/00_7value_doublequote2/tiramisu/multi.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') try: groups.namespace except: diff --git a/tests/dictionaries/00_7value_doublequote2/tiramisu/no_namespace.py b/tests/dictionaries/00_7value_doublequote2/tiramisu/no_namespace.py index 495ba597c..3bde7a8b3 100644 --- a/tests/dictionaries/00_7value_doublequote2/tiramisu/no_namespace.py +++ b/tests/dictionaries/00_7value_doublequote2/tiramisu/no_namespace.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") ALLOWED_LEADER_PROPERTIES.add("standard") ALLOWED_LEADER_PROPERTIES.add("advanced") diff --git a/tests/dictionaries/00_7value_doublequote3/dictionaries/rougail/00-base.yml b/tests/dictionaries/00_7value_doublequote3/dictionaries/rougail/00-base.yml deleted file mode 100644 index b41ed475e..000000000 --- a/tests/dictionaries/00_7value_doublequote3/dictionaries/rougail/00-base.yml +++ /dev/null @@ -1,6 +0,0 @@ ---- -version: '1.1' - -variable: - description: a variable - default: quote\"\' diff --git a/tests/dictionaries/00_7value_doublequote3/tiramisu/base.py b/tests/dictionaries/00_7value_doublequote3/tiramisu/base.py index 590ded46d..dcf044bed 100644 --- a/tests/dictionaries/00_7value_doublequote3/tiramisu/base.py +++ b/tests/dictionaries/00_7value_doublequote3/tiramisu/base.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') try: groups.namespace except: diff --git a/tests/dictionaries/00_7value_doublequote3/tiramisu/multi.py b/tests/dictionaries/00_7value_doublequote3/tiramisu/multi.py index ec0747eca..5096db778 100644 --- a/tests/dictionaries/00_7value_doublequote3/tiramisu/multi.py +++ b/tests/dictionaries/00_7value_doublequote3/tiramisu/multi.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') try: groups.namespace except: diff --git a/tests/dictionaries/00_7value_doublequote3/tiramisu/no_namespace.py b/tests/dictionaries/00_7value_doublequote3/tiramisu/no_namespace.py index 982652ea4..1234ed610 100644 --- a/tests/dictionaries/00_7value_doublequote3/tiramisu/no_namespace.py +++ b/tests/dictionaries/00_7value_doublequote3/tiramisu/no_namespace.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") ALLOWED_LEADER_PROPERTIES.add("standard") ALLOWED_LEADER_PROPERTIES.add("advanced") diff --git a/tests/dictionaries/00_7value_quote/dictionaries/rougail/00-base.yml b/tests/dictionaries/00_7value_quote/dictionaries/rougail/00-base.yml deleted file mode 100644 index 40789a6fe..000000000 --- a/tests/dictionaries/00_7value_quote/dictionaries/rougail/00-base.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -version: '1.0' -variable: - description: a variable - default: quote' diff --git a/tests/dictionaries/00_7value_quote/tiramisu/base.py b/tests/dictionaries/00_7value_quote/tiramisu/base.py index 9d55b298f..313bfb2c0 100644 --- a/tests/dictionaries/00_7value_quote/tiramisu/base.py +++ b/tests/dictionaries/00_7value_quote/tiramisu/base.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') try: groups.namespace except: diff --git a/tests/dictionaries/00_7value_quote/tiramisu/multi.py b/tests/dictionaries/00_7value_quote/tiramisu/multi.py index 72d67127c..a70dc933b 100644 --- a/tests/dictionaries/00_7value_quote/tiramisu/multi.py +++ b/tests/dictionaries/00_7value_quote/tiramisu/multi.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') try: groups.namespace except: diff --git a/tests/dictionaries/00_7value_quote/tiramisu/no_namespace.py b/tests/dictionaries/00_7value_quote/tiramisu/no_namespace.py index 1480a0efb..88e8a5c94 100644 --- a/tests/dictionaries/00_7value_quote/tiramisu/no_namespace.py +++ b/tests/dictionaries/00_7value_quote/tiramisu/no_namespace.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") ALLOWED_LEADER_PROPERTIES.add("standard") ALLOWED_LEADER_PROPERTIES.add("advanced") diff --git a/tests/dictionaries/00_8calculation_information/dictionaries/rougail/00-base.yml b/tests/dictionaries/00_8calculation_information/dictionaries/rougail/00-base.yml deleted file mode 100644 index 58a188b35..000000000 --- a/tests/dictionaries/00_8calculation_information/dictionaries/rougail/00-base.yml +++ /dev/null @@ -1,12 +0,0 @@ ---- -version: '1.1' -variable: - description: a variable - default: - jinja: | - {{test_information }} - params: - test_information: - type: information - information: test_information - description: get information test_information diff --git a/tests/dictionaries/00_8calculation_information/tiramisu/base.py b/tests/dictionaries/00_8calculation_information/tiramisu/base.py index 99b22177b..23a95b3eb 100644 --- a/tests/dictionaries/00_8calculation_information/tiramisu/base.py +++ b/tests/dictionaries/00_8calculation_information/tiramisu/base.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') try: groups.namespace except: @@ -11,6 +11,6 @@ ALLOWED_LEADER_PROPERTIES.add("basic") ALLOWED_LEADER_PROPERTIES.add("standard") ALLOWED_LEADER_PROPERTIES.add("advanced") dict_env['default_rougail.variable'] = "{{test_information }}\n" -option_2 = StrOption(name="variable", doc="a variable", default=Calculation(func['jinja_to_function'], Params((), kwargs={'__internal_jinja': ParamValue("default_rougail.variable"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['tests/dictionaries/00_8calculation_information/dictionaries/rougail/00-base.yml']), '__internal_attribute': ParamValue("default"), '__internal_variable': ParamValue("rougail.variable"), 'test_information': ParamInformation("test_information", None)})), properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) +option_2 = StrOption(name="variable", doc="a variable", default=Calculation(func['jinja_to_function'], Params((), kwargs={'__internal_jinja': ParamValue("default_rougail.variable"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['../rougail-tests/structures/00_8calculation_information/rougail/00-base.yml']), '__internal_attribute': ParamValue("default"), '__internal_variable': ParamValue("rougail.variable"), 'test_information': ParamInformation("test_information", None)})), properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) optiondescription_1 = OptionDescription(name="rougail", doc="Rougail", group_type=groups.namespace, children=[option_2], properties=frozenset({"standard"})) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_1]) diff --git a/tests/dictionaries/00_8calculation_information/tiramisu/multi.py b/tests/dictionaries/00_8calculation_information/tiramisu/multi.py index 3da8353aa..80eac632b 100644 --- a/tests/dictionaries/00_8calculation_information/tiramisu/multi.py +++ b/tests/dictionaries/00_8calculation_information/tiramisu/multi.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') try: groups.namespace except: @@ -12,10 +12,10 @@ ALLOWED_LEADER_PROPERTIES.add("standard") ALLOWED_LEADER_PROPERTIES.add("advanced") dict_env['default_1.rougail.variable'] = "{{test_information }}\n" dict_env['default_2.rougail.variable'] = "{{test_information }}\n" -option_3 = StrOption(name="variable", doc="a variable", default=Calculation(func['jinja_to_function'], Params((), kwargs={'__internal_jinja': ParamValue("default_1.rougail.variable"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['tests/dictionaries/00_8calculation_information/dictionaries/rougail/00-base.yml']), '__internal_attribute': ParamValue("default"), '__internal_variable': ParamValue("1.rougail.variable"), 'test_information': ParamInformation("test_information", None)})), properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) +option_3 = StrOption(name="variable", doc="a variable", default=Calculation(func['jinja_to_function'], Params((), kwargs={'__internal_jinja': ParamValue("default_1.rougail.variable"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['../rougail-tests/structures/00_8calculation_information/rougail/00-base.yml']), '__internal_attribute': ParamValue("default"), '__internal_variable': ParamValue("1.rougail.variable"), 'test_information': ParamInformation("test_information", None)})), properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) optiondescription_2 = OptionDescription(name="rougail", doc="Rougail", group_type=groups.namespace, children=[option_3], properties=frozenset({"standard"})) optiondescription_1 = OptionDescription(name="1", doc="1", children=[optiondescription_2], properties=frozenset({"standard"})) -option_6 = StrOption(name="variable", doc="a variable", default=Calculation(func['jinja_to_function'], Params((), kwargs={'__internal_jinja': ParamValue("default_2.rougail.variable"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['tests/dictionaries/00_8calculation_information/dictionaries/rougail/00-base.yml']), '__internal_attribute': ParamValue("default"), '__internal_variable': ParamValue("2.rougail.variable"), 'test_information': ParamInformation("test_information", None)})), properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) +option_6 = StrOption(name="variable", doc="a variable", default=Calculation(func['jinja_to_function'], Params((), kwargs={'__internal_jinja': ParamValue("default_2.rougail.variable"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['../rougail-tests/structures/00_8calculation_information/rougail/00-base.yml']), '__internal_attribute': ParamValue("default"), '__internal_variable': ParamValue("2.rougail.variable"), 'test_information': ParamInformation("test_information", None)})), properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) optiondescription_5 = OptionDescription(name="rougail", doc="Rougail", group_type=groups.namespace, 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_8calculation_information/tiramisu/no_namespace.py b/tests/dictionaries/00_8calculation_information/tiramisu/no_namespace.py index a4113d596..4f1374dc8 100644 --- a/tests/dictionaries/00_8calculation_information/tiramisu/no_namespace.py +++ b/tests/dictionaries/00_8calculation_information/tiramisu/no_namespace.py @@ -2,10 +2,10 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") ALLOWED_LEADER_PROPERTIES.add("standard") ALLOWED_LEADER_PROPERTIES.add("advanced") dict_env['default_variable'] = "{{test_information }}\n" -option_1 = StrOption(name="variable", doc="a variable", default=Calculation(func['jinja_to_function'], Params((), kwargs={'__internal_jinja': ParamValue("default_variable"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['tests/dictionaries/00_8calculation_information/dictionaries/rougail/00-base.yml']), '__internal_attribute': ParamValue("default"), '__internal_variable': ParamValue("variable"), 'test_information': ParamInformation("test_information", None)})), properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) +option_1 = StrOption(name="variable", doc="a variable", default=Calculation(func['jinja_to_function'], Params((), kwargs={'__internal_jinja': ParamValue("default_variable"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['../rougail-tests/structures/00_8calculation_information/rougail/00-base.yml']), '__internal_attribute': ParamValue("default"), '__internal_variable': ParamValue("variable"), 'test_information': ParamInformation("test_information", None)})), properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1]) diff --git a/tests/dictionaries/00_8test/dictionaries/rougail/00-base.yml b/tests/dictionaries/00_8test/dictionaries/rougail/00-base.yml deleted file mode 100644 index 6a22bef08..000000000 --- a/tests/dictionaries/00_8test/dictionaries/rougail/00-base.yml +++ /dev/null @@ -1,40 +0,0 @@ ---- -version: '1.1' - -var1: - description: the first variable - test: - - test - -var2: - description: the second variable - test: - - test - default: value - -var3: - description: the third variable - test: - - test1 - - test2 - -var4: - description: the forth variable - test: - - null - - test1 - - test2 - mandatory: false - -var5: - description: the fifth variable - type: boolean - test: - - false - -var6: - description: the sixth variable - multi: true - test: - - test1 - - test2 diff --git a/tests/dictionaries/00_8test/tiramisu/base.py b/tests/dictionaries/00_8test/tiramisu/base.py index 6ef4c43dc..024588768 100644 --- a/tests/dictionaries/00_8test/tiramisu/base.py +++ b/tests/dictionaries/00_8test/tiramisu/base.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') try: groups.namespace except: diff --git a/tests/dictionaries/00_8test/tiramisu/multi.py b/tests/dictionaries/00_8test/tiramisu/multi.py index 434df026c..29a5b668b 100644 --- a/tests/dictionaries/00_8test/tiramisu/multi.py +++ b/tests/dictionaries/00_8test/tiramisu/multi.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') try: groups.namespace except: diff --git a/tests/dictionaries/00_8test/tiramisu/no_namespace.py b/tests/dictionaries/00_8test/tiramisu/no_namespace.py index de30d07fe..59ebd5fb5 100644 --- a/tests/dictionaries/00_8test/tiramisu/no_namespace.py +++ b/tests/dictionaries/00_8test/tiramisu/no_namespace.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") ALLOWED_LEADER_PROPERTIES.add("standard") ALLOWED_LEADER_PROPERTIES.add("advanced") diff --git a/tests/dictionaries/00_9choice_variable_multi/dictionaries/rougail/00-base.yml b/tests/dictionaries/00_9choice_variable_multi/dictionaries/rougail/00-base.yml deleted file mode 100644 index 80d5ddf23..000000000 --- a/tests/dictionaries/00_9choice_variable_multi/dictionaries/rougail/00-base.yml +++ /dev/null @@ -1,17 +0,0 @@ ---- -version: '1.1' -variable1: - description: a first variable - type: choice - multi: true - choices: - - val1 - - val2 -variable2: - description: a second variable - type: choice - multi: true - mandatory: false - choices: - - val1 - - val2 diff --git a/tests/dictionaries/00_9choice_variable_multi/tiramisu/base.py b/tests/dictionaries/00_9choice_variable_multi/tiramisu/base.py index 55880e647..f4f7ac039 100644 --- a/tests/dictionaries/00_9choice_variable_multi/tiramisu/base.py +++ b/tests/dictionaries/00_9choice_variable_multi/tiramisu/base.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') try: groups.namespace except: diff --git a/tests/dictionaries/00_9choice_variable_multi/tiramisu/multi.py b/tests/dictionaries/00_9choice_variable_multi/tiramisu/multi.py index 339465fb0..f65fbee8b 100644 --- a/tests/dictionaries/00_9choice_variable_multi/tiramisu/multi.py +++ b/tests/dictionaries/00_9choice_variable_multi/tiramisu/multi.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') try: groups.namespace except: 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 1c13eea29..81c573075 100644 --- a/tests/dictionaries/00_9choice_variable_multi/tiramisu/no_namespace.py +++ b/tests/dictionaries/00_9choice_variable_multi/tiramisu/no_namespace.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") ALLOWED_LEADER_PROPERTIES.add("standard") ALLOWED_LEADER_PROPERTIES.add("advanced") diff --git a/tests/dictionaries/00_9choice_variables/dictionaries/rougail/00-base.yml b/tests/dictionaries/00_9choice_variables/dictionaries/rougail/00-base.yml deleted file mode 100644 index b08b48c89..000000000 --- a/tests/dictionaries/00_9choice_variables/dictionaries/rougail/00-base.yml +++ /dev/null @@ -1,11 +0,0 @@ ---- -version: '1.1' -source_variable_1: val1 # the first source variable -source_variable_2: val2 # the second source variable -my_variable: - description: a variable - type: choice - choices: - - 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 31c74b30f..770237226 100644 --- a/tests/dictionaries/00_9choice_variables/tiramisu/base.py +++ b/tests/dictionaries/00_9choice_variables/tiramisu/base.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') try: groups.namespace except: diff --git a/tests/dictionaries/00_9choice_variables/tiramisu/multi.py b/tests/dictionaries/00_9choice_variables/tiramisu/multi.py index 82b53332c..add1fe510 100644 --- a/tests/dictionaries/00_9choice_variables/tiramisu/multi.py +++ b/tests/dictionaries/00_9choice_variables/tiramisu/multi.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') try: groups.namespace except: diff --git a/tests/dictionaries/00_9choice_variables/tiramisu/no_namespace.py b/tests/dictionaries/00_9choice_variables/tiramisu/no_namespace.py index 99312a1e1..053c6d41f 100644 --- a/tests/dictionaries/00_9choice_variables/tiramisu/no_namespace.py +++ b/tests/dictionaries/00_9choice_variables/tiramisu/no_namespace.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") ALLOWED_LEADER_PROPERTIES.add("standard") ALLOWED_LEADER_PROPERTIES.add("advanced") diff --git a/tests/dictionaries/00_9default_calculation/dictionaries/rougail/00-base.yml b/tests/dictionaries/00_9default_calculation/dictionaries/rougail/00-base.yml deleted file mode 100644 index 48f953f3e..000000000 --- a/tests/dictionaries/00_9default_calculation/dictionaries/rougail/00-base.yml +++ /dev/null @@ -1,14 +0,0 @@ ---- -version: '1.1' - -variable: - description: a variable - default: - jinja: | - {{ param1 }}_{{ param2 }}_{{ param3 }}_{{ param4 }} - params: - param1: string - param2: 1 - param3: true - param4: null - description: concat all parameters diff --git a/tests/dictionaries/00_9default_calculation/tiramisu/base.py b/tests/dictionaries/00_9default_calculation/tiramisu/base.py index bcb3136f5..b800ebe06 100644 --- a/tests/dictionaries/00_9default_calculation/tiramisu/base.py +++ b/tests/dictionaries/00_9default_calculation/tiramisu/base.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') try: groups.namespace except: @@ -11,6 +11,6 @@ ALLOWED_LEADER_PROPERTIES.add("basic") ALLOWED_LEADER_PROPERTIES.add("standard") ALLOWED_LEADER_PROPERTIES.add("advanced") dict_env['default_rougail.variable'] = "{{ param1 }}_{{ param2 }}_{{ param3 }}_{{ param4 }}\n" -option_2 = StrOption(name="variable", doc="a variable", default=Calculation(func['jinja_to_function'], Params((), kwargs={'__internal_jinja': ParamValue("default_rougail.variable"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['tests/dictionaries/00_9default_calculation/dictionaries/rougail/00-base.yml']), '__internal_attribute': ParamValue("default"), '__internal_variable': ParamValue("rougail.variable"), 'param1': ParamValue("string"), 'param2': ParamValue(1), 'param3': ParamValue(True), 'param4': ParamValue(None)})), properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) +option_2 = StrOption(name="variable", doc="a variable", default=Calculation(func['jinja_to_function'], Params((), kwargs={'__internal_jinja': ParamValue("default_rougail.variable"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['../rougail-tests/structures/00_9default_calculation/rougail/00-base.yml']), '__internal_attribute': ParamValue("default"), '__internal_variable': ParamValue("rougail.variable"), 'param1': ParamValue("string"), 'param2': ParamValue(1), 'param3': ParamValue(True), 'param4': ParamValue(None)})), properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) optiondescription_1 = OptionDescription(name="rougail", doc="Rougail", group_type=groups.namespace, children=[option_2], properties=frozenset({"standard"})) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_1]) diff --git a/tests/dictionaries/00_9default_calculation/tiramisu/multi.py b/tests/dictionaries/00_9default_calculation/tiramisu/multi.py index 1b0ea9ced..fcba20880 100644 --- a/tests/dictionaries/00_9default_calculation/tiramisu/multi.py +++ b/tests/dictionaries/00_9default_calculation/tiramisu/multi.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') try: groups.namespace except: @@ -12,10 +12,10 @@ ALLOWED_LEADER_PROPERTIES.add("standard") ALLOWED_LEADER_PROPERTIES.add("advanced") dict_env['default_1.rougail.variable'] = "{{ param1 }}_{{ param2 }}_{{ param3 }}_{{ param4 }}\n" dict_env['default_2.rougail.variable'] = "{{ param1 }}_{{ param2 }}_{{ param3 }}_{{ param4 }}\n" -option_3 = StrOption(name="variable", doc="a variable", default=Calculation(func['jinja_to_function'], Params((), kwargs={'__internal_jinja': ParamValue("default_1.rougail.variable"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['tests/dictionaries/00_9default_calculation/dictionaries/rougail/00-base.yml']), '__internal_attribute': ParamValue("default"), '__internal_variable': ParamValue("1.rougail.variable"), 'param1': ParamValue("string"), 'param2': ParamValue(1), 'param3': ParamValue(True), 'param4': ParamValue(None)})), properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) +option_3 = StrOption(name="variable", doc="a variable", default=Calculation(func['jinja_to_function'], Params((), kwargs={'__internal_jinja': ParamValue("default_1.rougail.variable"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['../rougail-tests/structures/00_9default_calculation/rougail/00-base.yml']), '__internal_attribute': ParamValue("default"), '__internal_variable': ParamValue("1.rougail.variable"), 'param1': ParamValue("string"), 'param2': ParamValue(1), 'param3': ParamValue(True), 'param4': ParamValue(None)})), properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) optiondescription_2 = OptionDescription(name="rougail", doc="Rougail", group_type=groups.namespace, children=[option_3], properties=frozenset({"standard"})) optiondescription_1 = OptionDescription(name="1", doc="1", children=[optiondescription_2], properties=frozenset({"standard"})) -option_6 = StrOption(name="variable", doc="a variable", default=Calculation(func['jinja_to_function'], Params((), kwargs={'__internal_jinja': ParamValue("default_2.rougail.variable"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['tests/dictionaries/00_9default_calculation/dictionaries/rougail/00-base.yml']), '__internal_attribute': ParamValue("default"), '__internal_variable': ParamValue("2.rougail.variable"), 'param1': ParamValue("string"), 'param2': ParamValue(1), 'param3': ParamValue(True), 'param4': ParamValue(None)})), properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) +option_6 = StrOption(name="variable", doc="a variable", default=Calculation(func['jinja_to_function'], Params((), kwargs={'__internal_jinja': ParamValue("default_2.rougail.variable"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['../rougail-tests/structures/00_9default_calculation/rougail/00-base.yml']), '__internal_attribute': ParamValue("default"), '__internal_variable': ParamValue("2.rougail.variable"), 'param1': ParamValue("string"), 'param2': ParamValue(1), 'param3': ParamValue(True), 'param4': ParamValue(None)})), properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) optiondescription_5 = OptionDescription(name="rougail", doc="Rougail", group_type=groups.namespace, 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/tiramisu/no_namespace.py b/tests/dictionaries/00_9default_calculation/tiramisu/no_namespace.py index c60231941..5a3d94542 100644 --- a/tests/dictionaries/00_9default_calculation/tiramisu/no_namespace.py +++ b/tests/dictionaries/00_9default_calculation/tiramisu/no_namespace.py @@ -2,10 +2,10 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") ALLOWED_LEADER_PROPERTIES.add("standard") ALLOWED_LEADER_PROPERTIES.add("advanced") dict_env['default_variable'] = "{{ param1 }}_{{ param2 }}_{{ param3 }}_{{ param4 }}\n" -option_1 = StrOption(name="variable", doc="a variable", default=Calculation(func['jinja_to_function'], Params((), kwargs={'__internal_jinja': ParamValue("default_variable"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['tests/dictionaries/00_9default_calculation/dictionaries/rougail/00-base.yml']), '__internal_attribute': ParamValue("default"), '__internal_variable': ParamValue("variable"), 'param1': ParamValue("string"), 'param2': ParamValue(1), 'param3': ParamValue(True), 'param4': ParamValue(None)})), properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) +option_1 = StrOption(name="variable", doc="a variable", default=Calculation(func['jinja_to_function'], Params((), kwargs={'__internal_jinja': ParamValue("default_variable"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['../rougail-tests/structures/00_9default_calculation/rougail/00-base.yml']), '__internal_attribute': ParamValue("default"), '__internal_variable': ParamValue("variable"), 'param1': ParamValue("string"), 'param2': ParamValue(1), 'param3': ParamValue(True), 'param4': ParamValue(None)})), properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1]) 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 deleted file mode 100644 index 490363f06..000000000 --- a/tests/dictionaries/00_9default_calculation_information/dictionaries/rougail/00-base.yml +++ /dev/null @@ -1,12 +0,0 @@ ---- -version: '1.1' -var: - description: a variable - default: - jinja: '{{ information }}' - params: - information: - type: information - information: test_information - variable: _.var - description: returns the information diff --git a/tests/dictionaries/00_9default_calculation_information/tiramisu/base.py b/tests/dictionaries/00_9default_calculation_information/tiramisu/base.py index d130c1427..fc42b7837 100644 --- a/tests/dictionaries/00_9default_calculation_information/tiramisu/base.py +++ b/tests/dictionaries/00_9default_calculation_information/tiramisu/base.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') try: groups.namespace except: @@ -11,6 +11,6 @@ ALLOWED_LEADER_PROPERTIES.add("basic") ALLOWED_LEADER_PROPERTIES.add("standard") ALLOWED_LEADER_PROPERTIES.add("advanced") dict_env['default_rougail.var'] = "{{ information }}" -option_2 = StrOption(name="var", doc="a variable", default=Calculation(func['jinja_to_function'], Params((), kwargs={'__internal_jinja': ParamValue("default_rougail.var"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['tests/dictionaries/00_9default_calculation_information/dictionaries/rougail/00-base.yml']), '__internal_attribute': ParamValue("default"), '__internal_variable': ParamValue("rougail.var"), 'information': ParamSelfInformation("test_information", None)})), properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) +option_2 = StrOption(name="var", doc="a variable", default=Calculation(func['jinja_to_function'], Params((), kwargs={'__internal_jinja': ParamValue("default_rougail.var"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['../rougail-tests/structures/00_9default_calculation_information/rougail/00-base.yml']), '__internal_attribute': ParamValue("default"), '__internal_variable': ParamValue("rougail.var"), 'information': ParamSelfInformation("test_information", None)})), properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) optiondescription_1 = OptionDescription(name="rougail", doc="Rougail", group_type=groups.namespace, children=[option_2], properties=frozenset({"standard"})) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_1]) diff --git a/tests/dictionaries/00_9default_calculation_information/tiramisu/multi.py b/tests/dictionaries/00_9default_calculation_information/tiramisu/multi.py index b5d57558f..b3a357b9d 100644 --- a/tests/dictionaries/00_9default_calculation_information/tiramisu/multi.py +++ b/tests/dictionaries/00_9default_calculation_information/tiramisu/multi.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') try: groups.namespace except: @@ -12,10 +12,10 @@ ALLOWED_LEADER_PROPERTIES.add("standard") ALLOWED_LEADER_PROPERTIES.add("advanced") dict_env['default_1.rougail.var'] = "{{ information }}" dict_env['default_2.rougail.var'] = "{{ information }}" -option_3 = StrOption(name="var", doc="a variable", default=Calculation(func['jinja_to_function'], Params((), kwargs={'__internal_jinja': ParamValue("default_1.rougail.var"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['tests/dictionaries/00_9default_calculation_information/dictionaries/rougail/00-base.yml']), '__internal_attribute': ParamValue("default"), '__internal_variable': ParamValue("1.rougail.var"), 'information': ParamSelfInformation("test_information", None)})), properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) +option_3 = StrOption(name="var", doc="a variable", default=Calculation(func['jinja_to_function'], Params((), kwargs={'__internal_jinja': ParamValue("default_1.rougail.var"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['../rougail-tests/structures/00_9default_calculation_information/rougail/00-base.yml']), '__internal_attribute': ParamValue("default"), '__internal_variable': ParamValue("1.rougail.var"), 'information': ParamSelfInformation("test_information", None)})), properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) optiondescription_2 = OptionDescription(name="rougail", doc="Rougail", group_type=groups.namespace, children=[option_3], properties=frozenset({"standard"})) optiondescription_1 = OptionDescription(name="1", doc="1", children=[optiondescription_2], properties=frozenset({"standard"})) -option_6 = StrOption(name="var", doc="a variable", default=Calculation(func['jinja_to_function'], Params((), kwargs={'__internal_jinja': ParamValue("default_2.rougail.var"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['tests/dictionaries/00_9default_calculation_information/dictionaries/rougail/00-base.yml']), '__internal_attribute': ParamValue("default"), '__internal_variable': ParamValue("2.rougail.var"), 'information': ParamSelfInformation("test_information", None)})), properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) +option_6 = StrOption(name="var", doc="a variable", default=Calculation(func['jinja_to_function'], Params((), kwargs={'__internal_jinja': ParamValue("default_2.rougail.var"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['../rougail-tests/structures/00_9default_calculation_information/rougail/00-base.yml']), '__internal_attribute': ParamValue("default"), '__internal_variable': ParamValue("2.rougail.var"), 'information': ParamSelfInformation("test_information", None)})), properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) optiondescription_5 = OptionDescription(name="rougail", doc="Rougail", group_type=groups.namespace, 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_information/tiramisu/no_namespace.py b/tests/dictionaries/00_9default_calculation_information/tiramisu/no_namespace.py index 202cac4bf..d93dcb88e 100644 --- a/tests/dictionaries/00_9default_calculation_information/tiramisu/no_namespace.py +++ b/tests/dictionaries/00_9default_calculation_information/tiramisu/no_namespace.py @@ -2,10 +2,10 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") ALLOWED_LEADER_PROPERTIES.add("standard") ALLOWED_LEADER_PROPERTIES.add("advanced") dict_env['default_var'] = "{{ information }}" -option_1 = StrOption(name="var", doc="a variable", default=Calculation(func['jinja_to_function'], Params((), kwargs={'__internal_jinja': ParamValue("default_var"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['tests/dictionaries/00_9default_calculation_information/dictionaries/rougail/00-base.yml']), '__internal_attribute': ParamValue("default"), '__internal_variable': ParamValue("var"), 'information': ParamSelfInformation("test_information", None)})), properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) +option_1 = StrOption(name="var", doc="a variable", default=Calculation(func['jinja_to_function'], Params((), kwargs={'__internal_jinja': ParamValue("default_var"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['../rougail-tests/structures/00_9default_calculation_information/rougail/00-base.yml']), '__internal_attribute': ParamValue("default"), '__internal_variable': ParamValue("var"), 'information': ParamSelfInformation("test_information", None)})), properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1]) 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 deleted file mode 100644 index 9a92c7474..000000000 --- a/tests/dictionaries/00_9default_calculation_information_other_variable/dictionaries/rougail/00-base.yml +++ /dev/null @@ -1,13 +0,0 @@ ---- -version: '1.1' -var1: # a first variable -var2: - description: a second variable - default: - jinja: | - {{ information }} - params: - information: - type: information - information: test_information - variable: _.var1 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 0d9c8d70b..6e1e323ef 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 @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') try: groups.namespace except: @@ -12,6 +12,6 @@ ALLOWED_LEADER_PROPERTIES.add("standard") ALLOWED_LEADER_PROPERTIES.add("advanced") dict_env['default_rougail.var2'] = "{{ information }}\n" option_2 = StrOption(name="var1", doc="a first variable", properties=frozenset({"basic", "mandatory"}), informations={'type': 'string'}) -option_3 = StrOption(name="var2", doc="a second variable", default=Calculation(func['jinja_to_function'], Params((), kwargs={'__internal_jinja': ParamValue("default_rougail.var2"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['tests/dictionaries/00_9default_calculation_information_other_variable/dictionaries/rougail/00-base.yml']), '__internal_attribute': ParamValue("default"), '__internal_variable': ParamValue("rougail.var2"), 'information': ParamInformation("test_information", None, option=option_2)})), properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) +option_3 = StrOption(name="var2", doc="a second variable", default=Calculation(func['jinja_to_function'], Params((), kwargs={'__internal_jinja': ParamValue("default_rougail.var2"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['../rougail-tests/structures/00_9default_calculation_information_other_variable/rougail/00-base.yml']), '__internal_attribute': ParamValue("default"), '__internal_variable': ParamValue("rougail.var2"), 'information': ParamInformation("test_information", None, option=option_2)})), properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) optiondescription_1 = OptionDescription(name="rougail", doc="Rougail", group_type=groups.namespace, children=[option_2, option_3], properties=frozenset({"basic"})) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_1]) 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 a52509c73..d85d3cd1b 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 @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') try: groups.namespace except: @@ -13,11 +13,11 @@ ALLOWED_LEADER_PROPERTIES.add("advanced") dict_env['default_1.rougail.var2'] = "{{ information }}\n" dict_env['default_2.rougail.var2'] = "{{ information }}\n" option_3 = StrOption(name="var1", doc="a first variable", properties=frozenset({"basic", "mandatory"}), informations={'type': 'string'}) -option_4 = StrOption(name="var2", doc="a second variable", default=Calculation(func['jinja_to_function'], Params((), kwargs={'__internal_jinja': ParamValue("default_1.rougail.var2"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['tests/dictionaries/00_9default_calculation_information_other_variable/dictionaries/rougail/00-base.yml']), '__internal_attribute': ParamValue("default"), '__internal_variable': ParamValue("1.rougail.var2"), 'information': ParamInformation("test_information", None, option=option_3)})), properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) +option_4 = StrOption(name="var2", doc="a second variable", default=Calculation(func['jinja_to_function'], Params((), kwargs={'__internal_jinja': ParamValue("default_1.rougail.var2"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['../rougail-tests/structures/00_9default_calculation_information_other_variable/rougail/00-base.yml']), '__internal_attribute': ParamValue("default"), '__internal_variable': ParamValue("1.rougail.var2"), 'information': ParamInformation("test_information", None, option=option_3)})), properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) optiondescription_2 = OptionDescription(name="rougail", doc="Rougail", group_type=groups.namespace, children=[option_3, option_4], properties=frozenset({"basic"})) optiondescription_1 = OptionDescription(name="1", doc="1", children=[optiondescription_2], properties=frozenset({"basic"})) option_7 = StrOption(name="var1", doc="a first variable", properties=frozenset({"basic", "mandatory"}), informations={'type': 'string'}) -option_8 = StrOption(name="var2", doc="a second variable", default=Calculation(func['jinja_to_function'], Params((), kwargs={'__internal_jinja': ParamValue("default_2.rougail.var2"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['tests/dictionaries/00_9default_calculation_information_other_variable/dictionaries/rougail/00-base.yml']), '__internal_attribute': ParamValue("default"), '__internal_variable': ParamValue("2.rougail.var2"), 'information': ParamInformation("test_information", None, option=option_7)})), properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) +option_8 = StrOption(name="var2", doc="a second variable", default=Calculation(func['jinja_to_function'], Params((), kwargs={'__internal_jinja': ParamValue("default_2.rougail.var2"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['../rougail-tests/structures/00_9default_calculation_information_other_variable/rougail/00-base.yml']), '__internal_attribute': ParamValue("default"), '__internal_variable': ParamValue("2.rougail.var2"), 'information': ParamInformation("test_information", None, option=option_7)})), properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) optiondescription_6 = OptionDescription(name="rougail", doc="Rougail", group_type=groups.namespace, 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_9default_calculation_information_other_variable/tiramisu/no_namespace.py b/tests/dictionaries/00_9default_calculation_information_other_variable/tiramisu/no_namespace.py index da895664b..4e1ba79a9 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 @@ -2,11 +2,11 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") ALLOWED_LEADER_PROPERTIES.add("standard") ALLOWED_LEADER_PROPERTIES.add("advanced") dict_env['default_var2'] = "{{ information }}\n" option_1 = StrOption(name="var1", doc="a first variable", properties=frozenset({"basic", "mandatory"}), informations={'type': 'string'}) -option_2 = StrOption(name="var2", doc="a second variable", default=Calculation(func['jinja_to_function'], Params((), kwargs={'__internal_jinja': ParamValue("default_var2"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['tests/dictionaries/00_9default_calculation_information_other_variable/dictionaries/rougail/00-base.yml']), '__internal_attribute': ParamValue("default"), '__internal_variable': ParamValue("var2"), 'information': ParamInformation("test_information", None, option=option_1)})), properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) +option_2 = StrOption(name="var2", doc="a second variable", default=Calculation(func['jinja_to_function'], Params((), kwargs={'__internal_jinja': ParamValue("default_var2"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['../rougail-tests/structures/00_9default_calculation_information_other_variable/rougail/00-base.yml']), '__internal_attribute': ParamValue("default"), '__internal_variable': ParamValue("var2"), 'information': ParamInformation("test_information", None, option=option_1)})), properties=frozenset({"mandatory", "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_optional/dictionaries/rougail/00-base.yml b/tests/dictionaries/00_9default_calculation_multi_optional/dictionaries/rougail/00-base.yml deleted file mode 100644 index a7e65c039..000000000 --- a/tests/dictionaries/00_9default_calculation_multi_optional/dictionaries/rougail/00-base.yml +++ /dev/null @@ -1,11 +0,0 @@ ---- -version: 1.1 -my_variable: - default: val1 -my_calculated_variable: - multi: true - default: - - variable: _.my_variable - optional: true - - 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 7d84d3d71..ca23a5356 100644 --- a/tests/dictionaries/00_9default_calculation_multi_optional/tiramisu/base.py +++ b/tests/dictionaries/00_9default_calculation_multi_optional/tiramisu/base.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') try: groups.namespace except: 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 79371b50b..1cb72a8b5 100644 --- a/tests/dictionaries/00_9default_calculation_multi_optional/tiramisu/multi.py +++ b/tests/dictionaries/00_9default_calculation_multi_optional/tiramisu/multi.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') try: groups.namespace except: 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 0d779b3f4..01a08ec5d 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 @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") ALLOWED_LEADER_PROPERTIES.add("standard") ALLOWED_LEADER_PROPERTIES.add("advanced") 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 deleted file mode 100644 index ca1582efd..000000000 --- a/tests/dictionaries/00_9default_calculation_multi_optional2/dictionaries/rougail/00-base.yml +++ /dev/null @@ -1,11 +0,0 @@ ---- -version: 1.1 -my_variable: - default: val1 -my_calculated_variable: - multi: true - default: - - variable: _.my_variable_unexists - optional: true - - 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 caaf21d25..de0e24cae 100644 --- a/tests/dictionaries/00_9default_calculation_multi_optional2/tiramisu/base.py +++ b/tests/dictionaries/00_9default_calculation_multi_optional2/tiramisu/base.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') try: groups.namespace except: 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 c53407f24..aef127e94 100644 --- a/tests/dictionaries/00_9default_calculation_multi_optional2/tiramisu/multi.py +++ b/tests/dictionaries/00_9default_calculation_multi_optional2/tiramisu/multi.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') try: groups.namespace except: 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 805f3dd41..850c695ee 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 @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") ALLOWED_LEADER_PROPERTIES.add("standard") ALLOWED_LEADER_PROPERTIES.add("advanced") 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 deleted file mode 100644 index c20c2b254..000000000 --- a/tests/dictionaries/00_9default_calculation_optional/dictionaries/rougail/00-base.yml +++ /dev/null @@ -1,7 +0,0 @@ ---- -version: 1.1 -my_calculated_variable: - multi: true - default: - 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 4f8abed9e..e0b6a99de 100644 --- a/tests/dictionaries/00_9default_calculation_optional/tiramisu/base.py +++ b/tests/dictionaries/00_9default_calculation_optional/tiramisu/base.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') try: groups.namespace except: diff --git a/tests/dictionaries/00_9default_calculation_optional/tiramisu/multi.py b/tests/dictionaries/00_9default_calculation_optional/tiramisu/multi.py index d96a53e2e..ba18f0c6d 100644 --- a/tests/dictionaries/00_9default_calculation_optional/tiramisu/multi.py +++ b/tests/dictionaries/00_9default_calculation_optional/tiramisu/multi.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') try: groups.namespace except: 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 7ab9fa4a0..91c82d37e 100644 --- a/tests/dictionaries/00_9default_calculation_optional/tiramisu/no_namespace.py +++ b/tests/dictionaries/00_9default_calculation_optional/tiramisu/no_namespace.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") ALLOWED_LEADER_PROPERTIES.add("standard") ALLOWED_LEADER_PROPERTIES.add("advanced") 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 deleted file mode 100644 index 094c6d883..000000000 --- a/tests/dictionaries/00_9default_calculation_optional_exists/dictionaries/rougail/00-base.yml +++ /dev/null @@ -1,12 +0,0 @@ ---- -version: 1.1 -my_variable: - multi: true - default: - - val1 - - val2 -my_calculated_variable: - multi: true - default: - 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 0eb318699..a5c2c12f3 100644 --- a/tests/dictionaries/00_9default_calculation_optional_exists/tiramisu/base.py +++ b/tests/dictionaries/00_9default_calculation_optional_exists/tiramisu/base.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') try: groups.namespace except: 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 bc8d0f44c..bc8138766 100644 --- a/tests/dictionaries/00_9default_calculation_optional_exists/tiramisu/multi.py +++ b/tests/dictionaries/00_9default_calculation_optional_exists/tiramisu/multi.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') try: groups.namespace except: 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 6015aacef..9af8fafcd 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 @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") ALLOWED_LEADER_PROPERTIES.add("standard") ALLOWED_LEADER_PROPERTIES.add("advanced") 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 deleted file mode 100644 index de32a7e7a..000000000 --- a/tests/dictionaries/00_9default_calculation_param_optional/dictionaries/rougail/00-base.yml +++ /dev/null @@ -1,28 +0,0 @@ ---- -version: '1.1' -var1: - description: a first variable - default: - jinja: '{% if var2 is defined %} - {{ var2 }} - {% elif var3 is defined %} - {{ var3 }} - {% elif var4 is defined %} - {{ var4 }} - {% else %} - {{ _.var2 }} - {% endif %} - ' - params: - var2: - variable: _.var2 - optional: true - var3: - variable: _.var3 - optional: true - var4: - variable: _.unknown_family.var - optional: true - description: returns a value - mandatory: false -var2: "no" # a second variable 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 d2a451f16..ff7e11346 100644 --- a/tests/dictionaries/00_9default_calculation_param_optional/tiramisu/base.py +++ b/tests/dictionaries/00_9default_calculation_param_optional/tiramisu/base.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') try: groups.namespace except: @@ -12,6 +12,6 @@ ALLOWED_LEADER_PROPERTIES.add("standard") ALLOWED_LEADER_PROPERTIES.add("advanced") dict_env['default_rougail.var1'] = "{% if var2 is defined %} {{ var2 }} {% elif var3 is defined %} {{ var3 }} {% elif var4 is defined %} {{ var4 }} {% else %} {{ _.var2 }} {% endif %} " option_3 = StrOption(name="var2", doc="a second variable", default="no", properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) -option_2 = StrOption(name="var1", doc="a first variable", default=Calculation(func['jinja_to_function'], Params((), kwargs={'__internal_jinja': ParamValue("default_rougail.var1"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['tests/dictionaries/00_9default_calculation_param_optional/dictionaries/rougail/00-base.yml']), '__internal_attribute': ParamValue("default"), '__internal_variable': ParamValue("rougail.var1"), 'var2': ParamOption(option_3), '_.var2': ParamOption(option_3, notraisepropertyerror=True)})), properties=frozenset({"standard"}), informations={'type': 'string'}) +option_2 = StrOption(name="var1", doc="a first variable", default=Calculation(func['jinja_to_function'], Params((), kwargs={'__internal_jinja': ParamValue("default_rougail.var1"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['../rougail-tests/structures/00_9default_calculation_param_optional/rougail/00-base.yml']), '__internal_attribute': ParamValue("default"), '__internal_variable': ParamValue("rougail.var1"), 'var2': ParamOption(option_3), '_.var2': ParamOption(option_3, notraisepropertyerror=True)})), properties=frozenset({"standard"}), informations={'type': 'string'}) optiondescription_1 = OptionDescription(name="rougail", doc="Rougail", group_type=groups.namespace, 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_param_optional/tiramisu/multi.py b/tests/dictionaries/00_9default_calculation_param_optional/tiramisu/multi.py index a1abb9373..4f7d494f5 100644 --- a/tests/dictionaries/00_9default_calculation_param_optional/tiramisu/multi.py +++ b/tests/dictionaries/00_9default_calculation_param_optional/tiramisu/multi.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') try: groups.namespace except: @@ -13,11 +13,11 @@ ALLOWED_LEADER_PROPERTIES.add("advanced") dict_env['default_1.rougail.var1'] = "{% if var2 is defined %} {{ var2 }} {% elif var3 is defined %} {{ var3 }} {% elif var4 is defined %} {{ var4 }} {% else %} {{ _.var2 }} {% endif %} " dict_env['default_2.rougail.var1'] = "{% if var2 is defined %} {{ var2 }} {% elif var3 is defined %} {{ var3 }} {% elif var4 is defined %} {{ var4 }} {% else %} {{ _.var2 }} {% endif %} " option_4 = StrOption(name="var2", doc="a second variable", default="no", properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) -option_3 = StrOption(name="var1", doc="a first variable", default=Calculation(func['jinja_to_function'], Params((), kwargs={'__internal_jinja': ParamValue("default_1.rougail.var1"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['tests/dictionaries/00_9default_calculation_param_optional/dictionaries/rougail/00-base.yml']), '__internal_attribute': ParamValue("default"), '__internal_variable': ParamValue("1.rougail.var1"), 'var2': ParamOption(option_4), '_.var2': ParamOption(option_4, notraisepropertyerror=True)})), properties=frozenset({"standard"}), informations={'type': 'string'}) +option_3 = StrOption(name="var1", doc="a first variable", default=Calculation(func['jinja_to_function'], Params((), kwargs={'__internal_jinja': ParamValue("default_1.rougail.var1"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['../rougail-tests/structures/00_9default_calculation_param_optional/rougail/00-base.yml']), '__internal_attribute': ParamValue("default"), '__internal_variable': ParamValue("1.rougail.var1"), 'var2': ParamOption(option_4), '_.var2': ParamOption(option_4, notraisepropertyerror=True)})), properties=frozenset({"standard"}), informations={'type': 'string'}) optiondescription_2 = OptionDescription(name="rougail", doc="Rougail", group_type=groups.namespace, children=[option_3, option_4], properties=frozenset({"standard"})) optiondescription_1 = OptionDescription(name="1", doc="1", children=[optiondescription_2], properties=frozenset({"standard"})) option_8 = StrOption(name="var2", doc="a second variable", default="no", properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) -option_7 = StrOption(name="var1", doc="a first variable", default=Calculation(func['jinja_to_function'], Params((), kwargs={'__internal_jinja': ParamValue("default_2.rougail.var1"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['tests/dictionaries/00_9default_calculation_param_optional/dictionaries/rougail/00-base.yml']), '__internal_attribute': ParamValue("default"), '__internal_variable': ParamValue("2.rougail.var1"), 'var2': ParamOption(option_8), '_.var2': ParamOption(option_8, notraisepropertyerror=True)})), properties=frozenset({"standard"}), informations={'type': 'string'}) +option_7 = StrOption(name="var1", doc="a first variable", default=Calculation(func['jinja_to_function'], Params((), kwargs={'__internal_jinja': ParamValue("default_2.rougail.var1"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['../rougail-tests/structures/00_9default_calculation_param_optional/rougail/00-base.yml']), '__internal_attribute': ParamValue("default"), '__internal_variable': ParamValue("2.rougail.var1"), 'var2': ParamOption(option_8), '_.var2': ParamOption(option_8, notraisepropertyerror=True)})), properties=frozenset({"standard"}), informations={'type': 'string'}) optiondescription_6 = OptionDescription(name="rougail", doc="Rougail", group_type=groups.namespace, 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_param_optional/tiramisu/no_namespace.py b/tests/dictionaries/00_9default_calculation_param_optional/tiramisu/no_namespace.py index 753d9594c..e14df9941 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 @@ -2,11 +2,11 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") ALLOWED_LEADER_PROPERTIES.add("standard") ALLOWED_LEADER_PROPERTIES.add("advanced") dict_env['default_var1'] = "{% if var2 is defined %} {{ var2 }} {% elif var3 is defined %} {{ var3 }} {% elif var4 is defined %} {{ var4 }} {% else %} {{ _.var2 }} {% endif %} " option_2 = StrOption(name="var2", doc="a second variable", default="no", properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) -option_1 = StrOption(name="var1", doc="a first variable", default=Calculation(func['jinja_to_function'], Params((), kwargs={'__internal_jinja': ParamValue("default_var1"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['tests/dictionaries/00_9default_calculation_param_optional/dictionaries/rougail/00-base.yml']), '__internal_attribute': ParamValue("default"), '__internal_variable': ParamValue("var1"), 'var2': ParamOption(option_2), '_.var2': ParamOption(option_2, notraisepropertyerror=True)})), properties=frozenset({"standard"}), informations={'type': 'string'}) +option_1 = StrOption(name="var1", doc="a first variable", default=Calculation(func['jinja_to_function'], Params((), kwargs={'__internal_jinja': ParamValue("default_var1"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['../rougail-tests/structures/00_9default_calculation_param_optional/rougail/00-base.yml']), '__internal_attribute': ParamValue("default"), '__internal_variable': ParamValue("var1"), 'var2': ParamOption(option_2), '_.var2': ParamOption(option_2, notraisepropertyerror=True)})), properties=frozenset({"standard"}), informations={'type': 'string'}) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1, option_2]) diff --git a/tests/dictionaries/00_9default_information_other_variable/dictionaries/rougail/00-base.yml b/tests/dictionaries/00_9default_information_other_variable/dictionaries/rougail/00-base.yml deleted file mode 100644 index 7e9c20023..000000000 --- a/tests/dictionaries/00_9default_information_other_variable/dictionaries/rougail/00-base.yml +++ /dev/null @@ -1,9 +0,0 @@ ---- -version: '1.1' -var1: # a first variable -var2: - description: a second variable - default: - type: information - information: test_information - variable: _.var1 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 7940796b4..2a4e95fdf 100644 --- a/tests/dictionaries/00_9default_information_other_variable/tiramisu/base.py +++ b/tests/dictionaries/00_9default_information_other_variable/tiramisu/base.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') try: groups.namespace except: 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 20e4c6da7..45c3b9e99 100644 --- a/tests/dictionaries/00_9default_information_other_variable/tiramisu/multi.py +++ b/tests/dictionaries/00_9default_information_other_variable/tiramisu/multi.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') try: groups.namespace except: 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 725e75e3b..362332a1f 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 @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") ALLOWED_LEADER_PROPERTIES.add("standard") ALLOWED_LEADER_PROPERTIES.add("advanced") diff --git a/tests/dictionaries/00_9default_integer/dictionaries/rougail/00-base.yml b/tests/dictionaries/00_9default_integer/dictionaries/rougail/00-base.yml deleted file mode 100644 index 9513e4b34..000000000 --- a/tests/dictionaries/00_9default_integer/dictionaries/rougail/00-base.yml +++ /dev/null @@ -1,12 +0,0 @@ ---- -version: '1.1' -var: - description: a variable - default: 9 - choices: - jinja: |+ - {% for item in trange(0, 10) %} - {{ item }} - {%- endfor %} - return_type: number - description: choice for 0 to 9 diff --git a/tests/dictionaries/00_9default_integer/tiramisu/base.py b/tests/dictionaries/00_9default_integer/tiramisu/base.py index 58567b7e2..ff9dc74a9 100644 --- a/tests/dictionaries/00_9default_integer/tiramisu/base.py +++ b/tests/dictionaries/00_9default_integer/tiramisu/base.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') try: groups.namespace except: @@ -11,6 +11,6 @@ ALLOWED_LEADER_PROPERTIES.add("basic") ALLOWED_LEADER_PROPERTIES.add("standard") ALLOWED_LEADER_PROPERTIES.add("advanced") dict_env['choices_rougail.var'] = "{% for item in trange(0, 10) %}\n{{ item }}\n{%- endfor %}\n" -option_2 = ChoiceOption(name="var", doc="a variable", values=Calculation(func['jinja_to_function'], Params((), kwargs={'__internal_jinja': ParamValue("choices_rougail.var"), '__internal_type': ParamValue("number"), '__internal_multi': ParamValue(True), '__internal_files': ParamValue(['tests/dictionaries/00_9default_integer/dictionaries/rougail/00-base.yml']), '__internal_attribute': ParamValue("choices"), '__internal_variable': ParamValue("rougail.var")})), default=9, properties=frozenset({"mandatory", "standard"}), informations={'type': 'choice'}) +option_2 = ChoiceOption(name="var", doc="a variable", values=Calculation(func['jinja_to_function'], Params((), kwargs={'__internal_jinja': ParamValue("choices_rougail.var"), '__internal_type': ParamValue("number"), '__internal_multi': ParamValue(True), '__internal_files': ParamValue(['../rougail-tests/structures/00_9default_integer/rougail/00-base.yml']), '__internal_attribute': ParamValue("choices"), '__internal_variable': ParamValue("rougail.var")})), default=9, properties=frozenset({"mandatory", "standard"}), informations={'type': 'choice'}) optiondescription_1 = OptionDescription(name="rougail", doc="Rougail", group_type=groups.namespace, children=[option_2], properties=frozenset({"standard"})) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_1]) diff --git a/tests/dictionaries/00_9default_integer/tiramisu/multi.py b/tests/dictionaries/00_9default_integer/tiramisu/multi.py index db8bd65fa..e3b503a56 100644 --- a/tests/dictionaries/00_9default_integer/tiramisu/multi.py +++ b/tests/dictionaries/00_9default_integer/tiramisu/multi.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') try: groups.namespace except: @@ -12,10 +12,10 @@ ALLOWED_LEADER_PROPERTIES.add("standard") ALLOWED_LEADER_PROPERTIES.add("advanced") dict_env['choices_1.rougail.var'] = "{% for item in trange(0, 10) %}\n{{ item }}\n{%- endfor %}\n" dict_env['choices_2.rougail.var'] = "{% for item in trange(0, 10) %}\n{{ item }}\n{%- endfor %}\n" -option_3 = ChoiceOption(name="var", doc="a variable", values=Calculation(func['jinja_to_function'], Params((), kwargs={'__internal_jinja': ParamValue("choices_1.rougail.var"), '__internal_type': ParamValue("number"), '__internal_multi': ParamValue(True), '__internal_files': ParamValue(['tests/dictionaries/00_9default_integer/dictionaries/rougail/00-base.yml']), '__internal_attribute': ParamValue("choices"), '__internal_variable': ParamValue("1.rougail.var")})), default=9, properties=frozenset({"mandatory", "standard"}), informations={'type': 'choice'}) +option_3 = ChoiceOption(name="var", doc="a variable", values=Calculation(func['jinja_to_function'], Params((), kwargs={'__internal_jinja': ParamValue("choices_1.rougail.var"), '__internal_type': ParamValue("number"), '__internal_multi': ParamValue(True), '__internal_files': ParamValue(['../rougail-tests/structures/00_9default_integer/rougail/00-base.yml']), '__internal_attribute': ParamValue("choices"), '__internal_variable': ParamValue("1.rougail.var")})), default=9, properties=frozenset({"mandatory", "standard"}), informations={'type': 'choice'}) optiondescription_2 = OptionDescription(name="rougail", doc="Rougail", group_type=groups.namespace, children=[option_3], properties=frozenset({"standard"})) optiondescription_1 = OptionDescription(name="1", doc="1", children=[optiondescription_2], properties=frozenset({"standard"})) -option_6 = ChoiceOption(name="var", doc="a variable", values=Calculation(func['jinja_to_function'], Params((), kwargs={'__internal_jinja': ParamValue("choices_2.rougail.var"), '__internal_type': ParamValue("number"), '__internal_multi': ParamValue(True), '__internal_files': ParamValue(['tests/dictionaries/00_9default_integer/dictionaries/rougail/00-base.yml']), '__internal_attribute': ParamValue("choices"), '__internal_variable': ParamValue("2.rougail.var")})), default=9, properties=frozenset({"mandatory", "standard"}), informations={'type': 'choice'}) +option_6 = ChoiceOption(name="var", doc="a variable", values=Calculation(func['jinja_to_function'], Params((), kwargs={'__internal_jinja': ParamValue("choices_2.rougail.var"), '__internal_type': ParamValue("number"), '__internal_multi': ParamValue(True), '__internal_files': ParamValue(['../rougail-tests/structures/00_9default_integer/rougail/00-base.yml']), '__internal_attribute': ParamValue("choices"), '__internal_variable': ParamValue("2.rougail.var")})), default=9, properties=frozenset({"mandatory", "standard"}), informations={'type': 'choice'}) optiondescription_5 = OptionDescription(name="rougail", doc="Rougail", group_type=groups.namespace, 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_integer/tiramisu/no_namespace.py b/tests/dictionaries/00_9default_integer/tiramisu/no_namespace.py index 3ac4abcdd..3dddcc0f9 100644 --- a/tests/dictionaries/00_9default_integer/tiramisu/no_namespace.py +++ b/tests/dictionaries/00_9default_integer/tiramisu/no_namespace.py @@ -2,10 +2,10 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") ALLOWED_LEADER_PROPERTIES.add("standard") ALLOWED_LEADER_PROPERTIES.add("advanced") dict_env['choices_var'] = "{% for item in trange(0, 10) %}\n{{ item }}\n{%- endfor %}\n" -option_1 = ChoiceOption(name="var", doc="a variable", values=Calculation(func['jinja_to_function'], Params((), kwargs={'__internal_jinja': ParamValue("choices_var"), '__internal_type': ParamValue("number"), '__internal_multi': ParamValue(True), '__internal_files': ParamValue(['tests/dictionaries/00_9default_integer/dictionaries/rougail/00-base.yml']), '__internal_attribute': ParamValue("choices"), '__internal_variable': ParamValue("var")})), default=9, properties=frozenset({"mandatory", "standard"}), informations={'type': 'choice'}) +option_1 = ChoiceOption(name="var", doc="a variable", values=Calculation(func['jinja_to_function'], Params((), kwargs={'__internal_jinja': ParamValue("choices_var"), '__internal_type': ParamValue("number"), '__internal_multi': ParamValue(True), '__internal_files': ParamValue(['../rougail-tests/structures/00_9default_integer/rougail/00-base.yml']), '__internal_attribute': ParamValue("choices"), '__internal_variable': ParamValue("var")})), default=9, properties=frozenset({"mandatory", "standard"}), informations={'type': 'choice'}) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1]) diff --git a/tests/dictionaries/00_9extra/dictionaries/extra/00-base.yml b/tests/dictionaries/00_9extra/dictionaries/extra/00-base.yml deleted file mode 100644 index 0416ef6b2..000000000 --- a/tests/dictionaries/00_9extra/dictionaries/extra/00-base.yml +++ /dev/null @@ -1,7 +0,0 @@ ---- -version: '1.1' -variable: - description: a variable - default: - jinja: 'no' - description: return no diff --git a/tests/dictionaries/00_9extra/dictionaries/rougail/00-base.yml b/tests/dictionaries/00_9extra/dictionaries/rougail/00-base.yml deleted file mode 100644 index 4f64b4402..000000000 --- a/tests/dictionaries/00_9extra/dictionaries/rougail/00-base.yml +++ /dev/null @@ -1,3 +0,0 @@ ---- -version: '1.1' -variable: rougail # a variable diff --git a/tests/dictionaries/00_9extra/force_namespace b/tests/dictionaries/00_9extra/force_namespace deleted file mode 100644 index e69de29bb..000000000 diff --git a/tests/dictionaries/00_9extra/tiramisu/base.py b/tests/dictionaries/00_9extra/tiramisu/base.py index cf442ccaa..d8e1cf4f6 100644 --- a/tests/dictionaries/00_9extra/tiramisu/base.py +++ b/tests/dictionaries/00_9extra/tiramisu/base.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') try: groups.namespace except: @@ -13,6 +13,6 @@ ALLOWED_LEADER_PROPERTIES.add("advanced") dict_env['default_extra.variable'] = "no" option_2 = StrOption(name="variable", doc="a variable", default="rougail", properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) optiondescription_1 = OptionDescription(name="rougail", doc="Rougail", group_type=groups.namespace, children=[option_2], properties=frozenset({"standard"})) -option_4 = StrOption(name="variable", doc="a variable", default=Calculation(func['jinja_to_function'], Params((), kwargs={'__internal_jinja': ParamValue("default_extra.variable"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['tests/dictionaries/00_9extra/dictionaries/extra/00-base.yml']), '__internal_attribute': ParamValue("default"), '__internal_variable': ParamValue("extra.variable")})), properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) +option_4 = StrOption(name="variable", doc="a variable", default=Calculation(func['jinja_to_function'], Params((), kwargs={'__internal_jinja': ParamValue("default_extra.variable"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['../rougail-tests/structures/00_9extra/extra/00-base.yml']), '__internal_attribute': ParamValue("default"), '__internal_variable': ParamValue("extra.variable")})), properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) optiondescription_3 = OptionDescription(name="extra", doc="extra", group_type=groups.namespace, children=[option_4], properties=frozenset({"standard"})) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_1, optiondescription_3]) diff --git a/tests/dictionaries/00_9extra/tiramisu/multi.py b/tests/dictionaries/00_9extra/tiramisu/multi.py index fb4020010..d77e4456c 100644 --- a/tests/dictionaries/00_9extra/tiramisu/multi.py +++ b/tests/dictionaries/00_9extra/tiramisu/multi.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') try: groups.namespace except: @@ -14,12 +14,12 @@ dict_env['default_1.extra.variable'] = "no" dict_env['default_2.extra.variable'] = "no" option_3 = StrOption(name="variable", doc="a variable", default="rougail", properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) optiondescription_2 = OptionDescription(name="rougail", doc="Rougail", group_type=groups.namespace, children=[option_3], properties=frozenset({"standard"})) -option_5 = StrOption(name="variable", doc="a variable", default=Calculation(func['jinja_to_function'], Params((), kwargs={'__internal_jinja': ParamValue("default_1.extra.variable"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['tests/dictionaries/00_9extra/dictionaries/extra/00-base.yml']), '__internal_attribute': ParamValue("default"), '__internal_variable': ParamValue("1.extra.variable")})), properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) +option_5 = StrOption(name="variable", doc="a variable", default=Calculation(func['jinja_to_function'], Params((), kwargs={'__internal_jinja': ParamValue("default_1.extra.variable"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['../rougail-tests/structures/00_9extra/extra/00-base.yml']), '__internal_attribute': ParamValue("default"), '__internal_variable': ParamValue("1.extra.variable")})), properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) optiondescription_4 = OptionDescription(name="extra", doc="extra", group_type=groups.namespace, children=[option_5], properties=frozenset({"standard"})) optiondescription_1 = OptionDescription(name="1", doc="1", children=[optiondescription_2, optiondescription_4], properties=frozenset({"standard"})) option_8 = StrOption(name="variable", doc="a variable", default="rougail", properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) optiondescription_7 = OptionDescription(name="rougail", doc="Rougail", group_type=groups.namespace, children=[option_8], properties=frozenset({"standard"})) -option_10 = StrOption(name="variable", doc="a variable", default=Calculation(func['jinja_to_function'], Params((), kwargs={'__internal_jinja': ParamValue("default_2.extra.variable"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['tests/dictionaries/00_9extra/dictionaries/extra/00-base.yml']), '__internal_attribute': ParamValue("default"), '__internal_variable': ParamValue("2.extra.variable")})), properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) +option_10 = StrOption(name="variable", doc="a variable", default=Calculation(func['jinja_to_function'], Params((), kwargs={'__internal_jinja': ParamValue("default_2.extra.variable"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['../rougail-tests/structures/00_9extra/extra/00-base.yml']), '__internal_attribute': ParamValue("default"), '__internal_variable': ParamValue("2.extra.variable")})), properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) optiondescription_9 = OptionDescription(name="extra", doc="extra", group_type=groups.namespace, children=[option_10], properties=frozenset({"standard"})) optiondescription_6 = OptionDescription(name="2", doc="2", children=[optiondescription_7, optiondescription_9], properties=frozenset({"standard"})) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_1, optiondescription_6]) diff --git a/tests/dictionaries/00_9extra_calculation/dictionaries/extra/00-base.yml b/tests/dictionaries/00_9extra_calculation/dictionaries/extra/00-base.yml deleted file mode 100644 index d0ece2dad..000000000 --- a/tests/dictionaries/00_9extra_calculation/dictionaries/extra/00-base.yml +++ /dev/null @@ -1,21 +0,0 @@ ---- -version: '1.1' -variable1: - description: a first variable - default: - variable: rougail.variable -variable2: - description: a second variable - default: - jinja: | - {{ rougail.variable }} - description: copy the value of rougail.variable -variable3: - description: a third variable - default: - jinja: | - {{ variable }} - params: - variable: - variable: rougail.variable - description: copy the value of rougail.variable diff --git a/tests/dictionaries/00_9extra_calculation/dictionaries/rougail/00-base.yml b/tests/dictionaries/00_9extra_calculation/dictionaries/rougail/00-base.yml deleted file mode 100644 index e0c9e9727..000000000 --- a/tests/dictionaries/00_9extra_calculation/dictionaries/rougail/00-base.yml +++ /dev/null @@ -1,3 +0,0 @@ ---- -version: '1.1' -variable: value # a variable diff --git a/tests/dictionaries/00_9extra_calculation/force_namespace b/tests/dictionaries/00_9extra_calculation/force_namespace deleted file mode 100644 index e69de29bb..000000000 diff --git a/tests/dictionaries/00_9extra_calculation/tiramisu/base.py b/tests/dictionaries/00_9extra_calculation/tiramisu/base.py index 665607637..2c8c54386 100644 --- a/tests/dictionaries/00_9extra_calculation/tiramisu/base.py +++ b/tests/dictionaries/00_9extra_calculation/tiramisu/base.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') try: groups.namespace except: @@ -15,7 +15,7 @@ dict_env['default_extra.variable3'] = "{{ variable }}\n" option_2 = StrOption(name="variable", doc="a variable", default="value", properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) optiondescription_1 = OptionDescription(name="rougail", doc="Rougail", group_type=groups.namespace, children=[option_2], properties=frozenset({"standard"})) option_4 = StrOption(name="variable1", doc="a first variable", default=Calculation(func['calc_value'], Params((ParamOption(option_2)))), properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) -option_5 = StrOption(name="variable2", doc="a second variable", default=Calculation(func['jinja_to_function'], Params((), kwargs={'__internal_jinja': ParamValue("default_extra.variable2"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['tests/dictionaries/00_9extra_calculation/dictionaries/extra/00-base.yml']), '__internal_attribute': ParamValue("default"), '__internal_variable': ParamValue("extra.variable2"), 'rougail.variable': ParamOption(option_2, notraisepropertyerror=True)})), properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) -option_6 = StrOption(name="variable3", doc="a third variable", default=Calculation(func['jinja_to_function'], Params((), kwargs={'__internal_jinja': ParamValue("default_extra.variable3"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['tests/dictionaries/00_9extra_calculation/dictionaries/extra/00-base.yml']), '__internal_attribute': ParamValue("default"), '__internal_variable': ParamValue("extra.variable3"), 'variable': ParamOption(option_2)})), properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) +option_5 = StrOption(name="variable2", doc="a second variable", default=Calculation(func['jinja_to_function'], Params((), kwargs={'__internal_jinja': ParamValue("default_extra.variable2"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['../rougail-tests/structures/00_9extra_calculation/extra/00-base.yml']), '__internal_attribute': ParamValue("default"), '__internal_variable': ParamValue("extra.variable2"), 'rougail.variable': ParamOption(option_2, notraisepropertyerror=True)})), properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) +option_6 = StrOption(name="variable3", doc="a third variable", default=Calculation(func['jinja_to_function'], Params((), kwargs={'__internal_jinja': ParamValue("default_extra.variable3"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['../rougail-tests/structures/00_9extra_calculation/extra/00-base.yml']), '__internal_attribute': ParamValue("default"), '__internal_variable': ParamValue("extra.variable3"), 'variable': ParamOption(option_2)})), properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) optiondescription_3 = OptionDescription(name="extra", doc="extra", group_type=groups.namespace, children=[option_4, option_5, option_6], properties=frozenset({"standard"})) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_1, optiondescription_3]) diff --git a/tests/dictionaries/00_9extra_calculation/tiramisu/multi.py b/tests/dictionaries/00_9extra_calculation/tiramisu/multi.py index d6a1a1576..a6d025137 100644 --- a/tests/dictionaries/00_9extra_calculation/tiramisu/multi.py +++ b/tests/dictionaries/00_9extra_calculation/tiramisu/multi.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') try: groups.namespace except: @@ -17,15 +17,15 @@ dict_env['default_2.extra.variable3'] = "{{ variable }}\n" option_3 = StrOption(name="variable", doc="a variable", default="value", properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) optiondescription_2 = OptionDescription(name="rougail", doc="Rougail", group_type=groups.namespace, children=[option_3], properties=frozenset({"standard"})) option_5 = StrOption(name="variable1", doc="a first variable", default=Calculation(func['calc_value'], Params((ParamOption(option_3)))), properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) -option_6 = StrOption(name="variable2", doc="a second variable", default=Calculation(func['jinja_to_function'], Params((), kwargs={'__internal_jinja': ParamValue("default_1.extra.variable2"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['tests/dictionaries/00_9extra_calculation/dictionaries/extra/00-base.yml']), '__internal_attribute': ParamValue("default"), '__internal_variable': ParamValue("1.extra.variable2"), 'rougail.variable': ParamOption(option_3, notraisepropertyerror=True)})), properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) -option_7 = StrOption(name="variable3", doc="a third variable", default=Calculation(func['jinja_to_function'], Params((), kwargs={'__internal_jinja': ParamValue("default_1.extra.variable3"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['tests/dictionaries/00_9extra_calculation/dictionaries/extra/00-base.yml']), '__internal_attribute': ParamValue("default"), '__internal_variable': ParamValue("1.extra.variable3"), 'variable': ParamOption(option_3)})), properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) +option_6 = StrOption(name="variable2", doc="a second variable", default=Calculation(func['jinja_to_function'], Params((), kwargs={'__internal_jinja': ParamValue("default_1.extra.variable2"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['../rougail-tests/structures/00_9extra_calculation/extra/00-base.yml']), '__internal_attribute': ParamValue("default"), '__internal_variable': ParamValue("1.extra.variable2"), 'rougail.variable': ParamOption(option_3, notraisepropertyerror=True)})), properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) +option_7 = StrOption(name="variable3", doc="a third variable", default=Calculation(func['jinja_to_function'], Params((), kwargs={'__internal_jinja': ParamValue("default_1.extra.variable3"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['../rougail-tests/structures/00_9extra_calculation/extra/00-base.yml']), '__internal_attribute': ParamValue("default"), '__internal_variable': ParamValue("1.extra.variable3"), 'variable': ParamOption(option_3)})), properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) optiondescription_4 = OptionDescription(name="extra", doc="extra", group_type=groups.namespace, children=[option_5, option_6, option_7], properties=frozenset({"standard"})) optiondescription_1 = OptionDescription(name="1", doc="1", children=[optiondescription_2, optiondescription_4], properties=frozenset({"standard"})) option_10 = StrOption(name="variable", doc="a variable", default="value", properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) optiondescription_9 = OptionDescription(name="rougail", doc="Rougail", group_type=groups.namespace, children=[option_10], properties=frozenset({"standard"})) option_12 = StrOption(name="variable1", doc="a first variable", default=Calculation(func['calc_value'], Params((ParamOption(option_10)))), properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) -option_13 = StrOption(name="variable2", doc="a second variable", default=Calculation(func['jinja_to_function'], Params((), kwargs={'__internal_jinja': ParamValue("default_2.extra.variable2"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['tests/dictionaries/00_9extra_calculation/dictionaries/extra/00-base.yml']), '__internal_attribute': ParamValue("default"), '__internal_variable': ParamValue("2.extra.variable2"), 'rougail.variable': ParamOption(option_10, notraisepropertyerror=True)})), properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) -option_14 = StrOption(name="variable3", doc="a third variable", default=Calculation(func['jinja_to_function'], Params((), kwargs={'__internal_jinja': ParamValue("default_2.extra.variable3"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['tests/dictionaries/00_9extra_calculation/dictionaries/extra/00-base.yml']), '__internal_attribute': ParamValue("default"), '__internal_variable': ParamValue("2.extra.variable3"), 'variable': ParamOption(option_10)})), properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) +option_13 = StrOption(name="variable2", doc="a second variable", default=Calculation(func['jinja_to_function'], Params((), kwargs={'__internal_jinja': ParamValue("default_2.extra.variable2"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['../rougail-tests/structures/00_9extra_calculation/extra/00-base.yml']), '__internal_attribute': ParamValue("default"), '__internal_variable': ParamValue("2.extra.variable2"), 'rougail.variable': ParamOption(option_10, notraisepropertyerror=True)})), properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) +option_14 = StrOption(name="variable3", doc="a third variable", default=Calculation(func['jinja_to_function'], Params((), kwargs={'__internal_jinja': ParamValue("default_2.extra.variable3"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['../rougail-tests/structures/00_9extra_calculation/extra/00-base.yml']), '__internal_attribute': ParamValue("default"), '__internal_variable': ParamValue("2.extra.variable3"), 'variable': ParamOption(option_10)})), properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) optiondescription_11 = OptionDescription(name="extra", doc="extra", group_type=groups.namespace, children=[option_12, option_13, option_14], properties=frozenset({"standard"})) optiondescription_8 = OptionDescription(name="2", doc="2", children=[optiondescription_9, optiondescription_11], properties=frozenset({"standard"})) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_1, optiondescription_8]) diff --git a/tests/dictionaries/01_6boolean_multi/dictionaries/rougail/00-base.yml b/tests/dictionaries/01_6boolean_multi/dictionaries/rougail/00-base.yml deleted file mode 100644 index 6d0ffeb4b..000000000 --- a/tests/dictionaries/01_6boolean_multi/dictionaries/rougail/00-base.yml +++ /dev/null @@ -1,36 +0,0 @@ ---- -version: '1.1' -var1: # the first variable - - true -var2: - description: the second variable - default: - - true -var3: - description: the third variable - type: boolean - default: - - true -var4: # the forth variable - - false -var5: - description: the fifth variable - default: - - false -var6: - description: the sixth variable - type: boolean - default: - - false - -var7: - description: the seventh variable - multi: true - default: - - true -var8: - description: the eighth variable - type: boolean - multi: true - default: - - true diff --git a/tests/dictionaries/01_6boolean_multi/tiramisu/base.py b/tests/dictionaries/01_6boolean_multi/tiramisu/base.py index 9eac31288..92aed6603 100644 --- a/tests/dictionaries/01_6boolean_multi/tiramisu/base.py +++ b/tests/dictionaries/01_6boolean_multi/tiramisu/base.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') try: groups.namespace except: diff --git a/tests/dictionaries/01_6boolean_multi/tiramisu/multi.py b/tests/dictionaries/01_6boolean_multi/tiramisu/multi.py index 613b6421f..ec63570a7 100644 --- a/tests/dictionaries/01_6boolean_multi/tiramisu/multi.py +++ b/tests/dictionaries/01_6boolean_multi/tiramisu/multi.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') try: groups.namespace except: diff --git a/tests/dictionaries/01_6boolean_multi/tiramisu/no_namespace.py b/tests/dictionaries/01_6boolean_multi/tiramisu/no_namespace.py index 205e275fe..0f2850e2c 100644 --- a/tests/dictionaries/01_6boolean_multi/tiramisu/no_namespace.py +++ b/tests/dictionaries/01_6boolean_multi/tiramisu/no_namespace.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") ALLOWED_LEADER_PROPERTIES.add("standard") ALLOWED_LEADER_PROPERTIES.add("advanced") diff --git a/tests/dictionaries/01_6custom_multi/dictionaries/rougail/00-base.yml b/tests/dictionaries/01_6custom_multi/dictionaries/rougail/00-base.yml deleted file mode 100644 index 39125a285..000000000 --- a/tests/dictionaries/01_6custom_multi/dictionaries/rougail/00-base.yml +++ /dev/null @@ -1,11 +0,0 @@ ---- -version: '1.1' -custom1: - description: a first custom variable - type: custom - multi: true -custom2: - description: a second custom variable - type: custom - default: - - value diff --git a/tests/dictionaries/01_6custom_multi/tiramisu/base.py b/tests/dictionaries/01_6custom_multi/tiramisu/base.py index ab105ac57..97ee18e85 100644 --- a/tests/dictionaries/01_6custom_multi/tiramisu/base.py +++ b/tests/dictionaries/01_6custom_multi/tiramisu/base.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') try: groups.namespace except: diff --git a/tests/dictionaries/01_6custom_multi/tiramisu/multi.py b/tests/dictionaries/01_6custom_multi/tiramisu/multi.py index 14e10aebb..0ce6d94b3 100644 --- a/tests/dictionaries/01_6custom_multi/tiramisu/multi.py +++ b/tests/dictionaries/01_6custom_multi/tiramisu/multi.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') try: groups.namespace except: diff --git a/tests/dictionaries/01_6custom_multi/tiramisu/no_namespace.py b/tests/dictionaries/01_6custom_multi/tiramisu/no_namespace.py index fb928e93c..03610a744 100644 --- a/tests/dictionaries/01_6custom_multi/tiramisu/no_namespace.py +++ b/tests/dictionaries/01_6custom_multi/tiramisu/no_namespace.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") ALLOWED_LEADER_PROPERTIES.add("standard") ALLOWED_LEADER_PROPERTIES.add("advanced") diff --git a/tests/dictionaries/01_6float_multi/dictionaries/rougail/00-base.yml b/tests/dictionaries/01_6float_multi/dictionaries/rougail/00-base.yml deleted file mode 100644 index df8a001ad..000000000 --- a/tests/dictionaries/01_6float_multi/dictionaries/rougail/00-base.yml +++ /dev/null @@ -1,36 +0,0 @@ ---- -version: '1.1' -var1: # the first variable - - 0.0 -var2: - description: the second variable - default: - - 0.0 -var3: - description: the third variable - type: float - default: - - 0.0 -var4: # the forth variable - - 10.1 -var5: - description: the fifth variable - default: - - 10.1 -var6: - description: the sixth variable - type: float - default: - - 10.1 - -var7: - description: the seventh variable - multi: true - default: - - 0.0 -var8: - description: the eighth variable - type: float - multi: true - default: - - 0.0 diff --git a/tests/dictionaries/01_6float_multi/tiramisu/base.py b/tests/dictionaries/01_6float_multi/tiramisu/base.py index b554a28d5..04786092c 100644 --- a/tests/dictionaries/01_6float_multi/tiramisu/base.py +++ b/tests/dictionaries/01_6float_multi/tiramisu/base.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') try: groups.namespace except: diff --git a/tests/dictionaries/01_6float_multi/tiramisu/multi.py b/tests/dictionaries/01_6float_multi/tiramisu/multi.py index d6c3b944f..a9153d65a 100644 --- a/tests/dictionaries/01_6float_multi/tiramisu/multi.py +++ b/tests/dictionaries/01_6float_multi/tiramisu/multi.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') try: groups.namespace except: diff --git a/tests/dictionaries/01_6float_multi/tiramisu/no_namespace.py b/tests/dictionaries/01_6float_multi/tiramisu/no_namespace.py index 06be1012a..b1cc3216f 100644 --- a/tests/dictionaries/01_6float_multi/tiramisu/no_namespace.py +++ b/tests/dictionaries/01_6float_multi/tiramisu/no_namespace.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") ALLOWED_LEADER_PROPERTIES.add("standard") ALLOWED_LEADER_PROPERTIES.add("advanced") diff --git a/tests/dictionaries/01_6number_multi/dictionaries/rougail/00-base.yml b/tests/dictionaries/01_6number_multi/dictionaries/rougail/00-base.yml deleted file mode 100644 index daa918b0c..000000000 --- a/tests/dictionaries/01_6number_multi/dictionaries/rougail/00-base.yml +++ /dev/null @@ -1,36 +0,0 @@ ---- -version: '1.1' -var1: # the first variable - - 0 -var2: - description: the second variable - default: - - 0 -var3: - description: the third variable - type: number - default: - - 0 -var4: # the forth variable - - 10 -var5: - description: the fifth variable - default: - - 10 -var6: - description: the sixth variable - type: number - default: - - 10 - -var7: - description: the seventh variable - multi: true - default: - - 0 -var8: - description: the eighth variable - type: number - multi: true - default: - - 0 diff --git a/tests/dictionaries/01_6number_multi/tiramisu/base.py b/tests/dictionaries/01_6number_multi/tiramisu/base.py index c897d1729..f084761e7 100644 --- a/tests/dictionaries/01_6number_multi/tiramisu/base.py +++ b/tests/dictionaries/01_6number_multi/tiramisu/base.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') try: groups.namespace except: diff --git a/tests/dictionaries/01_6number_multi/tiramisu/multi.py b/tests/dictionaries/01_6number_multi/tiramisu/multi.py index cd2a1178a..c183eaad0 100644 --- a/tests/dictionaries/01_6number_multi/tiramisu/multi.py +++ b/tests/dictionaries/01_6number_multi/tiramisu/multi.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') try: groups.namespace except: diff --git a/tests/dictionaries/01_6number_multi/tiramisu/no_namespace.py b/tests/dictionaries/01_6number_multi/tiramisu/no_namespace.py index dd0c29a72..4bc83b93e 100644 --- a/tests/dictionaries/01_6number_multi/tiramisu/no_namespace.py +++ b/tests/dictionaries/01_6number_multi/tiramisu/no_namespace.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") ALLOWED_LEADER_PROPERTIES.add("standard") ALLOWED_LEADER_PROPERTIES.add("advanced") diff --git a/tests/dictionaries/01_6string_empty/dictionaries/rougail/00-base.yml b/tests/dictionaries/01_6string_empty/dictionaries/rougail/00-base.yml deleted file mode 100644 index 580aa65f2..000000000 --- a/tests/dictionaries/01_6string_empty/dictionaries/rougail/00-base.yml +++ /dev/null @@ -1,8 +0,0 @@ ---- -version: '1.1' -var1: - description: the second variable - empty: false - default: - - 'value' - - null diff --git a/tests/dictionaries/01_6string_empty/tiramisu/base.py b/tests/dictionaries/01_6string_empty/tiramisu/base.py index 4e223af2b..103480acc 100644 --- a/tests/dictionaries/01_6string_empty/tiramisu/base.py +++ b/tests/dictionaries/01_6string_empty/tiramisu/base.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') try: groups.namespace except: diff --git a/tests/dictionaries/01_6string_empty/tiramisu/multi.py b/tests/dictionaries/01_6string_empty/tiramisu/multi.py index 6a7c1c56b..a4b722ac4 100644 --- a/tests/dictionaries/01_6string_empty/tiramisu/multi.py +++ b/tests/dictionaries/01_6string_empty/tiramisu/multi.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') try: groups.namespace except: diff --git a/tests/dictionaries/01_6string_empty/tiramisu/no_namespace.py b/tests/dictionaries/01_6string_empty/tiramisu/no_namespace.py index 025b9c555..9a071872a 100644 --- a/tests/dictionaries/01_6string_empty/tiramisu/no_namespace.py +++ b/tests/dictionaries/01_6string_empty/tiramisu/no_namespace.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") ALLOWED_LEADER_PROPERTIES.add("standard") ALLOWED_LEADER_PROPERTIES.add("advanced") diff --git a/tests/dictionaries/01_6string_multi/dictionaries/rougail/00-base.yml b/tests/dictionaries/01_6string_multi/dictionaries/rougail/00-base.yml deleted file mode 100644 index 38b5075cb..000000000 --- a/tests/dictionaries/01_6string_multi/dictionaries/rougail/00-base.yml +++ /dev/null @@ -1,32 +0,0 @@ ---- -version: '1.1' -var1: [] # the first variable -var2: - description: the second variable - default: [] -var3: - description: the third variable - type: string -var4: # the forth variable - - value -var5: - description: the fifth variable - default: - - value -var6: - description: the sixth variable - type: string - default: - - value - -var7: - description: the seventh variable - multi: true - default: - - value -var8: - description: the eighth variable - type: string - multi: true - default: - - value diff --git a/tests/dictionaries/01_6string_multi/tiramisu/base.py b/tests/dictionaries/01_6string_multi/tiramisu/base.py index 107032a5f..04d2639cf 100644 --- a/tests/dictionaries/01_6string_multi/tiramisu/base.py +++ b/tests/dictionaries/01_6string_multi/tiramisu/base.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') try: groups.namespace except: diff --git a/tests/dictionaries/01_6string_multi/tiramisu/multi.py b/tests/dictionaries/01_6string_multi/tiramisu/multi.py index 25a0ede62..1f376530e 100644 --- a/tests/dictionaries/01_6string_multi/tiramisu/multi.py +++ b/tests/dictionaries/01_6string_multi/tiramisu/multi.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') try: groups.namespace except: diff --git a/tests/dictionaries/01_6string_multi/tiramisu/no_namespace.py b/tests/dictionaries/01_6string_multi/tiramisu/no_namespace.py index cd7fb4a1a..fd4a4b3ad 100644 --- a/tests/dictionaries/01_6string_multi/tiramisu/no_namespace.py +++ b/tests/dictionaries/01_6string_multi/tiramisu/no_namespace.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") ALLOWED_LEADER_PROPERTIES.add("standard") ALLOWED_LEADER_PROPERTIES.add("advanced") diff --git a/tests/dictionaries/01_7value_multi_doublequote/dictionaries/rougail/00-base.yml b/tests/dictionaries/01_7value_multi_doublequote/dictionaries/rougail/00-base.yml deleted file mode 100644 index 6674df88a..000000000 --- a/tests/dictionaries/01_7value_multi_doublequote/dictionaries/rougail/00-base.yml +++ /dev/null @@ -1,6 +0,0 @@ ---- -version: '1.1' -variable: - description: a variable - default: - - quote" diff --git a/tests/dictionaries/01_7value_multi_doublequote/tiramisu/base.py b/tests/dictionaries/01_7value_multi_doublequote/tiramisu/base.py index 3307ae18b..c0a0ac603 100644 --- a/tests/dictionaries/01_7value_multi_doublequote/tiramisu/base.py +++ b/tests/dictionaries/01_7value_multi_doublequote/tiramisu/base.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') try: groups.namespace except: diff --git a/tests/dictionaries/01_7value_multi_doublequote/tiramisu/multi.py b/tests/dictionaries/01_7value_multi_doublequote/tiramisu/multi.py index c7c611e9a..6a4b4e704 100644 --- a/tests/dictionaries/01_7value_multi_doublequote/tiramisu/multi.py +++ b/tests/dictionaries/01_7value_multi_doublequote/tiramisu/multi.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') try: groups.namespace except: 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 7f4cf5fdb..a35fa3e69 100644 --- a/tests/dictionaries/01_7value_multi_doublequote/tiramisu/no_namespace.py +++ b/tests/dictionaries/01_7value_multi_doublequote/tiramisu/no_namespace.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") ALLOWED_LEADER_PROPERTIES.add("standard") ALLOWED_LEADER_PROPERTIES.add("advanced") diff --git a/tests/dictionaries/01_7value_multi_doublequote2/dictionaries/rougail/00-base.yml b/tests/dictionaries/01_7value_multi_doublequote2/dictionaries/rougail/00-base.yml deleted file mode 100644 index 939316b89..000000000 --- a/tests/dictionaries/01_7value_multi_doublequote2/dictionaries/rougail/00-base.yml +++ /dev/null @@ -1,6 +0,0 @@ ---- -version: '1.1' -variable: - description: a variable - default: - - quote'" diff --git a/tests/dictionaries/01_7value_multi_doublequote2/tiramisu/base.py b/tests/dictionaries/01_7value_multi_doublequote2/tiramisu/base.py index f40dda116..25d911125 100644 --- a/tests/dictionaries/01_7value_multi_doublequote2/tiramisu/base.py +++ b/tests/dictionaries/01_7value_multi_doublequote2/tiramisu/base.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') try: groups.namespace except: diff --git a/tests/dictionaries/01_7value_multi_doublequote2/tiramisu/multi.py b/tests/dictionaries/01_7value_multi_doublequote2/tiramisu/multi.py index 8ed055404..b8fdd5164 100644 --- a/tests/dictionaries/01_7value_multi_doublequote2/tiramisu/multi.py +++ b/tests/dictionaries/01_7value_multi_doublequote2/tiramisu/multi.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') try: groups.namespace except: 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 450365ec8..084a78a58 100644 --- a/tests/dictionaries/01_7value_multi_doublequote2/tiramisu/no_namespace.py +++ b/tests/dictionaries/01_7value_multi_doublequote2/tiramisu/no_namespace.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") ALLOWED_LEADER_PROPERTIES.add("standard") ALLOWED_LEADER_PROPERTIES.add("advanced") diff --git a/tests/dictionaries/01_7value_multi_quote/dictionaries/rougail/00-base.yml b/tests/dictionaries/01_7value_multi_quote/dictionaries/rougail/00-base.yml deleted file mode 100644 index 22cfe82e8..000000000 --- a/tests/dictionaries/01_7value_multi_quote/dictionaries/rougail/00-base.yml +++ /dev/null @@ -1,6 +0,0 @@ ---- -version: '1.1' -variable: - description: a variable - default: - - quote' diff --git a/tests/dictionaries/01_7value_multi_quote/tiramisu/base.py b/tests/dictionaries/01_7value_multi_quote/tiramisu/base.py index 4762fa6a1..6fe79cd2d 100644 --- a/tests/dictionaries/01_7value_multi_quote/tiramisu/base.py +++ b/tests/dictionaries/01_7value_multi_quote/tiramisu/base.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') try: groups.namespace except: diff --git a/tests/dictionaries/01_7value_multi_quote/tiramisu/multi.py b/tests/dictionaries/01_7value_multi_quote/tiramisu/multi.py index 04446c65a..8579c8848 100644 --- a/tests/dictionaries/01_7value_multi_quote/tiramisu/multi.py +++ b/tests/dictionaries/01_7value_multi_quote/tiramisu/multi.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') try: groups.namespace except: 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 5f9447f3c..511cbf454 100644 --- a/tests/dictionaries/01_7value_multi_quote/tiramisu/no_namespace.py +++ b/tests/dictionaries/01_7value_multi_quote/tiramisu/no_namespace.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") ALLOWED_LEADER_PROPERTIES.add("standard") ALLOWED_LEADER_PROPERTIES.add("advanced") 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 deleted file mode 100644 index a2236456e..000000000 --- a/tests/dictionaries/01_8calculation_information_multi/dictionaries/rougail/00-base.yml +++ /dev/null @@ -1,13 +0,0 @@ ---- -version: '1.1' -variable: - description: a variable - multi: true - default: - jinja: | - {{test_information }} - params: - test_information: - type: information - information: test_information - description: get information test_information diff --git a/tests/dictionaries/01_8calculation_information_multi/tiramisu/base.py b/tests/dictionaries/01_8calculation_information_multi/tiramisu/base.py index 1aad8a189..7bdc04d9f 100644 --- a/tests/dictionaries/01_8calculation_information_multi/tiramisu/base.py +++ b/tests/dictionaries/01_8calculation_information_multi/tiramisu/base.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') try: groups.namespace except: @@ -10,7 +10,7 @@ except: ALLOWED_LEADER_PROPERTIES.add("basic") ALLOWED_LEADER_PROPERTIES.add("standard") ALLOWED_LEADER_PROPERTIES.add("advanced") -dict_env['default_rougail.variable'] = "{{test_information }}\n" -option_2 = StrOption(name="variable", doc="a variable", multi=True, default=Calculation(func['jinja_to_function'], Params((), kwargs={'__internal_jinja': ParamValue("default_rougail.variable"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(True), '__internal_files': ParamValue(['tests/dictionaries/01_8calculation_information_multi/dictionaries/rougail/00-base.yml']), '__internal_attribute': ParamValue("default"), '__internal_variable': ParamValue("rougail.variable"), 'test_information': ParamInformation("test_information", [])})), properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) +dict_env['default_rougail.variable'] = "{% for info in test_information %}\n{{ info }}\n{% endfor %}\n" +option_2 = StrOption(name="variable", doc="a variable", multi=True, default=Calculation(func['jinja_to_function'], Params((), kwargs={'__internal_jinja': ParamValue("default_rougail.variable"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(True), '__internal_files': ParamValue(['../rougail-tests/structures/01_8calculation_information_multi/rougail/00-base.yml']), '__internal_attribute': ParamValue("default"), '__internal_variable': ParamValue("rougail.variable"), 'test_information': ParamInformation("test_information_list", [])})), properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) optiondescription_1 = OptionDescription(name="rougail", doc="Rougail", group_type=groups.namespace, children=[option_2], properties=frozenset({"standard"})) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_1]) diff --git a/tests/dictionaries/01_8calculation_information_multi/tiramisu/multi.py b/tests/dictionaries/01_8calculation_information_multi/tiramisu/multi.py index 0eb80f9af..c82c3600f 100644 --- a/tests/dictionaries/01_8calculation_information_multi/tiramisu/multi.py +++ b/tests/dictionaries/01_8calculation_information_multi/tiramisu/multi.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') try: groups.namespace except: @@ -10,12 +10,12 @@ except: ALLOWED_LEADER_PROPERTIES.add("basic") ALLOWED_LEADER_PROPERTIES.add("standard") ALLOWED_LEADER_PROPERTIES.add("advanced") -dict_env['default_1.rougail.variable'] = "{{test_information }}\n" -dict_env['default_2.rougail.variable'] = "{{test_information }}\n" -option_3 = StrOption(name="variable", doc="a variable", multi=True, default=Calculation(func['jinja_to_function'], Params((), kwargs={'__internal_jinja': ParamValue("default_1.rougail.variable"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(True), '__internal_files': ParamValue(['tests/dictionaries/01_8calculation_information_multi/dictionaries/rougail/00-base.yml']), '__internal_attribute': ParamValue("default"), '__internal_variable': ParamValue("1.rougail.variable"), 'test_information': ParamInformation("test_information", [])})), properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) +dict_env['default_1.rougail.variable'] = "{% for info in test_information %}\n{{ info }}\n{% endfor %}\n" +dict_env['default_2.rougail.variable'] = "{% for info in test_information %}\n{{ info }}\n{% endfor %}\n" +option_3 = StrOption(name="variable", doc="a variable", multi=True, default=Calculation(func['jinja_to_function'], Params((), kwargs={'__internal_jinja': ParamValue("default_1.rougail.variable"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(True), '__internal_files': ParamValue(['../rougail-tests/structures/01_8calculation_information_multi/rougail/00-base.yml']), '__internal_attribute': ParamValue("default"), '__internal_variable': ParamValue("1.rougail.variable"), 'test_information': ParamInformation("test_information_list", [])})), properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) optiondescription_2 = OptionDescription(name="rougail", doc="Rougail", group_type=groups.namespace, children=[option_3], properties=frozenset({"standard"})) optiondescription_1 = OptionDescription(name="1", doc="1", children=[optiondescription_2], properties=frozenset({"standard"})) -option_6 = StrOption(name="variable", doc="a variable", multi=True, default=Calculation(func['jinja_to_function'], Params((), kwargs={'__internal_jinja': ParamValue("default_2.rougail.variable"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(True), '__internal_files': ParamValue(['tests/dictionaries/01_8calculation_information_multi/dictionaries/rougail/00-base.yml']), '__internal_attribute': ParamValue("default"), '__internal_variable': ParamValue("2.rougail.variable"), 'test_information': ParamInformation("test_information", [])})), properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) +option_6 = StrOption(name="variable", doc="a variable", multi=True, default=Calculation(func['jinja_to_function'], Params((), kwargs={'__internal_jinja': ParamValue("default_2.rougail.variable"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(True), '__internal_files': ParamValue(['../rougail-tests/structures/01_8calculation_information_multi/rougail/00-base.yml']), '__internal_attribute': ParamValue("default"), '__internal_variable': ParamValue("2.rougail.variable"), 'test_information': ParamInformation("test_information_list", [])})), properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) optiondescription_5 = OptionDescription(name="rougail", doc="Rougail", group_type=groups.namespace, 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/01_8calculation_information_multi/tiramisu/no_namespace.py b/tests/dictionaries/01_8calculation_information_multi/tiramisu/no_namespace.py index 3f1b595d2..f2794fdec 100644 --- a/tests/dictionaries/01_8calculation_information_multi/tiramisu/no_namespace.py +++ b/tests/dictionaries/01_8calculation_information_multi/tiramisu/no_namespace.py @@ -2,10 +2,10 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") ALLOWED_LEADER_PROPERTIES.add("standard") ALLOWED_LEADER_PROPERTIES.add("advanced") -dict_env['default_variable'] = "{{test_information }}\n" -option_1 = StrOption(name="variable", doc="a variable", multi=True, default=Calculation(func['jinja_to_function'], Params((), kwargs={'__internal_jinja': ParamValue("default_variable"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(True), '__internal_files': ParamValue(['tests/dictionaries/01_8calculation_information_multi/dictionaries/rougail/00-base.yml']), '__internal_attribute': ParamValue("default"), '__internal_variable': ParamValue("variable"), 'test_information': ParamInformation("test_information", [])})), properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) +dict_env['default_variable'] = "{% for info in test_information %}\n{{ info }}\n{% endfor %}\n" +option_1 = StrOption(name="variable", doc="a variable", multi=True, default=Calculation(func['jinja_to_function'], Params((), kwargs={'__internal_jinja': ParamValue("default_variable"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(True), '__internal_files': ParamValue(['../rougail-tests/structures/01_8calculation_information_multi/rougail/00-base.yml']), '__internal_attribute': ParamValue("default"), '__internal_variable': ParamValue("variable"), 'test_information': ParamInformation("test_information_list", [])})), properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1]) 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 deleted file mode 100644 index 9ebf8cbf4..000000000 --- a/tests/dictionaries/01_9choice_variable_multi/dictionaries/rougail/00-base.yml +++ /dev/null @@ -1,10 +0,0 @@ ---- -version: '1.1' -variable1: # a first variable - - a - - b - - c -variable2: - description: a second variable - choices: - 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 c850bdf4f..ae5b2736d 100644 --- a/tests/dictionaries/01_9choice_variable_multi/tiramisu/base.py +++ b/tests/dictionaries/01_9choice_variable_multi/tiramisu/base.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') try: groups.namespace except: diff --git a/tests/dictionaries/01_9choice_variable_multi/tiramisu/multi.py b/tests/dictionaries/01_9choice_variable_multi/tiramisu/multi.py index 3bdd949cd..e5dd9da77 100644 --- a/tests/dictionaries/01_9choice_variable_multi/tiramisu/multi.py +++ b/tests/dictionaries/01_9choice_variable_multi/tiramisu/multi.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') try: groups.namespace except: 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 470038ce4..097550e73 100644 --- a/tests/dictionaries/01_9choice_variable_multi/tiramisu/no_namespace.py +++ b/tests/dictionaries/01_9choice_variable_multi/tiramisu/no_namespace.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") ALLOWED_LEADER_PROPERTIES.add("standard") ALLOWED_LEADER_PROPERTIES.add("advanced") diff --git a/tests/dictionaries/04_0type_param/dictionaries/rougail/00-base.yml b/tests/dictionaries/04_0type_param/dictionaries/rougail/00-base.yml deleted file mode 100644 index 07492891b..000000000 --- a/tests/dictionaries/04_0type_param/dictionaries/rougail/00-base.yml +++ /dev/null @@ -1,8 +0,0 @@ ---- -version: '1.1' -int: - description: A limited number - default: 10 - params: - min_number: 0 - max_number: 100 diff --git a/tests/dictionaries/04_0type_param/tiramisu/base.py b/tests/dictionaries/04_0type_param/tiramisu/base.py index 8ffa5fe31..dea0b9af4 100644 --- a/tests/dictionaries/04_0type_param/tiramisu/base.py +++ b/tests/dictionaries/04_0type_param/tiramisu/base.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') try: groups.namespace except: diff --git a/tests/dictionaries/04_0type_param/tiramisu/multi.py b/tests/dictionaries/04_0type_param/tiramisu/multi.py index 737eea338..e0e3d05a7 100644 --- a/tests/dictionaries/04_0type_param/tiramisu/multi.py +++ b/tests/dictionaries/04_0type_param/tiramisu/multi.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') try: groups.namespace except: diff --git a/tests/dictionaries/04_0type_param/tiramisu/no_namespace.py b/tests/dictionaries/04_0type_param/tiramisu/no_namespace.py index 60d68750c..56955d592 100644 --- a/tests/dictionaries/04_0type_param/tiramisu/no_namespace.py +++ b/tests/dictionaries/04_0type_param/tiramisu/no_namespace.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") ALLOWED_LEADER_PROPERTIES.add("standard") ALLOWED_LEADER_PROPERTIES.add("advanced") diff --git a/tests/dictionaries/04_1auto_save/dictionaries/rougail/00-base.yml b/tests/dictionaries/04_1auto_save/dictionaries/rougail/00-base.yml deleted file mode 100644 index 0c770da09..000000000 --- a/tests/dictionaries/04_1auto_save/dictionaries/rougail/00-base.yml +++ /dev/null @@ -1,6 +0,0 @@ ---- -version: 1.1 -variable: - description: an auto save variable - auto_save: true - default: "no" diff --git a/tests/dictionaries/04_1auto_save/tiramisu/base.py b/tests/dictionaries/04_1auto_save/tiramisu/base.py index c976a8c46..7ca705ca8 100644 --- a/tests/dictionaries/04_1auto_save/tiramisu/base.py +++ b/tests/dictionaries/04_1auto_save/tiramisu/base.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') try: groups.namespace except: diff --git a/tests/dictionaries/04_1auto_save/tiramisu/multi.py b/tests/dictionaries/04_1auto_save/tiramisu/multi.py index 04503f9f7..62ff3f6da 100644 --- a/tests/dictionaries/04_1auto_save/tiramisu/multi.py +++ b/tests/dictionaries/04_1auto_save/tiramisu/multi.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') try: groups.namespace except: diff --git a/tests/dictionaries/04_1auto_save/tiramisu/no_namespace.py b/tests/dictionaries/04_1auto_save/tiramisu/no_namespace.py index 47363e0de..f9b2c7cd4 100644 --- a/tests/dictionaries/04_1auto_save/tiramisu/no_namespace.py +++ b/tests/dictionaries/04_1auto_save/tiramisu/no_namespace.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") ALLOWED_LEADER_PROPERTIES.add("standard") ALLOWED_LEADER_PROPERTIES.add("advanced") 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 deleted file mode 100644 index a1a3facb6..000000000 --- a/tests/dictionaries/04_1auto_save_and_calculated/dictionaries/rougail/00-base.yml +++ /dev/null @@ -1,8 +0,0 @@ ---- -version: 1.1 -var1: "no" # a first variable -var2: - description: a second variable - auto_save: true - default: - 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 b928a0423..7421f2db4 100644 --- a/tests/dictionaries/04_1auto_save_and_calculated/tiramisu/base.py +++ b/tests/dictionaries/04_1auto_save_and_calculated/tiramisu/base.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') try: groups.namespace except: 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 30f18927f..4cf8af4fa 100644 --- a/tests/dictionaries/04_1auto_save_and_calculated/tiramisu/multi.py +++ b/tests/dictionaries/04_1auto_save_and_calculated/tiramisu/multi.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') try: groups.namespace except: 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 b1a73613a..1362993e5 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 @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") ALLOWED_LEADER_PROPERTIES.add("standard") ALLOWED_LEADER_PROPERTIES.add("advanced") 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 deleted file mode 100644 index dde478e80..000000000 --- a/tests/dictionaries/04_1auto_save_and_calculated_hidden/dictionaries/rougail/00-base.yml +++ /dev/null @@ -1,15 +0,0 @@ ---- -version: '1.1' -var1: "no" # a first variable -var2: - description: a second variable - auto_save: true - hidden: - jinja: | - {% if _.var1 == "yes" %} - _.var1 is yes - {% endif %} - description: only if the variable var1 has value "yes" - default: - 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 77c9d0144..62e92cc57 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 @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') try: groups.namespace except: @@ -14,6 +14,6 @@ dict_env['default_rougail.var2'] = "yes" dict_env['hidden_rougail.var2'] = "{% if _.var1 == \"yes\" %}\n_.var1 is yes\n{% endif %}\n" dict_env['frozen_rougail.var2'] = "{% if _.var1 == \"yes\" %}\n_.var1 is yes\n{% endif %}\n" option_2 = StrOption(name="var1", doc="a first variable", default="no", properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) -option_3 = StrOption(name="var2", doc="a second variable", default=Calculation(func['jinja_to_function'], Params((), kwargs={'__internal_jinja': ParamValue("default_rougail.var2"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['tests/dictionaries/04_1auto_save_and_calculated_hidden/dictionaries/rougail/00-base.yml']), '__internal_attribute': ParamValue("default"), '__internal_variable': ParamValue("rougail.var2")})), properties=frozenset({"basic", "force_store_value", "mandatory", Calculation(func['jinja_to_property'], Params((ParamValue("hidden")), kwargs={'__internal_jinja': ParamValue("hidden_rougail.var2"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['tests/dictionaries/04_1auto_save_and_calculated_hidden/dictionaries/rougail/00-base.yml']), '__internal_attribute': ParamValue("hidden"), '__internal_variable': ParamValue("rougail.var2"), 'when': ParamValue(True), 'inverse': ParamValue(False), '_.var1': ParamOption(option_2, notraisepropertyerror=True)}), 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), '__internal_files': ParamValue(['tests/dictionaries/04_1auto_save_and_calculated_hidden/dictionaries/rougail/00-base.yml']), '__internal_attribute': ParamValue("frozen"), '__internal_variable': ParamValue("rougail.var2"), 'when': ParamValue(True), 'inverse': ParamValue(False), '_.var1': ParamOption(option_2, notraisepropertyerror=True)}), help_function=func['jinja_to_property_help'])}), informations={'type': 'string'}) +option_3 = StrOption(name="var2", doc="a second variable", default=Calculation(func['jinja_to_function'], Params((), kwargs={'__internal_jinja': ParamValue("default_rougail.var2"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['../rougail-tests/structures/04_1auto_save_and_calculated_hidden/rougail/00-base.yml']), '__internal_attribute': ParamValue("default"), '__internal_variable': ParamValue("rougail.var2")})), properties=frozenset({"basic", "force_store_value", "mandatory", Calculation(func['jinja_to_property'], Params((ParamValue("hidden")), kwargs={'__internal_jinja': ParamValue("hidden_rougail.var2"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['../rougail-tests/structures/04_1auto_save_and_calculated_hidden/rougail/00-base.yml']), '__internal_attribute': ParamValue("hidden"), '__internal_variable': ParamValue("rougail.var2"), 'when': ParamValue(True), 'inverse': ParamValue(False), '_.var1': ParamOption(option_2, notraisepropertyerror=True)}), 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), '__internal_files': ParamValue(['../rougail-tests/structures/04_1auto_save_and_calculated_hidden/rougail/00-base.yml']), '__internal_attribute': ParamValue("frozen"), '__internal_variable': ParamValue("rougail.var2"), 'when': ParamValue(True), 'inverse': ParamValue(False), '_.var1': ParamOption(option_2, notraisepropertyerror=True)}), help_function=func['jinja_to_property_help'])}), informations={'type': 'string'}) optiondescription_1 = OptionDescription(name="rougail", doc="Rougail", group_type=groups.namespace, children=[option_2, option_3], properties=frozenset({"basic"})) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_1]) 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 af74f63aa..2f2bd8c1d 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 @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') try: groups.namespace except: @@ -17,11 +17,11 @@ dict_env['default_2.rougail.var2'] = "yes" dict_env['hidden_2.rougail.var2'] = "{% if _.var1 == \"yes\" %}\n_.var1 is yes\n{% endif %}\n" dict_env['frozen_2.rougail.var2'] = "{% if _.var1 == \"yes\" %}\n_.var1 is yes\n{% endif %}\n" option_3 = StrOption(name="var1", doc="a first variable", default="no", properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) -option_4 = StrOption(name="var2", doc="a second variable", default=Calculation(func['jinja_to_function'], Params((), kwargs={'__internal_jinja': ParamValue("default_1.rougail.var2"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['tests/dictionaries/04_1auto_save_and_calculated_hidden/dictionaries/rougail/00-base.yml']), '__internal_attribute': ParamValue("default"), '__internal_variable': ParamValue("1.rougail.var2")})), properties=frozenset({"basic", "force_store_value", "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), '__internal_files': ParamValue(['tests/dictionaries/04_1auto_save_and_calculated_hidden/dictionaries/rougail/00-base.yml']), '__internal_attribute': ParamValue("hidden"), '__internal_variable': ParamValue("1.rougail.var2"), 'when': ParamValue(True), 'inverse': ParamValue(False), '_.var1': ParamOption(option_3, notraisepropertyerror=True)}), 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), '__internal_files': ParamValue(['tests/dictionaries/04_1auto_save_and_calculated_hidden/dictionaries/rougail/00-base.yml']), '__internal_attribute': ParamValue("frozen"), '__internal_variable': ParamValue("1.rougail.var2"), 'when': ParamValue(True), 'inverse': ParamValue(False), '_.var1': ParamOption(option_3, notraisepropertyerror=True)}), help_function=func['jinja_to_property_help'])}), informations={'type': 'string'}) +option_4 = StrOption(name="var2", doc="a second variable", default=Calculation(func['jinja_to_function'], Params((), kwargs={'__internal_jinja': ParamValue("default_1.rougail.var2"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['../rougail-tests/structures/04_1auto_save_and_calculated_hidden/rougail/00-base.yml']), '__internal_attribute': ParamValue("default"), '__internal_variable': ParamValue("1.rougail.var2")})), properties=frozenset({"basic", "force_store_value", "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), '__internal_files': ParamValue(['../rougail-tests/structures/04_1auto_save_and_calculated_hidden/rougail/00-base.yml']), '__internal_attribute': ParamValue("hidden"), '__internal_variable': ParamValue("1.rougail.var2"), 'when': ParamValue(True), 'inverse': ParamValue(False), '_.var1': ParamOption(option_3, notraisepropertyerror=True)}), 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), '__internal_files': ParamValue(['../rougail-tests/structures/04_1auto_save_and_calculated_hidden/rougail/00-base.yml']), '__internal_attribute': ParamValue("frozen"), '__internal_variable': ParamValue("1.rougail.var2"), 'when': ParamValue(True), 'inverse': ParamValue(False), '_.var1': ParamOption(option_3, notraisepropertyerror=True)}), help_function=func['jinja_to_property_help'])}), informations={'type': 'string'}) optiondescription_2 = OptionDescription(name="rougail", doc="Rougail", group_type=groups.namespace, children=[option_3, option_4], properties=frozenset({"basic"})) optiondescription_1 = OptionDescription(name="1", doc="1", children=[optiondescription_2], properties=frozenset({"basic"})) option_7 = StrOption(name="var1", doc="a first variable", default="no", properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) -option_8 = StrOption(name="var2", doc="a second variable", default=Calculation(func['jinja_to_function'], Params((), kwargs={'__internal_jinja': ParamValue("default_2.rougail.var2"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['tests/dictionaries/04_1auto_save_and_calculated_hidden/dictionaries/rougail/00-base.yml']), '__internal_attribute': ParamValue("default"), '__internal_variable': ParamValue("2.rougail.var2")})), properties=frozenset({"basic", "force_store_value", "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), '__internal_files': ParamValue(['tests/dictionaries/04_1auto_save_and_calculated_hidden/dictionaries/rougail/00-base.yml']), '__internal_attribute': ParamValue("hidden"), '__internal_variable': ParamValue("2.rougail.var2"), 'when': ParamValue(True), 'inverse': ParamValue(False), '_.var1': ParamOption(option_7, notraisepropertyerror=True)}), 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), '__internal_files': ParamValue(['tests/dictionaries/04_1auto_save_and_calculated_hidden/dictionaries/rougail/00-base.yml']), '__internal_attribute': ParamValue("frozen"), '__internal_variable': ParamValue("2.rougail.var2"), 'when': ParamValue(True), 'inverse': ParamValue(False), '_.var1': ParamOption(option_7, notraisepropertyerror=True)}), help_function=func['jinja_to_property_help'])}), informations={'type': 'string'}) +option_8 = StrOption(name="var2", doc="a second variable", default=Calculation(func['jinja_to_function'], Params((), kwargs={'__internal_jinja': ParamValue("default_2.rougail.var2"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['../rougail-tests/structures/04_1auto_save_and_calculated_hidden/rougail/00-base.yml']), '__internal_attribute': ParamValue("default"), '__internal_variable': ParamValue("2.rougail.var2")})), properties=frozenset({"basic", "force_store_value", "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), '__internal_files': ParamValue(['../rougail-tests/structures/04_1auto_save_and_calculated_hidden/rougail/00-base.yml']), '__internal_attribute': ParamValue("hidden"), '__internal_variable': ParamValue("2.rougail.var2"), 'when': ParamValue(True), 'inverse': ParamValue(False), '_.var1': ParamOption(option_7, notraisepropertyerror=True)}), 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), '__internal_files': ParamValue(['../rougail-tests/structures/04_1auto_save_and_calculated_hidden/rougail/00-base.yml']), '__internal_attribute': ParamValue("frozen"), '__internal_variable': ParamValue("2.rougail.var2"), 'when': ParamValue(True), 'inverse': ParamValue(False), '_.var1': ParamOption(option_7, notraisepropertyerror=True)}), help_function=func['jinja_to_property_help'])}), informations={'type': 'string'}) optiondescription_6 = OptionDescription(name="rougail", doc="Rougail", group_type=groups.namespace, 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/04_1auto_save_and_calculated_hidden/tiramisu/no_namespace.py b/tests/dictionaries/04_1auto_save_and_calculated_hidden/tiramisu/no_namespace.py index 86684fe27..cfffcf115 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 @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") ALLOWED_LEADER_PROPERTIES.add("standard") ALLOWED_LEADER_PROPERTIES.add("advanced") @@ -10,5 +10,5 @@ dict_env['default_var2'] = "yes" dict_env['hidden_var2'] = "{% if _.var1 == \"yes\" %}\n_.var1 is yes\n{% endif %}\n" dict_env['frozen_var2'] = "{% if _.var1 == \"yes\" %}\n_.var1 is yes\n{% endif %}\n" option_1 = StrOption(name="var1", doc="a first variable", default="no", properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) -option_2 = StrOption(name="var2", doc="a second variable", default=Calculation(func['jinja_to_function'], Params((), kwargs={'__internal_jinja': ParamValue("default_var2"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['tests/dictionaries/04_1auto_save_and_calculated_hidden/dictionaries/rougail/00-base.yml']), '__internal_attribute': ParamValue("default"), '__internal_variable': ParamValue("var2")})), properties=frozenset({"basic", "force_store_value", "mandatory", Calculation(func['jinja_to_property'], Params((ParamValue("hidden")), kwargs={'__internal_jinja': ParamValue("hidden_var2"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['tests/dictionaries/04_1auto_save_and_calculated_hidden/dictionaries/rougail/00-base.yml']), '__internal_attribute': ParamValue("hidden"), '__internal_variable': ParamValue("var2"), 'when': ParamValue(True), 'inverse': ParamValue(False), '_.var1': ParamOption(option_1, notraisepropertyerror=True)}), 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), '__internal_files': ParamValue(['tests/dictionaries/04_1auto_save_and_calculated_hidden/dictionaries/rougail/00-base.yml']), '__internal_attribute': ParamValue("frozen"), '__internal_variable': ParamValue("var2"), 'when': ParamValue(True), 'inverse': ParamValue(False), '_.var1': ParamOption(option_1, notraisepropertyerror=True)}), help_function=func['jinja_to_property_help'])}), informations={'type': 'string'}) +option_2 = StrOption(name="var2", doc="a second variable", default=Calculation(func['jinja_to_function'], Params((), kwargs={'__internal_jinja': ParamValue("default_var2"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['../rougail-tests/structures/04_1auto_save_and_calculated_hidden/rougail/00-base.yml']), '__internal_attribute': ParamValue("default"), '__internal_variable': ParamValue("var2")})), properties=frozenset({"basic", "force_store_value", "mandatory", Calculation(func['jinja_to_property'], Params((ParamValue("hidden")), kwargs={'__internal_jinja': ParamValue("hidden_var2"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['../rougail-tests/structures/04_1auto_save_and_calculated_hidden/rougail/00-base.yml']), '__internal_attribute': ParamValue("hidden"), '__internal_variable': ParamValue("var2"), 'when': ParamValue(True), 'inverse': ParamValue(False), '_.var1': ParamOption(option_1, notraisepropertyerror=True)}), 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), '__internal_files': ParamValue(['../rougail-tests/structures/04_1auto_save_and_calculated_hidden/rougail/00-base.yml']), '__internal_attribute': ParamValue("frozen"), '__internal_variable': ParamValue("var2"), 'when': ParamValue(True), 'inverse': ParamValue(False), '_.var1': ParamOption(option_1, notraisepropertyerror=True)}), help_function=func['jinja_to_property_help'])}), informations={'type': 'string'}) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1, option_2]) diff --git a/tests/dictionaries/04_1auto_save_and_hidden/dictionaries/rougail/00-base.yml b/tests/dictionaries/04_1auto_save_and_hidden/dictionaries/rougail/00-base.yml deleted file mode 100644 index 94cde787b..000000000 --- a/tests/dictionaries/04_1auto_save_and_hidden/dictionaries/rougail/00-base.yml +++ /dev/null @@ -1,8 +0,0 @@ ---- -version: '1.1' -var: - description: autosave variable - auto_save: true - hidden: true - default: 'yes' - mandatory: false 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 59b182670..73b66e3f5 100644 --- a/tests/dictionaries/04_1auto_save_and_hidden/tiramisu/base.py +++ b/tests/dictionaries/04_1auto_save_and_hidden/tiramisu/base.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') try: groups.namespace except: 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 556720e73..60be4e27a 100644 --- a/tests/dictionaries/04_1auto_save_and_hidden/tiramisu/multi.py +++ b/tests/dictionaries/04_1auto_save_and_hidden/tiramisu/multi.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') try: groups.namespace except: 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 d99eb9cff..14a2819e3 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 @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") ALLOWED_LEADER_PROPERTIES.add("standard") ALLOWED_LEADER_PROPERTIES.add("advanced") diff --git a/tests/dictionaries/04_1default_calculation_hidden/dictionaries/rougail/00-base.yml b/tests/dictionaries/04_1default_calculation_hidden/dictionaries/rougail/00-base.yml deleted file mode 100644 index 4cc47d60a..000000000 --- a/tests/dictionaries/04_1default_calculation_hidden/dictionaries/rougail/00-base.yml +++ /dev/null @@ -1,20 +0,0 @@ ---- -version: 1.1 - -var1: - description: a first variable - default: value - -var2: - description: a second variable - disabled: - variable: _.var1 - when: value - -var3: - description: a third variable - default: - jinja: | - {% if _.var1 == 'value' or _.var2 == 'blah' %} - value - {% endif %} diff --git a/tests/dictionaries/04_1default_calculation_hidden/tiramisu/base.py b/tests/dictionaries/04_1default_calculation_hidden/tiramisu/base.py index ad8c1a20c..3dc5132a6 100644 --- a/tests/dictionaries/04_1default_calculation_hidden/tiramisu/base.py +++ b/tests/dictionaries/04_1default_calculation_hidden/tiramisu/base.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') try: groups.namespace except: @@ -13,6 +13,6 @@ ALLOWED_LEADER_PROPERTIES.add("advanced") dict_env['default_rougail.var3'] = "{% if _.var1 == 'value' or _.var2 == 'blah' %}\nvalue\n{% endif %}\n" option_2 = StrOption(name="var1", doc="a first variable", default="value", properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) option_3 = StrOption(name="var2", doc="a second variable", properties=frozenset({"basic", "mandatory", Calculation(func['variable_to_property'], Params((ParamValue("disabled"), ParamOption(option_2)), kwargs={'when': ParamValue("value"), 'inverse': ParamValue(False)}), help_function=func['variable_to_property'])}), informations={'type': 'string'}) -option_4 = StrOption(name="var3", doc="a third variable", default=Calculation(func['jinja_to_function'], Params((), kwargs={'__internal_jinja': ParamValue("default_rougail.var3"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['tests/dictionaries/04_1default_calculation_hidden/dictionaries/rougail/00-base.yml']), '__internal_attribute': ParamValue("default"), '__internal_variable': ParamValue("rougail.var3"), '_.var2': ParamOption(option_3, notraisepropertyerror=True), '_.var1': ParamOption(option_2, notraisepropertyerror=True)})), properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) +option_4 = StrOption(name="var3", doc="a third variable", default=Calculation(func['jinja_to_function'], Params((), kwargs={'__internal_jinja': ParamValue("default_rougail.var3"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['../rougail-tests/structures/04_1default_calculation_hidden/rougail/00-base.yml']), '__internal_attribute': ParamValue("default"), '__internal_variable': ParamValue("rougail.var3"), '_.var2': ParamOption(option_3, notraisepropertyerror=True), '_.var1': ParamOption(option_2, notraisepropertyerror=True)})), properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) optiondescription_1 = OptionDescription(name="rougail", doc="Rougail", group_type=groups.namespace, 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_1default_calculation_hidden/tiramisu/multi.py b/tests/dictionaries/04_1default_calculation_hidden/tiramisu/multi.py index 009da9fdc..c8632e358 100644 --- a/tests/dictionaries/04_1default_calculation_hidden/tiramisu/multi.py +++ b/tests/dictionaries/04_1default_calculation_hidden/tiramisu/multi.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') try: groups.namespace except: @@ -14,12 +14,12 @@ dict_env['default_1.rougail.var3'] = "{% if _.var1 == 'value' or _.var2 == 'blah dict_env['default_2.rougail.var3'] = "{% if _.var1 == 'value' or _.var2 == 'blah' %}\nvalue\n{% endif %}\n" option_3 = StrOption(name="var1", doc="a first variable", default="value", properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) option_4 = StrOption(name="var2", doc="a second variable", properties=frozenset({"basic", "mandatory", Calculation(func['variable_to_property'], Params((ParamValue("disabled"), ParamOption(option_3)), kwargs={'when': ParamValue("value"), 'inverse': ParamValue(False)}), help_function=func['variable_to_property'])}), informations={'type': 'string'}) -option_5 = StrOption(name="var3", doc="a third variable", default=Calculation(func['jinja_to_function'], Params((), kwargs={'__internal_jinja': ParamValue("default_1.rougail.var3"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['tests/dictionaries/04_1default_calculation_hidden/dictionaries/rougail/00-base.yml']), '__internal_attribute': ParamValue("default"), '__internal_variable': ParamValue("1.rougail.var3"), '_.var2': ParamOption(option_4, notraisepropertyerror=True), '_.var1': ParamOption(option_3, notraisepropertyerror=True)})), properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) +option_5 = StrOption(name="var3", doc="a third variable", default=Calculation(func['jinja_to_function'], Params((), kwargs={'__internal_jinja': ParamValue("default_1.rougail.var3"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['../rougail-tests/structures/04_1default_calculation_hidden/rougail/00-base.yml']), '__internal_attribute': ParamValue("default"), '__internal_variable': ParamValue("1.rougail.var3"), '_.var2': ParamOption(option_4, notraisepropertyerror=True), '_.var1': ParamOption(option_3, notraisepropertyerror=True)})), properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) optiondescription_2 = OptionDescription(name="rougail", doc="Rougail", group_type=groups.namespace, 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="var1", doc="a first variable", default="value", properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) option_9 = StrOption(name="var2", doc="a second variable", properties=frozenset({"basic", "mandatory", Calculation(func['variable_to_property'], Params((ParamValue("disabled"), ParamOption(option_8)), kwargs={'when': ParamValue("value"), 'inverse': ParamValue(False)}), help_function=func['variable_to_property'])}), informations={'type': 'string'}) -option_10 = StrOption(name="var3", doc="a third variable", default=Calculation(func['jinja_to_function'], Params((), kwargs={'__internal_jinja': ParamValue("default_2.rougail.var3"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['tests/dictionaries/04_1default_calculation_hidden/dictionaries/rougail/00-base.yml']), '__internal_attribute': ParamValue("default"), '__internal_variable': ParamValue("2.rougail.var3"), '_.var2': ParamOption(option_9, notraisepropertyerror=True), '_.var1': ParamOption(option_8, notraisepropertyerror=True)})), properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) +option_10 = StrOption(name="var3", doc="a third variable", default=Calculation(func['jinja_to_function'], Params((), kwargs={'__internal_jinja': ParamValue("default_2.rougail.var3"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['../rougail-tests/structures/04_1default_calculation_hidden/rougail/00-base.yml']), '__internal_attribute': ParamValue("default"), '__internal_variable': ParamValue("2.rougail.var3"), '_.var2': ParamOption(option_9, notraisepropertyerror=True), '_.var1': ParamOption(option_8, notraisepropertyerror=True)})), properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) optiondescription_7 = OptionDescription(name="rougail", doc="Rougail", group_type=groups.namespace, 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_1default_calculation_hidden/tiramisu/no_namespace.py b/tests/dictionaries/04_1default_calculation_hidden/tiramisu/no_namespace.py index c1d0ecf7a..c6d659898 100644 --- a/tests/dictionaries/04_1default_calculation_hidden/tiramisu/no_namespace.py +++ b/tests/dictionaries/04_1default_calculation_hidden/tiramisu/no_namespace.py @@ -2,12 +2,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') +load_functions('../rougail-tests/funcs/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") ALLOWED_LEADER_PROPERTIES.add("standard") ALLOWED_LEADER_PROPERTIES.add("advanced") dict_env['default_var3'] = "{% if _.var1 == 'value' or _.var2 == 'blah' %}\nvalue\n{% endif %}\n" option_1 = StrOption(name="var1", doc="a first variable", default="value", properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) option_2 = StrOption(name="var2", doc="a second variable", properties=frozenset({"basic", "mandatory", Calculation(func['variable_to_property'], Params((ParamValue("disabled"), ParamOption(option_1)), kwargs={'when': ParamValue("value"), 'inverse': ParamValue(False)}), help_function=func['variable_to_property'])}), informations={'type': 'string'}) -option_3 = StrOption(name="var3", doc="a third variable", default=Calculation(func['jinja_to_function'], Params((), kwargs={'__internal_jinja': ParamValue("default_var3"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['tests/dictionaries/04_1default_calculation_hidden/dictionaries/rougail/00-base.yml']), '__internal_attribute': ParamValue("default"), '__internal_variable': ParamValue("var3"), '_.var2': ParamOption(option_2, notraisepropertyerror=True), '_.var1': ParamOption(option_1, notraisepropertyerror=True)})), properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) +option_3 = StrOption(name="var3", doc="a third variable", default=Calculation(func['jinja_to_function'], Params((), kwargs={'__internal_jinja': ParamValue("default_var3"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['../rougail-tests/structures/04_1default_calculation_hidden/rougail/00-base.yml']), '__internal_attribute': ParamValue("default"), '__internal_variable': ParamValue("var3"), '_.var2': ParamOption(option_2, notraisepropertyerror=True), '_.var1': ParamOption(option_1, notraisepropertyerror=True)})), properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1, option_2, option_3]) diff --git a/tests/dictionaries/04_1default_calculation_hidden_2/dictionaries/rougail/00-base.yml b/tests/dictionaries/04_1default_calculation_hidden_2/dictionaries/rougail/00-base.yml deleted file mode 100644 index 69dea7d61..000000000 --- a/tests/dictionaries/04_1default_calculation_hidden_2/dictionaries/rougail/00-base.yml +++ /dev/null @@ -1,20 +0,0 @@ ---- -version: 1.1 - -var1: - description: a first variable - default: value - -var2: - description: a second variable - disabled: - variable: _.var1 - when: value - -var3: - description: a third variable - default: - jinja: | - {% if _.var2 is propertyerror %} - value - {% endif %} diff --git a/tests/dictionaries/04_1default_calculation_hidden_2/tiramisu/base.py b/tests/dictionaries/04_1default_calculation_hidden_2/tiramisu/base.py index f05031ca7..3643f39e7 100644 --- a/tests/dictionaries/04_1default_calculation_hidden_2/tiramisu/base.py +++ b/tests/dictionaries/04_1default_calculation_hidden_2/tiramisu/base.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') try: groups.namespace except: @@ -13,6 +13,6 @@ ALLOWED_LEADER_PROPERTIES.add("advanced") dict_env['default_rougail.var3'] = "{% if _.var2 is propertyerror %}\nvalue\n{% endif %}\n" option_2 = StrOption(name="var1", doc="a first variable", default="value", properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) option_3 = StrOption(name="var2", doc="a second variable", properties=frozenset({"basic", "mandatory", Calculation(func['variable_to_property'], Params((ParamValue("disabled"), ParamOption(option_2)), kwargs={'when': ParamValue("value"), 'inverse': ParamValue(False)}), help_function=func['variable_to_property'])}), informations={'type': 'string'}) -option_4 = StrOption(name="var3", doc="a third variable", default=Calculation(func['jinja_to_function'], Params((), kwargs={'__internal_jinja': ParamValue("default_rougail.var3"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['tests/dictionaries/04_1default_calculation_hidden_2/dictionaries/rougail/00-base.yml']), '__internal_attribute': ParamValue("default"), '__internal_variable': ParamValue("rougail.var3"), '_.var2': ParamOption(option_3, notraisepropertyerror=True)})), properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) +option_4 = StrOption(name="var3", doc="a third variable", default=Calculation(func['jinja_to_function'], Params((), kwargs={'__internal_jinja': ParamValue("default_rougail.var3"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['../rougail-tests/structures/04_1default_calculation_hidden_2/rougail/00-base.yml']), '__internal_attribute': ParamValue("default"), '__internal_variable': ParamValue("rougail.var3"), '_.var2': ParamOption(option_3, notraisepropertyerror=True)})), properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) optiondescription_1 = OptionDescription(name="rougail", doc="Rougail", group_type=groups.namespace, 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_1default_calculation_hidden_2/tiramisu/multi.py b/tests/dictionaries/04_1default_calculation_hidden_2/tiramisu/multi.py index 559685883..b2e1626c7 100644 --- a/tests/dictionaries/04_1default_calculation_hidden_2/tiramisu/multi.py +++ b/tests/dictionaries/04_1default_calculation_hidden_2/tiramisu/multi.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') try: groups.namespace except: @@ -14,12 +14,12 @@ dict_env['default_1.rougail.var3'] = "{% if _.var2 is propertyerror %}\nvalue\n{ dict_env['default_2.rougail.var3'] = "{% if _.var2 is propertyerror %}\nvalue\n{% endif %}\n" option_3 = StrOption(name="var1", doc="a first variable", default="value", properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) option_4 = StrOption(name="var2", doc="a second variable", properties=frozenset({"basic", "mandatory", Calculation(func['variable_to_property'], Params((ParamValue("disabled"), ParamOption(option_3)), kwargs={'when': ParamValue("value"), 'inverse': ParamValue(False)}), help_function=func['variable_to_property'])}), informations={'type': 'string'}) -option_5 = StrOption(name="var3", doc="a third variable", default=Calculation(func['jinja_to_function'], Params((), kwargs={'__internal_jinja': ParamValue("default_1.rougail.var3"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['tests/dictionaries/04_1default_calculation_hidden_2/dictionaries/rougail/00-base.yml']), '__internal_attribute': ParamValue("default"), '__internal_variable': ParamValue("1.rougail.var3"), '_.var2': ParamOption(option_4, notraisepropertyerror=True)})), properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) +option_5 = StrOption(name="var3", doc="a third variable", default=Calculation(func['jinja_to_function'], Params((), kwargs={'__internal_jinja': ParamValue("default_1.rougail.var3"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['../rougail-tests/structures/04_1default_calculation_hidden_2/rougail/00-base.yml']), '__internal_attribute': ParamValue("default"), '__internal_variable': ParamValue("1.rougail.var3"), '_.var2': ParamOption(option_4, notraisepropertyerror=True)})), properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) optiondescription_2 = OptionDescription(name="rougail", doc="Rougail", group_type=groups.namespace, 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="var1", doc="a first variable", default="value", properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) option_9 = StrOption(name="var2", doc="a second variable", properties=frozenset({"basic", "mandatory", Calculation(func['variable_to_property'], Params((ParamValue("disabled"), ParamOption(option_8)), kwargs={'when': ParamValue("value"), 'inverse': ParamValue(False)}), help_function=func['variable_to_property'])}), informations={'type': 'string'}) -option_10 = StrOption(name="var3", doc="a third variable", default=Calculation(func['jinja_to_function'], Params((), kwargs={'__internal_jinja': ParamValue("default_2.rougail.var3"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['tests/dictionaries/04_1default_calculation_hidden_2/dictionaries/rougail/00-base.yml']), '__internal_attribute': ParamValue("default"), '__internal_variable': ParamValue("2.rougail.var3"), '_.var2': ParamOption(option_9, notraisepropertyerror=True)})), properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) +option_10 = StrOption(name="var3", doc="a third variable", default=Calculation(func['jinja_to_function'], Params((), kwargs={'__internal_jinja': ParamValue("default_2.rougail.var3"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['../rougail-tests/structures/04_1default_calculation_hidden_2/rougail/00-base.yml']), '__internal_attribute': ParamValue("default"), '__internal_variable': ParamValue("2.rougail.var3"), '_.var2': ParamOption(option_9, notraisepropertyerror=True)})), properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) optiondescription_7 = OptionDescription(name="rougail", doc="Rougail", group_type=groups.namespace, 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_1default_calculation_hidden_2/tiramisu/no_namespace.py b/tests/dictionaries/04_1default_calculation_hidden_2/tiramisu/no_namespace.py index 7ce1a7b3a..155d5cd89 100644 --- a/tests/dictionaries/04_1default_calculation_hidden_2/tiramisu/no_namespace.py +++ b/tests/dictionaries/04_1default_calculation_hidden_2/tiramisu/no_namespace.py @@ -2,12 +2,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') +load_functions('../rougail-tests/funcs/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") ALLOWED_LEADER_PROPERTIES.add("standard") ALLOWED_LEADER_PROPERTIES.add("advanced") dict_env['default_var3'] = "{% if _.var2 is propertyerror %}\nvalue\n{% endif %}\n" option_1 = StrOption(name="var1", doc="a first variable", default="value", properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) option_2 = StrOption(name="var2", doc="a second variable", properties=frozenset({"basic", "mandatory", Calculation(func['variable_to_property'], Params((ParamValue("disabled"), ParamOption(option_1)), kwargs={'when': ParamValue("value"), 'inverse': ParamValue(False)}), help_function=func['variable_to_property'])}), informations={'type': 'string'}) -option_3 = StrOption(name="var3", doc="a third variable", default=Calculation(func['jinja_to_function'], Params((), kwargs={'__internal_jinja': ParamValue("default_var3"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['tests/dictionaries/04_1default_calculation_hidden_2/dictionaries/rougail/00-base.yml']), '__internal_attribute': ParamValue("default"), '__internal_variable': ParamValue("var3"), '_.var2': ParamOption(option_2, notraisepropertyerror=True)})), properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) +option_3 = StrOption(name="var3", doc="a third variable", default=Calculation(func['jinja_to_function'], Params((), kwargs={'__internal_jinja': ParamValue("default_var3"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['../rougail-tests/structures/04_1default_calculation_hidden_2/rougail/00-base.yml']), '__internal_attribute': ParamValue("default"), '__internal_variable': ParamValue("var3"), '_.var2': ParamOption(option_2, notraisepropertyerror=True)})), properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1, option_2, option_3]) diff --git a/tests/dictionaries/04_5disabled_calculation/dictionaries/rougail/00-base.yml b/tests/dictionaries/04_5disabled_calculation/dictionaries/rougail/00-base.yml deleted file mode 100644 index d26513a32..000000000 --- a/tests/dictionaries/04_5disabled_calculation/dictionaries/rougail/00-base.yml +++ /dev/null @@ -1,19 +0,0 @@ ---- -version: '1.1' -condition: "no" # a conditional variable -variable1: - description: a first variable - disabled: - jinja: | - {% if _.condition == "yes" %} - condition is yes - {% endif %} - description: if condition is egal to "yes" -variable2: - description: a second variable - disabled: - jinja: | - {% if _.condition == "yes" %} - condition is yes - {% endif %} - description: if condition is egal to "yes" diff --git a/tests/dictionaries/04_5disabled_calculation/force_namespace b/tests/dictionaries/04_5disabled_calculation/force_namespace deleted file mode 100644 index e69de29bb..000000000 diff --git a/tests/dictionaries/04_5disabled_calculation/tiramisu/base.py b/tests/dictionaries/04_5disabled_calculation/tiramisu/base.py index 46ffa2241..d4b49295a 100644 --- a/tests/dictionaries/04_5disabled_calculation/tiramisu/base.py +++ b/tests/dictionaries/04_5disabled_calculation/tiramisu/base.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') try: groups.namespace except: @@ -13,7 +13,7 @@ ALLOWED_LEADER_PROPERTIES.add("advanced") dict_env['disabled_rougail.variable1'] = "{% if _.condition == \"yes\" %}\ncondition is yes\n{% endif %}\n" dict_env['disabled_rougail.variable2'] = "{% if _.condition == \"yes\" %}\ncondition is yes\n{% endif %}\n" option_2 = StrOption(name="condition", doc="a conditional variable", default="no", properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) -option_3 = StrOption(name="variable1", doc="a first variable", properties=frozenset({"basic", "mandatory", Calculation(func['jinja_to_property'], Params((ParamValue("disabled")), kwargs={'__internal_jinja': ParamValue("disabled_rougail.variable1"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['tests/dictionaries/04_5disabled_calculation/dictionaries/rougail/00-base.yml']), '__internal_attribute': ParamValue("disabled"), '__internal_variable': ParamValue("rougail.variable1"), 'when': ParamValue(True), 'inverse': ParamValue(False), '_.condition': ParamOption(option_2, notraisepropertyerror=True)}), help_function=func['jinja_to_property_help'])}), informations={'type': 'string'}) -option_4 = StrOption(name="variable2", doc="a second variable", properties=frozenset({"basic", "mandatory", Calculation(func['jinja_to_property'], Params((ParamValue("disabled")), kwargs={'__internal_jinja': ParamValue("disabled_rougail.variable2"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['tests/dictionaries/04_5disabled_calculation/dictionaries/rougail/00-base.yml']), '__internal_attribute': ParamValue("disabled"), '__internal_variable': ParamValue("rougail.variable2"), 'when': ParamValue(True), 'inverse': ParamValue(False), '_.condition': ParamOption(option_2, notraisepropertyerror=True)}), help_function=func['jinja_to_property_help'])}), informations={'type': 'string'}) +option_3 = StrOption(name="variable1", doc="a first variable", properties=frozenset({"basic", "mandatory", Calculation(func['jinja_to_property'], Params((ParamValue("disabled")), kwargs={'__internal_jinja': ParamValue("disabled_rougail.variable1"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['../rougail-tests/structures/04_5disabled_calculation/rougail/00-base.yml']), '__internal_attribute': ParamValue("disabled"), '__internal_variable': ParamValue("rougail.variable1"), 'when': ParamValue(True), 'inverse': ParamValue(False), '_.condition': ParamOption(option_2, notraisepropertyerror=True)}), help_function=func['jinja_to_property_help'])}), informations={'type': 'string'}) +option_4 = StrOption(name="variable2", doc="a second variable", properties=frozenset({"basic", "mandatory", Calculation(func['jinja_to_property'], Params((ParamValue("disabled")), kwargs={'__internal_jinja': ParamValue("disabled_rougail.variable2"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['../rougail-tests/structures/04_5disabled_calculation/rougail/00-base.yml']), '__internal_attribute': ParamValue("disabled"), '__internal_variable': ParamValue("rougail.variable2"), 'when': ParamValue(True), 'inverse': ParamValue(False), '_.condition': ParamOption(option_2, notraisepropertyerror=True)}), help_function=func['jinja_to_property_help'])}), informations={'type': 'string'}) optiondescription_1 = OptionDescription(name="rougail", doc="Rougail", group_type=groups.namespace, 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/tiramisu/multi.py b/tests/dictionaries/04_5disabled_calculation/tiramisu/multi.py index e309673ad..0ab746ef3 100644 --- a/tests/dictionaries/04_5disabled_calculation/tiramisu/multi.py +++ b/tests/dictionaries/04_5disabled_calculation/tiramisu/multi.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') try: groups.namespace except: @@ -15,13 +15,13 @@ dict_env['disabled_1.rougail.variable2'] = "{% if _.condition == \"yes\" %}\ncon dict_env['disabled_2.rougail.variable1'] = "{% if _.condition == \"yes\" %}\ncondition is yes\n{% endif %}\n" dict_env['disabled_2.rougail.variable2'] = "{% if _.condition == \"yes\" %}\ncondition is yes\n{% endif %}\n" option_3 = StrOption(name="condition", doc="a conditional variable", default="no", properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) -option_4 = StrOption(name="variable1", doc="a first variable", properties=frozenset({"basic", "mandatory", Calculation(func['jinja_to_property'], Params((ParamValue("disabled")), kwargs={'__internal_jinja': ParamValue("disabled_1.rougail.variable1"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['tests/dictionaries/04_5disabled_calculation/dictionaries/rougail/00-base.yml']), '__internal_attribute': ParamValue("disabled"), '__internal_variable': ParamValue("1.rougail.variable1"), 'when': ParamValue(True), 'inverse': ParamValue(False), '_.condition': ParamOption(option_3, notraisepropertyerror=True)}), help_function=func['jinja_to_property_help'])}), informations={'type': 'string'}) -option_5 = StrOption(name="variable2", doc="a second variable", properties=frozenset({"basic", "mandatory", Calculation(func['jinja_to_property'], Params((ParamValue("disabled")), kwargs={'__internal_jinja': ParamValue("disabled_1.rougail.variable2"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['tests/dictionaries/04_5disabled_calculation/dictionaries/rougail/00-base.yml']), '__internal_attribute': ParamValue("disabled"), '__internal_variable': ParamValue("1.rougail.variable2"), 'when': ParamValue(True), 'inverse': ParamValue(False), '_.condition': ParamOption(option_3, notraisepropertyerror=True)}), help_function=func['jinja_to_property_help'])}), informations={'type': 'string'}) +option_4 = StrOption(name="variable1", doc="a first variable", properties=frozenset({"basic", "mandatory", Calculation(func['jinja_to_property'], Params((ParamValue("disabled")), kwargs={'__internal_jinja': ParamValue("disabled_1.rougail.variable1"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['../rougail-tests/structures/04_5disabled_calculation/rougail/00-base.yml']), '__internal_attribute': ParamValue("disabled"), '__internal_variable': ParamValue("1.rougail.variable1"), 'when': ParamValue(True), 'inverse': ParamValue(False), '_.condition': ParamOption(option_3, notraisepropertyerror=True)}), help_function=func['jinja_to_property_help'])}), informations={'type': 'string'}) +option_5 = StrOption(name="variable2", doc="a second variable", properties=frozenset({"basic", "mandatory", Calculation(func['jinja_to_property'], Params((ParamValue("disabled")), kwargs={'__internal_jinja': ParamValue("disabled_1.rougail.variable2"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['../rougail-tests/structures/04_5disabled_calculation/rougail/00-base.yml']), '__internal_attribute': ParamValue("disabled"), '__internal_variable': ParamValue("1.rougail.variable2"), 'when': ParamValue(True), 'inverse': ParamValue(False), '_.condition': ParamOption(option_3, notraisepropertyerror=True)}), help_function=func['jinja_to_property_help'])}), informations={'type': 'string'}) optiondescription_2 = OptionDescription(name="rougail", doc="Rougail", group_type=groups.namespace, 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 conditional variable", default="no", properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) -option_9 = StrOption(name="variable1", doc="a first variable", properties=frozenset({"basic", "mandatory", Calculation(func['jinja_to_property'], Params((ParamValue("disabled")), kwargs={'__internal_jinja': ParamValue("disabled_2.rougail.variable1"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['tests/dictionaries/04_5disabled_calculation/dictionaries/rougail/00-base.yml']), '__internal_attribute': ParamValue("disabled"), '__internal_variable': ParamValue("2.rougail.variable1"), 'when': ParamValue(True), 'inverse': ParamValue(False), '_.condition': ParamOption(option_8, notraisepropertyerror=True)}), help_function=func['jinja_to_property_help'])}), informations={'type': 'string'}) -option_10 = StrOption(name="variable2", doc="a second variable", properties=frozenset({"basic", "mandatory", Calculation(func['jinja_to_property'], Params((ParamValue("disabled")), kwargs={'__internal_jinja': ParamValue("disabled_2.rougail.variable2"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['tests/dictionaries/04_5disabled_calculation/dictionaries/rougail/00-base.yml']), '__internal_attribute': ParamValue("disabled"), '__internal_variable': ParamValue("2.rougail.variable2"), 'when': ParamValue(True), 'inverse': ParamValue(False), '_.condition': ParamOption(option_8, notraisepropertyerror=True)}), help_function=func['jinja_to_property_help'])}), informations={'type': 'string'}) +option_9 = StrOption(name="variable1", doc="a first variable", properties=frozenset({"basic", "mandatory", Calculation(func['jinja_to_property'], Params((ParamValue("disabled")), kwargs={'__internal_jinja': ParamValue("disabled_2.rougail.variable1"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['../rougail-tests/structures/04_5disabled_calculation/rougail/00-base.yml']), '__internal_attribute': ParamValue("disabled"), '__internal_variable': ParamValue("2.rougail.variable1"), 'when': ParamValue(True), 'inverse': ParamValue(False), '_.condition': ParamOption(option_8, notraisepropertyerror=True)}), help_function=func['jinja_to_property_help'])}), informations={'type': 'string'}) +option_10 = StrOption(name="variable2", doc="a second variable", properties=frozenset({"basic", "mandatory", Calculation(func['jinja_to_property'], Params((ParamValue("disabled")), kwargs={'__internal_jinja': ParamValue("disabled_2.rougail.variable2"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['../rougail-tests/structures/04_5disabled_calculation/rougail/00-base.yml']), '__internal_attribute': ParamValue("disabled"), '__internal_variable': ParamValue("2.rougail.variable2"), 'when': ParamValue(True), 'inverse': ParamValue(False), '_.condition': ParamOption(option_8, notraisepropertyerror=True)}), help_function=func['jinja_to_property_help'])}), informations={'type': 'string'}) optiondescription_7 = OptionDescription(name="rougail", doc="Rougail", group_type=groups.namespace, 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_default/dictionaries/rougail/00-base.yml b/tests/dictionaries/04_5disabled_calculation_default/dictionaries/rougail/00-base.yml deleted file mode 100644 index 67ff882bd..000000000 --- a/tests/dictionaries/04_5disabled_calculation_default/dictionaries/rougail/00-base.yml +++ /dev/null @@ -1,30 +0,0 @@ ---- -version: '1.1' - -condition: "no" # a condition - -var1: - description: a first variable - disabled: - jinja: | - {% if _.condition == "yes" %} - condition is yes - {% endif %} - description: if condition is yes - default: - jinja: | - {{ _.condition }} - description: the value of condition - -var2: - description: a second variable - disabled: - jinja: | - {% if rougail.condition == "yes" %} - condition is yes - {% endif %} - description: if condition is yes - default: - jinja: | - {{ rougail.condition }} - description: the value of condition diff --git a/tests/dictionaries/04_5disabled_calculation_default/force_namespace b/tests/dictionaries/04_5disabled_calculation_default/force_namespace deleted file mode 100644 index e69de29bb..000000000 diff --git a/tests/dictionaries/04_5disabled_calculation_default/tiramisu/base.py b/tests/dictionaries/04_5disabled_calculation_default/tiramisu/base.py index eacccc89f..36cf10162 100644 --- a/tests/dictionaries/04_5disabled_calculation_default/tiramisu/base.py +++ b/tests/dictionaries/04_5disabled_calculation_default/tiramisu/base.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') try: groups.namespace except: @@ -15,7 +15,7 @@ dict_env['disabled_rougail.var1'] = "{% if _.condition == \"yes\" %}\ncondition dict_env['default_rougail.var2'] = "{{ rougail.condition }}\n" dict_env['disabled_rougail.var2'] = "{% if rougail.condition == \"yes\" %}\ncondition is yes\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", default=Calculation(func['jinja_to_function'], Params((), kwargs={'__internal_jinja': ParamValue("default_rougail.var1"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['tests/dictionaries/04_5disabled_calculation_default/dictionaries/rougail/00-base.yml']), '__internal_attribute': ParamValue("default"), '__internal_variable': ParamValue("rougail.var1"), '_.condition': ParamOption(option_2, notraisepropertyerror=True)})), properties=frozenset({"mandatory", "standard", Calculation(func['jinja_to_property'], Params((ParamValue("disabled")), kwargs={'__internal_jinja': ParamValue("disabled_rougail.var1"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['tests/dictionaries/04_5disabled_calculation_default/dictionaries/rougail/00-base.yml']), '__internal_attribute': ParamValue("disabled"), '__internal_variable': ParamValue("rougail.var1"), 'when': ParamValue(True), 'inverse': ParamValue(False), '_.condition': ParamOption(option_2, notraisepropertyerror=True)}), help_function=func['jinja_to_property_help'])}), informations={'type': 'string'}) -option_4 = StrOption(name="var2", doc="a second variable", default=Calculation(func['jinja_to_function'], Params((), kwargs={'__internal_jinja': ParamValue("default_rougail.var2"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['tests/dictionaries/04_5disabled_calculation_default/dictionaries/rougail/00-base.yml']), '__internal_attribute': ParamValue("default"), '__internal_variable': ParamValue("rougail.var2"), 'rougail.condition': ParamOption(option_2, notraisepropertyerror=True)})), properties=frozenset({"mandatory", "standard", Calculation(func['jinja_to_property'], Params((ParamValue("disabled")), kwargs={'__internal_jinja': ParamValue("disabled_rougail.var2"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['tests/dictionaries/04_5disabled_calculation_default/dictionaries/rougail/00-base.yml']), '__internal_attribute': ParamValue("disabled"), '__internal_variable': ParamValue("rougail.var2"), 'when': ParamValue(True), 'inverse': ParamValue(False), 'rougail.condition': ParamOption(option_2, notraisepropertyerror=True)}), help_function=func['jinja_to_property_help'])}), informations={'type': 'string'}) +option_3 = StrOption(name="var1", doc="a first variable", default=Calculation(func['jinja_to_function'], Params((), kwargs={'__internal_jinja': ParamValue("default_rougail.var1"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['../rougail-tests/structures/04_5disabled_calculation_default/rougail/00-base.yml']), '__internal_attribute': ParamValue("default"), '__internal_variable': ParamValue("rougail.var1"), '_.condition': ParamOption(option_2, notraisepropertyerror=True)})), properties=frozenset({"mandatory", "standard", Calculation(func['jinja_to_property'], Params((ParamValue("disabled")), kwargs={'__internal_jinja': ParamValue("disabled_rougail.var1"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['../rougail-tests/structures/04_5disabled_calculation_default/rougail/00-base.yml']), '__internal_attribute': ParamValue("disabled"), '__internal_variable': ParamValue("rougail.var1"), 'when': ParamValue(True), 'inverse': ParamValue(False), '_.condition': ParamOption(option_2, notraisepropertyerror=True)}), help_function=func['jinja_to_property_help'])}), informations={'type': 'string'}) +option_4 = StrOption(name="var2", doc="a second variable", default=Calculation(func['jinja_to_function'], Params((), kwargs={'__internal_jinja': ParamValue("default_rougail.var2"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['../rougail-tests/structures/04_5disabled_calculation_default/rougail/00-base.yml']), '__internal_attribute': ParamValue("default"), '__internal_variable': ParamValue("rougail.var2"), 'rougail.condition': ParamOption(option_2, notraisepropertyerror=True)})), properties=frozenset({"mandatory", "standard", Calculation(func['jinja_to_property'], Params((ParamValue("disabled")), kwargs={'__internal_jinja': ParamValue("disabled_rougail.var2"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['../rougail-tests/structures/04_5disabled_calculation_default/rougail/00-base.yml']), '__internal_attribute': ParamValue("disabled"), '__internal_variable': ParamValue("rougail.var2"), 'when': ParamValue(True), 'inverse': ParamValue(False), 'rougail.condition': ParamOption(option_2, notraisepropertyerror=True)}), help_function=func['jinja_to_property_help'])}), informations={'type': 'string'}) optiondescription_1 = OptionDescription(name="rougail", doc="Rougail", group_type=groups.namespace, children=[option_2, option_3, option_4], properties=frozenset({"standard"})) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_1]) diff --git a/tests/dictionaries/04_5disabled_calculation_default/tiramisu/multi.py b/tests/dictionaries/04_5disabled_calculation_default/tiramisu/multi.py index 5cc6cbc98..d61882841 100644 --- a/tests/dictionaries/04_5disabled_calculation_default/tiramisu/multi.py +++ b/tests/dictionaries/04_5disabled_calculation_default/tiramisu/multi.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') try: groups.namespace except: @@ -19,13 +19,13 @@ dict_env['disabled_2.rougail.var1'] = "{% if _.condition == \"yes\" %}\nconditio dict_env['default_2.rougail.var2'] = "{{ rougail.condition }}\n" dict_env['disabled_2.rougail.var2'] = "{% if rougail.condition == \"yes\" %}\ncondition is yes\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", default=Calculation(func['jinja_to_function'], Params((), kwargs={'__internal_jinja': ParamValue("default_1.rougail.var1"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['tests/dictionaries/04_5disabled_calculation_default/dictionaries/rougail/00-base.yml']), '__internal_attribute': ParamValue("default"), '__internal_variable': ParamValue("1.rougail.var1"), '_.condition': ParamOption(option_3, notraisepropertyerror=True)})), properties=frozenset({"mandatory", "standard", Calculation(func['jinja_to_property'], Params((ParamValue("disabled")), kwargs={'__internal_jinja': ParamValue("disabled_1.rougail.var1"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['tests/dictionaries/04_5disabled_calculation_default/dictionaries/rougail/00-base.yml']), '__internal_attribute': ParamValue("disabled"), '__internal_variable': ParamValue("1.rougail.var1"), 'when': ParamValue(True), 'inverse': ParamValue(False), '_.condition': ParamOption(option_3, notraisepropertyerror=True)}), help_function=func['jinja_to_property_help'])}), informations={'type': 'string'}) -option_5 = StrOption(name="var2", doc="a second variable", default=Calculation(func['jinja_to_function'], Params((), kwargs={'__internal_jinja': ParamValue("default_1.rougail.var2"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['tests/dictionaries/04_5disabled_calculation_default/dictionaries/rougail/00-base.yml']), '__internal_attribute': ParamValue("default"), '__internal_variable': ParamValue("1.rougail.var2"), 'rougail.condition': ParamOption(option_3, notraisepropertyerror=True)})), properties=frozenset({"mandatory", "standard", Calculation(func['jinja_to_property'], Params((ParamValue("disabled")), kwargs={'__internal_jinja': ParamValue("disabled_1.rougail.var2"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['tests/dictionaries/04_5disabled_calculation_default/dictionaries/rougail/00-base.yml']), '__internal_attribute': ParamValue("disabled"), '__internal_variable': ParamValue("1.rougail.var2"), 'when': ParamValue(True), 'inverse': ParamValue(False), 'rougail.condition': ParamOption(option_3, notraisepropertyerror=True)}), help_function=func['jinja_to_property_help'])}), informations={'type': 'string'}) +option_4 = StrOption(name="var1", doc="a first variable", default=Calculation(func['jinja_to_function'], Params((), kwargs={'__internal_jinja': ParamValue("default_1.rougail.var1"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['../rougail-tests/structures/04_5disabled_calculation_default/rougail/00-base.yml']), '__internal_attribute': ParamValue("default"), '__internal_variable': ParamValue("1.rougail.var1"), '_.condition': ParamOption(option_3, notraisepropertyerror=True)})), properties=frozenset({"mandatory", "standard", Calculation(func['jinja_to_property'], Params((ParamValue("disabled")), kwargs={'__internal_jinja': ParamValue("disabled_1.rougail.var1"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['../rougail-tests/structures/04_5disabled_calculation_default/rougail/00-base.yml']), '__internal_attribute': ParamValue("disabled"), '__internal_variable': ParamValue("1.rougail.var1"), 'when': ParamValue(True), 'inverse': ParamValue(False), '_.condition': ParamOption(option_3, notraisepropertyerror=True)}), help_function=func['jinja_to_property_help'])}), informations={'type': 'string'}) +option_5 = StrOption(name="var2", doc="a second variable", default=Calculation(func['jinja_to_function'], Params((), kwargs={'__internal_jinja': ParamValue("default_1.rougail.var2"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['../rougail-tests/structures/04_5disabled_calculation_default/rougail/00-base.yml']), '__internal_attribute': ParamValue("default"), '__internal_variable': ParamValue("1.rougail.var2"), 'rougail.condition': ParamOption(option_3, notraisepropertyerror=True)})), properties=frozenset({"mandatory", "standard", Calculation(func['jinja_to_property'], Params((ParamValue("disabled")), kwargs={'__internal_jinja': ParamValue("disabled_1.rougail.var2"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['../rougail-tests/structures/04_5disabled_calculation_default/rougail/00-base.yml']), '__internal_attribute': ParamValue("disabled"), '__internal_variable': ParamValue("1.rougail.var2"), 'when': ParamValue(True), 'inverse': ParamValue(False), 'rougail.condition': ParamOption(option_3, notraisepropertyerror=True)}), help_function=func['jinja_to_property_help'])}), informations={'type': 'string'}) optiondescription_2 = OptionDescription(name="rougail", doc="Rougail", group_type=groups.namespace, children=[option_3, option_4, option_5], properties=frozenset({"standard"})) optiondescription_1 = OptionDescription(name="1", doc="1", children=[optiondescription_2], properties=frozenset({"standard"})) 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", default=Calculation(func['jinja_to_function'], Params((), kwargs={'__internal_jinja': ParamValue("default_2.rougail.var1"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['tests/dictionaries/04_5disabled_calculation_default/dictionaries/rougail/00-base.yml']), '__internal_attribute': ParamValue("default"), '__internal_variable': ParamValue("2.rougail.var1"), '_.condition': ParamOption(option_8, notraisepropertyerror=True)})), properties=frozenset({"mandatory", "standard", Calculation(func['jinja_to_property'], Params((ParamValue("disabled")), kwargs={'__internal_jinja': ParamValue("disabled_2.rougail.var1"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['tests/dictionaries/04_5disabled_calculation_default/dictionaries/rougail/00-base.yml']), '__internal_attribute': ParamValue("disabled"), '__internal_variable': ParamValue("2.rougail.var1"), 'when': ParamValue(True), 'inverse': ParamValue(False), '_.condition': ParamOption(option_8, notraisepropertyerror=True)}), help_function=func['jinja_to_property_help'])}), informations={'type': 'string'}) -option_10 = StrOption(name="var2", doc="a second variable", default=Calculation(func['jinja_to_function'], Params((), kwargs={'__internal_jinja': ParamValue("default_2.rougail.var2"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['tests/dictionaries/04_5disabled_calculation_default/dictionaries/rougail/00-base.yml']), '__internal_attribute': ParamValue("default"), '__internal_variable': ParamValue("2.rougail.var2"), 'rougail.condition': ParamOption(option_8, notraisepropertyerror=True)})), properties=frozenset({"mandatory", "standard", Calculation(func['jinja_to_property'], Params((ParamValue("disabled")), kwargs={'__internal_jinja': ParamValue("disabled_2.rougail.var2"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['tests/dictionaries/04_5disabled_calculation_default/dictionaries/rougail/00-base.yml']), '__internal_attribute': ParamValue("disabled"), '__internal_variable': ParamValue("2.rougail.var2"), 'when': ParamValue(True), 'inverse': ParamValue(False), 'rougail.condition': ParamOption(option_8, notraisepropertyerror=True)}), help_function=func['jinja_to_property_help'])}), informations={'type': 'string'}) +option_9 = StrOption(name="var1", doc="a first variable", default=Calculation(func['jinja_to_function'], Params((), kwargs={'__internal_jinja': ParamValue("default_2.rougail.var1"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['../rougail-tests/structures/04_5disabled_calculation_default/rougail/00-base.yml']), '__internal_attribute': ParamValue("default"), '__internal_variable': ParamValue("2.rougail.var1"), '_.condition': ParamOption(option_8, notraisepropertyerror=True)})), properties=frozenset({"mandatory", "standard", Calculation(func['jinja_to_property'], Params((ParamValue("disabled")), kwargs={'__internal_jinja': ParamValue("disabled_2.rougail.var1"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['../rougail-tests/structures/04_5disabled_calculation_default/rougail/00-base.yml']), '__internal_attribute': ParamValue("disabled"), '__internal_variable': ParamValue("2.rougail.var1"), 'when': ParamValue(True), 'inverse': ParamValue(False), '_.condition': ParamOption(option_8, notraisepropertyerror=True)}), help_function=func['jinja_to_property_help'])}), informations={'type': 'string'}) +option_10 = StrOption(name="var2", doc="a second variable", default=Calculation(func['jinja_to_function'], Params((), kwargs={'__internal_jinja': ParamValue("default_2.rougail.var2"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['../rougail-tests/structures/04_5disabled_calculation_default/rougail/00-base.yml']), '__internal_attribute': ParamValue("default"), '__internal_variable': ParamValue("2.rougail.var2"), 'rougail.condition': ParamOption(option_8, notraisepropertyerror=True)})), properties=frozenset({"mandatory", "standard", Calculation(func['jinja_to_property'], Params((ParamValue("disabled")), kwargs={'__internal_jinja': ParamValue("disabled_2.rougail.var2"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['../rougail-tests/structures/04_5disabled_calculation_default/rougail/00-base.yml']), '__internal_attribute': ParamValue("disabled"), '__internal_variable': ParamValue("2.rougail.var2"), 'when': ParamValue(True), 'inverse': ParamValue(False), 'rougail.condition': ParamOption(option_8, notraisepropertyerror=True)}), help_function=func['jinja_to_property_help'])}), informations={'type': 'string'}) optiondescription_7 = OptionDescription(name="rougail", doc="Rougail", group_type=groups.namespace, children=[option_8, option_9, option_10], properties=frozenset({"standard"})) optiondescription_6 = OptionDescription(name="2", doc="2", children=[optiondescription_7], properties=frozenset({"standard"})) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_1, optiondescription_6]) 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 deleted file mode 100644 index bc444e1b1..000000000 --- a/tests/dictionaries/04_5disabled_calculation_optional/dictionaries/rougail/00-base.yml +++ /dev/null @@ -1,33 +0,0 @@ ---- -version: '1.1' -condition: "no" # a condition -var1: - description: a first variable - hidden: - jinja: | - {% if unknown is not defined %} - unknown is undefined - {% elif unknown == "no" %} - unknown is no - {% endif %} - params: - unknown: - variable: _.unknown - optional: true - description: calculation from an unknown variable - mandatory: false -var2: - description: a second variable - hidden: - jinja: | - {% if condition is not defined %} - condition is undefined - {% elif condition == "no" %} - condition is no - {% endif %} - params: - condition: - variable: _.condition - optional: true - description: calculation from an condition variable - mandatory: false diff --git a/tests/dictionaries/04_5disabled_calculation_optional/tiramisu/base.py b/tests/dictionaries/04_5disabled_calculation_optional/tiramisu/base.py index 4bf1291d6..e3ce98f4d 100644 --- a/tests/dictionaries/04_5disabled_calculation_optional/tiramisu/base.py +++ b/tests/dictionaries/04_5disabled_calculation_optional/tiramisu/base.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') try: groups.namespace except: @@ -15,7 +15,7 @@ dict_env['frozen_rougail.var1'] = "{% if unknown is not defined %}\nunknown is u 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({"force_default_on_freeze", "standard", Calculation(func['jinja_to_property'], Params((ParamValue("hidden")), kwargs={'__internal_jinja': ParamValue("hidden_rougail.var1"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['tests/dictionaries/04_5disabled_calculation_optional/dictionaries/rougail/00-base.yml']), '__internal_attribute': ParamValue("hidden"), '__internal_variable': ParamValue("rougail.var1"), '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), '__internal_files': ParamValue(['tests/dictionaries/04_5disabled_calculation_optional/dictionaries/rougail/00-base.yml']), '__internal_attribute': ParamValue("frozen"), '__internal_variable': ParamValue("rougail.var1"), '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({"force_default_on_freeze", "standard", Calculation(func['jinja_to_property'], Params((ParamValue("hidden")), kwargs={'__internal_jinja': ParamValue("hidden_rougail.var2"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['tests/dictionaries/04_5disabled_calculation_optional/dictionaries/rougail/00-base.yml']), '__internal_attribute': ParamValue("hidden"), '__internal_variable': ParamValue("rougail.var2"), '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), '__internal_files': ParamValue(['tests/dictionaries/04_5disabled_calculation_optional/dictionaries/rougail/00-base.yml']), '__internal_attribute': ParamValue("frozen"), '__internal_variable': ParamValue("rougail.var2"), 'condition': ParamOption(option_2), 'when': ParamValue(True), 'inverse': ParamValue(False)}), help_function=func['jinja_to_property_help'])}), informations={'type': 'string'}) +option_3 = StrOption(name="var1", doc="a first variable", properties=frozenset({"force_default_on_freeze", "standard", Calculation(func['jinja_to_property'], Params((ParamValue("hidden")), kwargs={'__internal_jinja': ParamValue("hidden_rougail.var1"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['../rougail-tests/structures/04_5disabled_calculation_optional/rougail/00-base.yml']), '__internal_attribute': ParamValue("hidden"), '__internal_variable': ParamValue("rougail.var1"), '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), '__internal_files': ParamValue(['../rougail-tests/structures/04_5disabled_calculation_optional/rougail/00-base.yml']), '__internal_attribute': ParamValue("frozen"), '__internal_variable': ParamValue("rougail.var1"), '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({"force_default_on_freeze", "standard", Calculation(func['jinja_to_property'], Params((ParamValue("hidden")), kwargs={'__internal_jinja': ParamValue("hidden_rougail.var2"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['../rougail-tests/structures/04_5disabled_calculation_optional/rougail/00-base.yml']), '__internal_attribute': ParamValue("hidden"), '__internal_variable': ParamValue("rougail.var2"), '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), '__internal_files': ParamValue(['../rougail-tests/structures/04_5disabled_calculation_optional/rougail/00-base.yml']), '__internal_attribute': ParamValue("frozen"), '__internal_variable': ParamValue("rougail.var2"), '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", group_type=groups.namespace, children=[option_2, option_3, option_4], properties=frozenset({"standard"})) 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 fcd7775b3..c3dc2a108 100644 --- a/tests/dictionaries/04_5disabled_calculation_optional/tiramisu/multi.py +++ b/tests/dictionaries/04_5disabled_calculation_optional/tiramisu/multi.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') try: groups.namespace except: @@ -19,13 +19,13 @@ dict_env['frozen_2.rougail.var1'] = "{% if unknown is not defined %}\nunknown is 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({"force_default_on_freeze", "standard", Calculation(func['jinja_to_property'], Params((ParamValue("hidden")), kwargs={'__internal_jinja': ParamValue("hidden_1.rougail.var1"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['tests/dictionaries/04_5disabled_calculation_optional/dictionaries/rougail/00-base.yml']), '__internal_attribute': ParamValue("hidden"), '__internal_variable': ParamValue("1.rougail.var1"), '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), '__internal_files': ParamValue(['tests/dictionaries/04_5disabled_calculation_optional/dictionaries/rougail/00-base.yml']), '__internal_attribute': ParamValue("frozen"), '__internal_variable': ParamValue("1.rougail.var1"), '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({"force_default_on_freeze", "standard", Calculation(func['jinja_to_property'], Params((ParamValue("hidden")), kwargs={'__internal_jinja': ParamValue("hidden_1.rougail.var2"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['tests/dictionaries/04_5disabled_calculation_optional/dictionaries/rougail/00-base.yml']), '__internal_attribute': ParamValue("hidden"), '__internal_variable': ParamValue("1.rougail.var2"), '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), '__internal_files': ParamValue(['tests/dictionaries/04_5disabled_calculation_optional/dictionaries/rougail/00-base.yml']), '__internal_attribute': ParamValue("frozen"), '__internal_variable': ParamValue("1.rougail.var2"), 'condition': ParamOption(option_3), 'when': ParamValue(True), 'inverse': ParamValue(False)}), help_function=func['jinja_to_property_help'])}), informations={'type': 'string'}) +option_4 = StrOption(name="var1", doc="a first variable", properties=frozenset({"force_default_on_freeze", "standard", Calculation(func['jinja_to_property'], Params((ParamValue("hidden")), kwargs={'__internal_jinja': ParamValue("hidden_1.rougail.var1"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['../rougail-tests/structures/04_5disabled_calculation_optional/rougail/00-base.yml']), '__internal_attribute': ParamValue("hidden"), '__internal_variable': ParamValue("1.rougail.var1"), '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), '__internal_files': ParamValue(['../rougail-tests/structures/04_5disabled_calculation_optional/rougail/00-base.yml']), '__internal_attribute': ParamValue("frozen"), '__internal_variable': ParamValue("1.rougail.var1"), '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({"force_default_on_freeze", "standard", Calculation(func['jinja_to_property'], Params((ParamValue("hidden")), kwargs={'__internal_jinja': ParamValue("hidden_1.rougail.var2"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['../rougail-tests/structures/04_5disabled_calculation_optional/rougail/00-base.yml']), '__internal_attribute': ParamValue("hidden"), '__internal_variable': ParamValue("1.rougail.var2"), '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), '__internal_files': ParamValue(['../rougail-tests/structures/04_5disabled_calculation_optional/rougail/00-base.yml']), '__internal_attribute': ParamValue("frozen"), '__internal_variable': ParamValue("1.rougail.var2"), '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", group_type=groups.namespace, children=[option_3, option_4, option_5], properties=frozenset({"standard"})) optiondescription_1 = OptionDescription(name="1", doc="1", children=[optiondescription_2], properties=frozenset({"standard"})) 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({"force_default_on_freeze", "standard", Calculation(func['jinja_to_property'], Params((ParamValue("hidden")), kwargs={'__internal_jinja': ParamValue("hidden_2.rougail.var1"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['tests/dictionaries/04_5disabled_calculation_optional/dictionaries/rougail/00-base.yml']), '__internal_attribute': ParamValue("hidden"), '__internal_variable': ParamValue("2.rougail.var1"), '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), '__internal_files': ParamValue(['tests/dictionaries/04_5disabled_calculation_optional/dictionaries/rougail/00-base.yml']), '__internal_attribute': ParamValue("frozen"), '__internal_variable': ParamValue("2.rougail.var1"), '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({"force_default_on_freeze", "standard", Calculation(func['jinja_to_property'], Params((ParamValue("hidden")), kwargs={'__internal_jinja': ParamValue("hidden_2.rougail.var2"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['tests/dictionaries/04_5disabled_calculation_optional/dictionaries/rougail/00-base.yml']), '__internal_attribute': ParamValue("hidden"), '__internal_variable': ParamValue("2.rougail.var2"), '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), '__internal_files': ParamValue(['tests/dictionaries/04_5disabled_calculation_optional/dictionaries/rougail/00-base.yml']), '__internal_attribute': ParamValue("frozen"), '__internal_variable': ParamValue("2.rougail.var2"), 'condition': ParamOption(option_8), 'when': ParamValue(True), 'inverse': ParamValue(False)}), help_function=func['jinja_to_property_help'])}), informations={'type': 'string'}) +option_9 = StrOption(name="var1", doc="a first variable", properties=frozenset({"force_default_on_freeze", "standard", Calculation(func['jinja_to_property'], Params((ParamValue("hidden")), kwargs={'__internal_jinja': ParamValue("hidden_2.rougail.var1"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['../rougail-tests/structures/04_5disabled_calculation_optional/rougail/00-base.yml']), '__internal_attribute': ParamValue("hidden"), '__internal_variable': ParamValue("2.rougail.var1"), '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), '__internal_files': ParamValue(['../rougail-tests/structures/04_5disabled_calculation_optional/rougail/00-base.yml']), '__internal_attribute': ParamValue("frozen"), '__internal_variable': ParamValue("2.rougail.var1"), '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({"force_default_on_freeze", "standard", Calculation(func['jinja_to_property'], Params((ParamValue("hidden")), kwargs={'__internal_jinja': ParamValue("hidden_2.rougail.var2"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['../rougail-tests/structures/04_5disabled_calculation_optional/rougail/00-base.yml']), '__internal_attribute': ParamValue("hidden"), '__internal_variable': ParamValue("2.rougail.var2"), '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), '__internal_files': ParamValue(['../rougail-tests/structures/04_5disabled_calculation_optional/rougail/00-base.yml']), '__internal_attribute': ParamValue("frozen"), '__internal_variable': ParamValue("2.rougail.var2"), '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", group_type=groups.namespace, children=[option_8, option_9, option_10], properties=frozenset({"standard"})) optiondescription_6 = OptionDescription(name="2", doc="2", children=[optiondescription_7], properties=frozenset({"standard"})) 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 114a0542a..c6d37926b 100644 --- a/tests/dictionaries/04_5disabled_calculation_optional/tiramisu/no_namespace.py +++ b/tests/dictionaries/04_5disabled_calculation_optional/tiramisu/no_namespace.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") ALLOWED_LEADER_PROPERTIES.add("standard") ALLOWED_LEADER_PROPERTIES.add("advanced") @@ -11,6 +11,6 @@ dict_env['frozen_var1'] = "{% if unknown is not defined %}\nunknown is undefined 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({"force_default_on_freeze", "standard", Calculation(func['jinja_to_property'], Params((ParamValue("hidden")), kwargs={'__internal_jinja': ParamValue("hidden_var1"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['tests/dictionaries/04_5disabled_calculation_optional/dictionaries/rougail/00-base.yml']), '__internal_attribute': ParamValue("hidden"), '__internal_variable': ParamValue("var1"), '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_var1"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['tests/dictionaries/04_5disabled_calculation_optional/dictionaries/rougail/00-base.yml']), '__internal_attribute': ParamValue("frozen"), '__internal_variable': ParamValue("var1"), 'when': ParamValue(True), 'inverse': ParamValue(False)}), help_function=func['jinja_to_property_help'])}), informations={'type': 'string'}) -option_3 = StrOption(name="var2", doc="a second variable", properties=frozenset({"force_default_on_freeze", "standard", Calculation(func['jinja_to_property'], Params((ParamValue("hidden")), kwargs={'__internal_jinja': ParamValue("hidden_var2"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['tests/dictionaries/04_5disabled_calculation_optional/dictionaries/rougail/00-base.yml']), '__internal_attribute': ParamValue("hidden"), '__internal_variable': ParamValue("var2"), '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), '__internal_files': ParamValue(['tests/dictionaries/04_5disabled_calculation_optional/dictionaries/rougail/00-base.yml']), '__internal_attribute': ParamValue("frozen"), '__internal_variable': ParamValue("var2"), 'condition': ParamOption(option_1), 'when': ParamValue(True), 'inverse': ParamValue(False)}), help_function=func['jinja_to_property_help'])}), informations={'type': 'string'}) +option_2 = StrOption(name="var1", doc="a first variable", properties=frozenset({"force_default_on_freeze", "standard", Calculation(func['jinja_to_property'], Params((ParamValue("hidden")), kwargs={'__internal_jinja': ParamValue("hidden_var1"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['../rougail-tests/structures/04_5disabled_calculation_optional/rougail/00-base.yml']), '__internal_attribute': ParamValue("hidden"), '__internal_variable': ParamValue("var1"), '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_var1"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['../rougail-tests/structures/04_5disabled_calculation_optional/rougail/00-base.yml']), '__internal_attribute': ParamValue("frozen"), '__internal_variable': ParamValue("var1"), 'when': ParamValue(True), 'inverse': ParamValue(False)}), help_function=func['jinja_to_property_help'])}), informations={'type': 'string'}) +option_3 = StrOption(name="var2", doc="a second variable", properties=frozenset({"force_default_on_freeze", "standard", Calculation(func['jinja_to_property'], Params((ParamValue("hidden")), kwargs={'__internal_jinja': ParamValue("hidden_var2"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['../rougail-tests/structures/04_5disabled_calculation_optional/rougail/00-base.yml']), '__internal_attribute': ParamValue("hidden"), '__internal_variable': ParamValue("var2"), '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), '__internal_files': ParamValue(['../rougail-tests/structures/04_5disabled_calculation_optional/rougail/00-base.yml']), '__internal_attribute': ParamValue("frozen"), '__internal_variable': ParamValue("var2"), '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 deleted file mode 100644 index 403274bbc..000000000 --- a/tests/dictionaries/04_5disabled_calculation_variable/dictionaries/rougail/00-base.yml +++ /dev/null @@ -1,7 +0,0 @@ ---- -version: '1.1' -condition: false # a condition -variable: - description: a variable - disabled: - 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 ed4f0b342..bb3cc5d76 100644 --- a/tests/dictionaries/04_5disabled_calculation_variable/tiramisu/base.py +++ b/tests/dictionaries/04_5disabled_calculation_variable/tiramisu/base.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') try: groups.namespace except: diff --git a/tests/dictionaries/04_5disabled_calculation_variable/tiramisu/multi.py b/tests/dictionaries/04_5disabled_calculation_variable/tiramisu/multi.py index 22be73757..625472e52 100644 --- a/tests/dictionaries/04_5disabled_calculation_variable/tiramisu/multi.py +++ b/tests/dictionaries/04_5disabled_calculation_variable/tiramisu/multi.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') try: groups.namespace except: 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 fa6c63deb..a9ea6f605 100644 --- a/tests/dictionaries/04_5disabled_calculation_variable/tiramisu/no_namespace.py +++ b/tests/dictionaries/04_5disabled_calculation_variable/tiramisu/no_namespace.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") ALLOWED_LEADER_PROPERTIES.add("standard") ALLOWED_LEADER_PROPERTIES.add("advanced") 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 deleted file mode 100644 index ea102327c..000000000 --- a/tests/dictionaries/04_5disabled_calculation_variable2/dictionaries/rougail/00-base.yml +++ /dev/null @@ -1,7 +0,0 @@ ---- -version: '1.1' -condition: true # a condition -variable: - description: a variable - disabled: - 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 b9a38a85d..5bf88a689 100644 --- a/tests/dictionaries/04_5disabled_calculation_variable2/tiramisu/base.py +++ b/tests/dictionaries/04_5disabled_calculation_variable2/tiramisu/base.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') try: groups.namespace except: diff --git a/tests/dictionaries/04_5disabled_calculation_variable2/tiramisu/multi.py b/tests/dictionaries/04_5disabled_calculation_variable2/tiramisu/multi.py index fdbca1916..7e231de81 100644 --- a/tests/dictionaries/04_5disabled_calculation_variable2/tiramisu/multi.py +++ b/tests/dictionaries/04_5disabled_calculation_variable2/tiramisu/multi.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') try: groups.namespace except: 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 5b60384bc..d5ea57295 100644 --- a/tests/dictionaries/04_5disabled_calculation_variable2/tiramisu/no_namespace.py +++ b/tests/dictionaries/04_5disabled_calculation_variable2/tiramisu/no_namespace.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") ALLOWED_LEADER_PROPERTIES.add("standard") ALLOWED_LEADER_PROPERTIES.add("advanced") 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 deleted file mode 100644 index feefba2cc..000000000 --- a/tests/dictionaries/04_5disabled_calculation_variable3/dictionaries/rougail/00-base.yml +++ /dev/null @@ -1,8 +0,0 @@ ---- -version: '1.1' -condition: "yes" # a condition -variable: - description: a variable - disabled: - 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 74b5853ab..1062d459c 100644 --- a/tests/dictionaries/04_5disabled_calculation_variable3/tiramisu/base.py +++ b/tests/dictionaries/04_5disabled_calculation_variable3/tiramisu/base.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') try: groups.namespace except: diff --git a/tests/dictionaries/04_5disabled_calculation_variable3/tiramisu/multi.py b/tests/dictionaries/04_5disabled_calculation_variable3/tiramisu/multi.py index 325b3f3a4..f52d7f4af 100644 --- a/tests/dictionaries/04_5disabled_calculation_variable3/tiramisu/multi.py +++ b/tests/dictionaries/04_5disabled_calculation_variable3/tiramisu/multi.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') try: groups.namespace except: 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 8926153cd..65acfc46a 100644 --- a/tests/dictionaries/04_5disabled_calculation_variable3/tiramisu/no_namespace.py +++ b/tests/dictionaries/04_5disabled_calculation_variable3/tiramisu/no_namespace.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") ALLOWED_LEADER_PROPERTIES.add("standard") ALLOWED_LEADER_PROPERTIES.add("advanced") 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 deleted file mode 100644 index e6464de80..000000000 --- a/tests/dictionaries/04_5disabled_calculation_variable4/dictionaries/rougail/00-base.yml +++ /dev/null @@ -1,8 +0,0 @@ ---- -version: '1.1' -condition: "yes" # a condition -variable: - description: a variable - disabled: - 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 40cd5bb33..3aaab15d2 100644 --- a/tests/dictionaries/04_5disabled_calculation_variable4/tiramisu/base.py +++ b/tests/dictionaries/04_5disabled_calculation_variable4/tiramisu/base.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') try: groups.namespace except: diff --git a/tests/dictionaries/04_5disabled_calculation_variable4/tiramisu/multi.py b/tests/dictionaries/04_5disabled_calculation_variable4/tiramisu/multi.py index 36856ae3c..a53d8a492 100644 --- a/tests/dictionaries/04_5disabled_calculation_variable4/tiramisu/multi.py +++ b/tests/dictionaries/04_5disabled_calculation_variable4/tiramisu/multi.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') try: groups.namespace except: 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 f70a85f13..b912fc9c3 100644 --- a/tests/dictionaries/04_5disabled_calculation_variable4/tiramisu/no_namespace.py +++ b/tests/dictionaries/04_5disabled_calculation_variable4/tiramisu/no_namespace.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") ALLOWED_LEADER_PROPERTIES.add("standard") ALLOWED_LEADER_PROPERTIES.add("advanced") diff --git a/tests/dictionaries/04_5hidden_calculation/dictionaries/rougail/00-base.yml b/tests/dictionaries/04_5hidden_calculation/dictionaries/rougail/00-base.yml deleted file mode 100644 index a235b9b22..000000000 --- a/tests/dictionaries/04_5hidden_calculation/dictionaries/rougail/00-base.yml +++ /dev/null @@ -1,21 +0,0 @@ ---- -version: '1.1' -condition: 'no' # the condition -var1: - description: a first variable - default: "no" - hidden: - jinja: | - {% if _.condition == "yes" %} - condition is yes - {% endif %} - description: if condition is yes -var2: - description: a second variable - default: "no" - hidden: - jinja: | - {% if rougail.condition == "yes" %} - condition is yes - {% endif %} - description: if condition is yes diff --git a/tests/dictionaries/04_5hidden_calculation/force_namespace b/tests/dictionaries/04_5hidden_calculation/force_namespace deleted file mode 100644 index e69de29bb..000000000 diff --git a/tests/dictionaries/04_5hidden_calculation/tiramisu/base.py b/tests/dictionaries/04_5hidden_calculation/tiramisu/base.py index 626fd4d77..4adfbe248 100644 --- a/tests/dictionaries/04_5hidden_calculation/tiramisu/base.py +++ b/tests/dictionaries/04_5hidden_calculation/tiramisu/base.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') try: groups.namespace except: @@ -15,7 +15,7 @@ dict_env['frozen_rougail.var1'] = "{% if _.condition == \"yes\" %}\ncondition is dict_env['hidden_rougail.var2'] = "{% if rougail.condition == \"yes\" %}\ncondition is yes\n{% endif %}\n" dict_env['frozen_rougail.var2'] = "{% if rougail.condition == \"yes\" %}\ncondition is yes\n{% endif %}\n" option_2 = StrOption(name="condition", doc="the condition", default="no", properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) -option_3 = StrOption(name="var1", doc="a first variable", default="no", properties=frozenset({"force_default_on_freeze", "mandatory", "standard", Calculation(func['jinja_to_property'], Params((ParamValue("hidden")), kwargs={'__internal_jinja': ParamValue("hidden_rougail.var1"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['tests/dictionaries/04_5hidden_calculation/dictionaries/rougail/00-base.yml']), '__internal_attribute': ParamValue("hidden"), '__internal_variable': ParamValue("rougail.var1"), 'when': ParamValue(True), 'inverse': ParamValue(False), '_.condition': ParamOption(option_2, notraisepropertyerror=True)}), 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), '__internal_files': ParamValue(['tests/dictionaries/04_5hidden_calculation/dictionaries/rougail/00-base.yml']), '__internal_attribute': ParamValue("frozen"), '__internal_variable': ParamValue("rougail.var1"), 'when': ParamValue(True), 'inverse': ParamValue(False), '_.condition': ParamOption(option_2, notraisepropertyerror=True)}), help_function=func['jinja_to_property_help'])}), informations={'type': 'string'}) -option_4 = StrOption(name="var2", doc="a second variable", default="no", properties=frozenset({"force_default_on_freeze", "mandatory", "standard", Calculation(func['jinja_to_property'], Params((ParamValue("hidden")), kwargs={'__internal_jinja': ParamValue("hidden_rougail.var2"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['tests/dictionaries/04_5hidden_calculation/dictionaries/rougail/00-base.yml']), '__internal_attribute': ParamValue("hidden"), '__internal_variable': ParamValue("rougail.var2"), 'when': ParamValue(True), 'inverse': ParamValue(False), 'rougail.condition': ParamOption(option_2, notraisepropertyerror=True)}), 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), '__internal_files': ParamValue(['tests/dictionaries/04_5hidden_calculation/dictionaries/rougail/00-base.yml']), '__internal_attribute': ParamValue("frozen"), '__internal_variable': ParamValue("rougail.var2"), 'when': ParamValue(True), 'inverse': ParamValue(False), 'rougail.condition': ParamOption(option_2, notraisepropertyerror=True)}), help_function=func['jinja_to_property_help'])}), informations={'type': 'string'}) +option_3 = StrOption(name="var1", doc="a first variable", default="no", properties=frozenset({"force_default_on_freeze", "mandatory", "standard", Calculation(func['jinja_to_property'], Params((ParamValue("hidden")), kwargs={'__internal_jinja': ParamValue("hidden_rougail.var1"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['../rougail-tests/structures/04_5hidden_calculation/rougail/00-base.yml']), '__internal_attribute': ParamValue("hidden"), '__internal_variable': ParamValue("rougail.var1"), 'when': ParamValue(True), 'inverse': ParamValue(False), '_.condition': ParamOption(option_2, notraisepropertyerror=True)}), 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), '__internal_files': ParamValue(['../rougail-tests/structures/04_5hidden_calculation/rougail/00-base.yml']), '__internal_attribute': ParamValue("frozen"), '__internal_variable': ParamValue("rougail.var1"), 'when': ParamValue(True), 'inverse': ParamValue(False), '_.condition': ParamOption(option_2, notraisepropertyerror=True)}), help_function=func['jinja_to_property_help'])}), informations={'type': 'string'}) +option_4 = StrOption(name="var2", doc="a second variable", default="no", properties=frozenset({"force_default_on_freeze", "mandatory", "standard", Calculation(func['jinja_to_property'], Params((ParamValue("hidden")), kwargs={'__internal_jinja': ParamValue("hidden_rougail.var2"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['../rougail-tests/structures/04_5hidden_calculation/rougail/00-base.yml']), '__internal_attribute': ParamValue("hidden"), '__internal_variable': ParamValue("rougail.var2"), 'when': ParamValue(True), 'inverse': ParamValue(False), 'rougail.condition': ParamOption(option_2, notraisepropertyerror=True)}), 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), '__internal_files': ParamValue(['../rougail-tests/structures/04_5hidden_calculation/rougail/00-base.yml']), '__internal_attribute': ParamValue("frozen"), '__internal_variable': ParamValue("rougail.var2"), 'when': ParamValue(True), 'inverse': ParamValue(False), 'rougail.condition': ParamOption(option_2, notraisepropertyerror=True)}), help_function=func['jinja_to_property_help'])}), informations={'type': 'string'}) optiondescription_1 = OptionDescription(name="rougail", doc="Rougail", group_type=groups.namespace, children=[option_2, option_3, option_4], properties=frozenset({"standard"})) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_1]) diff --git a/tests/dictionaries/04_5hidden_calculation/tiramisu/multi.py b/tests/dictionaries/04_5hidden_calculation/tiramisu/multi.py index 7aa1c87b1..1ce3f8c0b 100644 --- a/tests/dictionaries/04_5hidden_calculation/tiramisu/multi.py +++ b/tests/dictionaries/04_5hidden_calculation/tiramisu/multi.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') try: groups.namespace except: @@ -19,13 +19,13 @@ dict_env['frozen_2.rougail.var1'] = "{% if _.condition == \"yes\" %}\ncondition dict_env['hidden_2.rougail.var2'] = "{% if rougail.condition == \"yes\" %}\ncondition is yes\n{% endif %}\n" dict_env['frozen_2.rougail.var2'] = "{% if rougail.condition == \"yes\" %}\ncondition is yes\n{% endif %}\n" option_3 = StrOption(name="condition", doc="the condition", default="no", properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) -option_4 = StrOption(name="var1", doc="a first variable", default="no", properties=frozenset({"force_default_on_freeze", "mandatory", "standard", Calculation(func['jinja_to_property'], Params((ParamValue("hidden")), kwargs={'__internal_jinja': ParamValue("hidden_1.rougail.var1"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['tests/dictionaries/04_5hidden_calculation/dictionaries/rougail/00-base.yml']), '__internal_attribute': ParamValue("hidden"), '__internal_variable': ParamValue("1.rougail.var1"), 'when': ParamValue(True), 'inverse': ParamValue(False), '_.condition': ParamOption(option_3, notraisepropertyerror=True)}), 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), '__internal_files': ParamValue(['tests/dictionaries/04_5hidden_calculation/dictionaries/rougail/00-base.yml']), '__internal_attribute': ParamValue("frozen"), '__internal_variable': ParamValue("1.rougail.var1"), 'when': ParamValue(True), 'inverse': ParamValue(False), '_.condition': ParamOption(option_3, notraisepropertyerror=True)}), help_function=func['jinja_to_property_help'])}), informations={'type': 'string'}) -option_5 = StrOption(name="var2", doc="a second variable", default="no", properties=frozenset({"force_default_on_freeze", "mandatory", "standard", Calculation(func['jinja_to_property'], Params((ParamValue("hidden")), kwargs={'__internal_jinja': ParamValue("hidden_1.rougail.var2"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['tests/dictionaries/04_5hidden_calculation/dictionaries/rougail/00-base.yml']), '__internal_attribute': ParamValue("hidden"), '__internal_variable': ParamValue("1.rougail.var2"), 'when': ParamValue(True), 'inverse': ParamValue(False), 'rougail.condition': ParamOption(option_3, notraisepropertyerror=True)}), 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), '__internal_files': ParamValue(['tests/dictionaries/04_5hidden_calculation/dictionaries/rougail/00-base.yml']), '__internal_attribute': ParamValue("frozen"), '__internal_variable': ParamValue("1.rougail.var2"), 'when': ParamValue(True), 'inverse': ParamValue(False), 'rougail.condition': ParamOption(option_3, notraisepropertyerror=True)}), help_function=func['jinja_to_property_help'])}), informations={'type': 'string'}) +option_4 = StrOption(name="var1", doc="a first variable", default="no", properties=frozenset({"force_default_on_freeze", "mandatory", "standard", Calculation(func['jinja_to_property'], Params((ParamValue("hidden")), kwargs={'__internal_jinja': ParamValue("hidden_1.rougail.var1"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['../rougail-tests/structures/04_5hidden_calculation/rougail/00-base.yml']), '__internal_attribute': ParamValue("hidden"), '__internal_variable': ParamValue("1.rougail.var1"), 'when': ParamValue(True), 'inverse': ParamValue(False), '_.condition': ParamOption(option_3, notraisepropertyerror=True)}), 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), '__internal_files': ParamValue(['../rougail-tests/structures/04_5hidden_calculation/rougail/00-base.yml']), '__internal_attribute': ParamValue("frozen"), '__internal_variable': ParamValue("1.rougail.var1"), 'when': ParamValue(True), 'inverse': ParamValue(False), '_.condition': ParamOption(option_3, notraisepropertyerror=True)}), help_function=func['jinja_to_property_help'])}), informations={'type': 'string'}) +option_5 = StrOption(name="var2", doc="a second variable", default="no", properties=frozenset({"force_default_on_freeze", "mandatory", "standard", Calculation(func['jinja_to_property'], Params((ParamValue("hidden")), kwargs={'__internal_jinja': ParamValue("hidden_1.rougail.var2"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['../rougail-tests/structures/04_5hidden_calculation/rougail/00-base.yml']), '__internal_attribute': ParamValue("hidden"), '__internal_variable': ParamValue("1.rougail.var2"), 'when': ParamValue(True), 'inverse': ParamValue(False), 'rougail.condition': ParamOption(option_3, notraisepropertyerror=True)}), 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), '__internal_files': ParamValue(['../rougail-tests/structures/04_5hidden_calculation/rougail/00-base.yml']), '__internal_attribute': ParamValue("frozen"), '__internal_variable': ParamValue("1.rougail.var2"), 'when': ParamValue(True), 'inverse': ParamValue(False), 'rougail.condition': ParamOption(option_3, notraisepropertyerror=True)}), help_function=func['jinja_to_property_help'])}), informations={'type': 'string'}) optiondescription_2 = OptionDescription(name="rougail", doc="Rougail", group_type=groups.namespace, children=[option_3, option_4, option_5], properties=frozenset({"standard"})) optiondescription_1 = OptionDescription(name="1", doc="1", children=[optiondescription_2], properties=frozenset({"standard"})) option_8 = StrOption(name="condition", doc="the condition", default="no", properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) -option_9 = StrOption(name="var1", doc="a first variable", default="no", properties=frozenset({"force_default_on_freeze", "mandatory", "standard", Calculation(func['jinja_to_property'], Params((ParamValue("hidden")), kwargs={'__internal_jinja': ParamValue("hidden_2.rougail.var1"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['tests/dictionaries/04_5hidden_calculation/dictionaries/rougail/00-base.yml']), '__internal_attribute': ParamValue("hidden"), '__internal_variable': ParamValue("2.rougail.var1"), 'when': ParamValue(True), 'inverse': ParamValue(False), '_.condition': ParamOption(option_8, notraisepropertyerror=True)}), 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), '__internal_files': ParamValue(['tests/dictionaries/04_5hidden_calculation/dictionaries/rougail/00-base.yml']), '__internal_attribute': ParamValue("frozen"), '__internal_variable': ParamValue("2.rougail.var1"), 'when': ParamValue(True), 'inverse': ParamValue(False), '_.condition': ParamOption(option_8, notraisepropertyerror=True)}), help_function=func['jinja_to_property_help'])}), informations={'type': 'string'}) -option_10 = StrOption(name="var2", doc="a second variable", default="no", properties=frozenset({"force_default_on_freeze", "mandatory", "standard", Calculation(func['jinja_to_property'], Params((ParamValue("hidden")), kwargs={'__internal_jinja': ParamValue("hidden_2.rougail.var2"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['tests/dictionaries/04_5hidden_calculation/dictionaries/rougail/00-base.yml']), '__internal_attribute': ParamValue("hidden"), '__internal_variable': ParamValue("2.rougail.var2"), 'when': ParamValue(True), 'inverse': ParamValue(False), 'rougail.condition': ParamOption(option_8, notraisepropertyerror=True)}), 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), '__internal_files': ParamValue(['tests/dictionaries/04_5hidden_calculation/dictionaries/rougail/00-base.yml']), '__internal_attribute': ParamValue("frozen"), '__internal_variable': ParamValue("2.rougail.var2"), 'when': ParamValue(True), 'inverse': ParamValue(False), 'rougail.condition': ParamOption(option_8, notraisepropertyerror=True)}), help_function=func['jinja_to_property_help'])}), informations={'type': 'string'}) +option_9 = StrOption(name="var1", doc="a first variable", default="no", properties=frozenset({"force_default_on_freeze", "mandatory", "standard", Calculation(func['jinja_to_property'], Params((ParamValue("hidden")), kwargs={'__internal_jinja': ParamValue("hidden_2.rougail.var1"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['../rougail-tests/structures/04_5hidden_calculation/rougail/00-base.yml']), '__internal_attribute': ParamValue("hidden"), '__internal_variable': ParamValue("2.rougail.var1"), 'when': ParamValue(True), 'inverse': ParamValue(False), '_.condition': ParamOption(option_8, notraisepropertyerror=True)}), 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), '__internal_files': ParamValue(['../rougail-tests/structures/04_5hidden_calculation/rougail/00-base.yml']), '__internal_attribute': ParamValue("frozen"), '__internal_variable': ParamValue("2.rougail.var1"), 'when': ParamValue(True), 'inverse': ParamValue(False), '_.condition': ParamOption(option_8, notraisepropertyerror=True)}), help_function=func['jinja_to_property_help'])}), informations={'type': 'string'}) +option_10 = StrOption(name="var2", doc="a second variable", default="no", properties=frozenset({"force_default_on_freeze", "mandatory", "standard", Calculation(func['jinja_to_property'], Params((ParamValue("hidden")), kwargs={'__internal_jinja': ParamValue("hidden_2.rougail.var2"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['../rougail-tests/structures/04_5hidden_calculation/rougail/00-base.yml']), '__internal_attribute': ParamValue("hidden"), '__internal_variable': ParamValue("2.rougail.var2"), 'when': ParamValue(True), 'inverse': ParamValue(False), 'rougail.condition': ParamOption(option_8, notraisepropertyerror=True)}), 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), '__internal_files': ParamValue(['../rougail-tests/structures/04_5hidden_calculation/rougail/00-base.yml']), '__internal_attribute': ParamValue("frozen"), '__internal_variable': ParamValue("2.rougail.var2"), 'when': ParamValue(True), 'inverse': ParamValue(False), 'rougail.condition': ParamOption(option_8, notraisepropertyerror=True)}), help_function=func['jinja_to_property_help'])}), informations={'type': 'string'}) optiondescription_7 = OptionDescription(name="rougail", doc="Rougail", group_type=groups.namespace, children=[option_8, option_9, option_10], properties=frozenset({"standard"})) optiondescription_6 = OptionDescription(name="2", doc="2", children=[optiondescription_7], properties=frozenset({"standard"})) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_1, optiondescription_6]) diff --git a/tests/dictionaries/04_5hidden_calculation2/dictionaries/rougail/00-base.yml b/tests/dictionaries/04_5hidden_calculation2/dictionaries/rougail/00-base.yml deleted file mode 100644 index d455a5a08..000000000 --- a/tests/dictionaries/04_5hidden_calculation2/dictionaries/rougail/00-base.yml +++ /dev/null @@ -1,27 +0,0 @@ ---- -version: '1.1' -condition: "no" # a condition -var1: - description: a first variable - hidden: - jinja: | - {% if _.condition != "yes" %} - condition is yes - {% endif %} - description: if condition is yes - default: - jinja: | - {{ _.condition }} - description: the value of condition -var2: - description: a second variable - hidden: - jinja: | - {% if rougail.condition != "yes" %} - condition is yes - {% endif %} - description: if condition is yes - default: - jinja: | - {{ rougail.condition }} - description: the value of condition diff --git a/tests/dictionaries/04_5hidden_calculation2/force_namespace b/tests/dictionaries/04_5hidden_calculation2/force_namespace deleted file mode 100644 index e69de29bb..000000000 diff --git a/tests/dictionaries/04_5hidden_calculation2/tiramisu/base.py b/tests/dictionaries/04_5hidden_calculation2/tiramisu/base.py index fe5c08a0c..70b26df2b 100644 --- a/tests/dictionaries/04_5hidden_calculation2/tiramisu/base.py +++ b/tests/dictionaries/04_5hidden_calculation2/tiramisu/base.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') try: groups.namespace except: @@ -17,7 +17,7 @@ dict_env['default_rougail.var2'] = "{{ rougail.condition }}\n" dict_env['hidden_rougail.var2'] = "{% if rougail.condition != \"yes\" %}\ncondition is yes\n{% endif %}\n" dict_env['frozen_rougail.var2'] = "{% if rougail.condition != \"yes\" %}\ncondition is yes\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", default=Calculation(func['jinja_to_function'], Params((), kwargs={'__internal_jinja': ParamValue("default_rougail.var1"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['tests/dictionaries/04_5hidden_calculation2/dictionaries/rougail/00-base.yml']), '__internal_attribute': ParamValue("default"), '__internal_variable': ParamValue("rougail.var1"), '_.condition': ParamOption(option_2, notraisepropertyerror=True)})), properties=frozenset({"force_default_on_freeze", "mandatory", "standard", Calculation(func['jinja_to_property'], Params((ParamValue("hidden")), kwargs={'__internal_jinja': ParamValue("hidden_rougail.var1"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['tests/dictionaries/04_5hidden_calculation2/dictionaries/rougail/00-base.yml']), '__internal_attribute': ParamValue("hidden"), '__internal_variable': ParamValue("rougail.var1"), 'when': ParamValue(True), 'inverse': ParamValue(False), '_.condition': ParamOption(option_2, notraisepropertyerror=True)}), 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), '__internal_files': ParamValue(['tests/dictionaries/04_5hidden_calculation2/dictionaries/rougail/00-base.yml']), '__internal_attribute': ParamValue("frozen"), '__internal_variable': ParamValue("rougail.var1"), 'when': ParamValue(True), 'inverse': ParamValue(False), '_.condition': ParamOption(option_2, notraisepropertyerror=True)}), help_function=func['jinja_to_property_help'])}), informations={'type': 'string'}) -option_4 = StrOption(name="var2", doc="a second variable", default=Calculation(func['jinja_to_function'], Params((), kwargs={'__internal_jinja': ParamValue("default_rougail.var2"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['tests/dictionaries/04_5hidden_calculation2/dictionaries/rougail/00-base.yml']), '__internal_attribute': ParamValue("default"), '__internal_variable': ParamValue("rougail.var2"), 'rougail.condition': ParamOption(option_2, notraisepropertyerror=True)})), properties=frozenset({"force_default_on_freeze", "mandatory", "standard", Calculation(func['jinja_to_property'], Params((ParamValue("hidden")), kwargs={'__internal_jinja': ParamValue("hidden_rougail.var2"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['tests/dictionaries/04_5hidden_calculation2/dictionaries/rougail/00-base.yml']), '__internal_attribute': ParamValue("hidden"), '__internal_variable': ParamValue("rougail.var2"), 'when': ParamValue(True), 'inverse': ParamValue(False), 'rougail.condition': ParamOption(option_2, notraisepropertyerror=True)}), 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), '__internal_files': ParamValue(['tests/dictionaries/04_5hidden_calculation2/dictionaries/rougail/00-base.yml']), '__internal_attribute': ParamValue("frozen"), '__internal_variable': ParamValue("rougail.var2"), 'when': ParamValue(True), 'inverse': ParamValue(False), 'rougail.condition': ParamOption(option_2, notraisepropertyerror=True)}), help_function=func['jinja_to_property_help'])}), informations={'type': 'string'}) +option_3 = StrOption(name="var1", doc="a first variable", default=Calculation(func['jinja_to_function'], Params((), kwargs={'__internal_jinja': ParamValue("default_rougail.var1"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['../rougail-tests/structures/04_5hidden_calculation2/rougail/00-base.yml']), '__internal_attribute': ParamValue("default"), '__internal_variable': ParamValue("rougail.var1"), '_.condition': ParamOption(option_2, notraisepropertyerror=True)})), properties=frozenset({"force_default_on_freeze", "mandatory", "standard", Calculation(func['jinja_to_property'], Params((ParamValue("hidden")), kwargs={'__internal_jinja': ParamValue("hidden_rougail.var1"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['../rougail-tests/structures/04_5hidden_calculation2/rougail/00-base.yml']), '__internal_attribute': ParamValue("hidden"), '__internal_variable': ParamValue("rougail.var1"), 'when': ParamValue(True), 'inverse': ParamValue(False), '_.condition': ParamOption(option_2, notraisepropertyerror=True)}), 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), '__internal_files': ParamValue(['../rougail-tests/structures/04_5hidden_calculation2/rougail/00-base.yml']), '__internal_attribute': ParamValue("frozen"), '__internal_variable': ParamValue("rougail.var1"), 'when': ParamValue(True), 'inverse': ParamValue(False), '_.condition': ParamOption(option_2, notraisepropertyerror=True)}), help_function=func['jinja_to_property_help'])}), informations={'type': 'string'}) +option_4 = StrOption(name="var2", doc="a second variable", default=Calculation(func['jinja_to_function'], Params((), kwargs={'__internal_jinja': ParamValue("default_rougail.var2"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['../rougail-tests/structures/04_5hidden_calculation2/rougail/00-base.yml']), '__internal_attribute': ParamValue("default"), '__internal_variable': ParamValue("rougail.var2"), 'rougail.condition': ParamOption(option_2, notraisepropertyerror=True)})), properties=frozenset({"force_default_on_freeze", "mandatory", "standard", Calculation(func['jinja_to_property'], Params((ParamValue("hidden")), kwargs={'__internal_jinja': ParamValue("hidden_rougail.var2"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['../rougail-tests/structures/04_5hidden_calculation2/rougail/00-base.yml']), '__internal_attribute': ParamValue("hidden"), '__internal_variable': ParamValue("rougail.var2"), 'when': ParamValue(True), 'inverse': ParamValue(False), 'rougail.condition': ParamOption(option_2, notraisepropertyerror=True)}), 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), '__internal_files': ParamValue(['../rougail-tests/structures/04_5hidden_calculation2/rougail/00-base.yml']), '__internal_attribute': ParamValue("frozen"), '__internal_variable': ParamValue("rougail.var2"), 'when': ParamValue(True), 'inverse': ParamValue(False), 'rougail.condition': ParamOption(option_2, notraisepropertyerror=True)}), help_function=func['jinja_to_property_help'])}), informations={'type': 'string'}) optiondescription_1 = OptionDescription(name="rougail", doc="Rougail", group_type=groups.namespace, children=[option_2, option_3, option_4], properties=frozenset({"standard"})) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_1]) diff --git a/tests/dictionaries/04_5hidden_calculation2/tiramisu/multi.py b/tests/dictionaries/04_5hidden_calculation2/tiramisu/multi.py index cabd6907b..c6fed0fa7 100644 --- a/tests/dictionaries/04_5hidden_calculation2/tiramisu/multi.py +++ b/tests/dictionaries/04_5hidden_calculation2/tiramisu/multi.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') try: groups.namespace except: @@ -23,13 +23,13 @@ dict_env['default_2.rougail.var2'] = "{{ rougail.condition }}\n" dict_env['hidden_2.rougail.var2'] = "{% if rougail.condition != \"yes\" %}\ncondition is yes\n{% endif %}\n" dict_env['frozen_2.rougail.var2'] = "{% if rougail.condition != \"yes\" %}\ncondition is yes\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", default=Calculation(func['jinja_to_function'], Params((), kwargs={'__internal_jinja': ParamValue("default_1.rougail.var1"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['tests/dictionaries/04_5hidden_calculation2/dictionaries/rougail/00-base.yml']), '__internal_attribute': ParamValue("default"), '__internal_variable': ParamValue("1.rougail.var1"), '_.condition': ParamOption(option_3, notraisepropertyerror=True)})), properties=frozenset({"force_default_on_freeze", "mandatory", "standard", Calculation(func['jinja_to_property'], Params((ParamValue("hidden")), kwargs={'__internal_jinja': ParamValue("hidden_1.rougail.var1"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['tests/dictionaries/04_5hidden_calculation2/dictionaries/rougail/00-base.yml']), '__internal_attribute': ParamValue("hidden"), '__internal_variable': ParamValue("1.rougail.var1"), 'when': ParamValue(True), 'inverse': ParamValue(False), '_.condition': ParamOption(option_3, notraisepropertyerror=True)}), 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), '__internal_files': ParamValue(['tests/dictionaries/04_5hidden_calculation2/dictionaries/rougail/00-base.yml']), '__internal_attribute': ParamValue("frozen"), '__internal_variable': ParamValue("1.rougail.var1"), 'when': ParamValue(True), 'inverse': ParamValue(False), '_.condition': ParamOption(option_3, notraisepropertyerror=True)}), help_function=func['jinja_to_property_help'])}), informations={'type': 'string'}) -option_5 = StrOption(name="var2", doc="a second variable", default=Calculation(func['jinja_to_function'], Params((), kwargs={'__internal_jinja': ParamValue("default_1.rougail.var2"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['tests/dictionaries/04_5hidden_calculation2/dictionaries/rougail/00-base.yml']), '__internal_attribute': ParamValue("default"), '__internal_variable': ParamValue("1.rougail.var2"), 'rougail.condition': ParamOption(option_3, notraisepropertyerror=True)})), properties=frozenset({"force_default_on_freeze", "mandatory", "standard", Calculation(func['jinja_to_property'], Params((ParamValue("hidden")), kwargs={'__internal_jinja': ParamValue("hidden_1.rougail.var2"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['tests/dictionaries/04_5hidden_calculation2/dictionaries/rougail/00-base.yml']), '__internal_attribute': ParamValue("hidden"), '__internal_variable': ParamValue("1.rougail.var2"), 'when': ParamValue(True), 'inverse': ParamValue(False), 'rougail.condition': ParamOption(option_3, notraisepropertyerror=True)}), 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), '__internal_files': ParamValue(['tests/dictionaries/04_5hidden_calculation2/dictionaries/rougail/00-base.yml']), '__internal_attribute': ParamValue("frozen"), '__internal_variable': ParamValue("1.rougail.var2"), 'when': ParamValue(True), 'inverse': ParamValue(False), 'rougail.condition': ParamOption(option_3, notraisepropertyerror=True)}), help_function=func['jinja_to_property_help'])}), informations={'type': 'string'}) +option_4 = StrOption(name="var1", doc="a first variable", default=Calculation(func['jinja_to_function'], Params((), kwargs={'__internal_jinja': ParamValue("default_1.rougail.var1"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['../rougail-tests/structures/04_5hidden_calculation2/rougail/00-base.yml']), '__internal_attribute': ParamValue("default"), '__internal_variable': ParamValue("1.rougail.var1"), '_.condition': ParamOption(option_3, notraisepropertyerror=True)})), properties=frozenset({"force_default_on_freeze", "mandatory", "standard", Calculation(func['jinja_to_property'], Params((ParamValue("hidden")), kwargs={'__internal_jinja': ParamValue("hidden_1.rougail.var1"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['../rougail-tests/structures/04_5hidden_calculation2/rougail/00-base.yml']), '__internal_attribute': ParamValue("hidden"), '__internal_variable': ParamValue("1.rougail.var1"), 'when': ParamValue(True), 'inverse': ParamValue(False), '_.condition': ParamOption(option_3, notraisepropertyerror=True)}), 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), '__internal_files': ParamValue(['../rougail-tests/structures/04_5hidden_calculation2/rougail/00-base.yml']), '__internal_attribute': ParamValue("frozen"), '__internal_variable': ParamValue("1.rougail.var1"), 'when': ParamValue(True), 'inverse': ParamValue(False), '_.condition': ParamOption(option_3, notraisepropertyerror=True)}), help_function=func['jinja_to_property_help'])}), informations={'type': 'string'}) +option_5 = StrOption(name="var2", doc="a second variable", default=Calculation(func['jinja_to_function'], Params((), kwargs={'__internal_jinja': ParamValue("default_1.rougail.var2"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['../rougail-tests/structures/04_5hidden_calculation2/rougail/00-base.yml']), '__internal_attribute': ParamValue("default"), '__internal_variable': ParamValue("1.rougail.var2"), 'rougail.condition': ParamOption(option_3, notraisepropertyerror=True)})), properties=frozenset({"force_default_on_freeze", "mandatory", "standard", Calculation(func['jinja_to_property'], Params((ParamValue("hidden")), kwargs={'__internal_jinja': ParamValue("hidden_1.rougail.var2"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['../rougail-tests/structures/04_5hidden_calculation2/rougail/00-base.yml']), '__internal_attribute': ParamValue("hidden"), '__internal_variable': ParamValue("1.rougail.var2"), 'when': ParamValue(True), 'inverse': ParamValue(False), 'rougail.condition': ParamOption(option_3, notraisepropertyerror=True)}), 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), '__internal_files': ParamValue(['../rougail-tests/structures/04_5hidden_calculation2/rougail/00-base.yml']), '__internal_attribute': ParamValue("frozen"), '__internal_variable': ParamValue("1.rougail.var2"), 'when': ParamValue(True), 'inverse': ParamValue(False), 'rougail.condition': ParamOption(option_3, notraisepropertyerror=True)}), help_function=func['jinja_to_property_help'])}), informations={'type': 'string'}) optiondescription_2 = OptionDescription(name="rougail", doc="Rougail", group_type=groups.namespace, children=[option_3, option_4, option_5], properties=frozenset({"standard"})) optiondescription_1 = OptionDescription(name="1", doc="1", children=[optiondescription_2], properties=frozenset({"standard"})) 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", default=Calculation(func['jinja_to_function'], Params((), kwargs={'__internal_jinja': ParamValue("default_2.rougail.var1"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['tests/dictionaries/04_5hidden_calculation2/dictionaries/rougail/00-base.yml']), '__internal_attribute': ParamValue("default"), '__internal_variable': ParamValue("2.rougail.var1"), '_.condition': ParamOption(option_8, notraisepropertyerror=True)})), properties=frozenset({"force_default_on_freeze", "mandatory", "standard", Calculation(func['jinja_to_property'], Params((ParamValue("hidden")), kwargs={'__internal_jinja': ParamValue("hidden_2.rougail.var1"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['tests/dictionaries/04_5hidden_calculation2/dictionaries/rougail/00-base.yml']), '__internal_attribute': ParamValue("hidden"), '__internal_variable': ParamValue("2.rougail.var1"), 'when': ParamValue(True), 'inverse': ParamValue(False), '_.condition': ParamOption(option_8, notraisepropertyerror=True)}), 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), '__internal_files': ParamValue(['tests/dictionaries/04_5hidden_calculation2/dictionaries/rougail/00-base.yml']), '__internal_attribute': ParamValue("frozen"), '__internal_variable': ParamValue("2.rougail.var1"), 'when': ParamValue(True), 'inverse': ParamValue(False), '_.condition': ParamOption(option_8, notraisepropertyerror=True)}), help_function=func['jinja_to_property_help'])}), informations={'type': 'string'}) -option_10 = StrOption(name="var2", doc="a second variable", default=Calculation(func['jinja_to_function'], Params((), kwargs={'__internal_jinja': ParamValue("default_2.rougail.var2"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['tests/dictionaries/04_5hidden_calculation2/dictionaries/rougail/00-base.yml']), '__internal_attribute': ParamValue("default"), '__internal_variable': ParamValue("2.rougail.var2"), 'rougail.condition': ParamOption(option_8, notraisepropertyerror=True)})), properties=frozenset({"force_default_on_freeze", "mandatory", "standard", Calculation(func['jinja_to_property'], Params((ParamValue("hidden")), kwargs={'__internal_jinja': ParamValue("hidden_2.rougail.var2"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['tests/dictionaries/04_5hidden_calculation2/dictionaries/rougail/00-base.yml']), '__internal_attribute': ParamValue("hidden"), '__internal_variable': ParamValue("2.rougail.var2"), 'when': ParamValue(True), 'inverse': ParamValue(False), 'rougail.condition': ParamOption(option_8, notraisepropertyerror=True)}), 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), '__internal_files': ParamValue(['tests/dictionaries/04_5hidden_calculation2/dictionaries/rougail/00-base.yml']), '__internal_attribute': ParamValue("frozen"), '__internal_variable': ParamValue("2.rougail.var2"), 'when': ParamValue(True), 'inverse': ParamValue(False), 'rougail.condition': ParamOption(option_8, notraisepropertyerror=True)}), help_function=func['jinja_to_property_help'])}), informations={'type': 'string'}) +option_9 = StrOption(name="var1", doc="a first variable", default=Calculation(func['jinja_to_function'], Params((), kwargs={'__internal_jinja': ParamValue("default_2.rougail.var1"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['../rougail-tests/structures/04_5hidden_calculation2/rougail/00-base.yml']), '__internal_attribute': ParamValue("default"), '__internal_variable': ParamValue("2.rougail.var1"), '_.condition': ParamOption(option_8, notraisepropertyerror=True)})), properties=frozenset({"force_default_on_freeze", "mandatory", "standard", Calculation(func['jinja_to_property'], Params((ParamValue("hidden")), kwargs={'__internal_jinja': ParamValue("hidden_2.rougail.var1"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['../rougail-tests/structures/04_5hidden_calculation2/rougail/00-base.yml']), '__internal_attribute': ParamValue("hidden"), '__internal_variable': ParamValue("2.rougail.var1"), 'when': ParamValue(True), 'inverse': ParamValue(False), '_.condition': ParamOption(option_8, notraisepropertyerror=True)}), 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), '__internal_files': ParamValue(['../rougail-tests/structures/04_5hidden_calculation2/rougail/00-base.yml']), '__internal_attribute': ParamValue("frozen"), '__internal_variable': ParamValue("2.rougail.var1"), 'when': ParamValue(True), 'inverse': ParamValue(False), '_.condition': ParamOption(option_8, notraisepropertyerror=True)}), help_function=func['jinja_to_property_help'])}), informations={'type': 'string'}) +option_10 = StrOption(name="var2", doc="a second variable", default=Calculation(func['jinja_to_function'], Params((), kwargs={'__internal_jinja': ParamValue("default_2.rougail.var2"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['../rougail-tests/structures/04_5hidden_calculation2/rougail/00-base.yml']), '__internal_attribute': ParamValue("default"), '__internal_variable': ParamValue("2.rougail.var2"), 'rougail.condition': ParamOption(option_8, notraisepropertyerror=True)})), properties=frozenset({"force_default_on_freeze", "mandatory", "standard", Calculation(func['jinja_to_property'], Params((ParamValue("hidden")), kwargs={'__internal_jinja': ParamValue("hidden_2.rougail.var2"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['../rougail-tests/structures/04_5hidden_calculation2/rougail/00-base.yml']), '__internal_attribute': ParamValue("hidden"), '__internal_variable': ParamValue("2.rougail.var2"), 'when': ParamValue(True), 'inverse': ParamValue(False), 'rougail.condition': ParamOption(option_8, notraisepropertyerror=True)}), 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), '__internal_files': ParamValue(['../rougail-tests/structures/04_5hidden_calculation2/rougail/00-base.yml']), '__internal_attribute': ParamValue("frozen"), '__internal_variable': ParamValue("2.rougail.var2"), 'when': ParamValue(True), 'inverse': ParamValue(False), 'rougail.condition': ParamOption(option_8, notraisepropertyerror=True)}), help_function=func['jinja_to_property_help'])}), informations={'type': 'string'}) optiondescription_7 = OptionDescription(name="rougail", doc="Rougail", group_type=groups.namespace, children=[option_8, option_9, option_10], properties=frozenset({"standard"})) optiondescription_6 = OptionDescription(name="2", doc="2", children=[optiondescription_7], properties=frozenset({"standard"})) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_1, optiondescription_6]) 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 deleted file mode 100644 index a3080fe5a..000000000 --- a/tests/dictionaries/04_5hidden_calculation_default_calculation/dictionaries/rougail/00-base.yml +++ /dev/null @@ -1,27 +0,0 @@ ---- -version: '1.1' -condition: "no" # a condition -var1: - description: a first variable - hidden: - jinja: | - {% if _.condition == "yes" %} - condition is yes - {% endif %} - description: if condition is yes - default: - jinja: | - {{ _.condition }} - description: returns the condition value -var2: - description: a second variable - hidden: - jinja: | - {% if rougail.condition == "yes" %} - condition is yes - {% endif %} - description: if condition is yes - default: - jinja: | - {{ rougail.condition }} - description: returns the condition value diff --git a/tests/dictionaries/04_5hidden_calculation_default_calculation/force_namespace b/tests/dictionaries/04_5hidden_calculation_default_calculation/force_namespace deleted file mode 100644 index e69de29bb..000000000 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 367d04232..624c7f08b 100644 --- a/tests/dictionaries/04_5hidden_calculation_default_calculation/tiramisu/base.py +++ b/tests/dictionaries/04_5hidden_calculation_default_calculation/tiramisu/base.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') try: groups.namespace except: @@ -17,7 +17,7 @@ dict_env['default_rougail.var2'] = "{{ rougail.condition }}\n" dict_env['hidden_rougail.var2'] = "{% if rougail.condition == \"yes\" %}\ncondition is yes\n{% endif %}\n" dict_env['frozen_rougail.var2'] = "{% if rougail.condition == \"yes\" %}\ncondition is yes\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", default=Calculation(func['jinja_to_function'], Params((), kwargs={'__internal_jinja': ParamValue("default_rougail.var1"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['tests/dictionaries/04_5hidden_calculation_default_calculation/dictionaries/rougail/00-base.yml']), '__internal_attribute': ParamValue("default"), '__internal_variable': ParamValue("rougail.var1"), '_.condition': ParamOption(option_2, notraisepropertyerror=True)})), properties=frozenset({"force_default_on_freeze", "mandatory", "standard", Calculation(func['jinja_to_property'], Params((ParamValue("hidden")), kwargs={'__internal_jinja': ParamValue("hidden_rougail.var1"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['tests/dictionaries/04_5hidden_calculation_default_calculation/dictionaries/rougail/00-base.yml']), '__internal_attribute': ParamValue("hidden"), '__internal_variable': ParamValue("rougail.var1"), 'when': ParamValue(True), 'inverse': ParamValue(False), '_.condition': ParamOption(option_2, notraisepropertyerror=True)}), 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), '__internal_files': ParamValue(['tests/dictionaries/04_5hidden_calculation_default_calculation/dictionaries/rougail/00-base.yml']), '__internal_attribute': ParamValue("frozen"), '__internal_variable': ParamValue("rougail.var1"), 'when': ParamValue(True), 'inverse': ParamValue(False), '_.condition': ParamOption(option_2, notraisepropertyerror=True)}), help_function=func['jinja_to_property_help'])}), informations={'type': 'string'}) -option_4 = StrOption(name="var2", doc="a second variable", default=Calculation(func['jinja_to_function'], Params((), kwargs={'__internal_jinja': ParamValue("default_rougail.var2"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['tests/dictionaries/04_5hidden_calculation_default_calculation/dictionaries/rougail/00-base.yml']), '__internal_attribute': ParamValue("default"), '__internal_variable': ParamValue("rougail.var2"), 'rougail.condition': ParamOption(option_2, notraisepropertyerror=True)})), properties=frozenset({"force_default_on_freeze", "mandatory", "standard", Calculation(func['jinja_to_property'], Params((ParamValue("hidden")), kwargs={'__internal_jinja': ParamValue("hidden_rougail.var2"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['tests/dictionaries/04_5hidden_calculation_default_calculation/dictionaries/rougail/00-base.yml']), '__internal_attribute': ParamValue("hidden"), '__internal_variable': ParamValue("rougail.var2"), 'when': ParamValue(True), 'inverse': ParamValue(False), 'rougail.condition': ParamOption(option_2, notraisepropertyerror=True)}), 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), '__internal_files': ParamValue(['tests/dictionaries/04_5hidden_calculation_default_calculation/dictionaries/rougail/00-base.yml']), '__internal_attribute': ParamValue("frozen"), '__internal_variable': ParamValue("rougail.var2"), 'when': ParamValue(True), 'inverse': ParamValue(False), 'rougail.condition': ParamOption(option_2, notraisepropertyerror=True)}), help_function=func['jinja_to_property_help'])}), informations={'type': 'string'}) +option_3 = StrOption(name="var1", doc="a first variable", default=Calculation(func['jinja_to_function'], Params((), kwargs={'__internal_jinja': ParamValue("default_rougail.var1"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['../rougail-tests/structures/04_5hidden_calculation_default_calculation/rougail/00-base.yml']), '__internal_attribute': ParamValue("default"), '__internal_variable': ParamValue("rougail.var1"), '_.condition': ParamOption(option_2, notraisepropertyerror=True)})), properties=frozenset({"force_default_on_freeze", "mandatory", "standard", Calculation(func['jinja_to_property'], Params((ParamValue("hidden")), kwargs={'__internal_jinja': ParamValue("hidden_rougail.var1"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['../rougail-tests/structures/04_5hidden_calculation_default_calculation/rougail/00-base.yml']), '__internal_attribute': ParamValue("hidden"), '__internal_variable': ParamValue("rougail.var1"), 'when': ParamValue(True), 'inverse': ParamValue(False), '_.condition': ParamOption(option_2, notraisepropertyerror=True)}), 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), '__internal_files': ParamValue(['../rougail-tests/structures/04_5hidden_calculation_default_calculation/rougail/00-base.yml']), '__internal_attribute': ParamValue("frozen"), '__internal_variable': ParamValue("rougail.var1"), 'when': ParamValue(True), 'inverse': ParamValue(False), '_.condition': ParamOption(option_2, notraisepropertyerror=True)}), help_function=func['jinja_to_property_help'])}), informations={'type': 'string'}) +option_4 = StrOption(name="var2", doc="a second variable", default=Calculation(func['jinja_to_function'], Params((), kwargs={'__internal_jinja': ParamValue("default_rougail.var2"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['../rougail-tests/structures/04_5hidden_calculation_default_calculation/rougail/00-base.yml']), '__internal_attribute': ParamValue("default"), '__internal_variable': ParamValue("rougail.var2"), 'rougail.condition': ParamOption(option_2, notraisepropertyerror=True)})), properties=frozenset({"force_default_on_freeze", "mandatory", "standard", Calculation(func['jinja_to_property'], Params((ParamValue("hidden")), kwargs={'__internal_jinja': ParamValue("hidden_rougail.var2"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['../rougail-tests/structures/04_5hidden_calculation_default_calculation/rougail/00-base.yml']), '__internal_attribute': ParamValue("hidden"), '__internal_variable': ParamValue("rougail.var2"), 'when': ParamValue(True), 'inverse': ParamValue(False), 'rougail.condition': ParamOption(option_2, notraisepropertyerror=True)}), 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), '__internal_files': ParamValue(['../rougail-tests/structures/04_5hidden_calculation_default_calculation/rougail/00-base.yml']), '__internal_attribute': ParamValue("frozen"), '__internal_variable': ParamValue("rougail.var2"), 'when': ParamValue(True), 'inverse': ParamValue(False), 'rougail.condition': ParamOption(option_2, notraisepropertyerror=True)}), help_function=func['jinja_to_property_help'])}), informations={'type': 'string'}) optiondescription_1 = OptionDescription(name="rougail", doc="Rougail", group_type=groups.namespace, children=[option_2, option_3, option_4], properties=frozenset({"standard"})) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_1]) 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 37cde215a..909ce57cb 100644 --- a/tests/dictionaries/04_5hidden_calculation_default_calculation/tiramisu/multi.py +++ b/tests/dictionaries/04_5hidden_calculation_default_calculation/tiramisu/multi.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') try: groups.namespace except: @@ -23,13 +23,13 @@ dict_env['default_2.rougail.var2'] = "{{ rougail.condition }}\n" dict_env['hidden_2.rougail.var2'] = "{% if rougail.condition == \"yes\" %}\ncondition is yes\n{% endif %}\n" dict_env['frozen_2.rougail.var2'] = "{% if rougail.condition == \"yes\" %}\ncondition is yes\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", default=Calculation(func['jinja_to_function'], Params((), kwargs={'__internal_jinja': ParamValue("default_1.rougail.var1"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['tests/dictionaries/04_5hidden_calculation_default_calculation/dictionaries/rougail/00-base.yml']), '__internal_attribute': ParamValue("default"), '__internal_variable': ParamValue("1.rougail.var1"), '_.condition': ParamOption(option_3, notraisepropertyerror=True)})), properties=frozenset({"force_default_on_freeze", "mandatory", "standard", Calculation(func['jinja_to_property'], Params((ParamValue("hidden")), kwargs={'__internal_jinja': ParamValue("hidden_1.rougail.var1"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['tests/dictionaries/04_5hidden_calculation_default_calculation/dictionaries/rougail/00-base.yml']), '__internal_attribute': ParamValue("hidden"), '__internal_variable': ParamValue("1.rougail.var1"), 'when': ParamValue(True), 'inverse': ParamValue(False), '_.condition': ParamOption(option_3, notraisepropertyerror=True)}), 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), '__internal_files': ParamValue(['tests/dictionaries/04_5hidden_calculation_default_calculation/dictionaries/rougail/00-base.yml']), '__internal_attribute': ParamValue("frozen"), '__internal_variable': ParamValue("1.rougail.var1"), 'when': ParamValue(True), 'inverse': ParamValue(False), '_.condition': ParamOption(option_3, notraisepropertyerror=True)}), help_function=func['jinja_to_property_help'])}), informations={'type': 'string'}) -option_5 = StrOption(name="var2", doc="a second variable", default=Calculation(func['jinja_to_function'], Params((), kwargs={'__internal_jinja': ParamValue("default_1.rougail.var2"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['tests/dictionaries/04_5hidden_calculation_default_calculation/dictionaries/rougail/00-base.yml']), '__internal_attribute': ParamValue("default"), '__internal_variable': ParamValue("1.rougail.var2"), 'rougail.condition': ParamOption(option_3, notraisepropertyerror=True)})), properties=frozenset({"force_default_on_freeze", "mandatory", "standard", Calculation(func['jinja_to_property'], Params((ParamValue("hidden")), kwargs={'__internal_jinja': ParamValue("hidden_1.rougail.var2"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['tests/dictionaries/04_5hidden_calculation_default_calculation/dictionaries/rougail/00-base.yml']), '__internal_attribute': ParamValue("hidden"), '__internal_variable': ParamValue("1.rougail.var2"), 'when': ParamValue(True), 'inverse': ParamValue(False), 'rougail.condition': ParamOption(option_3, notraisepropertyerror=True)}), 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), '__internal_files': ParamValue(['tests/dictionaries/04_5hidden_calculation_default_calculation/dictionaries/rougail/00-base.yml']), '__internal_attribute': ParamValue("frozen"), '__internal_variable': ParamValue("1.rougail.var2"), 'when': ParamValue(True), 'inverse': ParamValue(False), 'rougail.condition': ParamOption(option_3, notraisepropertyerror=True)}), help_function=func['jinja_to_property_help'])}), informations={'type': 'string'}) +option_4 = StrOption(name="var1", doc="a first variable", default=Calculation(func['jinja_to_function'], Params((), kwargs={'__internal_jinja': ParamValue("default_1.rougail.var1"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['../rougail-tests/structures/04_5hidden_calculation_default_calculation/rougail/00-base.yml']), '__internal_attribute': ParamValue("default"), '__internal_variable': ParamValue("1.rougail.var1"), '_.condition': ParamOption(option_3, notraisepropertyerror=True)})), properties=frozenset({"force_default_on_freeze", "mandatory", "standard", Calculation(func['jinja_to_property'], Params((ParamValue("hidden")), kwargs={'__internal_jinja': ParamValue("hidden_1.rougail.var1"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['../rougail-tests/structures/04_5hidden_calculation_default_calculation/rougail/00-base.yml']), '__internal_attribute': ParamValue("hidden"), '__internal_variable': ParamValue("1.rougail.var1"), 'when': ParamValue(True), 'inverse': ParamValue(False), '_.condition': ParamOption(option_3, notraisepropertyerror=True)}), 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), '__internal_files': ParamValue(['../rougail-tests/structures/04_5hidden_calculation_default_calculation/rougail/00-base.yml']), '__internal_attribute': ParamValue("frozen"), '__internal_variable': ParamValue("1.rougail.var1"), 'when': ParamValue(True), 'inverse': ParamValue(False), '_.condition': ParamOption(option_3, notraisepropertyerror=True)}), help_function=func['jinja_to_property_help'])}), informations={'type': 'string'}) +option_5 = StrOption(name="var2", doc="a second variable", default=Calculation(func['jinja_to_function'], Params((), kwargs={'__internal_jinja': ParamValue("default_1.rougail.var2"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['../rougail-tests/structures/04_5hidden_calculation_default_calculation/rougail/00-base.yml']), '__internal_attribute': ParamValue("default"), '__internal_variable': ParamValue("1.rougail.var2"), 'rougail.condition': ParamOption(option_3, notraisepropertyerror=True)})), properties=frozenset({"force_default_on_freeze", "mandatory", "standard", Calculation(func['jinja_to_property'], Params((ParamValue("hidden")), kwargs={'__internal_jinja': ParamValue("hidden_1.rougail.var2"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['../rougail-tests/structures/04_5hidden_calculation_default_calculation/rougail/00-base.yml']), '__internal_attribute': ParamValue("hidden"), '__internal_variable': ParamValue("1.rougail.var2"), 'when': ParamValue(True), 'inverse': ParamValue(False), 'rougail.condition': ParamOption(option_3, notraisepropertyerror=True)}), 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), '__internal_files': ParamValue(['../rougail-tests/structures/04_5hidden_calculation_default_calculation/rougail/00-base.yml']), '__internal_attribute': ParamValue("frozen"), '__internal_variable': ParamValue("1.rougail.var2"), 'when': ParamValue(True), 'inverse': ParamValue(False), 'rougail.condition': ParamOption(option_3, notraisepropertyerror=True)}), help_function=func['jinja_to_property_help'])}), informations={'type': 'string'}) optiondescription_2 = OptionDescription(name="rougail", doc="Rougail", group_type=groups.namespace, children=[option_3, option_4, option_5], properties=frozenset({"standard"})) optiondescription_1 = OptionDescription(name="1", doc="1", children=[optiondescription_2], properties=frozenset({"standard"})) 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", default=Calculation(func['jinja_to_function'], Params((), kwargs={'__internal_jinja': ParamValue("default_2.rougail.var1"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['tests/dictionaries/04_5hidden_calculation_default_calculation/dictionaries/rougail/00-base.yml']), '__internal_attribute': ParamValue("default"), '__internal_variable': ParamValue("2.rougail.var1"), '_.condition': ParamOption(option_8, notraisepropertyerror=True)})), properties=frozenset({"force_default_on_freeze", "mandatory", "standard", Calculation(func['jinja_to_property'], Params((ParamValue("hidden")), kwargs={'__internal_jinja': ParamValue("hidden_2.rougail.var1"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['tests/dictionaries/04_5hidden_calculation_default_calculation/dictionaries/rougail/00-base.yml']), '__internal_attribute': ParamValue("hidden"), '__internal_variable': ParamValue("2.rougail.var1"), 'when': ParamValue(True), 'inverse': ParamValue(False), '_.condition': ParamOption(option_8, notraisepropertyerror=True)}), 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), '__internal_files': ParamValue(['tests/dictionaries/04_5hidden_calculation_default_calculation/dictionaries/rougail/00-base.yml']), '__internal_attribute': ParamValue("frozen"), '__internal_variable': ParamValue("2.rougail.var1"), 'when': ParamValue(True), 'inverse': ParamValue(False), '_.condition': ParamOption(option_8, notraisepropertyerror=True)}), help_function=func['jinja_to_property_help'])}), informations={'type': 'string'}) -option_10 = StrOption(name="var2", doc="a second variable", default=Calculation(func['jinja_to_function'], Params((), kwargs={'__internal_jinja': ParamValue("default_2.rougail.var2"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['tests/dictionaries/04_5hidden_calculation_default_calculation/dictionaries/rougail/00-base.yml']), '__internal_attribute': ParamValue("default"), '__internal_variable': ParamValue("2.rougail.var2"), 'rougail.condition': ParamOption(option_8, notraisepropertyerror=True)})), properties=frozenset({"force_default_on_freeze", "mandatory", "standard", Calculation(func['jinja_to_property'], Params((ParamValue("hidden")), kwargs={'__internal_jinja': ParamValue("hidden_2.rougail.var2"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['tests/dictionaries/04_5hidden_calculation_default_calculation/dictionaries/rougail/00-base.yml']), '__internal_attribute': ParamValue("hidden"), '__internal_variable': ParamValue("2.rougail.var2"), 'when': ParamValue(True), 'inverse': ParamValue(False), 'rougail.condition': ParamOption(option_8, notraisepropertyerror=True)}), 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), '__internal_files': ParamValue(['tests/dictionaries/04_5hidden_calculation_default_calculation/dictionaries/rougail/00-base.yml']), '__internal_attribute': ParamValue("frozen"), '__internal_variable': ParamValue("2.rougail.var2"), 'when': ParamValue(True), 'inverse': ParamValue(False), 'rougail.condition': ParamOption(option_8, notraisepropertyerror=True)}), help_function=func['jinja_to_property_help'])}), informations={'type': 'string'}) +option_9 = StrOption(name="var1", doc="a first variable", default=Calculation(func['jinja_to_function'], Params((), kwargs={'__internal_jinja': ParamValue("default_2.rougail.var1"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['../rougail-tests/structures/04_5hidden_calculation_default_calculation/rougail/00-base.yml']), '__internal_attribute': ParamValue("default"), '__internal_variable': ParamValue("2.rougail.var1"), '_.condition': ParamOption(option_8, notraisepropertyerror=True)})), properties=frozenset({"force_default_on_freeze", "mandatory", "standard", Calculation(func['jinja_to_property'], Params((ParamValue("hidden")), kwargs={'__internal_jinja': ParamValue("hidden_2.rougail.var1"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['../rougail-tests/structures/04_5hidden_calculation_default_calculation/rougail/00-base.yml']), '__internal_attribute': ParamValue("hidden"), '__internal_variable': ParamValue("2.rougail.var1"), 'when': ParamValue(True), 'inverse': ParamValue(False), '_.condition': ParamOption(option_8, notraisepropertyerror=True)}), 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), '__internal_files': ParamValue(['../rougail-tests/structures/04_5hidden_calculation_default_calculation/rougail/00-base.yml']), '__internal_attribute': ParamValue("frozen"), '__internal_variable': ParamValue("2.rougail.var1"), 'when': ParamValue(True), 'inverse': ParamValue(False), '_.condition': ParamOption(option_8, notraisepropertyerror=True)}), help_function=func['jinja_to_property_help'])}), informations={'type': 'string'}) +option_10 = StrOption(name="var2", doc="a second variable", default=Calculation(func['jinja_to_function'], Params((), kwargs={'__internal_jinja': ParamValue("default_2.rougail.var2"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['../rougail-tests/structures/04_5hidden_calculation_default_calculation/rougail/00-base.yml']), '__internal_attribute': ParamValue("default"), '__internal_variable': ParamValue("2.rougail.var2"), 'rougail.condition': ParamOption(option_8, notraisepropertyerror=True)})), properties=frozenset({"force_default_on_freeze", "mandatory", "standard", Calculation(func['jinja_to_property'], Params((ParamValue("hidden")), kwargs={'__internal_jinja': ParamValue("hidden_2.rougail.var2"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['../rougail-tests/structures/04_5hidden_calculation_default_calculation/rougail/00-base.yml']), '__internal_attribute': ParamValue("hidden"), '__internal_variable': ParamValue("2.rougail.var2"), 'when': ParamValue(True), 'inverse': ParamValue(False), 'rougail.condition': ParamOption(option_8, notraisepropertyerror=True)}), 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), '__internal_files': ParamValue(['../rougail-tests/structures/04_5hidden_calculation_default_calculation/rougail/00-base.yml']), '__internal_attribute': ParamValue("frozen"), '__internal_variable': ParamValue("2.rougail.var2"), 'when': ParamValue(True), 'inverse': ParamValue(False), 'rougail.condition': ParamOption(option_8, notraisepropertyerror=True)}), help_function=func['jinja_to_property_help'])}), informations={'type': 'string'}) optiondescription_7 = OptionDescription(name="rougail", doc="Rougail", group_type=groups.namespace, children=[option_8, option_9, option_10], properties=frozenset({"standard"})) optiondescription_6 = OptionDescription(name="2", doc="2", children=[optiondescription_7], properties=frozenset({"standard"})) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_1, optiondescription_6]) diff --git a/tests/dictionaries/04_5validators/dictionaries/rougail/00-base.yml b/tests/dictionaries/04_5validators/dictionaries/rougail/00-base.yml deleted file mode 100644 index ca145a58f..000000000 --- a/tests/dictionaries/04_5validators/dictionaries/rougail/00-base.yml +++ /dev/null @@ -1,11 +0,0 @@ ---- -version: '1.1' -int: - description: A number - type: number - validators: - - jinja: | - {% if _.int > 100 %} - value is too high - {% endif %} - description: the max value is 100 diff --git a/tests/dictionaries/04_5validators/tiramisu/base.py b/tests/dictionaries/04_5validators/tiramisu/base.py index 7b7d38fa2..5e7761f07 100644 --- a/tests/dictionaries/04_5validators/tiramisu/base.py +++ b/tests/dictionaries/04_5validators/tiramisu/base.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') try: groups.namespace except: @@ -11,6 +11,6 @@ ALLOWED_LEADER_PROPERTIES.add("basic") ALLOWED_LEADER_PROPERTIES.add("standard") ALLOWED_LEADER_PROPERTIES.add("advanced") dict_env['validators_rougail.int'] = "{% if _.int > 100 %}\nvalue is too high\n{% endif %}\n" -option_2 = IntOption(name="int", doc="A number", validators=[Calculation(func['valid_with_jinja'], Params((), kwargs={'__internal_jinja': ParamValue("validators_rougail.int"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['tests/dictionaries/04_5validators/dictionaries/rougail/00-base.yml']), '__internal_attribute': ParamValue("validators"), '__internal_variable': ParamValue("rougail.int"), '_.int': ParamSelfOption(whole=False)}))], properties=frozenset({"basic", "mandatory"}), informations={'type': 'number'}) +option_2 = IntOption(name="int", doc="A number", validators=[Calculation(func['valid_with_jinja'], Params((), kwargs={'__internal_jinja': ParamValue("validators_rougail.int"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['../rougail-tests/structures/04_5validators/rougail/00-base.yml']), '__internal_attribute': ParamValue("validators"), '__internal_variable': ParamValue("rougail.int"), '_.int': ParamSelfOption(whole=False)}))], properties=frozenset({"basic", "mandatory"}), informations={'type': 'number'}) optiondescription_1 = OptionDescription(name="rougail", doc="Rougail", group_type=groups.namespace, children=[option_2], properties=frozenset({"basic"})) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_1]) diff --git a/tests/dictionaries/04_5validators/tiramisu/multi.py b/tests/dictionaries/04_5validators/tiramisu/multi.py index a29dac726..f939ef707 100644 --- a/tests/dictionaries/04_5validators/tiramisu/multi.py +++ b/tests/dictionaries/04_5validators/tiramisu/multi.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') try: groups.namespace except: @@ -12,10 +12,10 @@ ALLOWED_LEADER_PROPERTIES.add("standard") ALLOWED_LEADER_PROPERTIES.add("advanced") dict_env['validators_1.rougail.int'] = "{% if _.int > 100 %}\nvalue is too high\n{% endif %}\n" dict_env['validators_2.rougail.int'] = "{% if _.int > 100 %}\nvalue is too high\n{% endif %}\n" -option_3 = IntOption(name="int", doc="A number", validators=[Calculation(func['valid_with_jinja'], Params((), kwargs={'__internal_jinja': ParamValue("validators_1.rougail.int"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['tests/dictionaries/04_5validators/dictionaries/rougail/00-base.yml']), '__internal_attribute': ParamValue("validators"), '__internal_variable': ParamValue("1.rougail.int"), '_.int': ParamSelfOption(whole=False)}))], properties=frozenset({"basic", "mandatory"}), informations={'type': 'number'}) +option_3 = IntOption(name="int", doc="A number", validators=[Calculation(func['valid_with_jinja'], Params((), kwargs={'__internal_jinja': ParamValue("validators_1.rougail.int"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['../rougail-tests/structures/04_5validators/rougail/00-base.yml']), '__internal_attribute': ParamValue("validators"), '__internal_variable': ParamValue("1.rougail.int"), '_.int': ParamSelfOption(whole=False)}))], properties=frozenset({"basic", "mandatory"}), informations={'type': 'number'}) optiondescription_2 = OptionDescription(name="rougail", doc="Rougail", group_type=groups.namespace, children=[option_3], properties=frozenset({"basic"})) optiondescription_1 = OptionDescription(name="1", doc="1", children=[optiondescription_2], properties=frozenset({"basic"})) -option_6 = IntOption(name="int", doc="A number", validators=[Calculation(func['valid_with_jinja'], Params((), kwargs={'__internal_jinja': ParamValue("validators_2.rougail.int"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['tests/dictionaries/04_5validators/dictionaries/rougail/00-base.yml']), '__internal_attribute': ParamValue("validators"), '__internal_variable': ParamValue("2.rougail.int"), '_.int': ParamSelfOption(whole=False)}))], properties=frozenset({"basic", "mandatory"}), informations={'type': 'number'}) +option_6 = IntOption(name="int", doc="A number", validators=[Calculation(func['valid_with_jinja'], Params((), kwargs={'__internal_jinja': ParamValue("validators_2.rougail.int"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['../rougail-tests/structures/04_5validators/rougail/00-base.yml']), '__internal_attribute': ParamValue("validators"), '__internal_variable': ParamValue("2.rougail.int"), '_.int': ParamSelfOption(whole=False)}))], properties=frozenset({"basic", "mandatory"}), informations={'type': 'number'}) optiondescription_5 = OptionDescription(name="rougail", doc="Rougail", group_type=groups.namespace, children=[option_6], properties=frozenset({"basic"})) optiondescription_4 = OptionDescription(name="2", doc="2", children=[optiondescription_5], properties=frozenset({"basic"})) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_1, optiondescription_4]) diff --git a/tests/dictionaries/04_5validators/tiramisu/no_namespace.py b/tests/dictionaries/04_5validators/tiramisu/no_namespace.py index 3f35a16f9..247b508ea 100644 --- a/tests/dictionaries/04_5validators/tiramisu/no_namespace.py +++ b/tests/dictionaries/04_5validators/tiramisu/no_namespace.py @@ -2,10 +2,10 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") ALLOWED_LEADER_PROPERTIES.add("standard") ALLOWED_LEADER_PROPERTIES.add("advanced") dict_env['validators_int'] = "{% if _.int > 100 %}\nvalue is too high\n{% endif %}\n" -option_1 = IntOption(name="int", doc="A number", validators=[Calculation(func['valid_with_jinja'], Params((), kwargs={'__internal_jinja': ParamValue("validators_int"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['tests/dictionaries/04_5validators/dictionaries/rougail/00-base.yml']), '__internal_attribute': ParamValue("validators"), '__internal_variable': ParamValue("int"), '_.int': ParamSelfOption(whole=False)}))], properties=frozenset({"basic", "mandatory"}), informations={'type': 'number'}) +option_1 = IntOption(name="int", doc="A number", validators=[Calculation(func['valid_with_jinja'], Params((), kwargs={'__internal_jinja': ParamValue("validators_int"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['../rougail-tests/structures/04_5validators/rougail/00-base.yml']), '__internal_attribute': ParamValue("validators"), '__internal_variable': ParamValue("int"), '_.int': ParamSelfOption(whole=False)}))], properties=frozenset({"basic", "mandatory"}), informations={'type': 'number'}) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1]) diff --git a/tests/dictionaries/04_5validators_differ/dictionaries/rougail/00-base.yml b/tests/dictionaries/04_5validators_differ/dictionaries/rougail/00-base.yml deleted file mode 100644 index 6dd3872b6..000000000 --- a/tests/dictionaries/04_5validators_differ/dictionaries/rougail/00-base.yml +++ /dev/null @@ -1,15 +0,0 @@ ---- -version: '1.1' -var1: - description: a first variable - test: - - another_value - type: string - default: oui - validators: - - jinja: | - {% if _.var1 == _.var2 %} - var1 must be different than var2 - {% endif %} - description: var1 must be different than var2 -var2: "no" # A second variable diff --git a/tests/dictionaries/04_5validators_differ/tiramisu/base.py b/tests/dictionaries/04_5validators_differ/tiramisu/base.py index ed69aaf49..b0b266a4e 100644 --- a/tests/dictionaries/04_5validators_differ/tiramisu/base.py +++ b/tests/dictionaries/04_5validators_differ/tiramisu/base.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') try: groups.namespace except: @@ -12,6 +12,6 @@ ALLOWED_LEADER_PROPERTIES.add("standard") ALLOWED_LEADER_PROPERTIES.add("advanced") dict_env['validators_rougail.var1'] = "{% if _.var1 == _.var2 %}\nvar1 must be different than var2\n{% endif %}\n" option_3 = StrOption(name="var2", doc="A second variable", default="no", properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) -option_2 = StrOption(name="var1", doc="a first variable", default="oui", validators=[Calculation(func['valid_with_jinja'], Params((), kwargs={'__internal_jinja': ParamValue("validators_rougail.var1"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['tests/dictionaries/04_5validators_differ/dictionaries/rougail/00-base.yml']), '__internal_attribute': ParamValue("validators"), '__internal_variable': ParamValue("rougail.var1"), '_.var2': ParamOption(option_3, notraisepropertyerror=True), '_.var1': ParamSelfOption(whole=False)}))], properties=frozenset({"mandatory", "standard"}), informations={'type': 'string', 'test': ('another_value',)}) +option_2 = StrOption(name="var1", doc="a first variable", default="oui", validators=[Calculation(func['valid_with_jinja'], Params((), kwargs={'__internal_jinja': ParamValue("validators_rougail.var1"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['../rougail-tests/structures/04_5validators_differ/rougail/00-base.yml']), '__internal_attribute': ParamValue("validators"), '__internal_variable': ParamValue("rougail.var1"), '_.var2': ParamOption(option_3, notraisepropertyerror=True), '_.var1': ParamSelfOption(whole=False)}))], properties=frozenset({"mandatory", "standard"}), informations={'type': 'string', 'test': ('another_value',)}) optiondescription_1 = OptionDescription(name="rougail", doc="Rougail", group_type=groups.namespace, children=[option_2, option_3], properties=frozenset({"standard"})) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_1]) diff --git a/tests/dictionaries/04_5validators_differ/tiramisu/multi.py b/tests/dictionaries/04_5validators_differ/tiramisu/multi.py index c3cfe58b7..3500c28a3 100644 --- a/tests/dictionaries/04_5validators_differ/tiramisu/multi.py +++ b/tests/dictionaries/04_5validators_differ/tiramisu/multi.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') try: groups.namespace except: @@ -13,11 +13,11 @@ ALLOWED_LEADER_PROPERTIES.add("advanced") dict_env['validators_1.rougail.var1'] = "{% if _.var1 == _.var2 %}\nvar1 must be different than var2\n{% endif %}\n" dict_env['validators_2.rougail.var1'] = "{% if _.var1 == _.var2 %}\nvar1 must be different than var2\n{% endif %}\n" option_4 = StrOption(name="var2", doc="A second variable", default="no", properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) -option_3 = StrOption(name="var1", doc="a first variable", default="oui", validators=[Calculation(func['valid_with_jinja'], Params((), kwargs={'__internal_jinja': ParamValue("validators_1.rougail.var1"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['tests/dictionaries/04_5validators_differ/dictionaries/rougail/00-base.yml']), '__internal_attribute': ParamValue("validators"), '__internal_variable': ParamValue("1.rougail.var1"), '_.var2': ParamOption(option_4, notraisepropertyerror=True), '_.var1': ParamSelfOption(whole=False)}))], properties=frozenset({"mandatory", "standard"}), informations={'type': 'string', 'test': ('another_value',)}) +option_3 = StrOption(name="var1", doc="a first variable", default="oui", validators=[Calculation(func['valid_with_jinja'], Params((), kwargs={'__internal_jinja': ParamValue("validators_1.rougail.var1"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['../rougail-tests/structures/04_5validators_differ/rougail/00-base.yml']), '__internal_attribute': ParamValue("validators"), '__internal_variable': ParamValue("1.rougail.var1"), '_.var2': ParamOption(option_4, notraisepropertyerror=True), '_.var1': ParamSelfOption(whole=False)}))], properties=frozenset({"mandatory", "standard"}), informations={'type': 'string', 'test': ('another_value',)}) optiondescription_2 = OptionDescription(name="rougail", doc="Rougail", group_type=groups.namespace, children=[option_3, option_4], properties=frozenset({"standard"})) optiondescription_1 = OptionDescription(name="1", doc="1", children=[optiondescription_2], properties=frozenset({"standard"})) option_8 = StrOption(name="var2", doc="A second variable", default="no", properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) -option_7 = StrOption(name="var1", doc="a first variable", default="oui", validators=[Calculation(func['valid_with_jinja'], Params((), kwargs={'__internal_jinja': ParamValue("validators_2.rougail.var1"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['tests/dictionaries/04_5validators_differ/dictionaries/rougail/00-base.yml']), '__internal_attribute': ParamValue("validators"), '__internal_variable': ParamValue("2.rougail.var1"), '_.var2': ParamOption(option_8, notraisepropertyerror=True), '_.var1': ParamSelfOption(whole=False)}))], properties=frozenset({"mandatory", "standard"}), informations={'type': 'string', 'test': ('another_value',)}) +option_7 = StrOption(name="var1", doc="a first variable", default="oui", validators=[Calculation(func['valid_with_jinja'], Params((), kwargs={'__internal_jinja': ParamValue("validators_2.rougail.var1"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['../rougail-tests/structures/04_5validators_differ/rougail/00-base.yml']), '__internal_attribute': ParamValue("validators"), '__internal_variable': ParamValue("2.rougail.var1"), '_.var2': ParamOption(option_8, notraisepropertyerror=True), '_.var1': ParamSelfOption(whole=False)}))], properties=frozenset({"mandatory", "standard"}), informations={'type': 'string', 'test': ('another_value',)}) optiondescription_6 = OptionDescription(name="rougail", doc="Rougail", group_type=groups.namespace, 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/04_5validators_differ/tiramisu/no_namespace.py b/tests/dictionaries/04_5validators_differ/tiramisu/no_namespace.py index 8f86719e9..d995a0d94 100644 --- a/tests/dictionaries/04_5validators_differ/tiramisu/no_namespace.py +++ b/tests/dictionaries/04_5validators_differ/tiramisu/no_namespace.py @@ -2,11 +2,11 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") ALLOWED_LEADER_PROPERTIES.add("standard") ALLOWED_LEADER_PROPERTIES.add("advanced") dict_env['validators_var1'] = "{% if _.var1 == _.var2 %}\nvar1 must be different than var2\n{% endif %}\n" option_2 = StrOption(name="var2", doc="A second variable", default="no", properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) -option_1 = StrOption(name="var1", doc="a first variable", default="oui", validators=[Calculation(func['valid_with_jinja'], Params((), kwargs={'__internal_jinja': ParamValue("validators_var1"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['tests/dictionaries/04_5validators_differ/dictionaries/rougail/00-base.yml']), '__internal_attribute': ParamValue("validators"), '__internal_variable': ParamValue("var1"), '_.var2': ParamOption(option_2, notraisepropertyerror=True), '_.var1': ParamSelfOption(whole=False)}))], properties=frozenset({"mandatory", "standard"}), informations={'type': 'string', 'test': ('another_value',)}) +option_1 = StrOption(name="var1", doc="a first variable", default="oui", validators=[Calculation(func['valid_with_jinja'], Params((), kwargs={'__internal_jinja': ParamValue("validators_var1"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['../rougail-tests/structures/04_5validators_differ/rougail/00-base.yml']), '__internal_attribute': ParamValue("validators"), '__internal_variable': ParamValue("var1"), '_.var2': ParamOption(option_2, notraisepropertyerror=True), '_.var1': ParamSelfOption(whole=False)}))], properties=frozenset({"mandatory", "standard"}), informations={'type': 'string', 'test': ('another_value',)}) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1, option_2]) diff --git a/tests/dictionaries/04_5validators_multi/dictionaries/rougail/00-base.yml b/tests/dictionaries/04_5validators_multi/dictionaries/rougail/00-base.yml deleted file mode 100644 index 8168c3a8b..000000000 --- a/tests/dictionaries/04_5validators_multi/dictionaries/rougail/00-base.yml +++ /dev/null @@ -1,14 +0,0 @@ ---- -version: 1.1 -var1: - description: a second variable - multi: true - default: - - 'no' - - 'yes' - validators: - - 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/tiramisu/base.py b/tests/dictionaries/04_5validators_multi/tiramisu/base.py index 092edd4ea..022f8fa90 100644 --- a/tests/dictionaries/04_5validators_multi/tiramisu/base.py +++ b/tests/dictionaries/04_5validators_multi/tiramisu/base.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') try: groups.namespace except: @@ -11,6 +11,6 @@ ALLOWED_LEADER_PROPERTIES.add("basic") ALLOWED_LEADER_PROPERTIES.add("standard") ALLOWED_LEADER_PROPERTIES.add("advanced") dict_env['validators_rougail.var1'] = "{% if _.var1 | 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), '__internal_files': ParamValue(['tests/dictionaries/04_5validators_multi/dictionaries/rougail/00-base.yml']), '__internal_attribute': ParamValue("validators"), '__internal_variable': ParamValue("rougail.var1"), '_.var1': ParamSelfOption(whole=False)}))], properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) +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), '__internal_files': ParamValue(['../rougail-tests/structures/04_5validators_multi/rougail/00-base.yml']), '__internal_attribute': ParamValue("validators"), '__internal_variable': ParamValue("rougail.var1"), '_.var1': ParamSelfOption(whole=False)}))], properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) optiondescription_1 = OptionDescription(name="rougail", doc="Rougail", group_type=groups.namespace, 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 index cdd9fcadd..604a1f395 100644 --- a/tests/dictionaries/04_5validators_multi/tiramisu/multi.py +++ b/tests/dictionaries/04_5validators_multi/tiramisu/multi.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') try: groups.namespace except: @@ -12,10 +12,10 @@ 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), '__internal_files': ParamValue(['tests/dictionaries/04_5validators_multi/dictionaries/rougail/00-base.yml']), '__internal_attribute': ParamValue("validators"), '__internal_variable': ParamValue("1.rougail.var1"), '_.var1': ParamSelfOption(whole=False)}))], properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) +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), '__internal_files': ParamValue(['../rougail-tests/structures/04_5validators_multi/rougail/00-base.yml']), '__internal_attribute': ParamValue("validators"), '__internal_variable': ParamValue("1.rougail.var1"), '_.var1': ParamSelfOption(whole=False)}))], properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) optiondescription_2 = OptionDescription(name="rougail", doc="Rougail", group_type=groups.namespace, 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), '__internal_files': ParamValue(['tests/dictionaries/04_5validators_multi/dictionaries/rougail/00-base.yml']), '__internal_attribute': ParamValue("validators"), '__internal_variable': ParamValue("2.rougail.var1"), '_.var1': ParamSelfOption(whole=False)}))], properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) +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), '__internal_files': ParamValue(['../rougail-tests/structures/04_5validators_multi/rougail/00-base.yml']), '__internal_attribute': ParamValue("validators"), '__internal_variable': ParamValue("2.rougail.var1"), '_.var1': ParamSelfOption(whole=False)}))], properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) optiondescription_5 = OptionDescription(name="rougail", doc="Rougail", group_type=groups.namespace, 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 index 8478e6edb..2e0472c5d 100644 --- a/tests/dictionaries/04_5validators_multi/tiramisu/no_namespace.py +++ b/tests/dictionaries/04_5validators_multi/tiramisu/no_namespace.py @@ -2,10 +2,10 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/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), '__internal_files': ParamValue(['tests/dictionaries/04_5validators_multi/dictionaries/rougail/00-base.yml']), '__internal_attribute': ParamValue("validators"), '__internal_variable': ParamValue("var1"), '_.var1': ParamSelfOption(whole=False)}))], properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) +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), '__internal_files': ParamValue(['../rougail-tests/structures/04_5validators_multi/rougail/00-base.yml']), '__internal_attribute': ParamValue("validators"), '__internal_variable': ParamValue("var1"), '_.var1': ParamSelfOption(whole=False)}))], properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1]) diff --git a/tests/dictionaries/04_5validators_multi2/dictionaries/rougail/00-base.yml b/tests/dictionaries/04_5validators_multi2/dictionaries/rougail/00-base.yml deleted file mode 100644 index 9627d4382..000000000 --- a/tests/dictionaries/04_5validators_multi2/dictionaries/rougail/00-base.yml +++ /dev/null @@ -1,21 +0,0 @@ ---- -version: 1.1 -var1: - description: a second variable - multi: true - default: - - 'no' - - 'yes' - test: - - 'val1' - - 'val2' - validators: - - params: - values: - 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/tiramisu/base.py b/tests/dictionaries/04_5validators_multi2/tiramisu/base.py index ca07bf559..d98fed9d0 100644 --- a/tests/dictionaries/04_5validators_multi2/tiramisu/base.py +++ b/tests/dictionaries/04_5validators_multi2/tiramisu/base.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') try: groups.namespace except: @@ -11,6 +11,6 @@ ALLOWED_LEADER_PROPERTIES.add("basic") ALLOWED_LEADER_PROPERTIES.add("standard") ALLOWED_LEADER_PROPERTIES.add("advanced") dict_env['validators_rougail.var1'] = "{% if 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), '__internal_files': ParamValue(['tests/dictionaries/04_5validators_multi2/dictionaries/rougail/00-base.yml']), '__internal_attribute': ParamValue("validators"), '__internal_variable': ParamValue("rougail.var1"), 'values': ParamSelfOption(whole=True)}))], properties=frozenset({"mandatory", "standard"}), informations={'type': 'string', 'test': ('val1', 'val2')}) +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), '__internal_files': ParamValue(['../rougail-tests/structures/04_5validators_multi2/rougail/00-base.yml']), '__internal_attribute': ParamValue("validators"), '__internal_variable': ParamValue("rougail.var1"), 'values': ParamSelfOption(whole=True)}))], properties=frozenset({"mandatory", "standard"}), informations={'type': 'string', 'test': ('val1', 'val2')}) optiondescription_1 = OptionDescription(name="rougail", doc="Rougail", group_type=groups.namespace, 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 index bcc87d241..9e907b8fb 100644 --- a/tests/dictionaries/04_5validators_multi2/tiramisu/multi.py +++ b/tests/dictionaries/04_5validators_multi2/tiramisu/multi.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') try: groups.namespace except: @@ -12,10 +12,10 @@ 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), '__internal_files': ParamValue(['tests/dictionaries/04_5validators_multi2/dictionaries/rougail/00-base.yml']), '__internal_attribute': ParamValue("validators"), '__internal_variable': ParamValue("1.rougail.var1"), 'values': ParamSelfOption(whole=True)}))], properties=frozenset({"mandatory", "standard"}), informations={'type': 'string', 'test': ('val1', 'val2')}) +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), '__internal_files': ParamValue(['../rougail-tests/structures/04_5validators_multi2/rougail/00-base.yml']), '__internal_attribute': ParamValue("validators"), '__internal_variable': ParamValue("1.rougail.var1"), 'values': ParamSelfOption(whole=True)}))], properties=frozenset({"mandatory", "standard"}), informations={'type': 'string', 'test': ('val1', 'val2')}) optiondescription_2 = OptionDescription(name="rougail", doc="Rougail", group_type=groups.namespace, 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), '__internal_files': ParamValue(['tests/dictionaries/04_5validators_multi2/dictionaries/rougail/00-base.yml']), '__internal_attribute': ParamValue("validators"), '__internal_variable': ParamValue("2.rougail.var1"), 'values': ParamSelfOption(whole=True)}))], properties=frozenset({"mandatory", "standard"}), informations={'type': 'string', 'test': ('val1', 'val2')}) +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), '__internal_files': ParamValue(['../rougail-tests/structures/04_5validators_multi2/rougail/00-base.yml']), '__internal_attribute': ParamValue("validators"), '__internal_variable': ParamValue("2.rougail.var1"), 'values': ParamSelfOption(whole=True)}))], properties=frozenset({"mandatory", "standard"}), informations={'type': 'string', 'test': ('val1', 'val2')}) optiondescription_5 = OptionDescription(name="rougail", doc="Rougail", group_type=groups.namespace, 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 index bad4ef5b7..b938f488f 100644 --- a/tests/dictionaries/04_5validators_multi2/tiramisu/no_namespace.py +++ b/tests/dictionaries/04_5validators_multi2/tiramisu/no_namespace.py @@ -2,10 +2,10 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/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), '__internal_files': ParamValue(['tests/dictionaries/04_5validators_multi2/dictionaries/rougail/00-base.yml']), '__internal_attribute': ParamValue("validators"), '__internal_variable': ParamValue("var1"), 'values': ParamSelfOption(whole=True)}))], properties=frozenset({"mandatory", "standard"}), informations={'type': 'string', 'test': ('val1', 'val2')}) +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), '__internal_files': ParamValue(['../rougail-tests/structures/04_5validators_multi2/rougail/00-base.yml']), '__internal_attribute': ParamValue("validators"), '__internal_variable': ParamValue("var1"), 'values': ParamSelfOption(whole=True)}))], properties=frozenset({"mandatory", "standard"}), informations={'type': 'string', 'test': ('val1', 'val2')}) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1]) diff --git a/tests/dictionaries/05_0multi_not_uniq/dictionaries/rougail/00-base.yml b/tests/dictionaries/05_0multi_not_uniq/dictionaries/rougail/00-base.yml deleted file mode 100644 index 6581fdfb9..000000000 --- a/tests/dictionaries/05_0multi_not_uniq/dictionaries/rougail/00-base.yml +++ /dev/null @@ -1,7 +0,0 @@ ---- -version: '1.1' -var1: - description: a variable - unique: false - default: - - non diff --git a/tests/dictionaries/05_0multi_not_uniq/tiramisu/base.py b/tests/dictionaries/05_0multi_not_uniq/tiramisu/base.py index 838b35f0b..52c304a8b 100644 --- a/tests/dictionaries/05_0multi_not_uniq/tiramisu/base.py +++ b/tests/dictionaries/05_0multi_not_uniq/tiramisu/base.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') try: groups.namespace except: diff --git a/tests/dictionaries/05_0multi_not_uniq/tiramisu/multi.py b/tests/dictionaries/05_0multi_not_uniq/tiramisu/multi.py index d9807087d..ab874647b 100644 --- a/tests/dictionaries/05_0multi_not_uniq/tiramisu/multi.py +++ b/tests/dictionaries/05_0multi_not_uniq/tiramisu/multi.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') try: groups.namespace except: 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 cdb5996c9..a7358c7c5 100644 --- a/tests/dictionaries/05_0multi_not_uniq/tiramisu/no_namespace.py +++ b/tests/dictionaries/05_0multi_not_uniq/tiramisu/no_namespace.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") ALLOWED_LEADER_PROPERTIES.add("standard") ALLOWED_LEADER_PROPERTIES.add("advanced") diff --git a/tests/dictionaries/05_0multi_uniq/dictionaries/rougail/00-base.yml b/tests/dictionaries/05_0multi_uniq/dictionaries/rougail/00-base.yml deleted file mode 100644 index f4f964d94..000000000 --- a/tests/dictionaries/05_0multi_uniq/dictionaries/rougail/00-base.yml +++ /dev/null @@ -1,7 +0,0 @@ ---- -version: '1.1' -variable: - description: a variable - unique: true - default: - - non diff --git a/tests/dictionaries/05_0multi_uniq/tiramisu/base.py b/tests/dictionaries/05_0multi_uniq/tiramisu/base.py index 511d33712..d0f969ca3 100644 --- a/tests/dictionaries/05_0multi_uniq/tiramisu/base.py +++ b/tests/dictionaries/05_0multi_uniq/tiramisu/base.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') try: groups.namespace except: diff --git a/tests/dictionaries/05_0multi_uniq/tiramisu/multi.py b/tests/dictionaries/05_0multi_uniq/tiramisu/multi.py index 3772cb179..e83e7f0b7 100644 --- a/tests/dictionaries/05_0multi_uniq/tiramisu/multi.py +++ b/tests/dictionaries/05_0multi_uniq/tiramisu/multi.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') try: groups.namespace except: diff --git a/tests/dictionaries/05_0multi_uniq/tiramisu/no_namespace.py b/tests/dictionaries/05_0multi_uniq/tiramisu/no_namespace.py index 81c7ca94d..b88632834 100644 --- a/tests/dictionaries/05_0multi_uniq/tiramisu/no_namespace.py +++ b/tests/dictionaries/05_0multi_uniq/tiramisu/no_namespace.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") ALLOWED_LEADER_PROPERTIES.add("standard") ALLOWED_LEADER_PROPERTIES.add("advanced") diff --git a/tests/dictionaries/12_1auto_save_expert/dictionaries/rougail/00-base.yml b/tests/dictionaries/12_1auto_save_expert/dictionaries/rougail/00-base.yml deleted file mode 100644 index 641bb3529..000000000 --- a/tests/dictionaries/12_1auto_save_expert/dictionaries/rougail/00-base.yml +++ /dev/null @@ -1,7 +0,0 @@ ---- -version: 1.1 -var: - description: a variable - auto_save: true - mode: advanced - default: "no" diff --git a/tests/dictionaries/12_1auto_save_expert/tiramisu/base.py b/tests/dictionaries/12_1auto_save_expert/tiramisu/base.py index 7f548fa00..ca70061ed 100644 --- a/tests/dictionaries/12_1auto_save_expert/tiramisu/base.py +++ b/tests/dictionaries/12_1auto_save_expert/tiramisu/base.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') try: groups.namespace except: diff --git a/tests/dictionaries/12_1auto_save_expert/tiramisu/multi.py b/tests/dictionaries/12_1auto_save_expert/tiramisu/multi.py index 735f2c389..cf9fc902f 100644 --- a/tests/dictionaries/12_1auto_save_expert/tiramisu/multi.py +++ b/tests/dictionaries/12_1auto_save_expert/tiramisu/multi.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') try: groups.namespace except: 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 434bcc5bd..195a406e4 100644 --- a/tests/dictionaries/12_1auto_save_expert/tiramisu/no_namespace.py +++ b/tests/dictionaries/12_1auto_save_expert/tiramisu/no_namespace.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") ALLOWED_LEADER_PROPERTIES.add("standard") ALLOWED_LEADER_PROPERTIES.add("advanced") diff --git a/tests/dictionaries/16_0redefine_description/dictionaries/rougail/00-base.yml b/tests/dictionaries/16_0redefine_description/dictionaries/rougail/00-base.yml deleted file mode 100644 index 83227aa50..000000000 --- a/tests/dictionaries/16_0redefine_description/dictionaries/rougail/00-base.yml +++ /dev/null @@ -1,4 +0,0 @@ ---- -version: '1.1' -var: - description: Redefine description diff --git a/tests/dictionaries/16_0redefine_description/dictionaries/rougail/01-redefine.yml b/tests/dictionaries/16_0redefine_description/dictionaries/rougail/01-redefine.yml deleted file mode 100644 index 667b85fb6..000000000 --- a/tests/dictionaries/16_0redefine_description/dictionaries/rougail/01-redefine.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -version: '1.1' -var: - description: Redefined - redefine: true diff --git a/tests/dictionaries/16_0redefine_description/tiramisu/base.py b/tests/dictionaries/16_0redefine_description/tiramisu/base.py index 8fd154bcc..cd77d3e35 100644 --- a/tests/dictionaries/16_0redefine_description/tiramisu/base.py +++ b/tests/dictionaries/16_0redefine_description/tiramisu/base.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') try: groups.namespace except: diff --git a/tests/dictionaries/16_0redefine_description/tiramisu/multi.py b/tests/dictionaries/16_0redefine_description/tiramisu/multi.py index 749bbe3aa..98eaba57b 100644 --- a/tests/dictionaries/16_0redefine_description/tiramisu/multi.py +++ b/tests/dictionaries/16_0redefine_description/tiramisu/multi.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') try: groups.namespace except: diff --git a/tests/dictionaries/16_0redefine_description/tiramisu/no_namespace.py b/tests/dictionaries/16_0redefine_description/tiramisu/no_namespace.py index cedc40a63..04f2d65e7 100644 --- a/tests/dictionaries/16_0redefine_description/tiramisu/no_namespace.py +++ b/tests/dictionaries/16_0redefine_description/tiramisu/no_namespace.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") ALLOWED_LEADER_PROPERTIES.add("standard") ALLOWED_LEADER_PROPERTIES.add("advanced") diff --git a/tests/dictionaries/16_2family_redefine_calculation/dictionaries/rougail/00-base.yml b/tests/dictionaries/16_2family_redefine_calculation/dictionaries/rougail/00-base.yml deleted file mode 100644 index 553c9a747..000000000 --- a/tests/dictionaries/16_2family_redefine_calculation/dictionaries/rougail/00-base.yml +++ /dev/null @@ -1,4 +0,0 @@ ---- -version: '1.0' -family: - var1: 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 deleted file mode 100644 index 098e9303e..000000000 --- a/tests/dictionaries/16_2family_redefine_calculation/dictionaries/rougail/01-base.yml +++ /dev/null @@ -1,7 +0,0 @@ ---- -version: '1.0' -family: - redefine: true - disabled: - 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 5b959eb3d..8b9292271 100644 --- a/tests/dictionaries/16_2family_redefine_calculation/tiramisu/base.py +++ b/tests/dictionaries/16_2family_redefine_calculation/tiramisu/base.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') try: groups.namespace except: @@ -12,6 +12,6 @@ ALLOWED_LEADER_PROPERTIES.add("standard") ALLOWED_LEADER_PROPERTIES.add("advanced") dict_env['disabled_rougail.family'] = "true\n" option_3 = StrOption(name="var1", doc="var1", properties=frozenset({"basic", "mandatory"}), informations={'type': 'string'}) -optiondescription_2 = OptionDescription(name="family", doc="family", children=[option_3], properties=frozenset({"basic", Calculation(func['jinja_to_property'], Params((ParamValue("disabled")), kwargs={'__internal_jinja': ParamValue("disabled_rougail.family"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['tests/dictionaries/16_2family_redefine_calculation/dictionaries/rougail/01-base.yml']), '__internal_attribute': ParamValue("disabled"), '__internal_variable': ParamValue("rougail.family"), 'when': ParamValue(True), 'inverse': ParamValue(False)}), help_function=func['jinja_to_property_help'])})) +optiondescription_2 = OptionDescription(name="family", doc="family", children=[option_3], properties=frozenset({"basic", Calculation(func['jinja_to_property'], Params((ParamValue("disabled")), kwargs={'__internal_jinja': ParamValue("disabled_rougail.family"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['../rougail-tests/structures/16_2family_redefine_calculation/rougail/01-base.yml']), '__internal_attribute': ParamValue("disabled"), '__internal_variable': ParamValue("rougail.family"), 'when': ParamValue(True), 'inverse': ParamValue(False)}), help_function=func['jinja_to_property_help'])})) optiondescription_1 = OptionDescription(name="rougail", doc="Rougail", group_type=groups.namespace, children=[optiondescription_2], properties=frozenset({"basic"})) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_1]) diff --git a/tests/dictionaries/16_2family_redefine_calculation/tiramisu/multi.py b/tests/dictionaries/16_2family_redefine_calculation/tiramisu/multi.py index a600d5fa0..179347ad8 100644 --- a/tests/dictionaries/16_2family_redefine_calculation/tiramisu/multi.py +++ b/tests/dictionaries/16_2family_redefine_calculation/tiramisu/multi.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') try: groups.namespace except: @@ -13,11 +13,11 @@ ALLOWED_LEADER_PROPERTIES.add("advanced") dict_env['disabled_1.rougail.family'] = "true\n" dict_env['disabled_2.rougail.family'] = "true\n" option_4 = StrOption(name="var1", doc="var1", properties=frozenset({"basic", "mandatory"}), informations={'type': 'string'}) -optiondescription_3 = OptionDescription(name="family", doc="family", children=[option_4], properties=frozenset({"basic", Calculation(func['jinja_to_property'], Params((ParamValue("disabled")), kwargs={'__internal_jinja': ParamValue("disabled_1.rougail.family"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['tests/dictionaries/16_2family_redefine_calculation/dictionaries/rougail/01-base.yml']), '__internal_attribute': ParamValue("disabled"), '__internal_variable': ParamValue("1.rougail.family"), 'when': ParamValue(True), 'inverse': ParamValue(False)}), help_function=func['jinja_to_property_help'])})) +optiondescription_3 = OptionDescription(name="family", doc="family", children=[option_4], properties=frozenset({"basic", Calculation(func['jinja_to_property'], Params((ParamValue("disabled")), kwargs={'__internal_jinja': ParamValue("disabled_1.rougail.family"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['../rougail-tests/structures/16_2family_redefine_calculation/rougail/01-base.yml']), '__internal_attribute': ParamValue("disabled"), '__internal_variable': ParamValue("1.rougail.family"), 'when': ParamValue(True), 'inverse': ParamValue(False)}), help_function=func['jinja_to_property_help'])})) optiondescription_2 = OptionDescription(name="rougail", doc="Rougail", group_type=groups.namespace, children=[optiondescription_3], properties=frozenset({"basic"})) optiondescription_1 = OptionDescription(name="1", doc="1", children=[optiondescription_2], properties=frozenset({"basic"})) option_8 = StrOption(name="var1", doc="var1", properties=frozenset({"basic", "mandatory"}), informations={'type': 'string'}) -optiondescription_7 = OptionDescription(name="family", doc="family", children=[option_8], properties=frozenset({"basic", Calculation(func['jinja_to_property'], Params((ParamValue("disabled")), kwargs={'__internal_jinja': ParamValue("disabled_2.rougail.family"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['tests/dictionaries/16_2family_redefine_calculation/dictionaries/rougail/01-base.yml']), '__internal_attribute': ParamValue("disabled"), '__internal_variable': ParamValue("2.rougail.family"), 'when': ParamValue(True), 'inverse': ParamValue(False)}), help_function=func['jinja_to_property_help'])})) +optiondescription_7 = OptionDescription(name="family", doc="family", children=[option_8], properties=frozenset({"basic", Calculation(func['jinja_to_property'], Params((ParamValue("disabled")), kwargs={'__internal_jinja': ParamValue("disabled_2.rougail.family"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['../rougail-tests/structures/16_2family_redefine_calculation/rougail/01-base.yml']), '__internal_attribute': ParamValue("disabled"), '__internal_variable': ParamValue("2.rougail.family"), 'when': ParamValue(True), 'inverse': ParamValue(False)}), help_function=func['jinja_to_property_help'])})) optiondescription_6 = OptionDescription(name="rougail", doc="Rougail", group_type=groups.namespace, 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/16_2family_redefine_calculation/tiramisu/no_namespace.py b/tests/dictionaries/16_2family_redefine_calculation/tiramisu/no_namespace.py index 5b643aeff..cc366fb8d 100644 --- a/tests/dictionaries/16_2family_redefine_calculation/tiramisu/no_namespace.py +++ b/tests/dictionaries/16_2family_redefine_calculation/tiramisu/no_namespace.py @@ -2,11 +2,11 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") ALLOWED_LEADER_PROPERTIES.add("standard") ALLOWED_LEADER_PROPERTIES.add("advanced") dict_env['disabled_family'] = "true\n" option_2 = StrOption(name="var1", doc="var1", properties=frozenset({"basic", "mandatory"}), informations={'type': 'string'}) -optiondescription_1 = OptionDescription(name="family", doc="family", children=[option_2], properties=frozenset({"basic", Calculation(func['jinja_to_property'], Params((ParamValue("disabled")), kwargs={'__internal_jinja': ParamValue("disabled_family"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['tests/dictionaries/16_2family_redefine_calculation/dictionaries/rougail/01-base.yml']), '__internal_attribute': ParamValue("disabled"), '__internal_variable': ParamValue("family"), 'when': ParamValue(True), 'inverse': ParamValue(False)}), help_function=func['jinja_to_property_help'])})) +optiondescription_1 = OptionDescription(name="family", doc="family", children=[option_2], properties=frozenset({"basic", Calculation(func['jinja_to_property'], Params((ParamValue("disabled")), kwargs={'__internal_jinja': ParamValue("disabled_family"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['../rougail-tests/structures/16_2family_redefine_calculation/rougail/01-base.yml']), '__internal_attribute': ParamValue("disabled"), '__internal_variable': ParamValue("family"), 'when': ParamValue(True), 'inverse': ParamValue(False)}), help_function=func['jinja_to_property_help'])})) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_1]) diff --git a/tests/dictionaries/16_2family_redefine_disabled/dictionaries/rougail/00-base.yml b/tests/dictionaries/16_2family_redefine_disabled/dictionaries/rougail/00-base.yml deleted file mode 100644 index 553c9a747..000000000 --- a/tests/dictionaries/16_2family_redefine_disabled/dictionaries/rougail/00-base.yml +++ /dev/null @@ -1,4 +0,0 @@ ---- -version: '1.0' -family: - var1: diff --git a/tests/dictionaries/16_2family_redefine_disabled/dictionaries/rougail/01-base.yml b/tests/dictionaries/16_2family_redefine_disabled/dictionaries/rougail/01-base.yml deleted file mode 100644 index f33c4b207..000000000 --- a/tests/dictionaries/16_2family_redefine_disabled/dictionaries/rougail/01-base.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -version: '1.0' -family: - redefine: true - disabled: true diff --git a/tests/dictionaries/16_2family_redefine_disabled/tiramisu/base.py b/tests/dictionaries/16_2family_redefine_disabled/tiramisu/base.py index 1c8a83711..bac91780b 100644 --- a/tests/dictionaries/16_2family_redefine_disabled/tiramisu/base.py +++ b/tests/dictionaries/16_2family_redefine_disabled/tiramisu/base.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') try: groups.namespace except: diff --git a/tests/dictionaries/16_2family_redefine_disabled/tiramisu/multi.py b/tests/dictionaries/16_2family_redefine_disabled/tiramisu/multi.py index 7125b5e12..2756385bf 100644 --- a/tests/dictionaries/16_2family_redefine_disabled/tiramisu/multi.py +++ b/tests/dictionaries/16_2family_redefine_disabled/tiramisu/multi.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') try: groups.namespace except: 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 0954076d9..de622f4cf 100644 --- a/tests/dictionaries/16_2family_redefine_disabled/tiramisu/no_namespace.py +++ b/tests/dictionaries/16_2family_redefine_disabled/tiramisu/no_namespace.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") ALLOWED_LEADER_PROPERTIES.add("standard") ALLOWED_LEADER_PROPERTIES.add("advanced") diff --git a/tests/dictionaries/16_5exists_nonexists/dictionaries/rougail/00-base.yml b/tests/dictionaries/16_5exists_nonexists/dictionaries/rougail/00-base.yml deleted file mode 100644 index 112f25c63..000000000 --- a/tests/dictionaries/16_5exists_nonexists/dictionaries/rougail/00-base.yml +++ /dev/null @@ -1,3 +0,0 @@ ---- -version: '1.1' -var1: "no" # a variable diff --git a/tests/dictionaries/16_5exists_nonexists/dictionaries/rougail/01-base.yml b/tests/dictionaries/16_5exists_nonexists/dictionaries/rougail/01-base.yml deleted file mode 100644 index 29266e3b5..000000000 --- a/tests/dictionaries/16_5exists_nonexists/dictionaries/rougail/01-base.yml +++ /dev/null @@ -1,6 +0,0 @@ ---- -version: '1.1' -var2: - description: a new variable - exists: false - default: "yes" diff --git a/tests/dictionaries/16_5exists_nonexists/tiramisu/base.py b/tests/dictionaries/16_5exists_nonexists/tiramisu/base.py index c02d0ed15..9ffc3a5f4 100644 --- a/tests/dictionaries/16_5exists_nonexists/tiramisu/base.py +++ b/tests/dictionaries/16_5exists_nonexists/tiramisu/base.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') try: groups.namespace except: diff --git a/tests/dictionaries/16_5exists_nonexists/tiramisu/multi.py b/tests/dictionaries/16_5exists_nonexists/tiramisu/multi.py index b046a338f..4864d0f27 100644 --- a/tests/dictionaries/16_5exists_nonexists/tiramisu/multi.py +++ b/tests/dictionaries/16_5exists_nonexists/tiramisu/multi.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') try: groups.namespace except: diff --git a/tests/dictionaries/16_5exists_nonexists/tiramisu/no_namespace.py b/tests/dictionaries/16_5exists_nonexists/tiramisu/no_namespace.py index 41d253240..97c77f63e 100644 --- a/tests/dictionaries/16_5exists_nonexists/tiramisu/no_namespace.py +++ b/tests/dictionaries/16_5exists_nonexists/tiramisu/no_namespace.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") ALLOWED_LEADER_PROPERTIES.add("standard") ALLOWED_LEADER_PROPERTIES.add("advanced") diff --git a/tests/dictionaries/16_5exists_redefine/dictionaries/rougail/00-base.yml b/tests/dictionaries/16_5exists_redefine/dictionaries/rougail/00-base.yml deleted file mode 100644 index 5ba66f478..000000000 --- a/tests/dictionaries/16_5exists_redefine/dictionaries/rougail/00-base.yml +++ /dev/null @@ -1,7 +0,0 @@ ---- -version: '1.1' -var1: - description: a first variable - hidden: true - default: "no" - mandatory: false diff --git a/tests/dictionaries/16_5exists_redefine/dictionaries/rougail/01-base.yml b/tests/dictionaries/16_5exists_redefine/dictionaries/rougail/01-base.yml deleted file mode 100644 index a72ec9ebb..000000000 --- a/tests/dictionaries/16_5exists_redefine/dictionaries/rougail/01-base.yml +++ /dev/null @@ -1,11 +0,0 @@ ---- -version: '1.1' -var1: - redefine: true - exists: true - default: "yes" -var2: - description: a second variable - redefine: true - exists: true - default: "yes" diff --git a/tests/dictionaries/16_5exists_redefine/tiramisu/base.py b/tests/dictionaries/16_5exists_redefine/tiramisu/base.py index 966ee69ab..263db2201 100644 --- a/tests/dictionaries/16_5exists_redefine/tiramisu/base.py +++ b/tests/dictionaries/16_5exists_redefine/tiramisu/base.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') try: groups.namespace except: diff --git a/tests/dictionaries/16_5exists_redefine/tiramisu/multi.py b/tests/dictionaries/16_5exists_redefine/tiramisu/multi.py index 00fa9d983..335548671 100644 --- a/tests/dictionaries/16_5exists_redefine/tiramisu/multi.py +++ b/tests/dictionaries/16_5exists_redefine/tiramisu/multi.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') try: groups.namespace except: diff --git a/tests/dictionaries/16_5exists_redefine/tiramisu/no_namespace.py b/tests/dictionaries/16_5exists_redefine/tiramisu/no_namespace.py index 8c59dba13..12edb80cd 100644 --- a/tests/dictionaries/16_5exists_redefine/tiramisu/no_namespace.py +++ b/tests/dictionaries/16_5exists_redefine/tiramisu/no_namespace.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") ALLOWED_LEADER_PROPERTIES.add("standard") ALLOWED_LEADER_PROPERTIES.add("advanced") diff --git a/tests/dictionaries/16_5redefine_calculation/dictionaries/rougail/00-base.yml b/tests/dictionaries/16_5redefine_calculation/dictionaries/rougail/00-base.yml deleted file mode 100644 index 20889f115..000000000 --- a/tests/dictionaries/16_5redefine_calculation/dictionaries/rougail/00-base.yml +++ /dev/null @@ -1,7 +0,0 @@ ---- -version: '1.1' -variable: - description: a variable - default: - 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 deleted file mode 100644 index 48eb5bbac..000000000 --- a/tests/dictionaries/16_5redefine_calculation/dictionaries/rougail/01-base.yml +++ /dev/null @@ -1,7 +0,0 @@ ---- -version: '1.1' -variable: - redefine: true - default: - 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 2d50e0776..699ec8cf8 100644 --- a/tests/dictionaries/16_5redefine_calculation/tiramisu/base.py +++ b/tests/dictionaries/16_5redefine_calculation/tiramisu/base.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') try: groups.namespace except: @@ -11,6 +11,6 @@ ALLOWED_LEADER_PROPERTIES.add("basic") ALLOWED_LEADER_PROPERTIES.add("standard") ALLOWED_LEADER_PROPERTIES.add("advanced") dict_env['default_rougail.variable'] = "yes" -option_2 = StrOption(name="variable", doc="a variable", default=Calculation(func['jinja_to_function'], Params((), kwargs={'__internal_jinja': ParamValue("default_rougail.variable"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['tests/dictionaries/16_5redefine_calculation/dictionaries/rougail/01-base.yml']), '__internal_attribute': ParamValue("default"), '__internal_variable': ParamValue("rougail.variable")})), properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) +option_2 = StrOption(name="variable", doc="a variable", default=Calculation(func['jinja_to_function'], Params((), kwargs={'__internal_jinja': ParamValue("default_rougail.variable"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['../rougail-tests/structures/16_5redefine_calculation/rougail/01-base.yml']), '__internal_attribute': ParamValue("default"), '__internal_variable': ParamValue("rougail.variable")})), properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) optiondescription_1 = OptionDescription(name="rougail", doc="Rougail", group_type=groups.namespace, children=[option_2], properties=frozenset({"standard"})) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_1]) diff --git a/tests/dictionaries/16_5redefine_calculation/tiramisu/multi.py b/tests/dictionaries/16_5redefine_calculation/tiramisu/multi.py index 3ace5dc04..3ca69ef69 100644 --- a/tests/dictionaries/16_5redefine_calculation/tiramisu/multi.py +++ b/tests/dictionaries/16_5redefine_calculation/tiramisu/multi.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') try: groups.namespace except: @@ -12,10 +12,10 @@ ALLOWED_LEADER_PROPERTIES.add("standard") ALLOWED_LEADER_PROPERTIES.add("advanced") dict_env['default_1.rougail.variable'] = "yes" dict_env['default_2.rougail.variable'] = "yes" -option_3 = StrOption(name="variable", doc="a variable", default=Calculation(func['jinja_to_function'], Params((), kwargs={'__internal_jinja': ParamValue("default_1.rougail.variable"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['tests/dictionaries/16_5redefine_calculation/dictionaries/rougail/01-base.yml']), '__internal_attribute': ParamValue("default"), '__internal_variable': ParamValue("1.rougail.variable")})), properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) +option_3 = StrOption(name="variable", doc="a variable", default=Calculation(func['jinja_to_function'], Params((), kwargs={'__internal_jinja': ParamValue("default_1.rougail.variable"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['../rougail-tests/structures/16_5redefine_calculation/rougail/01-base.yml']), '__internal_attribute': ParamValue("default"), '__internal_variable': ParamValue("1.rougail.variable")})), properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) optiondescription_2 = OptionDescription(name="rougail", doc="Rougail", group_type=groups.namespace, children=[option_3], properties=frozenset({"standard"})) optiondescription_1 = OptionDescription(name="1", doc="1", children=[optiondescription_2], properties=frozenset({"standard"})) -option_6 = StrOption(name="variable", doc="a variable", default=Calculation(func['jinja_to_function'], Params((), kwargs={'__internal_jinja': ParamValue("default_2.rougail.variable"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['tests/dictionaries/16_5redefine_calculation/dictionaries/rougail/01-base.yml']), '__internal_attribute': ParamValue("default"), '__internal_variable': ParamValue("2.rougail.variable")})), properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) +option_6 = StrOption(name="variable", doc="a variable", default=Calculation(func['jinja_to_function'], Params((), kwargs={'__internal_jinja': ParamValue("default_2.rougail.variable"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['../rougail-tests/structures/16_5redefine_calculation/rougail/01-base.yml']), '__internal_attribute': ParamValue("default"), '__internal_variable': ParamValue("2.rougail.variable")})), properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) optiondescription_5 = OptionDescription(name="rougail", doc="Rougail", group_type=groups.namespace, 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/16_5redefine_calculation/tiramisu/no_namespace.py b/tests/dictionaries/16_5redefine_calculation/tiramisu/no_namespace.py index d520957ca..736ad95a3 100644 --- a/tests/dictionaries/16_5redefine_calculation/tiramisu/no_namespace.py +++ b/tests/dictionaries/16_5redefine_calculation/tiramisu/no_namespace.py @@ -2,10 +2,10 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") ALLOWED_LEADER_PROPERTIES.add("standard") ALLOWED_LEADER_PROPERTIES.add("advanced") dict_env['default_variable'] = "yes" -option_1 = StrOption(name="variable", doc="a variable", default=Calculation(func['jinja_to_function'], Params((), kwargs={'__internal_jinja': ParamValue("default_variable"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['tests/dictionaries/16_5redefine_calculation/dictionaries/rougail/01-base.yml']), '__internal_attribute': ParamValue("default"), '__internal_variable': ParamValue("variable")})), properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) +option_1 = StrOption(name="variable", doc="a variable", default=Calculation(func['jinja_to_function'], Params((), kwargs={'__internal_jinja': ParamValue("default_variable"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['../rougail-tests/structures/16_5redefine_calculation/rougail/01-base.yml']), '__internal_attribute': ParamValue("default"), '__internal_variable': ParamValue("variable")})), properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1]) diff --git a/tests/dictionaries/16_5redefine_choice/dictionaries/rougail/00-base.yml b/tests/dictionaries/16_5redefine_choice/dictionaries/rougail/00-base.yml deleted file mode 100644 index 905b8651c..000000000 --- a/tests/dictionaries/16_5redefine_choice/dictionaries/rougail/00-base.yml +++ /dev/null @@ -1,8 +0,0 @@ ---- -version: '1.1' -variable: - description: a variable - choices: - - a - - b - - c diff --git a/tests/dictionaries/16_5redefine_choice/dictionaries/rougail/01-redefine.yml b/tests/dictionaries/16_5redefine_choice/dictionaries/rougail/01-redefine.yml deleted file mode 100644 index f8f1d6aa1..000000000 --- a/tests/dictionaries/16_5redefine_choice/dictionaries/rougail/01-redefine.yml +++ /dev/null @@ -1,7 +0,0 @@ ---- -version: '1.0' -variable: - redefine: true - choices: - - a - - b diff --git a/tests/dictionaries/16_5redefine_choice/tiramisu/base.py b/tests/dictionaries/16_5redefine_choice/tiramisu/base.py index a0e24e2fe..001926c71 100644 --- a/tests/dictionaries/16_5redefine_choice/tiramisu/base.py +++ b/tests/dictionaries/16_5redefine_choice/tiramisu/base.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') try: groups.namespace except: diff --git a/tests/dictionaries/16_5redefine_choice/tiramisu/multi.py b/tests/dictionaries/16_5redefine_choice/tiramisu/multi.py index c15ebed67..e704c5408 100644 --- a/tests/dictionaries/16_5redefine_choice/tiramisu/multi.py +++ b/tests/dictionaries/16_5redefine_choice/tiramisu/multi.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') try: groups.namespace except: diff --git a/tests/dictionaries/16_5redefine_choice/tiramisu/no_namespace.py b/tests/dictionaries/16_5redefine_choice/tiramisu/no_namespace.py index ca3a694b9..47c34cc47 100644 --- a/tests/dictionaries/16_5redefine_choice/tiramisu/no_namespace.py +++ b/tests/dictionaries/16_5redefine_choice/tiramisu/no_namespace.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") ALLOWED_LEADER_PROPERTIES.add("standard") ALLOWED_LEADER_PROPERTIES.add("advanced") diff --git a/tests/dictionaries/16_5redefine_default/dictionaries/rougail/00-base.yml b/tests/dictionaries/16_5redefine_default/dictionaries/rougail/00-base.yml deleted file mode 100644 index e694df3f4..000000000 --- a/tests/dictionaries/16_5redefine_default/dictionaries/rougail/00-base.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -version: '1.1' -variable: - description: a variable - default: "no" diff --git a/tests/dictionaries/16_5redefine_default/dictionaries/rougail/01-redefine.yml b/tests/dictionaries/16_5redefine_default/dictionaries/rougail/01-redefine.yml deleted file mode 100644 index c9d7ff109..000000000 --- a/tests/dictionaries/16_5redefine_default/dictionaries/rougail/01-redefine.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -version: '1.1' -variable: - redefine: true - default: "yes" diff --git a/tests/dictionaries/16_5redefine_default/tiramisu/base.py b/tests/dictionaries/16_5redefine_default/tiramisu/base.py index 1cc157611..bd48561b1 100644 --- a/tests/dictionaries/16_5redefine_default/tiramisu/base.py +++ b/tests/dictionaries/16_5redefine_default/tiramisu/base.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') try: groups.namespace except: diff --git a/tests/dictionaries/16_5redefine_default/tiramisu/multi.py b/tests/dictionaries/16_5redefine_default/tiramisu/multi.py index 7b1356494..4b28a7f3d 100644 --- a/tests/dictionaries/16_5redefine_default/tiramisu/multi.py +++ b/tests/dictionaries/16_5redefine_default/tiramisu/multi.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') try: groups.namespace except: diff --git a/tests/dictionaries/16_5redefine_default/tiramisu/no_namespace.py b/tests/dictionaries/16_5redefine_default/tiramisu/no_namespace.py index 29373d00e..9d1fa5a3f 100644 --- a/tests/dictionaries/16_5redefine_default/tiramisu/no_namespace.py +++ b/tests/dictionaries/16_5redefine_default/tiramisu/no_namespace.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") ALLOWED_LEADER_PROPERTIES.add("standard") ALLOWED_LEADER_PROPERTIES.add("advanced") 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 deleted file mode 100644 index 3f44bad41..000000000 --- a/tests/dictionaries/16_5redefine_default_calculation/dictionaries/rougail/00-base.yml +++ /dev/null @@ -1,6 +0,0 @@ ---- -version: '1.1' -variable: - description: a variable - default: - jinja: 'yes' diff --git a/tests/dictionaries/16_5redefine_default_calculation/dictionaries/rougail/01-base.yml b/tests/dictionaries/16_5redefine_default_calculation/dictionaries/rougail/01-base.yml deleted file mode 100644 index 165e9c50c..000000000 --- a/tests/dictionaries/16_5redefine_default_calculation/dictionaries/rougail/01-base.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -version: '1.1' -variable: - redefine: true - default: null diff --git a/tests/dictionaries/16_5redefine_default_calculation/tiramisu/base.py b/tests/dictionaries/16_5redefine_default_calculation/tiramisu/base.py index c23b855cd..0d751363b 100644 --- a/tests/dictionaries/16_5redefine_default_calculation/tiramisu/base.py +++ b/tests/dictionaries/16_5redefine_default_calculation/tiramisu/base.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') try: groups.namespace except: diff --git a/tests/dictionaries/16_5redefine_default_calculation/tiramisu/multi.py b/tests/dictionaries/16_5redefine_default_calculation/tiramisu/multi.py index 5d4e5180c..d87a998a5 100644 --- a/tests/dictionaries/16_5redefine_default_calculation/tiramisu/multi.py +++ b/tests/dictionaries/16_5redefine_default_calculation/tiramisu/multi.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') try: groups.namespace except: 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 c2ce765c9..eb3369171 100644 --- a/tests/dictionaries/16_5redefine_default_calculation/tiramisu/no_namespace.py +++ b/tests/dictionaries/16_5redefine_default_calculation/tiramisu/no_namespace.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") ALLOWED_LEADER_PROPERTIES.add("standard") ALLOWED_LEADER_PROPERTIES.add("advanced") diff --git a/tests/dictionaries/16_5redefine_family/dictionaries/rougail/00-base.yml b/tests/dictionaries/16_5redefine_family/dictionaries/rougail/00-base.yml deleted file mode 100644 index 01b181fb2..000000000 --- a/tests/dictionaries/16_5redefine_family/dictionaries/rougail/00-base.yml +++ /dev/null @@ -1,4 +0,0 @@ ---- -version: '1.1' -family: # a family - variable: # a variable diff --git a/tests/dictionaries/16_5redefine_family/dictionaries/rougail/01-base.yml b/tests/dictionaries/16_5redefine_family/dictionaries/rougail/01-base.yml deleted file mode 100644 index 9572509b6..000000000 --- a/tests/dictionaries/16_5redefine_family/dictionaries/rougail/01-base.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -version: '1.1' -family: - redefine: true - description: new description diff --git a/tests/dictionaries/16_5redefine_family/tiramisu/base.py b/tests/dictionaries/16_5redefine_family/tiramisu/base.py index dbf658acb..bb7c04d85 100644 --- a/tests/dictionaries/16_5redefine_family/tiramisu/base.py +++ b/tests/dictionaries/16_5redefine_family/tiramisu/base.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') try: groups.namespace except: diff --git a/tests/dictionaries/16_5redefine_family/tiramisu/multi.py b/tests/dictionaries/16_5redefine_family/tiramisu/multi.py index e0419da9a..84d419f3c 100644 --- a/tests/dictionaries/16_5redefine_family/tiramisu/multi.py +++ b/tests/dictionaries/16_5redefine_family/tiramisu/multi.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') try: groups.namespace except: diff --git a/tests/dictionaries/16_5redefine_family/tiramisu/no_namespace.py b/tests/dictionaries/16_5redefine_family/tiramisu/no_namespace.py index e200bbcd0..7a795d51b 100644 --- a/tests/dictionaries/16_5redefine_family/tiramisu/no_namespace.py +++ b/tests/dictionaries/16_5redefine_family/tiramisu/no_namespace.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") ALLOWED_LEADER_PROPERTIES.add("standard") ALLOWED_LEADER_PROPERTIES.add("advanced") diff --git a/tests/dictionaries/16_5redefine_help/dictionaries/rougail/00-base.yml b/tests/dictionaries/16_5redefine_help/dictionaries/rougail/00-base.yml deleted file mode 100644 index db01b218f..000000000 --- a/tests/dictionaries/16_5redefine_help/dictionaries/rougail/00-base.yml +++ /dev/null @@ -1,8 +0,0 @@ ---- -version: '1.1' -family: - description: a family - help: redefine help family - variable: - description: redefine help - help: redefine help diff --git a/tests/dictionaries/16_5redefine_help/dictionaries/rougail/01-base.yml b/tests/dictionaries/16_5redefine_help/dictionaries/rougail/01-base.yml deleted file mode 100644 index f7e049527..000000000 --- a/tests/dictionaries/16_5redefine_help/dictionaries/rougail/01-base.yml +++ /dev/null @@ -1,8 +0,0 @@ ---- -version: '1.1' -family: - redefine: true - help: redefine help family ok - variable: - redefine: true - help: redefine help ok diff --git a/tests/dictionaries/16_5redefine_help/tiramisu/base.py b/tests/dictionaries/16_5redefine_help/tiramisu/base.py index de2396092..9d1ad9441 100644 --- a/tests/dictionaries/16_5redefine_help/tiramisu/base.py +++ b/tests/dictionaries/16_5redefine_help/tiramisu/base.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') try: groups.namespace except: diff --git a/tests/dictionaries/16_5redefine_help/tiramisu/multi.py b/tests/dictionaries/16_5redefine_help/tiramisu/multi.py index c5f34f05f..b9883be8f 100644 --- a/tests/dictionaries/16_5redefine_help/tiramisu/multi.py +++ b/tests/dictionaries/16_5redefine_help/tiramisu/multi.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') try: groups.namespace except: diff --git a/tests/dictionaries/16_5redefine_help/tiramisu/no_namespace.py b/tests/dictionaries/16_5redefine_help/tiramisu/no_namespace.py index 0fc654e09..3d6c0b867 100644 --- a/tests/dictionaries/16_5redefine_help/tiramisu/no_namespace.py +++ b/tests/dictionaries/16_5redefine_help/tiramisu/no_namespace.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") ALLOWED_LEADER_PROPERTIES.add("standard") ALLOWED_LEADER_PROPERTIES.add("advanced") diff --git a/tests/dictionaries/16_5redefine_hidden/dictionaries/rougail/00-base.yml b/tests/dictionaries/16_5redefine_hidden/dictionaries/rougail/00-base.yml deleted file mode 100644 index 7f7ae0dac..000000000 --- a/tests/dictionaries/16_5redefine_hidden/dictionaries/rougail/00-base.yml +++ /dev/null @@ -1,3 +0,0 @@ ---- -version: '1.1' -variable: "no" # a variable diff --git a/tests/dictionaries/16_5redefine_hidden/dictionaries/rougail/01-redefine.yml b/tests/dictionaries/16_5redefine_hidden/dictionaries/rougail/01-redefine.yml deleted file mode 100644 index 07a25984c..000000000 --- a/tests/dictionaries/16_5redefine_hidden/dictionaries/rougail/01-redefine.yml +++ /dev/null @@ -1,6 +0,0 @@ ---- -version: '1.1' -variable: - redefine: true - hidden: true - mandatory: false diff --git a/tests/dictionaries/16_5redefine_hidden/tiramisu/base.py b/tests/dictionaries/16_5redefine_hidden/tiramisu/base.py index cb64857ff..22c88fad1 100644 --- a/tests/dictionaries/16_5redefine_hidden/tiramisu/base.py +++ b/tests/dictionaries/16_5redefine_hidden/tiramisu/base.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') try: groups.namespace except: diff --git a/tests/dictionaries/16_5redefine_hidden/tiramisu/multi.py b/tests/dictionaries/16_5redefine_hidden/tiramisu/multi.py index e0775ff65..c98881b75 100644 --- a/tests/dictionaries/16_5redefine_hidden/tiramisu/multi.py +++ b/tests/dictionaries/16_5redefine_hidden/tiramisu/multi.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') try: groups.namespace except: diff --git a/tests/dictionaries/16_5redefine_hidden/tiramisu/no_namespace.py b/tests/dictionaries/16_5redefine_hidden/tiramisu/no_namespace.py index c8537bec3..6cc3cd46f 100644 --- a/tests/dictionaries/16_5redefine_hidden/tiramisu/no_namespace.py +++ b/tests/dictionaries/16_5redefine_hidden/tiramisu/no_namespace.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") ALLOWED_LEADER_PROPERTIES.add("standard") ALLOWED_LEADER_PROPERTIES.add("advanced") diff --git a/tests/dictionaries/16_5redefine_multi/dictionaries/rougail/00-base.yml b/tests/dictionaries/16_5redefine_multi/dictionaries/rougail/00-base.yml deleted file mode 100644 index 04aef3861..000000000 --- a/tests/dictionaries/16_5redefine_multi/dictionaries/rougail/00-base.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -version: '1.1' -variable: - description: a variable - default: non diff --git a/tests/dictionaries/16_5redefine_multi/dictionaries/rougail/01-redefine.yml b/tests/dictionaries/16_5redefine_multi/dictionaries/rougail/01-redefine.yml deleted file mode 100644 index 40f1ee145..000000000 --- a/tests/dictionaries/16_5redefine_multi/dictionaries/rougail/01-redefine.yml +++ /dev/null @@ -1,7 +0,0 @@ ---- -version: '1.1' -variable: - redefine: true - multi: true - default: - - non diff --git a/tests/dictionaries/16_5redefine_multi/tiramisu/base.py b/tests/dictionaries/16_5redefine_multi/tiramisu/base.py index 167c3833e..78c04be2e 100644 --- a/tests/dictionaries/16_5redefine_multi/tiramisu/base.py +++ b/tests/dictionaries/16_5redefine_multi/tiramisu/base.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') try: groups.namespace except: diff --git a/tests/dictionaries/16_5redefine_multi/tiramisu/multi.py b/tests/dictionaries/16_5redefine_multi/tiramisu/multi.py index 8b82ad591..81ddff522 100644 --- a/tests/dictionaries/16_5redefine_multi/tiramisu/multi.py +++ b/tests/dictionaries/16_5redefine_multi/tiramisu/multi.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') try: groups.namespace except: diff --git a/tests/dictionaries/16_5redefine_multi/tiramisu/no_namespace.py b/tests/dictionaries/16_5redefine_multi/tiramisu/no_namespace.py index 6f80a0442..0e93c4538 100644 --- a/tests/dictionaries/16_5redefine_multi/tiramisu/no_namespace.py +++ b/tests/dictionaries/16_5redefine_multi/tiramisu/no_namespace.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") ALLOWED_LEADER_PROPERTIES.add("standard") ALLOWED_LEADER_PROPERTIES.add("advanced") 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 deleted file mode 100644 index 27259ee3d..000000000 --- a/tests/dictionaries/16_5redefine_remove_disable_calculation/dictionaries/rougail/00-base.yml +++ /dev/null @@ -1,12 +0,0 @@ ---- -version: '1.1' -condition: "no" # a condition -variable: - description: a variable - disabled: - jinja: | - {% if _.condition == "yes" %} - true - {% else %} - false - {% endif %} diff --git a/tests/dictionaries/16_5redefine_remove_disable_calculation/dictionaries/rougail/01-base.yml b/tests/dictionaries/16_5redefine_remove_disable_calculation/dictionaries/rougail/01-base.yml deleted file mode 100644 index 2fe830469..000000000 --- a/tests/dictionaries/16_5redefine_remove_disable_calculation/dictionaries/rougail/01-base.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -version: '1.1' -variable: - redefine: true - disabled: false 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 56853871e..a7d6a8c51 100644 --- a/tests/dictionaries/16_5redefine_remove_disable_calculation/tiramisu/base.py +++ b/tests/dictionaries/16_5redefine_remove_disable_calculation/tiramisu/base.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') try: groups.namespace except: 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 3c67611c5..cdd69ce43 100644 --- a/tests/dictionaries/16_5redefine_remove_disable_calculation/tiramisu/multi.py +++ b/tests/dictionaries/16_5redefine_remove_disable_calculation/tiramisu/multi.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') try: groups.namespace except: 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 511d214a5..0b2ad1556 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 @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") ALLOWED_LEADER_PROPERTIES.add("standard") ALLOWED_LEADER_PROPERTIES.add("advanced") diff --git a/tests/dictionaries/16_5test_redefine/dictionaries/rougail/00-base.yml b/tests/dictionaries/16_5test_redefine/dictionaries/rougail/00-base.yml deleted file mode 100644 index aae55576b..000000000 --- a/tests/dictionaries/16_5test_redefine/dictionaries/rougail/00-base.yml +++ /dev/null @@ -1,12 +0,0 @@ ---- -version: '1.1' -var1: "no" # a first variable -var2: - description: a second variable - test: - - test - default: non -var3: - description: a third variable - test: - - test diff --git a/tests/dictionaries/16_5test_redefine/dictionaries/rougail/10-base.yml b/tests/dictionaries/16_5test_redefine/dictionaries/rougail/10-base.yml deleted file mode 100644 index 02b7e7ae9..000000000 --- a/tests/dictionaries/16_5test_redefine/dictionaries/rougail/10-base.yml +++ /dev/null @@ -1,13 +0,0 @@ ---- -version: '1.1' -var1: - redefine: true - test: - - test1 -var2: - redefine: true - test: - - test1 -var3: - redefine: true - test: null diff --git a/tests/dictionaries/16_5test_redefine/tiramisu/base.py b/tests/dictionaries/16_5test_redefine/tiramisu/base.py index d6897e644..ab9fafa8c 100644 --- a/tests/dictionaries/16_5test_redefine/tiramisu/base.py +++ b/tests/dictionaries/16_5test_redefine/tiramisu/base.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') try: groups.namespace except: diff --git a/tests/dictionaries/16_5test_redefine/tiramisu/multi.py b/tests/dictionaries/16_5test_redefine/tiramisu/multi.py index 2c448083e..3b7821b04 100644 --- a/tests/dictionaries/16_5test_redefine/tiramisu/multi.py +++ b/tests/dictionaries/16_5test_redefine/tiramisu/multi.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') try: groups.namespace except: diff --git a/tests/dictionaries/16_5test_redefine/tiramisu/no_namespace.py b/tests/dictionaries/16_5test_redefine/tiramisu/no_namespace.py index cb54605d0..5149730a7 100644 --- a/tests/dictionaries/16_5test_redefine/tiramisu/no_namespace.py +++ b/tests/dictionaries/16_5test_redefine/tiramisu/no_namespace.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") ALLOWED_LEADER_PROPERTIES.add("standard") ALLOWED_LEADER_PROPERTIES.add("advanced") diff --git a/tests/dictionaries/16_6choice_redefine/dictionaries/rougail/00-base.yml b/tests/dictionaries/16_6choice_redefine/dictionaries/rougail/00-base.yml deleted file mode 100644 index 0dd00d88a..000000000 --- a/tests/dictionaries/16_6choice_redefine/dictionaries/rougail/00-base.yml +++ /dev/null @@ -1,10 +0,0 @@ ---- -version: '1.0' -var: - type: choice - description: A choice - default: c - choices: - - a - - b - - c diff --git a/tests/dictionaries/16_6choice_redefine/dictionaries/rougail/01-base.yml b/tests/dictionaries/16_6choice_redefine/dictionaries/rougail/01-base.yml deleted file mode 100644 index 1f9696c33..000000000 --- a/tests/dictionaries/16_6choice_redefine/dictionaries/rougail/01-base.yml +++ /dev/null @@ -1,7 +0,0 @@ ---- -version: '1.0' -var: - redefine: true - choices: - - a - - c diff --git a/tests/dictionaries/16_6choice_redefine/tiramisu/base.py b/tests/dictionaries/16_6choice_redefine/tiramisu/base.py index e7a247264..bed3b2d82 100644 --- a/tests/dictionaries/16_6choice_redefine/tiramisu/base.py +++ b/tests/dictionaries/16_6choice_redefine/tiramisu/base.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') try: groups.namespace except: diff --git a/tests/dictionaries/16_6choice_redefine/tiramisu/multi.py b/tests/dictionaries/16_6choice_redefine/tiramisu/multi.py index 946ce3670..345cda46c 100644 --- a/tests/dictionaries/16_6choice_redefine/tiramisu/multi.py +++ b/tests/dictionaries/16_6choice_redefine/tiramisu/multi.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') try: groups.namespace except: diff --git a/tests/dictionaries/16_6choice_redefine/tiramisu/no_namespace.py b/tests/dictionaries/16_6choice_redefine/tiramisu/no_namespace.py index df3de6274..4abd068eb 100644 --- a/tests/dictionaries/16_6choice_redefine/tiramisu/no_namespace.py +++ b/tests/dictionaries/16_6choice_redefine/tiramisu/no_namespace.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") ALLOWED_LEADER_PROPERTIES.add("standard") ALLOWED_LEADER_PROPERTIES.add("advanced") diff --git a/tests/dictionaries/16_6exists_redefine_family/dictionaries/rougail/00-base.yml b/tests/dictionaries/16_6exists_redefine_family/dictionaries/rougail/00-base.yml deleted file mode 100644 index daadc02d2..000000000 --- a/tests/dictionaries/16_6exists_redefine_family/dictionaries/rougail/00-base.yml +++ /dev/null @@ -1,10 +0,0 @@ ---- -version: '1.1' - -family1: # a family - - variable1: # a variable - -family2: # a second family - - variable2: # a second variable diff --git a/tests/dictionaries/16_6exists_redefine_family/dictionaries/rougail/01-base.yml b/tests/dictionaries/16_6exists_redefine_family/dictionaries/rougail/01-base.yml deleted file mode 100644 index 2e045ab0b..000000000 --- a/tests/dictionaries/16_6exists_redefine_family/dictionaries/rougail/01-base.yml +++ /dev/null @@ -1,16 +0,0 @@ ---- -version: '1.1' - -family1: - exists: true - redefine: true - description: new description - -family2: - exists: false - description: new description - -family3: - exists: true - redefine: true - description: new description diff --git a/tests/dictionaries/16_6exists_redefine_family/tiramisu/base.py b/tests/dictionaries/16_6exists_redefine_family/tiramisu/base.py index c65b32699..57046f2aa 100644 --- a/tests/dictionaries/16_6exists_redefine_family/tiramisu/base.py +++ b/tests/dictionaries/16_6exists_redefine_family/tiramisu/base.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') try: groups.namespace except: diff --git a/tests/dictionaries/16_6exists_redefine_family/tiramisu/multi.py b/tests/dictionaries/16_6exists_redefine_family/tiramisu/multi.py index fb06a2668..92038bbd2 100644 --- a/tests/dictionaries/16_6exists_redefine_family/tiramisu/multi.py +++ b/tests/dictionaries/16_6exists_redefine_family/tiramisu/multi.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') try: groups.namespace except: diff --git a/tests/dictionaries/16_6exists_redefine_family/tiramisu/no_namespace.py b/tests/dictionaries/16_6exists_redefine_family/tiramisu/no_namespace.py index b43c16e92..f7881a8bf 100644 --- a/tests/dictionaries/16_6exists_redefine_family/tiramisu/no_namespace.py +++ b/tests/dictionaries/16_6exists_redefine_family/tiramisu/no_namespace.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") ALLOWED_LEADER_PROPERTIES.add("standard") ALLOWED_LEADER_PROPERTIES.add("advanced") diff --git a/tests/dictionaries/16exists_exists/dictionaries/rougail/00-base.yml b/tests/dictionaries/16exists_exists/dictionaries/rougail/00-base.yml deleted file mode 100644 index a322d536f..000000000 --- a/tests/dictionaries/16exists_exists/dictionaries/rougail/00-base.yml +++ /dev/null @@ -1,4 +0,0 @@ ---- -version: '1.1' -var: - description: Description diff --git a/tests/dictionaries/16exists_exists/dictionaries/rougail/01-base.yml b/tests/dictionaries/16exists_exists/dictionaries/rougail/01-base.yml deleted file mode 100644 index cc3d1200b..000000000 --- a/tests/dictionaries/16exists_exists/dictionaries/rougail/01-base.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -version: '1.1' -var: - description: New description - exists: false diff --git a/tests/dictionaries/16exists_exists/tiramisu/base.py b/tests/dictionaries/16exists_exists/tiramisu/base.py index 3b3de1db9..a1585f2fb 100644 --- a/tests/dictionaries/16exists_exists/tiramisu/base.py +++ b/tests/dictionaries/16exists_exists/tiramisu/base.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') try: groups.namespace except: diff --git a/tests/dictionaries/16exists_exists/tiramisu/multi.py b/tests/dictionaries/16exists_exists/tiramisu/multi.py index 823605c18..b92810e1d 100644 --- a/tests/dictionaries/16exists_exists/tiramisu/multi.py +++ b/tests/dictionaries/16exists_exists/tiramisu/multi.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') try: groups.namespace except: diff --git a/tests/dictionaries/16exists_exists/tiramisu/no_namespace.py b/tests/dictionaries/16exists_exists/tiramisu/no_namespace.py index 90b80ff1c..1ea4bf052 100644 --- a/tests/dictionaries/16exists_exists/tiramisu/no_namespace.py +++ b/tests/dictionaries/16exists_exists/tiramisu/no_namespace.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") ALLOWED_LEADER_PROPERTIES.add("standard") ALLOWED_LEADER_PROPERTIES.add("advanced") diff --git a/tests/dictionaries/17_5redefine_leadership/dictionaries/rougail/00-base.yml b/tests/dictionaries/17_5redefine_leadership/dictionaries/rougail/00-base.yml deleted file mode 100644 index 147302435..000000000 --- a/tests/dictionaries/17_5redefine_leadership/dictionaries/rougail/00-base.yml +++ /dev/null @@ -1,11 +0,0 @@ ---- -version: '1.1' -leader: # a leadership - type: leadership - leader: - description: a leader - multi: true - mandatory: false - follower: - description: a follower - mandatory: false diff --git a/tests/dictionaries/17_5redefine_leadership/dictionaries/rougail/01-base.yml b/tests/dictionaries/17_5redefine_leadership/dictionaries/rougail/01-base.yml deleted file mode 100644 index c7f1ea9db..000000000 --- a/tests/dictionaries/17_5redefine_leadership/dictionaries/rougail/01-base.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -version: '1.1' -leader: - redefine: true - hidden: true diff --git a/tests/dictionaries/17_5redefine_leadership/tiramisu/base.py b/tests/dictionaries/17_5redefine_leadership/tiramisu/base.py index 8f0c938a1..1b1a2906e 100644 --- a/tests/dictionaries/17_5redefine_leadership/tiramisu/base.py +++ b/tests/dictionaries/17_5redefine_leadership/tiramisu/base.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') try: groups.namespace except: diff --git a/tests/dictionaries/17_5redefine_leadership/tiramisu/multi.py b/tests/dictionaries/17_5redefine_leadership/tiramisu/multi.py index 7fdf72619..a6cc1abed 100644 --- a/tests/dictionaries/17_5redefine_leadership/tiramisu/multi.py +++ b/tests/dictionaries/17_5redefine_leadership/tiramisu/multi.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') try: groups.namespace except: diff --git a/tests/dictionaries/17_5redefine_leadership/tiramisu/no_namespace.py b/tests/dictionaries/17_5redefine_leadership/tiramisu/no_namespace.py index cb12c6e51..d17c7fd3c 100644 --- a/tests/dictionaries/17_5redefine_leadership/tiramisu/no_namespace.py +++ b/tests/dictionaries/17_5redefine_leadership/tiramisu/no_namespace.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") ALLOWED_LEADER_PROPERTIES.add("standard") ALLOWED_LEADER_PROPERTIES.add("advanced") diff --git a/tests/dictionaries/20_0empty_family/dictionaries/rougail/00-base.yml b/tests/dictionaries/20_0empty_family/dictionaries/rougail/00-base.yml deleted file mode 100644 index a086902cb..000000000 --- a/tests/dictionaries/20_0empty_family/dictionaries/rougail/00-base.yml +++ /dev/null @@ -1,4 +0,0 @@ ---- -version: '1.0' -my_family: - type: family diff --git a/tests/dictionaries/20_0empty_family/tiramisu/base.py b/tests/dictionaries/20_0empty_family/tiramisu/base.py index bb6ab55d2..d9e243d06 100644 --- a/tests/dictionaries/20_0empty_family/tiramisu/base.py +++ b/tests/dictionaries/20_0empty_family/tiramisu/base.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') try: groups.namespace except: diff --git a/tests/dictionaries/20_0empty_family/tiramisu/multi.py b/tests/dictionaries/20_0empty_family/tiramisu/multi.py index f8a40b84b..614668d43 100644 --- a/tests/dictionaries/20_0empty_family/tiramisu/multi.py +++ b/tests/dictionaries/20_0empty_family/tiramisu/multi.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') try: groups.namespace except: diff --git a/tests/dictionaries/20_0empty_family/tiramisu/no_namespace.py b/tests/dictionaries/20_0empty_family/tiramisu/no_namespace.py index 502023bc9..e4e37cbdb 100644 --- a/tests/dictionaries/20_0empty_family/tiramisu/no_namespace.py +++ b/tests/dictionaries/20_0empty_family/tiramisu/no_namespace.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") ALLOWED_LEADER_PROPERTIES.add("standard") ALLOWED_LEADER_PROPERTIES.add("advanced") diff --git a/tests/dictionaries/20_0family_append/dictionaries/rougail/00-base.yml b/tests/dictionaries/20_0family_append/dictionaries/rougail/00-base.yml deleted file mode 100644 index f6ec14b66..000000000 --- a/tests/dictionaries/20_0family_append/dictionaries/rougail/00-base.yml +++ /dev/null @@ -1,6 +0,0 @@ ---- -version: '1.1' -family: - description: A family - var1: - description: The first variable diff --git a/tests/dictionaries/20_0family_append/dictionaries/rougail/01-base.yml b/tests/dictionaries/20_0family_append/dictionaries/rougail/01-base.yml deleted file mode 100644 index de4d51fee..000000000 --- a/tests/dictionaries/20_0family_append/dictionaries/rougail/01-base.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -version: '1.1' -family: - var2: - description: The second variable diff --git a/tests/dictionaries/20_0family_append/tiramisu/base.py b/tests/dictionaries/20_0family_append/tiramisu/base.py index 3bfde0a98..f500600b8 100644 --- a/tests/dictionaries/20_0family_append/tiramisu/base.py +++ b/tests/dictionaries/20_0family_append/tiramisu/base.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') try: groups.namespace except: diff --git a/tests/dictionaries/20_0family_append/tiramisu/multi.py b/tests/dictionaries/20_0family_append/tiramisu/multi.py index 35b50a68d..4a4e87c7f 100644 --- a/tests/dictionaries/20_0family_append/tiramisu/multi.py +++ b/tests/dictionaries/20_0family_append/tiramisu/multi.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') try: groups.namespace except: diff --git a/tests/dictionaries/20_0family_append/tiramisu/no_namespace.py b/tests/dictionaries/20_0family_append/tiramisu/no_namespace.py index add0ad523..f50bbc5cb 100644 --- a/tests/dictionaries/20_0family_append/tiramisu/no_namespace.py +++ b/tests/dictionaries/20_0family_append/tiramisu/no_namespace.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") ALLOWED_LEADER_PROPERTIES.add("standard") ALLOWED_LEADER_PROPERTIES.add("advanced") diff --git a/tests/dictionaries/20_0family_underscore/dictionaries/rougail/00-base.yml b/tests/dictionaries/20_0family_underscore/dictionaries/rougail/00-base.yml deleted file mode 100644 index 032906fc2..000000000 --- a/tests/dictionaries/20_0family_underscore/dictionaries/rougail/00-base.yml +++ /dev/null @@ -1,38 +0,0 @@ ---- -version: '1.1' -my_family: - _type: family - _description: This is a great family - _help: This is a great family - _mode: standard - _hidden: true - _disabled: true - type: - description: a type family - type: family - my_variable: - mandatory: false - description: - description: This is a other great family - my_variable: - mandatory: false - help: - description: a help family - help: This is a other great family - my_variable: - mandatory: false - mode: - description: a mode family - mode: advanced - my_variable: - mandatory: false - hidden: - description: an hidden family - hidden: true - my_variable: - mandatory: false - disabled: - description: an disabled family - disabled: true - my_variable: - mandatory: false diff --git a/tests/dictionaries/20_0family_underscore/tiramisu/base.py b/tests/dictionaries/20_0family_underscore/tiramisu/base.py index 0786591b9..85e5783f9 100644 --- a/tests/dictionaries/20_0family_underscore/tiramisu/base.py +++ b/tests/dictionaries/20_0family_underscore/tiramisu/base.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') try: groups.namespace except: diff --git a/tests/dictionaries/20_0family_underscore/tiramisu/multi.py b/tests/dictionaries/20_0family_underscore/tiramisu/multi.py index 4ff89dfc3..4e8f38e65 100644 --- a/tests/dictionaries/20_0family_underscore/tiramisu/multi.py +++ b/tests/dictionaries/20_0family_underscore/tiramisu/multi.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') try: groups.namespace except: diff --git a/tests/dictionaries/20_0family_underscore/tiramisu/no_namespace.py b/tests/dictionaries/20_0family_underscore/tiramisu/no_namespace.py index 7fda680ba..32d82ff22 100644 --- a/tests/dictionaries/20_0family_underscore/tiramisu/no_namespace.py +++ b/tests/dictionaries/20_0family_underscore/tiramisu/no_namespace.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") ALLOWED_LEADER_PROPERTIES.add("standard") ALLOWED_LEADER_PROPERTIES.add("advanced") diff --git a/tests/dictionaries/20_0multi_family/dictionaries/rougail/00-base.yml b/tests/dictionaries/20_0multi_family/dictionaries/rougail/00-base.yml deleted file mode 100644 index c404d6ed4..000000000 --- a/tests/dictionaries/20_0multi_family/dictionaries/rougail/00-base.yml +++ /dev/null @@ -1,7 +0,0 @@ ---- -version: '1.1' -family: # a family - subfamily: # a sub family - variable: - description: a variable - mandatory: false diff --git a/tests/dictionaries/20_0multi_family/tiramisu/base.py b/tests/dictionaries/20_0multi_family/tiramisu/base.py index 4aa86e8b3..d3a8c786c 100644 --- a/tests/dictionaries/20_0multi_family/tiramisu/base.py +++ b/tests/dictionaries/20_0multi_family/tiramisu/base.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') try: groups.namespace except: diff --git a/tests/dictionaries/20_0multi_family/tiramisu/multi.py b/tests/dictionaries/20_0multi_family/tiramisu/multi.py index 72e14fb3a..741acfd5e 100644 --- a/tests/dictionaries/20_0multi_family/tiramisu/multi.py +++ b/tests/dictionaries/20_0multi_family/tiramisu/multi.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') try: groups.namespace except: diff --git a/tests/dictionaries/20_0multi_family/tiramisu/no_namespace.py b/tests/dictionaries/20_0multi_family/tiramisu/no_namespace.py index f12bfcad9..8d21f2b46 100644 --- a/tests/dictionaries/20_0multi_family/tiramisu/no_namespace.py +++ b/tests/dictionaries/20_0multi_family/tiramisu/no_namespace.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") ALLOWED_LEADER_PROPERTIES.add("standard") ALLOWED_LEADER_PROPERTIES.add("advanced") diff --git a/tests/dictionaries/20_0multi_family_basic/dictionaries/rougail/00-base.yml b/tests/dictionaries/20_0multi_family_basic/dictionaries/rougail/00-base.yml deleted file mode 100644 index 2f1ea87d7..000000000 --- a/tests/dictionaries/20_0multi_family_basic/dictionaries/rougail/00-base.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -version: '1.1' -family: # a family - subfamily: # a sub family - variable: # a variable diff --git a/tests/dictionaries/20_0multi_family_basic/tiramisu/base.py b/tests/dictionaries/20_0multi_family_basic/tiramisu/base.py index 2e9905f41..89b457d5a 100644 --- a/tests/dictionaries/20_0multi_family_basic/tiramisu/base.py +++ b/tests/dictionaries/20_0multi_family_basic/tiramisu/base.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') try: groups.namespace except: diff --git a/tests/dictionaries/20_0multi_family_basic/tiramisu/multi.py b/tests/dictionaries/20_0multi_family_basic/tiramisu/multi.py index feb8796f9..fe0c56fab 100644 --- a/tests/dictionaries/20_0multi_family_basic/tiramisu/multi.py +++ b/tests/dictionaries/20_0multi_family_basic/tiramisu/multi.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') try: groups.namespace except: 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 c2c0181fa..2a8d6fa19 100644 --- a/tests/dictionaries/20_0multi_family_basic/tiramisu/no_namespace.py +++ b/tests/dictionaries/20_0multi_family_basic/tiramisu/no_namespace.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") ALLOWED_LEADER_PROPERTIES.add("standard") ALLOWED_LEADER_PROPERTIES.add("advanced") diff --git a/tests/dictionaries/20_0multi_family_expert/dictionaries/rougail/00-base.yml b/tests/dictionaries/20_0multi_family_expert/dictionaries/rougail/00-base.yml deleted file mode 100644 index 7f1771871..000000000 --- a/tests/dictionaries/20_0multi_family_expert/dictionaries/rougail/00-base.yml +++ /dev/null @@ -1,9 +0,0 @@ ---- -version: '1.1' -family: - description: a family - mode: advanced - subfamily: # a sub family - variable: - description: a variable - mandatory: false diff --git a/tests/dictionaries/20_0multi_family_expert/tiramisu/base.py b/tests/dictionaries/20_0multi_family_expert/tiramisu/base.py index 2474a72e9..e3b770f37 100644 --- a/tests/dictionaries/20_0multi_family_expert/tiramisu/base.py +++ b/tests/dictionaries/20_0multi_family_expert/tiramisu/base.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') try: groups.namespace except: diff --git a/tests/dictionaries/20_0multi_family_expert/tiramisu/multi.py b/tests/dictionaries/20_0multi_family_expert/tiramisu/multi.py index 769694946..669c7aa49 100644 --- a/tests/dictionaries/20_0multi_family_expert/tiramisu/multi.py +++ b/tests/dictionaries/20_0multi_family_expert/tiramisu/multi.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') try: groups.namespace except: 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 6f318dc59..4068e10a3 100644 --- a/tests/dictionaries/20_0multi_family_expert/tiramisu/no_namespace.py +++ b/tests/dictionaries/20_0multi_family_expert/tiramisu/no_namespace.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") ALLOWED_LEADER_PROPERTIES.add("standard") ALLOWED_LEADER_PROPERTIES.add("advanced") diff --git a/tests/dictionaries/20_0multi_family_order/dictionaries/rougail/00-base.yml b/tests/dictionaries/20_0multi_family_order/dictionaries/rougail/00-base.yml deleted file mode 100644 index e56dd3b17..000000000 --- a/tests/dictionaries/20_0multi_family_order/dictionaries/rougail/00-base.yml +++ /dev/null @@ -1,8 +0,0 @@ ---- -version: '1.1' -variable: # a variable -family: # a family - variable1: # a first variable - subfamily: # a sub family - variable: # a variable - variable2: # a second variable diff --git a/tests/dictionaries/20_0multi_family_order/tiramisu/base.py b/tests/dictionaries/20_0multi_family_order/tiramisu/base.py index 0034afa57..d3905f8d8 100644 --- a/tests/dictionaries/20_0multi_family_order/tiramisu/base.py +++ b/tests/dictionaries/20_0multi_family_order/tiramisu/base.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') try: groups.namespace except: diff --git a/tests/dictionaries/20_0multi_family_order/tiramisu/multi.py b/tests/dictionaries/20_0multi_family_order/tiramisu/multi.py index 4630b2109..76fe49896 100644 --- a/tests/dictionaries/20_0multi_family_order/tiramisu/multi.py +++ b/tests/dictionaries/20_0multi_family_order/tiramisu/multi.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') try: groups.namespace except: 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 ae6578ff9..2a151b577 100644 --- a/tests/dictionaries/20_0multi_family_order/tiramisu/no_namespace.py +++ b/tests/dictionaries/20_0multi_family_order/tiramisu/no_namespace.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") ALLOWED_LEADER_PROPERTIES.add("standard") ALLOWED_LEADER_PROPERTIES.add("advanced") 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 deleted file mode 100644 index dbdf367ac..000000000 --- a/tests/dictionaries/20_0validators_differ_redefine/dictionaries/rougail/00-base.yml +++ /dev/null @@ -1,15 +0,0 @@ ---- -version: '1.1' -var1: "no" # a first variable -var2: "no" # a second variable -var3: - description: a third variable - default: "yes" - test: - - "yes" - validators: - - jinja: | - {% if _.var3 == _.var1 %} - var3 must be different than var1 - {% endif %} - description: var3 must be different than var1 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 deleted file mode 100644 index fd9bb17dc..000000000 --- a/tests/dictionaries/20_0validators_differ_redefine/dictionaries/rougail/01-base.yml +++ /dev/null @@ -1,10 +0,0 @@ ---- -version: '1.1' -var3: - redefine: true - validators: - - jinja: | - {% if _.var3 == _.var2 %} - var3 must be different than var2 - {% endif %} - description: var3 must be different than var2 diff --git a/tests/dictionaries/20_0validators_differ_redefine/tiramisu/base.py b/tests/dictionaries/20_0validators_differ_redefine/tiramisu/base.py index 110679bec..b0f2e4e6a 100644 --- a/tests/dictionaries/20_0validators_differ_redefine/tiramisu/base.py +++ b/tests/dictionaries/20_0validators_differ_redefine/tiramisu/base.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') try: groups.namespace except: @@ -13,6 +13,6 @@ ALLOWED_LEADER_PROPERTIES.add("advanced") dict_env['validators_rougail.var3'] = "{% if _.var3 == _.var2 %}\nvar3 must be different than var2\n{% endif %}\n" option_2 = StrOption(name="var1", doc="a first variable", default="no", properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) option_3 = StrOption(name="var2", doc="a second variable", default="no", properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) -option_4 = StrOption(name="var3", doc="a third variable", default="yes", validators=[Calculation(func['valid_with_jinja'], Params((), kwargs={'__internal_jinja': ParamValue("validators_rougail.var3"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['tests/dictionaries/20_0validators_differ_redefine/dictionaries/rougail/01-base.yml']), '__internal_attribute': ParamValue("validators"), '__internal_variable': ParamValue("rougail.var3"), '_.var3': ParamSelfOption(whole=False), '_.var2': ParamOption(option_3, notraisepropertyerror=True)}))], properties=frozenset({"mandatory", "standard"}), informations={'type': 'string', 'test': ('yes',)}) +option_4 = StrOption(name="var3", doc="a third variable", default="yes", validators=[Calculation(func['valid_with_jinja'], Params((), kwargs={'__internal_jinja': ParamValue("validators_rougail.var3"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['../rougail-tests/structures/20_0validators_differ_redefine/rougail/01-base.yml']), '__internal_attribute': ParamValue("validators"), '__internal_variable': ParamValue("rougail.var3"), '_.var3': ParamSelfOption(whole=False), '_.var2': ParamOption(option_3, notraisepropertyerror=True)}))], properties=frozenset({"mandatory", "standard"}), informations={'type': 'string', 'test': ('yes',)}) optiondescription_1 = OptionDescription(name="rougail", doc="Rougail", group_type=groups.namespace, children=[option_2, option_3, option_4], properties=frozenset({"standard"})) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_1]) diff --git a/tests/dictionaries/20_0validators_differ_redefine/tiramisu/multi.py b/tests/dictionaries/20_0validators_differ_redefine/tiramisu/multi.py index dbeb6df03..04dd47640 100644 --- a/tests/dictionaries/20_0validators_differ_redefine/tiramisu/multi.py +++ b/tests/dictionaries/20_0validators_differ_redefine/tiramisu/multi.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') try: groups.namespace except: @@ -14,12 +14,12 @@ dict_env['validators_1.rougail.var3'] = "{% if _.var3 == _.var2 %}\nvar3 must be dict_env['validators_2.rougail.var3'] = "{% if _.var3 == _.var2 %}\nvar3 must be different than var2\n{% endif %}\n" option_3 = StrOption(name="var1", doc="a first variable", default="no", properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) option_4 = StrOption(name="var2", doc="a second variable", default="no", properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) -option_5 = StrOption(name="var3", doc="a third variable", default="yes", validators=[Calculation(func['valid_with_jinja'], Params((), kwargs={'__internal_jinja': ParamValue("validators_1.rougail.var3"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['tests/dictionaries/20_0validators_differ_redefine/dictionaries/rougail/01-base.yml']), '__internal_attribute': ParamValue("validators"), '__internal_variable': ParamValue("1.rougail.var3"), '_.var3': ParamSelfOption(whole=False), '_.var2': ParamOption(option_4, notraisepropertyerror=True)}))], properties=frozenset({"mandatory", "standard"}), informations={'type': 'string', 'test': ('yes',)}) +option_5 = StrOption(name="var3", doc="a third variable", default="yes", validators=[Calculation(func['valid_with_jinja'], Params((), kwargs={'__internal_jinja': ParamValue("validators_1.rougail.var3"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['../rougail-tests/structures/20_0validators_differ_redefine/rougail/01-base.yml']), '__internal_attribute': ParamValue("validators"), '__internal_variable': ParamValue("1.rougail.var3"), '_.var3': ParamSelfOption(whole=False), '_.var2': ParamOption(option_4, notraisepropertyerror=True)}))], properties=frozenset({"mandatory", "standard"}), informations={'type': 'string', 'test': ('yes',)}) optiondescription_2 = OptionDescription(name="rougail", doc="Rougail", group_type=groups.namespace, children=[option_3, option_4, option_5], properties=frozenset({"standard"})) optiondescription_1 = OptionDescription(name="1", doc="1", children=[optiondescription_2], properties=frozenset({"standard"})) option_8 = StrOption(name="var1", doc="a first variable", default="no", properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) option_9 = StrOption(name="var2", doc="a second variable", default="no", properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) -option_10 = StrOption(name="var3", doc="a third variable", default="yes", validators=[Calculation(func['valid_with_jinja'], Params((), kwargs={'__internal_jinja': ParamValue("validators_2.rougail.var3"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['tests/dictionaries/20_0validators_differ_redefine/dictionaries/rougail/01-base.yml']), '__internal_attribute': ParamValue("validators"), '__internal_variable': ParamValue("2.rougail.var3"), '_.var3': ParamSelfOption(whole=False), '_.var2': ParamOption(option_9, notraisepropertyerror=True)}))], properties=frozenset({"mandatory", "standard"}), informations={'type': 'string', 'test': ('yes',)}) +option_10 = StrOption(name="var3", doc="a third variable", default="yes", validators=[Calculation(func['valid_with_jinja'], Params((), kwargs={'__internal_jinja': ParamValue("validators_2.rougail.var3"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['../rougail-tests/structures/20_0validators_differ_redefine/rougail/01-base.yml']), '__internal_attribute': ParamValue("validators"), '__internal_variable': ParamValue("2.rougail.var3"), '_.var3': ParamSelfOption(whole=False), '_.var2': ParamOption(option_9, notraisepropertyerror=True)}))], properties=frozenset({"mandatory", "standard"}), informations={'type': 'string', 'test': ('yes',)}) optiondescription_7 = OptionDescription(name="rougail", doc="Rougail", group_type=groups.namespace, children=[option_8, option_9, option_10], properties=frozenset({"standard"})) optiondescription_6 = OptionDescription(name="2", doc="2", children=[optiondescription_7], properties=frozenset({"standard"})) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_1, optiondescription_6]) 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 203e599fa..3e3ce9dd8 100644 --- a/tests/dictionaries/20_0validators_differ_redefine/tiramisu/no_namespace.py +++ b/tests/dictionaries/20_0validators_differ_redefine/tiramisu/no_namespace.py @@ -2,12 +2,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') +load_functions('../rougail-tests/funcs/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") ALLOWED_LEADER_PROPERTIES.add("standard") ALLOWED_LEADER_PROPERTIES.add("advanced") dict_env['validators_var3'] = "{% if _.var3 == _.var2 %}\nvar3 must be different than var2\n{% endif %}\n" option_1 = StrOption(name="var1", doc="a first variable", default="no", properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) option_2 = StrOption(name="var2", doc="a second variable", default="no", properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) -option_3 = StrOption(name="var3", doc="a third variable", default="yes", validators=[Calculation(func['valid_with_jinja'], Params((), kwargs={'__internal_jinja': ParamValue("validators_var3"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['tests/dictionaries/20_0validators_differ_redefine/dictionaries/rougail/01-base.yml']), '__internal_attribute': ParamValue("validators"), '__internal_variable': ParamValue("var3"), '_.var3': ParamSelfOption(whole=False), '_.var2': ParamOption(option_2, notraisepropertyerror=True)}))], properties=frozenset({"mandatory", "standard"}), informations={'type': 'string', 'test': ('yes',)}) +option_3 = StrOption(name="var3", doc="a third variable", default="yes", validators=[Calculation(func['valid_with_jinja'], Params((), kwargs={'__internal_jinja': ParamValue("validators_var3"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['../rougail-tests/structures/20_0validators_differ_redefine/rougail/01-base.yml']), '__internal_attribute': ParamValue("validators"), '__internal_variable': ParamValue("var3"), '_.var3': ParamSelfOption(whole=False), '_.var2': ParamOption(option_2, notraisepropertyerror=True)}))], properties=frozenset({"mandatory", "standard"}), informations={'type': 'string', 'test': ('yes',)}) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1, option_2, option_3]) diff --git a/tests/dictionaries/20_1empty_subfamily/dictionaries/rougail/00-base.yml b/tests/dictionaries/20_1empty_subfamily/dictionaries/rougail/00-base.yml deleted file mode 100644 index 2ebce70dd..000000000 --- a/tests/dictionaries/20_1empty_subfamily/dictionaries/rougail/00-base.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -version: '1.0' -my_family: - my_sub_family: - type: family diff --git a/tests/dictionaries/20_1empty_subfamily/tiramisu/base.py b/tests/dictionaries/20_1empty_subfamily/tiramisu/base.py index bb6ab55d2..d9e243d06 100644 --- a/tests/dictionaries/20_1empty_subfamily/tiramisu/base.py +++ b/tests/dictionaries/20_1empty_subfamily/tiramisu/base.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') try: groups.namespace except: diff --git a/tests/dictionaries/20_1empty_subfamily/tiramisu/multi.py b/tests/dictionaries/20_1empty_subfamily/tiramisu/multi.py index c4fbb0af2..a72e44538 100644 --- a/tests/dictionaries/20_1empty_subfamily/tiramisu/multi.py +++ b/tests/dictionaries/20_1empty_subfamily/tiramisu/multi.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') try: groups.namespace except: diff --git a/tests/dictionaries/20_1empty_subfamily/tiramisu/no_namespace.py b/tests/dictionaries/20_1empty_subfamily/tiramisu/no_namespace.py index 502023bc9..e4e37cbdb 100644 --- a/tests/dictionaries/20_1empty_subfamily/tiramisu/no_namespace.py +++ b/tests/dictionaries/20_1empty_subfamily/tiramisu/no_namespace.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") ALLOWED_LEADER_PROPERTIES.add("standard") ALLOWED_LEADER_PROPERTIES.add("advanced") diff --git a/tests/dictionaries/20_9default_information_parent/dictionaries/rougail/00-base.yml b/tests/dictionaries/20_9default_information_parent/dictionaries/rougail/00-base.yml deleted file mode 100644 index 281718b58..000000000 --- a/tests/dictionaries/20_9default_information_parent/dictionaries/rougail/00-base.yml +++ /dev/null @@ -1,10 +0,0 @@ ---- -version: 1.1 -family: - var1: # a first variable - var2: - description: a second variable - default: - type: information - information: test_information - variable: __.family diff --git a/tests/dictionaries/20_9default_information_parent/tiramisu/base.py b/tests/dictionaries/20_9default_information_parent/tiramisu/base.py index 30b28a02a..dc4fcd30a 100644 --- a/tests/dictionaries/20_9default_information_parent/tiramisu/base.py +++ b/tests/dictionaries/20_9default_information_parent/tiramisu/base.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') try: groups.namespace except: diff --git a/tests/dictionaries/20_9default_information_parent/tiramisu/multi.py b/tests/dictionaries/20_9default_information_parent/tiramisu/multi.py index e8d98fa06..b079c941b 100644 --- a/tests/dictionaries/20_9default_information_parent/tiramisu/multi.py +++ b/tests/dictionaries/20_9default_information_parent/tiramisu/multi.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') try: groups.namespace except: 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 991a00ae4..03b027374 100644 --- a/tests/dictionaries/20_9default_information_parent/tiramisu/no_namespace.py +++ b/tests/dictionaries/20_9default_information_parent/tiramisu/no_namespace.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") ALLOWED_LEADER_PROPERTIES.add("standard") ALLOWED_LEADER_PROPERTIES.add("advanced") 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 deleted file mode 100644 index 0ea4593a5..000000000 --- a/tests/dictionaries/24_0family_hidden_condition/dictionaries/rougail/00-base.yml +++ /dev/null @@ -1,12 +0,0 @@ ---- -version: '1.1' -condition: "no" # the variable use has condition -family: - description: possibly hidden family - hidden: - jinja: | - {% if rougail.condition == "yes" %} - condition is yes - {% endif %} - description: if condition is yes - var1: # a variable diff --git a/tests/dictionaries/24_0family_hidden_condition/force_namespace b/tests/dictionaries/24_0family_hidden_condition/force_namespace deleted file mode 100644 index e69de29bb..000000000 diff --git a/tests/dictionaries/24_0family_hidden_condition/tiramisu/base.py b/tests/dictionaries/24_0family_hidden_condition/tiramisu/base.py index 23211d281..a00a0b0ff 100644 --- a/tests/dictionaries/24_0family_hidden_condition/tiramisu/base.py +++ b/tests/dictionaries/24_0family_hidden_condition/tiramisu/base.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') try: groups.namespace except: @@ -13,7 +13,7 @@ ALLOWED_LEADER_PROPERTIES.add("advanced") dict_env['frozen_rougail.family.var1'] = "{% if rougail.condition == \"yes\" %}\ncondition is yes\n{% endif %}\n" dict_env['hidden_rougail.family'] = "{% if rougail.condition == \"yes\" %}\ncondition is yes\n{% endif %}\n" option_2 = StrOption(name="condition", doc="the variable use has condition", default="no", properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) -option_4 = StrOption(name="var1", doc="a variable", properties=frozenset({"basic", "force_default_on_freeze", "mandatory", Calculation(func['jinja_to_property'], Params((ParamValue("frozen")), kwargs={'__internal_jinja': ParamValue("frozen_rougail.family.var1"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['tests/dictionaries/24_0family_hidden_condition/dictionaries/rougail/00-base.yml']), '__internal_attribute': ParamValue("frozen"), '__internal_variable': ParamValue("rougail.family.var1"), 'when': ParamValue(True), 'inverse': ParamValue(False), 'rougail.condition': ParamOption(option_2, notraisepropertyerror=True)}), help_function=func['jinja_to_property_help'])}), informations={'type': 'string'}) -optiondescription_3 = OptionDescription(name="family", doc="possibly hidden family", children=[option_4], properties=frozenset({"basic", Calculation(func['jinja_to_property'], Params((ParamValue("hidden")), kwargs={'__internal_jinja': ParamValue("hidden_rougail.family"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['tests/dictionaries/24_0family_hidden_condition/dictionaries/rougail/00-base.yml']), '__internal_attribute': ParamValue("hidden"), '__internal_variable': ParamValue("rougail.family"), 'when': ParamValue(True), 'inverse': ParamValue(False), 'rougail.condition': ParamOption(option_2, notraisepropertyerror=True)}), help_function=func['jinja_to_property_help'])})) +option_4 = StrOption(name="var1", doc="a variable", properties=frozenset({"basic", "force_default_on_freeze", "mandatory", Calculation(func['jinja_to_property'], Params((ParamValue("frozen")), kwargs={'__internal_jinja': ParamValue("frozen_rougail.family.var1"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['../rougail-tests/structures/24_0family_hidden_condition/rougail/00-base.yml']), '__internal_attribute': ParamValue("frozen"), '__internal_variable': ParamValue("rougail.family.var1"), 'when': ParamValue(True), 'inverse': ParamValue(False), 'rougail.condition': ParamOption(option_2, notraisepropertyerror=True)}), help_function=func['jinja_to_property_help'])}), informations={'type': 'string'}) +optiondescription_3 = OptionDescription(name="family", doc="possibly hidden family", children=[option_4], properties=frozenset({"basic", Calculation(func['jinja_to_property'], Params((ParamValue("hidden")), kwargs={'__internal_jinja': ParamValue("hidden_rougail.family"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['../rougail-tests/structures/24_0family_hidden_condition/rougail/00-base.yml']), '__internal_attribute': ParamValue("hidden"), '__internal_variable': ParamValue("rougail.family"), 'when': ParamValue(True), 'inverse': ParamValue(False), 'rougail.condition': ParamOption(option_2, notraisepropertyerror=True)}), help_function=func['jinja_to_property_help'])})) optiondescription_1 = OptionDescription(name="rougail", doc="Rougail", group_type=groups.namespace, children=[option_2, optiondescription_3], properties=frozenset({"basic"})) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_1]) diff --git a/tests/dictionaries/24_0family_hidden_condition/tiramisu/multi.py b/tests/dictionaries/24_0family_hidden_condition/tiramisu/multi.py index 650a4520f..9698bf815 100644 --- a/tests/dictionaries/24_0family_hidden_condition/tiramisu/multi.py +++ b/tests/dictionaries/24_0family_hidden_condition/tiramisu/multi.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') try: groups.namespace except: @@ -15,13 +15,13 @@ dict_env['hidden_1.rougail.family'] = "{% if rougail.condition == \"yes\" %}\nco dict_env['frozen_2.rougail.family.var1'] = "{% if rougail.condition == \"yes\" %}\ncondition is yes\n{% endif %}\n" dict_env['hidden_2.rougail.family'] = "{% if rougail.condition == \"yes\" %}\ncondition is yes\n{% endif %}\n" option_3 = StrOption(name="condition", doc="the variable use has condition", default="no", properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) -option_5 = StrOption(name="var1", doc="a variable", properties=frozenset({"basic", "force_default_on_freeze", "mandatory", Calculation(func['jinja_to_property'], Params((ParamValue("frozen")), kwargs={'__internal_jinja': ParamValue("frozen_1.rougail.family.var1"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['tests/dictionaries/24_0family_hidden_condition/dictionaries/rougail/00-base.yml']), '__internal_attribute': ParamValue("frozen"), '__internal_variable': ParamValue("1.rougail.family.var1"), 'when': ParamValue(True), 'inverse': ParamValue(False), 'rougail.condition': ParamOption(option_3, notraisepropertyerror=True)}), help_function=func['jinja_to_property_help'])}), informations={'type': 'string'}) -optiondescription_4 = OptionDescription(name="family", doc="possibly hidden family", children=[option_5], properties=frozenset({"basic", Calculation(func['jinja_to_property'], Params((ParamValue("hidden")), kwargs={'__internal_jinja': ParamValue("hidden_1.rougail.family"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['tests/dictionaries/24_0family_hidden_condition/dictionaries/rougail/00-base.yml']), '__internal_attribute': ParamValue("hidden"), '__internal_variable': ParamValue("1.rougail.family"), 'when': ParamValue(True), 'inverse': ParamValue(False), 'rougail.condition': ParamOption(option_3, notraisepropertyerror=True)}), help_function=func['jinja_to_property_help'])})) +option_5 = StrOption(name="var1", doc="a variable", properties=frozenset({"basic", "force_default_on_freeze", "mandatory", Calculation(func['jinja_to_property'], Params((ParamValue("frozen")), kwargs={'__internal_jinja': ParamValue("frozen_1.rougail.family.var1"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['../rougail-tests/structures/24_0family_hidden_condition/rougail/00-base.yml']), '__internal_attribute': ParamValue("frozen"), '__internal_variable': ParamValue("1.rougail.family.var1"), 'when': ParamValue(True), 'inverse': ParamValue(False), 'rougail.condition': ParamOption(option_3, notraisepropertyerror=True)}), help_function=func['jinja_to_property_help'])}), informations={'type': 'string'}) +optiondescription_4 = OptionDescription(name="family", doc="possibly hidden family", children=[option_5], properties=frozenset({"basic", Calculation(func['jinja_to_property'], Params((ParamValue("hidden")), kwargs={'__internal_jinja': ParamValue("hidden_1.rougail.family"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['../rougail-tests/structures/24_0family_hidden_condition/rougail/00-base.yml']), '__internal_attribute': ParamValue("hidden"), '__internal_variable': ParamValue("1.rougail.family"), 'when': ParamValue(True), 'inverse': ParamValue(False), 'rougail.condition': ParamOption(option_3, notraisepropertyerror=True)}), help_function=func['jinja_to_property_help'])})) optiondescription_2 = OptionDescription(name="rougail", doc="Rougail", group_type=groups.namespace, children=[option_3, optiondescription_4], properties=frozenset({"basic"})) optiondescription_1 = OptionDescription(name="1", doc="1", children=[optiondescription_2], properties=frozenset({"basic"})) option_8 = StrOption(name="condition", doc="the variable use has condition", default="no", properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) -option_10 = StrOption(name="var1", doc="a variable", properties=frozenset({"basic", "force_default_on_freeze", "mandatory", Calculation(func['jinja_to_property'], Params((ParamValue("frozen")), kwargs={'__internal_jinja': ParamValue("frozen_2.rougail.family.var1"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['tests/dictionaries/24_0family_hidden_condition/dictionaries/rougail/00-base.yml']), '__internal_attribute': ParamValue("frozen"), '__internal_variable': ParamValue("2.rougail.family.var1"), 'when': ParamValue(True), 'inverse': ParamValue(False), 'rougail.condition': ParamOption(option_8, notraisepropertyerror=True)}), help_function=func['jinja_to_property_help'])}), informations={'type': 'string'}) -optiondescription_9 = OptionDescription(name="family", doc="possibly hidden family", children=[option_10], properties=frozenset({"basic", Calculation(func['jinja_to_property'], Params((ParamValue("hidden")), kwargs={'__internal_jinja': ParamValue("hidden_2.rougail.family"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['tests/dictionaries/24_0family_hidden_condition/dictionaries/rougail/00-base.yml']), '__internal_attribute': ParamValue("hidden"), '__internal_variable': ParamValue("2.rougail.family"), 'when': ParamValue(True), 'inverse': ParamValue(False), 'rougail.condition': ParamOption(option_8, notraisepropertyerror=True)}), help_function=func['jinja_to_property_help'])})) +option_10 = StrOption(name="var1", doc="a variable", properties=frozenset({"basic", "force_default_on_freeze", "mandatory", Calculation(func['jinja_to_property'], Params((ParamValue("frozen")), kwargs={'__internal_jinja': ParamValue("frozen_2.rougail.family.var1"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['../rougail-tests/structures/24_0family_hidden_condition/rougail/00-base.yml']), '__internal_attribute': ParamValue("frozen"), '__internal_variable': ParamValue("2.rougail.family.var1"), 'when': ParamValue(True), 'inverse': ParamValue(False), 'rougail.condition': ParamOption(option_8, notraisepropertyerror=True)}), help_function=func['jinja_to_property_help'])}), informations={'type': 'string'}) +optiondescription_9 = OptionDescription(name="family", doc="possibly hidden family", children=[option_10], properties=frozenset({"basic", Calculation(func['jinja_to_property'], Params((ParamValue("hidden")), kwargs={'__internal_jinja': ParamValue("hidden_2.rougail.family"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['../rougail-tests/structures/24_0family_hidden_condition/rougail/00-base.yml']), '__internal_attribute': ParamValue("hidden"), '__internal_variable': ParamValue("2.rougail.family"), 'when': ParamValue(True), 'inverse': ParamValue(False), 'rougail.condition': ParamOption(option_8, notraisepropertyerror=True)}), help_function=func['jinja_to_property_help'])})) optiondescription_7 = OptionDescription(name="rougail", doc="Rougail", group_type=groups.namespace, children=[option_8, optiondescription_9], 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/24_0family_hidden_condition_boolean/dictionaries/rougail/00-base.yml b/tests/dictionaries/24_0family_hidden_condition_boolean/dictionaries/rougail/00-base.yml deleted file mode 100644 index 8ad55dcda..000000000 --- a/tests/dictionaries/24_0family_hidden_condition_boolean/dictionaries/rougail/00-base.yml +++ /dev/null @@ -1,14 +0,0 @@ ---- -version: '1.1' -condition: false # a conditional variable -family: - description: a family - hidden: - jinja: | - {% if not rougail.condition %} - condition is false - {% endif %} - description: if not condition - variable: - description: a variable - mandatory: false diff --git a/tests/dictionaries/24_0family_hidden_condition_boolean/force_namespace b/tests/dictionaries/24_0family_hidden_condition_boolean/force_namespace deleted file mode 100644 index e69de29bb..000000000 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 55c8f6ed2..bd2f8c002 100644 --- a/tests/dictionaries/24_0family_hidden_condition_boolean/tiramisu/base.py +++ b/tests/dictionaries/24_0family_hidden_condition_boolean/tiramisu/base.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') try: groups.namespace except: @@ -13,7 +13,7 @@ ALLOWED_LEADER_PROPERTIES.add("advanced") dict_env['frozen_rougail.family.variable'] = "{% if not rougail.condition %}\ncondition is false\n{% endif %}\n" dict_env['hidden_rougail.family'] = "{% if not rougail.condition %}\ncondition is false\n{% endif %}\n" option_2 = BoolOption(name="condition", doc="a conditional variable", default=False, properties=frozenset({"mandatory", "standard"}), informations={'type': 'boolean'}) -option_4 = StrOption(name="variable", doc="a variable", properties=frozenset({"force_default_on_freeze", "standard", Calculation(func['jinja_to_property'], Params((ParamValue("frozen")), kwargs={'__internal_jinja': ParamValue("frozen_rougail.family.variable"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['tests/dictionaries/24_0family_hidden_condition_boolean/dictionaries/rougail/00-base.yml']), '__internal_attribute': ParamValue("frozen"), '__internal_variable': ParamValue("rougail.family.variable"), 'when': ParamValue(True), 'inverse': ParamValue(False), 'rougail.condition': ParamOption(option_2, notraisepropertyerror=True)}), help_function=func['jinja_to_property_help'])}), informations={'type': 'string'}) -optiondescription_3 = OptionDescription(name="family", doc="a family", children=[option_4], properties=frozenset({"standard", Calculation(func['jinja_to_property'], Params((ParamValue("hidden")), kwargs={'__internal_jinja': ParamValue("hidden_rougail.family"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['tests/dictionaries/24_0family_hidden_condition_boolean/dictionaries/rougail/00-base.yml']), '__internal_attribute': ParamValue("hidden"), '__internal_variable': ParamValue("rougail.family"), 'when': ParamValue(True), 'inverse': ParamValue(False), 'rougail.condition': ParamOption(option_2, notraisepropertyerror=True)}), help_function=func['jinja_to_property_help'])})) +option_4 = StrOption(name="variable", doc="a variable", properties=frozenset({"force_default_on_freeze", "standard", Calculation(func['jinja_to_property'], Params((ParamValue("frozen")), kwargs={'__internal_jinja': ParamValue("frozen_rougail.family.variable"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['../rougail-tests/structures/24_0family_hidden_condition_boolean/rougail/00-base.yml']), '__internal_attribute': ParamValue("frozen"), '__internal_variable': ParamValue("rougail.family.variable"), 'when': ParamValue(True), 'inverse': ParamValue(False), 'rougail.condition': ParamOption(option_2, notraisepropertyerror=True)}), help_function=func['jinja_to_property_help'])}), informations={'type': 'string'}) +optiondescription_3 = OptionDescription(name="family", doc="a family", children=[option_4], properties=frozenset({"standard", Calculation(func['jinja_to_property'], Params((ParamValue("hidden")), kwargs={'__internal_jinja': ParamValue("hidden_rougail.family"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['../rougail-tests/structures/24_0family_hidden_condition_boolean/rougail/00-base.yml']), '__internal_attribute': ParamValue("hidden"), '__internal_variable': ParamValue("rougail.family"), 'when': ParamValue(True), 'inverse': ParamValue(False), 'rougail.condition': ParamOption(option_2, notraisepropertyerror=True)}), help_function=func['jinja_to_property_help'])})) optiondescription_1 = OptionDescription(name="rougail", doc="Rougail", group_type=groups.namespace, children=[option_2, optiondescription_3], properties=frozenset({"standard"})) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_1]) 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 a067f04dc..82563adc1 100644 --- a/tests/dictionaries/24_0family_hidden_condition_boolean/tiramisu/multi.py +++ b/tests/dictionaries/24_0family_hidden_condition_boolean/tiramisu/multi.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') try: groups.namespace except: @@ -15,13 +15,13 @@ dict_env['hidden_1.rougail.family'] = "{% if not rougail.condition %}\ncondition dict_env['frozen_2.rougail.family.variable'] = "{% if not rougail.condition %}\ncondition is false\n{% endif %}\n" dict_env['hidden_2.rougail.family'] = "{% if not rougail.condition %}\ncondition is false\n{% endif %}\n" option_3 = BoolOption(name="condition", doc="a conditional variable", default=False, properties=frozenset({"mandatory", "standard"}), informations={'type': 'boolean'}) -option_5 = StrOption(name="variable", doc="a variable", properties=frozenset({"force_default_on_freeze", "standard", Calculation(func['jinja_to_property'], Params((ParamValue("frozen")), kwargs={'__internal_jinja': ParamValue("frozen_1.rougail.family.variable"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['tests/dictionaries/24_0family_hidden_condition_boolean/dictionaries/rougail/00-base.yml']), '__internal_attribute': ParamValue("frozen"), '__internal_variable': ParamValue("1.rougail.family.variable"), 'when': ParamValue(True), 'inverse': ParamValue(False), 'rougail.condition': ParamOption(option_3, notraisepropertyerror=True)}), help_function=func['jinja_to_property_help'])}), informations={'type': 'string'}) -optiondescription_4 = OptionDescription(name="family", doc="a family", children=[option_5], properties=frozenset({"standard", Calculation(func['jinja_to_property'], Params((ParamValue("hidden")), kwargs={'__internal_jinja': ParamValue("hidden_1.rougail.family"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['tests/dictionaries/24_0family_hidden_condition_boolean/dictionaries/rougail/00-base.yml']), '__internal_attribute': ParamValue("hidden"), '__internal_variable': ParamValue("1.rougail.family"), 'when': ParamValue(True), 'inverse': ParamValue(False), 'rougail.condition': ParamOption(option_3, notraisepropertyerror=True)}), help_function=func['jinja_to_property_help'])})) +option_5 = StrOption(name="variable", doc="a variable", properties=frozenset({"force_default_on_freeze", "standard", Calculation(func['jinja_to_property'], Params((ParamValue("frozen")), kwargs={'__internal_jinja': ParamValue("frozen_1.rougail.family.variable"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['../rougail-tests/structures/24_0family_hidden_condition_boolean/rougail/00-base.yml']), '__internal_attribute': ParamValue("frozen"), '__internal_variable': ParamValue("1.rougail.family.variable"), 'when': ParamValue(True), 'inverse': ParamValue(False), 'rougail.condition': ParamOption(option_3, notraisepropertyerror=True)}), help_function=func['jinja_to_property_help'])}), informations={'type': 'string'}) +optiondescription_4 = OptionDescription(name="family", doc="a family", children=[option_5], properties=frozenset({"standard", Calculation(func['jinja_to_property'], Params((ParamValue("hidden")), kwargs={'__internal_jinja': ParamValue("hidden_1.rougail.family"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['../rougail-tests/structures/24_0family_hidden_condition_boolean/rougail/00-base.yml']), '__internal_attribute': ParamValue("hidden"), '__internal_variable': ParamValue("1.rougail.family"), 'when': ParamValue(True), 'inverse': ParamValue(False), 'rougail.condition': ParamOption(option_3, notraisepropertyerror=True)}), help_function=func['jinja_to_property_help'])})) optiondescription_2 = OptionDescription(name="rougail", doc="Rougail", group_type=groups.namespace, children=[option_3, optiondescription_4], properties=frozenset({"standard"})) optiondescription_1 = OptionDescription(name="1", doc="1", children=[optiondescription_2], properties=frozenset({"standard"})) option_8 = BoolOption(name="condition", doc="a conditional variable", default=False, properties=frozenset({"mandatory", "standard"}), informations={'type': 'boolean'}) -option_10 = StrOption(name="variable", doc="a variable", properties=frozenset({"force_default_on_freeze", "standard", Calculation(func['jinja_to_property'], Params((ParamValue("frozen")), kwargs={'__internal_jinja': ParamValue("frozen_2.rougail.family.variable"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['tests/dictionaries/24_0family_hidden_condition_boolean/dictionaries/rougail/00-base.yml']), '__internal_attribute': ParamValue("frozen"), '__internal_variable': ParamValue("2.rougail.family.variable"), 'when': ParamValue(True), 'inverse': ParamValue(False), 'rougail.condition': ParamOption(option_8, notraisepropertyerror=True)}), help_function=func['jinja_to_property_help'])}), informations={'type': 'string'}) -optiondescription_9 = OptionDescription(name="family", doc="a family", children=[option_10], properties=frozenset({"standard", Calculation(func['jinja_to_property'], Params((ParamValue("hidden")), kwargs={'__internal_jinja': ParamValue("hidden_2.rougail.family"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['tests/dictionaries/24_0family_hidden_condition_boolean/dictionaries/rougail/00-base.yml']), '__internal_attribute': ParamValue("hidden"), '__internal_variable': ParamValue("2.rougail.family"), 'when': ParamValue(True), 'inverse': ParamValue(False), 'rougail.condition': ParamOption(option_8, notraisepropertyerror=True)}), help_function=func['jinja_to_property_help'])})) +option_10 = StrOption(name="variable", doc="a variable", properties=frozenset({"force_default_on_freeze", "standard", Calculation(func['jinja_to_property'], Params((ParamValue("frozen")), kwargs={'__internal_jinja': ParamValue("frozen_2.rougail.family.variable"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['../rougail-tests/structures/24_0family_hidden_condition_boolean/rougail/00-base.yml']), '__internal_attribute': ParamValue("frozen"), '__internal_variable': ParamValue("2.rougail.family.variable"), 'when': ParamValue(True), 'inverse': ParamValue(False), 'rougail.condition': ParamOption(option_8, notraisepropertyerror=True)}), help_function=func['jinja_to_property_help'])}), informations={'type': 'string'}) +optiondescription_9 = OptionDescription(name="family", doc="a family", children=[option_10], properties=frozenset({"standard", Calculation(func['jinja_to_property'], Params((ParamValue("hidden")), kwargs={'__internal_jinja': ParamValue("hidden_2.rougail.family"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['../rougail-tests/structures/24_0family_hidden_condition_boolean/rougail/00-base.yml']), '__internal_attribute': ParamValue("hidden"), '__internal_variable': ParamValue("2.rougail.family"), 'when': ParamValue(True), 'inverse': ParamValue(False), 'rougail.condition': ParamOption(option_8, notraisepropertyerror=True)}), help_function=func['jinja_to_property_help'])})) optiondescription_7 = OptionDescription(name="rougail", doc="Rougail", group_type=groups.namespace, children=[option_8, optiondescription_9], properties=frozenset({"standard"})) optiondescription_6 = OptionDescription(name="2", doc="2", children=[optiondescription_7], properties=frozenset({"standard"})) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_1, optiondescription_6]) 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 deleted file mode 100644 index ad0154795..000000000 --- a/tests/dictionaries/24_0family_hidden_condition_sub_family/dictionaries/rougail/00-base.yml +++ /dev/null @@ -1,13 +0,0 @@ ---- -version: '1.1' -condition: "no" # the variable use has condition -family: - description: possibly hidden family - hidden: - jinja: | - {% if _.condition == "yes" %} - condition is yes - {% endif %} - description: if condition is yes - subfamily: - var1: # a variable 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 5637a3e0d..3cc4ff00c 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 @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') try: groups.namespace except: @@ -13,8 +13,8 @@ ALLOWED_LEADER_PROPERTIES.add("advanced") dict_env['frozen_rougail.family.subfamily.var1'] = "{% if _.condition == \"yes\" %}\ncondition is yes\n{% endif %}\n" dict_env['hidden_rougail.family'] = "{% if _.condition == \"yes\" %}\ncondition is yes\n{% endif %}\n" option_2 = StrOption(name="condition", doc="the variable use has condition", default="no", properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) -option_5 = StrOption(name="var1", doc="a variable", properties=frozenset({"basic", "force_default_on_freeze", "mandatory", Calculation(func['jinja_to_property'], Params((ParamValue("frozen")), kwargs={'__internal_jinja': ParamValue("frozen_rougail.family.subfamily.var1"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['tests/dictionaries/24_0family_hidden_condition_sub_family/dictionaries/rougail/00-base.yml']), '__internal_attribute': ParamValue("frozen"), '__internal_variable': ParamValue("rougail.family.subfamily.var1"), 'when': ParamValue(True), 'inverse': ParamValue(False), '_.condition': ParamOption(option_2, notraisepropertyerror=True)}), help_function=func['jinja_to_property_help'])}), informations={'type': 'string'}) +option_5 = StrOption(name="var1", doc="a variable", properties=frozenset({"basic", "force_default_on_freeze", "mandatory", Calculation(func['jinja_to_property'], Params((ParamValue("frozen")), kwargs={'__internal_jinja': ParamValue("frozen_rougail.family.subfamily.var1"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['../rougail-tests/structures/24_0family_hidden_condition_sub_family/rougail/00-base.yml']), '__internal_attribute': ParamValue("frozen"), '__internal_variable': ParamValue("rougail.family.subfamily.var1"), 'when': ParamValue(True), 'inverse': ParamValue(False), '_.condition': ParamOption(option_2, notraisepropertyerror=True)}), help_function=func['jinja_to_property_help'])}), informations={'type': 'string'}) optiondescription_4 = OptionDescription(name="subfamily", doc="subfamily", children=[option_5], properties=frozenset({"basic"})) -optiondescription_3 = OptionDescription(name="family", doc="possibly hidden family", children=[optiondescription_4], properties=frozenset({"basic", Calculation(func['jinja_to_property'], Params((ParamValue("hidden")), kwargs={'__internal_jinja': ParamValue("hidden_rougail.family"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['tests/dictionaries/24_0family_hidden_condition_sub_family/dictionaries/rougail/00-base.yml']), '__internal_attribute': ParamValue("hidden"), '__internal_variable': ParamValue("rougail.family"), 'when': ParamValue(True), 'inverse': ParamValue(False), '_.condition': ParamOption(option_2, notraisepropertyerror=True)}), help_function=func['jinja_to_property_help'])})) +optiondescription_3 = OptionDescription(name="family", doc="possibly hidden family", children=[optiondescription_4], properties=frozenset({"basic", Calculation(func['jinja_to_property'], Params((ParamValue("hidden")), kwargs={'__internal_jinja': ParamValue("hidden_rougail.family"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['../rougail-tests/structures/24_0family_hidden_condition_sub_family/rougail/00-base.yml']), '__internal_attribute': ParamValue("hidden"), '__internal_variable': ParamValue("rougail.family"), 'when': ParamValue(True), 'inverse': ParamValue(False), '_.condition': ParamOption(option_2, notraisepropertyerror=True)}), help_function=func['jinja_to_property_help'])})) optiondescription_1 = OptionDescription(name="rougail", doc="Rougail", group_type=groups.namespace, children=[option_2, optiondescription_3], properties=frozenset({"basic"})) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_1]) 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 381999e83..a2f201f1a 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 @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') try: groups.namespace except: @@ -15,15 +15,15 @@ dict_env['hidden_1.rougail.family'] = "{% if _.condition == \"yes\" %}\nconditio dict_env['frozen_2.rougail.family.subfamily.var1'] = "{% if _.condition == \"yes\" %}\ncondition is yes\n{% endif %}\n" dict_env['hidden_2.rougail.family'] = "{% if _.condition == \"yes\" %}\ncondition is yes\n{% endif %}\n" option_3 = StrOption(name="condition", doc="the variable use has condition", default="no", properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) -option_6 = StrOption(name="var1", doc="a variable", properties=frozenset({"basic", "force_default_on_freeze", "mandatory", Calculation(func['jinja_to_property'], Params((ParamValue("frozen")), kwargs={'__internal_jinja': ParamValue("frozen_1.rougail.family.subfamily.var1"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['tests/dictionaries/24_0family_hidden_condition_sub_family/dictionaries/rougail/00-base.yml']), '__internal_attribute': ParamValue("frozen"), '__internal_variable': ParamValue("1.rougail.family.subfamily.var1"), 'when': ParamValue(True), 'inverse': ParamValue(False), '_.condition': ParamOption(option_3, notraisepropertyerror=True)}), help_function=func['jinja_to_property_help'])}), informations={'type': 'string'}) +option_6 = StrOption(name="var1", doc="a variable", properties=frozenset({"basic", "force_default_on_freeze", "mandatory", Calculation(func['jinja_to_property'], Params((ParamValue("frozen")), kwargs={'__internal_jinja': ParamValue("frozen_1.rougail.family.subfamily.var1"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['../rougail-tests/structures/24_0family_hidden_condition_sub_family/rougail/00-base.yml']), '__internal_attribute': ParamValue("frozen"), '__internal_variable': ParamValue("1.rougail.family.subfamily.var1"), 'when': ParamValue(True), 'inverse': ParamValue(False), '_.condition': ParamOption(option_3, notraisepropertyerror=True)}), help_function=func['jinja_to_property_help'])}), informations={'type': 'string'}) optiondescription_5 = OptionDescription(name="subfamily", doc="subfamily", children=[option_6], properties=frozenset({"basic"})) -optiondescription_4 = OptionDescription(name="family", doc="possibly hidden family", children=[optiondescription_5], properties=frozenset({"basic", Calculation(func['jinja_to_property'], Params((ParamValue("hidden")), kwargs={'__internal_jinja': ParamValue("hidden_1.rougail.family"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['tests/dictionaries/24_0family_hidden_condition_sub_family/dictionaries/rougail/00-base.yml']), '__internal_attribute': ParamValue("hidden"), '__internal_variable': ParamValue("1.rougail.family"), 'when': ParamValue(True), 'inverse': ParamValue(False), '_.condition': ParamOption(option_3, notraisepropertyerror=True)}), help_function=func['jinja_to_property_help'])})) +optiondescription_4 = OptionDescription(name="family", doc="possibly hidden family", children=[optiondescription_5], properties=frozenset({"basic", Calculation(func['jinja_to_property'], Params((ParamValue("hidden")), kwargs={'__internal_jinja': ParamValue("hidden_1.rougail.family"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['../rougail-tests/structures/24_0family_hidden_condition_sub_family/rougail/00-base.yml']), '__internal_attribute': ParamValue("hidden"), '__internal_variable': ParamValue("1.rougail.family"), 'when': ParamValue(True), 'inverse': ParamValue(False), '_.condition': ParamOption(option_3, notraisepropertyerror=True)}), help_function=func['jinja_to_property_help'])})) optiondescription_2 = OptionDescription(name="rougail", doc="Rougail", group_type=groups.namespace, children=[option_3, optiondescription_4], properties=frozenset({"basic"})) optiondescription_1 = OptionDescription(name="1", doc="1", children=[optiondescription_2], properties=frozenset({"basic"})) option_9 = StrOption(name="condition", doc="the variable use has condition", default="no", properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) -option_12 = StrOption(name="var1", doc="a variable", properties=frozenset({"basic", "force_default_on_freeze", "mandatory", Calculation(func['jinja_to_property'], Params((ParamValue("frozen")), kwargs={'__internal_jinja': ParamValue("frozen_2.rougail.family.subfamily.var1"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['tests/dictionaries/24_0family_hidden_condition_sub_family/dictionaries/rougail/00-base.yml']), '__internal_attribute': ParamValue("frozen"), '__internal_variable': ParamValue("2.rougail.family.subfamily.var1"), 'when': ParamValue(True), 'inverse': ParamValue(False), '_.condition': ParamOption(option_9, notraisepropertyerror=True)}), help_function=func['jinja_to_property_help'])}), informations={'type': 'string'}) +option_12 = StrOption(name="var1", doc="a variable", properties=frozenset({"basic", "force_default_on_freeze", "mandatory", Calculation(func['jinja_to_property'], Params((ParamValue("frozen")), kwargs={'__internal_jinja': ParamValue("frozen_2.rougail.family.subfamily.var1"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['../rougail-tests/structures/24_0family_hidden_condition_sub_family/rougail/00-base.yml']), '__internal_attribute': ParamValue("frozen"), '__internal_variable': ParamValue("2.rougail.family.subfamily.var1"), 'when': ParamValue(True), 'inverse': ParamValue(False), '_.condition': ParamOption(option_9, notraisepropertyerror=True)}), help_function=func['jinja_to_property_help'])}), informations={'type': 'string'}) optiondescription_11 = OptionDescription(name="subfamily", doc="subfamily", children=[option_12], properties=frozenset({"basic"})) -optiondescription_10 = OptionDescription(name="family", doc="possibly hidden family", children=[optiondescription_11], properties=frozenset({"basic", Calculation(func['jinja_to_property'], Params((ParamValue("hidden")), kwargs={'__internal_jinja': ParamValue("hidden_2.rougail.family"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['tests/dictionaries/24_0family_hidden_condition_sub_family/dictionaries/rougail/00-base.yml']), '__internal_attribute': ParamValue("hidden"), '__internal_variable': ParamValue("2.rougail.family"), 'when': ParamValue(True), 'inverse': ParamValue(False), '_.condition': ParamOption(option_9, notraisepropertyerror=True)}), help_function=func['jinja_to_property_help'])})) +optiondescription_10 = OptionDescription(name="family", doc="possibly hidden family", children=[optiondescription_11], properties=frozenset({"basic", Calculation(func['jinja_to_property'], Params((ParamValue("hidden")), kwargs={'__internal_jinja': ParamValue("hidden_2.rougail.family"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['../rougail-tests/structures/24_0family_hidden_condition_sub_family/rougail/00-base.yml']), '__internal_attribute': ParamValue("hidden"), '__internal_variable': ParamValue("2.rougail.family"), 'when': ParamValue(True), 'inverse': ParamValue(False), '_.condition': ParamOption(option_9, notraisepropertyerror=True)}), help_function=func['jinja_to_property_help'])})) optiondescription_8 = OptionDescription(name="rougail", doc="Rougail", group_type=groups.namespace, children=[option_9, optiondescription_10], properties=frozenset({"basic"})) optiondescription_7 = OptionDescription(name="2", doc="2", children=[optiondescription_8], properties=frozenset({"basic"})) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_1, optiondescription_7]) 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 3120a0c65..638e48166 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 @@ -2,14 +2,14 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") ALLOWED_LEADER_PROPERTIES.add("standard") ALLOWED_LEADER_PROPERTIES.add("advanced") dict_env['frozen_family.subfamily.var1'] = "{% if _.condition == \"yes\" %}\ncondition is yes\n{% endif %}\n" dict_env['hidden_family'] = "{% if _.condition == \"yes\" %}\ncondition is yes\n{% endif %}\n" option_1 = StrOption(name="condition", doc="the variable use has condition", default="no", properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) -option_4 = StrOption(name="var1", doc="a variable", properties=frozenset({"basic", "force_default_on_freeze", "mandatory", Calculation(func['jinja_to_property'], Params((ParamValue("frozen")), kwargs={'__internal_jinja': ParamValue("frozen_family.subfamily.var1"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['tests/dictionaries/24_0family_hidden_condition_sub_family/dictionaries/rougail/00-base.yml']), '__internal_attribute': ParamValue("frozen"), '__internal_variable': ParamValue("family.subfamily.var1"), 'when': ParamValue(True), 'inverse': ParamValue(False), '_.condition': ParamOption(option_1, notraisepropertyerror=True)}), help_function=func['jinja_to_property_help'])}), informations={'type': 'string'}) +option_4 = StrOption(name="var1", doc="a variable", properties=frozenset({"basic", "force_default_on_freeze", "mandatory", Calculation(func['jinja_to_property'], Params((ParamValue("frozen")), kwargs={'__internal_jinja': ParamValue("frozen_family.subfamily.var1"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['../rougail-tests/structures/24_0family_hidden_condition_sub_family/rougail/00-base.yml']), '__internal_attribute': ParamValue("frozen"), '__internal_variable': ParamValue("family.subfamily.var1"), 'when': ParamValue(True), 'inverse': ParamValue(False), '_.condition': ParamOption(option_1, notraisepropertyerror=True)}), help_function=func['jinja_to_property_help'])}), informations={'type': 'string'}) optiondescription_3 = OptionDescription(name="subfamily", doc="subfamily", children=[option_4], properties=frozenset({"basic"})) -optiondescription_2 = OptionDescription(name="family", doc="possibly hidden family", children=[optiondescription_3], properties=frozenset({"basic", Calculation(func['jinja_to_property'], Params((ParamValue("hidden")), kwargs={'__internal_jinja': ParamValue("hidden_family"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['tests/dictionaries/24_0family_hidden_condition_sub_family/dictionaries/rougail/00-base.yml']), '__internal_attribute': ParamValue("hidden"), '__internal_variable': ParamValue("family"), 'when': ParamValue(True), 'inverse': ParamValue(False), '_.condition': ParamOption(option_1, notraisepropertyerror=True)}), help_function=func['jinja_to_property_help'])})) +optiondescription_2 = OptionDescription(name="family", doc="possibly hidden family", children=[optiondescription_3], properties=frozenset({"basic", Calculation(func['jinja_to_property'], Params((ParamValue("hidden")), kwargs={'__internal_jinja': ParamValue("hidden_family"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['../rougail-tests/structures/24_0family_hidden_condition_sub_family/rougail/00-base.yml']), '__internal_attribute': ParamValue("hidden"), '__internal_variable': ParamValue("family"), 'when': ParamValue(True), 'inverse': ParamValue(False), '_.condition': ParamOption(option_1, notraisepropertyerror=True)}), help_function=func['jinja_to_property_help'])})) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1, optiondescription_2]) 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 deleted file mode 100644 index a842134c7..000000000 --- a/tests/dictionaries/24_0family_hidden_condition_variable_sub_family/dictionaries/rougail/00-base.yml +++ /dev/null @@ -1,11 +0,0 @@ ---- -version: '1.1' -condition: true # the variable use has condition -family: - description: possibly hidden family - hidden: - variable: _.condition - subfamily: # a subfamily - var1: - description: a variable - mandatory: false 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 66e1f2a5f..1dc55587e 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 @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') try: groups.namespace except: 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 e5c92785b..17ace5d0f 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 @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') try: groups.namespace except: 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 30c9cb0c0..511bc1556 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 @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") ALLOWED_LEADER_PROPERTIES.add("standard") ALLOWED_LEADER_PROPERTIES.add("advanced") 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 deleted file mode 100644 index 394acaa48..000000000 --- a/tests/dictionaries/24_0family_hidden_condition_with_variable/dictionaries/rougail/00-base.yml +++ /dev/null @@ -1,21 +0,0 @@ ---- -version: '1.1' -condition1: false # a first conditional variable -condition2: false # a second conditional variable -family: - description: a family - hidden: - jinja: | - {% if not rougail.condition1 %} - condition1 is false - {% endif %} - description: if condition1 is false - variable: - description: a variable - hidden: - jinja: | - {% if rougail.condition2 %} - condition2 is true - {% endif %} - description: if condition2 is false - mandatory: false diff --git a/tests/dictionaries/24_0family_hidden_condition_with_variable/force_namespace b/tests/dictionaries/24_0family_hidden_condition_with_variable/force_namespace deleted file mode 100644 index e69de29bb..000000000 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 735b842f2..a3795dc7b 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 @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') try: groups.namespace except: @@ -16,7 +16,7 @@ dict_env['frozen_rougail.family.variable_0'] = "{% if rougail.condition2 %}\ncon dict_env['hidden_rougail.family'] = "{% if not rougail.condition1 %}\ncondition1 is false\n{% endif %}\n" option_2 = BoolOption(name="condition1", doc="a first conditional variable", default=False, properties=frozenset({"mandatory", "standard"}), informations={'type': 'boolean'}) option_3 = BoolOption(name="condition2", doc="a second conditional variable", default=False, properties=frozenset({"mandatory", "standard"}), informations={'type': 'boolean'}) -option_5 = StrOption(name="variable", doc="a variable", properties=frozenset({"force_default_on_freeze", "standard", Calculation(func['jinja_to_property'], Params((ParamValue("hidden")), kwargs={'__internal_jinja': ParamValue("hidden_rougail.family.variable"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['tests/dictionaries/24_0family_hidden_condition_with_variable/dictionaries/rougail/00-base.yml']), '__internal_attribute': ParamValue("hidden"), '__internal_variable': ParamValue("rougail.family.variable"), 'when': ParamValue(True), 'inverse': ParamValue(False), 'rougail.condition2': ParamOption(option_3, notraisepropertyerror=True)}), help_function=func['jinja_to_property_help']), Calculation(func['jinja_to_property'], Params((ParamValue("frozen")), kwargs={'__internal_jinja': ParamValue("frozen_rougail.family.variable"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['tests/dictionaries/24_0family_hidden_condition_with_variable/dictionaries/rougail/00-base.yml']), '__internal_attribute': ParamValue("frozen"), '__internal_variable': ParamValue("rougail.family.variable"), 'when': ParamValue(True), 'inverse': ParamValue(False), 'rougail.condition1': ParamOption(option_2, notraisepropertyerror=True)}), help_function=func['jinja_to_property_help']), Calculation(func['jinja_to_property'], Params((ParamValue("frozen")), kwargs={'__internal_jinja': ParamValue("frozen_rougail.family.variable_0"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['tests/dictionaries/24_0family_hidden_condition_with_variable/dictionaries/rougail/00-base.yml']), '__internal_attribute': ParamValue("frozen"), '__internal_variable': ParamValue("rougail.family.variable"), 'when': ParamValue(True), 'inverse': ParamValue(False), 'rougail.condition2': ParamOption(option_3, notraisepropertyerror=True)}), help_function=func['jinja_to_property_help'])}), informations={'type': 'string'}) -optiondescription_4 = OptionDescription(name="family", doc="a family", children=[option_5], properties=frozenset({"standard", Calculation(func['jinja_to_property'], Params((ParamValue("hidden")), kwargs={'__internal_jinja': ParamValue("hidden_rougail.family"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['tests/dictionaries/24_0family_hidden_condition_with_variable/dictionaries/rougail/00-base.yml']), '__internal_attribute': ParamValue("hidden"), '__internal_variable': ParamValue("rougail.family"), 'when': ParamValue(True), 'inverse': ParamValue(False), 'rougail.condition1': ParamOption(option_2, notraisepropertyerror=True)}), help_function=func['jinja_to_property_help'])})) +option_5 = StrOption(name="variable", doc="a variable", properties=frozenset({"force_default_on_freeze", "standard", Calculation(func['jinja_to_property'], Params((ParamValue("hidden")), kwargs={'__internal_jinja': ParamValue("hidden_rougail.family.variable"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['../rougail-tests/structures/24_0family_hidden_condition_with_variable/rougail/00-base.yml']), '__internal_attribute': ParamValue("hidden"), '__internal_variable': ParamValue("rougail.family.variable"), 'when': ParamValue(True), 'inverse': ParamValue(False), 'rougail.condition2': ParamOption(option_3, notraisepropertyerror=True)}), help_function=func['jinja_to_property_help']), Calculation(func['jinja_to_property'], Params((ParamValue("frozen")), kwargs={'__internal_jinja': ParamValue("frozen_rougail.family.variable"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['../rougail-tests/structures/24_0family_hidden_condition_with_variable/rougail/00-base.yml']), '__internal_attribute': ParamValue("frozen"), '__internal_variable': ParamValue("rougail.family.variable"), 'when': ParamValue(True), 'inverse': ParamValue(False), 'rougail.condition1': ParamOption(option_2, notraisepropertyerror=True)}), help_function=func['jinja_to_property_help']), Calculation(func['jinja_to_property'], Params((ParamValue("frozen")), kwargs={'__internal_jinja': ParamValue("frozen_rougail.family.variable_0"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['../rougail-tests/structures/24_0family_hidden_condition_with_variable/rougail/00-base.yml']), '__internal_attribute': ParamValue("frozen"), '__internal_variable': ParamValue("rougail.family.variable"), 'when': ParamValue(True), 'inverse': ParamValue(False), 'rougail.condition2': ParamOption(option_3, notraisepropertyerror=True)}), help_function=func['jinja_to_property_help'])}), informations={'type': 'string'}) +optiondescription_4 = OptionDescription(name="family", doc="a family", children=[option_5], properties=frozenset({"standard", Calculation(func['jinja_to_property'], Params((ParamValue("hidden")), kwargs={'__internal_jinja': ParamValue("hidden_rougail.family"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['../rougail-tests/structures/24_0family_hidden_condition_with_variable/rougail/00-base.yml']), '__internal_attribute': ParamValue("hidden"), '__internal_variable': ParamValue("rougail.family"), 'when': ParamValue(True), 'inverse': ParamValue(False), 'rougail.condition1': ParamOption(option_2, notraisepropertyerror=True)}), help_function=func['jinja_to_property_help'])})) optiondescription_1 = OptionDescription(name="rougail", doc="Rougail", group_type=groups.namespace, children=[option_2, option_3, optiondescription_4], properties=frozenset({"standard"})) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_1]) 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 3417f7df8..af461abc0 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 @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') try: groups.namespace except: @@ -20,14 +20,14 @@ dict_env['frozen_2.rougail.family.variable_0'] = "{% if rougail.condition2 %}\nc dict_env['hidden_2.rougail.family'] = "{% if not rougail.condition1 %}\ncondition1 is false\n{% endif %}\n" option_3 = BoolOption(name="condition1", doc="a first conditional variable", default=False, properties=frozenset({"mandatory", "standard"}), informations={'type': 'boolean'}) option_4 = BoolOption(name="condition2", doc="a second conditional variable", default=False, properties=frozenset({"mandatory", "standard"}), informations={'type': 'boolean'}) -option_6 = StrOption(name="variable", doc="a variable", properties=frozenset({"force_default_on_freeze", "standard", Calculation(func['jinja_to_property'], Params((ParamValue("hidden")), kwargs={'__internal_jinja': ParamValue("hidden_1.rougail.family.variable"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['tests/dictionaries/24_0family_hidden_condition_with_variable/dictionaries/rougail/00-base.yml']), '__internal_attribute': ParamValue("hidden"), '__internal_variable': ParamValue("1.rougail.family.variable"), 'when': ParamValue(True), 'inverse': ParamValue(False), 'rougail.condition2': ParamOption(option_4, notraisepropertyerror=True)}), help_function=func['jinja_to_property_help']), Calculation(func['jinja_to_property'], Params((ParamValue("frozen")), kwargs={'__internal_jinja': ParamValue("frozen_1.rougail.family.variable"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['tests/dictionaries/24_0family_hidden_condition_with_variable/dictionaries/rougail/00-base.yml']), '__internal_attribute': ParamValue("frozen"), '__internal_variable': ParamValue("1.rougail.family.variable"), 'when': ParamValue(True), 'inverse': ParamValue(False), 'rougail.condition1': ParamOption(option_3, notraisepropertyerror=True)}), help_function=func['jinja_to_property_help']), Calculation(func['jinja_to_property'], Params((ParamValue("frozen")), kwargs={'__internal_jinja': ParamValue("frozen_1.rougail.family.variable_0"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['tests/dictionaries/24_0family_hidden_condition_with_variable/dictionaries/rougail/00-base.yml']), '__internal_attribute': ParamValue("frozen"), '__internal_variable': ParamValue("1.rougail.family.variable"), 'when': ParamValue(True), 'inverse': ParamValue(False), 'rougail.condition2': ParamOption(option_4, notraisepropertyerror=True)}), help_function=func['jinja_to_property_help'])}), informations={'type': 'string'}) -optiondescription_5 = OptionDescription(name="family", doc="a family", children=[option_6], properties=frozenset({"standard", Calculation(func['jinja_to_property'], Params((ParamValue("hidden")), kwargs={'__internal_jinja': ParamValue("hidden_1.rougail.family"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['tests/dictionaries/24_0family_hidden_condition_with_variable/dictionaries/rougail/00-base.yml']), '__internal_attribute': ParamValue("hidden"), '__internal_variable': ParamValue("1.rougail.family"), 'when': ParamValue(True), 'inverse': ParamValue(False), 'rougail.condition1': ParamOption(option_3, notraisepropertyerror=True)}), help_function=func['jinja_to_property_help'])})) +option_6 = StrOption(name="variable", doc="a variable", properties=frozenset({"force_default_on_freeze", "standard", Calculation(func['jinja_to_property'], Params((ParamValue("hidden")), kwargs={'__internal_jinja': ParamValue("hidden_1.rougail.family.variable"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['../rougail-tests/structures/24_0family_hidden_condition_with_variable/rougail/00-base.yml']), '__internal_attribute': ParamValue("hidden"), '__internal_variable': ParamValue("1.rougail.family.variable"), 'when': ParamValue(True), 'inverse': ParamValue(False), 'rougail.condition2': ParamOption(option_4, notraisepropertyerror=True)}), help_function=func['jinja_to_property_help']), Calculation(func['jinja_to_property'], Params((ParamValue("frozen")), kwargs={'__internal_jinja': ParamValue("frozen_1.rougail.family.variable"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['../rougail-tests/structures/24_0family_hidden_condition_with_variable/rougail/00-base.yml']), '__internal_attribute': ParamValue("frozen"), '__internal_variable': ParamValue("1.rougail.family.variable"), 'when': ParamValue(True), 'inverse': ParamValue(False), 'rougail.condition1': ParamOption(option_3, notraisepropertyerror=True)}), help_function=func['jinja_to_property_help']), Calculation(func['jinja_to_property'], Params((ParamValue("frozen")), kwargs={'__internal_jinja': ParamValue("frozen_1.rougail.family.variable_0"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['../rougail-tests/structures/24_0family_hidden_condition_with_variable/rougail/00-base.yml']), '__internal_attribute': ParamValue("frozen"), '__internal_variable': ParamValue("1.rougail.family.variable"), 'when': ParamValue(True), 'inverse': ParamValue(False), 'rougail.condition2': ParamOption(option_4, notraisepropertyerror=True)}), help_function=func['jinja_to_property_help'])}), informations={'type': 'string'}) +optiondescription_5 = OptionDescription(name="family", doc="a family", children=[option_6], properties=frozenset({"standard", Calculation(func['jinja_to_property'], Params((ParamValue("hidden")), kwargs={'__internal_jinja': ParamValue("hidden_1.rougail.family"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['../rougail-tests/structures/24_0family_hidden_condition_with_variable/rougail/00-base.yml']), '__internal_attribute': ParamValue("hidden"), '__internal_variable': ParamValue("1.rougail.family"), 'when': ParamValue(True), 'inverse': ParamValue(False), 'rougail.condition1': ParamOption(option_3, notraisepropertyerror=True)}), help_function=func['jinja_to_property_help'])})) optiondescription_2 = OptionDescription(name="rougail", doc="Rougail", group_type=groups.namespace, children=[option_3, option_4, optiondescription_5], properties=frozenset({"standard"})) optiondescription_1 = OptionDescription(name="1", doc="1", children=[optiondescription_2], properties=frozenset({"standard"})) option_9 = BoolOption(name="condition1", doc="a first conditional variable", default=False, properties=frozenset({"mandatory", "standard"}), informations={'type': 'boolean'}) option_10 = BoolOption(name="condition2", doc="a second conditional variable", default=False, properties=frozenset({"mandatory", "standard"}), informations={'type': 'boolean'}) -option_12 = StrOption(name="variable", doc="a variable", properties=frozenset({"force_default_on_freeze", "standard", Calculation(func['jinja_to_property'], Params((ParamValue("hidden")), kwargs={'__internal_jinja': ParamValue("hidden_2.rougail.family.variable"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['tests/dictionaries/24_0family_hidden_condition_with_variable/dictionaries/rougail/00-base.yml']), '__internal_attribute': ParamValue("hidden"), '__internal_variable': ParamValue("2.rougail.family.variable"), 'when': ParamValue(True), 'inverse': ParamValue(False), 'rougail.condition2': ParamOption(option_10, notraisepropertyerror=True)}), help_function=func['jinja_to_property_help']), Calculation(func['jinja_to_property'], Params((ParamValue("frozen")), kwargs={'__internal_jinja': ParamValue("frozen_2.rougail.family.variable"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['tests/dictionaries/24_0family_hidden_condition_with_variable/dictionaries/rougail/00-base.yml']), '__internal_attribute': ParamValue("frozen"), '__internal_variable': ParamValue("2.rougail.family.variable"), 'when': ParamValue(True), 'inverse': ParamValue(False), 'rougail.condition1': ParamOption(option_9, notraisepropertyerror=True)}), help_function=func['jinja_to_property_help']), Calculation(func['jinja_to_property'], Params((ParamValue("frozen")), kwargs={'__internal_jinja': ParamValue("frozen_2.rougail.family.variable_0"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['tests/dictionaries/24_0family_hidden_condition_with_variable/dictionaries/rougail/00-base.yml']), '__internal_attribute': ParamValue("frozen"), '__internal_variable': ParamValue("2.rougail.family.variable"), 'when': ParamValue(True), 'inverse': ParamValue(False), 'rougail.condition2': ParamOption(option_10, notraisepropertyerror=True)}), help_function=func['jinja_to_property_help'])}), informations={'type': 'string'}) -optiondescription_11 = OptionDescription(name="family", doc="a family", children=[option_12], properties=frozenset({"standard", Calculation(func['jinja_to_property'], Params((ParamValue("hidden")), kwargs={'__internal_jinja': ParamValue("hidden_2.rougail.family"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['tests/dictionaries/24_0family_hidden_condition_with_variable/dictionaries/rougail/00-base.yml']), '__internal_attribute': ParamValue("hidden"), '__internal_variable': ParamValue("2.rougail.family"), 'when': ParamValue(True), 'inverse': ParamValue(False), 'rougail.condition1': ParamOption(option_9, notraisepropertyerror=True)}), help_function=func['jinja_to_property_help'])})) +option_12 = StrOption(name="variable", doc="a variable", properties=frozenset({"force_default_on_freeze", "standard", Calculation(func['jinja_to_property'], Params((ParamValue("hidden")), kwargs={'__internal_jinja': ParamValue("hidden_2.rougail.family.variable"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['../rougail-tests/structures/24_0family_hidden_condition_with_variable/rougail/00-base.yml']), '__internal_attribute': ParamValue("hidden"), '__internal_variable': ParamValue("2.rougail.family.variable"), 'when': ParamValue(True), 'inverse': ParamValue(False), 'rougail.condition2': ParamOption(option_10, notraisepropertyerror=True)}), help_function=func['jinja_to_property_help']), Calculation(func['jinja_to_property'], Params((ParamValue("frozen")), kwargs={'__internal_jinja': ParamValue("frozen_2.rougail.family.variable"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['../rougail-tests/structures/24_0family_hidden_condition_with_variable/rougail/00-base.yml']), '__internal_attribute': ParamValue("frozen"), '__internal_variable': ParamValue("2.rougail.family.variable"), 'when': ParamValue(True), 'inverse': ParamValue(False), 'rougail.condition1': ParamOption(option_9, notraisepropertyerror=True)}), help_function=func['jinja_to_property_help']), Calculation(func['jinja_to_property'], Params((ParamValue("frozen")), kwargs={'__internal_jinja': ParamValue("frozen_2.rougail.family.variable_0"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['../rougail-tests/structures/24_0family_hidden_condition_with_variable/rougail/00-base.yml']), '__internal_attribute': ParamValue("frozen"), '__internal_variable': ParamValue("2.rougail.family.variable"), 'when': ParamValue(True), 'inverse': ParamValue(False), 'rougail.condition2': ParamOption(option_10, notraisepropertyerror=True)}), help_function=func['jinja_to_property_help'])}), informations={'type': 'string'}) +optiondescription_11 = OptionDescription(name="family", doc="a family", children=[option_12], properties=frozenset({"standard", Calculation(func['jinja_to_property'], Params((ParamValue("hidden")), kwargs={'__internal_jinja': ParamValue("hidden_2.rougail.family"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['../rougail-tests/structures/24_0family_hidden_condition_with_variable/rougail/00-base.yml']), '__internal_attribute': ParamValue("hidden"), '__internal_variable': ParamValue("2.rougail.family"), 'when': ParamValue(True), 'inverse': ParamValue(False), 'rougail.condition1': ParamOption(option_9, notraisepropertyerror=True)}), help_function=func['jinja_to_property_help'])})) optiondescription_8 = OptionDescription(name="rougail", doc="Rougail", group_type=groups.namespace, children=[option_9, option_10, optiondescription_11], properties=frozenset({"standard"})) optiondescription_7 = OptionDescription(name="2", doc="2", children=[optiondescription_8], properties=frozenset({"standard"})) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_1, optiondescription_7]) 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 deleted file mode 100644 index 6c64302d8..000000000 --- a/tests/dictionaries/24_0family_hidden_param_condition_sub_family/dictionaries/rougail/00-base.yml +++ /dev/null @@ -1,16 +0,0 @@ ---- -version: '1.1' -condition: "no" # the variable use has condition -family: - description: possibly hidden family - hidden: - jinja: | - {% if condition == "yes" %} - condition is yes - {% endif %} - params: - condition: - variable: _.condition - description: if condition is yes - sub_family: # a subfamily - var1: # a variable 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 385bd4cf0..faa8efd40 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 @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') try: groups.namespace except: @@ -13,8 +13,8 @@ ALLOWED_LEADER_PROPERTIES.add("advanced") dict_env['frozen_rougail.family.sub_family.var1'] = "{% if condition == \"yes\" %}\ncondition is yes\n{% endif %}\n" dict_env['hidden_rougail.family'] = "{% if condition == \"yes\" %}\ncondition is yes\n{% endif %}\n" option_2 = StrOption(name="condition", doc="the variable use has condition", default="no", properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) -option_5 = StrOption(name="var1", doc="a variable", properties=frozenset({"basic", "force_default_on_freeze", "mandatory", Calculation(func['jinja_to_property'], Params((ParamValue("frozen")), kwargs={'__internal_jinja': ParamValue("frozen_rougail.family.sub_family.var1"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['tests/dictionaries/24_0family_hidden_param_condition_sub_family/dictionaries/rougail/00-base.yml']), '__internal_attribute': ParamValue("frozen"), '__internal_variable': ParamValue("rougail.family.sub_family.var1"), 'condition': ParamOption(option_2), 'when': ParamValue(True), 'inverse': ParamValue(False)}), help_function=func['jinja_to_property_help'])}), informations={'type': 'string'}) +option_5 = StrOption(name="var1", doc="a variable", properties=frozenset({"basic", "force_default_on_freeze", "mandatory", Calculation(func['jinja_to_property'], Params((ParamValue("frozen")), kwargs={'__internal_jinja': ParamValue("frozen_rougail.family.sub_family.var1"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['../rougail-tests/structures/24_0family_hidden_param_condition_sub_family/rougail/00-base.yml']), '__internal_attribute': ParamValue("frozen"), '__internal_variable': ParamValue("rougail.family.sub_family.var1"), 'condition': ParamOption(option_2), 'when': ParamValue(True), 'inverse': ParamValue(False)}), help_function=func['jinja_to_property_help'])}), informations={'type': 'string'}) optiondescription_4 = OptionDescription(name="sub_family", doc="a subfamily", children=[option_5], properties=frozenset({"basic"})) -optiondescription_3 = OptionDescription(name="family", doc="possibly hidden family", children=[optiondescription_4], properties=frozenset({"basic", Calculation(func['jinja_to_property'], Params((ParamValue("hidden")), kwargs={'__internal_jinja': ParamValue("hidden_rougail.family"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['tests/dictionaries/24_0family_hidden_param_condition_sub_family/dictionaries/rougail/00-base.yml']), '__internal_attribute': ParamValue("hidden"), '__internal_variable': ParamValue("rougail.family"), 'condition': ParamOption(option_2), 'when': ParamValue(True), 'inverse': ParamValue(False)}), help_function=func['jinja_to_property_help'])})) +optiondescription_3 = OptionDescription(name="family", doc="possibly hidden family", children=[optiondescription_4], properties=frozenset({"basic", Calculation(func['jinja_to_property'], Params((ParamValue("hidden")), kwargs={'__internal_jinja': ParamValue("hidden_rougail.family"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['../rougail-tests/structures/24_0family_hidden_param_condition_sub_family/rougail/00-base.yml']), '__internal_attribute': ParamValue("hidden"), '__internal_variable': ParamValue("rougail.family"), 'condition': ParamOption(option_2), 'when': ParamValue(True), 'inverse': ParamValue(False)}), help_function=func['jinja_to_property_help'])})) optiondescription_1 = OptionDescription(name="rougail", doc="Rougail", group_type=groups.namespace, children=[option_2, optiondescription_3], properties=frozenset({"basic"})) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_1]) 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 747696acb..1502da91e 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 @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') try: groups.namespace except: @@ -15,15 +15,15 @@ dict_env['hidden_1.rougail.family'] = "{% if condition == \"yes\" %}\ncondition dict_env['frozen_2.rougail.family.sub_family.var1'] = "{% if condition == \"yes\" %}\ncondition is yes\n{% endif %}\n" dict_env['hidden_2.rougail.family'] = "{% if condition == \"yes\" %}\ncondition is yes\n{% endif %}\n" option_3 = StrOption(name="condition", doc="the variable use has condition", default="no", properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) -option_6 = StrOption(name="var1", doc="a variable", properties=frozenset({"basic", "force_default_on_freeze", "mandatory", Calculation(func['jinja_to_property'], Params((ParamValue("frozen")), kwargs={'__internal_jinja': ParamValue("frozen_1.rougail.family.sub_family.var1"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['tests/dictionaries/24_0family_hidden_param_condition_sub_family/dictionaries/rougail/00-base.yml']), '__internal_attribute': ParamValue("frozen"), '__internal_variable': ParamValue("1.rougail.family.sub_family.var1"), 'condition': ParamOption(option_3), 'when': ParamValue(True), 'inverse': ParamValue(False)}), help_function=func['jinja_to_property_help'])}), informations={'type': 'string'}) +option_6 = StrOption(name="var1", doc="a variable", properties=frozenset({"basic", "force_default_on_freeze", "mandatory", Calculation(func['jinja_to_property'], Params((ParamValue("frozen")), kwargs={'__internal_jinja': ParamValue("frozen_1.rougail.family.sub_family.var1"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['../rougail-tests/structures/24_0family_hidden_param_condition_sub_family/rougail/00-base.yml']), '__internal_attribute': ParamValue("frozen"), '__internal_variable': ParamValue("1.rougail.family.sub_family.var1"), 'condition': ParamOption(option_3), 'when': ParamValue(True), 'inverse': ParamValue(False)}), help_function=func['jinja_to_property_help'])}), informations={'type': 'string'}) optiondescription_5 = OptionDescription(name="sub_family", doc="a subfamily", children=[option_6], properties=frozenset({"basic"})) -optiondescription_4 = OptionDescription(name="family", doc="possibly hidden family", children=[optiondescription_5], properties=frozenset({"basic", Calculation(func['jinja_to_property'], Params((ParamValue("hidden")), kwargs={'__internal_jinja': ParamValue("hidden_1.rougail.family"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['tests/dictionaries/24_0family_hidden_param_condition_sub_family/dictionaries/rougail/00-base.yml']), '__internal_attribute': ParamValue("hidden"), '__internal_variable': ParamValue("1.rougail.family"), 'condition': ParamOption(option_3), 'when': ParamValue(True), 'inverse': ParamValue(False)}), help_function=func['jinja_to_property_help'])})) +optiondescription_4 = OptionDescription(name="family", doc="possibly hidden family", children=[optiondescription_5], properties=frozenset({"basic", Calculation(func['jinja_to_property'], Params((ParamValue("hidden")), kwargs={'__internal_jinja': ParamValue("hidden_1.rougail.family"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['../rougail-tests/structures/24_0family_hidden_param_condition_sub_family/rougail/00-base.yml']), '__internal_attribute': ParamValue("hidden"), '__internal_variable': ParamValue("1.rougail.family"), 'condition': ParamOption(option_3), 'when': ParamValue(True), 'inverse': ParamValue(False)}), help_function=func['jinja_to_property_help'])})) optiondescription_2 = OptionDescription(name="rougail", doc="Rougail", group_type=groups.namespace, children=[option_3, optiondescription_4], properties=frozenset({"basic"})) optiondescription_1 = OptionDescription(name="1", doc="1", children=[optiondescription_2], properties=frozenset({"basic"})) option_9 = StrOption(name="condition", doc="the variable use has condition", default="no", properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) -option_12 = StrOption(name="var1", doc="a variable", properties=frozenset({"basic", "force_default_on_freeze", "mandatory", Calculation(func['jinja_to_property'], Params((ParamValue("frozen")), kwargs={'__internal_jinja': ParamValue("frozen_2.rougail.family.sub_family.var1"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['tests/dictionaries/24_0family_hidden_param_condition_sub_family/dictionaries/rougail/00-base.yml']), '__internal_attribute': ParamValue("frozen"), '__internal_variable': ParamValue("2.rougail.family.sub_family.var1"), 'condition': ParamOption(option_9), 'when': ParamValue(True), 'inverse': ParamValue(False)}), help_function=func['jinja_to_property_help'])}), informations={'type': 'string'}) +option_12 = StrOption(name="var1", doc="a variable", properties=frozenset({"basic", "force_default_on_freeze", "mandatory", Calculation(func['jinja_to_property'], Params((ParamValue("frozen")), kwargs={'__internal_jinja': ParamValue("frozen_2.rougail.family.sub_family.var1"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['../rougail-tests/structures/24_0family_hidden_param_condition_sub_family/rougail/00-base.yml']), '__internal_attribute': ParamValue("frozen"), '__internal_variable': ParamValue("2.rougail.family.sub_family.var1"), 'condition': ParamOption(option_9), 'when': ParamValue(True), 'inverse': ParamValue(False)}), help_function=func['jinja_to_property_help'])}), informations={'type': 'string'}) optiondescription_11 = OptionDescription(name="sub_family", doc="a subfamily", children=[option_12], properties=frozenset({"basic"})) -optiondescription_10 = OptionDescription(name="family", doc="possibly hidden family", children=[optiondescription_11], properties=frozenset({"basic", Calculation(func['jinja_to_property'], Params((ParamValue("hidden")), kwargs={'__internal_jinja': ParamValue("hidden_2.rougail.family"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['tests/dictionaries/24_0family_hidden_param_condition_sub_family/dictionaries/rougail/00-base.yml']), '__internal_attribute': ParamValue("hidden"), '__internal_variable': ParamValue("2.rougail.family"), 'condition': ParamOption(option_9), 'when': ParamValue(True), 'inverse': ParamValue(False)}), help_function=func['jinja_to_property_help'])})) +optiondescription_10 = OptionDescription(name="family", doc="possibly hidden family", children=[optiondescription_11], properties=frozenset({"basic", Calculation(func['jinja_to_property'], Params((ParamValue("hidden")), kwargs={'__internal_jinja': ParamValue("hidden_2.rougail.family"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['../rougail-tests/structures/24_0family_hidden_param_condition_sub_family/rougail/00-base.yml']), '__internal_attribute': ParamValue("hidden"), '__internal_variable': ParamValue("2.rougail.family"), 'condition': ParamOption(option_9), 'when': ParamValue(True), 'inverse': ParamValue(False)}), help_function=func['jinja_to_property_help'])})) optiondescription_8 = OptionDescription(name="rougail", doc="Rougail", group_type=groups.namespace, children=[option_9, optiondescription_10], properties=frozenset({"basic"})) optiondescription_7 = OptionDescription(name="2", doc="2", children=[optiondescription_8], properties=frozenset({"basic"})) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_1, optiondescription_7]) 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 fea57e901..a66422d9e 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 @@ -2,14 +2,14 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") ALLOWED_LEADER_PROPERTIES.add("standard") ALLOWED_LEADER_PROPERTIES.add("advanced") dict_env['frozen_family.sub_family.var1'] = "{% if condition == \"yes\" %}\ncondition is yes\n{% endif %}\n" dict_env['hidden_family'] = "{% if condition == \"yes\" %}\ncondition is yes\n{% endif %}\n" option_1 = StrOption(name="condition", doc="the variable use has condition", default="no", properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) -option_4 = StrOption(name="var1", doc="a variable", properties=frozenset({"basic", "force_default_on_freeze", "mandatory", Calculation(func['jinja_to_property'], Params((ParamValue("frozen")), kwargs={'__internal_jinja': ParamValue("frozen_family.sub_family.var1"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['tests/dictionaries/24_0family_hidden_param_condition_sub_family/dictionaries/rougail/00-base.yml']), '__internal_attribute': ParamValue("frozen"), '__internal_variable': ParamValue("family.sub_family.var1"), 'condition': ParamOption(option_1), 'when': ParamValue(True), 'inverse': ParamValue(False)}), help_function=func['jinja_to_property_help'])}), informations={'type': 'string'}) +option_4 = StrOption(name="var1", doc="a variable", properties=frozenset({"basic", "force_default_on_freeze", "mandatory", Calculation(func['jinja_to_property'], Params((ParamValue("frozen")), kwargs={'__internal_jinja': ParamValue("frozen_family.sub_family.var1"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['../rougail-tests/structures/24_0family_hidden_param_condition_sub_family/rougail/00-base.yml']), '__internal_attribute': ParamValue("frozen"), '__internal_variable': ParamValue("family.sub_family.var1"), 'condition': ParamOption(option_1), 'when': ParamValue(True), 'inverse': ParamValue(False)}), help_function=func['jinja_to_property_help'])}), informations={'type': 'string'}) optiondescription_3 = OptionDescription(name="sub_family", doc="a subfamily", children=[option_4], properties=frozenset({"basic"})) -optiondescription_2 = OptionDescription(name="family", doc="possibly hidden family", children=[optiondescription_3], properties=frozenset({"basic", Calculation(func['jinja_to_property'], Params((ParamValue("hidden")), kwargs={'__internal_jinja': ParamValue("hidden_family"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['tests/dictionaries/24_0family_hidden_param_condition_sub_family/dictionaries/rougail/00-base.yml']), '__internal_attribute': ParamValue("hidden"), '__internal_variable': ParamValue("family"), 'condition': ParamOption(option_1), 'when': ParamValue(True), 'inverse': ParamValue(False)}), help_function=func['jinja_to_property_help'])})) +optiondescription_2 = OptionDescription(name="family", doc="possibly hidden family", children=[optiondescription_3], properties=frozenset({"basic", Calculation(func['jinja_to_property'], Params((ParamValue("hidden")), kwargs={'__internal_jinja': ParamValue("hidden_family"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['../rougail-tests/structures/24_0family_hidden_param_condition_sub_family/rougail/00-base.yml']), '__internal_attribute': ParamValue("hidden"), '__internal_variable': ParamValue("family"), 'condition': ParamOption(option_1), 'when': ParamValue(True), 'inverse': ParamValue(False)}), help_function=func['jinja_to_property_help'])})) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1, optiondescription_2]) 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 deleted file mode 100644 index e00f2c193..000000000 --- a/tests/dictionaries/24_0family_mandatory_condition/dictionaries/rougail/00-base.yml +++ /dev/null @@ -1,11 +0,0 @@ ---- -version: '1.1' -condition: "no" # a condition -var: - description: a variable - mandatory: - jinja: | - {% if _.condition == "yes" %} - condition is yes - {% endif %} - description: only if rougail.condition has the value "yes" diff --git a/tests/dictionaries/24_0family_mandatory_condition/tiramisu/base.py b/tests/dictionaries/24_0family_mandatory_condition/tiramisu/base.py index 5573d77a4..6bebfe12f 100644 --- a/tests/dictionaries/24_0family_mandatory_condition/tiramisu/base.py +++ b/tests/dictionaries/24_0family_mandatory_condition/tiramisu/base.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') try: groups.namespace except: @@ -12,6 +12,6 @@ ALLOWED_LEADER_PROPERTIES.add("standard") ALLOWED_LEADER_PROPERTIES.add("advanced") dict_env['mandatory_rougail.var'] = "{% if _.condition == \"yes\" %}\ncondition is yes\n{% endif %}\n" option_2 = StrOption(name="condition", doc="a condition", default="no", properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) -option_3 = StrOption(name="var", doc="a variable", properties=frozenset({"standard", Calculation(func['jinja_to_property'], Params((ParamValue("mandatory")), kwargs={'__internal_jinja': ParamValue("mandatory_rougail.var"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['tests/dictionaries/24_0family_mandatory_condition/dictionaries/rougail/00-base.yml']), '__internal_attribute': ParamValue("mandatory"), '__internal_variable': ParamValue("rougail.var"), 'when': ParamValue(True), 'inverse': ParamValue(False), '_.condition': ParamOption(option_2, notraisepropertyerror=True)}), help_function=func['jinja_to_property_help'])}), informations={'type': 'string'}) +option_3 = StrOption(name="var", doc="a variable", properties=frozenset({"standard", Calculation(func['jinja_to_property'], Params((ParamValue("mandatory")), kwargs={'__internal_jinja': ParamValue("mandatory_rougail.var"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['../rougail-tests/structures/24_0family_mandatory_condition/rougail/00-base.yml']), '__internal_attribute': ParamValue("mandatory"), '__internal_variable': ParamValue("rougail.var"), 'when': ParamValue(True), 'inverse': ParamValue(False), '_.condition': ParamOption(option_2, notraisepropertyerror=True)}), help_function=func['jinja_to_property_help'])}), informations={'type': 'string'}) optiondescription_1 = OptionDescription(name="rougail", doc="Rougail", group_type=groups.namespace, children=[option_2, option_3], properties=frozenset({"standard"})) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_1]) diff --git a/tests/dictionaries/24_0family_mandatory_condition/tiramisu/multi.py b/tests/dictionaries/24_0family_mandatory_condition/tiramisu/multi.py index ee05da12b..60ee5105e 100644 --- a/tests/dictionaries/24_0family_mandatory_condition/tiramisu/multi.py +++ b/tests/dictionaries/24_0family_mandatory_condition/tiramisu/multi.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') try: groups.namespace except: @@ -13,11 +13,11 @@ ALLOWED_LEADER_PROPERTIES.add("advanced") dict_env['mandatory_1.rougail.var'] = "{% if _.condition == \"yes\" %}\ncondition is yes\n{% endif %}\n" dict_env['mandatory_2.rougail.var'] = "{% if _.condition == \"yes\" %}\ncondition is yes\n{% endif %}\n" option_3 = StrOption(name="condition", doc="a condition", default="no", properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) -option_4 = StrOption(name="var", doc="a variable", properties=frozenset({"standard", Calculation(func['jinja_to_property'], Params((ParamValue("mandatory")), kwargs={'__internal_jinja': ParamValue("mandatory_1.rougail.var"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['tests/dictionaries/24_0family_mandatory_condition/dictionaries/rougail/00-base.yml']), '__internal_attribute': ParamValue("mandatory"), '__internal_variable': ParamValue("1.rougail.var"), 'when': ParamValue(True), 'inverse': ParamValue(False), '_.condition': ParamOption(option_3, notraisepropertyerror=True)}), help_function=func['jinja_to_property_help'])}), informations={'type': 'string'}) +option_4 = StrOption(name="var", doc="a variable", properties=frozenset({"standard", Calculation(func['jinja_to_property'], Params((ParamValue("mandatory")), kwargs={'__internal_jinja': ParamValue("mandatory_1.rougail.var"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['../rougail-tests/structures/24_0family_mandatory_condition/rougail/00-base.yml']), '__internal_attribute': ParamValue("mandatory"), '__internal_variable': ParamValue("1.rougail.var"), 'when': ParamValue(True), 'inverse': ParamValue(False), '_.condition': ParamOption(option_3, notraisepropertyerror=True)}), help_function=func['jinja_to_property_help'])}), informations={'type': 'string'}) optiondescription_2 = OptionDescription(name="rougail", doc="Rougail", group_type=groups.namespace, 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="condition", doc="a condition", default="no", properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) -option_8 = StrOption(name="var", doc="a variable", properties=frozenset({"standard", Calculation(func['jinja_to_property'], Params((ParamValue("mandatory")), kwargs={'__internal_jinja': ParamValue("mandatory_2.rougail.var"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['tests/dictionaries/24_0family_mandatory_condition/dictionaries/rougail/00-base.yml']), '__internal_attribute': ParamValue("mandatory"), '__internal_variable': ParamValue("2.rougail.var"), 'when': ParamValue(True), 'inverse': ParamValue(False), '_.condition': ParamOption(option_7, notraisepropertyerror=True)}), help_function=func['jinja_to_property_help'])}), informations={'type': 'string'}) +option_8 = StrOption(name="var", doc="a variable", properties=frozenset({"standard", Calculation(func['jinja_to_property'], Params((ParamValue("mandatory")), kwargs={'__internal_jinja': ParamValue("mandatory_2.rougail.var"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['../rougail-tests/structures/24_0family_mandatory_condition/rougail/00-base.yml']), '__internal_attribute': ParamValue("mandatory"), '__internal_variable': ParamValue("2.rougail.var"), 'when': ParamValue(True), 'inverse': ParamValue(False), '_.condition': ParamOption(option_7, notraisepropertyerror=True)}), help_function=func['jinja_to_property_help'])}), informations={'type': 'string'}) optiondescription_6 = OptionDescription(name="rougail", doc="Rougail", group_type=groups.namespace, 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/24_0family_mandatory_condition/tiramisu/no_namespace.py b/tests/dictionaries/24_0family_mandatory_condition/tiramisu/no_namespace.py index b53568a1b..cd62c5014 100644 --- a/tests/dictionaries/24_0family_mandatory_condition/tiramisu/no_namespace.py +++ b/tests/dictionaries/24_0family_mandatory_condition/tiramisu/no_namespace.py @@ -2,11 +2,11 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") ALLOWED_LEADER_PROPERTIES.add("standard") ALLOWED_LEADER_PROPERTIES.add("advanced") dict_env['mandatory_var'] = "{% if _.condition == \"yes\" %}\ncondition is yes\n{% endif %}\n" option_1 = StrOption(name="condition", doc="a condition", default="no", properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) -option_2 = StrOption(name="var", doc="a variable", properties=frozenset({"standard", Calculation(func['jinja_to_property'], Params((ParamValue("mandatory")), kwargs={'__internal_jinja': ParamValue("mandatory_var"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['tests/dictionaries/24_0family_mandatory_condition/dictionaries/rougail/00-base.yml']), '__internal_attribute': ParamValue("mandatory"), '__internal_variable': ParamValue("var"), 'when': ParamValue(True), 'inverse': ParamValue(False), '_.condition': ParamOption(option_1, notraisepropertyerror=True)}), help_function=func['jinja_to_property_help'])}), informations={'type': 'string'}) +option_2 = StrOption(name="var", doc="a variable", properties=frozenset({"standard", Calculation(func['jinja_to_property'], Params((ParamValue("mandatory")), kwargs={'__internal_jinja': ParamValue("mandatory_var"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['../rougail-tests/structures/24_0family_mandatory_condition/rougail/00-base.yml']), '__internal_attribute': ParamValue("mandatory"), '__internal_variable': ParamValue("var"), 'when': ParamValue(True), 'inverse': ParamValue(False), '_.condition': ParamOption(option_1, notraisepropertyerror=True)}), help_function=func['jinja_to_property_help'])}), informations={'type': 'string'}) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1, option_2]) 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 deleted file mode 100644 index d335b1d54..000000000 --- a/tests/dictionaries/24_0family_mandatory_condition_variable/dictionaries/rougail/00-base.yml +++ /dev/null @@ -1,7 +0,0 @@ ---- -version: '1.1' -condition: true # a condition -var: - description: a variable - mandatory: - 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 519724d6e..b48136721 100644 --- a/tests/dictionaries/24_0family_mandatory_condition_variable/tiramisu/base.py +++ b/tests/dictionaries/24_0family_mandatory_condition_variable/tiramisu/base.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') try: groups.namespace except: 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 247fbd102..e68aebe2a 100644 --- a/tests/dictionaries/24_0family_mandatory_condition_variable/tiramisu/multi.py +++ b/tests/dictionaries/24_0family_mandatory_condition_variable/tiramisu/multi.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') try: groups.namespace except: 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 3d5401861..6e7f72d5c 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 @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") ALLOWED_LEADER_PROPERTIES.add("standard") ALLOWED_LEADER_PROPERTIES.add("advanced") diff --git a/tests/dictionaries/24_7validators_variable_optional/dictionaries/rougail/00-base.yml b/tests/dictionaries/24_7validators_variable_optional/dictionaries/rougail/00-base.yml deleted file mode 100644 index 7a000ba19..000000000 --- a/tests/dictionaries/24_7validators_variable_optional/dictionaries/rougail/00-base.yml +++ /dev/null @@ -1,28 +0,0 @@ ---- -version: '1.1' -general: # a family - int: - description: a first number - type: number - test: - - 5 - validators: - - jinja: | - {% if _.int == int2 %} - int and int2 must be different - {% endif %} - params: - int2: - variable: _.int2 - optional: true - description: int and int2 must be different - - jinja: | - {% if int3 is defined and _.int == int3 %} - int and int3 must be different - {% endif %} - params: - int3: - variable: _.int3 - optional: true - description: int and int3 must be different - int2: 1 # a second number diff --git a/tests/dictionaries/24_7validators_variable_optional/tiramisu/base.py b/tests/dictionaries/24_7validators_variable_optional/tiramisu/base.py index f6205a1a1..022ee24f2 100644 --- a/tests/dictionaries/24_7validators_variable_optional/tiramisu/base.py +++ b/tests/dictionaries/24_7validators_variable_optional/tiramisu/base.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') try: groups.namespace except: @@ -13,7 +13,7 @@ ALLOWED_LEADER_PROPERTIES.add("advanced") dict_env['validators_rougail.general.int'] = "{% if _.int == int2 %}\nint and int2 must be different\n{% endif %}\n" dict_env['validators_rougail.general.int_0'] = "{% if int3 is defined and _.int == int3 %}\nint and int3 must be different\n{% endif %}\n" option_4 = IntOption(name="int2", doc="a second number", default=1, properties=frozenset({"mandatory", "standard"}), informations={'type': 'number'}) -option_3 = IntOption(name="int", doc="a first number", validators=[Calculation(func['valid_with_jinja'], Params((), kwargs={'__internal_jinja': ParamValue("validators_rougail.general.int"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['tests/dictionaries/24_7validators_variable_optional/dictionaries/rougail/00-base.yml']), '__internal_attribute': ParamValue("validators"), '__internal_variable': ParamValue("rougail.general.int"), 'int2': ParamOption(option_4), '_.int': ParamSelfOption(whole=False)})), Calculation(func['valid_with_jinja'], Params((), kwargs={'__internal_jinja': ParamValue("validators_rougail.general.int_0"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['tests/dictionaries/24_7validators_variable_optional/dictionaries/rougail/00-base.yml']), '__internal_attribute': ParamValue("validators"), '__internal_variable': ParamValue("rougail.general.int"), '_.int': ParamSelfOption(whole=False)}))], properties=frozenset({"basic", "mandatory"}), informations={'type': 'number', 'test': (5,)}) +option_3 = IntOption(name="int", doc="a first number", validators=[Calculation(func['valid_with_jinja'], Params((), kwargs={'__internal_jinja': ParamValue("validators_rougail.general.int"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['../rougail-tests/structures/24_7validators_variable_optional/rougail/00-base.yml']), '__internal_attribute': ParamValue("validators"), '__internal_variable': ParamValue("rougail.general.int"), 'int2': ParamOption(option_4), '_.int': ParamSelfOption(whole=False)})), Calculation(func['valid_with_jinja'], Params((), kwargs={'__internal_jinja': ParamValue("validators_rougail.general.int_0"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['../rougail-tests/structures/24_7validators_variable_optional/rougail/00-base.yml']), '__internal_attribute': ParamValue("validators"), '__internal_variable': ParamValue("rougail.general.int"), '_.int': ParamSelfOption(whole=False)}))], properties=frozenset({"basic", "mandatory"}), informations={'type': 'number', 'test': (5,)}) optiondescription_2 = OptionDescription(name="general", doc="a family", children=[option_3, option_4], properties=frozenset({"basic"})) optiondescription_1 = OptionDescription(name="rougail", doc="Rougail", group_type=groups.namespace, children=[optiondescription_2], properties=frozenset({"basic"})) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_1]) diff --git a/tests/dictionaries/24_7validators_variable_optional/tiramisu/multi.py b/tests/dictionaries/24_7validators_variable_optional/tiramisu/multi.py index 9478ef2cf..94f3c8067 100644 --- a/tests/dictionaries/24_7validators_variable_optional/tiramisu/multi.py +++ b/tests/dictionaries/24_7validators_variable_optional/tiramisu/multi.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') try: groups.namespace except: @@ -15,12 +15,12 @@ dict_env['validators_1.rougail.general.int_0'] = "{% if int3 is defined and _.in dict_env['validators_2.rougail.general.int'] = "{% if _.int == int2 %}\nint and int2 must be different\n{% endif %}\n" dict_env['validators_2.rougail.general.int_0'] = "{% if int3 is defined and _.int == int3 %}\nint and int3 must be different\n{% endif %}\n" option_5 = IntOption(name="int2", doc="a second number", default=1, properties=frozenset({"mandatory", "standard"}), informations={'type': 'number'}) -option_4 = IntOption(name="int", doc="a first number", validators=[Calculation(func['valid_with_jinja'], Params((), kwargs={'__internal_jinja': ParamValue("validators_1.rougail.general.int"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['tests/dictionaries/24_7validators_variable_optional/dictionaries/rougail/00-base.yml']), '__internal_attribute': ParamValue("validators"), '__internal_variable': ParamValue("1.rougail.general.int"), 'int2': ParamOption(option_5), '_.int': ParamSelfOption(whole=False)})), Calculation(func['valid_with_jinja'], Params((), kwargs={'__internal_jinja': ParamValue("validators_1.rougail.general.int_0"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['tests/dictionaries/24_7validators_variable_optional/dictionaries/rougail/00-base.yml']), '__internal_attribute': ParamValue("validators"), '__internal_variable': ParamValue("1.rougail.general.int"), '_.int': ParamSelfOption(whole=False)}))], properties=frozenset({"basic", "mandatory"}), informations={'type': 'number', 'test': (5,)}) +option_4 = IntOption(name="int", doc="a first number", validators=[Calculation(func['valid_with_jinja'], Params((), kwargs={'__internal_jinja': ParamValue("validators_1.rougail.general.int"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['../rougail-tests/structures/24_7validators_variable_optional/rougail/00-base.yml']), '__internal_attribute': ParamValue("validators"), '__internal_variable': ParamValue("1.rougail.general.int"), 'int2': ParamOption(option_5), '_.int': ParamSelfOption(whole=False)})), Calculation(func['valid_with_jinja'], Params((), kwargs={'__internal_jinja': ParamValue("validators_1.rougail.general.int_0"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['../rougail-tests/structures/24_7validators_variable_optional/rougail/00-base.yml']), '__internal_attribute': ParamValue("validators"), '__internal_variable': ParamValue("1.rougail.general.int"), '_.int': ParamSelfOption(whole=False)}))], properties=frozenset({"basic", "mandatory"}), informations={'type': 'number', 'test': (5,)}) optiondescription_3 = OptionDescription(name="general", doc="a family", children=[option_4, option_5], properties=frozenset({"basic"})) optiondescription_2 = OptionDescription(name="rougail", doc="Rougail", group_type=groups.namespace, children=[optiondescription_3], properties=frozenset({"basic"})) optiondescription_1 = OptionDescription(name="1", doc="1", children=[optiondescription_2], properties=frozenset({"basic"})) option_10 = IntOption(name="int2", doc="a second number", default=1, properties=frozenset({"mandatory", "standard"}), informations={'type': 'number'}) -option_9 = IntOption(name="int", doc="a first number", validators=[Calculation(func['valid_with_jinja'], Params((), kwargs={'__internal_jinja': ParamValue("validators_2.rougail.general.int"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['tests/dictionaries/24_7validators_variable_optional/dictionaries/rougail/00-base.yml']), '__internal_attribute': ParamValue("validators"), '__internal_variable': ParamValue("2.rougail.general.int"), 'int2': ParamOption(option_10), '_.int': ParamSelfOption(whole=False)})), Calculation(func['valid_with_jinja'], Params((), kwargs={'__internal_jinja': ParamValue("validators_2.rougail.general.int_0"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['tests/dictionaries/24_7validators_variable_optional/dictionaries/rougail/00-base.yml']), '__internal_attribute': ParamValue("validators"), '__internal_variable': ParamValue("2.rougail.general.int"), '_.int': ParamSelfOption(whole=False)}))], properties=frozenset({"basic", "mandatory"}), informations={'type': 'number', 'test': (5,)}) +option_9 = IntOption(name="int", doc="a first number", validators=[Calculation(func['valid_with_jinja'], Params((), kwargs={'__internal_jinja': ParamValue("validators_2.rougail.general.int"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['../rougail-tests/structures/24_7validators_variable_optional/rougail/00-base.yml']), '__internal_attribute': ParamValue("validators"), '__internal_variable': ParamValue("2.rougail.general.int"), 'int2': ParamOption(option_10), '_.int': ParamSelfOption(whole=False)})), Calculation(func['valid_with_jinja'], Params((), kwargs={'__internal_jinja': ParamValue("validators_2.rougail.general.int_0"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['../rougail-tests/structures/24_7validators_variable_optional/rougail/00-base.yml']), '__internal_attribute': ParamValue("validators"), '__internal_variable': ParamValue("2.rougail.general.int"), '_.int': ParamSelfOption(whole=False)}))], properties=frozenset({"basic", "mandatory"}), informations={'type': 'number', 'test': (5,)}) optiondescription_8 = OptionDescription(name="general", doc="a family", children=[option_9, option_10], properties=frozenset({"basic"})) optiondescription_7 = OptionDescription(name="rougail", doc="Rougail", group_type=groups.namespace, children=[optiondescription_8], properties=frozenset({"basic"})) optiondescription_6 = OptionDescription(name="2", doc="2", children=[optiondescription_7], properties=frozenset({"basic"})) diff --git a/tests/dictionaries/24_7validators_variable_optional/tiramisu/no_namespace.py b/tests/dictionaries/24_7validators_variable_optional/tiramisu/no_namespace.py index 2c639958c..6db5f1b0f 100644 --- a/tests/dictionaries/24_7validators_variable_optional/tiramisu/no_namespace.py +++ b/tests/dictionaries/24_7validators_variable_optional/tiramisu/no_namespace.py @@ -2,13 +2,13 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") ALLOWED_LEADER_PROPERTIES.add("standard") ALLOWED_LEADER_PROPERTIES.add("advanced") dict_env['validators_general.int'] = "{% if _.int == int2 %}\nint and int2 must be different\n{% endif %}\n" dict_env['validators_general.int_0'] = "{% if int3 is defined and _.int == int3 %}\nint and int3 must be different\n{% endif %}\n" option_3 = IntOption(name="int2", doc="a second number", default=1, properties=frozenset({"mandatory", "standard"}), informations={'type': 'number'}) -option_2 = IntOption(name="int", doc="a first number", validators=[Calculation(func['valid_with_jinja'], Params((), kwargs={'__internal_jinja': ParamValue("validators_general.int"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['tests/dictionaries/24_7validators_variable_optional/dictionaries/rougail/00-base.yml']), '__internal_attribute': ParamValue("validators"), '__internal_variable': ParamValue("general.int"), 'int2': ParamOption(option_3), '_.int': ParamSelfOption(whole=False)})), Calculation(func['valid_with_jinja'], Params((), kwargs={'__internal_jinja': ParamValue("validators_general.int_0"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['tests/dictionaries/24_7validators_variable_optional/dictionaries/rougail/00-base.yml']), '__internal_attribute': ParamValue("validators"), '__internal_variable': ParamValue("general.int"), '_.int': ParamSelfOption(whole=False)}))], properties=frozenset({"basic", "mandatory"}), informations={'type': 'number', 'test': (5,)}) +option_2 = IntOption(name="int", doc="a first number", validators=[Calculation(func['valid_with_jinja'], Params((), kwargs={'__internal_jinja': ParamValue("validators_general.int"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['../rougail-tests/structures/24_7validators_variable_optional/rougail/00-base.yml']), '__internal_attribute': ParamValue("validators"), '__internal_variable': ParamValue("general.int"), 'int2': ParamOption(option_3), '_.int': ParamSelfOption(whole=False)})), Calculation(func['valid_with_jinja'], Params((), kwargs={'__internal_jinja': ParamValue("validators_general.int_0"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['../rougail-tests/structures/24_7validators_variable_optional/rougail/00-base.yml']), '__internal_attribute': ParamValue("validators"), '__internal_variable': ParamValue("general.int"), '_.int': ParamSelfOption(whole=False)}))], properties=frozenset({"basic", "mandatory"}), informations={'type': 'number', 'test': (5,)}) optiondescription_1 = OptionDescription(name="general", doc="a family", children=[option_2, option_3], properties=frozenset({"basic"})) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_1]) diff --git a/tests/dictionaries/24_family_disabled_var_hidden/dictionaries/rougail/00-base.yml b/tests/dictionaries/24_family_disabled_var_hidden/dictionaries/rougail/00-base.yml deleted file mode 100644 index d9f149c89..000000000 --- a/tests/dictionaries/24_family_disabled_var_hidden/dictionaries/rougail/00-base.yml +++ /dev/null @@ -1,12 +0,0 @@ ---- -version: 1.1 - -family: - disabled: true - - var1: true # A description - - var2: - description: A description - hidden: - variable: _.var1 diff --git a/tests/dictionaries/24_family_disabled_var_hidden/tiramisu/base.py b/tests/dictionaries/24_family_disabled_var_hidden/tiramisu/base.py index 0e9487a51..198937169 100644 --- a/tests/dictionaries/24_family_disabled_var_hidden/tiramisu/base.py +++ b/tests/dictionaries/24_family_disabled_var_hidden/tiramisu/base.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') try: groups.namespace except: diff --git a/tests/dictionaries/24_family_disabled_var_hidden/tiramisu/multi.py b/tests/dictionaries/24_family_disabled_var_hidden/tiramisu/multi.py index aec1f02b1..dcee9b4d7 100644 --- a/tests/dictionaries/24_family_disabled_var_hidden/tiramisu/multi.py +++ b/tests/dictionaries/24_family_disabled_var_hidden/tiramisu/multi.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') try: groups.namespace except: diff --git a/tests/dictionaries/24_family_disabled_var_hidden/tiramisu/no_namespace.py b/tests/dictionaries/24_family_disabled_var_hidden/tiramisu/no_namespace.py index bd08232de..1801f63c5 100644 --- a/tests/dictionaries/24_family_disabled_var_hidden/tiramisu/no_namespace.py +++ b/tests/dictionaries/24_family_disabled_var_hidden/tiramisu/no_namespace.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") ALLOWED_LEADER_PROPERTIES.add("standard") ALLOWED_LEADER_PROPERTIES.add("advanced") diff --git a/tests/dictionaries/40_0leadership/dictionaries/rougail/00-base.yml b/tests/dictionaries/40_0leadership/dictionaries/rougail/00-base.yml deleted file mode 100644 index f31311d89..000000000 --- a/tests/dictionaries/40_0leadership/dictionaries/rougail/00-base.yml +++ /dev/null @@ -1,8 +0,0 @@ ---- -version: '1.1' -leader: - description: a leadership - type: leadership - leader: # a leader - follower1: # a follower - follower2: # an other follower diff --git a/tests/dictionaries/40_0leadership/tiramisu/base.py b/tests/dictionaries/40_0leadership/tiramisu/base.py index 9e899f4f7..5452ffe12 100644 --- a/tests/dictionaries/40_0leadership/tiramisu/base.py +++ b/tests/dictionaries/40_0leadership/tiramisu/base.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') try: groups.namespace except: diff --git a/tests/dictionaries/40_0leadership/tiramisu/multi.py b/tests/dictionaries/40_0leadership/tiramisu/multi.py index 03deac3ff..c3bdcfb81 100644 --- a/tests/dictionaries/40_0leadership/tiramisu/multi.py +++ b/tests/dictionaries/40_0leadership/tiramisu/multi.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') try: groups.namespace except: diff --git a/tests/dictionaries/40_0leadership/tiramisu/no_namespace.py b/tests/dictionaries/40_0leadership/tiramisu/no_namespace.py index f1ffb96ff..2c3d5dab0 100644 --- a/tests/dictionaries/40_0leadership/tiramisu/no_namespace.py +++ b/tests/dictionaries/40_0leadership/tiramisu/no_namespace.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") ALLOWED_LEADER_PROPERTIES.add("standard") ALLOWED_LEADER_PROPERTIES.add("advanced") diff --git a/tests/dictionaries/40_0leadership_diff_name/dictionaries/rougail/00-base.yml b/tests/dictionaries/40_0leadership_diff_name/dictionaries/rougail/00-base.yml deleted file mode 100644 index 0ce22170e..000000000 --- a/tests/dictionaries/40_0leadership_diff_name/dictionaries/rougail/00-base.yml +++ /dev/null @@ -1,8 +0,0 @@ ---- -version: '1.1' -leadership: - description: a leadership - type: leadership - leader: [] # a leader - follower1: # a follower - follower2: # an other follower diff --git a/tests/dictionaries/40_0leadership_diff_name/tiramisu/base.py b/tests/dictionaries/40_0leadership_diff_name/tiramisu/base.py index 8e5c1f87e..d55068ebe 100644 --- a/tests/dictionaries/40_0leadership_diff_name/tiramisu/base.py +++ b/tests/dictionaries/40_0leadership_diff_name/tiramisu/base.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') try: groups.namespace except: diff --git a/tests/dictionaries/40_0leadership_diff_name/tiramisu/multi.py b/tests/dictionaries/40_0leadership_diff_name/tiramisu/multi.py index 6e0db7478..1f3debecd 100644 --- a/tests/dictionaries/40_0leadership_diff_name/tiramisu/multi.py +++ b/tests/dictionaries/40_0leadership_diff_name/tiramisu/multi.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') try: groups.namespace except: 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 cc91afca5..03c6e0749 100644 --- a/tests/dictionaries/40_0leadership_diff_name/tiramisu/no_namespace.py +++ b/tests/dictionaries/40_0leadership_diff_name/tiramisu/no_namespace.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") ALLOWED_LEADER_PROPERTIES.add("standard") ALLOWED_LEADER_PROPERTIES.add("advanced") diff --git a/tests/dictionaries/40_0leadership_empty/dictionaries/rougail/00-base.yml b/tests/dictionaries/40_0leadership_empty/dictionaries/rougail/00-base.yml deleted file mode 100644 index 550a20746..000000000 --- a/tests/dictionaries/40_0leadership_empty/dictionaries/rougail/00-base.yml +++ /dev/null @@ -1,4 +0,0 @@ ---- -version: '1.1' -empty_leader: - type: leadership diff --git a/tests/dictionaries/40_0leadership_empty/tiramisu/base.py b/tests/dictionaries/40_0leadership_empty/tiramisu/base.py index bb6ab55d2..d9e243d06 100644 --- a/tests/dictionaries/40_0leadership_empty/tiramisu/base.py +++ b/tests/dictionaries/40_0leadership_empty/tiramisu/base.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') try: groups.namespace except: diff --git a/tests/dictionaries/40_0leadership_empty/tiramisu/multi.py b/tests/dictionaries/40_0leadership_empty/tiramisu/multi.py index f8a40b84b..614668d43 100644 --- a/tests/dictionaries/40_0leadership_empty/tiramisu/multi.py +++ b/tests/dictionaries/40_0leadership_empty/tiramisu/multi.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') try: groups.namespace except: diff --git a/tests/dictionaries/40_0leadership_empty/tiramisu/no_namespace.py b/tests/dictionaries/40_0leadership_empty/tiramisu/no_namespace.py index 502023bc9..e4e37cbdb 100644 --- a/tests/dictionaries/40_0leadership_empty/tiramisu/no_namespace.py +++ b/tests/dictionaries/40_0leadership_empty/tiramisu/no_namespace.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") ALLOWED_LEADER_PROPERTIES.add("standard") ALLOWED_LEADER_PROPERTIES.add("advanced") 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 deleted file mode 100644 index e7bc667ff..000000000 --- a/tests/dictionaries/40_0leadership_follower_default_calculation/dictionaries/rougail/00-base.yml +++ /dev/null @@ -1,13 +0,0 @@ ---- -version: '1.1' -leader: - description: a leadership - type: leadership - leader: # a leader - follower1: value # a follower - follower2: - description: a second follower - default: - 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 47131ce9d..73d7cfee9 100644 --- a/tests/dictionaries/40_0leadership_follower_default_calculation/tiramisu/base.py +++ b/tests/dictionaries/40_0leadership_follower_default_calculation/tiramisu/base.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') try: groups.namespace except: @@ -13,7 +13,7 @@ ALLOWED_LEADER_PROPERTIES.add("advanced") dict_env['default_rougail.leader.follower2'] = "{{ _.follower1 }}\n" option_3 = StrOption(name="leader", doc="a leader", multi=True, properties=frozenset({"basic", "mandatory"}), informations={'type': 'string'}) option_4 = StrOption(name="follower1", doc="a follower", multi=True, default_multi="value", properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) -option_5 = StrOption(name="follower2", doc="a second follower", multi=True, default=Calculation(func['jinja_to_function'], Params((), kwargs={'__internal_jinja': ParamValue("default_rougail.leader.follower2"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['tests/dictionaries/40_0leadership_follower_default_calculation/dictionaries/rougail/00-base.yml']), '__internal_attribute': ParamValue("default"), '__internal_variable': ParamValue("rougail.leader.follower2"), '_.follower1': ParamOption(option_4, notraisepropertyerror=True)})), properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) +option_5 = StrOption(name="follower2", doc="a second follower", multi=True, default=Calculation(func['jinja_to_function'], Params((), kwargs={'__internal_jinja': ParamValue("default_rougail.leader.follower2"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['../rougail-tests/structures/40_0leadership_follower_default_calculation/rougail/00-base.yml']), '__internal_attribute': ParamValue("default"), '__internal_variable': ParamValue("rougail.leader.follower2"), '_.follower1': ParamOption(option_4, notraisepropertyerror=True)})), properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) optiondescription_2 = Leadership(name="leader", doc="a leadership", children=[option_3, option_4, option_5], properties=frozenset({"basic"})) optiondescription_1 = OptionDescription(name="rougail", doc="Rougail", group_type=groups.namespace, children=[optiondescription_2], properties=frozenset({"basic"})) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_1]) 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 3f38e4b26..40c7aed57 100644 --- a/tests/dictionaries/40_0leadership_follower_default_calculation/tiramisu/multi.py +++ b/tests/dictionaries/40_0leadership_follower_default_calculation/tiramisu/multi.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') try: groups.namespace except: @@ -14,13 +14,13 @@ dict_env['default_1.rougail.leader.follower2'] = "{{ _.follower1 }}\n" dict_env['default_2.rougail.leader.follower2'] = "{{ _.follower1 }}\n" option_4 = StrOption(name="leader", doc="a leader", multi=True, properties=frozenset({"basic", "mandatory"}), informations={'type': 'string'}) option_5 = StrOption(name="follower1", doc="a follower", multi=True, default_multi="value", properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) -option_6 = StrOption(name="follower2", doc="a second follower", multi=True, default=Calculation(func['jinja_to_function'], Params((), kwargs={'__internal_jinja': ParamValue("default_1.rougail.leader.follower2"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['tests/dictionaries/40_0leadership_follower_default_calculation/dictionaries/rougail/00-base.yml']), '__internal_attribute': ParamValue("default"), '__internal_variable': ParamValue("1.rougail.leader.follower2"), '_.follower1': ParamOption(option_5, notraisepropertyerror=True)})), properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) +option_6 = StrOption(name="follower2", doc="a second follower", multi=True, default=Calculation(func['jinja_to_function'], Params((), kwargs={'__internal_jinja': ParamValue("default_1.rougail.leader.follower2"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['../rougail-tests/structures/40_0leadership_follower_default_calculation/rougail/00-base.yml']), '__internal_attribute': ParamValue("default"), '__internal_variable': ParamValue("1.rougail.leader.follower2"), '_.follower1': ParamOption(option_5, notraisepropertyerror=True)})), properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) optiondescription_3 = Leadership(name="leader", doc="a leadership", children=[option_4, option_5, option_6], properties=frozenset({"basic"})) optiondescription_2 = OptionDescription(name="rougail", doc="Rougail", group_type=groups.namespace, children=[optiondescription_3], properties=frozenset({"basic"})) optiondescription_1 = OptionDescription(name="1", doc="1", children=[optiondescription_2], properties=frozenset({"basic"})) option_10 = StrOption(name="leader", doc="a leader", multi=True, properties=frozenset({"basic", "mandatory"}), informations={'type': 'string'}) option_11 = StrOption(name="follower1", doc="a follower", multi=True, default_multi="value", properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) -option_12 = StrOption(name="follower2", doc="a second follower", multi=True, default=Calculation(func['jinja_to_function'], Params((), kwargs={'__internal_jinja': ParamValue("default_2.rougail.leader.follower2"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['tests/dictionaries/40_0leadership_follower_default_calculation/dictionaries/rougail/00-base.yml']), '__internal_attribute': ParamValue("default"), '__internal_variable': ParamValue("2.rougail.leader.follower2"), '_.follower1': ParamOption(option_11, notraisepropertyerror=True)})), properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) +option_12 = StrOption(name="follower2", doc="a second follower", multi=True, default=Calculation(func['jinja_to_function'], Params((), kwargs={'__internal_jinja': ParamValue("default_2.rougail.leader.follower2"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['../rougail-tests/structures/40_0leadership_follower_default_calculation/rougail/00-base.yml']), '__internal_attribute': ParamValue("default"), '__internal_variable': ParamValue("2.rougail.leader.follower2"), '_.follower1': ParamOption(option_11, notraisepropertyerror=True)})), properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) optiondescription_9 = Leadership(name="leader", doc="a leadership", children=[option_10, option_11, option_12], properties=frozenset({"basic"})) optiondescription_8 = OptionDescription(name="rougail", doc="Rougail", group_type=groups.namespace, children=[optiondescription_9], properties=frozenset({"basic"})) optiondescription_7 = OptionDescription(name="2", doc="2", children=[optiondescription_8], properties=frozenset({"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 51a7bc15c..704c444ee 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 @@ -2,13 +2,13 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") ALLOWED_LEADER_PROPERTIES.add("standard") ALLOWED_LEADER_PROPERTIES.add("advanced") dict_env['default_leader.follower2'] = "{{ _.follower1 }}\n" option_2 = StrOption(name="leader", doc="a leader", multi=True, properties=frozenset({"basic", "mandatory"}), informations={'type': 'string'}) option_3 = StrOption(name="follower1", doc="a follower", multi=True, default_multi="value", properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) -option_4 = StrOption(name="follower2", doc="a second follower", multi=True, default=Calculation(func['jinja_to_function'], Params((), kwargs={'__internal_jinja': ParamValue("default_leader.follower2"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['tests/dictionaries/40_0leadership_follower_default_calculation/dictionaries/rougail/00-base.yml']), '__internal_attribute': ParamValue("default"), '__internal_variable': ParamValue("leader.follower2"), '_.follower1': ParamOption(option_3, notraisepropertyerror=True)})), properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) +option_4 = StrOption(name="follower2", doc="a second follower", multi=True, default=Calculation(func['jinja_to_function'], Params((), kwargs={'__internal_jinja': ParamValue("default_leader.follower2"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['../rougail-tests/structures/40_0leadership_follower_default_calculation/rougail/00-base.yml']), '__internal_attribute': ParamValue("default"), '__internal_variable': ParamValue("leader.follower2"), '_.follower1': ParamOption(option_3, notraisepropertyerror=True)})), properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) optiondescription_1 = Leadership(name="leader", doc="a leadership", 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/40_0leadership_follower_default_submulti/dictionaries/rougail/00-base.yml b/tests/dictionaries/40_0leadership_follower_default_submulti/dictionaries/rougail/00-base.yml deleted file mode 100644 index f0099503f..000000000 --- a/tests/dictionaries/40_0leadership_follower_default_submulti/dictionaries/rougail/00-base.yml +++ /dev/null @@ -1,12 +0,0 @@ ---- -version: '1.1' -leader: - description: a leadership - type: leadership - leader: # a leader - - leader - follower1: # a follower1 - - value - follower2: # a follower2 - - value1 - - value2 diff --git a/tests/dictionaries/40_0leadership_follower_default_submulti/force_namespace b/tests/dictionaries/40_0leadership_follower_default_submulti/force_namespace deleted file mode 100644 index e69de29bb..000000000 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 46aa04030..221dc1758 100644 --- a/tests/dictionaries/40_0leadership_follower_default_submulti/tiramisu/base.py +++ b/tests/dictionaries/40_0leadership_follower_default_submulti/tiramisu/base.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') try: groups.namespace except: 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 b2cd664ee..6a6b1b4a6 100644 --- a/tests/dictionaries/40_0leadership_follower_default_submulti/tiramisu/multi.py +++ b/tests/dictionaries/40_0leadership_follower_default_submulti/tiramisu/multi.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') try: groups.namespace except: 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 deleted file mode 100644 index 2d9a58093..000000000 --- a/tests/dictionaries/40_0leadership_follower_default_submulti_calculation/dictionaries/rougail/00-base.yml +++ /dev/null @@ -1,14 +0,0 @@ ---- -version: '1.1' -leader: - description: a leadership - type: leadership - leader: # the leader - - leader - follower1: # the follower1 - - value - follower2: - description: the follower2 - multi: true - default: - variable: _.follower1 diff --git a/tests/dictionaries/40_0leadership_follower_default_submulti_calculation/force_namespace b/tests/dictionaries/40_0leadership_follower_default_submulti_calculation/force_namespace deleted file mode 100644 index e69de29bb..000000000 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 5bf735c1e..91712cf40 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 @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') try: groups.namespace except: 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 ced34fcb4..2c7f037fa 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 @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') try: groups.namespace except: diff --git a/tests/dictionaries/40_0leadership_follower_default_value/dictionaries/rougail/00-base.yml b/tests/dictionaries/40_0leadership_follower_default_value/dictionaries/rougail/00-base.yml deleted file mode 100644 index 4c267a661..000000000 --- a/tests/dictionaries/40_0leadership_follower_default_value/dictionaries/rougail/00-base.yml +++ /dev/null @@ -1,10 +0,0 @@ ---- -version: '1.1' -leader: - description: a leadership - type: leadership - leader: - description: a leader - multi: true - mandatory: false - follower1: value # a follower with default value 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 709313bd1..ebf5ce147 100644 --- a/tests/dictionaries/40_0leadership_follower_default_value/tiramisu/base.py +++ b/tests/dictionaries/40_0leadership_follower_default_value/tiramisu/base.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') try: groups.namespace except: 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 5089651ee..3fdb987e8 100644 --- a/tests/dictionaries/40_0leadership_follower_default_value/tiramisu/multi.py +++ b/tests/dictionaries/40_0leadership_follower_default_value/tiramisu/multi.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') try: groups.namespace except: 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 68cd8f0b3..54d27429e 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 @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") ALLOWED_LEADER_PROPERTIES.add("standard") ALLOWED_LEADER_PROPERTIES.add("advanced") diff --git a/tests/dictionaries/40_0leadership_leader_not_multi/dictionaries/rougail/00-base.yml b/tests/dictionaries/40_0leadership_leader_not_multi/dictionaries/rougail/00-base.yml deleted file mode 100644 index c667a2ae5..000000000 --- a/tests/dictionaries/40_0leadership_leader_not_multi/dictionaries/rougail/00-base.yml +++ /dev/null @@ -1,19 +0,0 @@ -general: - mode_conteneur_actif: - type: string - description: No change - default: non -general1: - leader: - description: leader - type: leadership - leader: - type: string - description: leader - follower1: - type: string - description: follower1 - follower2: - type: string - description: follower2 -version: '1.0' diff --git a/tests/dictionaries/40_0leadership_leader_not_multi/tiramisu/base.py b/tests/dictionaries/40_0leadership_leader_not_multi/tiramisu/base.py index 5be360ea4..3c21af537 100644 --- a/tests/dictionaries/40_0leadership_leader_not_multi/tiramisu/base.py +++ b/tests/dictionaries/40_0leadership_leader_not_multi/tiramisu/base.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') try: groups.namespace except: diff --git a/tests/dictionaries/40_0leadership_leader_not_multi/tiramisu/multi.py b/tests/dictionaries/40_0leadership_leader_not_multi/tiramisu/multi.py index 95c82f7e8..88bcddaa9 100644 --- a/tests/dictionaries/40_0leadership_leader_not_multi/tiramisu/multi.py +++ b/tests/dictionaries/40_0leadership_leader_not_multi/tiramisu/multi.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') try: groups.namespace except: diff --git a/tests/dictionaries/40_0leadership_leader_not_multi/tiramisu/no_namespace.py b/tests/dictionaries/40_0leadership_leader_not_multi/tiramisu/no_namespace.py index 791e6583b..aea1da7f0 100644 --- a/tests/dictionaries/40_0leadership_leader_not_multi/tiramisu/no_namespace.py +++ b/tests/dictionaries/40_0leadership_leader_not_multi/tiramisu/no_namespace.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") ALLOWED_LEADER_PROPERTIES.add("standard") ALLOWED_LEADER_PROPERTIES.add("advanced") diff --git a/tests/dictionaries/40_1leadership_append_follower/dictionaries/rougail/00-base.yml b/tests/dictionaries/40_1leadership_append_follower/dictionaries/rougail/00-base.yml deleted file mode 100644 index 919145af5..000000000 --- a/tests/dictionaries/40_1leadership_append_follower/dictionaries/rougail/00-base.yml +++ /dev/null @@ -1,12 +0,0 @@ ---- -version: '1.1' -leader: - description: a leadership - type: leadership - leader: - description: the leader - multi: true - follower1: - description: the follower1 - follower2: - description: the follower2 diff --git a/tests/dictionaries/40_1leadership_append_follower/dictionaries/rougail/01-base.yml b/tests/dictionaries/40_1leadership_append_follower/dictionaries/rougail/01-base.yml deleted file mode 100644 index 55e010997..000000000 --- a/tests/dictionaries/40_1leadership_append_follower/dictionaries/rougail/01-base.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -version: '1.1' -leader: - follower3: - description: the follower3 diff --git a/tests/dictionaries/40_1leadership_append_follower/tiramisu/base.py b/tests/dictionaries/40_1leadership_append_follower/tiramisu/base.py index 20a5d34df..fb3a93734 100644 --- a/tests/dictionaries/40_1leadership_append_follower/tiramisu/base.py +++ b/tests/dictionaries/40_1leadership_append_follower/tiramisu/base.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') try: groups.namespace except: diff --git a/tests/dictionaries/40_1leadership_append_follower/tiramisu/multi.py b/tests/dictionaries/40_1leadership_append_follower/tiramisu/multi.py index 15a6ee5b4..472b93ee7 100644 --- a/tests/dictionaries/40_1leadership_append_follower/tiramisu/multi.py +++ b/tests/dictionaries/40_1leadership_append_follower/tiramisu/multi.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') try: groups.namespace except: 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 82ef5d9c1..55f3e6cbf 100644 --- a/tests/dictionaries/40_1leadership_append_follower/tiramisu/no_namespace.py +++ b/tests/dictionaries/40_1leadership_append_follower/tiramisu/no_namespace.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") ALLOWED_LEADER_PROPERTIES.add("standard") ALLOWED_LEADER_PROPERTIES.add("advanced") diff --git a/tests/dictionaries/40_2leadership_calculation_index/dictionaries/rougail/00-base.yml b/tests/dictionaries/40_2leadership_calculation_index/dictionaries/rougail/00-base.yml deleted file mode 100644 index 17989d181..000000000 --- a/tests/dictionaries/40_2leadership_calculation_index/dictionaries/rougail/00-base.yml +++ /dev/null @@ -1,14 +0,0 @@ ---- -version: '1.1' -leader: - description: a leadership - type: leadership - leader: # a leader - - a - - b - - c - follower1: - description: a follower - type: number - default: - type: index diff --git a/tests/dictionaries/40_2leadership_calculation_index/force_namespace b/tests/dictionaries/40_2leadership_calculation_index/force_namespace deleted file mode 100644 index e69de29bb..000000000 diff --git a/tests/dictionaries/40_2leadership_calculation_index/tiramisu/base.py b/tests/dictionaries/40_2leadership_calculation_index/tiramisu/base.py index fa0ea96e6..cd195058f 100644 --- a/tests/dictionaries/40_2leadership_calculation_index/tiramisu/base.py +++ b/tests/dictionaries/40_2leadership_calculation_index/tiramisu/base.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') try: groups.namespace except: diff --git a/tests/dictionaries/40_2leadership_calculation_index/tiramisu/multi.py b/tests/dictionaries/40_2leadership_calculation_index/tiramisu/multi.py index 4391a8891..c099381f2 100644 --- a/tests/dictionaries/40_2leadership_calculation_index/tiramisu/multi.py +++ b/tests/dictionaries/40_2leadership_calculation_index/tiramisu/multi.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') try: groups.namespace except: 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 deleted file mode 100644 index 2a63e4059..000000000 --- a/tests/dictionaries/40_2leadership_calculation_param_index/dictionaries/rougail/00-base.yml +++ /dev/null @@ -1,18 +0,0 @@ ---- -version: '1.1' -leader: - description: leadership - type: leadership - leader: # a leader - - a - - b - - c - follower1: - description: a follower - type: number - default: - jinja: '{{ index }}' - params: - index: - type: index - description: returns index diff --git a/tests/dictionaries/40_2leadership_calculation_param_index/force_namespace b/tests/dictionaries/40_2leadership_calculation_param_index/force_namespace deleted file mode 100644 index e69de29bb..000000000 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 e91a9ea6d..36ce2eb7c 100644 --- a/tests/dictionaries/40_2leadership_calculation_param_index/tiramisu/base.py +++ b/tests/dictionaries/40_2leadership_calculation_param_index/tiramisu/base.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') try: groups.namespace except: @@ -12,7 +12,7 @@ ALLOWED_LEADER_PROPERTIES.add("standard") ALLOWED_LEADER_PROPERTIES.add("advanced") dict_env['default_rougail.leader.follower1'] = "{{ index }}" option_3 = StrOption(name="leader", doc="a leader", multi=True, default=["a", "b", "c"], properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) -option_4 = IntOption(name="follower1", doc="a follower", multi=True, default=Calculation(func['jinja_to_function'], Params((), kwargs={'__internal_jinja': ParamValue("default_rougail.leader.follower1"), '__internal_type': ParamValue("number"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['tests/dictionaries/40_2leadership_calculation_param_index/dictionaries/rougail/00-base.yml']), '__internal_attribute': ParamValue("default"), '__internal_variable': ParamValue("rougail.leader.follower1"), 'index': ParamIndex()})), properties=frozenset({"mandatory", "standard"}), informations={'type': 'number'}) +option_4 = IntOption(name="follower1", doc="a follower", multi=True, default=Calculation(func['jinja_to_function'], Params((), kwargs={'__internal_jinja': ParamValue("default_rougail.leader.follower1"), '__internal_type': ParamValue("number"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['../rougail-tests/structures/40_2leadership_calculation_param_index/rougail/00-base.yml']), '__internal_attribute': ParamValue("default"), '__internal_variable': ParamValue("rougail.leader.follower1"), 'index': ParamIndex()})), properties=frozenset({"mandatory", "standard"}), informations={'type': 'number'}) optiondescription_2 = Leadership(name="leader", doc="leadership", children=[option_3, option_4], properties=frozenset({"standard"})) optiondescription_1 = OptionDescription(name="rougail", doc="Rougail", group_type=groups.namespace, children=[optiondescription_2], properties=frozenset({"standard"})) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_1]) 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 c70caef71..8a3c8b239 100644 --- a/tests/dictionaries/40_2leadership_calculation_param_index/tiramisu/multi.py +++ b/tests/dictionaries/40_2leadership_calculation_param_index/tiramisu/multi.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') try: groups.namespace except: @@ -13,12 +13,12 @@ ALLOWED_LEADER_PROPERTIES.add("advanced") dict_env['default_1.rougail.leader.follower1'] = "{{ index }}" dict_env['default_2.rougail.leader.follower1'] = "{{ index }}" option_4 = StrOption(name="leader", doc="a leader", multi=True, default=["a", "b", "c"], properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) -option_5 = IntOption(name="follower1", doc="a follower", multi=True, default=Calculation(func['jinja_to_function'], Params((), kwargs={'__internal_jinja': ParamValue("default_1.rougail.leader.follower1"), '__internal_type': ParamValue("number"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['tests/dictionaries/40_2leadership_calculation_param_index/dictionaries/rougail/00-base.yml']), '__internal_attribute': ParamValue("default"), '__internal_variable': ParamValue("1.rougail.leader.follower1"), 'index': ParamIndex()})), properties=frozenset({"mandatory", "standard"}), informations={'type': 'number'}) +option_5 = IntOption(name="follower1", doc="a follower", multi=True, default=Calculation(func['jinja_to_function'], Params((), kwargs={'__internal_jinja': ParamValue("default_1.rougail.leader.follower1"), '__internal_type': ParamValue("number"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['../rougail-tests/structures/40_2leadership_calculation_param_index/rougail/00-base.yml']), '__internal_attribute': ParamValue("default"), '__internal_variable': ParamValue("1.rougail.leader.follower1"), 'index': ParamIndex()})), properties=frozenset({"mandatory", "standard"}), informations={'type': 'number'}) optiondescription_3 = Leadership(name="leader", doc="leadership", children=[option_4, option_5], properties=frozenset({"standard"})) optiondescription_2 = OptionDescription(name="rougail", doc="Rougail", group_type=groups.namespace, children=[optiondescription_3], properties=frozenset({"standard"})) optiondescription_1 = OptionDescription(name="1", doc="1", children=[optiondescription_2], properties=frozenset({"standard"})) option_9 = StrOption(name="leader", doc="a leader", multi=True, default=["a", "b", "c"], properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) -option_10 = IntOption(name="follower1", doc="a follower", multi=True, default=Calculation(func['jinja_to_function'], Params((), kwargs={'__internal_jinja': ParamValue("default_2.rougail.leader.follower1"), '__internal_type': ParamValue("number"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['tests/dictionaries/40_2leadership_calculation_param_index/dictionaries/rougail/00-base.yml']), '__internal_attribute': ParamValue("default"), '__internal_variable': ParamValue("2.rougail.leader.follower1"), 'index': ParamIndex()})), properties=frozenset({"mandatory", "standard"}), informations={'type': 'number'}) +option_10 = IntOption(name="follower1", doc="a follower", multi=True, default=Calculation(func['jinja_to_function'], Params((), kwargs={'__internal_jinja': ParamValue("default_2.rougail.leader.follower1"), '__internal_type': ParamValue("number"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['../rougail-tests/structures/40_2leadership_calculation_param_index/rougail/00-base.yml']), '__internal_attribute': ParamValue("default"), '__internal_variable': ParamValue("2.rougail.leader.follower1"), 'index': ParamIndex()})), properties=frozenset({"mandatory", "standard"}), informations={'type': 'number'}) optiondescription_8 = Leadership(name="leader", doc="leadership", children=[option_9, option_10], properties=frozenset({"standard"})) optiondescription_7 = OptionDescription(name="rougail", doc="Rougail", group_type=groups.namespace, children=[optiondescription_8], properties=frozenset({"standard"})) optiondescription_6 = OptionDescription(name="2", doc="2", children=[optiondescription_7], properties=frozenset({"standard"})) 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 deleted file mode 100644 index a8fb9e533..000000000 --- a/tests/dictionaries/40_2leadership_leader_calculation/dictionaries/rougail/00-base.yml +++ /dev/null @@ -1,19 +0,0 @@ ---- -version: '1.1' - -leader: - description: a leadership - type: leadership - - leader: - description: a leader - multi: true - default: - jinja: | - val1 - val2 - description: returns val1 and val2 - - follower1: # a first follower - - follower2: # a second follower diff --git a/tests/dictionaries/40_2leadership_leader_calculation/force_namespace b/tests/dictionaries/40_2leadership_leader_calculation/force_namespace deleted file mode 100644 index e69de29bb..000000000 diff --git a/tests/dictionaries/40_2leadership_leader_calculation/tiramisu/base.py b/tests/dictionaries/40_2leadership_leader_calculation/tiramisu/base.py index 0f8f98602..fa8b07bc0 100644 --- a/tests/dictionaries/40_2leadership_leader_calculation/tiramisu/base.py +++ b/tests/dictionaries/40_2leadership_leader_calculation/tiramisu/base.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') try: groups.namespace except: @@ -11,7 +11,7 @@ ALLOWED_LEADER_PROPERTIES.add("basic") ALLOWED_LEADER_PROPERTIES.add("standard") ALLOWED_LEADER_PROPERTIES.add("advanced") dict_env['default_rougail.leader.leader'] = "val1\nval2\n" -option_3 = StrOption(name="leader", doc="a leader", multi=True, default=Calculation(func['jinja_to_function'], Params((), kwargs={'__internal_jinja': ParamValue("default_rougail.leader.leader"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(True), '__internal_files': ParamValue(['tests/dictionaries/40_2leadership_leader_calculation/dictionaries/rougail/00-base.yml']), '__internal_attribute': ParamValue("default"), '__internal_variable': ParamValue("rougail.leader.leader")})), properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) +option_3 = StrOption(name="leader", doc="a leader", multi=True, default=Calculation(func['jinja_to_function'], Params((), kwargs={'__internal_jinja': ParamValue("default_rougail.leader.leader"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(True), '__internal_files': ParamValue(['../rougail-tests/structures/40_2leadership_leader_calculation/rougail/00-base.yml']), '__internal_attribute': ParamValue("default"), '__internal_variable': ParamValue("rougail.leader.leader")})), properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) option_4 = StrOption(name="follower1", doc="a first follower", multi=True, properties=frozenset({"basic", "mandatory"}), informations={'type': 'string'}) option_5 = StrOption(name="follower2", doc="a second follower", multi=True, properties=frozenset({"basic", "mandatory"}), informations={'type': 'string'}) optiondescription_2 = Leadership(name="leader", doc="a leadership", children=[option_3, option_4, option_5], properties=frozenset({"basic"})) diff --git a/tests/dictionaries/40_2leadership_leader_calculation/tiramisu/multi.py b/tests/dictionaries/40_2leadership_leader_calculation/tiramisu/multi.py index 9565fd1d6..b4897ebd2 100644 --- a/tests/dictionaries/40_2leadership_leader_calculation/tiramisu/multi.py +++ b/tests/dictionaries/40_2leadership_leader_calculation/tiramisu/multi.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') try: groups.namespace except: @@ -12,13 +12,13 @@ ALLOWED_LEADER_PROPERTIES.add("standard") ALLOWED_LEADER_PROPERTIES.add("advanced") dict_env['default_1.rougail.leader.leader'] = "val1\nval2\n" dict_env['default_2.rougail.leader.leader'] = "val1\nval2\n" -option_4 = StrOption(name="leader", doc="a leader", multi=True, default=Calculation(func['jinja_to_function'], Params((), kwargs={'__internal_jinja': ParamValue("default_1.rougail.leader.leader"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(True), '__internal_files': ParamValue(['tests/dictionaries/40_2leadership_leader_calculation/dictionaries/rougail/00-base.yml']), '__internal_attribute': ParamValue("default"), '__internal_variable': ParamValue("1.rougail.leader.leader")})), properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) +option_4 = StrOption(name="leader", doc="a leader", multi=True, default=Calculation(func['jinja_to_function'], Params((), kwargs={'__internal_jinja': ParamValue("default_1.rougail.leader.leader"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(True), '__internal_files': ParamValue(['../rougail-tests/structures/40_2leadership_leader_calculation/rougail/00-base.yml']), '__internal_attribute': ParamValue("default"), '__internal_variable': ParamValue("1.rougail.leader.leader")})), properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) option_5 = StrOption(name="follower1", doc="a first follower", multi=True, properties=frozenset({"basic", "mandatory"}), informations={'type': 'string'}) option_6 = StrOption(name="follower2", doc="a second follower", multi=True, properties=frozenset({"basic", "mandatory"}), informations={'type': 'string'}) optiondescription_3 = Leadership(name="leader", doc="a leadership", children=[option_4, option_5, option_6], properties=frozenset({"basic"})) optiondescription_2 = OptionDescription(name="rougail", doc="Rougail", group_type=groups.namespace, children=[optiondescription_3], properties=frozenset({"basic"})) optiondescription_1 = OptionDescription(name="1", doc="1", children=[optiondescription_2], properties=frozenset({"basic"})) -option_10 = StrOption(name="leader", doc="a leader", multi=True, default=Calculation(func['jinja_to_function'], Params((), kwargs={'__internal_jinja': ParamValue("default_2.rougail.leader.leader"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(True), '__internal_files': ParamValue(['tests/dictionaries/40_2leadership_leader_calculation/dictionaries/rougail/00-base.yml']), '__internal_attribute': ParamValue("default"), '__internal_variable': ParamValue("2.rougail.leader.leader")})), properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) +option_10 = StrOption(name="leader", doc="a leader", multi=True, default=Calculation(func['jinja_to_function'], Params((), kwargs={'__internal_jinja': ParamValue("default_2.rougail.leader.leader"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(True), '__internal_files': ParamValue(['../rougail-tests/structures/40_2leadership_leader_calculation/rougail/00-base.yml']), '__internal_attribute': ParamValue("default"), '__internal_variable': ParamValue("2.rougail.leader.leader")})), properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) option_11 = StrOption(name="follower1", doc="a first follower", multi=True, properties=frozenset({"basic", "mandatory"}), informations={'type': 'string'}) option_12 = StrOption(name="follower2", doc="a second follower", multi=True, properties=frozenset({"basic", "mandatory"}), informations={'type': 'string'}) optiondescription_9 = Leadership(name="leader", doc="a leadership", children=[option_10, option_11, option_12], properties=frozenset({"basic"})) diff --git a/tests/dictionaries/40_6leadership_follower_multi/dictionaries/rougail/00-base.yml b/tests/dictionaries/40_6leadership_follower_multi/dictionaries/rougail/00-base.yml deleted file mode 100644 index 7bac09d76..000000000 --- a/tests/dictionaries/40_6leadership_follower_multi/dictionaries/rougail/00-base.yml +++ /dev/null @@ -1,16 +0,0 @@ ---- -version: '1.0' -leadership: - description: A leadership - type: leadership - leader: - description: The leader - multi: true - follower1: - description: The first follower - multi: true - follower2: - description: The second follower - multi: true - default: - - 'value' diff --git a/tests/dictionaries/40_6leadership_follower_multi/tiramisu/base.py b/tests/dictionaries/40_6leadership_follower_multi/tiramisu/base.py index ceb9e9dc5..287c22f59 100644 --- a/tests/dictionaries/40_6leadership_follower_multi/tiramisu/base.py +++ b/tests/dictionaries/40_6leadership_follower_multi/tiramisu/base.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') try: groups.namespace except: diff --git a/tests/dictionaries/40_6leadership_follower_multi/tiramisu/multi.py b/tests/dictionaries/40_6leadership_follower_multi/tiramisu/multi.py index f101f5c28..8c160e926 100644 --- a/tests/dictionaries/40_6leadership_follower_multi/tiramisu/multi.py +++ b/tests/dictionaries/40_6leadership_follower_multi/tiramisu/multi.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') try: groups.namespace except: 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 6f4ce6a7a..d1a281dcb 100644 --- a/tests/dictionaries/40_6leadership_follower_multi/tiramisu/no_namespace.py +++ b/tests/dictionaries/40_6leadership_follower_multi/tiramisu/no_namespace.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") ALLOWED_LEADER_PROPERTIES.add("standard") ALLOWED_LEADER_PROPERTIES.add("advanced") diff --git a/tests/dictionaries/40_8calculation_boolean/dictionaries/rougail/00-base.yml b/tests/dictionaries/40_8calculation_boolean/dictionaries/rougail/00-base.yml deleted file mode 100644 index f09a9564f..000000000 --- a/tests/dictionaries/40_8calculation_boolean/dictionaries/rougail/00-base.yml +++ /dev/null @@ -1,29 +0,0 @@ ---- -version: '1.1' -bool: false # a boolean variable -multi1: - description: a first multi variable - type: boolean - multi: true - default: - jinja: | - {% if _.bool %} - True - False - {% else %} - False - {% endif %} - description: a calculation -multi2: - description: a second multi variable - type: boolean - multi: true - default: - jinja: | - {% if not _.bool %} - True - False - {% else %} - False - {% endif %} - description: a calculation diff --git a/tests/dictionaries/40_8calculation_boolean/tiramisu/base.py b/tests/dictionaries/40_8calculation_boolean/tiramisu/base.py index 2119af852..72d764c60 100644 --- a/tests/dictionaries/40_8calculation_boolean/tiramisu/base.py +++ b/tests/dictionaries/40_8calculation_boolean/tiramisu/base.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') try: groups.namespace except: @@ -13,7 +13,7 @@ ALLOWED_LEADER_PROPERTIES.add("advanced") dict_env['default_rougail.multi1'] = "{% if _.bool %}\nTrue\nFalse\n{% else %}\nFalse\n{% endif %}\n" dict_env['default_rougail.multi2'] = "{% if not _.bool %}\nTrue\nFalse\n{% else %}\nFalse\n{% endif %}\n" option_2 = BoolOption(name="bool", doc="a boolean variable", default=False, properties=frozenset({"mandatory", "standard"}), informations={'type': 'boolean'}) -option_3 = BoolOption(name="multi1", doc="a first multi variable", multi=True, default=Calculation(func['jinja_to_function'], Params((), kwargs={'__internal_jinja': ParamValue("default_rougail.multi1"), '__internal_type': ParamValue("boolean"), '__internal_multi': ParamValue(True), '__internal_files': ParamValue(['tests/dictionaries/40_8calculation_boolean/dictionaries/rougail/00-base.yml']), '__internal_attribute': ParamValue("default"), '__internal_variable': ParamValue("rougail.multi1"), '_.bool': ParamOption(option_2, notraisepropertyerror=True)})), properties=frozenset({"mandatory", "standard"}), informations={'type': 'boolean'}) -option_4 = BoolOption(name="multi2", doc="a second multi variable", multi=True, default=Calculation(func['jinja_to_function'], Params((), kwargs={'__internal_jinja': ParamValue("default_rougail.multi2"), '__internal_type': ParamValue("boolean"), '__internal_multi': ParamValue(True), '__internal_files': ParamValue(['tests/dictionaries/40_8calculation_boolean/dictionaries/rougail/00-base.yml']), '__internal_attribute': ParamValue("default"), '__internal_variable': ParamValue("rougail.multi2"), '_.bool': ParamOption(option_2, notraisepropertyerror=True)})), properties=frozenset({"mandatory", "standard"}), informations={'type': 'boolean'}) +option_3 = BoolOption(name="multi1", doc="a first multi variable", multi=True, default=Calculation(func['jinja_to_function'], Params((), kwargs={'__internal_jinja': ParamValue("default_rougail.multi1"), '__internal_type': ParamValue("boolean"), '__internal_multi': ParamValue(True), '__internal_files': ParamValue(['../rougail-tests/structures/40_8calculation_boolean/rougail/00-base.yml']), '__internal_attribute': ParamValue("default"), '__internal_variable': ParamValue("rougail.multi1"), '_.bool': ParamOption(option_2, notraisepropertyerror=True)})), properties=frozenset({"mandatory", "standard"}), informations={'type': 'boolean'}) +option_4 = BoolOption(name="multi2", doc="a second multi variable", multi=True, default=Calculation(func['jinja_to_function'], Params((), kwargs={'__internal_jinja': ParamValue("default_rougail.multi2"), '__internal_type': ParamValue("boolean"), '__internal_multi': ParamValue(True), '__internal_files': ParamValue(['../rougail-tests/structures/40_8calculation_boolean/rougail/00-base.yml']), '__internal_attribute': ParamValue("default"), '__internal_variable': ParamValue("rougail.multi2"), '_.bool': ParamOption(option_2, notraisepropertyerror=True)})), properties=frozenset({"mandatory", "standard"}), informations={'type': 'boolean'}) optiondescription_1 = OptionDescription(name="rougail", doc="Rougail", group_type=groups.namespace, children=[option_2, option_3, option_4], properties=frozenset({"standard"})) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_1]) diff --git a/tests/dictionaries/40_8calculation_boolean/tiramisu/multi.py b/tests/dictionaries/40_8calculation_boolean/tiramisu/multi.py index 06056d3ee..83ab19b01 100644 --- a/tests/dictionaries/40_8calculation_boolean/tiramisu/multi.py +++ b/tests/dictionaries/40_8calculation_boolean/tiramisu/multi.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') try: groups.namespace except: @@ -15,13 +15,13 @@ dict_env['default_1.rougail.multi2'] = "{% if not _.bool %}\nTrue\nFalse\n{% els dict_env['default_2.rougail.multi1'] = "{% if _.bool %}\nTrue\nFalse\n{% else %}\nFalse\n{% endif %}\n" dict_env['default_2.rougail.multi2'] = "{% if not _.bool %}\nTrue\nFalse\n{% else %}\nFalse\n{% endif %}\n" option_3 = BoolOption(name="bool", doc="a boolean variable", default=False, properties=frozenset({"mandatory", "standard"}), informations={'type': 'boolean'}) -option_4 = BoolOption(name="multi1", doc="a first multi variable", multi=True, default=Calculation(func['jinja_to_function'], Params((), kwargs={'__internal_jinja': ParamValue("default_1.rougail.multi1"), '__internal_type': ParamValue("boolean"), '__internal_multi': ParamValue(True), '__internal_files': ParamValue(['tests/dictionaries/40_8calculation_boolean/dictionaries/rougail/00-base.yml']), '__internal_attribute': ParamValue("default"), '__internal_variable': ParamValue("1.rougail.multi1"), '_.bool': ParamOption(option_3, notraisepropertyerror=True)})), properties=frozenset({"mandatory", "standard"}), informations={'type': 'boolean'}) -option_5 = BoolOption(name="multi2", doc="a second multi variable", multi=True, default=Calculation(func['jinja_to_function'], Params((), kwargs={'__internal_jinja': ParamValue("default_1.rougail.multi2"), '__internal_type': ParamValue("boolean"), '__internal_multi': ParamValue(True), '__internal_files': ParamValue(['tests/dictionaries/40_8calculation_boolean/dictionaries/rougail/00-base.yml']), '__internal_attribute': ParamValue("default"), '__internal_variable': ParamValue("1.rougail.multi2"), '_.bool': ParamOption(option_3, notraisepropertyerror=True)})), properties=frozenset({"mandatory", "standard"}), informations={'type': 'boolean'}) +option_4 = BoolOption(name="multi1", doc="a first multi variable", multi=True, default=Calculation(func['jinja_to_function'], Params((), kwargs={'__internal_jinja': ParamValue("default_1.rougail.multi1"), '__internal_type': ParamValue("boolean"), '__internal_multi': ParamValue(True), '__internal_files': ParamValue(['../rougail-tests/structures/40_8calculation_boolean/rougail/00-base.yml']), '__internal_attribute': ParamValue("default"), '__internal_variable': ParamValue("1.rougail.multi1"), '_.bool': ParamOption(option_3, notraisepropertyerror=True)})), properties=frozenset({"mandatory", "standard"}), informations={'type': 'boolean'}) +option_5 = BoolOption(name="multi2", doc="a second multi variable", multi=True, default=Calculation(func['jinja_to_function'], Params((), kwargs={'__internal_jinja': ParamValue("default_1.rougail.multi2"), '__internal_type': ParamValue("boolean"), '__internal_multi': ParamValue(True), '__internal_files': ParamValue(['../rougail-tests/structures/40_8calculation_boolean/rougail/00-base.yml']), '__internal_attribute': ParamValue("default"), '__internal_variable': ParamValue("1.rougail.multi2"), '_.bool': ParamOption(option_3, notraisepropertyerror=True)})), properties=frozenset({"mandatory", "standard"}), informations={'type': 'boolean'}) optiondescription_2 = OptionDescription(name="rougail", doc="Rougail", group_type=groups.namespace, children=[option_3, option_4, option_5], properties=frozenset({"standard"})) optiondescription_1 = OptionDescription(name="1", doc="1", children=[optiondescription_2], properties=frozenset({"standard"})) option_8 = BoolOption(name="bool", doc="a boolean variable", default=False, properties=frozenset({"mandatory", "standard"}), informations={'type': 'boolean'}) -option_9 = BoolOption(name="multi1", doc="a first multi variable", multi=True, default=Calculation(func['jinja_to_function'], Params((), kwargs={'__internal_jinja': ParamValue("default_2.rougail.multi1"), '__internal_type': ParamValue("boolean"), '__internal_multi': ParamValue(True), '__internal_files': ParamValue(['tests/dictionaries/40_8calculation_boolean/dictionaries/rougail/00-base.yml']), '__internal_attribute': ParamValue("default"), '__internal_variable': ParamValue("2.rougail.multi1"), '_.bool': ParamOption(option_8, notraisepropertyerror=True)})), properties=frozenset({"mandatory", "standard"}), informations={'type': 'boolean'}) -option_10 = BoolOption(name="multi2", doc="a second multi variable", multi=True, default=Calculation(func['jinja_to_function'], Params((), kwargs={'__internal_jinja': ParamValue("default_2.rougail.multi2"), '__internal_type': ParamValue("boolean"), '__internal_multi': ParamValue(True), '__internal_files': ParamValue(['tests/dictionaries/40_8calculation_boolean/dictionaries/rougail/00-base.yml']), '__internal_attribute': ParamValue("default"), '__internal_variable': ParamValue("2.rougail.multi2"), '_.bool': ParamOption(option_8, notraisepropertyerror=True)})), properties=frozenset({"mandatory", "standard"}), informations={'type': 'boolean'}) +option_9 = BoolOption(name="multi1", doc="a first multi variable", multi=True, default=Calculation(func['jinja_to_function'], Params((), kwargs={'__internal_jinja': ParamValue("default_2.rougail.multi1"), '__internal_type': ParamValue("boolean"), '__internal_multi': ParamValue(True), '__internal_files': ParamValue(['../rougail-tests/structures/40_8calculation_boolean/rougail/00-base.yml']), '__internal_attribute': ParamValue("default"), '__internal_variable': ParamValue("2.rougail.multi1"), '_.bool': ParamOption(option_8, notraisepropertyerror=True)})), properties=frozenset({"mandatory", "standard"}), informations={'type': 'boolean'}) +option_10 = BoolOption(name="multi2", doc="a second multi variable", multi=True, default=Calculation(func['jinja_to_function'], Params((), kwargs={'__internal_jinja': ParamValue("default_2.rougail.multi2"), '__internal_type': ParamValue("boolean"), '__internal_multi': ParamValue(True), '__internal_files': ParamValue(['../rougail-tests/structures/40_8calculation_boolean/rougail/00-base.yml']), '__internal_attribute': ParamValue("default"), '__internal_variable': ParamValue("2.rougail.multi2"), '_.bool': ParamOption(option_8, notraisepropertyerror=True)})), properties=frozenset({"mandatory", "standard"}), informations={'type': 'boolean'}) optiondescription_7 = OptionDescription(name="rougail", doc="Rougail", group_type=groups.namespace, children=[option_8, option_9, option_10], properties=frozenset({"standard"})) optiondescription_6 = OptionDescription(name="2", doc="2", children=[optiondescription_7], properties=frozenset({"standard"})) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_1, optiondescription_6]) diff --git a/tests/dictionaries/40_8calculation_boolean/tiramisu/no_namespace.py b/tests/dictionaries/40_8calculation_boolean/tiramisu/no_namespace.py index 22d501372..ed73b9eca 100644 --- a/tests/dictionaries/40_8calculation_boolean/tiramisu/no_namespace.py +++ b/tests/dictionaries/40_8calculation_boolean/tiramisu/no_namespace.py @@ -2,13 +2,13 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") ALLOWED_LEADER_PROPERTIES.add("standard") ALLOWED_LEADER_PROPERTIES.add("advanced") dict_env['default_multi1'] = "{% if _.bool %}\nTrue\nFalse\n{% else %}\nFalse\n{% endif %}\n" dict_env['default_multi2'] = "{% if not _.bool %}\nTrue\nFalse\n{% else %}\nFalse\n{% endif %}\n" option_1 = BoolOption(name="bool", doc="a boolean variable", default=False, properties=frozenset({"mandatory", "standard"}), informations={'type': 'boolean'}) -option_2 = BoolOption(name="multi1", doc="a first multi variable", multi=True, default=Calculation(func['jinja_to_function'], Params((), kwargs={'__internal_jinja': ParamValue("default_multi1"), '__internal_type': ParamValue("boolean"), '__internal_multi': ParamValue(True), '__internal_files': ParamValue(['tests/dictionaries/40_8calculation_boolean/dictionaries/rougail/00-base.yml']), '__internal_attribute': ParamValue("default"), '__internal_variable': ParamValue("multi1"), '_.bool': ParamOption(option_1, notraisepropertyerror=True)})), properties=frozenset({"mandatory", "standard"}), informations={'type': 'boolean'}) -option_3 = BoolOption(name="multi2", doc="a second multi variable", multi=True, default=Calculation(func['jinja_to_function'], Params((), kwargs={'__internal_jinja': ParamValue("default_multi2"), '__internal_type': ParamValue("boolean"), '__internal_multi': ParamValue(True), '__internal_files': ParamValue(['tests/dictionaries/40_8calculation_boolean/dictionaries/rougail/00-base.yml']), '__internal_attribute': ParamValue("default"), '__internal_variable': ParamValue("multi2"), '_.bool': ParamOption(option_1, notraisepropertyerror=True)})), properties=frozenset({"mandatory", "standard"}), informations={'type': 'boolean'}) +option_2 = BoolOption(name="multi1", doc="a first multi variable", multi=True, default=Calculation(func['jinja_to_function'], Params((), kwargs={'__internal_jinja': ParamValue("default_multi1"), '__internal_type': ParamValue("boolean"), '__internal_multi': ParamValue(True), '__internal_files': ParamValue(['../rougail-tests/structures/40_8calculation_boolean/rougail/00-base.yml']), '__internal_attribute': ParamValue("default"), '__internal_variable': ParamValue("multi1"), '_.bool': ParamOption(option_1, notraisepropertyerror=True)})), properties=frozenset({"mandatory", "standard"}), informations={'type': 'boolean'}) +option_3 = BoolOption(name="multi2", doc="a second multi variable", multi=True, default=Calculation(func['jinja_to_function'], Params((), kwargs={'__internal_jinja': ParamValue("default_multi2"), '__internal_type': ParamValue("boolean"), '__internal_multi': ParamValue(True), '__internal_files': ParamValue(['../rougail-tests/structures/40_8calculation_boolean/rougail/00-base.yml']), '__internal_attribute': ParamValue("default"), '__internal_variable': ParamValue("multi2"), '_.bool': ParamOption(option_1, notraisepropertyerror=True)})), properties=frozenset({"mandatory", "standard"}), informations={'type': 'boolean'}) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1, option_2, option_3]) 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 deleted file mode 100644 index fafc141bf..000000000 --- a/tests/dictionaries/40_8calculation_boolean_return_none/dictionaries/rougail/00-base.yml +++ /dev/null @@ -1,12 +0,0 @@ ---- -version: '1.1' -var1: 'yes' # a first variable -var2: - description: a second variable - type: boolean - default: - jinja: | - {% if rougail.var1 == 'no' %} - false - {% endif %} - description: return false if the value of var1 is "no" diff --git a/tests/dictionaries/40_8calculation_boolean_return_none/force_namespace b/tests/dictionaries/40_8calculation_boolean_return_none/force_namespace deleted file mode 100644 index e69de29bb..000000000 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 46691226c..1e26271d7 100644 --- a/tests/dictionaries/40_8calculation_boolean_return_none/tiramisu/base.py +++ b/tests/dictionaries/40_8calculation_boolean_return_none/tiramisu/base.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') try: groups.namespace except: @@ -12,6 +12,6 @@ ALLOWED_LEADER_PROPERTIES.add("standard") ALLOWED_LEADER_PROPERTIES.add("advanced") dict_env['default_rougail.var2'] = "{% if rougail.var1 == 'no' %}\nfalse\n{% endif %}\n" option_2 = StrOption(name="var1", doc="a first variable", default="yes", properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) -option_3 = BoolOption(name="var2", doc="a second variable", default=Calculation(func['jinja_to_function'], Params((), kwargs={'__internal_jinja': ParamValue("default_rougail.var2"), '__internal_type': ParamValue("boolean"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['tests/dictionaries/40_8calculation_boolean_return_none/dictionaries/rougail/00-base.yml']), '__internal_attribute': ParamValue("default"), '__internal_variable': ParamValue("rougail.var2"), 'rougail.var1': ParamOption(option_2, notraisepropertyerror=True)})), properties=frozenset({"mandatory", "standard"}), informations={'type': 'boolean'}) +option_3 = BoolOption(name="var2", doc="a second variable", default=Calculation(func['jinja_to_function'], Params((), kwargs={'__internal_jinja': ParamValue("default_rougail.var2"), '__internal_type': ParamValue("boolean"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['../rougail-tests/structures/40_8calculation_boolean_return_none/rougail/00-base.yml']), '__internal_attribute': ParamValue("default"), '__internal_variable': ParamValue("rougail.var2"), 'rougail.var1': ParamOption(option_2, notraisepropertyerror=True)})), properties=frozenset({"mandatory", "standard"}), informations={'type': 'boolean'}) optiondescription_1 = OptionDescription(name="rougail", doc="Rougail", group_type=groups.namespace, children=[option_2, option_3], properties=frozenset({"standard"})) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_1]) 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 fded51c18..94022c06e 100644 --- a/tests/dictionaries/40_8calculation_boolean_return_none/tiramisu/multi.py +++ b/tests/dictionaries/40_8calculation_boolean_return_none/tiramisu/multi.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') try: groups.namespace except: @@ -13,11 +13,11 @@ ALLOWED_LEADER_PROPERTIES.add("advanced") dict_env['default_1.rougail.var2'] = "{% if rougail.var1 == 'no' %}\nfalse\n{% endif %}\n" dict_env['default_2.rougail.var2'] = "{% if rougail.var1 == 'no' %}\nfalse\n{% endif %}\n" option_3 = StrOption(name="var1", doc="a first variable", default="yes", properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) -option_4 = BoolOption(name="var2", doc="a second variable", default=Calculation(func['jinja_to_function'], Params((), kwargs={'__internal_jinja': ParamValue("default_1.rougail.var2"), '__internal_type': ParamValue("boolean"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['tests/dictionaries/40_8calculation_boolean_return_none/dictionaries/rougail/00-base.yml']), '__internal_attribute': ParamValue("default"), '__internal_variable': ParamValue("1.rougail.var2"), 'rougail.var1': ParamOption(option_3, notraisepropertyerror=True)})), properties=frozenset({"mandatory", "standard"}), informations={'type': 'boolean'}) +option_4 = BoolOption(name="var2", doc="a second variable", default=Calculation(func['jinja_to_function'], Params((), kwargs={'__internal_jinja': ParamValue("default_1.rougail.var2"), '__internal_type': ParamValue("boolean"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['../rougail-tests/structures/40_8calculation_boolean_return_none/rougail/00-base.yml']), '__internal_attribute': ParamValue("default"), '__internal_variable': ParamValue("1.rougail.var2"), 'rougail.var1': ParamOption(option_3, notraisepropertyerror=True)})), properties=frozenset({"mandatory", "standard"}), informations={'type': 'boolean'}) optiondescription_2 = OptionDescription(name="rougail", doc="Rougail", group_type=groups.namespace, 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="var1", doc="a first variable", default="yes", properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) -option_8 = BoolOption(name="var2", doc="a second variable", default=Calculation(func['jinja_to_function'], Params((), kwargs={'__internal_jinja': ParamValue("default_2.rougail.var2"), '__internal_type': ParamValue("boolean"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['tests/dictionaries/40_8calculation_boolean_return_none/dictionaries/rougail/00-base.yml']), '__internal_attribute': ParamValue("default"), '__internal_variable': ParamValue("2.rougail.var2"), 'rougail.var1': ParamOption(option_7, notraisepropertyerror=True)})), properties=frozenset({"mandatory", "standard"}), informations={'type': 'boolean'}) +option_8 = BoolOption(name="var2", doc="a second variable", default=Calculation(func['jinja_to_function'], Params((), kwargs={'__internal_jinja': ParamValue("default_2.rougail.var2"), '__internal_type': ParamValue("boolean"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['../rougail-tests/structures/40_8calculation_boolean_return_none/rougail/00-base.yml']), '__internal_attribute': ParamValue("default"), '__internal_variable': ParamValue("2.rougail.var2"), 'rougail.var1': ParamOption(option_7, notraisepropertyerror=True)})), properties=frozenset({"mandatory", "standard"}), informations={'type': 'boolean'}) optiondescription_6 = OptionDescription(name="rougail", doc="Rougail", group_type=groups.namespace, 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/40_8calculation_integer/dictionaries/rougail/00-base.yml b/tests/dictionaries/40_8calculation_integer/dictionaries/rougail/00-base.yml deleted file mode 100644 index f51c098ef..000000000 --- a/tests/dictionaries/40_8calculation_integer/dictionaries/rougail/00-base.yml +++ /dev/null @@ -1,17 +0,0 @@ ---- -version: '1.1' -bool: false # a boolean variable -int1: - description: first integer variable - type: number - default: - jinja: | - {% if rougail.bool %}1{% else %}2{% endif %} - description: if bool returns 1 otherwise return 2 -int2: - description: second integer variable - type: number - default: - 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/force_namespace b/tests/dictionaries/40_8calculation_integer/force_namespace deleted file mode 100644 index e69de29bb..000000000 diff --git a/tests/dictionaries/40_8calculation_integer/tiramisu/base.py b/tests/dictionaries/40_8calculation_integer/tiramisu/base.py index 136291bd3..6f5d7a909 100644 --- a/tests/dictionaries/40_8calculation_integer/tiramisu/base.py +++ b/tests/dictionaries/40_8calculation_integer/tiramisu/base.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') try: groups.namespace except: @@ -13,7 +13,7 @@ ALLOWED_LEADER_PROPERTIES.add("advanced") dict_env['default_rougail.int1'] = "{% if rougail.bool %}1{% else %}2{% endif %}\n" dict_env['default_rougail.int2'] = "{% if not rougail.bool %}3{% else %}4{% endif %}\n" option_2 = BoolOption(name="bool", doc="a boolean variable", default=False, properties=frozenset({"mandatory", "standard"}), informations={'type': 'boolean'}) -option_3 = IntOption(name="int1", doc="first integer variable", default=Calculation(func['jinja_to_function'], Params((), kwargs={'__internal_jinja': ParamValue("default_rougail.int1"), '__internal_type': ParamValue("number"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['tests/dictionaries/40_8calculation_integer/dictionaries/rougail/00-base.yml']), '__internal_attribute': ParamValue("default"), '__internal_variable': ParamValue("rougail.int1"), 'rougail.bool': ParamOption(option_2, notraisepropertyerror=True)})), properties=frozenset({"mandatory", "standard"}), informations={'type': 'number'}) -option_4 = IntOption(name="int2", doc="second integer variable", default=Calculation(func['jinja_to_function'], Params((), kwargs={'__internal_jinja': ParamValue("default_rougail.int2"), '__internal_type': ParamValue("number"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['tests/dictionaries/40_8calculation_integer/dictionaries/rougail/00-base.yml']), '__internal_attribute': ParamValue("default"), '__internal_variable': ParamValue("rougail.int2"), 'rougail.bool': ParamOption(option_2, notraisepropertyerror=True)})), properties=frozenset({"mandatory", "standard"}), informations={'type': 'number'}) +option_3 = IntOption(name="int1", doc="first integer variable", default=Calculation(func['jinja_to_function'], Params((), kwargs={'__internal_jinja': ParamValue("default_rougail.int1"), '__internal_type': ParamValue("number"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['../rougail-tests/structures/40_8calculation_integer/rougail/00-base.yml']), '__internal_attribute': ParamValue("default"), '__internal_variable': ParamValue("rougail.int1"), 'rougail.bool': ParamOption(option_2, notraisepropertyerror=True)})), properties=frozenset({"mandatory", "standard"}), informations={'type': 'number'}) +option_4 = IntOption(name="int2", doc="second integer variable", default=Calculation(func['jinja_to_function'], Params((), kwargs={'__internal_jinja': ParamValue("default_rougail.int2"), '__internal_type': ParamValue("number"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['../rougail-tests/structures/40_8calculation_integer/rougail/00-base.yml']), '__internal_attribute': ParamValue("default"), '__internal_variable': ParamValue("rougail.int2"), 'rougail.bool': ParamOption(option_2, notraisepropertyerror=True)})), properties=frozenset({"mandatory", "standard"}), informations={'type': 'number'}) optiondescription_1 = OptionDescription(name="rougail", doc="Rougail", group_type=groups.namespace, children=[option_2, option_3, option_4], properties=frozenset({"standard"})) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_1]) diff --git a/tests/dictionaries/40_8calculation_integer/tiramisu/multi.py b/tests/dictionaries/40_8calculation_integer/tiramisu/multi.py index 3a8f7de78..41309c368 100644 --- a/tests/dictionaries/40_8calculation_integer/tiramisu/multi.py +++ b/tests/dictionaries/40_8calculation_integer/tiramisu/multi.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') try: groups.namespace except: @@ -15,13 +15,13 @@ dict_env['default_1.rougail.int2'] = "{% if not rougail.bool %}3{% else %}4{% en dict_env['default_2.rougail.int1'] = "{% if rougail.bool %}1{% else %}2{% endif %}\n" dict_env['default_2.rougail.int2'] = "{% if not rougail.bool %}3{% else %}4{% endif %}\n" option_3 = BoolOption(name="bool", doc="a boolean variable", default=False, properties=frozenset({"mandatory", "standard"}), informations={'type': 'boolean'}) -option_4 = IntOption(name="int1", doc="first integer variable", default=Calculation(func['jinja_to_function'], Params((), kwargs={'__internal_jinja': ParamValue("default_1.rougail.int1"), '__internal_type': ParamValue("number"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['tests/dictionaries/40_8calculation_integer/dictionaries/rougail/00-base.yml']), '__internal_attribute': ParamValue("default"), '__internal_variable': ParamValue("1.rougail.int1"), 'rougail.bool': ParamOption(option_3, notraisepropertyerror=True)})), properties=frozenset({"mandatory", "standard"}), informations={'type': 'number'}) -option_5 = IntOption(name="int2", doc="second integer variable", default=Calculation(func['jinja_to_function'], Params((), kwargs={'__internal_jinja': ParamValue("default_1.rougail.int2"), '__internal_type': ParamValue("number"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['tests/dictionaries/40_8calculation_integer/dictionaries/rougail/00-base.yml']), '__internal_attribute': ParamValue("default"), '__internal_variable': ParamValue("1.rougail.int2"), 'rougail.bool': ParamOption(option_3, notraisepropertyerror=True)})), properties=frozenset({"mandatory", "standard"}), informations={'type': 'number'}) +option_4 = IntOption(name="int1", doc="first integer variable", default=Calculation(func['jinja_to_function'], Params((), kwargs={'__internal_jinja': ParamValue("default_1.rougail.int1"), '__internal_type': ParamValue("number"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['../rougail-tests/structures/40_8calculation_integer/rougail/00-base.yml']), '__internal_attribute': ParamValue("default"), '__internal_variable': ParamValue("1.rougail.int1"), 'rougail.bool': ParamOption(option_3, notraisepropertyerror=True)})), properties=frozenset({"mandatory", "standard"}), informations={'type': 'number'}) +option_5 = IntOption(name="int2", doc="second integer variable", default=Calculation(func['jinja_to_function'], Params((), kwargs={'__internal_jinja': ParamValue("default_1.rougail.int2"), '__internal_type': ParamValue("number"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['../rougail-tests/structures/40_8calculation_integer/rougail/00-base.yml']), '__internal_attribute': ParamValue("default"), '__internal_variable': ParamValue("1.rougail.int2"), 'rougail.bool': ParamOption(option_3, notraisepropertyerror=True)})), properties=frozenset({"mandatory", "standard"}), informations={'type': 'number'}) optiondescription_2 = OptionDescription(name="rougail", doc="Rougail", group_type=groups.namespace, children=[option_3, option_4, option_5], properties=frozenset({"standard"})) optiondescription_1 = OptionDescription(name="1", doc="1", children=[optiondescription_2], properties=frozenset({"standard"})) option_8 = BoolOption(name="bool", doc="a boolean variable", default=False, properties=frozenset({"mandatory", "standard"}), informations={'type': 'boolean'}) -option_9 = IntOption(name="int1", doc="first integer variable", default=Calculation(func['jinja_to_function'], Params((), kwargs={'__internal_jinja': ParamValue("default_2.rougail.int1"), '__internal_type': ParamValue("number"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['tests/dictionaries/40_8calculation_integer/dictionaries/rougail/00-base.yml']), '__internal_attribute': ParamValue("default"), '__internal_variable': ParamValue("2.rougail.int1"), 'rougail.bool': ParamOption(option_8, notraisepropertyerror=True)})), properties=frozenset({"mandatory", "standard"}), informations={'type': 'number'}) -option_10 = IntOption(name="int2", doc="second integer variable", default=Calculation(func['jinja_to_function'], Params((), kwargs={'__internal_jinja': ParamValue("default_2.rougail.int2"), '__internal_type': ParamValue("number"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['tests/dictionaries/40_8calculation_integer/dictionaries/rougail/00-base.yml']), '__internal_attribute': ParamValue("default"), '__internal_variable': ParamValue("2.rougail.int2"), 'rougail.bool': ParamOption(option_8, notraisepropertyerror=True)})), properties=frozenset({"mandatory", "standard"}), informations={'type': 'number'}) +option_9 = IntOption(name="int1", doc="first integer variable", default=Calculation(func['jinja_to_function'], Params((), kwargs={'__internal_jinja': ParamValue("default_2.rougail.int1"), '__internal_type': ParamValue("number"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['../rougail-tests/structures/40_8calculation_integer/rougail/00-base.yml']), '__internal_attribute': ParamValue("default"), '__internal_variable': ParamValue("2.rougail.int1"), 'rougail.bool': ParamOption(option_8, notraisepropertyerror=True)})), properties=frozenset({"mandatory", "standard"}), informations={'type': 'number'}) +option_10 = IntOption(name="int2", doc="second integer variable", default=Calculation(func['jinja_to_function'], Params((), kwargs={'__internal_jinja': ParamValue("default_2.rougail.int2"), '__internal_type': ParamValue("number"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['../rougail-tests/structures/40_8calculation_integer/rougail/00-base.yml']), '__internal_attribute': ParamValue("default"), '__internal_variable': ParamValue("2.rougail.int2"), 'rougail.bool': ParamOption(option_8, notraisepropertyerror=True)})), properties=frozenset({"mandatory", "standard"}), informations={'type': 'number'}) optiondescription_7 = OptionDescription(name="rougail", doc="Rougail", group_type=groups.namespace, children=[option_8, option_9, option_10], properties=frozenset({"standard"})) optiondescription_6 = OptionDescription(name="2", doc="2", children=[optiondescription_7], properties=frozenset({"standard"})) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_1, optiondescription_6]) 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 deleted file mode 100644 index aa2a2ae21..000000000 --- a/tests/dictionaries/40_8calculation_multi_variable/dictionaries/rougail/00-base.yml +++ /dev/null @@ -1,9 +0,0 @@ ---- -version: '1.1' -var: - description: a first variable - default: - - 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 78dfebc2b..8e25e8df0 100644 --- a/tests/dictionaries/40_8calculation_multi_variable/tiramisu/base.py +++ b/tests/dictionaries/40_8calculation_multi_variable/tiramisu/base.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') try: groups.namespace except: diff --git a/tests/dictionaries/40_8calculation_multi_variable/tiramisu/multi.py b/tests/dictionaries/40_8calculation_multi_variable/tiramisu/multi.py index 6ac43d666..daedb4f5e 100644 --- a/tests/dictionaries/40_8calculation_multi_variable/tiramisu/multi.py +++ b/tests/dictionaries/40_8calculation_multi_variable/tiramisu/multi.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') try: groups.namespace except: 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 200b6ec08..78de98035 100644 --- a/tests/dictionaries/40_8calculation_multi_variable/tiramisu/no_namespace.py +++ b/tests/dictionaries/40_8calculation_multi_variable/tiramisu/no_namespace.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") ALLOWED_LEADER_PROPERTIES.add("standard") ALLOWED_LEADER_PROPERTIES.add("advanced") 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 deleted file mode 100644 index 9ecfde9a3..000000000 --- a/tests/dictionaries/40_8calculation_multi_variable_parent/dictionaries/rougail/00-base.yml +++ /dev/null @@ -1,8 +0,0 @@ ---- -version: '1.1' -var: "no" # a variable -fam1: # a family - var: - description: a calculated variable - default: - 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 073a5b16b..27a58ade1 100644 --- a/tests/dictionaries/40_8calculation_multi_variable_parent/tiramisu/base.py +++ b/tests/dictionaries/40_8calculation_multi_variable_parent/tiramisu/base.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') try: groups.namespace except: 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 e3baeca7c..d81ff9b1e 100644 --- a/tests/dictionaries/40_8calculation_multi_variable_parent/tiramisu/multi.py +++ b/tests/dictionaries/40_8calculation_multi_variable_parent/tiramisu/multi.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') try: groups.namespace except: 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 4995e8177..b9083eecd 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 @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") ALLOWED_LEADER_PROPERTIES.add("standard") ALLOWED_LEADER_PROPERTIES.add("advanced") 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 deleted file mode 100644 index e890f42b4..000000000 --- a/tests/dictionaries/40_8calculation_multi_variable_parent2/dictionaries/rougail/00-base.yml +++ /dev/null @@ -1,9 +0,0 @@ ---- -version: '1.1' -fam1: # first family - var: "no" # a variable -fam2: # second family - var: - description: a varaible - default: - 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 79621373d..54a445145 100644 --- a/tests/dictionaries/40_8calculation_multi_variable_parent2/tiramisu/base.py +++ b/tests/dictionaries/40_8calculation_multi_variable_parent2/tiramisu/base.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') try: groups.namespace except: 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 c3e3a961f..ede64da7b 100644 --- a/tests/dictionaries/40_8calculation_multi_variable_parent2/tiramisu/multi.py +++ b/tests/dictionaries/40_8calculation_multi_variable_parent2/tiramisu/multi.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') try: groups.namespace except: 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 793fa6a47..b493cb1a6 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 @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") ALLOWED_LEADER_PROPERTIES.add("standard") ALLOWED_LEADER_PROPERTIES.add("advanced") diff --git a/tests/dictionaries/41_0choice_leader/dictionaries/rougail/00-base.yml b/tests/dictionaries/41_0choice_leader/dictionaries/rougail/00-base.yml deleted file mode 100644 index 26b5e3c19..000000000 --- a/tests/dictionaries/41_0choice_leader/dictionaries/rougail/00-base.yml +++ /dev/null @@ -1,16 +0,0 @@ ---- -version: '1.0' -leader: - description: The leadership - type: leadership - leader: - description: The leader - multi: true - mandatory: false - follower1: - type: choice - description: A follower - choices: - - a - - b - - c diff --git a/tests/dictionaries/41_0choice_leader/tiramisu/base.py b/tests/dictionaries/41_0choice_leader/tiramisu/base.py index 21aba90ab..636f0b453 100644 --- a/tests/dictionaries/41_0choice_leader/tiramisu/base.py +++ b/tests/dictionaries/41_0choice_leader/tiramisu/base.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') try: groups.namespace except: diff --git a/tests/dictionaries/41_0choice_leader/tiramisu/multi.py b/tests/dictionaries/41_0choice_leader/tiramisu/multi.py index 97da21961..4160ea7cb 100644 --- a/tests/dictionaries/41_0choice_leader/tiramisu/multi.py +++ b/tests/dictionaries/41_0choice_leader/tiramisu/multi.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') try: groups.namespace except: diff --git a/tests/dictionaries/41_0choice_leader/tiramisu/no_namespace.py b/tests/dictionaries/41_0choice_leader/tiramisu/no_namespace.py index 03e43cbce..bd7761abe 100644 --- a/tests/dictionaries/41_0choice_leader/tiramisu/no_namespace.py +++ b/tests/dictionaries/41_0choice_leader/tiramisu/no_namespace.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") ALLOWED_LEADER_PROPERTIES.add("standard") ALLOWED_LEADER_PROPERTIES.add("advanced") diff --git a/tests/dictionaries/44_0leadership_hidden/dictionaries/rougail/00-base.yml b/tests/dictionaries/44_0leadership_hidden/dictionaries/rougail/00-base.yml deleted file mode 100644 index f870bca4d..000000000 --- a/tests/dictionaries/44_0leadership_hidden/dictionaries/rougail/00-base.yml +++ /dev/null @@ -1,15 +0,0 @@ ---- -version: '1.1' - -leader: - description: a leadership - hidden: true - type: leadership - - leader: - description: a leader - mandatory: false - - follower: - description: a follower - mandatory: false diff --git a/tests/dictionaries/44_0leadership_hidden/tiramisu/base.py b/tests/dictionaries/44_0leadership_hidden/tiramisu/base.py index a6b3dad44..4665af25f 100644 --- a/tests/dictionaries/44_0leadership_hidden/tiramisu/base.py +++ b/tests/dictionaries/44_0leadership_hidden/tiramisu/base.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') try: groups.namespace except: diff --git a/tests/dictionaries/44_0leadership_hidden/tiramisu/multi.py b/tests/dictionaries/44_0leadership_hidden/tiramisu/multi.py index 02cb66c33..6ff36f7e4 100644 --- a/tests/dictionaries/44_0leadership_hidden/tiramisu/multi.py +++ b/tests/dictionaries/44_0leadership_hidden/tiramisu/multi.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') try: groups.namespace except: diff --git a/tests/dictionaries/44_0leadership_hidden/tiramisu/no_namespace.py b/tests/dictionaries/44_0leadership_hidden/tiramisu/no_namespace.py index 16b5df2c6..6326cc6e1 100644 --- a/tests/dictionaries/44_0leadership_hidden/tiramisu/no_namespace.py +++ b/tests/dictionaries/44_0leadership_hidden/tiramisu/no_namespace.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") ALLOWED_LEADER_PROPERTIES.add("standard") ALLOWED_LEADER_PROPERTIES.add("advanced") diff --git a/tests/dictionaries/44_0leadership_leader_hidden/dictionaries/rougail/00-base.yml b/tests/dictionaries/44_0leadership_leader_hidden/dictionaries/rougail/00-base.yml deleted file mode 100644 index fe0e282d4..000000000 --- a/tests/dictionaries/44_0leadership_leader_hidden/dictionaries/rougail/00-base.yml +++ /dev/null @@ -1,15 +0,0 @@ -version: '1.1' - -leader: - description: a leadership - type: leadership - - leader: - description: a leader - multi: true - hidden: true - mandatory: false - - follower: - description: a follower - mandatory: false diff --git a/tests/dictionaries/44_0leadership_leader_hidden/tiramisu/base.py b/tests/dictionaries/44_0leadership_leader_hidden/tiramisu/base.py index a6b3dad44..4665af25f 100644 --- a/tests/dictionaries/44_0leadership_leader_hidden/tiramisu/base.py +++ b/tests/dictionaries/44_0leadership_leader_hidden/tiramisu/base.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') try: groups.namespace except: diff --git a/tests/dictionaries/44_0leadership_leader_hidden/tiramisu/multi.py b/tests/dictionaries/44_0leadership_leader_hidden/tiramisu/multi.py index 02cb66c33..6ff36f7e4 100644 --- a/tests/dictionaries/44_0leadership_leader_hidden/tiramisu/multi.py +++ b/tests/dictionaries/44_0leadership_leader_hidden/tiramisu/multi.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') try: groups.namespace except: 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 16b5df2c6..6326cc6e1 100644 --- a/tests/dictionaries/44_0leadership_leader_hidden/tiramisu/no_namespace.py +++ b/tests/dictionaries/44_0leadership_leader_hidden/tiramisu/no_namespace.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") ALLOWED_LEADER_PROPERTIES.add("standard") ALLOWED_LEADER_PROPERTIES.add("advanced") diff --git a/tests/dictionaries/44_1leadership_append_hidden_follower/dictionaries/rougail/00-base.yml b/tests/dictionaries/44_1leadership_append_hidden_follower/dictionaries/rougail/00-base.yml deleted file mode 100644 index 061771727..000000000 --- a/tests/dictionaries/44_1leadership_append_hidden_follower/dictionaries/rougail/00-base.yml +++ /dev/null @@ -1,16 +0,0 @@ ---- -version: '1.1' -leader: - description: a leadership - type: leadership - leader: - description: a leader - multi: true - hidden: true - mandatory: false - follower1: - description: the follower1 - mandatory: false - follower2: - description: the follower2 - mandatory: false diff --git a/tests/dictionaries/44_1leadership_append_hidden_follower/dictionaries/rougail/01-base.yml b/tests/dictionaries/44_1leadership_append_hidden_follower/dictionaries/rougail/01-base.yml deleted file mode 100644 index b9bdef37f..000000000 --- a/tests/dictionaries/44_1leadership_append_hidden_follower/dictionaries/rougail/01-base.yml +++ /dev/null @@ -1,6 +0,0 @@ ---- -version: '1.1' -leader: - follower3: - description: follower3 - mandatory: false 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 01cee501f..16dc6be3e 100644 --- a/tests/dictionaries/44_1leadership_append_hidden_follower/tiramisu/base.py +++ b/tests/dictionaries/44_1leadership_append_hidden_follower/tiramisu/base.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') try: groups.namespace except: 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 c5722d306..05ca3c194 100644 --- a/tests/dictionaries/44_1leadership_append_hidden_follower/tiramisu/multi.py +++ b/tests/dictionaries/44_1leadership_append_hidden_follower/tiramisu/multi.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') try: groups.namespace except: 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 eabaddf7b..ef1913b9d 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 @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") ALLOWED_LEADER_PROPERTIES.add("standard") ALLOWED_LEADER_PROPERTIES.add("advanced") 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 deleted file mode 100644 index 745c34e28..000000000 --- a/tests/dictionaries/44_4disabled_calcultion_follower/dictionaries/rougail/00-base.yml +++ /dev/null @@ -1,18 +0,0 @@ ---- -version: '1.1' -condition: true # a condition -leader: - description: a leadership - type: leadership - leader: - description: aleader - default: - - a - follower: - description: a follower - disabled: - jinja: | - {% if rougail.condition == "yes" %} - condition is yes - {% endif %} - description: if condition is yes diff --git a/tests/dictionaries/44_4disabled_calcultion_follower/force_namespace b/tests/dictionaries/44_4disabled_calcultion_follower/force_namespace deleted file mode 100644 index e69de29bb..000000000 diff --git a/tests/dictionaries/44_4disabled_calcultion_follower/tiramisu/base.py b/tests/dictionaries/44_4disabled_calcultion_follower/tiramisu/base.py index a5bd7232d..6c78f8249 100644 --- a/tests/dictionaries/44_4disabled_calcultion_follower/tiramisu/base.py +++ b/tests/dictionaries/44_4disabled_calcultion_follower/tiramisu/base.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') try: groups.namespace except: @@ -13,7 +13,7 @@ ALLOWED_LEADER_PROPERTIES.add("advanced") dict_env['disabled_rougail.leader.follower'] = "{% if rougail.condition == \"yes\" %}\ncondition is yes\n{% endif %}\n" option_2 = BoolOption(name="condition", doc="a condition", default=True, properties=frozenset({"mandatory", "standard"}), informations={'type': 'boolean'}) option_4 = StrOption(name="leader", doc="aleader", multi=True, default=["a"], properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) -option_5 = StrOption(name="follower", doc="a follower", multi=True, properties=frozenset({"basic", "mandatory", Calculation(func['jinja_to_property'], Params((ParamValue("disabled")), kwargs={'__internal_jinja': ParamValue("disabled_rougail.leader.follower"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['tests/dictionaries/44_4disabled_calcultion_follower/dictionaries/rougail/00-base.yml']), '__internal_attribute': ParamValue("disabled"), '__internal_variable': ParamValue("rougail.leader.follower"), 'when': ParamValue(True), 'inverse': ParamValue(False), 'rougail.condition': ParamOption(option_2, notraisepropertyerror=True)}), help_function=func['jinja_to_property_help'])}), informations={'type': 'string'}) +option_5 = StrOption(name="follower", doc="a follower", multi=True, properties=frozenset({"basic", "mandatory", Calculation(func['jinja_to_property'], Params((ParamValue("disabled")), kwargs={'__internal_jinja': ParamValue("disabled_rougail.leader.follower"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['../rougail-tests/structures/44_4disabled_calcultion_follower/rougail/00-base.yml']), '__internal_attribute': ParamValue("disabled"), '__internal_variable': ParamValue("rougail.leader.follower"), 'when': ParamValue(True), 'inverse': ParamValue(False), 'rougail.condition': ParamOption(option_2, notraisepropertyerror=True)}), help_function=func['jinja_to_property_help'])}), informations={'type': 'string'}) optiondescription_3 = Leadership(name="leader", doc="a leadership", children=[option_4, option_5], properties=frozenset({"basic"})) optiondescription_1 = OptionDescription(name="rougail", doc="Rougail", group_type=groups.namespace, children=[option_2, optiondescription_3], properties=frozenset({"basic"})) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_1]) diff --git a/tests/dictionaries/44_4disabled_calcultion_follower/tiramisu/multi.py b/tests/dictionaries/44_4disabled_calcultion_follower/tiramisu/multi.py index 051d34f27..cd63752ac 100644 --- a/tests/dictionaries/44_4disabled_calcultion_follower/tiramisu/multi.py +++ b/tests/dictionaries/44_4disabled_calcultion_follower/tiramisu/multi.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') try: groups.namespace except: @@ -14,13 +14,13 @@ dict_env['disabled_1.rougail.leader.follower'] = "{% if rougail.condition == \"y dict_env['disabled_2.rougail.leader.follower'] = "{% if rougail.condition == \"yes\" %}\ncondition is yes\n{% endif %}\n" option_3 = BoolOption(name="condition", doc="a condition", default=True, properties=frozenset({"mandatory", "standard"}), informations={'type': 'boolean'}) option_5 = StrOption(name="leader", doc="aleader", multi=True, default=["a"], properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) -option_6 = StrOption(name="follower", doc="a follower", multi=True, properties=frozenset({"basic", "mandatory", Calculation(func['jinja_to_property'], Params((ParamValue("disabled")), kwargs={'__internal_jinja': ParamValue("disabled_1.rougail.leader.follower"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['tests/dictionaries/44_4disabled_calcultion_follower/dictionaries/rougail/00-base.yml']), '__internal_attribute': ParamValue("disabled"), '__internal_variable': ParamValue("1.rougail.leader.follower"), 'when': ParamValue(True), 'inverse': ParamValue(False), 'rougail.condition': ParamOption(option_3, notraisepropertyerror=True)}), help_function=func['jinja_to_property_help'])}), informations={'type': 'string'}) +option_6 = StrOption(name="follower", doc="a follower", multi=True, properties=frozenset({"basic", "mandatory", Calculation(func['jinja_to_property'], Params((ParamValue("disabled")), kwargs={'__internal_jinja': ParamValue("disabled_1.rougail.leader.follower"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['../rougail-tests/structures/44_4disabled_calcultion_follower/rougail/00-base.yml']), '__internal_attribute': ParamValue("disabled"), '__internal_variable': ParamValue("1.rougail.leader.follower"), 'when': ParamValue(True), 'inverse': ParamValue(False), 'rougail.condition': ParamOption(option_3, notraisepropertyerror=True)}), help_function=func['jinja_to_property_help'])}), informations={'type': 'string'}) optiondescription_4 = Leadership(name="leader", doc="a leadership", children=[option_5, option_6], properties=frozenset({"basic"})) optiondescription_2 = OptionDescription(name="rougail", doc="Rougail", group_type=groups.namespace, children=[option_3, optiondescription_4], properties=frozenset({"basic"})) optiondescription_1 = OptionDescription(name="1", doc="1", children=[optiondescription_2], properties=frozenset({"basic"})) option_9 = BoolOption(name="condition", doc="a condition", default=True, properties=frozenset({"mandatory", "standard"}), informations={'type': 'boolean'}) option_11 = StrOption(name="leader", doc="aleader", multi=True, default=["a"], properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) -option_12 = StrOption(name="follower", doc="a follower", multi=True, properties=frozenset({"basic", "mandatory", Calculation(func['jinja_to_property'], Params((ParamValue("disabled")), kwargs={'__internal_jinja': ParamValue("disabled_2.rougail.leader.follower"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['tests/dictionaries/44_4disabled_calcultion_follower/dictionaries/rougail/00-base.yml']), '__internal_attribute': ParamValue("disabled"), '__internal_variable': ParamValue("2.rougail.leader.follower"), 'when': ParamValue(True), 'inverse': ParamValue(False), 'rougail.condition': ParamOption(option_9, notraisepropertyerror=True)}), help_function=func['jinja_to_property_help'])}), informations={'type': 'string'}) +option_12 = StrOption(name="follower", doc="a follower", multi=True, properties=frozenset({"basic", "mandatory", Calculation(func['jinja_to_property'], Params((ParamValue("disabled")), kwargs={'__internal_jinja': ParamValue("disabled_2.rougail.leader.follower"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['../rougail-tests/structures/44_4disabled_calcultion_follower/rougail/00-base.yml']), '__internal_attribute': ParamValue("disabled"), '__internal_variable': ParamValue("2.rougail.leader.follower"), 'when': ParamValue(True), 'inverse': ParamValue(False), 'rougail.condition': ParamOption(option_9, notraisepropertyerror=True)}), help_function=func['jinja_to_property_help'])}), informations={'type': 'string'}) optiondescription_10 = Leadership(name="leader", doc="a leadership", children=[option_11, option_12], properties=frozenset({"basic"})) optiondescription_8 = OptionDescription(name="rougail", doc="Rougail", group_type=groups.namespace, children=[option_9, optiondescription_10], properties=frozenset({"basic"})) optiondescription_7 = OptionDescription(name="2", doc="2", children=[optiondescription_8], properties=frozenset({"basic"})) diff --git a/tests/dictionaries/44_4leadership_mandatory/dictionaries/rougail/00-base.yml b/tests/dictionaries/44_4leadership_mandatory/dictionaries/rougail/00-base.yml deleted file mode 100644 index bd69e701d..000000000 --- a/tests/dictionaries/44_4leadership_mandatory/dictionaries/rougail/00-base.yml +++ /dev/null @@ -1,12 +0,0 @@ ---- -version: '1.1' -leader: - description: a leadership - type: leadership - leader: - description: a leader - multi: true - mandatory: true - follower1: - description: a follower - mandatory: false diff --git a/tests/dictionaries/44_4leadership_mandatory/tiramisu/base.py b/tests/dictionaries/44_4leadership_mandatory/tiramisu/base.py index be5fc56e3..419110551 100644 --- a/tests/dictionaries/44_4leadership_mandatory/tiramisu/base.py +++ b/tests/dictionaries/44_4leadership_mandatory/tiramisu/base.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') try: groups.namespace except: diff --git a/tests/dictionaries/44_4leadership_mandatory/tiramisu/multi.py b/tests/dictionaries/44_4leadership_mandatory/tiramisu/multi.py index c924bc1bb..4c316419d 100644 --- a/tests/dictionaries/44_4leadership_mandatory/tiramisu/multi.py +++ b/tests/dictionaries/44_4leadership_mandatory/tiramisu/multi.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') try: groups.namespace except: diff --git a/tests/dictionaries/44_4leadership_mandatory/tiramisu/no_namespace.py b/tests/dictionaries/44_4leadership_mandatory/tiramisu/no_namespace.py index f62e9a3e7..b6d4c4f8c 100644 --- a/tests/dictionaries/44_4leadership_mandatory/tiramisu/no_namespace.py +++ b/tests/dictionaries/44_4leadership_mandatory/tiramisu/no_namespace.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") ALLOWED_LEADER_PROPERTIES.add("standard") ALLOWED_LEADER_PROPERTIES.add("advanced") diff --git a/tests/dictionaries/44_4leadership_mandatory_follower/dictionaries/rougail/00-base.yml b/tests/dictionaries/44_4leadership_mandatory_follower/dictionaries/rougail/00-base.yml deleted file mode 100644 index 1273a3d70..000000000 --- a/tests/dictionaries/44_4leadership_mandatory_follower/dictionaries/rougail/00-base.yml +++ /dev/null @@ -1,12 +0,0 @@ ---- -version: '1.0' -leader: - description: a leadership - type: leadership - leader: - description: a leader - multi: true - mandatory: false - follower: - description: a follower - mandatory: true diff --git a/tests/dictionaries/44_4leadership_mandatory_follower/tiramisu/base.py b/tests/dictionaries/44_4leadership_mandatory_follower/tiramisu/base.py index 8d4f16ec6..da32b6303 100644 --- a/tests/dictionaries/44_4leadership_mandatory_follower/tiramisu/base.py +++ b/tests/dictionaries/44_4leadership_mandatory_follower/tiramisu/base.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') try: groups.namespace except: diff --git a/tests/dictionaries/44_4leadership_mandatory_follower/tiramisu/multi.py b/tests/dictionaries/44_4leadership_mandatory_follower/tiramisu/multi.py index 71832f129..9ad353277 100644 --- a/tests/dictionaries/44_4leadership_mandatory_follower/tiramisu/multi.py +++ b/tests/dictionaries/44_4leadership_mandatory_follower/tiramisu/multi.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') try: groups.namespace except: 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 a75ed6de3..4e73a9619 100644 --- a/tests/dictionaries/44_4leadership_mandatory_follower/tiramisu/no_namespace.py +++ b/tests/dictionaries/44_4leadership_mandatory_follower/tiramisu/no_namespace.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") ALLOWED_LEADER_PROPERTIES.add("standard") ALLOWED_LEADER_PROPERTIES.add("advanced") 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 deleted file mode 100644 index 5d156680e..000000000 --- a/tests/dictionaries/44_5leadership_leader_hidden_calculation/dictionaries/rougail/00-base.yml +++ /dev/null @@ -1,17 +0,0 @@ ---- -version: '1.1' -condition: 'no' # a condition -leader: - description: a leadership - type: leadership - leader: - description: a leader - multi: true - hidden: - jinja: | - {% if __.condition == "no" %} - condition is no - {% endif %} - description: if condition is no - mandatory: false - follower: # a follower 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 3ca718f6c..a550fc44a 100644 --- a/tests/dictionaries/44_5leadership_leader_hidden_calculation/tiramisu/base.py +++ b/tests/dictionaries/44_5leadership_leader_hidden_calculation/tiramisu/base.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') try: groups.namespace except: @@ -14,8 +14,8 @@ dict_env['frozen_rougail.leader.leader'] = "{% if __.condition == \"no\" %}\ncon dict_env['frozen_rougail.leader.follower'] = "{% if __.condition == \"no\" %}\ncondition is no\n{% endif %}\n" dict_env['hidden_rougail.leader.leader'] = "{% if __.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_4 = StrOption(name="leader", doc="a leader", multi=True, properties=frozenset({"force_default_on_freeze", "standard", Calculation(func['jinja_to_property'], Params((ParamValue("frozen")), kwargs={'__internal_jinja': ParamValue("frozen_rougail.leader.leader"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['tests/dictionaries/44_5leadership_leader_hidden_calculation/dictionaries/rougail/00-base.yml']), '__internal_attribute': ParamValue("frozen"), '__internal_variable': ParamValue("rougail.leader.leader"), 'when': ParamValue(True), 'inverse': ParamValue(False), '__.condition': ParamOption(option_2, notraisepropertyerror=True)}), help_function=func['jinja_to_property_help'])}), informations={'type': 'string'}) -option_5 = StrOption(name="follower", doc="a follower", multi=True, properties=frozenset({"basic", "force_default_on_freeze", "mandatory", Calculation(func['jinja_to_property'], Params((ParamValue("frozen")), kwargs={'__internal_jinja': ParamValue("frozen_rougail.leader.follower"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['tests/dictionaries/44_5leadership_leader_hidden_calculation/dictionaries/rougail/00-base.yml']), '__internal_attribute': ParamValue("frozen"), '__internal_variable': ParamValue("rougail.leader.follower"), 'when': ParamValue(True), 'inverse': ParamValue(False), '__.condition': ParamOption(option_2, notraisepropertyerror=True)}), help_function=func['jinja_to_property_help'])}), informations={'type': 'string'}) -optiondescription_3 = Leadership(name="leader", doc="a leadership", children=[option_4, option_5], properties=frozenset({"basic", Calculation(func['jinja_to_property'], Params((ParamValue("hidden")), kwargs={'__internal_jinja': ParamValue("hidden_rougail.leader.leader"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['tests/dictionaries/44_5leadership_leader_hidden_calculation/dictionaries/rougail/00-base.yml']), '__internal_attribute': ParamValue("hidden"), '__internal_variable': ParamValue("rougail.leader.leader"), 'when': ParamValue(True), 'inverse': ParamValue(False), '__.condition': ParamOption(option_2, notraisepropertyerror=True)}), help_function=func['jinja_to_property_help'])})) +option_4 = StrOption(name="leader", doc="a leader", multi=True, properties=frozenset({"force_default_on_freeze", "standard", Calculation(func['jinja_to_property'], Params((ParamValue("frozen")), kwargs={'__internal_jinja': ParamValue("frozen_rougail.leader.leader"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['../rougail-tests/structures/44_5leadership_leader_hidden_calculation/rougail/00-base.yml']), '__internal_attribute': ParamValue("frozen"), '__internal_variable': ParamValue("rougail.leader.leader"), 'when': ParamValue(True), 'inverse': ParamValue(False), '__.condition': ParamOption(option_2, notraisepropertyerror=True)}), help_function=func['jinja_to_property_help'])}), informations={'type': 'string'}) +option_5 = StrOption(name="follower", doc="a follower", multi=True, properties=frozenset({"basic", "force_default_on_freeze", "mandatory", Calculation(func['jinja_to_property'], Params((ParamValue("frozen")), kwargs={'__internal_jinja': ParamValue("frozen_rougail.leader.follower"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['../rougail-tests/structures/44_5leadership_leader_hidden_calculation/rougail/00-base.yml']), '__internal_attribute': ParamValue("frozen"), '__internal_variable': ParamValue("rougail.leader.follower"), 'when': ParamValue(True), 'inverse': ParamValue(False), '__.condition': ParamOption(option_2, notraisepropertyerror=True)}), help_function=func['jinja_to_property_help'])}), informations={'type': 'string'}) +optiondescription_3 = Leadership(name="leader", doc="a leadership", children=[option_4, option_5], properties=frozenset({"basic", Calculation(func['jinja_to_property'], Params((ParamValue("hidden")), kwargs={'__internal_jinja': ParamValue("hidden_rougail.leader.leader"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['../rougail-tests/structures/44_5leadership_leader_hidden_calculation/rougail/00-base.yml']), '__internal_attribute': ParamValue("hidden"), '__internal_variable': ParamValue("rougail.leader.leader"), 'when': ParamValue(True), 'inverse': ParamValue(False), '__.condition': ParamOption(option_2, notraisepropertyerror=True)}), help_function=func['jinja_to_property_help'])})) optiondescription_1 = OptionDescription(name="rougail", doc="Rougail", group_type=groups.namespace, children=[option_2, optiondescription_3], properties=frozenset({"basic"})) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_1]) 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 4e2e19ec4..319e22d6a 100644 --- a/tests/dictionaries/44_5leadership_leader_hidden_calculation/tiramisu/multi.py +++ b/tests/dictionaries/44_5leadership_leader_hidden_calculation/tiramisu/multi.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') try: groups.namespace except: @@ -17,15 +17,15 @@ dict_env['frozen_2.rougail.leader.leader'] = "{% if __.condition == \"no\" %}\nc dict_env['frozen_2.rougail.leader.follower'] = "{% if __.condition == \"no\" %}\ncondition is no\n{% endif %}\n" dict_env['hidden_2.rougail.leader.leader'] = "{% if __.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_5 = StrOption(name="leader", doc="a leader", multi=True, properties=frozenset({"force_default_on_freeze", "standard", Calculation(func['jinja_to_property'], Params((ParamValue("frozen")), kwargs={'__internal_jinja': ParamValue("frozen_1.rougail.leader.leader"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['tests/dictionaries/44_5leadership_leader_hidden_calculation/dictionaries/rougail/00-base.yml']), '__internal_attribute': ParamValue("frozen"), '__internal_variable': ParamValue("1.rougail.leader.leader"), 'when': ParamValue(True), 'inverse': ParamValue(False), '__.condition': ParamOption(option_3, notraisepropertyerror=True)}), help_function=func['jinja_to_property_help'])}), informations={'type': 'string'}) -option_6 = StrOption(name="follower", doc="a follower", multi=True, properties=frozenset({"basic", "force_default_on_freeze", "mandatory", Calculation(func['jinja_to_property'], Params((ParamValue("frozen")), kwargs={'__internal_jinja': ParamValue("frozen_1.rougail.leader.follower"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['tests/dictionaries/44_5leadership_leader_hidden_calculation/dictionaries/rougail/00-base.yml']), '__internal_attribute': ParamValue("frozen"), '__internal_variable': ParamValue("1.rougail.leader.follower"), 'when': ParamValue(True), 'inverse': ParamValue(False), '__.condition': ParamOption(option_3, notraisepropertyerror=True)}), help_function=func['jinja_to_property_help'])}), informations={'type': 'string'}) -optiondescription_4 = Leadership(name="leader", doc="a leadership", children=[option_5, option_6], properties=frozenset({"basic", Calculation(func['jinja_to_property'], Params((ParamValue("hidden")), kwargs={'__internal_jinja': ParamValue("hidden_1.rougail.leader.leader"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['tests/dictionaries/44_5leadership_leader_hidden_calculation/dictionaries/rougail/00-base.yml']), '__internal_attribute': ParamValue("hidden"), '__internal_variable': ParamValue("1.rougail.leader.leader"), 'when': ParamValue(True), 'inverse': ParamValue(False), '__.condition': ParamOption(option_3, notraisepropertyerror=True)}), help_function=func['jinja_to_property_help'])})) +option_5 = StrOption(name="leader", doc="a leader", multi=True, properties=frozenset({"force_default_on_freeze", "standard", Calculation(func['jinja_to_property'], Params((ParamValue("frozen")), kwargs={'__internal_jinja': ParamValue("frozen_1.rougail.leader.leader"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['../rougail-tests/structures/44_5leadership_leader_hidden_calculation/rougail/00-base.yml']), '__internal_attribute': ParamValue("frozen"), '__internal_variable': ParamValue("1.rougail.leader.leader"), 'when': ParamValue(True), 'inverse': ParamValue(False), '__.condition': ParamOption(option_3, notraisepropertyerror=True)}), help_function=func['jinja_to_property_help'])}), informations={'type': 'string'}) +option_6 = StrOption(name="follower", doc="a follower", multi=True, properties=frozenset({"basic", "force_default_on_freeze", "mandatory", Calculation(func['jinja_to_property'], Params((ParamValue("frozen")), kwargs={'__internal_jinja': ParamValue("frozen_1.rougail.leader.follower"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['../rougail-tests/structures/44_5leadership_leader_hidden_calculation/rougail/00-base.yml']), '__internal_attribute': ParamValue("frozen"), '__internal_variable': ParamValue("1.rougail.leader.follower"), 'when': ParamValue(True), 'inverse': ParamValue(False), '__.condition': ParamOption(option_3, notraisepropertyerror=True)}), help_function=func['jinja_to_property_help'])}), informations={'type': 'string'}) +optiondescription_4 = Leadership(name="leader", doc="a leadership", children=[option_5, option_6], properties=frozenset({"basic", Calculation(func['jinja_to_property'], Params((ParamValue("hidden")), kwargs={'__internal_jinja': ParamValue("hidden_1.rougail.leader.leader"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['../rougail-tests/structures/44_5leadership_leader_hidden_calculation/rougail/00-base.yml']), '__internal_attribute': ParamValue("hidden"), '__internal_variable': ParamValue("1.rougail.leader.leader"), 'when': ParamValue(True), 'inverse': ParamValue(False), '__.condition': ParamOption(option_3, notraisepropertyerror=True)}), help_function=func['jinja_to_property_help'])})) optiondescription_2 = OptionDescription(name="rougail", doc="Rougail", group_type=groups.namespace, children=[option_3, optiondescription_4], properties=frozenset({"basic"})) optiondescription_1 = OptionDescription(name="1", doc="1", children=[optiondescription_2], properties=frozenset({"basic"})) option_9 = StrOption(name="condition", doc="a condition", default="no", properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) -option_11 = StrOption(name="leader", doc="a leader", multi=True, properties=frozenset({"force_default_on_freeze", "standard", Calculation(func['jinja_to_property'], Params((ParamValue("frozen")), kwargs={'__internal_jinja': ParamValue("frozen_2.rougail.leader.leader"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['tests/dictionaries/44_5leadership_leader_hidden_calculation/dictionaries/rougail/00-base.yml']), '__internal_attribute': ParamValue("frozen"), '__internal_variable': ParamValue("2.rougail.leader.leader"), 'when': ParamValue(True), 'inverse': ParamValue(False), '__.condition': ParamOption(option_9, notraisepropertyerror=True)}), help_function=func['jinja_to_property_help'])}), informations={'type': 'string'}) -option_12 = StrOption(name="follower", doc="a follower", multi=True, properties=frozenset({"basic", "force_default_on_freeze", "mandatory", Calculation(func['jinja_to_property'], Params((ParamValue("frozen")), kwargs={'__internal_jinja': ParamValue("frozen_2.rougail.leader.follower"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['tests/dictionaries/44_5leadership_leader_hidden_calculation/dictionaries/rougail/00-base.yml']), '__internal_attribute': ParamValue("frozen"), '__internal_variable': ParamValue("2.rougail.leader.follower"), 'when': ParamValue(True), 'inverse': ParamValue(False), '__.condition': ParamOption(option_9, notraisepropertyerror=True)}), help_function=func['jinja_to_property_help'])}), informations={'type': 'string'}) -optiondescription_10 = Leadership(name="leader", doc="a leadership", children=[option_11, option_12], properties=frozenset({"basic", Calculation(func['jinja_to_property'], Params((ParamValue("hidden")), kwargs={'__internal_jinja': ParamValue("hidden_2.rougail.leader.leader"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['tests/dictionaries/44_5leadership_leader_hidden_calculation/dictionaries/rougail/00-base.yml']), '__internal_attribute': ParamValue("hidden"), '__internal_variable': ParamValue("2.rougail.leader.leader"), 'when': ParamValue(True), 'inverse': ParamValue(False), '__.condition': ParamOption(option_9, notraisepropertyerror=True)}), help_function=func['jinja_to_property_help'])})) +option_11 = StrOption(name="leader", doc="a leader", multi=True, properties=frozenset({"force_default_on_freeze", "standard", Calculation(func['jinja_to_property'], Params((ParamValue("frozen")), kwargs={'__internal_jinja': ParamValue("frozen_2.rougail.leader.leader"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['../rougail-tests/structures/44_5leadership_leader_hidden_calculation/rougail/00-base.yml']), '__internal_attribute': ParamValue("frozen"), '__internal_variable': ParamValue("2.rougail.leader.leader"), 'when': ParamValue(True), 'inverse': ParamValue(False), '__.condition': ParamOption(option_9, notraisepropertyerror=True)}), help_function=func['jinja_to_property_help'])}), informations={'type': 'string'}) +option_12 = StrOption(name="follower", doc="a follower", multi=True, properties=frozenset({"basic", "force_default_on_freeze", "mandatory", Calculation(func['jinja_to_property'], Params((ParamValue("frozen")), kwargs={'__internal_jinja': ParamValue("frozen_2.rougail.leader.follower"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['../rougail-tests/structures/44_5leadership_leader_hidden_calculation/rougail/00-base.yml']), '__internal_attribute': ParamValue("frozen"), '__internal_variable': ParamValue("2.rougail.leader.follower"), 'when': ParamValue(True), 'inverse': ParamValue(False), '__.condition': ParamOption(option_9, notraisepropertyerror=True)}), help_function=func['jinja_to_property_help'])}), informations={'type': 'string'}) +optiondescription_10 = Leadership(name="leader", doc="a leadership", children=[option_11, option_12], properties=frozenset({"basic", Calculation(func['jinja_to_property'], Params((ParamValue("hidden")), kwargs={'__internal_jinja': ParamValue("hidden_2.rougail.leader.leader"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['../rougail-tests/structures/44_5leadership_leader_hidden_calculation/rougail/00-base.yml']), '__internal_attribute': ParamValue("hidden"), '__internal_variable': ParamValue("2.rougail.leader.leader"), 'when': ParamValue(True), 'inverse': ParamValue(False), '__.condition': ParamOption(option_9, notraisepropertyerror=True)}), help_function=func['jinja_to_property_help'])})) optiondescription_8 = OptionDescription(name="rougail", doc="Rougail", group_type=groups.namespace, children=[option_9, optiondescription_10], properties=frozenset({"basic"})) optiondescription_7 = OptionDescription(name="2", doc="2", children=[optiondescription_8], properties=frozenset({"basic"})) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_1, optiondescription_7]) 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 08292450c..e9567a811 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 @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") ALLOWED_LEADER_PROPERTIES.add("standard") ALLOWED_LEADER_PROPERTIES.add("advanced") @@ -10,7 +10,7 @@ dict_env['frozen_leader.leader'] = "{% if __.condition == \"no\" %}\ncondition i dict_env['frozen_leader.follower'] = "{% if __.condition == \"no\" %}\ncondition is no\n{% endif %}\n" dict_env['hidden_leader.leader'] = "{% if __.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_3 = StrOption(name="leader", doc="a leader", multi=True, properties=frozenset({"force_default_on_freeze", "standard", Calculation(func['jinja_to_property'], Params((ParamValue("frozen")), kwargs={'__internal_jinja': ParamValue("frozen_leader.leader"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['tests/dictionaries/44_5leadership_leader_hidden_calculation/dictionaries/rougail/00-base.yml']), '__internal_attribute': ParamValue("frozen"), '__internal_variable': ParamValue("leader.leader"), 'when': ParamValue(True), 'inverse': ParamValue(False), '__.condition': ParamOption(option_1, notraisepropertyerror=True)}), help_function=func['jinja_to_property_help'])}), informations={'type': 'string'}) -option_4 = StrOption(name="follower", doc="a follower", multi=True, properties=frozenset({"basic", "force_default_on_freeze", "mandatory", Calculation(func['jinja_to_property'], Params((ParamValue("frozen")), kwargs={'__internal_jinja': ParamValue("frozen_leader.follower"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['tests/dictionaries/44_5leadership_leader_hidden_calculation/dictionaries/rougail/00-base.yml']), '__internal_attribute': ParamValue("frozen"), '__internal_variable': ParamValue("leader.follower"), 'when': ParamValue(True), 'inverse': ParamValue(False), '__.condition': ParamOption(option_1, notraisepropertyerror=True)}), help_function=func['jinja_to_property_help'])}), informations={'type': 'string'}) -optiondescription_2 = Leadership(name="leader", doc="a leadership", children=[option_3, option_4], properties=frozenset({"basic", Calculation(func['jinja_to_property'], Params((ParamValue("hidden")), kwargs={'__internal_jinja': ParamValue("hidden_leader.leader"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['tests/dictionaries/44_5leadership_leader_hidden_calculation/dictionaries/rougail/00-base.yml']), '__internal_attribute': ParamValue("hidden"), '__internal_variable': ParamValue("leader.leader"), 'when': ParamValue(True), 'inverse': ParamValue(False), '__.condition': ParamOption(option_1, notraisepropertyerror=True)}), help_function=func['jinja_to_property_help'])})) +option_3 = StrOption(name="leader", doc="a leader", multi=True, properties=frozenset({"force_default_on_freeze", "standard", Calculation(func['jinja_to_property'], Params((ParamValue("frozen")), kwargs={'__internal_jinja': ParamValue("frozen_leader.leader"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['../rougail-tests/structures/44_5leadership_leader_hidden_calculation/rougail/00-base.yml']), '__internal_attribute': ParamValue("frozen"), '__internal_variable': ParamValue("leader.leader"), 'when': ParamValue(True), 'inverse': ParamValue(False), '__.condition': ParamOption(option_1, notraisepropertyerror=True)}), help_function=func['jinja_to_property_help'])}), informations={'type': 'string'}) +option_4 = StrOption(name="follower", doc="a follower", multi=True, properties=frozenset({"basic", "force_default_on_freeze", "mandatory", Calculation(func['jinja_to_property'], Params((ParamValue("frozen")), kwargs={'__internal_jinja': ParamValue("frozen_leader.follower"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['../rougail-tests/structures/44_5leadership_leader_hidden_calculation/rougail/00-base.yml']), '__internal_attribute': ParamValue("frozen"), '__internal_variable': ParamValue("leader.follower"), 'when': ParamValue(True), 'inverse': ParamValue(False), '__.condition': ParamOption(option_1, notraisepropertyerror=True)}), help_function=func['jinja_to_property_help'])}), informations={'type': 'string'}) +optiondescription_2 = Leadership(name="leader", doc="a leadership", children=[option_3, option_4], properties=frozenset({"basic", Calculation(func['jinja_to_property'], Params((ParamValue("hidden")), kwargs={'__internal_jinja': ParamValue("hidden_leader.leader"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['../rougail-tests/structures/44_5leadership_leader_hidden_calculation/rougail/00-base.yml']), '__internal_attribute': ParamValue("hidden"), '__internal_variable': ParamValue("leader.leader"), 'when': ParamValue(True), 'inverse': ParamValue(False), '__.condition': ParamOption(option_1, notraisepropertyerror=True)}), help_function=func['jinja_to_property_help'])})) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1, optiondescription_2]) 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 deleted file mode 100644 index 693834671..000000000 --- a/tests/dictionaries/44_6leadership_follower_disabled_calculation/dictionaries/rougail/00-base.yml +++ /dev/null @@ -1,17 +0,0 @@ ---- -version: '1.1' -condition: "yes" # a condition -leader: - description: a leadership - type: leadership - leader: - description: a leader - multi: true - follower: - description: a follower - disabled: - jinja: | - {% if __.condition == "yes" %} - disabled - {% 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 dd1710db0..99f7a6267 100644 --- a/tests/dictionaries/44_6leadership_follower_disabled_calculation/tiramisu/base.py +++ b/tests/dictionaries/44_6leadership_follower_disabled_calculation/tiramisu/base.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') try: groups.namespace except: @@ -13,7 +13,7 @@ ALLOWED_LEADER_PROPERTIES.add("advanced") dict_env['disabled_rougail.leader.follower'] = "{% if __.condition == \"yes\" %}\ndisabled\n{% endif %}\n" option_2 = StrOption(name="condition", doc="a condition", default="yes", properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) option_4 = StrOption(name="leader", doc="a leader", multi=True, properties=frozenset({"basic", "mandatory"}), informations={'type': 'string'}) -option_5 = StrOption(name="follower", doc="a follower", multi=True, properties=frozenset({"basic", "mandatory", Calculation(func['jinja_to_property'], Params((ParamValue("disabled")), kwargs={'__internal_jinja': ParamValue("disabled_rougail.leader.follower"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['tests/dictionaries/44_6leadership_follower_disabled_calculation/dictionaries/rougail/00-base.yml']), '__internal_attribute': ParamValue("disabled"), '__internal_variable': ParamValue("rougail.leader.follower"), 'when': ParamValue(True), 'inverse': ParamValue(False), '__.condition': ParamOption(option_2, notraisepropertyerror=True)}), help_function=func['jinja_to_property_help'])}), informations={'type': 'string'}) +option_5 = StrOption(name="follower", doc="a follower", multi=True, properties=frozenset({"basic", "mandatory", Calculation(func['jinja_to_property'], Params((ParamValue("disabled")), kwargs={'__internal_jinja': ParamValue("disabled_rougail.leader.follower"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['../rougail-tests/structures/44_6leadership_follower_disabled_calculation/rougail/00-base.yml']), '__internal_attribute': ParamValue("disabled"), '__internal_variable': ParamValue("rougail.leader.follower"), 'when': ParamValue(True), 'inverse': ParamValue(False), '__.condition': ParamOption(option_2, notraisepropertyerror=True)}), help_function=func['jinja_to_property_help'])}), informations={'type': 'string'}) optiondescription_3 = Leadership(name="leader", doc="a leadership", children=[option_4, option_5], properties=frozenset({"basic"})) optiondescription_1 = OptionDescription(name="rougail", doc="Rougail", group_type=groups.namespace, children=[option_2, optiondescription_3], properties=frozenset({"basic"})) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_1]) 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 9f9be3ce3..3b753a267 100644 --- a/tests/dictionaries/44_6leadership_follower_disabled_calculation/tiramisu/multi.py +++ b/tests/dictionaries/44_6leadership_follower_disabled_calculation/tiramisu/multi.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') try: groups.namespace except: @@ -14,13 +14,13 @@ dict_env['disabled_1.rougail.leader.follower'] = "{% if __.condition == \"yes\" dict_env['disabled_2.rougail.leader.follower'] = "{% if __.condition == \"yes\" %}\ndisabled\n{% endif %}\n" option_3 = StrOption(name="condition", doc="a condition", default="yes", properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) option_5 = StrOption(name="leader", doc="a leader", multi=True, properties=frozenset({"basic", "mandatory"}), informations={'type': 'string'}) -option_6 = StrOption(name="follower", doc="a follower", multi=True, properties=frozenset({"basic", "mandatory", Calculation(func['jinja_to_property'], Params((ParamValue("disabled")), kwargs={'__internal_jinja': ParamValue("disabled_1.rougail.leader.follower"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['tests/dictionaries/44_6leadership_follower_disabled_calculation/dictionaries/rougail/00-base.yml']), '__internal_attribute': ParamValue("disabled"), '__internal_variable': ParamValue("1.rougail.leader.follower"), 'when': ParamValue(True), 'inverse': ParamValue(False), '__.condition': ParamOption(option_3, notraisepropertyerror=True)}), help_function=func['jinja_to_property_help'])}), informations={'type': 'string'}) +option_6 = StrOption(name="follower", doc="a follower", multi=True, properties=frozenset({"basic", "mandatory", Calculation(func['jinja_to_property'], Params((ParamValue("disabled")), kwargs={'__internal_jinja': ParamValue("disabled_1.rougail.leader.follower"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['../rougail-tests/structures/44_6leadership_follower_disabled_calculation/rougail/00-base.yml']), '__internal_attribute': ParamValue("disabled"), '__internal_variable': ParamValue("1.rougail.leader.follower"), 'when': ParamValue(True), 'inverse': ParamValue(False), '__.condition': ParamOption(option_3, notraisepropertyerror=True)}), help_function=func['jinja_to_property_help'])}), informations={'type': 'string'}) optiondescription_4 = Leadership(name="leader", doc="a leadership", children=[option_5, option_6], properties=frozenset({"basic"})) optiondescription_2 = OptionDescription(name="rougail", doc="Rougail", group_type=groups.namespace, children=[option_3, optiondescription_4], properties=frozenset({"basic"})) optiondescription_1 = OptionDescription(name="1", doc="1", children=[optiondescription_2], properties=frozenset({"basic"})) option_9 = StrOption(name="condition", doc="a condition", default="yes", properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) option_11 = StrOption(name="leader", doc="a leader", multi=True, properties=frozenset({"basic", "mandatory"}), informations={'type': 'string'}) -option_12 = StrOption(name="follower", doc="a follower", multi=True, properties=frozenset({"basic", "mandatory", Calculation(func['jinja_to_property'], Params((ParamValue("disabled")), kwargs={'__internal_jinja': ParamValue("disabled_2.rougail.leader.follower"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['tests/dictionaries/44_6leadership_follower_disabled_calculation/dictionaries/rougail/00-base.yml']), '__internal_attribute': ParamValue("disabled"), '__internal_variable': ParamValue("2.rougail.leader.follower"), 'when': ParamValue(True), 'inverse': ParamValue(False), '__.condition': ParamOption(option_9, notraisepropertyerror=True)}), help_function=func['jinja_to_property_help'])}), informations={'type': 'string'}) +option_12 = StrOption(name="follower", doc="a follower", multi=True, properties=frozenset({"basic", "mandatory", Calculation(func['jinja_to_property'], Params((ParamValue("disabled")), kwargs={'__internal_jinja': ParamValue("disabled_2.rougail.leader.follower"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['../rougail-tests/structures/44_6leadership_follower_disabled_calculation/rougail/00-base.yml']), '__internal_attribute': ParamValue("disabled"), '__internal_variable': ParamValue("2.rougail.leader.follower"), 'when': ParamValue(True), 'inverse': ParamValue(False), '__.condition': ParamOption(option_9, notraisepropertyerror=True)}), help_function=func['jinja_to_property_help'])}), informations={'type': 'string'}) optiondescription_10 = Leadership(name="leader", doc="a leadership", children=[option_11, option_12], properties=frozenset({"basic"})) optiondescription_8 = OptionDescription(name="rougail", doc="Rougail", group_type=groups.namespace, children=[option_9, optiondescription_10], properties=frozenset({"basic"})) optiondescription_7 = OptionDescription(name="2", doc="2", children=[optiondescription_8], properties=frozenset({"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 515cbae41..f9ebf7dd8 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 @@ -2,13 +2,13 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") ALLOWED_LEADER_PROPERTIES.add("standard") ALLOWED_LEADER_PROPERTIES.add("advanced") dict_env['disabled_leader.follower'] = "{% if __.condition == \"yes\" %}\ndisabled\n{% endif %}\n" option_1 = StrOption(name="condition", doc="a condition", default="yes", properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) option_3 = StrOption(name="leader", doc="a leader", multi=True, properties=frozenset({"basic", "mandatory"}), informations={'type': 'string'}) -option_4 = StrOption(name="follower", doc="a follower", multi=True, properties=frozenset({"basic", "mandatory", Calculation(func['jinja_to_property'], Params((ParamValue("disabled")), kwargs={'__internal_jinja': ParamValue("disabled_leader.follower"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['tests/dictionaries/44_6leadership_follower_disabled_calculation/dictionaries/rougail/00-base.yml']), '__internal_attribute': ParamValue("disabled"), '__internal_variable': ParamValue("leader.follower"), 'when': ParamValue(True), 'inverse': ParamValue(False), '__.condition': ParamOption(option_1, notraisepropertyerror=True)}), help_function=func['jinja_to_property_help'])}), informations={'type': 'string'}) +option_4 = StrOption(name="follower", doc="a follower", multi=True, properties=frozenset({"basic", "mandatory", Calculation(func['jinja_to_property'], Params((ParamValue("disabled")), kwargs={'__internal_jinja': ParamValue("disabled_leader.follower"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['../rougail-tests/structures/44_6leadership_follower_disabled_calculation/rougail/00-base.yml']), '__internal_attribute': ParamValue("disabled"), '__internal_variable': ParamValue("leader.follower"), 'when': ParamValue(True), 'inverse': ParamValue(False), '__.condition': ParamOption(option_1, notraisepropertyerror=True)}), help_function=func['jinja_to_property_help'])}), informations={'type': 'string'}) optiondescription_2 = Leadership(name="leader", doc="a leadership", children=[option_3, option_4], properties=frozenset({"basic"})) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1, optiondescription_2]) 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 deleted file mode 100644 index f2c6c9d8f..000000000 --- a/tests/dictionaries/44_9calculated_default_leadership_leader/dictionaries/rougail/00-base.yml +++ /dev/null @@ -1,18 +0,0 @@ ---- -version: 1.1 -leader: - description: leader - type: leadership - leader: # a leader - - a - - b - follower: - description: a follower - disabled: - jinja: | - {% if _.leader == "a" %} - the value of "leader" is "a" - {% endif %} - description: if the value of "leader" is "a" - default: - variable: _.leader diff --git a/tests/dictionaries/44_9calculated_default_leadership_leader/force_namespace b/tests/dictionaries/44_9calculated_default_leadership_leader/force_namespace deleted file mode 100644 index e69de29bb..000000000 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 ebb280f73..eafadd395 100644 --- a/tests/dictionaries/44_9calculated_default_leadership_leader/tiramisu/base.py +++ b/tests/dictionaries/44_9calculated_default_leadership_leader/tiramisu/base.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') try: groups.namespace except: @@ -12,7 +12,7 @@ ALLOWED_LEADER_PROPERTIES.add("standard") ALLOWED_LEADER_PROPERTIES.add("advanced") dict_env['disabled_rougail.leader.follower'] = "{% if _.leader == \"a\" %}\nthe value of \"leader\" is \"a\"\n{% endif %}\n" option_3 = StrOption(name="leader", doc="a leader", multi=True, default=["a", "b"], properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) -option_4 = StrOption(name="follower", doc="a follower", multi=True, default=Calculation(func['calc_value'], Params((ParamOption(option_3)))), properties=frozenset({"mandatory", "standard", Calculation(func['jinja_to_property'], Params((ParamValue("disabled")), kwargs={'__internal_jinja': ParamValue("disabled_rougail.leader.follower"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['tests/dictionaries/44_9calculated_default_leadership_leader/dictionaries/rougail/00-base.yml']), '__internal_attribute': ParamValue("disabled"), '__internal_variable': ParamValue("rougail.leader.follower"), 'when': ParamValue(True), 'inverse': ParamValue(False), '_.leader': ParamOption(option_3, notraisepropertyerror=True)}), help_function=func['jinja_to_property_help'])}), informations={'type': 'string'}) +option_4 = StrOption(name="follower", doc="a follower", multi=True, default=Calculation(func['calc_value'], Params((ParamOption(option_3)))), properties=frozenset({"mandatory", "standard", Calculation(func['jinja_to_property'], Params((ParamValue("disabled")), kwargs={'__internal_jinja': ParamValue("disabled_rougail.leader.follower"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['../rougail-tests/structures/44_9calculated_default_leadership_leader/rougail/00-base.yml']), '__internal_attribute': ParamValue("disabled"), '__internal_variable': ParamValue("rougail.leader.follower"), 'when': ParamValue(True), 'inverse': ParamValue(False), '_.leader': ParamOption(option_3, notraisepropertyerror=True)}), help_function=func['jinja_to_property_help'])}), informations={'type': 'string'}) optiondescription_2 = Leadership(name="leader", doc="leader", children=[option_3, option_4], properties=frozenset({"standard"})) optiondescription_1 = OptionDescription(name="rougail", doc="Rougail", group_type=groups.namespace, children=[optiondescription_2], properties=frozenset({"standard"})) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_1]) 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 de7047c73..b20927a71 100644 --- a/tests/dictionaries/44_9calculated_default_leadership_leader/tiramisu/multi.py +++ b/tests/dictionaries/44_9calculated_default_leadership_leader/tiramisu/multi.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') try: groups.namespace except: @@ -13,12 +13,12 @@ ALLOWED_LEADER_PROPERTIES.add("advanced") dict_env['disabled_1.rougail.leader.follower'] = "{% if _.leader == \"a\" %}\nthe value of \"leader\" is \"a\"\n{% endif %}\n" dict_env['disabled_2.rougail.leader.follower'] = "{% if _.leader == \"a\" %}\nthe value of \"leader\" is \"a\"\n{% endif %}\n" option_4 = StrOption(name="leader", doc="a leader", multi=True, default=["a", "b"], properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) -option_5 = StrOption(name="follower", doc="a follower", multi=True, default=Calculation(func['calc_value'], Params((ParamOption(option_4)))), properties=frozenset({"mandatory", "standard", Calculation(func['jinja_to_property'], Params((ParamValue("disabled")), kwargs={'__internal_jinja': ParamValue("disabled_1.rougail.leader.follower"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['tests/dictionaries/44_9calculated_default_leadership_leader/dictionaries/rougail/00-base.yml']), '__internal_attribute': ParamValue("disabled"), '__internal_variable': ParamValue("1.rougail.leader.follower"), 'when': ParamValue(True), 'inverse': ParamValue(False), '_.leader': ParamOption(option_4, notraisepropertyerror=True)}), help_function=func['jinja_to_property_help'])}), informations={'type': 'string'}) +option_5 = StrOption(name="follower", doc="a follower", multi=True, default=Calculation(func['calc_value'], Params((ParamOption(option_4)))), properties=frozenset({"mandatory", "standard", Calculation(func['jinja_to_property'], Params((ParamValue("disabled")), kwargs={'__internal_jinja': ParamValue("disabled_1.rougail.leader.follower"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['../rougail-tests/structures/44_9calculated_default_leadership_leader/rougail/00-base.yml']), '__internal_attribute': ParamValue("disabled"), '__internal_variable': ParamValue("1.rougail.leader.follower"), 'when': ParamValue(True), 'inverse': ParamValue(False), '_.leader': ParamOption(option_4, notraisepropertyerror=True)}), help_function=func['jinja_to_property_help'])}), informations={'type': 'string'}) optiondescription_3 = Leadership(name="leader", doc="leader", children=[option_4, option_5], properties=frozenset({"standard"})) optiondescription_2 = OptionDescription(name="rougail", doc="Rougail", group_type=groups.namespace, children=[optiondescription_3], properties=frozenset({"standard"})) optiondescription_1 = OptionDescription(name="1", doc="1", children=[optiondescription_2], properties=frozenset({"standard"})) option_9 = StrOption(name="leader", doc="a leader", multi=True, default=["a", "b"], properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) -option_10 = StrOption(name="follower", doc="a follower", multi=True, default=Calculation(func['calc_value'], Params((ParamOption(option_9)))), properties=frozenset({"mandatory", "standard", Calculation(func['jinja_to_property'], Params((ParamValue("disabled")), kwargs={'__internal_jinja': ParamValue("disabled_2.rougail.leader.follower"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['tests/dictionaries/44_9calculated_default_leadership_leader/dictionaries/rougail/00-base.yml']), '__internal_attribute': ParamValue("disabled"), '__internal_variable': ParamValue("2.rougail.leader.follower"), 'when': ParamValue(True), 'inverse': ParamValue(False), '_.leader': ParamOption(option_9, notraisepropertyerror=True)}), help_function=func['jinja_to_property_help'])}), informations={'type': 'string'}) +option_10 = StrOption(name="follower", doc="a follower", multi=True, default=Calculation(func['calc_value'], Params((ParamOption(option_9)))), properties=frozenset({"mandatory", "standard", Calculation(func['jinja_to_property'], Params((ParamValue("disabled")), kwargs={'__internal_jinja': ParamValue("disabled_2.rougail.leader.follower"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['../rougail-tests/structures/44_9calculated_default_leadership_leader/rougail/00-base.yml']), '__internal_attribute': ParamValue("disabled"), '__internal_variable': ParamValue("2.rougail.leader.follower"), 'when': ParamValue(True), 'inverse': ParamValue(False), '_.leader': ParamOption(option_9, notraisepropertyerror=True)}), help_function=func['jinja_to_property_help'])}), informations={'type': 'string'}) optiondescription_8 = Leadership(name="leader", doc="leader", children=[option_9, option_10], properties=frozenset({"standard"})) optiondescription_7 = OptionDescription(name="rougail", doc="Rougail", group_type=groups.namespace, children=[optiondescription_8], properties=frozenset({"standard"})) optiondescription_6 = OptionDescription(name="2", doc="2", children=[optiondescription_7], properties=frozenset({"standard"})) diff --git a/tests/dictionaries/60_0family_dynamic/dictionaries/rougail/00-base.yml b/tests/dictionaries/60_0family_dynamic/dictionaries/rougail/00-base.yml deleted file mode 100644 index 1a96ff090..000000000 --- a/tests/dictionaries/60_0family_dynamic/dictionaries/rougail/00-base.yml +++ /dev/null @@ -1,12 +0,0 @@ ---- -version: '1.1' - -var: # A suffix variable - - val1 - - val2 - -"dyn{{ identifier }}": - description: A dynamic family - dynamic: - 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 2e382f210..c6403878e 100644 --- a/tests/dictionaries/60_0family_dynamic/tiramisu/base.py +++ b/tests/dictionaries/60_0family_dynamic/tiramisu/base.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') try: groups.namespace except: diff --git a/tests/dictionaries/60_0family_dynamic/tiramisu/multi.py b/tests/dictionaries/60_0family_dynamic/tiramisu/multi.py index 13c4f9592..34f484601 100644 --- a/tests/dictionaries/60_0family_dynamic/tiramisu/multi.py +++ b/tests/dictionaries/60_0family_dynamic/tiramisu/multi.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') try: groups.namespace except: diff --git a/tests/dictionaries/60_0family_dynamic/tiramisu/no_namespace.py b/tests/dictionaries/60_0family_dynamic/tiramisu/no_namespace.py index dcd83fc63..e85cc0e9b 100644 --- a/tests/dictionaries/60_0family_dynamic/tiramisu/no_namespace.py +++ b/tests/dictionaries/60_0family_dynamic/tiramisu/no_namespace.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") ALLOWED_LEADER_PROPERTIES.add("standard") ALLOWED_LEADER_PROPERTIES.add("advanced") diff --git a/tests/dictionaries/60_0family_dynamic_1_0/dictionaries/rougail/00-base.yml b/tests/dictionaries/60_0family_dynamic_1_0/dictionaries/rougail/00-base.yml deleted file mode 100644 index 01b1c3f5f..000000000 --- a/tests/dictionaries/60_0family_dynamic_1_0/dictionaries/rougail/00-base.yml +++ /dev/null @@ -1,14 +0,0 @@ ---- -version: '1.0' -var: - description: A suffix variable - multi: true - default: - - val1 - - val2 -dyn: - type: dynamic - variable: rougail.var - vardyn: - description: Dynamic variable - mandatory: false diff --git a/tests/dictionaries/60_0family_dynamic_1_0/force_namespace b/tests/dictionaries/60_0family_dynamic_1_0/force_namespace deleted file mode 100644 index e69de29bb..000000000 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 889eb5dd7..714a19a09 100644 --- a/tests/dictionaries/60_0family_dynamic_1_0/tiramisu/base.py +++ b/tests/dictionaries/60_0family_dynamic_1_0/tiramisu/base.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') try: groups.namespace except: 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 72fb7224c..f619bf04e 100644 --- a/tests/dictionaries/60_0family_dynamic_1_0/tiramisu/multi.py +++ b/tests/dictionaries/60_0family_dynamic_1_0/tiramisu/multi.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') try: groups.namespace except: @@ -12,12 +12,12 @@ ALLOWED_LEADER_PROPERTIES.add("standard") ALLOWED_LEADER_PROPERTIES.add("advanced") option_3 = StrOption(name="var", doc="A suffix variable", multi=True, default=["val1", "val2"], default_multi="val1", properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) option_5 = StrOption(name="vardyn", doc="Dynamic variable", properties=frozenset({"standard"}), informations={'type': 'string'}) -optiondescription_4 = ConvertDynOptionDescription(name="dyn{{ identifier }}", doc="dyn{{ identifier }}", identifiers=Calculation(func['calc_value'], Params((ParamOption(option_3, notraisepropertyerror=True)), kwargs={'allow_none': ParamValue(True)})), children=[option_5], properties=frozenset({"standard"}), informations={'dynamic_variable': '1.var'}) +optiondescription_4 = ConvertDynOptionDescription(name="dyn{{ identifier }}", doc="dyn{{ identifier }}", identifiers=Calculation(func['calc_value'], Params((ParamOption(option_3, notraisepropertyerror=True)), kwargs={'allow_none': ParamValue(True)})), children=[option_5], properties=frozenset({"standard"}), informations={'dynamic_variable': 'rougail.var'}) optiondescription_2 = OptionDescription(name="rougail", doc="Rougail", group_type=groups.namespace, children=[option_3, optiondescription_4], properties=frozenset({"standard"})) optiondescription_1 = OptionDescription(name="1", doc="1", children=[optiondescription_2], properties=frozenset({"standard"})) option_8 = StrOption(name="var", doc="A suffix variable", multi=True, default=["val1", "val2"], default_multi="val1", properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) option_10 = StrOption(name="vardyn", doc="Dynamic variable", properties=frozenset({"standard"}), informations={'type': 'string'}) -optiondescription_9 = ConvertDynOptionDescription(name="dyn{{ identifier }}", doc="dyn{{ identifier }}", identifiers=Calculation(func['calc_value'], Params((ParamOption(option_8, notraisepropertyerror=True)), kwargs={'allow_none': ParamValue(True)})), children=[option_10], properties=frozenset({"standard"}), informations={'dynamic_variable': '2.var'}) +optiondescription_9 = ConvertDynOptionDescription(name="dyn{{ identifier }}", doc="dyn{{ identifier }}", identifiers=Calculation(func['calc_value'], Params((ParamOption(option_8, notraisepropertyerror=True)), kwargs={'allow_none': ParamValue(True)})), children=[option_10], properties=frozenset({"standard"}), informations={'dynamic_variable': 'rougail.var'}) optiondescription_7 = OptionDescription(name="rougail", doc="Rougail", group_type=groups.namespace, children=[option_8, optiondescription_9], properties=frozenset({"standard"})) optiondescription_6 = OptionDescription(name="2", doc="2", children=[optiondescription_7], properties=frozenset({"standard"})) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_1, optiondescription_6]) diff --git a/tests/dictionaries/60_0family_dynamic_1_0_empty/dictionaries/rougail/00-base.yml b/tests/dictionaries/60_0family_dynamic_1_0_empty/dictionaries/rougail/00-base.yml deleted file mode 100644 index 237a3e937..000000000 --- a/tests/dictionaries/60_0family_dynamic_1_0_empty/dictionaries/rougail/00-base.yml +++ /dev/null @@ -1,15 +0,0 @@ ---- -version: '1.0' -var: - description: A suffix variable - multi: true - mandatory: false - test: - - val1 - - val2 -dyn: - type: dynamic - variable: rougail.var - vardyn: - description: Dynamic variable - mandatory: false diff --git a/tests/dictionaries/60_0family_dynamic_1_0_empty/force_namespace b/tests/dictionaries/60_0family_dynamic_1_0_empty/force_namespace deleted file mode 100644 index e69de29bb..000000000 diff --git a/tests/dictionaries/60_0family_dynamic_1_0_empty/tiramisu/base.py b/tests/dictionaries/60_0family_dynamic_1_0_empty/tiramisu/base.py index 0c28e692d..289986683 100644 --- a/tests/dictionaries/60_0family_dynamic_1_0_empty/tiramisu/base.py +++ b/tests/dictionaries/60_0family_dynamic_1_0_empty/tiramisu/base.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') try: groups.namespace except: diff --git a/tests/dictionaries/60_0family_dynamic_1_0_empty/tiramisu/multi.py b/tests/dictionaries/60_0family_dynamic_1_0_empty/tiramisu/multi.py index da32be7e7..15f0b6619 100644 --- a/tests/dictionaries/60_0family_dynamic_1_0_empty/tiramisu/multi.py +++ b/tests/dictionaries/60_0family_dynamic_1_0_empty/tiramisu/multi.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') try: groups.namespace except: @@ -12,12 +12,12 @@ ALLOWED_LEADER_PROPERTIES.add("standard") ALLOWED_LEADER_PROPERTIES.add("advanced") option_3 = StrOption(name="var", doc="A suffix variable", multi=True, properties=frozenset({"standard"}), informations={'type': 'string', 'test': ('val1', 'val2')}) option_5 = StrOption(name="vardyn", doc="Dynamic variable", properties=frozenset({"standard"}), informations={'type': 'string'}) -optiondescription_4 = ConvertDynOptionDescription(name="dyn{{ identifier }}", doc="dyn{{ identifier }}", identifiers=Calculation(func['calc_value'], Params((ParamOption(option_3, notraisepropertyerror=True)), kwargs={'allow_none': ParamValue(True)})), children=[option_5], properties=frozenset({"standard"}), informations={'dynamic_variable': '1.var'}) +optiondescription_4 = ConvertDynOptionDescription(name="dyn{{ identifier }}", doc="dyn{{ identifier }}", identifiers=Calculation(func['calc_value'], Params((ParamOption(option_3, notraisepropertyerror=True)), kwargs={'allow_none': ParamValue(True)})), children=[option_5], properties=frozenset({"standard"}), informations={'dynamic_variable': 'rougail.var'}) optiondescription_2 = OptionDescription(name="rougail", doc="Rougail", group_type=groups.namespace, children=[option_3, optiondescription_4], properties=frozenset({"standard"})) optiondescription_1 = OptionDescription(name="1", doc="1", children=[optiondescription_2], properties=frozenset({"standard"})) option_8 = StrOption(name="var", doc="A suffix variable", multi=True, properties=frozenset({"standard"}), informations={'type': 'string', 'test': ('val1', 'val2')}) option_10 = StrOption(name="vardyn", doc="Dynamic variable", properties=frozenset({"standard"}), informations={'type': 'string'}) -optiondescription_9 = ConvertDynOptionDescription(name="dyn{{ identifier }}", doc="dyn{{ identifier }}", identifiers=Calculation(func['calc_value'], Params((ParamOption(option_8, notraisepropertyerror=True)), kwargs={'allow_none': ParamValue(True)})), children=[option_10], properties=frozenset({"standard"}), informations={'dynamic_variable': '2.var'}) +optiondescription_9 = ConvertDynOptionDescription(name="dyn{{ identifier }}", doc="dyn{{ identifier }}", identifiers=Calculation(func['calc_value'], Params((ParamOption(option_8, notraisepropertyerror=True)), kwargs={'allow_none': ParamValue(True)})), children=[option_10], properties=frozenset({"standard"}), informations={'dynamic_variable': 'rougail.var'}) optiondescription_7 = OptionDescription(name="rougail", doc="Rougail", group_type=groups.namespace, children=[option_8, optiondescription_9], properties=frozenset({"standard"})) optiondescription_6 = OptionDescription(name="2", doc="2", children=[optiondescription_7], properties=frozenset({"standard"})) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_1, optiondescription_6]) diff --git a/tests/dictionaries/60_0family_dynamic_1_0_type/dictionaries/rougail/00-base.yml b/tests/dictionaries/60_0family_dynamic_1_0_type/dictionaries/rougail/00-base.yml deleted file mode 100644 index 0b2eadcce..000000000 --- a/tests/dictionaries/60_0family_dynamic_1_0_type/dictionaries/rougail/00-base.yml +++ /dev/null @@ -1,13 +0,0 @@ ---- -version: '1.0' -var: - description: A suffix variable - multi: true - default: - - val1 - - val2 -dyn: - _type: dynamic - variable: rougail.var - vardyn: - description: A dyn variable diff --git a/tests/dictionaries/60_0family_dynamic_1_0_type/force_namespace b/tests/dictionaries/60_0family_dynamic_1_0_type/force_namespace deleted file mode 100644 index e69de29bb..000000000 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 c3999340f..0acb997f9 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 @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') try: groups.namespace except: 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 1114b870f..7150f473a 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 @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') try: groups.namespace except: @@ -12,12 +12,12 @@ ALLOWED_LEADER_PROPERTIES.add("standard") ALLOWED_LEADER_PROPERTIES.add("advanced") option_3 = StrOption(name="var", doc="A suffix variable", multi=True, default=["val1", "val2"], default_multi="val1", properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) option_5 = StrOption(name="vardyn", doc="A dyn variable", properties=frozenset({"basic", "mandatory"}), informations={'type': 'string'}) -optiondescription_4 = ConvertDynOptionDescription(name="dyn{{ identifier }}", doc="dyn{{ identifier }}", identifiers=Calculation(func['calc_value'], Params((ParamOption(option_3, notraisepropertyerror=True)), kwargs={'allow_none': ParamValue(True)})), children=[option_5], properties=frozenset({"basic"}), informations={'dynamic_variable': '1.var'}) +optiondescription_4 = ConvertDynOptionDescription(name="dyn{{ identifier }}", doc="dyn{{ identifier }}", identifiers=Calculation(func['calc_value'], Params((ParamOption(option_3, notraisepropertyerror=True)), kwargs={'allow_none': ParamValue(True)})), children=[option_5], properties=frozenset({"basic"}), informations={'dynamic_variable': 'rougail.var'}) optiondescription_2 = OptionDescription(name="rougail", doc="Rougail", group_type=groups.namespace, children=[option_3, optiondescription_4], properties=frozenset({"basic"})) optiondescription_1 = OptionDescription(name="1", doc="1", children=[optiondescription_2], properties=frozenset({"basic"})) option_8 = StrOption(name="var", doc="A suffix variable", multi=True, default=["val1", "val2"], default_multi="val1", properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) option_10 = StrOption(name="vardyn", doc="A dyn variable", properties=frozenset({"basic", "mandatory"}), informations={'type': 'string'}) -optiondescription_9 = ConvertDynOptionDescription(name="dyn{{ identifier }}", doc="dyn{{ identifier }}", identifiers=Calculation(func['calc_value'], Params((ParamOption(option_8, notraisepropertyerror=True)), kwargs={'allow_none': ParamValue(True)})), children=[option_10], properties=frozenset({"basic"}), informations={'dynamic_variable': '2.var'}) +optiondescription_9 = ConvertDynOptionDescription(name="dyn{{ identifier }}", doc="dyn{{ identifier }}", identifiers=Calculation(func['calc_value'], Params((ParamOption(option_8, notraisepropertyerror=True)), kwargs={'allow_none': ParamValue(True)})), children=[option_10], properties=frozenset({"basic"}), informations={'dynamic_variable': 'rougail.var'}) optiondescription_7 = OptionDescription(name="rougail", doc="Rougail", group_type=groups.namespace, children=[option_8, optiondescription_9], 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/60_0family_dynamic_1_0_type_empty/dictionaries/rougail/00-base.yml b/tests/dictionaries/60_0family_dynamic_1_0_type_empty/dictionaries/rougail/00-base.yml deleted file mode 100644 index 2744d9728..000000000 --- a/tests/dictionaries/60_0family_dynamic_1_0_type_empty/dictionaries/rougail/00-base.yml +++ /dev/null @@ -1,14 +0,0 @@ ---- -version: '1.0' -var: - description: A suffix variable - multi: true - mandatory: false - test: - - val1 - - val2 -dyn: - _type: dynamic - variable: rougail.var - vardyn: - description: A dyn variable diff --git a/tests/dictionaries/60_0family_dynamic_1_0_type_empty/force_namespace b/tests/dictionaries/60_0family_dynamic_1_0_type_empty/force_namespace deleted file mode 100644 index e69de29bb..000000000 diff --git a/tests/dictionaries/60_0family_dynamic_1_0_type_empty/tiramisu/base.py b/tests/dictionaries/60_0family_dynamic_1_0_type_empty/tiramisu/base.py index 1e324e102..4d01a2c4d 100644 --- a/tests/dictionaries/60_0family_dynamic_1_0_type_empty/tiramisu/base.py +++ b/tests/dictionaries/60_0family_dynamic_1_0_type_empty/tiramisu/base.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') try: groups.namespace except: diff --git a/tests/dictionaries/60_0family_dynamic_1_0_type_empty/tiramisu/multi.py b/tests/dictionaries/60_0family_dynamic_1_0_type_empty/tiramisu/multi.py index 74d8a4b9b..77303ad1d 100644 --- a/tests/dictionaries/60_0family_dynamic_1_0_type_empty/tiramisu/multi.py +++ b/tests/dictionaries/60_0family_dynamic_1_0_type_empty/tiramisu/multi.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') try: groups.namespace except: @@ -12,12 +12,12 @@ ALLOWED_LEADER_PROPERTIES.add("standard") ALLOWED_LEADER_PROPERTIES.add("advanced") option_3 = StrOption(name="var", doc="A suffix variable", multi=True, properties=frozenset({"standard"}), informations={'type': 'string', 'test': ('val1', 'val2')}) option_5 = StrOption(name="vardyn", doc="A dyn variable", properties=frozenset({"basic", "mandatory"}), informations={'type': 'string'}) -optiondescription_4 = ConvertDynOptionDescription(name="dyn{{ identifier }}", doc="dyn{{ identifier }}", identifiers=Calculation(func['calc_value'], Params((ParamOption(option_3, notraisepropertyerror=True)), kwargs={'allow_none': ParamValue(True)})), children=[option_5], properties=frozenset({"basic"}), informations={'dynamic_variable': '1.var'}) +optiondescription_4 = ConvertDynOptionDescription(name="dyn{{ identifier }}", doc="dyn{{ identifier }}", identifiers=Calculation(func['calc_value'], Params((ParamOption(option_3, notraisepropertyerror=True)), kwargs={'allow_none': ParamValue(True)})), children=[option_5], properties=frozenset({"basic"}), informations={'dynamic_variable': 'rougail.var'}) optiondescription_2 = OptionDescription(name="rougail", doc="Rougail", group_type=groups.namespace, children=[option_3, optiondescription_4], properties=frozenset({"basic"})) optiondescription_1 = OptionDescription(name="1", doc="1", children=[optiondescription_2], properties=frozenset({"basic"})) option_8 = StrOption(name="var", doc="A suffix variable", multi=True, properties=frozenset({"standard"}), informations={'type': 'string', 'test': ('val1', 'val2')}) option_10 = StrOption(name="vardyn", doc="A dyn variable", properties=frozenset({"basic", "mandatory"}), informations={'type': 'string'}) -optiondescription_9 = ConvertDynOptionDescription(name="dyn{{ identifier }}", doc="dyn{{ identifier }}", identifiers=Calculation(func['calc_value'], Params((ParamOption(option_8, notraisepropertyerror=True)), kwargs={'allow_none': ParamValue(True)})), children=[option_10], properties=frozenset({"basic"}), informations={'dynamic_variable': '2.var'}) +optiondescription_9 = ConvertDynOptionDescription(name="dyn{{ identifier }}", doc="dyn{{ identifier }}", identifiers=Calculation(func['calc_value'], Params((ParamOption(option_8, notraisepropertyerror=True)), kwargs={'allow_none': ParamValue(True)})), children=[option_10], properties=frozenset({"basic"}), informations={'dynamic_variable': 'rougail.var'}) optiondescription_7 = OptionDescription(name="rougail", doc="Rougail", group_type=groups.namespace, children=[option_8, optiondescription_9], 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/60_0family_dynamic_1_1/dictionaries/rougail/00-base.yml b/tests/dictionaries/60_0family_dynamic_1_1/dictionaries/rougail/00-base.yml deleted file mode 100644 index 518aff09e..000000000 --- a/tests/dictionaries/60_0family_dynamic_1_1/dictionaries/rougail/00-base.yml +++ /dev/null @@ -1,11 +0,0 @@ ---- -version: '1.1' -var: # A suffix variable - - val1 - - val2 -dyn: - type: dynamic - description: A dynamic family - variable: _.var - vardyn: - description: A dynamic variable 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 dd9a40c37..40a778630 100644 --- a/tests/dictionaries/60_0family_dynamic_1_1/tiramisu/base.py +++ b/tests/dictionaries/60_0family_dynamic_1_1/tiramisu/base.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') try: groups.namespace except: 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 0740ed11f..0ded7c3f6 100644 --- a/tests/dictionaries/60_0family_dynamic_1_1/tiramisu/multi.py +++ b/tests/dictionaries/60_0family_dynamic_1_1/tiramisu/multi.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') try: groups.namespace except: 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 95e80a0ed..b182dadcb 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 @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") ALLOWED_LEADER_PROPERTIES.add("standard") ALLOWED_LEADER_PROPERTIES.add("advanced") diff --git a/tests/dictionaries/60_0family_dynamic_1_1_empty/dictionaries/rougail/00-base.yml b/tests/dictionaries/60_0family_dynamic_1_1_empty/dictionaries/rougail/00-base.yml deleted file mode 100644 index ed09df4e2..000000000 --- a/tests/dictionaries/60_0family_dynamic_1_1_empty/dictionaries/rougail/00-base.yml +++ /dev/null @@ -1,15 +0,0 @@ ---- -version: '1.1' -var: - description: A suffix variable - multi: true - mandatory: false - test: - - val1 - - val2 -dyn: - type: dynamic - description: A dynamic family - variable: _.var - vardyn: - description: A dynamic variable diff --git a/tests/dictionaries/60_0family_dynamic_1_1_empty/tiramisu/base.py b/tests/dictionaries/60_0family_dynamic_1_1_empty/tiramisu/base.py index eb6995005..17d6efdf3 100644 --- a/tests/dictionaries/60_0family_dynamic_1_1_empty/tiramisu/base.py +++ b/tests/dictionaries/60_0family_dynamic_1_1_empty/tiramisu/base.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') try: groups.namespace except: diff --git a/tests/dictionaries/60_0family_dynamic_1_1_empty/tiramisu/multi.py b/tests/dictionaries/60_0family_dynamic_1_1_empty/tiramisu/multi.py index b7afa001f..4027bfc51 100644 --- a/tests/dictionaries/60_0family_dynamic_1_1_empty/tiramisu/multi.py +++ b/tests/dictionaries/60_0family_dynamic_1_1_empty/tiramisu/multi.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') try: groups.namespace except: diff --git a/tests/dictionaries/60_0family_dynamic_1_1_empty/tiramisu/no_namespace.py b/tests/dictionaries/60_0family_dynamic_1_1_empty/tiramisu/no_namespace.py index 2117c9f5f..a3ffe5571 100644 --- a/tests/dictionaries/60_0family_dynamic_1_1_empty/tiramisu/no_namespace.py +++ b/tests/dictionaries/60_0family_dynamic_1_1_empty/tiramisu/no_namespace.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") ALLOWED_LEADER_PROPERTIES.add("standard") ALLOWED_LEADER_PROPERTIES.add("advanced") diff --git a/tests/dictionaries/60_0family_dynamic_empty/dictionaries/rougail/00-base.yml b/tests/dictionaries/60_0family_dynamic_empty/dictionaries/rougail/00-base.yml deleted file mode 100644 index 02d1fbb03..000000000 --- a/tests/dictionaries/60_0family_dynamic_empty/dictionaries/rougail/00-base.yml +++ /dev/null @@ -1,13 +0,0 @@ ---- -version: '1.1' - -var: - description: A suffix variable - mandatory: false - multi: true - -"dyn{{ identifier }}": - description: A dynamic family - dynamic: - variable: _.var - var: # A dynamic variable diff --git a/tests/dictionaries/60_0family_dynamic_empty/tiramisu/base.py b/tests/dictionaries/60_0family_dynamic_empty/tiramisu/base.py index 91f429bc5..8f6fdea12 100644 --- a/tests/dictionaries/60_0family_dynamic_empty/tiramisu/base.py +++ b/tests/dictionaries/60_0family_dynamic_empty/tiramisu/base.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') try: groups.namespace except: diff --git a/tests/dictionaries/60_0family_dynamic_empty/tiramisu/multi.py b/tests/dictionaries/60_0family_dynamic_empty/tiramisu/multi.py index 4e7be6b04..0750c070f 100644 --- a/tests/dictionaries/60_0family_dynamic_empty/tiramisu/multi.py +++ b/tests/dictionaries/60_0family_dynamic_empty/tiramisu/multi.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') try: groups.namespace except: diff --git a/tests/dictionaries/60_0family_dynamic_empty/tiramisu/no_namespace.py b/tests/dictionaries/60_0family_dynamic_empty/tiramisu/no_namespace.py index 799e718a8..930154ad3 100644 --- a/tests/dictionaries/60_0family_dynamic_empty/tiramisu/no_namespace.py +++ b/tests/dictionaries/60_0family_dynamic_empty/tiramisu/no_namespace.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") ALLOWED_LEADER_PROPERTIES.add("standard") ALLOWED_LEADER_PROPERTIES.add("advanced") 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 deleted file mode 100644 index 47ade725f..000000000 --- a/tests/dictionaries/60_0family_dynamic_jinja_number/dictionaries/rougail/00-base.yml +++ /dev/null @@ -1,16 +0,0 @@ ---- -version: '1.1' -var: # a suffix variable - - 1 - - 2 -"dyn{{ identifier }}": - description: a dynamic family - dynamic: - variable: _.var - var: val # a variable inside dynamic family -var2: - description: a variable - default: - jinja: | - {{ rougail.dyn1.var }} - description: get the value of rougail.dyn1.var diff --git a/tests/dictionaries/60_0family_dynamic_jinja_number/force_namespace b/tests/dictionaries/60_0family_dynamic_jinja_number/force_namespace deleted file mode 100644 index e69de29bb..000000000 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 7c1bc2a5c..7830f3c90 100644 --- a/tests/dictionaries/60_0family_dynamic_jinja_number/tiramisu/base.py +++ b/tests/dictionaries/60_0family_dynamic_jinja_number/tiramisu/base.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') try: groups.namespace except: @@ -14,6 +14,6 @@ dict_env['default_rougail.var2'] = "{{ rougail.dyn1.var }}\n" option_2 = IntOption(name="var", doc="a suffix variable", multi=True, default=[1, 2], default_multi=1, properties=frozenset({"mandatory", "standard"}), informations={'type': 'number'}) option_4 = StrOption(name="var", doc="a variable inside dynamic family", default="val", properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) optiondescription_3 = ConvertDynOptionDescription(name="dyn{{ identifier }}", doc="a dynamic family", identifiers=Calculation(func['calc_value'], Params((ParamOption(option_2)))), children=[option_4], properties=frozenset({"standard"}), informations={'dynamic_variable': 'rougail.var'}) -option_5 = StrOption(name="var2", doc="a variable", default=Calculation(func['jinja_to_function'], Params((), kwargs={'__internal_jinja': ParamValue("default_rougail.var2"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['tests/dictionaries/60_0family_dynamic_jinja_number/dictionaries/rougail/00-base.yml']), '__internal_attribute': ParamValue("default"), '__internal_variable': ParamValue("rougail.var2"), 'rougail.dyn1.var': ParamDynOption(option_4, ["1"], optional=True, notraisepropertyerror=True)})), properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) +option_5 = StrOption(name="var2", doc="a variable", default=Calculation(func['jinja_to_function'], Params((), kwargs={'__internal_jinja': ParamValue("default_rougail.var2"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['../rougail-tests/structures/60_0family_dynamic_jinja_number/rougail/00-base.yml']), '__internal_attribute': ParamValue("default"), '__internal_variable': ParamValue("rougail.var2"), 'rougail.dyn1.var': ParamDynOption(option_4, ["1"], optional=True, notraisepropertyerror=True)})), properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) optiondescription_1 = OptionDescription(name="rougail", doc="Rougail", group_type=groups.namespace, children=[option_2, optiondescription_3, option_5], properties=frozenset({"standard"})) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_1]) 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 a023801c6..2aa0f82cd 100644 --- a/tests/dictionaries/60_0family_dynamic_jinja_number/tiramisu/multi.py +++ b/tests/dictionaries/60_0family_dynamic_jinja_number/tiramisu/multi.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') try: groups.namespace except: @@ -15,13 +15,13 @@ dict_env['default_2.rougail.var2'] = "{{ rougail.dyn1.var }}\n" option_3 = IntOption(name="var", doc="a suffix variable", multi=True, default=[1, 2], default_multi=1, properties=frozenset({"mandatory", "standard"}), informations={'type': 'number'}) option_5 = StrOption(name="var", doc="a variable inside dynamic family", default="val", properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) optiondescription_4 = ConvertDynOptionDescription(name="dyn{{ identifier }}", doc="a dynamic family", identifiers=Calculation(func['calc_value'], Params((ParamOption(option_3)))), children=[option_5], properties=frozenset({"standard"}), informations={'dynamic_variable': '1.rougail.var'}) -option_6 = StrOption(name="var2", doc="a variable", default=Calculation(func['jinja_to_function'], Params((), kwargs={'__internal_jinja': ParamValue("default_1.rougail.var2"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['tests/dictionaries/60_0family_dynamic_jinja_number/dictionaries/rougail/00-base.yml']), '__internal_attribute': ParamValue("default"), '__internal_variable': ParamValue("1.rougail.var2"), 'rougail.dyn1.var': ParamDynOption(option_5, ["1"], optional=True, notraisepropertyerror=True)})), properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) +option_6 = StrOption(name="var2", doc="a variable", default=Calculation(func['jinja_to_function'], Params((), kwargs={'__internal_jinja': ParamValue("default_1.rougail.var2"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['../rougail-tests/structures/60_0family_dynamic_jinja_number/rougail/00-base.yml']), '__internal_attribute': ParamValue("default"), '__internal_variable': ParamValue("1.rougail.var2"), 'rougail.dyn1.var': ParamDynOption(option_5, ["1"], optional=True, notraisepropertyerror=True)})), properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) optiondescription_2 = OptionDescription(name="rougail", doc="Rougail", group_type=groups.namespace, children=[option_3, optiondescription_4, option_6], properties=frozenset({"standard"})) optiondescription_1 = OptionDescription(name="1", doc="1", children=[optiondescription_2], properties=frozenset({"standard"})) option_9 = IntOption(name="var", doc="a suffix variable", multi=True, default=[1, 2], default_multi=1, properties=frozenset({"mandatory", "standard"}), informations={'type': 'number'}) option_11 = StrOption(name="var", doc="a variable inside dynamic family", default="val", properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) optiondescription_10 = ConvertDynOptionDescription(name="dyn{{ identifier }}", doc="a dynamic family", identifiers=Calculation(func['calc_value'], Params((ParamOption(option_9)))), children=[option_11], properties=frozenset({"standard"}), informations={'dynamic_variable': '2.rougail.var'}) -option_12 = StrOption(name="var2", doc="a variable", default=Calculation(func['jinja_to_function'], Params((), kwargs={'__internal_jinja': ParamValue("default_2.rougail.var2"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['tests/dictionaries/60_0family_dynamic_jinja_number/dictionaries/rougail/00-base.yml']), '__internal_attribute': ParamValue("default"), '__internal_variable': ParamValue("2.rougail.var2"), 'rougail.dyn1.var': ParamDynOption(option_11, ["1"], optional=True, notraisepropertyerror=True)})), properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) +option_12 = StrOption(name="var2", doc="a variable", default=Calculation(func['jinja_to_function'], Params((), kwargs={'__internal_jinja': ParamValue("default_2.rougail.var2"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['../rougail-tests/structures/60_0family_dynamic_jinja_number/rougail/00-base.yml']), '__internal_attribute': ParamValue("default"), '__internal_variable': ParamValue("2.rougail.var2"), 'rougail.dyn1.var': ParamDynOption(option_11, ["1"], optional=True, notraisepropertyerror=True)})), properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) optiondescription_8 = OptionDescription(name="rougail", doc="Rougail", group_type=groups.namespace, children=[option_9, optiondescription_10, option_12], properties=frozenset({"standard"})) optiondescription_7 = OptionDescription(name="2", doc="2", children=[optiondescription_8], properties=frozenset({"standard"})) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_1, optiondescription_7]) diff --git a/tests/dictionaries/60_0family_dynamic_jinja_number_empty/dictionaries/rougail/00-base.yml b/tests/dictionaries/60_0family_dynamic_jinja_number_empty/dictionaries/rougail/00-base.yml deleted file mode 100644 index 85367d28f..000000000 --- a/tests/dictionaries/60_0family_dynamic_jinja_number_empty/dictionaries/rougail/00-base.yml +++ /dev/null @@ -1,23 +0,0 @@ ---- -version: '1.1' -var: - description: a suffix variable - multi: true - mandatory: false - type: number - test: - - 1 - - 2 -"dyn{{ identifier }}": - description: a dynamic family - dynamic: - variable: _.var - var: val # a variable inside dynamic family -var2: - description: a variable - default: - jinja: | - {% if rougail.dyn1 is defined %} - {{ rougail.dyn1.var }} - {% endif %} - description: get the value of rougail.dyn1.var diff --git a/tests/dictionaries/60_0family_dynamic_jinja_number_empty/force_namespace b/tests/dictionaries/60_0family_dynamic_jinja_number_empty/force_namespace deleted file mode 100644 index e69de29bb..000000000 diff --git a/tests/dictionaries/60_0family_dynamic_jinja_number_empty/tiramisu/base.py b/tests/dictionaries/60_0family_dynamic_jinja_number_empty/tiramisu/base.py index 72e82a110..f0a875df8 100644 --- a/tests/dictionaries/60_0family_dynamic_jinja_number_empty/tiramisu/base.py +++ b/tests/dictionaries/60_0family_dynamic_jinja_number_empty/tiramisu/base.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') try: groups.namespace except: @@ -14,6 +14,6 @@ dict_env['default_rougail.var2'] = "{% if rougail.dyn1 is defined %}\n{{ rougail option_2 = IntOption(name="var", doc="a suffix variable", multi=True, properties=frozenset({"standard"}), informations={'type': 'number', 'test': (1, 2)}) option_4 = StrOption(name="var", doc="a variable inside dynamic family", default="val", properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) optiondescription_3 = ConvertDynOptionDescription(name="dyn{{ identifier }}", doc="a dynamic family", identifiers=Calculation(func['calc_value'], Params((ParamOption(option_2)))), children=[option_4], properties=frozenset({"standard"}), informations={'dynamic_variable': 'rougail.var'}) -option_5 = StrOption(name="var2", doc="a variable", default=Calculation(func['jinja_to_function'], Params((), kwargs={'__internal_jinja': ParamValue("default_rougail.var2"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['tests/dictionaries/60_0family_dynamic_jinja_number_empty/dictionaries/rougail/00-base.yml']), '__internal_attribute': ParamValue("default"), '__internal_variable': ParamValue("rougail.var2"), 'rougail.dyn1.var': ParamDynOption(option_4, ["1"], optional=True, notraisepropertyerror=True)})), properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) +option_5 = StrOption(name="var2", doc="a variable", default=Calculation(func['jinja_to_function'], Params((), kwargs={'__internal_jinja': ParamValue("default_rougail.var2"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['../rougail-tests/structures/60_0family_dynamic_jinja_number_empty/rougail/00-base.yml']), '__internal_attribute': ParamValue("default"), '__internal_variable': ParamValue("rougail.var2"), 'rougail.dyn1.var': ParamDynOption(option_4, ["1"], optional=True, notraisepropertyerror=True)})), properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) optiondescription_1 = OptionDescription(name="rougail", doc="Rougail", group_type=groups.namespace, children=[option_2, optiondescription_3, option_5], properties=frozenset({"standard"})) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_1]) diff --git a/tests/dictionaries/60_0family_dynamic_jinja_number_empty/tiramisu/multi.py b/tests/dictionaries/60_0family_dynamic_jinja_number_empty/tiramisu/multi.py index 1b141ddb4..56248da9c 100644 --- a/tests/dictionaries/60_0family_dynamic_jinja_number_empty/tiramisu/multi.py +++ b/tests/dictionaries/60_0family_dynamic_jinja_number_empty/tiramisu/multi.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') try: groups.namespace except: @@ -15,13 +15,13 @@ dict_env['default_2.rougail.var2'] = "{% if rougail.dyn1 is defined %}\n{{ rouga option_3 = IntOption(name="var", doc="a suffix variable", multi=True, properties=frozenset({"standard"}), informations={'type': 'number', 'test': (1, 2)}) option_5 = StrOption(name="var", doc="a variable inside dynamic family", default="val", properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) optiondescription_4 = ConvertDynOptionDescription(name="dyn{{ identifier }}", doc="a dynamic family", identifiers=Calculation(func['calc_value'], Params((ParamOption(option_3)))), children=[option_5], properties=frozenset({"standard"}), informations={'dynamic_variable': '1.rougail.var'}) -option_6 = StrOption(name="var2", doc="a variable", default=Calculation(func['jinja_to_function'], Params((), kwargs={'__internal_jinja': ParamValue("default_1.rougail.var2"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['tests/dictionaries/60_0family_dynamic_jinja_number_empty/dictionaries/rougail/00-base.yml']), '__internal_attribute': ParamValue("default"), '__internal_variable': ParamValue("1.rougail.var2"), 'rougail.dyn1.var': ParamDynOption(option_5, ["1"], optional=True, notraisepropertyerror=True)})), properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) +option_6 = StrOption(name="var2", doc="a variable", default=Calculation(func['jinja_to_function'], Params((), kwargs={'__internal_jinja': ParamValue("default_1.rougail.var2"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['../rougail-tests/structures/60_0family_dynamic_jinja_number_empty/rougail/00-base.yml']), '__internal_attribute': ParamValue("default"), '__internal_variable': ParamValue("1.rougail.var2"), 'rougail.dyn1.var': ParamDynOption(option_5, ["1"], optional=True, notraisepropertyerror=True)})), properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) optiondescription_2 = OptionDescription(name="rougail", doc="Rougail", group_type=groups.namespace, children=[option_3, optiondescription_4, option_6], properties=frozenset({"standard"})) optiondescription_1 = OptionDescription(name="1", doc="1", children=[optiondescription_2], properties=frozenset({"standard"})) option_9 = IntOption(name="var", doc="a suffix variable", multi=True, properties=frozenset({"standard"}), informations={'type': 'number', 'test': (1, 2)}) option_11 = StrOption(name="var", doc="a variable inside dynamic family", default="val", properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) optiondescription_10 = ConvertDynOptionDescription(name="dyn{{ identifier }}", doc="a dynamic family", identifiers=Calculation(func['calc_value'], Params((ParamOption(option_9)))), children=[option_11], properties=frozenset({"standard"}), informations={'dynamic_variable': '2.rougail.var'}) -option_12 = StrOption(name="var2", doc="a variable", default=Calculation(func['jinja_to_function'], Params((), kwargs={'__internal_jinja': ParamValue("default_2.rougail.var2"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['tests/dictionaries/60_0family_dynamic_jinja_number_empty/dictionaries/rougail/00-base.yml']), '__internal_attribute': ParamValue("default"), '__internal_variable': ParamValue("2.rougail.var2"), 'rougail.dyn1.var': ParamDynOption(option_11, ["1"], optional=True, notraisepropertyerror=True)})), properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) +option_12 = StrOption(name="var2", doc="a variable", default=Calculation(func['jinja_to_function'], Params((), kwargs={'__internal_jinja': ParamValue("default_2.rougail.var2"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['../rougail-tests/structures/60_0family_dynamic_jinja_number_empty/rougail/00-base.yml']), '__internal_attribute': ParamValue("default"), '__internal_variable': ParamValue("2.rougail.var2"), 'rougail.dyn1.var': ParamDynOption(option_11, ["1"], optional=True, notraisepropertyerror=True)})), properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) optiondescription_8 = OptionDescription(name="rougail", doc="Rougail", group_type=groups.namespace, children=[option_9, optiondescription_10, option_12], properties=frozenset({"standard"})) optiondescription_7 = OptionDescription(name="2", doc="2", children=[optiondescription_8], properties=frozenset({"standard"})) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_1, optiondescription_7]) diff --git a/tests/dictionaries/60_0family_dynamic_no_description/dictionaries/rougail/00-base.yml b/tests/dictionaries/60_0family_dynamic_no_description/dictionaries/rougail/00-base.yml deleted file mode 100644 index f9400c02a..000000000 --- a/tests/dictionaries/60_0family_dynamic_no_description/dictionaries/rougail/00-base.yml +++ /dev/null @@ -1,12 +0,0 @@ ---- -version: '1.1' - -var: # A suffix variable - - val1 - - val2 - -"dyn{{ identifier }}": - description: A dynamic family - dynamic: - variable: _.var - var: diff --git a/tests/dictionaries/60_0family_dynamic_no_description/tiramisu/base.py b/tests/dictionaries/60_0family_dynamic_no_description/tiramisu/base.py index f8ecfe7ef..fc0448d6c 100644 --- a/tests/dictionaries/60_0family_dynamic_no_description/tiramisu/base.py +++ b/tests/dictionaries/60_0family_dynamic_no_description/tiramisu/base.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') try: groups.namespace except: diff --git a/tests/dictionaries/60_0family_dynamic_no_description/tiramisu/multi.py b/tests/dictionaries/60_0family_dynamic_no_description/tiramisu/multi.py index 2fd24d6e2..f94300adc 100644 --- a/tests/dictionaries/60_0family_dynamic_no_description/tiramisu/multi.py +++ b/tests/dictionaries/60_0family_dynamic_no_description/tiramisu/multi.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') try: groups.namespace except: diff --git a/tests/dictionaries/60_0family_dynamic_no_description/tiramisu/no_namespace.py b/tests/dictionaries/60_0family_dynamic_no_description/tiramisu/no_namespace.py index f0aeea986..8158fd627 100644 --- a/tests/dictionaries/60_0family_dynamic_no_description/tiramisu/no_namespace.py +++ b/tests/dictionaries/60_0family_dynamic_no_description/tiramisu/no_namespace.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") ALLOWED_LEADER_PROPERTIES.add("standard") ALLOWED_LEADER_PROPERTIES.add("advanced") diff --git a/tests/dictionaries/60_0family_dynamic_no_description_empty/dictionaries/rougail/00-base.yml b/tests/dictionaries/60_0family_dynamic_no_description_empty/dictionaries/rougail/00-base.yml deleted file mode 100644 index fff5b27ad..000000000 --- a/tests/dictionaries/60_0family_dynamic_no_description_empty/dictionaries/rougail/00-base.yml +++ /dev/null @@ -1,16 +0,0 @@ ---- -version: '1.1' - -var: - description: A suffix variable - multi: true - mandatory: false - test: - - val1 - - val2 - -"dyn{{ identifier }}": - description: A dynamic family - dynamic: - variable: _.var - var: diff --git a/tests/dictionaries/60_0family_dynamic_no_description_empty/tiramisu/base.py b/tests/dictionaries/60_0family_dynamic_no_description_empty/tiramisu/base.py index 234ae55d5..26bace930 100644 --- a/tests/dictionaries/60_0family_dynamic_no_description_empty/tiramisu/base.py +++ b/tests/dictionaries/60_0family_dynamic_no_description_empty/tiramisu/base.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') try: groups.namespace except: diff --git a/tests/dictionaries/60_0family_dynamic_no_description_empty/tiramisu/multi.py b/tests/dictionaries/60_0family_dynamic_no_description_empty/tiramisu/multi.py index 09f51501d..bdaf67fa6 100644 --- a/tests/dictionaries/60_0family_dynamic_no_description_empty/tiramisu/multi.py +++ b/tests/dictionaries/60_0family_dynamic_no_description_empty/tiramisu/multi.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') try: groups.namespace except: diff --git a/tests/dictionaries/60_0family_dynamic_no_description_empty/tiramisu/no_namespace.py b/tests/dictionaries/60_0family_dynamic_no_description_empty/tiramisu/no_namespace.py index 4f2f7f9b8..18e7a12ac 100644 --- a/tests/dictionaries/60_0family_dynamic_no_description_empty/tiramisu/no_namespace.py +++ b/tests/dictionaries/60_0family_dynamic_no_description_empty/tiramisu/no_namespace.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") ALLOWED_LEADER_PROPERTIES.add("standard") ALLOWED_LEADER_PROPERTIES.add("advanced") 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 deleted file mode 100644 index a2a38577d..000000000 --- a/tests/dictionaries/60_0family_dynamic_static/dictionaries/rougail/00-base.yml +++ /dev/null @@ -1,8 +0,0 @@ ---- -version: '1.1' -"dyn{{ identifier }}": - description: a dynamic family - dynamic: - - val1 - - val2 - var: # a variable inside a dynamic family diff --git a/tests/dictionaries/60_0family_dynamic_static/tiramisu/base.py b/tests/dictionaries/60_0family_dynamic_static/tiramisu/base.py index 02b0cf029..0b53c60a3 100644 --- a/tests/dictionaries/60_0family_dynamic_static/tiramisu/base.py +++ b/tests/dictionaries/60_0family_dynamic_static/tiramisu/base.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') try: groups.namespace except: diff --git a/tests/dictionaries/60_0family_dynamic_static/tiramisu/multi.py b/tests/dictionaries/60_0family_dynamic_static/tiramisu/multi.py index 8d24b84e9..80906f6f8 100644 --- a/tests/dictionaries/60_0family_dynamic_static/tiramisu/multi.py +++ b/tests/dictionaries/60_0family_dynamic_static/tiramisu/multi.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') try: groups.namespace except: 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 a808796df..3b7184757 100644 --- a/tests/dictionaries/60_0family_dynamic_static/tiramisu/no_namespace.py +++ b/tests/dictionaries/60_0family_dynamic_static/tiramisu/no_namespace.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") ALLOWED_LEADER_PROPERTIES.add("standard") ALLOWED_LEADER_PROPERTIES.add("advanced") diff --git a/tests/dictionaries/60_0family_dynamic_test/dictionaries/rougail/00-base.yml b/tests/dictionaries/60_0family_dynamic_test/dictionaries/rougail/00-base.yml deleted file mode 100644 index c7be5f7d8..000000000 --- a/tests/dictionaries/60_0family_dynamic_test/dictionaries/rougail/00-base.yml +++ /dev/null @@ -1,16 +0,0 @@ ---- -version: '1.1' - -var: - description: A suffix variable - multi: true - test: - - val1 - - val2 - -"dyn{{ identifier }}": - description: A dynamic family - dynamic: - variable: _.var - - var: # A dynamic variable diff --git a/tests/dictionaries/60_0family_dynamic_test/tiramisu/base.py b/tests/dictionaries/60_0family_dynamic_test/tiramisu/base.py index 92c170544..b5954038c 100644 --- a/tests/dictionaries/60_0family_dynamic_test/tiramisu/base.py +++ b/tests/dictionaries/60_0family_dynamic_test/tiramisu/base.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') try: groups.namespace except: diff --git a/tests/dictionaries/60_0family_dynamic_test/tiramisu/multi.py b/tests/dictionaries/60_0family_dynamic_test/tiramisu/multi.py index 0d80daa67..b8b9c2283 100644 --- a/tests/dictionaries/60_0family_dynamic_test/tiramisu/multi.py +++ b/tests/dictionaries/60_0family_dynamic_test/tiramisu/multi.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') try: groups.namespace except: diff --git a/tests/dictionaries/60_0family_dynamic_test/tiramisu/no_namespace.py b/tests/dictionaries/60_0family_dynamic_test/tiramisu/no_namespace.py index afd552e03..071850172 100644 --- a/tests/dictionaries/60_0family_dynamic_test/tiramisu/no_namespace.py +++ b/tests/dictionaries/60_0family_dynamic_test/tiramisu/no_namespace.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") ALLOWED_LEADER_PROPERTIES.add("standard") ALLOWED_LEADER_PROPERTIES.add("advanced") 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 deleted file mode 100644 index f450d7b12..000000000 --- a/tests/dictionaries/60_0family_dynamic_variable_empty/dictionaries/rougail/00-base.yml +++ /dev/null @@ -1,8 +0,0 @@ ---- -version: '1.1' -var: [] # a suffix variable -"dyn{{ identifier }}": - description: a dynamic family - dynamic: - 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 724146a87..251888bfa 100644 --- a/tests/dictionaries/60_0family_dynamic_variable_empty/tiramisu/base.py +++ b/tests/dictionaries/60_0family_dynamic_variable_empty/tiramisu/base.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') try: groups.namespace except: 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 e59f10a44..2f354b96d 100644 --- a/tests/dictionaries/60_0family_dynamic_variable_empty/tiramisu/multi.py +++ b/tests/dictionaries/60_0family_dynamic_variable_empty/tiramisu/multi.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') try: groups.namespace except: 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 f71a43063..302e389ca 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 @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") ALLOWED_LEADER_PROPERTIES.add("standard") ALLOWED_LEADER_PROPERTIES.add("advanced") 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 deleted file mode 100644 index 9a9c1e043..000000000 --- a/tests/dictionaries/60_0family_dynamic_variable_suffix/dictionaries/rougail/00-base.yml +++ /dev/null @@ -1,10 +0,0 @@ ---- -version: '1.1' -var: # A suffix variable - - val1 - - val2 -"dyn{{ identifier }}": - description: A dynamic family - dynamic: - variable: _.var - var: a value # A dynamic variable with suffix {{ identifier }} 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 24e5f8aab..05f56ba18 100644 --- a/tests/dictionaries/60_0family_dynamic_variable_suffix/tiramisu/base.py +++ b/tests/dictionaries/60_0family_dynamic_variable_suffix/tiramisu/base.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') try: groups.namespace except: 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 7b1c63ef0..c2f47e9b2 100644 --- a/tests/dictionaries/60_0family_dynamic_variable_suffix/tiramisu/multi.py +++ b/tests/dictionaries/60_0family_dynamic_variable_suffix/tiramisu/multi.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') try: groups.namespace except: 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 ceb6631c8..8f9f76f22 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 @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") ALLOWED_LEADER_PROPERTIES.add("standard") ALLOWED_LEADER_PROPERTIES.add("advanced") diff --git a/tests/dictionaries/60_0family_dynamic_variable_suffix_empty/dictionaries/rougail/00-base.yml b/tests/dictionaries/60_0family_dynamic_variable_suffix_empty/dictionaries/rougail/00-base.yml deleted file mode 100644 index 4eeaa4672..000000000 --- a/tests/dictionaries/60_0family_dynamic_variable_suffix_empty/dictionaries/rougail/00-base.yml +++ /dev/null @@ -1,13 +0,0 @@ ---- -version: '1.1' -var: - description: A suffix variable - multi: true - test: - - val1 - - val2 -"dyn{{ identifier }}": - description: A dynamic family - dynamic: - variable: _.var - var: a value # A dynamic variable with suffix {{ identifier }} diff --git a/tests/dictionaries/60_0family_dynamic_variable_suffix_empty/tiramisu/base.py b/tests/dictionaries/60_0family_dynamic_variable_suffix_empty/tiramisu/base.py index 67cf584db..2ba0f605e 100644 --- a/tests/dictionaries/60_0family_dynamic_variable_suffix_empty/tiramisu/base.py +++ b/tests/dictionaries/60_0family_dynamic_variable_suffix_empty/tiramisu/base.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') try: groups.namespace except: diff --git a/tests/dictionaries/60_0family_dynamic_variable_suffix_empty/tiramisu/multi.py b/tests/dictionaries/60_0family_dynamic_variable_suffix_empty/tiramisu/multi.py index 26d422ac1..48082fca6 100644 --- a/tests/dictionaries/60_0family_dynamic_variable_suffix_empty/tiramisu/multi.py +++ b/tests/dictionaries/60_0family_dynamic_variable_suffix_empty/tiramisu/multi.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') try: groups.namespace except: diff --git a/tests/dictionaries/60_0family_dynamic_variable_suffix_empty/tiramisu/no_namespace.py b/tests/dictionaries/60_0family_dynamic_variable_suffix_empty/tiramisu/no_namespace.py index 3302c3f61..4bcb1afea 100644 --- a/tests/dictionaries/60_0family_dynamic_variable_suffix_empty/tiramisu/no_namespace.py +++ b/tests/dictionaries/60_0family_dynamic_variable_suffix_empty/tiramisu/no_namespace.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") ALLOWED_LEADER_PROPERTIES.add("standard") ALLOWED_LEADER_PROPERTIES.add("advanced") diff --git a/tests/dictionaries/60_0family_empty/dictionaries/rougail/00-base.yml b/tests/dictionaries/60_0family_empty/dictionaries/rougail/00-base.yml deleted file mode 100644 index 793c5ac06..000000000 --- a/tests/dictionaries/60_0family_empty/dictionaries/rougail/00-base.yml +++ /dev/null @@ -1,4 +0,0 @@ ---- -version: '1.0' -general2: - type: family diff --git a/tests/dictionaries/60_0family_empty/tiramisu/base.py b/tests/dictionaries/60_0family_empty/tiramisu/base.py index bb6ab55d2..d9e243d06 100644 --- a/tests/dictionaries/60_0family_empty/tiramisu/base.py +++ b/tests/dictionaries/60_0family_empty/tiramisu/base.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') try: groups.namespace except: diff --git a/tests/dictionaries/60_0family_empty/tiramisu/multi.py b/tests/dictionaries/60_0family_empty/tiramisu/multi.py index f8a40b84b..614668d43 100644 --- a/tests/dictionaries/60_0family_empty/tiramisu/multi.py +++ b/tests/dictionaries/60_0family_empty/tiramisu/multi.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') try: groups.namespace except: diff --git a/tests/dictionaries/60_0family_empty/tiramisu/no_namespace.py b/tests/dictionaries/60_0family_empty/tiramisu/no_namespace.py index 502023bc9..e4e37cbdb 100644 --- a/tests/dictionaries/60_0family_empty/tiramisu/no_namespace.py +++ b/tests/dictionaries/60_0family_empty/tiramisu/no_namespace.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") ALLOWED_LEADER_PROPERTIES.add("standard") ALLOWED_LEADER_PROPERTIES.add("advanced") diff --git a/tests/dictionaries/60_0family_hidden/dictionaries/rougail/00-base.yml b/tests/dictionaries/60_0family_hidden/dictionaries/rougail/00-base.yml deleted file mode 100644 index 791f8bf2c..000000000 --- a/tests/dictionaries/60_0family_hidden/dictionaries/rougail/00-base.yml +++ /dev/null @@ -1,6 +0,0 @@ ---- -version: '1.1' -family: # a family - var: - description: a variable - mandatory: false diff --git a/tests/dictionaries/60_0family_hidden/dictionaries/rougail/01-base.yml b/tests/dictionaries/60_0family_hidden/dictionaries/rougail/01-base.yml deleted file mode 100644 index 5145fdba3..000000000 --- a/tests/dictionaries/60_0family_hidden/dictionaries/rougail/01-base.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -version: '1.1' -family: - redefine: true - hidden: true diff --git a/tests/dictionaries/60_0family_hidden/tiramisu/base.py b/tests/dictionaries/60_0family_hidden/tiramisu/base.py index a21ec3011..b6aeef35a 100644 --- a/tests/dictionaries/60_0family_hidden/tiramisu/base.py +++ b/tests/dictionaries/60_0family_hidden/tiramisu/base.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') try: groups.namespace except: diff --git a/tests/dictionaries/60_0family_hidden/tiramisu/multi.py b/tests/dictionaries/60_0family_hidden/tiramisu/multi.py index f41e1f4a4..d9c8597cb 100644 --- a/tests/dictionaries/60_0family_hidden/tiramisu/multi.py +++ b/tests/dictionaries/60_0family_hidden/tiramisu/multi.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') try: groups.namespace except: diff --git a/tests/dictionaries/60_0family_hidden/tiramisu/no_namespace.py b/tests/dictionaries/60_0family_hidden/tiramisu/no_namespace.py index 34a18f213..9c2de42c1 100644 --- a/tests/dictionaries/60_0family_hidden/tiramisu/no_namespace.py +++ b/tests/dictionaries/60_0family_hidden/tiramisu/no_namespace.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") ALLOWED_LEADER_PROPERTIES.add("standard") ALLOWED_LEADER_PROPERTIES.add("advanced") diff --git a/tests/dictionaries/60_0family_mode/dictionaries/rougail/00-base.yml b/tests/dictionaries/60_0family_mode/dictionaries/rougail/00-base.yml deleted file mode 100644 index 5e97e94d8..000000000 --- a/tests/dictionaries/60_0family_mode/dictionaries/rougail/00-base.yml +++ /dev/null @@ -1,7 +0,0 @@ ---- -version: '1.1' -family: # a family - var: - description: A variable - mode: basic - default: non diff --git a/tests/dictionaries/60_0family_mode/tiramisu/base.py b/tests/dictionaries/60_0family_mode/tiramisu/base.py index 6966a618e..bc34696ca 100644 --- a/tests/dictionaries/60_0family_mode/tiramisu/base.py +++ b/tests/dictionaries/60_0family_mode/tiramisu/base.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') try: groups.namespace except: diff --git a/tests/dictionaries/60_0family_mode/tiramisu/multi.py b/tests/dictionaries/60_0family_mode/tiramisu/multi.py index 68cb1c814..a48eac9a3 100644 --- a/tests/dictionaries/60_0family_mode/tiramisu/multi.py +++ b/tests/dictionaries/60_0family_mode/tiramisu/multi.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') try: groups.namespace except: diff --git a/tests/dictionaries/60_0family_mode/tiramisu/no_namespace.py b/tests/dictionaries/60_0family_mode/tiramisu/no_namespace.py index e45d0c098..ffde35b8c 100644 --- a/tests/dictionaries/60_0family_mode/tiramisu/no_namespace.py +++ b/tests/dictionaries/60_0family_mode/tiramisu/no_namespace.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") ALLOWED_LEADER_PROPERTIES.add("standard") ALLOWED_LEADER_PROPERTIES.add("advanced") 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 deleted file mode 100644 index 41e839d71..000000000 --- a/tests/dictionaries/60_1family_dynamic_jinja/dictionaries/rougail/00-base.yml +++ /dev/null @@ -1,14 +0,0 @@ ---- -version: '1.1' -var: # a suffix variable - - val1 - - val2 -"dyn{{ identifier }}": - description: A dynamic family - dynamic: - jinja: | - {% for val in _.var %} - {{ loop.index }} - {% endfor %} - description: index of suffix value - var: val # a dynamic variable diff --git a/tests/dictionaries/60_1family_dynamic_jinja/tiramisu/base.py b/tests/dictionaries/60_1family_dynamic_jinja/tiramisu/base.py index 8809d5bc8..bed6c9089 100644 --- a/tests/dictionaries/60_1family_dynamic_jinja/tiramisu/base.py +++ b/tests/dictionaries/60_1family_dynamic_jinja/tiramisu/base.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') try: groups.namespace except: @@ -13,6 +13,6 @@ ALLOWED_LEADER_PROPERTIES.add("advanced") dict_env['dynamic_rougail.dyn{{ identifier }}'] = "{% for val in _.var %}\n{{ loop.index }}\n{% endfor %}\n" option_2 = StrOption(name="var", doc="a suffix variable", multi=True, default=["val1", "val2"], default_multi="val1", properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) option_4 = StrOption(name="var", doc="a dynamic variable", default="val", properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) -optiondescription_3 = ConvertDynOptionDescription(name="dyn{{ identifier }}", doc="A dynamic family", identifiers=Calculation(func['jinja_to_function'], Params((), kwargs={'__internal_jinja': ParamValue("dynamic_rougail.dyn{{ identifier }}"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(True), '__internal_files': ParamValue(['tests/dictionaries/60_1family_dynamic_jinja/dictionaries/rougail/00-base.yml']), '__internal_attribute': ParamValue("dynamic"), '__internal_variable': ParamValue("rougail.dyn{{ identifier }}"), '_.var': ParamOption(option_2, notraisepropertyerror=True)})), children=[option_4], properties=frozenset({"standard"})) +optiondescription_3 = ConvertDynOptionDescription(name="dyn{{ identifier }}", doc="A dynamic family", identifiers=Calculation(func['jinja_to_function'], Params((), kwargs={'__internal_jinja': ParamValue("dynamic_rougail.dyn{{ identifier }}"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(True), '__internal_files': ParamValue(['../rougail-tests/structures/60_1family_dynamic_jinja/rougail/00-base.yml']), '__internal_attribute': ParamValue("dynamic"), '__internal_variable': ParamValue("rougail.dyn{{ identifier }}"), '_.var': ParamOption(option_2, notraisepropertyerror=True)})), children=[option_4], properties=frozenset({"standard"})) optiondescription_1 = OptionDescription(name="rougail", doc="Rougail", group_type=groups.namespace, children=[option_2, optiondescription_3], properties=frozenset({"standard"})) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_1]) diff --git a/tests/dictionaries/60_1family_dynamic_jinja/tiramisu/multi.py b/tests/dictionaries/60_1family_dynamic_jinja/tiramisu/multi.py index 1729e5879..ec929146b 100644 --- a/tests/dictionaries/60_1family_dynamic_jinja/tiramisu/multi.py +++ b/tests/dictionaries/60_1family_dynamic_jinja/tiramisu/multi.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') try: groups.namespace except: @@ -14,12 +14,12 @@ dict_env['dynamic_1.rougail.dyn{{ identifier }}'] = "{% for val in _.var %}\n{{ dict_env['dynamic_2.rougail.dyn{{ identifier }}'] = "{% for val in _.var %}\n{{ loop.index }}\n{% endfor %}\n" option_3 = StrOption(name="var", doc="a suffix variable", multi=True, default=["val1", "val2"], default_multi="val1", properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) option_5 = StrOption(name="var", doc="a dynamic variable", default="val", properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) -optiondescription_4 = ConvertDynOptionDescription(name="dyn{{ identifier }}", doc="A dynamic family", identifiers=Calculation(func['jinja_to_function'], Params((), kwargs={'__internal_jinja': ParamValue("dynamic_1.rougail.dyn{{ identifier }}"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(True), '__internal_files': ParamValue(['tests/dictionaries/60_1family_dynamic_jinja/dictionaries/rougail/00-base.yml']), '__internal_attribute': ParamValue("dynamic"), '__internal_variable': ParamValue("1.rougail.dyn{{ identifier }}"), '_.var': ParamOption(option_3, notraisepropertyerror=True)})), children=[option_5], properties=frozenset({"standard"})) +optiondescription_4 = ConvertDynOptionDescription(name="dyn{{ identifier }}", doc="A dynamic family", identifiers=Calculation(func['jinja_to_function'], Params((), kwargs={'__internal_jinja': ParamValue("dynamic_1.rougail.dyn{{ identifier }}"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(True), '__internal_files': ParamValue(['../rougail-tests/structures/60_1family_dynamic_jinja/rougail/00-base.yml']), '__internal_attribute': ParamValue("dynamic"), '__internal_variable': ParamValue("1.rougail.dyn{{ identifier }}"), '_.var': ParamOption(option_3, notraisepropertyerror=True)})), children=[option_5], properties=frozenset({"standard"})) optiondescription_2 = OptionDescription(name="rougail", doc="Rougail", group_type=groups.namespace, children=[option_3, optiondescription_4], properties=frozenset({"standard"})) optiondescription_1 = OptionDescription(name="1", doc="1", children=[optiondescription_2], properties=frozenset({"standard"})) option_8 = StrOption(name="var", doc="a suffix variable", multi=True, default=["val1", "val2"], default_multi="val1", properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) option_10 = StrOption(name="var", doc="a dynamic variable", default="val", properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) -optiondescription_9 = ConvertDynOptionDescription(name="dyn{{ identifier }}", doc="A dynamic family", identifiers=Calculation(func['jinja_to_function'], Params((), kwargs={'__internal_jinja': ParamValue("dynamic_2.rougail.dyn{{ identifier }}"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(True), '__internal_files': ParamValue(['tests/dictionaries/60_1family_dynamic_jinja/dictionaries/rougail/00-base.yml']), '__internal_attribute': ParamValue("dynamic"), '__internal_variable': ParamValue("2.rougail.dyn{{ identifier }}"), '_.var': ParamOption(option_8, notraisepropertyerror=True)})), children=[option_10], properties=frozenset({"standard"})) +optiondescription_9 = ConvertDynOptionDescription(name="dyn{{ identifier }}", doc="A dynamic family", identifiers=Calculation(func['jinja_to_function'], Params((), kwargs={'__internal_jinja': ParamValue("dynamic_2.rougail.dyn{{ identifier }}"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(True), '__internal_files': ParamValue(['../rougail-tests/structures/60_1family_dynamic_jinja/rougail/00-base.yml']), '__internal_attribute': ParamValue("dynamic"), '__internal_variable': ParamValue("2.rougail.dyn{{ identifier }}"), '_.var': ParamOption(option_8, notraisepropertyerror=True)})), children=[option_10], properties=frozenset({"standard"})) optiondescription_7 = OptionDescription(name="rougail", doc="Rougail", group_type=groups.namespace, children=[option_8, optiondescription_9], properties=frozenset({"standard"})) optiondescription_6 = OptionDescription(name="2", doc="2", children=[optiondescription_7], properties=frozenset({"standard"})) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_1, optiondescription_6]) 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 4aa1ba65e..148bfca38 100644 --- a/tests/dictionaries/60_1family_dynamic_jinja/tiramisu/no_namespace.py +++ b/tests/dictionaries/60_1family_dynamic_jinja/tiramisu/no_namespace.py @@ -2,12 +2,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') +load_functions('../rougail-tests/funcs/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") ALLOWED_LEADER_PROPERTIES.add("standard") ALLOWED_LEADER_PROPERTIES.add("advanced") dict_env['dynamic_dyn{{ identifier }}'] = "{% for val in _.var %}\n{{ loop.index }}\n{% endfor %}\n" option_1 = StrOption(name="var", doc="a suffix variable", multi=True, default=["val1", "val2"], default_multi="val1", properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) option_3 = StrOption(name="var", doc="a dynamic variable", default="val", properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) -optiondescription_2 = ConvertDynOptionDescription(name="dyn{{ identifier }}", doc="A dynamic family", identifiers=Calculation(func['jinja_to_function'], Params((), kwargs={'__internal_jinja': ParamValue("dynamic_dyn{{ identifier }}"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(True), '__internal_files': ParamValue(['tests/dictionaries/60_1family_dynamic_jinja/dictionaries/rougail/00-base.yml']), '__internal_attribute': ParamValue("dynamic"), '__internal_variable': ParamValue("dyn{{ identifier }}"), '_.var': ParamOption(option_1, notraisepropertyerror=True)})), children=[option_3], properties=frozenset({"standard"})) +optiondescription_2 = ConvertDynOptionDescription(name="dyn{{ identifier }}", doc="A dynamic family", identifiers=Calculation(func['jinja_to_function'], Params((), kwargs={'__internal_jinja': ParamValue("dynamic_dyn{{ identifier }}"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(True), '__internal_files': ParamValue(['../rougail-tests/structures/60_1family_dynamic_jinja/rougail/00-base.yml']), '__internal_attribute': ParamValue("dynamic"), '__internal_variable': ParamValue("dyn{{ identifier }}"), '_.var': ParamOption(option_1, notraisepropertyerror=True)})), children=[option_3], properties=frozenset({"standard"})) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1, optiondescription_2]) 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 deleted file mode 100644 index 82781b85b..000000000 --- a/tests/dictionaries/60_2family_dynamic_jinja_fill_sub_group/dictionaries/rougail/00-base.yml +++ /dev/null @@ -1,17 +0,0 @@ ---- -version: '1.1' -var1: # a suffix variable - - val1 - - val2 -"dyn{{ identifier }}": - description: a dynamic family - dynamic: - variable: _.var1 - family: # a family - var: # with a variable -var2: - description: a second variable - default: - 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 0e25bef38..db4f02694 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 @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') try: groups.namespace except: @@ -15,6 +15,6 @@ option_2 = StrOption(name="var1", doc="a suffix variable", multi=True, default=[ option_5 = StrOption(name="var", doc="with a variable", properties=frozenset({"basic", "mandatory"}), informations={'type': 'string'}) optiondescription_4 = OptionDescription(name="family", doc="a family", children=[option_5], properties=frozenset({"basic"})) optiondescription_3 = ConvertDynOptionDescription(name="dyn{{ identifier }}", doc="a dynamic family", identifiers=Calculation(func['calc_value'], Params((ParamOption(option_2)))), children=[optiondescription_4], properties=frozenset({"basic"}), informations={'dynamic_variable': 'rougail.var1'}) -option_6 = StrOption(name="var2", doc="a second variable", default=Calculation(func['jinja_to_function'], Params((), kwargs={'__internal_jinja': ParamValue("default_rougail.var2"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['tests/dictionaries/60_2family_dynamic_jinja_fill_sub_group/dictionaries/rougail/00-base.yml']), '__internal_attribute': ParamValue("default"), '__internal_variable': ParamValue("rougail.var2"), '_.dynval1.family.var': ParamDynOption(option_5, ["val1"], optional=True, notraisepropertyerror=True)})), properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) +option_6 = StrOption(name="var2", doc="a second variable", default=Calculation(func['jinja_to_function'], Params((), kwargs={'__internal_jinja': ParamValue("default_rougail.var2"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['../rougail-tests/structures/60_2family_dynamic_jinja_fill_sub_group/rougail/00-base.yml']), '__internal_attribute': ParamValue("default"), '__internal_variable': ParamValue("rougail.var2"), '_.dynval1.family.var': ParamDynOption(option_5, ["val1"], optional=True, notraisepropertyerror=True)})), properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) optiondescription_1 = OptionDescription(name="rougail", doc="Rougail", group_type=groups.namespace, children=[option_2, optiondescription_3, option_6], properties=frozenset({"basic"})) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_1]) 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 a77ebc6ee..67b61acc1 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 @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') try: groups.namespace except: @@ -16,14 +16,14 @@ option_3 = StrOption(name="var1", doc="a suffix variable", multi=True, default=[ option_6 = StrOption(name="var", doc="with a variable", properties=frozenset({"basic", "mandatory"}), informations={'type': 'string'}) optiondescription_5 = OptionDescription(name="family", doc="a family", children=[option_6], properties=frozenset({"basic"})) optiondescription_4 = ConvertDynOptionDescription(name="dyn{{ identifier }}", doc="a dynamic family", identifiers=Calculation(func['calc_value'], Params((ParamOption(option_3)))), children=[optiondescription_5], properties=frozenset({"basic"}), informations={'dynamic_variable': '1.rougail.var1'}) -option_7 = StrOption(name="var2", doc="a second variable", default=Calculation(func['jinja_to_function'], Params((), kwargs={'__internal_jinja': ParamValue("default_1.rougail.var2"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['tests/dictionaries/60_2family_dynamic_jinja_fill_sub_group/dictionaries/rougail/00-base.yml']), '__internal_attribute': ParamValue("default"), '__internal_variable': ParamValue("1.rougail.var2"), '_.dynval1.family.var': ParamDynOption(option_6, ["val1"], optional=True, notraisepropertyerror=True)})), properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) +option_7 = StrOption(name="var2", doc="a second variable", default=Calculation(func['jinja_to_function'], Params((), kwargs={'__internal_jinja': ParamValue("default_1.rougail.var2"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['../rougail-tests/structures/60_2family_dynamic_jinja_fill_sub_group/rougail/00-base.yml']), '__internal_attribute': ParamValue("default"), '__internal_variable': ParamValue("1.rougail.var2"), '_.dynval1.family.var': ParamDynOption(option_6, ["val1"], optional=True, notraisepropertyerror=True)})), properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) optiondescription_2 = OptionDescription(name="rougail", doc="Rougail", group_type=groups.namespace, children=[option_3, optiondescription_4, option_7], properties=frozenset({"basic"})) optiondescription_1 = OptionDescription(name="1", doc="1", children=[optiondescription_2], properties=frozenset({"basic"})) option_10 = StrOption(name="var1", doc="a suffix variable", multi=True, default=["val1", "val2"], default_multi="val1", properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) option_13 = StrOption(name="var", doc="with a variable", properties=frozenset({"basic", "mandatory"}), informations={'type': 'string'}) optiondescription_12 = OptionDescription(name="family", doc="a family", children=[option_13], properties=frozenset({"basic"})) optiondescription_11 = ConvertDynOptionDescription(name="dyn{{ identifier }}", doc="a dynamic family", identifiers=Calculation(func['calc_value'], Params((ParamOption(option_10)))), children=[optiondescription_12], properties=frozenset({"basic"}), informations={'dynamic_variable': '2.rougail.var1'}) -option_14 = StrOption(name="var2", doc="a second variable", default=Calculation(func['jinja_to_function'], Params((), kwargs={'__internal_jinja': ParamValue("default_2.rougail.var2"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['tests/dictionaries/60_2family_dynamic_jinja_fill_sub_group/dictionaries/rougail/00-base.yml']), '__internal_attribute': ParamValue("default"), '__internal_variable': ParamValue("2.rougail.var2"), '_.dynval1.family.var': ParamDynOption(option_13, ["val1"], optional=True, notraisepropertyerror=True)})), properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) +option_14 = StrOption(name="var2", doc="a second variable", default=Calculation(func['jinja_to_function'], Params((), kwargs={'__internal_jinja': ParamValue("default_2.rougail.var2"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['../rougail-tests/structures/60_2family_dynamic_jinja_fill_sub_group/rougail/00-base.yml']), '__internal_attribute': ParamValue("default"), '__internal_variable': ParamValue("2.rougail.var2"), '_.dynval1.family.var': ParamDynOption(option_13, ["val1"], optional=True, notraisepropertyerror=True)})), properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) optiondescription_9 = OptionDescription(name="rougail", doc="Rougail", group_type=groups.namespace, children=[option_10, optiondescription_11, option_14], properties=frozenset({"basic"})) optiondescription_8 = OptionDescription(name="2", doc="2", children=[optiondescription_9], properties=frozenset({"basic"})) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_1, optiondescription_8]) 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 fdcad340d..201210c39 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 @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") ALLOWED_LEADER_PROPERTIES.add("standard") ALLOWED_LEADER_PROPERTIES.add("advanced") @@ -11,5 +11,5 @@ option_1 = StrOption(name="var1", doc="a suffix variable", multi=True, default=[ option_4 = StrOption(name="var", doc="with a variable", properties=frozenset({"basic", "mandatory"}), informations={'type': 'string'}) optiondescription_3 = OptionDescription(name="family", doc="a family", children=[option_4], properties=frozenset({"basic"})) optiondescription_2 = ConvertDynOptionDescription(name="dyn{{ identifier }}", doc="a dynamic family", identifiers=Calculation(func['calc_value'], Params((ParamOption(option_1)))), children=[optiondescription_3], properties=frozenset({"basic"}), informations={'dynamic_variable': 'var1'}) -option_5 = StrOption(name="var2", doc="a second variable", default=Calculation(func['jinja_to_function'], Params((), kwargs={'__internal_jinja': ParamValue("default_var2"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['tests/dictionaries/60_2family_dynamic_jinja_fill_sub_group/dictionaries/rougail/00-base.yml']), '__internal_attribute': ParamValue("default"), '__internal_variable': ParamValue("var2"), '_.dynval1.family.var': ParamDynOption(option_4, ["val1"], optional=True, notraisepropertyerror=True)})), properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) +option_5 = StrOption(name="var2", doc="a second variable", default=Calculation(func['jinja_to_function'], Params((), kwargs={'__internal_jinja': ParamValue("default_var2"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['../rougail-tests/structures/60_2family_dynamic_jinja_fill_sub_group/rougail/00-base.yml']), '__internal_attribute': ParamValue("default"), '__internal_variable': ParamValue("var2"), '_.dynval1.family.var': ParamDynOption(option_4, ["val1"], optional=True, notraisepropertyerror=True)})), properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1, optiondescription_2, option_5]) 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 deleted file mode 100644 index c6c09a7b2..000000000 --- a/tests/dictionaries/60_2family_dynamic_jinja_fill_sub_group_2/dictionaries/rougail/00-base.yml +++ /dev/null @@ -1,21 +0,0 @@ ---- -version: '1.1' -var: # a identifier variable - - val1 - - val2 -"dyn{{ identifier }}": - description: a dynamic family - dynamic: - variable: _.var - family: - description: a family inside dynamic family - var: - description: a dynamic variable - default: - type: 'identifier' -var2: - description: a varible outside dynamic family - default: - 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 17aa55b3d..2d96cf0a3 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 @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') try: groups.namespace except: @@ -15,6 +15,6 @@ option_2 = StrOption(name="var", doc="a identifier variable", multi=True, defaul option_5 = StrOption(name="var", doc="a dynamic variable", default=Calculation(func['calc_value'], Params((ParamIdentifier()))), properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) optiondescription_4 = OptionDescription(name="family", doc="a family inside dynamic family", children=[option_5], properties=frozenset({"standard"})) optiondescription_3 = ConvertDynOptionDescription(name="dyn{{ identifier }}", doc="a dynamic family", identifiers=Calculation(func['calc_value'], Params((ParamOption(option_2)))), children=[optiondescription_4], properties=frozenset({"standard"}), informations={'dynamic_variable': 'rougail.var'}) -option_6 = StrOption(name="var2", doc="a varible outside dynamic family", default=Calculation(func['jinja_to_function'], Params((), kwargs={'__internal_jinja': ParamValue("default_rougail.var2"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['tests/dictionaries/60_2family_dynamic_jinja_fill_sub_group_2/dictionaries/rougail/00-base.yml']), '__internal_attribute': ParamValue("default"), '__internal_variable': ParamValue("rougail.var2"), '_.dynval1.family.var': ParamDynOption(option_5, ["val1"], optional=True, notraisepropertyerror=True)})), properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) +option_6 = StrOption(name="var2", doc="a varible outside dynamic family", default=Calculation(func['jinja_to_function'], Params((), kwargs={'__internal_jinja': ParamValue("default_rougail.var2"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['../rougail-tests/structures/60_2family_dynamic_jinja_fill_sub_group_2/rougail/00-base.yml']), '__internal_attribute': ParamValue("default"), '__internal_variable': ParamValue("rougail.var2"), '_.dynval1.family.var': ParamDynOption(option_5, ["val1"], optional=True, notraisepropertyerror=True)})), properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) optiondescription_1 = OptionDescription(name="rougail", doc="Rougail", group_type=groups.namespace, children=[option_2, optiondescription_3, option_6], properties=frozenset({"standard"})) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_1]) 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 4ed5dd156..b19af126a 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 @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') try: groups.namespace except: @@ -16,14 +16,14 @@ option_3 = StrOption(name="var", doc="a identifier variable", multi=True, defaul option_6 = StrOption(name="var", doc="a dynamic variable", default=Calculation(func['calc_value'], Params((ParamIdentifier()))), properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) optiondescription_5 = OptionDescription(name="family", doc="a family inside dynamic family", children=[option_6], properties=frozenset({"standard"})) optiondescription_4 = ConvertDynOptionDescription(name="dyn{{ identifier }}", doc="a dynamic family", identifiers=Calculation(func['calc_value'], Params((ParamOption(option_3)))), children=[optiondescription_5], properties=frozenset({"standard"}), informations={'dynamic_variable': '1.rougail.var'}) -option_7 = StrOption(name="var2", doc="a varible outside dynamic family", default=Calculation(func['jinja_to_function'], Params((), kwargs={'__internal_jinja': ParamValue("default_1.rougail.var2"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['tests/dictionaries/60_2family_dynamic_jinja_fill_sub_group_2/dictionaries/rougail/00-base.yml']), '__internal_attribute': ParamValue("default"), '__internal_variable': ParamValue("1.rougail.var2"), '_.dynval1.family.var': ParamDynOption(option_6, ["val1"], optional=True, notraisepropertyerror=True)})), properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) +option_7 = StrOption(name="var2", doc="a varible outside dynamic family", default=Calculation(func['jinja_to_function'], Params((), kwargs={'__internal_jinja': ParamValue("default_1.rougail.var2"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['../rougail-tests/structures/60_2family_dynamic_jinja_fill_sub_group_2/rougail/00-base.yml']), '__internal_attribute': ParamValue("default"), '__internal_variable': ParamValue("1.rougail.var2"), '_.dynval1.family.var': ParamDynOption(option_6, ["val1"], optional=True, notraisepropertyerror=True)})), properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) optiondescription_2 = OptionDescription(name="rougail", doc="Rougail", group_type=groups.namespace, children=[option_3, optiondescription_4, option_7], properties=frozenset({"standard"})) optiondescription_1 = OptionDescription(name="1", doc="1", children=[optiondescription_2], properties=frozenset({"standard"})) option_10 = StrOption(name="var", doc="a identifier variable", multi=True, default=["val1", "val2"], default_multi="val1", properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) option_13 = StrOption(name="var", doc="a dynamic variable", default=Calculation(func['calc_value'], Params((ParamIdentifier()))), properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) optiondescription_12 = OptionDescription(name="family", doc="a family inside dynamic family", children=[option_13], properties=frozenset({"standard"})) optiondescription_11 = ConvertDynOptionDescription(name="dyn{{ identifier }}", doc="a dynamic family", identifiers=Calculation(func['calc_value'], Params((ParamOption(option_10)))), children=[optiondescription_12], properties=frozenset({"standard"}), informations={'dynamic_variable': '2.rougail.var'}) -option_14 = StrOption(name="var2", doc="a varible outside dynamic family", default=Calculation(func['jinja_to_function'], Params((), kwargs={'__internal_jinja': ParamValue("default_2.rougail.var2"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['tests/dictionaries/60_2family_dynamic_jinja_fill_sub_group_2/dictionaries/rougail/00-base.yml']), '__internal_attribute': ParamValue("default"), '__internal_variable': ParamValue("2.rougail.var2"), '_.dynval1.family.var': ParamDynOption(option_13, ["val1"], optional=True, notraisepropertyerror=True)})), properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) +option_14 = StrOption(name="var2", doc="a varible outside dynamic family", default=Calculation(func['jinja_to_function'], Params((), kwargs={'__internal_jinja': ParamValue("default_2.rougail.var2"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['../rougail-tests/structures/60_2family_dynamic_jinja_fill_sub_group_2/rougail/00-base.yml']), '__internal_attribute': ParamValue("default"), '__internal_variable': ParamValue("2.rougail.var2"), '_.dynval1.family.var': ParamDynOption(option_13, ["val1"], optional=True, notraisepropertyerror=True)})), properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) optiondescription_9 = OptionDescription(name="rougail", doc="Rougail", group_type=groups.namespace, children=[option_10, optiondescription_11, option_14], properties=frozenset({"standard"})) optiondescription_8 = OptionDescription(name="2", doc="2", children=[optiondescription_9], properties=frozenset({"standard"})) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_1, optiondescription_8]) 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 c9633252c..b888e5269 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 @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") ALLOWED_LEADER_PROPERTIES.add("standard") ALLOWED_LEADER_PROPERTIES.add("advanced") @@ -11,5 +11,5 @@ option_1 = StrOption(name="var", doc="a identifier variable", multi=True, defaul option_4 = StrOption(name="var", doc="a dynamic variable", default=Calculation(func['calc_value'], Params((ParamIdentifier()))), properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) optiondescription_3 = OptionDescription(name="family", doc="a family inside dynamic family", children=[option_4], properties=frozenset({"standard"})) optiondescription_2 = ConvertDynOptionDescription(name="dyn{{ identifier }}", doc="a dynamic family", identifiers=Calculation(func['calc_value'], Params((ParamOption(option_1)))), children=[optiondescription_3], properties=frozenset({"standard"}), informations={'dynamic_variable': 'var'}) -option_5 = StrOption(name="var2", doc="a varible outside dynamic family", default=Calculation(func['jinja_to_function'], Params((), kwargs={'__internal_jinja': ParamValue("default_var2"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['tests/dictionaries/60_2family_dynamic_jinja_fill_sub_group_2/dictionaries/rougail/00-base.yml']), '__internal_attribute': ParamValue("default"), '__internal_variable': ParamValue("var2"), '_.dynval1.family.var': ParamDynOption(option_4, ["val1"], optional=True, notraisepropertyerror=True)})), properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) +option_5 = StrOption(name="var2", doc="a varible outside dynamic family", default=Calculation(func['jinja_to_function'], Params((), kwargs={'__internal_jinja': ParamValue("default_var2"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['../rougail-tests/structures/60_2family_dynamic_jinja_fill_sub_group_2/rougail/00-base.yml']), '__internal_attribute': ParamValue("default"), '__internal_variable': ParamValue("var2"), '_.dynval1.family.var': ParamDynOption(option_4, ["val1"], optional=True, notraisepropertyerror=True)})), properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1, optiondescription_2, option_5]) diff --git a/tests/dictionaries/60_2family_dynamic_jinja_fill_sub_group_2_empty/dictionaries/rougail/00-base.yml b/tests/dictionaries/60_2family_dynamic_jinja_fill_sub_group_2_empty/dictionaries/rougail/00-base.yml deleted file mode 100644 index 34db8f993..000000000 --- a/tests/dictionaries/60_2family_dynamic_jinja_fill_sub_group_2_empty/dictionaries/rougail/00-base.yml +++ /dev/null @@ -1,28 +0,0 @@ ---- -version: '1.1' -var: - description: a identifier variable - multi: true - mandatory: false - test: - - val1 - - val2 -"dyn{{ identifier }}": - description: a dynamic family - dynamic: - variable: _.var - family: - description: a family inside dynamic family - var: - description: a dynamic variable - default: - type: 'identifier' -var2: - description: a varible outside dynamic family - mandatory: false - default: - jinja: | - {% if _.dynval1 is defined %} - {{ _.dynval1.family.var }} - {% endif %} - description: the value of var diff --git a/tests/dictionaries/60_2family_dynamic_jinja_fill_sub_group_2_empty/tiramisu/base.py b/tests/dictionaries/60_2family_dynamic_jinja_fill_sub_group_2_empty/tiramisu/base.py index 186989ec3..72dddd01f 100644 --- a/tests/dictionaries/60_2family_dynamic_jinja_fill_sub_group_2_empty/tiramisu/base.py +++ b/tests/dictionaries/60_2family_dynamic_jinja_fill_sub_group_2_empty/tiramisu/base.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') try: groups.namespace except: @@ -15,6 +15,6 @@ option_2 = StrOption(name="var", doc="a identifier variable", multi=True, proper option_5 = StrOption(name="var", doc="a dynamic variable", default=Calculation(func['calc_value'], Params((ParamIdentifier()))), properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) optiondescription_4 = OptionDescription(name="family", doc="a family inside dynamic family", children=[option_5], properties=frozenset({"standard"})) optiondescription_3 = ConvertDynOptionDescription(name="dyn{{ identifier }}", doc="a dynamic family", identifiers=Calculation(func['calc_value'], Params((ParamOption(option_2)))), children=[optiondescription_4], properties=frozenset({"standard"}), informations={'dynamic_variable': 'rougail.var'}) -option_6 = StrOption(name="var2", doc="a varible outside dynamic family", default=Calculation(func['jinja_to_function'], Params((), kwargs={'__internal_jinja': ParamValue("default_rougail.var2"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['tests/dictionaries/60_2family_dynamic_jinja_fill_sub_group_2_empty/dictionaries/rougail/00-base.yml']), '__internal_attribute': ParamValue("default"), '__internal_variable': ParamValue("rougail.var2"), '_.dynval1.family.var': ParamDynOption(option_5, ["val1"], optional=True, notraisepropertyerror=True)})), properties=frozenset({"standard"}), informations={'type': 'string'}) +option_6 = StrOption(name="var2", doc="a varible outside dynamic family", default=Calculation(func['jinja_to_function'], Params((), kwargs={'__internal_jinja': ParamValue("default_rougail.var2"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['../rougail-tests/structures/60_2family_dynamic_jinja_fill_sub_group_2_empty/rougail/00-base.yml']), '__internal_attribute': ParamValue("default"), '__internal_variable': ParamValue("rougail.var2"), '_.dynval1.family.var': ParamDynOption(option_5, ["val1"], optional=True, notraisepropertyerror=True)})), properties=frozenset({"standard"}), informations={'type': 'string'}) optiondescription_1 = OptionDescription(name="rougail", doc="Rougail", group_type=groups.namespace, children=[option_2, optiondescription_3, option_6], properties=frozenset({"standard"})) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_1]) diff --git a/tests/dictionaries/60_2family_dynamic_jinja_fill_sub_group_2_empty/tiramisu/multi.py b/tests/dictionaries/60_2family_dynamic_jinja_fill_sub_group_2_empty/tiramisu/multi.py index 1b10bfc44..5a80e98dc 100644 --- a/tests/dictionaries/60_2family_dynamic_jinja_fill_sub_group_2_empty/tiramisu/multi.py +++ b/tests/dictionaries/60_2family_dynamic_jinja_fill_sub_group_2_empty/tiramisu/multi.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') try: groups.namespace except: @@ -16,14 +16,14 @@ option_3 = StrOption(name="var", doc="a identifier variable", multi=True, proper option_6 = StrOption(name="var", doc="a dynamic variable", default=Calculation(func['calc_value'], Params((ParamIdentifier()))), properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) optiondescription_5 = OptionDescription(name="family", doc="a family inside dynamic family", children=[option_6], properties=frozenset({"standard"})) optiondescription_4 = ConvertDynOptionDescription(name="dyn{{ identifier }}", doc="a dynamic family", identifiers=Calculation(func['calc_value'], Params((ParamOption(option_3)))), children=[optiondescription_5], properties=frozenset({"standard"}), informations={'dynamic_variable': '1.rougail.var'}) -option_7 = StrOption(name="var2", doc="a varible outside dynamic family", default=Calculation(func['jinja_to_function'], Params((), kwargs={'__internal_jinja': ParamValue("default_1.rougail.var2"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['tests/dictionaries/60_2family_dynamic_jinja_fill_sub_group_2_empty/dictionaries/rougail/00-base.yml']), '__internal_attribute': ParamValue("default"), '__internal_variable': ParamValue("1.rougail.var2"), '_.dynval1.family.var': ParamDynOption(option_6, ["val1"], optional=True, notraisepropertyerror=True)})), properties=frozenset({"standard"}), informations={'type': 'string'}) +option_7 = StrOption(name="var2", doc="a varible outside dynamic family", default=Calculation(func['jinja_to_function'], Params((), kwargs={'__internal_jinja': ParamValue("default_1.rougail.var2"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['../rougail-tests/structures/60_2family_dynamic_jinja_fill_sub_group_2_empty/rougail/00-base.yml']), '__internal_attribute': ParamValue("default"), '__internal_variable': ParamValue("1.rougail.var2"), '_.dynval1.family.var': ParamDynOption(option_6, ["val1"], optional=True, notraisepropertyerror=True)})), properties=frozenset({"standard"}), informations={'type': 'string'}) optiondescription_2 = OptionDescription(name="rougail", doc="Rougail", group_type=groups.namespace, children=[option_3, optiondescription_4, option_7], properties=frozenset({"standard"})) optiondescription_1 = OptionDescription(name="1", doc="1", children=[optiondescription_2], properties=frozenset({"standard"})) option_10 = StrOption(name="var", doc="a identifier variable", multi=True, properties=frozenset({"standard"}), informations={'type': 'string', 'test': ('val1', 'val2')}) option_13 = StrOption(name="var", doc="a dynamic variable", default=Calculation(func['calc_value'], Params((ParamIdentifier()))), properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) optiondescription_12 = OptionDescription(name="family", doc="a family inside dynamic family", children=[option_13], properties=frozenset({"standard"})) optiondescription_11 = ConvertDynOptionDescription(name="dyn{{ identifier }}", doc="a dynamic family", identifiers=Calculation(func['calc_value'], Params((ParamOption(option_10)))), children=[optiondescription_12], properties=frozenset({"standard"}), informations={'dynamic_variable': '2.rougail.var'}) -option_14 = StrOption(name="var2", doc="a varible outside dynamic family", default=Calculation(func['jinja_to_function'], Params((), kwargs={'__internal_jinja': ParamValue("default_2.rougail.var2"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['tests/dictionaries/60_2family_dynamic_jinja_fill_sub_group_2_empty/dictionaries/rougail/00-base.yml']), '__internal_attribute': ParamValue("default"), '__internal_variable': ParamValue("2.rougail.var2"), '_.dynval1.family.var': ParamDynOption(option_13, ["val1"], optional=True, notraisepropertyerror=True)})), properties=frozenset({"standard"}), informations={'type': 'string'}) +option_14 = StrOption(name="var2", doc="a varible outside dynamic family", default=Calculation(func['jinja_to_function'], Params((), kwargs={'__internal_jinja': ParamValue("default_2.rougail.var2"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['../rougail-tests/structures/60_2family_dynamic_jinja_fill_sub_group_2_empty/rougail/00-base.yml']), '__internal_attribute': ParamValue("default"), '__internal_variable': ParamValue("2.rougail.var2"), '_.dynval1.family.var': ParamDynOption(option_13, ["val1"], optional=True, notraisepropertyerror=True)})), properties=frozenset({"standard"}), informations={'type': 'string'}) optiondescription_9 = OptionDescription(name="rougail", doc="Rougail", group_type=groups.namespace, children=[option_10, optiondescription_11, option_14], properties=frozenset({"standard"})) optiondescription_8 = OptionDescription(name="2", doc="2", children=[optiondescription_9], properties=frozenset({"standard"})) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_1, optiondescription_8]) diff --git a/tests/dictionaries/60_2family_dynamic_jinja_fill_sub_group_2_empty/tiramisu/no_namespace.py b/tests/dictionaries/60_2family_dynamic_jinja_fill_sub_group_2_empty/tiramisu/no_namespace.py index b7d7f7fe7..5b1971178 100644 --- a/tests/dictionaries/60_2family_dynamic_jinja_fill_sub_group_2_empty/tiramisu/no_namespace.py +++ b/tests/dictionaries/60_2family_dynamic_jinja_fill_sub_group_2_empty/tiramisu/no_namespace.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") ALLOWED_LEADER_PROPERTIES.add("standard") ALLOWED_LEADER_PROPERTIES.add("advanced") @@ -11,5 +11,5 @@ option_1 = StrOption(name="var", doc="a identifier variable", multi=True, proper option_4 = StrOption(name="var", doc="a dynamic variable", default=Calculation(func['calc_value'], Params((ParamIdentifier()))), properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) optiondescription_3 = OptionDescription(name="family", doc="a family inside dynamic family", children=[option_4], properties=frozenset({"standard"})) optiondescription_2 = ConvertDynOptionDescription(name="dyn{{ identifier }}", doc="a dynamic family", identifiers=Calculation(func['calc_value'], Params((ParamOption(option_1)))), children=[optiondescription_3], properties=frozenset({"standard"}), informations={'dynamic_variable': 'var'}) -option_5 = StrOption(name="var2", doc="a varible outside dynamic family", default=Calculation(func['jinja_to_function'], Params((), kwargs={'__internal_jinja': ParamValue("default_var2"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['tests/dictionaries/60_2family_dynamic_jinja_fill_sub_group_2_empty/dictionaries/rougail/00-base.yml']), '__internal_attribute': ParamValue("default"), '__internal_variable': ParamValue("var2"), '_.dynval1.family.var': ParamDynOption(option_4, ["val1"], optional=True, notraisepropertyerror=True)})), properties=frozenset({"standard"}), informations={'type': 'string'}) +option_5 = StrOption(name="var2", doc="a varible outside dynamic family", default=Calculation(func['jinja_to_function'], Params((), kwargs={'__internal_jinja': ParamValue("default_var2"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['../rougail-tests/structures/60_2family_dynamic_jinja_fill_sub_group_2_empty/rougail/00-base.yml']), '__internal_attribute': ParamValue("default"), '__internal_variable': ParamValue("var2"), '_.dynval1.family.var': ParamDynOption(option_4, ["val1"], optional=True, notraisepropertyerror=True)})), properties=frozenset({"standard"}), informations={'type': 'string'}) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1, optiondescription_2, option_5]) diff --git a/tests/dictionaries/60_2family_dynamic_jinja_fill_sub_group_empty/dictionaries/rougail/00-base.yml b/tests/dictionaries/60_2family_dynamic_jinja_fill_sub_group_empty/dictionaries/rougail/00-base.yml deleted file mode 100644 index f070e142b..000000000 --- a/tests/dictionaries/60_2family_dynamic_jinja_fill_sub_group_empty/dictionaries/rougail/00-base.yml +++ /dev/null @@ -1,24 +0,0 @@ ---- -version: '1.1' -var1: - description: a suffix variable - multi: true - mandatory: false - test: - - val1 - - val2 -"dyn{{ identifier }}": - description: a dynamic family - dynamic: - variable: _.var1 - family: # a family - var: # with a variable -var2: - description: a second variable - mandatory: false - default: - jinja: | - {% if _.dynval1 is defined %} - {{ _.dynval1.family.var }} - {% endif %} - description: the value of var diff --git a/tests/dictionaries/60_2family_dynamic_jinja_fill_sub_group_empty/tiramisu/base.py b/tests/dictionaries/60_2family_dynamic_jinja_fill_sub_group_empty/tiramisu/base.py index 9e03006e7..d861bc98d 100644 --- a/tests/dictionaries/60_2family_dynamic_jinja_fill_sub_group_empty/tiramisu/base.py +++ b/tests/dictionaries/60_2family_dynamic_jinja_fill_sub_group_empty/tiramisu/base.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') try: groups.namespace except: @@ -15,6 +15,6 @@ option_2 = StrOption(name="var1", doc="a suffix variable", multi=True, propertie option_5 = StrOption(name="var", doc="with a variable", properties=frozenset({"basic", "mandatory"}), informations={'type': 'string'}) optiondescription_4 = OptionDescription(name="family", doc="a family", children=[option_5], properties=frozenset({"basic"})) optiondescription_3 = ConvertDynOptionDescription(name="dyn{{ identifier }}", doc="a dynamic family", identifiers=Calculation(func['calc_value'], Params((ParamOption(option_2)))), children=[optiondescription_4], properties=frozenset({"basic"}), informations={'dynamic_variable': 'rougail.var1'}) -option_6 = StrOption(name="var2", doc="a second variable", default=Calculation(func['jinja_to_function'], Params((), kwargs={'__internal_jinja': ParamValue("default_rougail.var2"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['tests/dictionaries/60_2family_dynamic_jinja_fill_sub_group_empty/dictionaries/rougail/00-base.yml']), '__internal_attribute': ParamValue("default"), '__internal_variable': ParamValue("rougail.var2"), '_.dynval1.family.var': ParamDynOption(option_5, ["val1"], optional=True, notraisepropertyerror=True)})), properties=frozenset({"standard"}), informations={'type': 'string'}) +option_6 = StrOption(name="var2", doc="a second variable", default=Calculation(func['jinja_to_function'], Params((), kwargs={'__internal_jinja': ParamValue("default_rougail.var2"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['../rougail-tests/structures/60_2family_dynamic_jinja_fill_sub_group_empty/rougail/00-base.yml']), '__internal_attribute': ParamValue("default"), '__internal_variable': ParamValue("rougail.var2"), '_.dynval1.family.var': ParamDynOption(option_5, ["val1"], optional=True, notraisepropertyerror=True)})), properties=frozenset({"standard"}), informations={'type': 'string'}) optiondescription_1 = OptionDescription(name="rougail", doc="Rougail", group_type=groups.namespace, children=[option_2, optiondescription_3, option_6], properties=frozenset({"basic"})) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_1]) diff --git a/tests/dictionaries/60_2family_dynamic_jinja_fill_sub_group_empty/tiramisu/multi.py b/tests/dictionaries/60_2family_dynamic_jinja_fill_sub_group_empty/tiramisu/multi.py index 00435119a..a099f4976 100644 --- a/tests/dictionaries/60_2family_dynamic_jinja_fill_sub_group_empty/tiramisu/multi.py +++ b/tests/dictionaries/60_2family_dynamic_jinja_fill_sub_group_empty/tiramisu/multi.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') try: groups.namespace except: @@ -16,14 +16,14 @@ option_3 = StrOption(name="var1", doc="a suffix variable", multi=True, propertie option_6 = StrOption(name="var", doc="with a variable", properties=frozenset({"basic", "mandatory"}), informations={'type': 'string'}) optiondescription_5 = OptionDescription(name="family", doc="a family", children=[option_6], properties=frozenset({"basic"})) optiondescription_4 = ConvertDynOptionDescription(name="dyn{{ identifier }}", doc="a dynamic family", identifiers=Calculation(func['calc_value'], Params((ParamOption(option_3)))), children=[optiondescription_5], properties=frozenset({"basic"}), informations={'dynamic_variable': '1.rougail.var1'}) -option_7 = StrOption(name="var2", doc="a second variable", default=Calculation(func['jinja_to_function'], Params((), kwargs={'__internal_jinja': ParamValue("default_1.rougail.var2"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['tests/dictionaries/60_2family_dynamic_jinja_fill_sub_group_empty/dictionaries/rougail/00-base.yml']), '__internal_attribute': ParamValue("default"), '__internal_variable': ParamValue("1.rougail.var2"), '_.dynval1.family.var': ParamDynOption(option_6, ["val1"], optional=True, notraisepropertyerror=True)})), properties=frozenset({"standard"}), informations={'type': 'string'}) +option_7 = StrOption(name="var2", doc="a second variable", default=Calculation(func['jinja_to_function'], Params((), kwargs={'__internal_jinja': ParamValue("default_1.rougail.var2"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['../rougail-tests/structures/60_2family_dynamic_jinja_fill_sub_group_empty/rougail/00-base.yml']), '__internal_attribute': ParamValue("default"), '__internal_variable': ParamValue("1.rougail.var2"), '_.dynval1.family.var': ParamDynOption(option_6, ["val1"], optional=True, notraisepropertyerror=True)})), properties=frozenset({"standard"}), informations={'type': 'string'}) optiondescription_2 = OptionDescription(name="rougail", doc="Rougail", group_type=groups.namespace, children=[option_3, optiondescription_4, option_7], properties=frozenset({"basic"})) optiondescription_1 = OptionDescription(name="1", doc="1", children=[optiondescription_2], properties=frozenset({"basic"})) option_10 = StrOption(name="var1", doc="a suffix variable", multi=True, properties=frozenset({"standard"}), informations={'type': 'string', 'test': ('val1', 'val2')}) option_13 = StrOption(name="var", doc="with a variable", properties=frozenset({"basic", "mandatory"}), informations={'type': 'string'}) optiondescription_12 = OptionDescription(name="family", doc="a family", children=[option_13], properties=frozenset({"basic"})) optiondescription_11 = ConvertDynOptionDescription(name="dyn{{ identifier }}", doc="a dynamic family", identifiers=Calculation(func['calc_value'], Params((ParamOption(option_10)))), children=[optiondescription_12], properties=frozenset({"basic"}), informations={'dynamic_variable': '2.rougail.var1'}) -option_14 = StrOption(name="var2", doc="a second variable", default=Calculation(func['jinja_to_function'], Params((), kwargs={'__internal_jinja': ParamValue("default_2.rougail.var2"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['tests/dictionaries/60_2family_dynamic_jinja_fill_sub_group_empty/dictionaries/rougail/00-base.yml']), '__internal_attribute': ParamValue("default"), '__internal_variable': ParamValue("2.rougail.var2"), '_.dynval1.family.var': ParamDynOption(option_13, ["val1"], optional=True, notraisepropertyerror=True)})), properties=frozenset({"standard"}), informations={'type': 'string'}) +option_14 = StrOption(name="var2", doc="a second variable", default=Calculation(func['jinja_to_function'], Params((), kwargs={'__internal_jinja': ParamValue("default_2.rougail.var2"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['../rougail-tests/structures/60_2family_dynamic_jinja_fill_sub_group_empty/rougail/00-base.yml']), '__internal_attribute': ParamValue("default"), '__internal_variable': ParamValue("2.rougail.var2"), '_.dynval1.family.var': ParamDynOption(option_13, ["val1"], optional=True, notraisepropertyerror=True)})), properties=frozenset({"standard"}), informations={'type': 'string'}) optiondescription_9 = OptionDescription(name="rougail", doc="Rougail", group_type=groups.namespace, children=[option_10, optiondescription_11, option_14], properties=frozenset({"basic"})) optiondescription_8 = OptionDescription(name="2", doc="2", children=[optiondescription_9], properties=frozenset({"basic"})) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_1, optiondescription_8]) diff --git a/tests/dictionaries/60_2family_dynamic_jinja_fill_sub_group_empty/tiramisu/no_namespace.py b/tests/dictionaries/60_2family_dynamic_jinja_fill_sub_group_empty/tiramisu/no_namespace.py index 69db0298b..fb0a6b818 100644 --- a/tests/dictionaries/60_2family_dynamic_jinja_fill_sub_group_empty/tiramisu/no_namespace.py +++ b/tests/dictionaries/60_2family_dynamic_jinja_fill_sub_group_empty/tiramisu/no_namespace.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") ALLOWED_LEADER_PROPERTIES.add("standard") ALLOWED_LEADER_PROPERTIES.add("advanced") @@ -11,5 +11,5 @@ option_1 = StrOption(name="var1", doc="a suffix variable", multi=True, propertie option_4 = StrOption(name="var", doc="with a variable", properties=frozenset({"basic", "mandatory"}), informations={'type': 'string'}) optiondescription_3 = OptionDescription(name="family", doc="a family", children=[option_4], properties=frozenset({"basic"})) optiondescription_2 = ConvertDynOptionDescription(name="dyn{{ identifier }}", doc="a dynamic family", identifiers=Calculation(func['calc_value'], Params((ParamOption(option_1)))), children=[optiondescription_3], properties=frozenset({"basic"}), informations={'dynamic_variable': 'var1'}) -option_5 = StrOption(name="var2", doc="a second variable", default=Calculation(func['jinja_to_function'], Params((), kwargs={'__internal_jinja': ParamValue("default_var2"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['tests/dictionaries/60_2family_dynamic_jinja_fill_sub_group_empty/dictionaries/rougail/00-base.yml']), '__internal_attribute': ParamValue("default"), '__internal_variable': ParamValue("var2"), '_.dynval1.family.var': ParamDynOption(option_4, ["val1"], optional=True, notraisepropertyerror=True)})), properties=frozenset({"standard"}), informations={'type': 'string'}) +option_5 = StrOption(name="var2", doc="a second variable", default=Calculation(func['jinja_to_function'], Params((), kwargs={'__internal_jinja': ParamValue("default_var2"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['../rougail-tests/structures/60_2family_dynamic_jinja_fill_sub_group_empty/rougail/00-base.yml']), '__internal_attribute': ParamValue("default"), '__internal_variable': ParamValue("var2"), '_.dynval1.family.var': ParamDynOption(option_4, ["val1"], optional=True, notraisepropertyerror=True)})), properties=frozenset({"standard"}), informations={'type': 'string'}) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1, optiondescription_2, option_5]) 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 deleted file mode 100644 index a0c56ccd1..000000000 --- a/tests/dictionaries/60_2family_dynamic_outside_calc/dictionaries/rougail/00-base.yml +++ /dev/null @@ -1,16 +0,0 @@ ---- -version: '1.1' -var1: # a suffx variable - - val1 - - val2 -"dyn{{ identifier }}": - description: a dynamic family - dynamic: - variable: _.var1 - var: val # a dynamic variable -newvar: - description: a second variable - default: - 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 4d88ac21e..e37e1bab7 100644 --- a/tests/dictionaries/60_2family_dynamic_outside_calc/tiramisu/base.py +++ b/tests/dictionaries/60_2family_dynamic_outside_calc/tiramisu/base.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') try: groups.namespace except: @@ -14,6 +14,6 @@ dict_env['default_rougail.newvar'] = "{{ _.dynval1.var }}\n" option_2 = StrOption(name="var1", doc="a suffx variable", multi=True, default=["val1", "val2"], default_multi="val1", properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) option_4 = StrOption(name="var", doc="a dynamic variable", default="val", properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) optiondescription_3 = ConvertDynOptionDescription(name="dyn{{ identifier }}", doc="a dynamic family", identifiers=Calculation(func['calc_value'], Params((ParamOption(option_2)))), children=[option_4], properties=frozenset({"standard"}), informations={'dynamic_variable': 'rougail.var1'}) -option_5 = StrOption(name="newvar", doc="a second variable", default=Calculation(func['jinja_to_function'], Params((), kwargs={'__internal_jinja': ParamValue("default_rougail.newvar"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['tests/dictionaries/60_2family_dynamic_outside_calc/dictionaries/rougail/00-base.yml']), '__internal_attribute': ParamValue("default"), '__internal_variable': ParamValue("rougail.newvar"), '_.dynval1.var': ParamDynOption(option_4, ["val1"], optional=True, notraisepropertyerror=True)})), properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) +option_5 = StrOption(name="newvar", doc="a second variable", default=Calculation(func['jinja_to_function'], Params((), kwargs={'__internal_jinja': ParamValue("default_rougail.newvar"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['../rougail-tests/structures/60_2family_dynamic_outside_calc/rougail/00-base.yml']), '__internal_attribute': ParamValue("default"), '__internal_variable': ParamValue("rougail.newvar"), '_.dynval1.var': ParamDynOption(option_4, ["val1"], optional=True, notraisepropertyerror=True)})), properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) optiondescription_1 = OptionDescription(name="rougail", doc="Rougail", group_type=groups.namespace, children=[option_2, optiondescription_3, option_5], properties=frozenset({"standard"})) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_1]) 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 b78440c5e..00a20605d 100644 --- a/tests/dictionaries/60_2family_dynamic_outside_calc/tiramisu/multi.py +++ b/tests/dictionaries/60_2family_dynamic_outside_calc/tiramisu/multi.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') try: groups.namespace except: @@ -15,13 +15,13 @@ dict_env['default_2.rougail.newvar'] = "{{ _.dynval1.var }}\n" option_3 = StrOption(name="var1", doc="a suffx variable", multi=True, default=["val1", "val2"], default_multi="val1", properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) option_5 = StrOption(name="var", doc="a dynamic variable", default="val", properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) optiondescription_4 = ConvertDynOptionDescription(name="dyn{{ identifier }}", doc="a dynamic family", identifiers=Calculation(func['calc_value'], Params((ParamOption(option_3)))), children=[option_5], properties=frozenset({"standard"}), informations={'dynamic_variable': '1.rougail.var1'}) -option_6 = StrOption(name="newvar", doc="a second variable", default=Calculation(func['jinja_to_function'], Params((), kwargs={'__internal_jinja': ParamValue("default_1.rougail.newvar"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['tests/dictionaries/60_2family_dynamic_outside_calc/dictionaries/rougail/00-base.yml']), '__internal_attribute': ParamValue("default"), '__internal_variable': ParamValue("1.rougail.newvar"), '_.dynval1.var': ParamDynOption(option_5, ["val1"], optional=True, notraisepropertyerror=True)})), properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) +option_6 = StrOption(name="newvar", doc="a second variable", default=Calculation(func['jinja_to_function'], Params((), kwargs={'__internal_jinja': ParamValue("default_1.rougail.newvar"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['../rougail-tests/structures/60_2family_dynamic_outside_calc/rougail/00-base.yml']), '__internal_attribute': ParamValue("default"), '__internal_variable': ParamValue("1.rougail.newvar"), '_.dynval1.var': ParamDynOption(option_5, ["val1"], optional=True, notraisepropertyerror=True)})), properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) optiondescription_2 = OptionDescription(name="rougail", doc="Rougail", group_type=groups.namespace, children=[option_3, optiondescription_4, option_6], properties=frozenset({"standard"})) optiondescription_1 = OptionDescription(name="1", doc="1", children=[optiondescription_2], properties=frozenset({"standard"})) option_9 = StrOption(name="var1", doc="a suffx variable", multi=True, default=["val1", "val2"], default_multi="val1", properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) option_11 = StrOption(name="var", doc="a dynamic variable", default="val", properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) optiondescription_10 = ConvertDynOptionDescription(name="dyn{{ identifier }}", doc="a dynamic family", identifiers=Calculation(func['calc_value'], Params((ParamOption(option_9)))), children=[option_11], properties=frozenset({"standard"}), informations={'dynamic_variable': '2.rougail.var1'}) -option_12 = StrOption(name="newvar", doc="a second variable", default=Calculation(func['jinja_to_function'], Params((), kwargs={'__internal_jinja': ParamValue("default_2.rougail.newvar"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['tests/dictionaries/60_2family_dynamic_outside_calc/dictionaries/rougail/00-base.yml']), '__internal_attribute': ParamValue("default"), '__internal_variable': ParamValue("2.rougail.newvar"), '_.dynval1.var': ParamDynOption(option_11, ["val1"], optional=True, notraisepropertyerror=True)})), properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) +option_12 = StrOption(name="newvar", doc="a second variable", default=Calculation(func['jinja_to_function'], Params((), kwargs={'__internal_jinja': ParamValue("default_2.rougail.newvar"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['../rougail-tests/structures/60_2family_dynamic_outside_calc/rougail/00-base.yml']), '__internal_attribute': ParamValue("default"), '__internal_variable': ParamValue("2.rougail.newvar"), '_.dynval1.var': ParamDynOption(option_11, ["val1"], optional=True, notraisepropertyerror=True)})), properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) optiondescription_8 = OptionDescription(name="rougail", doc="Rougail", group_type=groups.namespace, children=[option_9, optiondescription_10, option_12], properties=frozenset({"standard"})) optiondescription_7 = OptionDescription(name="2", doc="2", children=[optiondescription_8], properties=frozenset({"standard"})) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_1, optiondescription_7]) 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 e6b3d227e..15962779c 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 @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") ALLOWED_LEADER_PROPERTIES.add("standard") ALLOWED_LEADER_PROPERTIES.add("advanced") @@ -10,5 +10,5 @@ dict_env['default_newvar'] = "{{ _.dynval1.var }}\n" option_1 = StrOption(name="var1", doc="a suffx variable", multi=True, default=["val1", "val2"], default_multi="val1", properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) option_3 = StrOption(name="var", doc="a dynamic variable", default="val", properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) optiondescription_2 = ConvertDynOptionDescription(name="dyn{{ identifier }}", doc="a dynamic family", identifiers=Calculation(func['calc_value'], Params((ParamOption(option_1)))), children=[option_3], properties=frozenset({"standard"}), informations={'dynamic_variable': 'var1'}) -option_4 = StrOption(name="newvar", doc="a second variable", default=Calculation(func['jinja_to_function'], Params((), kwargs={'__internal_jinja': ParamValue("default_newvar"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['tests/dictionaries/60_2family_dynamic_outside_calc/dictionaries/rougail/00-base.yml']), '__internal_attribute': ParamValue("default"), '__internal_variable': ParamValue("newvar"), '_.dynval1.var': ParamDynOption(option_3, ["val1"], optional=True, notraisepropertyerror=True)})), properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) +option_4 = StrOption(name="newvar", doc="a second variable", default=Calculation(func['jinja_to_function'], Params((), kwargs={'__internal_jinja': ParamValue("default_newvar"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['../rougail-tests/structures/60_2family_dynamic_outside_calc/rougail/00-base.yml']), '__internal_attribute': ParamValue("default"), '__internal_variable': ParamValue("newvar"), '_.dynval1.var': ParamDynOption(option_3, ["val1"], optional=True, notraisepropertyerror=True)})), properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1, optiondescription_2, option_4]) diff --git a/tests/dictionaries/60_2family_dynamic_outside_calc_empty/dictionaries/rougail/00-base.yml b/tests/dictionaries/60_2family_dynamic_outside_calc_empty/dictionaries/rougail/00-base.yml deleted file mode 100644 index 1ec6690b4..000000000 --- a/tests/dictionaries/60_2family_dynamic_outside_calc_empty/dictionaries/rougail/00-base.yml +++ /dev/null @@ -1,23 +0,0 @@ ---- -version: '1.1' -var1: - description: a suffx variable - multi: true - mandatory: false - test: - - val1 - - val2 -"dyn{{ identifier }}": - description: a dynamic family - dynamic: - variable: _.var1 - var: val # a dynamic variable -newvar: - description: a second variable - mandatory: false - default: - jinja: | - {% if _.dynval1 is defined %} - {{ _.dynval1.var }} - {% endif %} - description: the value of var diff --git a/tests/dictionaries/60_2family_dynamic_outside_calc_empty/tiramisu/base.py b/tests/dictionaries/60_2family_dynamic_outside_calc_empty/tiramisu/base.py index dae623193..207290cb2 100644 --- a/tests/dictionaries/60_2family_dynamic_outside_calc_empty/tiramisu/base.py +++ b/tests/dictionaries/60_2family_dynamic_outside_calc_empty/tiramisu/base.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') try: groups.namespace except: @@ -14,6 +14,6 @@ dict_env['default_rougail.newvar'] = "{% if _.dynval1 is defined %}\n{{ _.dynval option_2 = StrOption(name="var1", doc="a suffx variable", multi=True, properties=frozenset({"standard"}), informations={'type': 'string', 'test': ('val1', 'val2')}) option_4 = StrOption(name="var", doc="a dynamic variable", default="val", properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) optiondescription_3 = ConvertDynOptionDescription(name="dyn{{ identifier }}", doc="a dynamic family", identifiers=Calculation(func['calc_value'], Params((ParamOption(option_2)))), children=[option_4], properties=frozenset({"standard"}), informations={'dynamic_variable': 'rougail.var1'}) -option_5 = StrOption(name="newvar", doc="a second variable", default=Calculation(func['jinja_to_function'], Params((), kwargs={'__internal_jinja': ParamValue("default_rougail.newvar"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['tests/dictionaries/60_2family_dynamic_outside_calc_empty/dictionaries/rougail/00-base.yml']), '__internal_attribute': ParamValue("default"), '__internal_variable': ParamValue("rougail.newvar"), '_.dynval1.var': ParamDynOption(option_4, ["val1"], optional=True, notraisepropertyerror=True)})), properties=frozenset({"standard"}), informations={'type': 'string'}) +option_5 = StrOption(name="newvar", doc="a second variable", default=Calculation(func['jinja_to_function'], Params((), kwargs={'__internal_jinja': ParamValue("default_rougail.newvar"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['../rougail-tests/structures/60_2family_dynamic_outside_calc_empty/rougail/00-base.yml']), '__internal_attribute': ParamValue("default"), '__internal_variable': ParamValue("rougail.newvar"), '_.dynval1.var': ParamDynOption(option_4, ["val1"], optional=True, notraisepropertyerror=True)})), properties=frozenset({"standard"}), informations={'type': 'string'}) optiondescription_1 = OptionDescription(name="rougail", doc="Rougail", group_type=groups.namespace, children=[option_2, optiondescription_3, option_5], properties=frozenset({"standard"})) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_1]) diff --git a/tests/dictionaries/60_2family_dynamic_outside_calc_empty/tiramisu/multi.py b/tests/dictionaries/60_2family_dynamic_outside_calc_empty/tiramisu/multi.py index f4e2ba59e..2a43f6154 100644 --- a/tests/dictionaries/60_2family_dynamic_outside_calc_empty/tiramisu/multi.py +++ b/tests/dictionaries/60_2family_dynamic_outside_calc_empty/tiramisu/multi.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') try: groups.namespace except: @@ -15,13 +15,13 @@ dict_env['default_2.rougail.newvar'] = "{% if _.dynval1 is defined %}\n{{ _.dynv option_3 = StrOption(name="var1", doc="a suffx variable", multi=True, properties=frozenset({"standard"}), informations={'type': 'string', 'test': ('val1', 'val2')}) option_5 = StrOption(name="var", doc="a dynamic variable", default="val", properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) optiondescription_4 = ConvertDynOptionDescription(name="dyn{{ identifier }}", doc="a dynamic family", identifiers=Calculation(func['calc_value'], Params((ParamOption(option_3)))), children=[option_5], properties=frozenset({"standard"}), informations={'dynamic_variable': '1.rougail.var1'}) -option_6 = StrOption(name="newvar", doc="a second variable", default=Calculation(func['jinja_to_function'], Params((), kwargs={'__internal_jinja': ParamValue("default_1.rougail.newvar"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['tests/dictionaries/60_2family_dynamic_outside_calc_empty/dictionaries/rougail/00-base.yml']), '__internal_attribute': ParamValue("default"), '__internal_variable': ParamValue("1.rougail.newvar"), '_.dynval1.var': ParamDynOption(option_5, ["val1"], optional=True, notraisepropertyerror=True)})), properties=frozenset({"standard"}), informations={'type': 'string'}) +option_6 = StrOption(name="newvar", doc="a second variable", default=Calculation(func['jinja_to_function'], Params((), kwargs={'__internal_jinja': ParamValue("default_1.rougail.newvar"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['../rougail-tests/structures/60_2family_dynamic_outside_calc_empty/rougail/00-base.yml']), '__internal_attribute': ParamValue("default"), '__internal_variable': ParamValue("1.rougail.newvar"), '_.dynval1.var': ParamDynOption(option_5, ["val1"], optional=True, notraisepropertyerror=True)})), properties=frozenset({"standard"}), informations={'type': 'string'}) optiondescription_2 = OptionDescription(name="rougail", doc="Rougail", group_type=groups.namespace, children=[option_3, optiondescription_4, option_6], properties=frozenset({"standard"})) optiondescription_1 = OptionDescription(name="1", doc="1", children=[optiondescription_2], properties=frozenset({"standard"})) option_9 = StrOption(name="var1", doc="a suffx variable", multi=True, properties=frozenset({"standard"}), informations={'type': 'string', 'test': ('val1', 'val2')}) option_11 = StrOption(name="var", doc="a dynamic variable", default="val", properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) optiondescription_10 = ConvertDynOptionDescription(name="dyn{{ identifier }}", doc="a dynamic family", identifiers=Calculation(func['calc_value'], Params((ParamOption(option_9)))), children=[option_11], properties=frozenset({"standard"}), informations={'dynamic_variable': '2.rougail.var1'}) -option_12 = StrOption(name="newvar", doc="a second variable", default=Calculation(func['jinja_to_function'], Params((), kwargs={'__internal_jinja': ParamValue("default_2.rougail.newvar"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['tests/dictionaries/60_2family_dynamic_outside_calc_empty/dictionaries/rougail/00-base.yml']), '__internal_attribute': ParamValue("default"), '__internal_variable': ParamValue("2.rougail.newvar"), '_.dynval1.var': ParamDynOption(option_11, ["val1"], optional=True, notraisepropertyerror=True)})), properties=frozenset({"standard"}), informations={'type': 'string'}) +option_12 = StrOption(name="newvar", doc="a second variable", default=Calculation(func['jinja_to_function'], Params((), kwargs={'__internal_jinja': ParamValue("default_2.rougail.newvar"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['../rougail-tests/structures/60_2family_dynamic_outside_calc_empty/rougail/00-base.yml']), '__internal_attribute': ParamValue("default"), '__internal_variable': ParamValue("2.rougail.newvar"), '_.dynval1.var': ParamDynOption(option_11, ["val1"], optional=True, notraisepropertyerror=True)})), properties=frozenset({"standard"}), informations={'type': 'string'}) optiondescription_8 = OptionDescription(name="rougail", doc="Rougail", group_type=groups.namespace, children=[option_9, optiondescription_10, option_12], properties=frozenset({"standard"})) optiondescription_7 = OptionDescription(name="2", doc="2", children=[optiondescription_8], properties=frozenset({"standard"})) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_1, optiondescription_7]) diff --git a/tests/dictionaries/60_2family_dynamic_outside_calc_empty/tiramisu/no_namespace.py b/tests/dictionaries/60_2family_dynamic_outside_calc_empty/tiramisu/no_namespace.py index f4ac472a2..512e078f9 100644 --- a/tests/dictionaries/60_2family_dynamic_outside_calc_empty/tiramisu/no_namespace.py +++ b/tests/dictionaries/60_2family_dynamic_outside_calc_empty/tiramisu/no_namespace.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") ALLOWED_LEADER_PROPERTIES.add("standard") ALLOWED_LEADER_PROPERTIES.add("advanced") @@ -10,5 +10,5 @@ dict_env['default_newvar'] = "{% if _.dynval1 is defined %}\n{{ _.dynval1.var }} option_1 = StrOption(name="var1", doc="a suffx variable", multi=True, properties=frozenset({"standard"}), informations={'type': 'string', 'test': ('val1', 'val2')}) option_3 = StrOption(name="var", doc="a dynamic variable", default="val", properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) optiondescription_2 = ConvertDynOptionDescription(name="dyn{{ identifier }}", doc="a dynamic family", identifiers=Calculation(func['calc_value'], Params((ParamOption(option_1)))), children=[option_3], properties=frozenset({"standard"}), informations={'dynamic_variable': 'var1'}) -option_4 = StrOption(name="newvar", doc="a second variable", default=Calculation(func['jinja_to_function'], Params((), kwargs={'__internal_jinja': ParamValue("default_newvar"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['tests/dictionaries/60_2family_dynamic_outside_calc_empty/dictionaries/rougail/00-base.yml']), '__internal_attribute': ParamValue("default"), '__internal_variable': ParamValue("newvar"), '_.dynval1.var': ParamDynOption(option_3, ["val1"], optional=True, notraisepropertyerror=True)})), properties=frozenset({"standard"}), informations={'type': 'string'}) +option_4 = StrOption(name="newvar", doc="a second variable", default=Calculation(func['jinja_to_function'], Params((), kwargs={'__internal_jinja': ParamValue("default_newvar"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['../rougail-tests/structures/60_2family_dynamic_outside_calc_empty/rougail/00-base.yml']), '__internal_attribute': ParamValue("default"), '__internal_variable': ParamValue("newvar"), '_.dynval1.var': ParamDynOption(option_3, ["val1"], optional=True, notraisepropertyerror=True)})), properties=frozenset({"standard"}), informations={'type': 'string'}) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1, optiondescription_2, option_4]) 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 deleted file mode 100644 index fb27c8bea..000000000 --- a/tests/dictionaries/60_5family_dynamic_calc2/dictionaries/rougail/00-base.yml +++ /dev/null @@ -1,21 +0,0 @@ ---- -version: '1.1' - -var: # A suffix variable - - val1 - - val2 - -var2: # a second variable - -"dyn{{ identifier }}": - description: A dynamic family - dynamic: - variable: _.var - hidden: - jinja: | - {% if _.var2 == "no" %} - var2 is no - {% endif %} - description: if var2 is no - - vardyn: val # a dynamic variable diff --git a/tests/dictionaries/60_5family_dynamic_calc2/force_namespace b/tests/dictionaries/60_5family_dynamic_calc2/force_namespace deleted file mode 100644 index e69de29bb..000000000 diff --git a/tests/dictionaries/60_5family_dynamic_calc2/tiramisu/base.py b/tests/dictionaries/60_5family_dynamic_calc2/tiramisu/base.py index 372937690..d6c788fc6 100644 --- a/tests/dictionaries/60_5family_dynamic_calc2/tiramisu/base.py +++ b/tests/dictionaries/60_5family_dynamic_calc2/tiramisu/base.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') try: groups.namespace except: @@ -14,7 +14,7 @@ dict_env['frozen_rougail.dyn{{ identifier }}.vardyn'] = "{% if _.var2 == \"no\" dict_env['hidden_rougail.dyn{{ identifier }}'] = "{% if _.var2 == \"no\" %}\nvar2 is no\n{% endif %}\n" option_2 = StrOption(name="var", doc="A suffix variable", multi=True, default=["val1", "val2"], default_multi="val1", properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) option_3 = StrOption(name="var2", doc="a second variable", properties=frozenset({"basic", "mandatory"}), informations={'type': 'string'}) -option_5 = StrOption(name="vardyn", doc="a dynamic variable", default="val", properties=frozenset({"force_default_on_freeze", "mandatory", "standard", Calculation(func['jinja_to_property'], Params((ParamValue("frozen")), kwargs={'__internal_jinja': ParamValue("frozen_rougail.dyn{{ identifier }}.vardyn"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['tests/dictionaries/60_5family_dynamic_calc2/dictionaries/rougail/00-base.yml']), '__internal_attribute': ParamValue("frozen"), '__internal_variable': ParamValue("rougail.dyn{{ identifier }}.vardyn"), 'when': ParamValue(True), 'inverse': ParamValue(False), '_.var2': ParamOption(option_3, notraisepropertyerror=True)}), help_function=func['jinja_to_property_help'])}), informations={'type': 'string'}) -optiondescription_4 = ConvertDynOptionDescription(name="dyn{{ identifier }}", doc="A dynamic family", identifiers=Calculation(func['calc_value'], Params((ParamOption(option_2)))), children=[option_5], properties=frozenset({"standard", Calculation(func['jinja_to_property'], Params((ParamValue("hidden")), kwargs={'__internal_jinja': ParamValue("hidden_rougail.dyn{{ identifier }}"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['tests/dictionaries/60_5family_dynamic_calc2/dictionaries/rougail/00-base.yml']), '__internal_attribute': ParamValue("hidden"), '__internal_variable': ParamValue("rougail.dyn{{ identifier }}"), 'when': ParamValue(True), 'inverse': ParamValue(False), '_.var2': ParamOption(option_3, notraisepropertyerror=True)}), help_function=func['jinja_to_property_help'])}), informations={'dynamic_variable': 'rougail.var'}) +option_5 = StrOption(name="vardyn", doc="a dynamic variable", default="val", properties=frozenset({"force_default_on_freeze", "mandatory", "standard", Calculation(func['jinja_to_property'], Params((ParamValue("frozen")), kwargs={'__internal_jinja': ParamValue("frozen_rougail.dyn{{ identifier }}.vardyn"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['../rougail-tests/structures/60_5family_dynamic_calc2/rougail/00-base.yml']), '__internal_attribute': ParamValue("frozen"), '__internal_variable': ParamValue("rougail.dyn{{ identifier }}.vardyn"), 'when': ParamValue(True), 'inverse': ParamValue(False), '_.var2': ParamOption(option_3, notraisepropertyerror=True)}), help_function=func['jinja_to_property_help'])}), informations={'type': 'string'}) +optiondescription_4 = ConvertDynOptionDescription(name="dyn{{ identifier }}", doc="A dynamic family", identifiers=Calculation(func['calc_value'], Params((ParamOption(option_2)))), children=[option_5], properties=frozenset({"standard", Calculation(func['jinja_to_property'], Params((ParamValue("hidden")), kwargs={'__internal_jinja': ParamValue("hidden_rougail.dyn{{ identifier }}"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['../rougail-tests/structures/60_5family_dynamic_calc2/rougail/00-base.yml']), '__internal_attribute': ParamValue("hidden"), '__internal_variable': ParamValue("rougail.dyn{{ identifier }}"), 'when': ParamValue(True), 'inverse': ParamValue(False), '_.var2': ParamOption(option_3, notraisepropertyerror=True)}), help_function=func['jinja_to_property_help'])}), informations={'dynamic_variable': 'rougail.var'}) optiondescription_1 = OptionDescription(name="rougail", doc="Rougail", group_type=groups.namespace, children=[option_2, option_3, optiondescription_4], properties=frozenset({"basic"})) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_1]) diff --git a/tests/dictionaries/60_5family_dynamic_calc2/tiramisu/multi.py b/tests/dictionaries/60_5family_dynamic_calc2/tiramisu/multi.py index 5b65768b6..822cca35f 100644 --- a/tests/dictionaries/60_5family_dynamic_calc2/tiramisu/multi.py +++ b/tests/dictionaries/60_5family_dynamic_calc2/tiramisu/multi.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') try: groups.namespace except: @@ -16,14 +16,14 @@ dict_env['frozen_2.rougail.dyn{{ identifier }}.vardyn'] = "{% if _.var2 == \"no\ dict_env['hidden_2.rougail.dyn{{ identifier }}'] = "{% if _.var2 == \"no\" %}\nvar2 is no\n{% endif %}\n" option_3 = StrOption(name="var", doc="A suffix variable", multi=True, default=["val1", "val2"], default_multi="val1", properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) option_4 = StrOption(name="var2", doc="a second variable", properties=frozenset({"basic", "mandatory"}), informations={'type': 'string'}) -option_6 = StrOption(name="vardyn", doc="a dynamic variable", default="val", properties=frozenset({"force_default_on_freeze", "mandatory", "standard", Calculation(func['jinja_to_property'], Params((ParamValue("frozen")), kwargs={'__internal_jinja': ParamValue("frozen_1.rougail.dyn{{ identifier }}.vardyn"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['tests/dictionaries/60_5family_dynamic_calc2/dictionaries/rougail/00-base.yml']), '__internal_attribute': ParamValue("frozen"), '__internal_variable': ParamValue("1.rougail.dyn{{ identifier }}.vardyn"), 'when': ParamValue(True), 'inverse': ParamValue(False), '_.var2': ParamOption(option_4, notraisepropertyerror=True)}), help_function=func['jinja_to_property_help'])}), informations={'type': 'string'}) -optiondescription_5 = ConvertDynOptionDescription(name="dyn{{ identifier }}", doc="A dynamic family", identifiers=Calculation(func['calc_value'], Params((ParamOption(option_3)))), children=[option_6], properties=frozenset({"standard", Calculation(func['jinja_to_property'], Params((ParamValue("hidden")), kwargs={'__internal_jinja': ParamValue("hidden_1.rougail.dyn{{ identifier }}"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['tests/dictionaries/60_5family_dynamic_calc2/dictionaries/rougail/00-base.yml']), '__internal_attribute': ParamValue("hidden"), '__internal_variable': ParamValue("1.rougail.dyn{{ identifier }}"), 'when': ParamValue(True), 'inverse': ParamValue(False), '_.var2': ParamOption(option_4, notraisepropertyerror=True)}), help_function=func['jinja_to_property_help'])}), informations={'dynamic_variable': '1.rougail.var'}) +option_6 = StrOption(name="vardyn", doc="a dynamic variable", default="val", properties=frozenset({"force_default_on_freeze", "mandatory", "standard", Calculation(func['jinja_to_property'], Params((ParamValue("frozen")), kwargs={'__internal_jinja': ParamValue("frozen_1.rougail.dyn{{ identifier }}.vardyn"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['../rougail-tests/structures/60_5family_dynamic_calc2/rougail/00-base.yml']), '__internal_attribute': ParamValue("frozen"), '__internal_variable': ParamValue("1.rougail.dyn{{ identifier }}.vardyn"), 'when': ParamValue(True), 'inverse': ParamValue(False), '_.var2': ParamOption(option_4, notraisepropertyerror=True)}), help_function=func['jinja_to_property_help'])}), informations={'type': 'string'}) +optiondescription_5 = ConvertDynOptionDescription(name="dyn{{ identifier }}", doc="A dynamic family", identifiers=Calculation(func['calc_value'], Params((ParamOption(option_3)))), children=[option_6], properties=frozenset({"standard", Calculation(func['jinja_to_property'], Params((ParamValue("hidden")), kwargs={'__internal_jinja': ParamValue("hidden_1.rougail.dyn{{ identifier }}"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['../rougail-tests/structures/60_5family_dynamic_calc2/rougail/00-base.yml']), '__internal_attribute': ParamValue("hidden"), '__internal_variable': ParamValue("1.rougail.dyn{{ identifier }}"), 'when': ParamValue(True), 'inverse': ParamValue(False), '_.var2': ParamOption(option_4, notraisepropertyerror=True)}), help_function=func['jinja_to_property_help'])}), informations={'dynamic_variable': '1.rougail.var'}) optiondescription_2 = OptionDescription(name="rougail", doc="Rougail", group_type=groups.namespace, children=[option_3, option_4, optiondescription_5], properties=frozenset({"basic"})) optiondescription_1 = OptionDescription(name="1", doc="1", children=[optiondescription_2], properties=frozenset({"basic"})) option_9 = StrOption(name="var", doc="A suffix variable", multi=True, default=["val1", "val2"], default_multi="val1", properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) option_10 = StrOption(name="var2", doc="a second variable", properties=frozenset({"basic", "mandatory"}), informations={'type': 'string'}) -option_12 = StrOption(name="vardyn", doc="a dynamic variable", default="val", properties=frozenset({"force_default_on_freeze", "mandatory", "standard", Calculation(func['jinja_to_property'], Params((ParamValue("frozen")), kwargs={'__internal_jinja': ParamValue("frozen_2.rougail.dyn{{ identifier }}.vardyn"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['tests/dictionaries/60_5family_dynamic_calc2/dictionaries/rougail/00-base.yml']), '__internal_attribute': ParamValue("frozen"), '__internal_variable': ParamValue("2.rougail.dyn{{ identifier }}.vardyn"), 'when': ParamValue(True), 'inverse': ParamValue(False), '_.var2': ParamOption(option_10, notraisepropertyerror=True)}), help_function=func['jinja_to_property_help'])}), informations={'type': 'string'}) -optiondescription_11 = ConvertDynOptionDescription(name="dyn{{ identifier }}", doc="A dynamic family", identifiers=Calculation(func['calc_value'], Params((ParamOption(option_9)))), children=[option_12], properties=frozenset({"standard", Calculation(func['jinja_to_property'], Params((ParamValue("hidden")), kwargs={'__internal_jinja': ParamValue("hidden_2.rougail.dyn{{ identifier }}"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['tests/dictionaries/60_5family_dynamic_calc2/dictionaries/rougail/00-base.yml']), '__internal_attribute': ParamValue("hidden"), '__internal_variable': ParamValue("2.rougail.dyn{{ identifier }}"), 'when': ParamValue(True), 'inverse': ParamValue(False), '_.var2': ParamOption(option_10, notraisepropertyerror=True)}), help_function=func['jinja_to_property_help'])}), informations={'dynamic_variable': '2.rougail.var'}) +option_12 = StrOption(name="vardyn", doc="a dynamic variable", default="val", properties=frozenset({"force_default_on_freeze", "mandatory", "standard", Calculation(func['jinja_to_property'], Params((ParamValue("frozen")), kwargs={'__internal_jinja': ParamValue("frozen_2.rougail.dyn{{ identifier }}.vardyn"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['../rougail-tests/structures/60_5family_dynamic_calc2/rougail/00-base.yml']), '__internal_attribute': ParamValue("frozen"), '__internal_variable': ParamValue("2.rougail.dyn{{ identifier }}.vardyn"), 'when': ParamValue(True), 'inverse': ParamValue(False), '_.var2': ParamOption(option_10, notraisepropertyerror=True)}), help_function=func['jinja_to_property_help'])}), informations={'type': 'string'}) +optiondescription_11 = ConvertDynOptionDescription(name="dyn{{ identifier }}", doc="A dynamic family", identifiers=Calculation(func['calc_value'], Params((ParamOption(option_9)))), children=[option_12], properties=frozenset({"standard", Calculation(func['jinja_to_property'], Params((ParamValue("hidden")), kwargs={'__internal_jinja': ParamValue("hidden_2.rougail.dyn{{ identifier }}"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['../rougail-tests/structures/60_5family_dynamic_calc2/rougail/00-base.yml']), '__internal_attribute': ParamValue("hidden"), '__internal_variable': ParamValue("2.rougail.dyn{{ identifier }}"), 'when': ParamValue(True), 'inverse': ParamValue(False), '_.var2': ParamOption(option_10, notraisepropertyerror=True)}), help_function=func['jinja_to_property_help'])}), informations={'dynamic_variable': '2.rougail.var'}) optiondescription_8 = OptionDescription(name="rougail", doc="Rougail", group_type=groups.namespace, children=[option_9, option_10, optiondescription_11], properties=frozenset({"basic"})) optiondescription_7 = OptionDescription(name="2", doc="2", children=[optiondescription_8], properties=frozenset({"basic"})) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_1, optiondescription_7]) diff --git a/tests/dictionaries/60_5family_dynamic_calc2_empty/dictionaries/rougail/00-base.yml b/tests/dictionaries/60_5family_dynamic_calc2_empty/dictionaries/rougail/00-base.yml deleted file mode 100644 index 5289faf64..000000000 --- a/tests/dictionaries/60_5family_dynamic_calc2_empty/dictionaries/rougail/00-base.yml +++ /dev/null @@ -1,25 +0,0 @@ ---- -version: '1.1' - -var: - description: A suffix variable - multi: true - mandatory: false - test: - - val1 - - val2 - -var2: # a second variable - -"dyn{{ identifier }}": - description: A dynamic family - dynamic: - variable: _.var - hidden: - jinja: | - {% if _.var2 == "no" %} - var2 is no - {% endif %} - description: if var2 is no - - vardyn: val # a dynamic variable diff --git a/tests/dictionaries/60_5family_dynamic_calc2_empty/force_namespace b/tests/dictionaries/60_5family_dynamic_calc2_empty/force_namespace deleted file mode 100644 index e69de29bb..000000000 diff --git a/tests/dictionaries/60_5family_dynamic_calc2_empty/tiramisu/base.py b/tests/dictionaries/60_5family_dynamic_calc2_empty/tiramisu/base.py index 9a72452d1..74e07c219 100644 --- a/tests/dictionaries/60_5family_dynamic_calc2_empty/tiramisu/base.py +++ b/tests/dictionaries/60_5family_dynamic_calc2_empty/tiramisu/base.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') try: groups.namespace except: @@ -14,7 +14,7 @@ dict_env['frozen_rougail.dyn{{ identifier }}.vardyn'] = "{% if _.var2 == \"no\" dict_env['hidden_rougail.dyn{{ identifier }}'] = "{% if _.var2 == \"no\" %}\nvar2 is no\n{% endif %}\n" option_2 = StrOption(name="var", doc="A suffix variable", multi=True, properties=frozenset({"standard"}), informations={'type': 'string', 'test': ('val1', 'val2')}) option_3 = StrOption(name="var2", doc="a second variable", properties=frozenset({"basic", "mandatory"}), informations={'type': 'string'}) -option_5 = StrOption(name="vardyn", doc="a dynamic variable", default="val", properties=frozenset({"force_default_on_freeze", "mandatory", "standard", Calculation(func['jinja_to_property'], Params((ParamValue("frozen")), kwargs={'__internal_jinja': ParamValue("frozen_rougail.dyn{{ identifier }}.vardyn"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['tests/dictionaries/60_5family_dynamic_calc2_empty/dictionaries/rougail/00-base.yml']), '__internal_attribute': ParamValue("frozen"), '__internal_variable': ParamValue("rougail.dyn{{ identifier }}.vardyn"), 'when': ParamValue(True), 'inverse': ParamValue(False), '_.var2': ParamOption(option_3, notraisepropertyerror=True)}), help_function=func['jinja_to_property_help'])}), informations={'type': 'string'}) -optiondescription_4 = ConvertDynOptionDescription(name="dyn{{ identifier }}", doc="A dynamic family", identifiers=Calculation(func['calc_value'], Params((ParamOption(option_2)))), children=[option_5], properties=frozenset({"standard", Calculation(func['jinja_to_property'], Params((ParamValue("hidden")), kwargs={'__internal_jinja': ParamValue("hidden_rougail.dyn{{ identifier }}"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['tests/dictionaries/60_5family_dynamic_calc2_empty/dictionaries/rougail/00-base.yml']), '__internal_attribute': ParamValue("hidden"), '__internal_variable': ParamValue("rougail.dyn{{ identifier }}"), 'when': ParamValue(True), 'inverse': ParamValue(False), '_.var2': ParamOption(option_3, notraisepropertyerror=True)}), help_function=func['jinja_to_property_help'])}), informations={'dynamic_variable': 'rougail.var'}) +option_5 = StrOption(name="vardyn", doc="a dynamic variable", default="val", properties=frozenset({"force_default_on_freeze", "mandatory", "standard", Calculation(func['jinja_to_property'], Params((ParamValue("frozen")), kwargs={'__internal_jinja': ParamValue("frozen_rougail.dyn{{ identifier }}.vardyn"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['../rougail-tests/structures/60_5family_dynamic_calc2_empty/rougail/00-base.yml']), '__internal_attribute': ParamValue("frozen"), '__internal_variable': ParamValue("rougail.dyn{{ identifier }}.vardyn"), 'when': ParamValue(True), 'inverse': ParamValue(False), '_.var2': ParamOption(option_3, notraisepropertyerror=True)}), help_function=func['jinja_to_property_help'])}), informations={'type': 'string'}) +optiondescription_4 = ConvertDynOptionDescription(name="dyn{{ identifier }}", doc="A dynamic family", identifiers=Calculation(func['calc_value'], Params((ParamOption(option_2)))), children=[option_5], properties=frozenset({"standard", Calculation(func['jinja_to_property'], Params((ParamValue("hidden")), kwargs={'__internal_jinja': ParamValue("hidden_rougail.dyn{{ identifier }}"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['../rougail-tests/structures/60_5family_dynamic_calc2_empty/rougail/00-base.yml']), '__internal_attribute': ParamValue("hidden"), '__internal_variable': ParamValue("rougail.dyn{{ identifier }}"), 'when': ParamValue(True), 'inverse': ParamValue(False), '_.var2': ParamOption(option_3, notraisepropertyerror=True)}), help_function=func['jinja_to_property_help'])}), informations={'dynamic_variable': 'rougail.var'}) optiondescription_1 = OptionDescription(name="rougail", doc="Rougail", group_type=groups.namespace, children=[option_2, option_3, optiondescription_4], properties=frozenset({"basic"})) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_1]) diff --git a/tests/dictionaries/60_5family_dynamic_calc2_empty/tiramisu/multi.py b/tests/dictionaries/60_5family_dynamic_calc2_empty/tiramisu/multi.py index 0eb8e16a9..dcbd3be0e 100644 --- a/tests/dictionaries/60_5family_dynamic_calc2_empty/tiramisu/multi.py +++ b/tests/dictionaries/60_5family_dynamic_calc2_empty/tiramisu/multi.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') try: groups.namespace except: @@ -16,14 +16,14 @@ dict_env['frozen_2.rougail.dyn{{ identifier }}.vardyn'] = "{% if _.var2 == \"no\ dict_env['hidden_2.rougail.dyn{{ identifier }}'] = "{% if _.var2 == \"no\" %}\nvar2 is no\n{% endif %}\n" option_3 = StrOption(name="var", doc="A suffix variable", multi=True, properties=frozenset({"standard"}), informations={'type': 'string', 'test': ('val1', 'val2')}) option_4 = StrOption(name="var2", doc="a second variable", properties=frozenset({"basic", "mandatory"}), informations={'type': 'string'}) -option_6 = StrOption(name="vardyn", doc="a dynamic variable", default="val", properties=frozenset({"force_default_on_freeze", "mandatory", "standard", Calculation(func['jinja_to_property'], Params((ParamValue("frozen")), kwargs={'__internal_jinja': ParamValue("frozen_1.rougail.dyn{{ identifier }}.vardyn"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['tests/dictionaries/60_5family_dynamic_calc2_empty/dictionaries/rougail/00-base.yml']), '__internal_attribute': ParamValue("frozen"), '__internal_variable': ParamValue("1.rougail.dyn{{ identifier }}.vardyn"), 'when': ParamValue(True), 'inverse': ParamValue(False), '_.var2': ParamOption(option_4, notraisepropertyerror=True)}), help_function=func['jinja_to_property_help'])}), informations={'type': 'string'}) -optiondescription_5 = ConvertDynOptionDescription(name="dyn{{ identifier }}", doc="A dynamic family", identifiers=Calculation(func['calc_value'], Params((ParamOption(option_3)))), children=[option_6], properties=frozenset({"standard", Calculation(func['jinja_to_property'], Params((ParamValue("hidden")), kwargs={'__internal_jinja': ParamValue("hidden_1.rougail.dyn{{ identifier }}"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['tests/dictionaries/60_5family_dynamic_calc2_empty/dictionaries/rougail/00-base.yml']), '__internal_attribute': ParamValue("hidden"), '__internal_variable': ParamValue("1.rougail.dyn{{ identifier }}"), 'when': ParamValue(True), 'inverse': ParamValue(False), '_.var2': ParamOption(option_4, notraisepropertyerror=True)}), help_function=func['jinja_to_property_help'])}), informations={'dynamic_variable': '1.rougail.var'}) +option_6 = StrOption(name="vardyn", doc="a dynamic variable", default="val", properties=frozenset({"force_default_on_freeze", "mandatory", "standard", Calculation(func['jinja_to_property'], Params((ParamValue("frozen")), kwargs={'__internal_jinja': ParamValue("frozen_1.rougail.dyn{{ identifier }}.vardyn"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['../rougail-tests/structures/60_5family_dynamic_calc2_empty/rougail/00-base.yml']), '__internal_attribute': ParamValue("frozen"), '__internal_variable': ParamValue("1.rougail.dyn{{ identifier }}.vardyn"), 'when': ParamValue(True), 'inverse': ParamValue(False), '_.var2': ParamOption(option_4, notraisepropertyerror=True)}), help_function=func['jinja_to_property_help'])}), informations={'type': 'string'}) +optiondescription_5 = ConvertDynOptionDescription(name="dyn{{ identifier }}", doc="A dynamic family", identifiers=Calculation(func['calc_value'], Params((ParamOption(option_3)))), children=[option_6], properties=frozenset({"standard", Calculation(func['jinja_to_property'], Params((ParamValue("hidden")), kwargs={'__internal_jinja': ParamValue("hidden_1.rougail.dyn{{ identifier }}"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['../rougail-tests/structures/60_5family_dynamic_calc2_empty/rougail/00-base.yml']), '__internal_attribute': ParamValue("hidden"), '__internal_variable': ParamValue("1.rougail.dyn{{ identifier }}"), 'when': ParamValue(True), 'inverse': ParamValue(False), '_.var2': ParamOption(option_4, notraisepropertyerror=True)}), help_function=func['jinja_to_property_help'])}), informations={'dynamic_variable': '1.rougail.var'}) optiondescription_2 = OptionDescription(name="rougail", doc="Rougail", group_type=groups.namespace, children=[option_3, option_4, optiondescription_5], properties=frozenset({"basic"})) optiondescription_1 = OptionDescription(name="1", doc="1", children=[optiondescription_2], properties=frozenset({"basic"})) option_9 = StrOption(name="var", doc="A suffix variable", multi=True, properties=frozenset({"standard"}), informations={'type': 'string', 'test': ('val1', 'val2')}) option_10 = StrOption(name="var2", doc="a second variable", properties=frozenset({"basic", "mandatory"}), informations={'type': 'string'}) -option_12 = StrOption(name="vardyn", doc="a dynamic variable", default="val", properties=frozenset({"force_default_on_freeze", "mandatory", "standard", Calculation(func['jinja_to_property'], Params((ParamValue("frozen")), kwargs={'__internal_jinja': ParamValue("frozen_2.rougail.dyn{{ identifier }}.vardyn"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['tests/dictionaries/60_5family_dynamic_calc2_empty/dictionaries/rougail/00-base.yml']), '__internal_attribute': ParamValue("frozen"), '__internal_variable': ParamValue("2.rougail.dyn{{ identifier }}.vardyn"), 'when': ParamValue(True), 'inverse': ParamValue(False), '_.var2': ParamOption(option_10, notraisepropertyerror=True)}), help_function=func['jinja_to_property_help'])}), informations={'type': 'string'}) -optiondescription_11 = ConvertDynOptionDescription(name="dyn{{ identifier }}", doc="A dynamic family", identifiers=Calculation(func['calc_value'], Params((ParamOption(option_9)))), children=[option_12], properties=frozenset({"standard", Calculation(func['jinja_to_property'], Params((ParamValue("hidden")), kwargs={'__internal_jinja': ParamValue("hidden_2.rougail.dyn{{ identifier }}"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['tests/dictionaries/60_5family_dynamic_calc2_empty/dictionaries/rougail/00-base.yml']), '__internal_attribute': ParamValue("hidden"), '__internal_variable': ParamValue("2.rougail.dyn{{ identifier }}"), 'when': ParamValue(True), 'inverse': ParamValue(False), '_.var2': ParamOption(option_10, notraisepropertyerror=True)}), help_function=func['jinja_to_property_help'])}), informations={'dynamic_variable': '2.rougail.var'}) +option_12 = StrOption(name="vardyn", doc="a dynamic variable", default="val", properties=frozenset({"force_default_on_freeze", "mandatory", "standard", Calculation(func['jinja_to_property'], Params((ParamValue("frozen")), kwargs={'__internal_jinja': ParamValue("frozen_2.rougail.dyn{{ identifier }}.vardyn"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['../rougail-tests/structures/60_5family_dynamic_calc2_empty/rougail/00-base.yml']), '__internal_attribute': ParamValue("frozen"), '__internal_variable': ParamValue("2.rougail.dyn{{ identifier }}.vardyn"), 'when': ParamValue(True), 'inverse': ParamValue(False), '_.var2': ParamOption(option_10, notraisepropertyerror=True)}), help_function=func['jinja_to_property_help'])}), informations={'type': 'string'}) +optiondescription_11 = ConvertDynOptionDescription(name="dyn{{ identifier }}", doc="A dynamic family", identifiers=Calculation(func['calc_value'], Params((ParamOption(option_9)))), children=[option_12], properties=frozenset({"standard", Calculation(func['jinja_to_property'], Params((ParamValue("hidden")), kwargs={'__internal_jinja': ParamValue("hidden_2.rougail.dyn{{ identifier }}"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['../rougail-tests/structures/60_5family_dynamic_calc2_empty/rougail/00-base.yml']), '__internal_attribute': ParamValue("hidden"), '__internal_variable': ParamValue("2.rougail.dyn{{ identifier }}"), 'when': ParamValue(True), 'inverse': ParamValue(False), '_.var2': ParamOption(option_10, notraisepropertyerror=True)}), help_function=func['jinja_to_property_help'])}), informations={'dynamic_variable': '2.rougail.var'}) optiondescription_8 = OptionDescription(name="rougail", doc="Rougail", group_type=groups.namespace, children=[option_9, option_10, optiondescription_11], properties=frozenset({"basic"})) optiondescription_7 = OptionDescription(name="2", doc="2", children=[optiondescription_8], properties=frozenset({"basic"})) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_1, optiondescription_7]) 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 deleted file mode 100644 index 363088554..000000000 --- a/tests/dictionaries/60_5family_dynamic_calc_suffix/dictionaries/rougail/00-base.yml +++ /dev/null @@ -1,20 +0,0 @@ ---- -version: '1.1' - -var1: - description: A suffix variable - default: - - val1 - - val2 - -"dyn{{ identifier }}": - dynamic: - variable: _.var1 - - var: - description: A dynamic variable - -var2: - description: A variable calculated - default: - variable: rougail.dynval1.var diff --git a/tests/dictionaries/60_5family_dynamic_calc_suffix/force_namespace b/tests/dictionaries/60_5family_dynamic_calc_suffix/force_namespace deleted file mode 100644 index e69de29bb..000000000 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 03b333479..ca3925b47 100644 --- a/tests/dictionaries/60_5family_dynamic_calc_suffix/tiramisu/base.py +++ b/tests/dictionaries/60_5family_dynamic_calc_suffix/tiramisu/base.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') try: groups.namespace except: 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 01850cb36..762078d7f 100644 --- a/tests/dictionaries/60_5family_dynamic_calc_suffix/tiramisu/multi.py +++ b/tests/dictionaries/60_5family_dynamic_calc_suffix/tiramisu/multi.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') try: groups.namespace except: 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 deleted file mode 100644 index 320fb96d4..000000000 --- a/tests/dictionaries/60_5family_dynamic_calc_suffix2/dictionaries/rougail/00-base.yml +++ /dev/null @@ -1,13 +0,0 @@ ---- -version: '1.1' -var: # a suffix variable - - val1 - - val2 -"dyn{{ identifier }}": - description: a dynamic family - dynamic: - variable: _.var - var: - description: Suffix has value - default: - type: identifier 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 9433eed3b..ec146af16 100644 --- a/tests/dictionaries/60_5family_dynamic_calc_suffix2/tiramisu/base.py +++ b/tests/dictionaries/60_5family_dynamic_calc_suffix2/tiramisu/base.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') try: groups.namespace except: 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 17b4a6e7d..3ac228f01 100644 --- a/tests/dictionaries/60_5family_dynamic_calc_suffix2/tiramisu/multi.py +++ b/tests/dictionaries/60_5family_dynamic_calc_suffix2/tiramisu/multi.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') try: groups.namespace except: 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 98eab7832..1ba476944 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 @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") ALLOWED_LEADER_PROPERTIES.add("standard") ALLOWED_LEADER_PROPERTIES.add("advanced") diff --git a/tests/dictionaries/60_5family_dynamic_calc_suffix2_empty/dictionaries/rougail/00-base.yml b/tests/dictionaries/60_5family_dynamic_calc_suffix2_empty/dictionaries/rougail/00-base.yml deleted file mode 100644 index a02c68246..000000000 --- a/tests/dictionaries/60_5family_dynamic_calc_suffix2_empty/dictionaries/rougail/00-base.yml +++ /dev/null @@ -1,17 +0,0 @@ ---- -version: '1.1' -var: - description: a suffix variable - multi: true - mandatory: false - test: - - val1 - - val2 -"dyn{{ identifier }}": - description: a dynamic family - dynamic: - variable: _.var - var: - description: Suffix has value - default: - type: identifier diff --git a/tests/dictionaries/60_5family_dynamic_calc_suffix2_empty/tiramisu/base.py b/tests/dictionaries/60_5family_dynamic_calc_suffix2_empty/tiramisu/base.py index dd8f61046..3f6b9f6a2 100644 --- a/tests/dictionaries/60_5family_dynamic_calc_suffix2_empty/tiramisu/base.py +++ b/tests/dictionaries/60_5family_dynamic_calc_suffix2_empty/tiramisu/base.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') try: groups.namespace except: diff --git a/tests/dictionaries/60_5family_dynamic_calc_suffix2_empty/tiramisu/multi.py b/tests/dictionaries/60_5family_dynamic_calc_suffix2_empty/tiramisu/multi.py index 23837e848..59bb9f6af 100644 --- a/tests/dictionaries/60_5family_dynamic_calc_suffix2_empty/tiramisu/multi.py +++ b/tests/dictionaries/60_5family_dynamic_calc_suffix2_empty/tiramisu/multi.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') try: groups.namespace except: diff --git a/tests/dictionaries/60_5family_dynamic_calc_suffix2_empty/tiramisu/no_namespace.py b/tests/dictionaries/60_5family_dynamic_calc_suffix2_empty/tiramisu/no_namespace.py index 4c7efeabb..77853f4a2 100644 --- a/tests/dictionaries/60_5family_dynamic_calc_suffix2_empty/tiramisu/no_namespace.py +++ b/tests/dictionaries/60_5family_dynamic_calc_suffix2_empty/tiramisu/no_namespace.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") ALLOWED_LEADER_PROPERTIES.add("standard") ALLOWED_LEADER_PROPERTIES.add("advanced") 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 deleted file mode 100644 index 1df2a0c55..000000000 --- a/tests/dictionaries/60_5family_dynamic_calc_suffix_disabled/dictionaries/rougail/00-base.yml +++ /dev/null @@ -1,11 +0,0 @@ ---- -version: '1.1' -"dyn{{ identifier }}": - dynamic: - - val1 - - val2 - var: - description: A dynamic variable - disabled: - type: identifier - 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 deleted file mode 100644 index e69de29bb..000000000 diff --git a/tests/dictionaries/60_5family_dynamic_calc_suffix_disabled/tiramisu/base.py b/tests/dictionaries/60_5family_dynamic_calc_suffix_disabled/tiramisu/base.py index d445cc5a0..8eae1b853 100644 --- a/tests/dictionaries/60_5family_dynamic_calc_suffix_disabled/tiramisu/base.py +++ b/tests/dictionaries/60_5family_dynamic_calc_suffix_disabled/tiramisu/base.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') try: groups.namespace except: 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 index 174cba10d..65399c73f 100644 --- a/tests/dictionaries/60_5family_dynamic_calc_suffix_disabled/tiramisu/multi.py +++ b/tests/dictionaries/60_5family_dynamic_calc_suffix_disabled/tiramisu/multi.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') try: groups.namespace except: diff --git a/tests/dictionaries/60_5family_dynamic_calc_suffix_empty/dictionaries/rougail/00-base.yml b/tests/dictionaries/60_5family_dynamic_calc_suffix_empty/dictionaries/rougail/00-base.yml deleted file mode 100644 index dcfdfa888..000000000 --- a/tests/dictionaries/60_5family_dynamic_calc_suffix_empty/dictionaries/rougail/00-base.yml +++ /dev/null @@ -1,23 +0,0 @@ ---- -version: '1.1' - -var1: - description: A suffix variable - multi: true - mandatory: false - test: - - val1 - - val2 - -"dyn{{ identifier }}": - dynamic: - variable: _.var1 - - var: - description: A dynamic variable - -var2: - description: A variable calculated - default: - variable: rougail.dynval1.var - optional: true diff --git a/tests/dictionaries/60_5family_dynamic_calc_suffix_empty/force_namespace b/tests/dictionaries/60_5family_dynamic_calc_suffix_empty/force_namespace deleted file mode 100644 index e69de29bb..000000000 diff --git a/tests/dictionaries/60_5family_dynamic_calc_suffix_empty/tiramisu/base.py b/tests/dictionaries/60_5family_dynamic_calc_suffix_empty/tiramisu/base.py index b58ed8cbc..5f7c65c18 100644 --- a/tests/dictionaries/60_5family_dynamic_calc_suffix_empty/tiramisu/base.py +++ b/tests/dictionaries/60_5family_dynamic_calc_suffix_empty/tiramisu/base.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') try: groups.namespace except: diff --git a/tests/dictionaries/60_5family_dynamic_calc_suffix_empty/tiramisu/multi.py b/tests/dictionaries/60_5family_dynamic_calc_suffix_empty/tiramisu/multi.py index 17c73c74e..a357f9fb3 100644 --- a/tests/dictionaries/60_5family_dynamic_calc_suffix_empty/tiramisu/multi.py +++ b/tests/dictionaries/60_5family_dynamic_calc_suffix_empty/tiramisu/multi.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') try: groups.namespace except: 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 deleted file mode 100644 index acff186b5..000000000 --- a/tests/dictionaries/60_5family_dynamic_calc_suffix_param/dictionaries/rougail/00-base.yml +++ /dev/null @@ -1,18 +0,0 @@ ---- -version: '1.1' -var: # A identifier variable - - val1 - - val2 -"dyn{{ identifier }}": - description: A dynamic family - dynamic: - variable: _.var - var: - description: A dynamic variable - default: - jinja: | - {{ identifier }} - params: - identifier: - type: identifier - description: from suffix 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 fbf8e5f7a..692d6bda7 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 @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') try: groups.namespace except: @@ -12,7 +12,7 @@ ALLOWED_LEADER_PROPERTIES.add("standard") ALLOWED_LEADER_PROPERTIES.add("advanced") dict_env['default_rougail.dyn{{ identifier }}.var'] = "{{ identifier }}\n" option_2 = StrOption(name="var", doc="A identifier variable", multi=True, default=["val1", "val2"], default_multi="val1", properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) -option_4 = StrOption(name="var", doc="A dynamic variable", default=Calculation(func['jinja_to_function'], Params((), kwargs={'__internal_jinja': ParamValue("default_rougail.dyn{{ identifier }}.var"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['tests/dictionaries/60_5family_dynamic_calc_suffix_param/dictionaries/rougail/00-base.yml']), '__internal_attribute': ParamValue("default"), '__internal_variable': ParamValue("rougail.dyn{{ identifier }}.var"), 'identifier': ParamIdentifier()})), properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) +option_4 = StrOption(name="var", doc="A dynamic variable", default=Calculation(func['jinja_to_function'], Params((), kwargs={'__internal_jinja': ParamValue("default_rougail.dyn{{ identifier }}.var"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['../rougail-tests/structures/60_5family_dynamic_calc_suffix_param/rougail/00-base.yml']), '__internal_attribute': ParamValue("default"), '__internal_variable': ParamValue("rougail.dyn{{ identifier }}.var"), 'identifier': ParamIdentifier()})), properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) optiondescription_3 = ConvertDynOptionDescription(name="dyn{{ identifier }}", doc="A dynamic family", identifiers=Calculation(func['calc_value'], Params((ParamOption(option_2)))), children=[option_4], properties=frozenset({"standard"}), informations={'dynamic_variable': 'rougail.var'}) optiondescription_1 = OptionDescription(name="rougail", doc="Rougail", group_type=groups.namespace, children=[option_2, optiondescription_3], properties=frozenset({"standard"})) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_1]) 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 925d50838..b8ec956b5 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 @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') try: groups.namespace except: @@ -13,12 +13,12 @@ ALLOWED_LEADER_PROPERTIES.add("advanced") dict_env['default_1.rougail.dyn{{ identifier }}.var'] = "{{ identifier }}\n" dict_env['default_2.rougail.dyn{{ identifier }}.var'] = "{{ identifier }}\n" option_3 = StrOption(name="var", doc="A identifier variable", multi=True, default=["val1", "val2"], default_multi="val1", properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) -option_5 = StrOption(name="var", doc="A dynamic variable", default=Calculation(func['jinja_to_function'], Params((), kwargs={'__internal_jinja': ParamValue("default_1.rougail.dyn{{ identifier }}.var"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['tests/dictionaries/60_5family_dynamic_calc_suffix_param/dictionaries/rougail/00-base.yml']), '__internal_attribute': ParamValue("default"), '__internal_variable': ParamValue("1.rougail.dyn{{ identifier }}.var"), 'identifier': ParamIdentifier()})), properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) +option_5 = StrOption(name="var", doc="A dynamic variable", default=Calculation(func['jinja_to_function'], Params((), kwargs={'__internal_jinja': ParamValue("default_1.rougail.dyn{{ identifier }}.var"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['../rougail-tests/structures/60_5family_dynamic_calc_suffix_param/rougail/00-base.yml']), '__internal_attribute': ParamValue("default"), '__internal_variable': ParamValue("1.rougail.dyn{{ identifier }}.var"), 'identifier': ParamIdentifier()})), properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) optiondescription_4 = ConvertDynOptionDescription(name="dyn{{ identifier }}", doc="A dynamic family", identifiers=Calculation(func['calc_value'], Params((ParamOption(option_3)))), children=[option_5], properties=frozenset({"standard"}), informations={'dynamic_variable': '1.rougail.var'}) optiondescription_2 = OptionDescription(name="rougail", doc="Rougail", group_type=groups.namespace, children=[option_3, optiondescription_4], properties=frozenset({"standard"})) optiondescription_1 = OptionDescription(name="1", doc="1", children=[optiondescription_2], properties=frozenset({"standard"})) option_8 = StrOption(name="var", doc="A identifier variable", multi=True, default=["val1", "val2"], default_multi="val1", properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) -option_10 = StrOption(name="var", doc="A dynamic variable", default=Calculation(func['jinja_to_function'], Params((), kwargs={'__internal_jinja': ParamValue("default_2.rougail.dyn{{ identifier }}.var"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['tests/dictionaries/60_5family_dynamic_calc_suffix_param/dictionaries/rougail/00-base.yml']), '__internal_attribute': ParamValue("default"), '__internal_variable': ParamValue("2.rougail.dyn{{ identifier }}.var"), 'identifier': ParamIdentifier()})), properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) +option_10 = StrOption(name="var", doc="A dynamic variable", default=Calculation(func['jinja_to_function'], Params((), kwargs={'__internal_jinja': ParamValue("default_2.rougail.dyn{{ identifier }}.var"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['../rougail-tests/structures/60_5family_dynamic_calc_suffix_param/rougail/00-base.yml']), '__internal_attribute': ParamValue("default"), '__internal_variable': ParamValue("2.rougail.dyn{{ identifier }}.var"), 'identifier': ParamIdentifier()})), properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) optiondescription_9 = ConvertDynOptionDescription(name="dyn{{ identifier }}", doc="A dynamic family", identifiers=Calculation(func['calc_value'], Params((ParamOption(option_8)))), children=[option_10], properties=frozenset({"standard"}), informations={'dynamic_variable': '2.rougail.var'}) optiondescription_7 = OptionDescription(name="rougail", doc="Rougail", group_type=groups.namespace, children=[option_8, optiondescription_9], properties=frozenset({"standard"})) optiondescription_6 = OptionDescription(name="2", doc="2", children=[optiondescription_7], properties=frozenset({"standard"})) 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 6c5def7ab..19646ce10 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 @@ -2,12 +2,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') +load_functions('../rougail-tests/funcs/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") ALLOWED_LEADER_PROPERTIES.add("standard") ALLOWED_LEADER_PROPERTIES.add("advanced") dict_env['default_dyn{{ identifier }}.var'] = "{{ identifier }}\n" option_1 = StrOption(name="var", doc="A identifier variable", multi=True, default=["val1", "val2"], default_multi="val1", properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) -option_3 = StrOption(name="var", doc="A dynamic variable", default=Calculation(func['jinja_to_function'], Params((), kwargs={'__internal_jinja': ParamValue("default_dyn{{ identifier }}.var"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['tests/dictionaries/60_5family_dynamic_calc_suffix_param/dictionaries/rougail/00-base.yml']), '__internal_attribute': ParamValue("default"), '__internal_variable': ParamValue("dyn{{ identifier }}.var"), 'identifier': ParamIdentifier()})), properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) +option_3 = StrOption(name="var", doc="A dynamic variable", default=Calculation(func['jinja_to_function'], Params((), kwargs={'__internal_jinja': ParamValue("default_dyn{{ identifier }}.var"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['../rougail-tests/structures/60_5family_dynamic_calc_suffix_param/rougail/00-base.yml']), '__internal_attribute': ParamValue("default"), '__internal_variable': ParamValue("dyn{{ identifier }}.var"), 'identifier': ParamIdentifier()})), properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) optiondescription_2 = ConvertDynOptionDescription(name="dyn{{ identifier }}", doc="A dynamic family", identifiers=Calculation(func['calc_value'], Params((ParamOption(option_1)))), children=[option_3], properties=frozenset({"standard"}), informations={'dynamic_variable': 'var'}) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1, optiondescription_2]) diff --git a/tests/dictionaries/60_5family_dynamic_calc_suffix_param_empty/dictionaries/rougail/00-base.yml b/tests/dictionaries/60_5family_dynamic_calc_suffix_param_empty/dictionaries/rougail/00-base.yml deleted file mode 100644 index a3471cbc0..000000000 --- a/tests/dictionaries/60_5family_dynamic_calc_suffix_param_empty/dictionaries/rougail/00-base.yml +++ /dev/null @@ -1,22 +0,0 @@ ---- -version: '1.1' -var: - description: A identifier variable - multi: true - mandatory: false - test: - - val1 - - val2 -"dyn{{ identifier }}": - description: A dynamic family - dynamic: - variable: _.var - var: - description: A dynamic variable - default: - jinja: | - {{ identifier }} - params: - identifier: - type: identifier - description: from suffix diff --git a/tests/dictionaries/60_5family_dynamic_calc_suffix_param_empty/tiramisu/base.py b/tests/dictionaries/60_5family_dynamic_calc_suffix_param_empty/tiramisu/base.py index 44da9a3c0..7558c8343 100644 --- a/tests/dictionaries/60_5family_dynamic_calc_suffix_param_empty/tiramisu/base.py +++ b/tests/dictionaries/60_5family_dynamic_calc_suffix_param_empty/tiramisu/base.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') try: groups.namespace except: @@ -12,7 +12,7 @@ ALLOWED_LEADER_PROPERTIES.add("standard") ALLOWED_LEADER_PROPERTIES.add("advanced") dict_env['default_rougail.dyn{{ identifier }}.var'] = "{{ identifier }}\n" option_2 = StrOption(name="var", doc="A identifier variable", multi=True, properties=frozenset({"standard"}), informations={'type': 'string', 'test': ('val1', 'val2')}) -option_4 = StrOption(name="var", doc="A dynamic variable", default=Calculation(func['jinja_to_function'], Params((), kwargs={'__internal_jinja': ParamValue("default_rougail.dyn{{ identifier }}.var"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['tests/dictionaries/60_5family_dynamic_calc_suffix_param_empty/dictionaries/rougail/00-base.yml']), '__internal_attribute': ParamValue("default"), '__internal_variable': ParamValue("rougail.dyn{{ identifier }}.var"), 'identifier': ParamIdentifier()})), properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) +option_4 = StrOption(name="var", doc="A dynamic variable", default=Calculation(func['jinja_to_function'], Params((), kwargs={'__internal_jinja': ParamValue("default_rougail.dyn{{ identifier }}.var"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['../rougail-tests/structures/60_5family_dynamic_calc_suffix_param_empty/rougail/00-base.yml']), '__internal_attribute': ParamValue("default"), '__internal_variable': ParamValue("rougail.dyn{{ identifier }}.var"), 'identifier': ParamIdentifier()})), properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) optiondescription_3 = ConvertDynOptionDescription(name="dyn{{ identifier }}", doc="A dynamic family", identifiers=Calculation(func['calc_value'], Params((ParamOption(option_2)))), children=[option_4], properties=frozenset({"standard"}), informations={'dynamic_variable': 'rougail.var'}) optiondescription_1 = OptionDescription(name="rougail", doc="Rougail", group_type=groups.namespace, children=[option_2, optiondescription_3], properties=frozenset({"standard"})) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_1]) diff --git a/tests/dictionaries/60_5family_dynamic_calc_suffix_param_empty/tiramisu/multi.py b/tests/dictionaries/60_5family_dynamic_calc_suffix_param_empty/tiramisu/multi.py index 3bbecf78c..23069b4fb 100644 --- a/tests/dictionaries/60_5family_dynamic_calc_suffix_param_empty/tiramisu/multi.py +++ b/tests/dictionaries/60_5family_dynamic_calc_suffix_param_empty/tiramisu/multi.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') try: groups.namespace except: @@ -13,12 +13,12 @@ ALLOWED_LEADER_PROPERTIES.add("advanced") dict_env['default_1.rougail.dyn{{ identifier }}.var'] = "{{ identifier }}\n" dict_env['default_2.rougail.dyn{{ identifier }}.var'] = "{{ identifier }}\n" option_3 = StrOption(name="var", doc="A identifier variable", multi=True, properties=frozenset({"standard"}), informations={'type': 'string', 'test': ('val1', 'val2')}) -option_5 = StrOption(name="var", doc="A dynamic variable", default=Calculation(func['jinja_to_function'], Params((), kwargs={'__internal_jinja': ParamValue("default_1.rougail.dyn{{ identifier }}.var"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['tests/dictionaries/60_5family_dynamic_calc_suffix_param_empty/dictionaries/rougail/00-base.yml']), '__internal_attribute': ParamValue("default"), '__internal_variable': ParamValue("1.rougail.dyn{{ identifier }}.var"), 'identifier': ParamIdentifier()})), properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) +option_5 = StrOption(name="var", doc="A dynamic variable", default=Calculation(func['jinja_to_function'], Params((), kwargs={'__internal_jinja': ParamValue("default_1.rougail.dyn{{ identifier }}.var"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['../rougail-tests/structures/60_5family_dynamic_calc_suffix_param_empty/rougail/00-base.yml']), '__internal_attribute': ParamValue("default"), '__internal_variable': ParamValue("1.rougail.dyn{{ identifier }}.var"), 'identifier': ParamIdentifier()})), properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) optiondescription_4 = ConvertDynOptionDescription(name="dyn{{ identifier }}", doc="A dynamic family", identifiers=Calculation(func['calc_value'], Params((ParamOption(option_3)))), children=[option_5], properties=frozenset({"standard"}), informations={'dynamic_variable': '1.rougail.var'}) optiondescription_2 = OptionDescription(name="rougail", doc="Rougail", group_type=groups.namespace, children=[option_3, optiondescription_4], properties=frozenset({"standard"})) optiondescription_1 = OptionDescription(name="1", doc="1", children=[optiondescription_2], properties=frozenset({"standard"})) option_8 = StrOption(name="var", doc="A identifier variable", multi=True, properties=frozenset({"standard"}), informations={'type': 'string', 'test': ('val1', 'val2')}) -option_10 = StrOption(name="var", doc="A dynamic variable", default=Calculation(func['jinja_to_function'], Params((), kwargs={'__internal_jinja': ParamValue("default_2.rougail.dyn{{ identifier }}.var"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['tests/dictionaries/60_5family_dynamic_calc_suffix_param_empty/dictionaries/rougail/00-base.yml']), '__internal_attribute': ParamValue("default"), '__internal_variable': ParamValue("2.rougail.dyn{{ identifier }}.var"), 'identifier': ParamIdentifier()})), properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) +option_10 = StrOption(name="var", doc="A dynamic variable", default=Calculation(func['jinja_to_function'], Params((), kwargs={'__internal_jinja': ParamValue("default_2.rougail.dyn{{ identifier }}.var"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['../rougail-tests/structures/60_5family_dynamic_calc_suffix_param_empty/rougail/00-base.yml']), '__internal_attribute': ParamValue("default"), '__internal_variable': ParamValue("2.rougail.dyn{{ identifier }}.var"), 'identifier': ParamIdentifier()})), properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) optiondescription_9 = ConvertDynOptionDescription(name="dyn{{ identifier }}", doc="A dynamic family", identifiers=Calculation(func['calc_value'], Params((ParamOption(option_8)))), children=[option_10], properties=frozenset({"standard"}), informations={'dynamic_variable': '2.rougail.var'}) optiondescription_7 = OptionDescription(name="rougail", doc="Rougail", group_type=groups.namespace, children=[option_8, optiondescription_9], properties=frozenset({"standard"})) optiondescription_6 = OptionDescription(name="2", doc="2", children=[optiondescription_7], properties=frozenset({"standard"})) diff --git a/tests/dictionaries/60_5family_dynamic_calc_suffix_param_empty/tiramisu/no_namespace.py b/tests/dictionaries/60_5family_dynamic_calc_suffix_param_empty/tiramisu/no_namespace.py index 3ebbd92e4..e03e10055 100644 --- a/tests/dictionaries/60_5family_dynamic_calc_suffix_param_empty/tiramisu/no_namespace.py +++ b/tests/dictionaries/60_5family_dynamic_calc_suffix_param_empty/tiramisu/no_namespace.py @@ -2,12 +2,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') +load_functions('../rougail-tests/funcs/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") ALLOWED_LEADER_PROPERTIES.add("standard") ALLOWED_LEADER_PROPERTIES.add("advanced") dict_env['default_dyn{{ identifier }}.var'] = "{{ identifier }}\n" option_1 = StrOption(name="var", doc="A identifier variable", multi=True, properties=frozenset({"standard"}), informations={'type': 'string', 'test': ('val1', 'val2')}) -option_3 = StrOption(name="var", doc="A dynamic variable", default=Calculation(func['jinja_to_function'], Params((), kwargs={'__internal_jinja': ParamValue("default_dyn{{ identifier }}.var"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['tests/dictionaries/60_5family_dynamic_calc_suffix_param_empty/dictionaries/rougail/00-base.yml']), '__internal_attribute': ParamValue("default"), '__internal_variable': ParamValue("dyn{{ identifier }}.var"), 'identifier': ParamIdentifier()})), properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) +option_3 = StrOption(name="var", doc="A dynamic variable", default=Calculation(func['jinja_to_function'], Params((), kwargs={'__internal_jinja': ParamValue("default_dyn{{ identifier }}.var"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['../rougail-tests/structures/60_5family_dynamic_calc_suffix_param_empty/rougail/00-base.yml']), '__internal_attribute': ParamValue("default"), '__internal_variable': ParamValue("dyn{{ identifier }}.var"), 'identifier': ParamIdentifier()})), properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) optiondescription_2 = ConvertDynOptionDescription(name="dyn{{ identifier }}", doc="A dynamic family", identifiers=Calculation(func['calc_value'], Params((ParamOption(option_1)))), children=[option_3], properties=frozenset({"standard"}), informations={'dynamic_variable': 'var'}) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1, optiondescription_2]) 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 deleted file mode 100644 index 2672fe4f2..000000000 --- a/tests/dictionaries/60_5family_dynamic_calc_variable/dictionaries/rougail/00-base.yml +++ /dev/null @@ -1,17 +0,0 @@ ---- -version: '1.1' -var1: - description: A suffix variable - default: - - val1 - - val2 -"dyn{{ identifier }}": - dynamic: - variable: _.var1 - propertyerror: false - var: - description: A dynamic variable -var2: - description: A variable calculated - default: - 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 fd8b0a84d..26ceb9497 100644 --- a/tests/dictionaries/60_5family_dynamic_calc_variable/tiramisu/base.py +++ b/tests/dictionaries/60_5family_dynamic_calc_variable/tiramisu/base.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') try: groups.namespace except: 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 7291e62a0..a5141f67e 100644 --- a/tests/dictionaries/60_5family_dynamic_calc_variable/tiramisu/multi.py +++ b/tests/dictionaries/60_5family_dynamic_calc_variable/tiramisu/multi.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') try: groups.namespace except: 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 e14fe1b82..c30e9f319 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 @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") ALLOWED_LEADER_PROPERTIES.add("standard") ALLOWED_LEADER_PROPERTIES.add("advanced") diff --git a/tests/dictionaries/60_5family_dynamic_calc_variable_empty/dictionaries/rougail/00-base.yml b/tests/dictionaries/60_5family_dynamic_calc_variable_empty/dictionaries/rougail/00-base.yml deleted file mode 100644 index 9f9d953fb..000000000 --- a/tests/dictionaries/60_5family_dynamic_calc_variable_empty/dictionaries/rougail/00-base.yml +++ /dev/null @@ -1,20 +0,0 @@ ---- -version: '1.1' -var1: - description: A suffix variable - multi: true - mandatory: false - test: - - val1 - - val2 -"dyn{{ identifier }}": - dynamic: - variable: _.var1 - propertyerror: false - var: - description: A dynamic variable -var2: - description: A variable calculated - default: - variable: _.dynval1.var - optional: true diff --git a/tests/dictionaries/60_5family_dynamic_calc_variable_empty/tiramisu/base.py b/tests/dictionaries/60_5family_dynamic_calc_variable_empty/tiramisu/base.py index 84ca49d88..1acb73612 100644 --- a/tests/dictionaries/60_5family_dynamic_calc_variable_empty/tiramisu/base.py +++ b/tests/dictionaries/60_5family_dynamic_calc_variable_empty/tiramisu/base.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') try: groups.namespace except: diff --git a/tests/dictionaries/60_5family_dynamic_calc_variable_empty/tiramisu/multi.py b/tests/dictionaries/60_5family_dynamic_calc_variable_empty/tiramisu/multi.py index 946c928f1..828576819 100644 --- a/tests/dictionaries/60_5family_dynamic_calc_variable_empty/tiramisu/multi.py +++ b/tests/dictionaries/60_5family_dynamic_calc_variable_empty/tiramisu/multi.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') try: groups.namespace except: diff --git a/tests/dictionaries/60_5family_dynamic_calc_variable_empty/tiramisu/no_namespace.py b/tests/dictionaries/60_5family_dynamic_calc_variable_empty/tiramisu/no_namespace.py index 3f6b91d3a..fc244c9a4 100644 --- a/tests/dictionaries/60_5family_dynamic_calc_variable_empty/tiramisu/no_namespace.py +++ b/tests/dictionaries/60_5family_dynamic_calc_variable_empty/tiramisu/no_namespace.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") ALLOWED_LEADER_PROPERTIES.add("standard") ALLOWED_LEADER_PROPERTIES.add("advanced") 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 deleted file mode 100644 index 97833ac32..000000000 --- a/tests/dictionaries/60_5family_dynamic_hidden_suffix/dictionaries/rougail/00-base.yml +++ /dev/null @@ -1,24 +0,0 @@ ---- -version: '1.1' -"dyn{{ identifier }}": - description: a dynamic family - dynamic: - - val1 - - val2 - hidden: - jinja: | - {% if suffix == 'val2' %} - disabled - {% endif %} - params: - suffix: - type: identifier - description: if suffix == 'val2' - - var: - description: a variable - mandatory: false - family: # a family - var: - description: a new variable - mandatory: false 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 5dfb2c24d..55992150f 100644 --- a/tests/dictionaries/60_5family_dynamic_hidden_suffix/tiramisu/base.py +++ b/tests/dictionaries/60_5family_dynamic_hidden_suffix/tiramisu/base.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') try: groups.namespace except: @@ -13,9 +13,9 @@ ALLOWED_LEADER_PROPERTIES.add("advanced") dict_env['frozen_rougail.dyn{{ identifier }}.var'] = "{% if suffix == 'val2' %}\ndisabled\n{% endif %}\n" dict_env['frozen_rougail.dyn{{ identifier }}.family.var'] = "{% if suffix == 'val2' %}\ndisabled\n{% endif %}\n" dict_env['hidden_rougail.dyn{{ identifier }}'] = "{% if suffix == 'val2' %}\ndisabled\n{% endif %}\n" -option_3 = StrOption(name="var", doc="a variable", properties=frozenset({"force_default_on_freeze", "standard", Calculation(func['jinja_to_property'], Params((ParamValue("frozen")), kwargs={'__internal_jinja': ParamValue("frozen_rougail.dyn{{ identifier }}.var"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['tests/dictionaries/60_5family_dynamic_hidden_suffix/dictionaries/rougail/00-base.yml']), '__internal_attribute': ParamValue("frozen"), '__internal_variable': ParamValue("rougail.dyn{{ identifier }}.var"), 'suffix': ParamIdentifier(), 'when': ParamValue(True), 'inverse': ParamValue(False)}), help_function=func['jinja_to_property_help'])}), informations={'type': 'string'}) -option_5 = StrOption(name="var", doc="a new variable", properties=frozenset({"force_default_on_freeze", "standard", Calculation(func['jinja_to_property'], Params((ParamValue("frozen")), kwargs={'__internal_jinja': ParamValue("frozen_rougail.dyn{{ identifier }}.family.var"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['tests/dictionaries/60_5family_dynamic_hidden_suffix/dictionaries/rougail/00-base.yml']), '__internal_attribute': ParamValue("frozen"), '__internal_variable': ParamValue("rougail.dyn{{ identifier }}.family.var"), 'suffix': ParamIdentifier(), 'when': ParamValue(True), 'inverse': ParamValue(False)}), help_function=func['jinja_to_property_help'])}), informations={'type': 'string'}) +option_3 = StrOption(name="var", doc="a variable", properties=frozenset({"force_default_on_freeze", "standard", Calculation(func['jinja_to_property'], Params((ParamValue("frozen")), kwargs={'__internal_jinja': ParamValue("frozen_rougail.dyn{{ identifier }}.var"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['../rougail-tests/structures/60_5family_dynamic_hidden_suffix/rougail/00-base.yml']), '__internal_attribute': ParamValue("frozen"), '__internal_variable': ParamValue("rougail.dyn{{ identifier }}.var"), 'suffix': ParamIdentifier(), 'when': ParamValue(True), 'inverse': ParamValue(False)}), help_function=func['jinja_to_property_help'])}), informations={'type': 'string'}) +option_5 = StrOption(name="var", doc="a new variable", properties=frozenset({"force_default_on_freeze", "standard", Calculation(func['jinja_to_property'], Params((ParamValue("frozen")), kwargs={'__internal_jinja': ParamValue("frozen_rougail.dyn{{ identifier }}.family.var"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['../rougail-tests/structures/60_5family_dynamic_hidden_suffix/rougail/00-base.yml']), '__internal_attribute': ParamValue("frozen"), '__internal_variable': ParamValue("rougail.dyn{{ identifier }}.family.var"), 'suffix': ParamIdentifier(), 'when': ParamValue(True), 'inverse': ParamValue(False)}), help_function=func['jinja_to_property_help'])}), informations={'type': 'string'}) optiondescription_4 = OptionDescription(name="family", doc="a family", children=[option_5], properties=frozenset({"standard"})) -optiondescription_2 = ConvertDynOptionDescription(name="dyn{{ identifier }}", doc="a dynamic family", identifiers=["val1", "val2"], children=[option_3, optiondescription_4], properties=frozenset({"standard", Calculation(func['jinja_to_property'], Params((ParamValue("hidden")), kwargs={'__internal_jinja': ParamValue("hidden_rougail.dyn{{ identifier }}"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['tests/dictionaries/60_5family_dynamic_hidden_suffix/dictionaries/rougail/00-base.yml']), '__internal_attribute': ParamValue("hidden"), '__internal_variable': ParamValue("rougail.dyn{{ identifier }}"), 'suffix': ParamIdentifier(), 'when': ParamValue(True), 'inverse': ParamValue(False)}), help_function=func['jinja_to_property_help'])})) +optiondescription_2 = ConvertDynOptionDescription(name="dyn{{ identifier }}", doc="a dynamic family", identifiers=["val1", "val2"], children=[option_3, optiondescription_4], properties=frozenset({"standard", Calculation(func['jinja_to_property'], Params((ParamValue("hidden")), kwargs={'__internal_jinja': ParamValue("hidden_rougail.dyn{{ identifier }}"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['../rougail-tests/structures/60_5family_dynamic_hidden_suffix/rougail/00-base.yml']), '__internal_attribute': ParamValue("hidden"), '__internal_variable': ParamValue("rougail.dyn{{ identifier }}"), 'suffix': ParamIdentifier(), 'when': ParamValue(True), 'inverse': ParamValue(False)}), help_function=func['jinja_to_property_help'])})) optiondescription_1 = OptionDescription(name="rougail", doc="Rougail", group_type=groups.namespace, children=[optiondescription_2], properties=frozenset({"standard"})) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_1]) 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 5104e9437..ec6d1af5f 100644 --- a/tests/dictionaries/60_5family_dynamic_hidden_suffix/tiramisu/multi.py +++ b/tests/dictionaries/60_5family_dynamic_hidden_suffix/tiramisu/multi.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') try: groups.namespace except: @@ -16,16 +16,16 @@ dict_env['hidden_1.rougail.dyn{{ identifier }}'] = "{% if suffix == 'val2' %}\nd dict_env['frozen_2.rougail.dyn{{ identifier }}.var'] = "{% if suffix == 'val2' %}\ndisabled\n{% endif %}\n" dict_env['frozen_2.rougail.dyn{{ identifier }}.family.var'] = "{% if suffix == 'val2' %}\ndisabled\n{% endif %}\n" dict_env['hidden_2.rougail.dyn{{ identifier }}'] = "{% if suffix == 'val2' %}\ndisabled\n{% endif %}\n" -option_4 = StrOption(name="var", doc="a variable", properties=frozenset({"force_default_on_freeze", "standard", Calculation(func['jinja_to_property'], Params((ParamValue("frozen")), kwargs={'__internal_jinja': ParamValue("frozen_1.rougail.dyn{{ identifier }}.var"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['tests/dictionaries/60_5family_dynamic_hidden_suffix/dictionaries/rougail/00-base.yml']), '__internal_attribute': ParamValue("frozen"), '__internal_variable': ParamValue("1.rougail.dyn{{ identifier }}.var"), 'suffix': ParamIdentifier(), 'when': ParamValue(True), 'inverse': ParamValue(False)}), help_function=func['jinja_to_property_help'])}), informations={'type': 'string'}) -option_6 = StrOption(name="var", doc="a new variable", properties=frozenset({"force_default_on_freeze", "standard", Calculation(func['jinja_to_property'], Params((ParamValue("frozen")), kwargs={'__internal_jinja': ParamValue("frozen_1.rougail.dyn{{ identifier }}.family.var"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['tests/dictionaries/60_5family_dynamic_hidden_suffix/dictionaries/rougail/00-base.yml']), '__internal_attribute': ParamValue("frozen"), '__internal_variable': ParamValue("1.rougail.dyn{{ identifier }}.family.var"), 'suffix': ParamIdentifier(), 'when': ParamValue(True), 'inverse': ParamValue(False)}), help_function=func['jinja_to_property_help'])}), informations={'type': 'string'}) +option_4 = StrOption(name="var", doc="a variable", properties=frozenset({"force_default_on_freeze", "standard", Calculation(func['jinja_to_property'], Params((ParamValue("frozen")), kwargs={'__internal_jinja': ParamValue("frozen_1.rougail.dyn{{ identifier }}.var"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['../rougail-tests/structures/60_5family_dynamic_hidden_suffix/rougail/00-base.yml']), '__internal_attribute': ParamValue("frozen"), '__internal_variable': ParamValue("1.rougail.dyn{{ identifier }}.var"), 'suffix': ParamIdentifier(), 'when': ParamValue(True), 'inverse': ParamValue(False)}), help_function=func['jinja_to_property_help'])}), informations={'type': 'string'}) +option_6 = StrOption(name="var", doc="a new variable", properties=frozenset({"force_default_on_freeze", "standard", Calculation(func['jinja_to_property'], Params((ParamValue("frozen")), kwargs={'__internal_jinja': ParamValue("frozen_1.rougail.dyn{{ identifier }}.family.var"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['../rougail-tests/structures/60_5family_dynamic_hidden_suffix/rougail/00-base.yml']), '__internal_attribute': ParamValue("frozen"), '__internal_variable': ParamValue("1.rougail.dyn{{ identifier }}.family.var"), 'suffix': ParamIdentifier(), 'when': ParamValue(True), 'inverse': ParamValue(False)}), help_function=func['jinja_to_property_help'])}), informations={'type': 'string'}) optiondescription_5 = OptionDescription(name="family", doc="a family", children=[option_6], properties=frozenset({"standard"})) -optiondescription_3 = ConvertDynOptionDescription(name="dyn{{ identifier }}", doc="a dynamic family", identifiers=["val1", "val2"], children=[option_4, optiondescription_5], properties=frozenset({"standard", Calculation(func['jinja_to_property'], Params((ParamValue("hidden")), kwargs={'__internal_jinja': ParamValue("hidden_1.rougail.dyn{{ identifier }}"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['tests/dictionaries/60_5family_dynamic_hidden_suffix/dictionaries/rougail/00-base.yml']), '__internal_attribute': ParamValue("hidden"), '__internal_variable': ParamValue("1.rougail.dyn{{ identifier }}"), 'suffix': ParamIdentifier(), 'when': ParamValue(True), 'inverse': ParamValue(False)}), help_function=func['jinja_to_property_help'])})) +optiondescription_3 = ConvertDynOptionDescription(name="dyn{{ identifier }}", doc="a dynamic family", identifiers=["val1", "val2"], children=[option_4, optiondescription_5], properties=frozenset({"standard", Calculation(func['jinja_to_property'], Params((ParamValue("hidden")), kwargs={'__internal_jinja': ParamValue("hidden_1.rougail.dyn{{ identifier }}"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['../rougail-tests/structures/60_5family_dynamic_hidden_suffix/rougail/00-base.yml']), '__internal_attribute': ParamValue("hidden"), '__internal_variable': ParamValue("1.rougail.dyn{{ identifier }}"), 'suffix': ParamIdentifier(), 'when': ParamValue(True), 'inverse': ParamValue(False)}), help_function=func['jinja_to_property_help'])})) optiondescription_2 = OptionDescription(name="rougail", doc="Rougail", group_type=groups.namespace, children=[optiondescription_3], properties=frozenset({"standard"})) optiondescription_1 = OptionDescription(name="1", doc="1", children=[optiondescription_2], properties=frozenset({"standard"})) -option_10 = StrOption(name="var", doc="a variable", properties=frozenset({"force_default_on_freeze", "standard", Calculation(func['jinja_to_property'], Params((ParamValue("frozen")), kwargs={'__internal_jinja': ParamValue("frozen_2.rougail.dyn{{ identifier }}.var"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['tests/dictionaries/60_5family_dynamic_hidden_suffix/dictionaries/rougail/00-base.yml']), '__internal_attribute': ParamValue("frozen"), '__internal_variable': ParamValue("2.rougail.dyn{{ identifier }}.var"), 'suffix': ParamIdentifier(), 'when': ParamValue(True), 'inverse': ParamValue(False)}), help_function=func['jinja_to_property_help'])}), informations={'type': 'string'}) -option_12 = StrOption(name="var", doc="a new variable", properties=frozenset({"force_default_on_freeze", "standard", Calculation(func['jinja_to_property'], Params((ParamValue("frozen")), kwargs={'__internal_jinja': ParamValue("frozen_2.rougail.dyn{{ identifier }}.family.var"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['tests/dictionaries/60_5family_dynamic_hidden_suffix/dictionaries/rougail/00-base.yml']), '__internal_attribute': ParamValue("frozen"), '__internal_variable': ParamValue("2.rougail.dyn{{ identifier }}.family.var"), 'suffix': ParamIdentifier(), 'when': ParamValue(True), 'inverse': ParamValue(False)}), help_function=func['jinja_to_property_help'])}), informations={'type': 'string'}) +option_10 = StrOption(name="var", doc="a variable", properties=frozenset({"force_default_on_freeze", "standard", Calculation(func['jinja_to_property'], Params((ParamValue("frozen")), kwargs={'__internal_jinja': ParamValue("frozen_2.rougail.dyn{{ identifier }}.var"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['../rougail-tests/structures/60_5family_dynamic_hidden_suffix/rougail/00-base.yml']), '__internal_attribute': ParamValue("frozen"), '__internal_variable': ParamValue("2.rougail.dyn{{ identifier }}.var"), 'suffix': ParamIdentifier(), 'when': ParamValue(True), 'inverse': ParamValue(False)}), help_function=func['jinja_to_property_help'])}), informations={'type': 'string'}) +option_12 = StrOption(name="var", doc="a new variable", properties=frozenset({"force_default_on_freeze", "standard", Calculation(func['jinja_to_property'], Params((ParamValue("frozen")), kwargs={'__internal_jinja': ParamValue("frozen_2.rougail.dyn{{ identifier }}.family.var"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['../rougail-tests/structures/60_5family_dynamic_hidden_suffix/rougail/00-base.yml']), '__internal_attribute': ParamValue("frozen"), '__internal_variable': ParamValue("2.rougail.dyn{{ identifier }}.family.var"), 'suffix': ParamIdentifier(), 'when': ParamValue(True), 'inverse': ParamValue(False)}), help_function=func['jinja_to_property_help'])}), informations={'type': 'string'}) optiondescription_11 = OptionDescription(name="family", doc="a family", children=[option_12], properties=frozenset({"standard"})) -optiondescription_9 = ConvertDynOptionDescription(name="dyn{{ identifier }}", doc="a dynamic family", identifiers=["val1", "val2"], children=[option_10, optiondescription_11], properties=frozenset({"standard", Calculation(func['jinja_to_property'], Params((ParamValue("hidden")), kwargs={'__internal_jinja': ParamValue("hidden_2.rougail.dyn{{ identifier }}"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['tests/dictionaries/60_5family_dynamic_hidden_suffix/dictionaries/rougail/00-base.yml']), '__internal_attribute': ParamValue("hidden"), '__internal_variable': ParamValue("2.rougail.dyn{{ identifier }}"), 'suffix': ParamIdentifier(), 'when': ParamValue(True), 'inverse': ParamValue(False)}), help_function=func['jinja_to_property_help'])})) +optiondescription_9 = ConvertDynOptionDescription(name="dyn{{ identifier }}", doc="a dynamic family", identifiers=["val1", "val2"], children=[option_10, optiondescription_11], properties=frozenset({"standard", Calculation(func['jinja_to_property'], Params((ParamValue("hidden")), kwargs={'__internal_jinja': ParamValue("hidden_2.rougail.dyn{{ identifier }}"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['../rougail-tests/structures/60_5family_dynamic_hidden_suffix/rougail/00-base.yml']), '__internal_attribute': ParamValue("hidden"), '__internal_variable': ParamValue("2.rougail.dyn{{ identifier }}"), 'suffix': ParamIdentifier(), 'when': ParamValue(True), 'inverse': ParamValue(False)}), help_function=func['jinja_to_property_help'])})) optiondescription_8 = OptionDescription(name="rougail", doc="Rougail", group_type=groups.namespace, children=[optiondescription_9], properties=frozenset({"standard"})) optiondescription_7 = OptionDescription(name="2", doc="2", children=[optiondescription_8], properties=frozenset({"standard"})) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_1, optiondescription_7]) 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 1ee59ab65..5b4ad16de 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 @@ -2,15 +2,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') +load_functions('../rougail-tests/funcs/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") ALLOWED_LEADER_PROPERTIES.add("standard") ALLOWED_LEADER_PROPERTIES.add("advanced") dict_env['frozen_dyn{{ identifier }}.var'] = "{% if suffix == 'val2' %}\ndisabled\n{% endif %}\n" dict_env['frozen_dyn{{ identifier }}.family.var'] = "{% if suffix == 'val2' %}\ndisabled\n{% endif %}\n" dict_env['hidden_dyn{{ identifier }}'] = "{% if suffix == 'val2' %}\ndisabled\n{% endif %}\n" -option_2 = StrOption(name="var", doc="a variable", properties=frozenset({"force_default_on_freeze", "standard", Calculation(func['jinja_to_property'], Params((ParamValue("frozen")), kwargs={'__internal_jinja': ParamValue("frozen_dyn{{ identifier }}.var"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['tests/dictionaries/60_5family_dynamic_hidden_suffix/dictionaries/rougail/00-base.yml']), '__internal_attribute': ParamValue("frozen"), '__internal_variable': ParamValue("dyn{{ identifier }}.var"), 'suffix': ParamIdentifier(), 'when': ParamValue(True), 'inverse': ParamValue(False)}), help_function=func['jinja_to_property_help'])}), informations={'type': 'string'}) -option_4 = StrOption(name="var", doc="a new variable", properties=frozenset({"force_default_on_freeze", "standard", Calculation(func['jinja_to_property'], Params((ParamValue("frozen")), kwargs={'__internal_jinja': ParamValue("frozen_dyn{{ identifier }}.family.var"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['tests/dictionaries/60_5family_dynamic_hidden_suffix/dictionaries/rougail/00-base.yml']), '__internal_attribute': ParamValue("frozen"), '__internal_variable': ParamValue("dyn{{ identifier }}.family.var"), 'suffix': ParamIdentifier(), 'when': ParamValue(True), 'inverse': ParamValue(False)}), help_function=func['jinja_to_property_help'])}), informations={'type': 'string'}) +option_2 = StrOption(name="var", doc="a variable", properties=frozenset({"force_default_on_freeze", "standard", Calculation(func['jinja_to_property'], Params((ParamValue("frozen")), kwargs={'__internal_jinja': ParamValue("frozen_dyn{{ identifier }}.var"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['../rougail-tests/structures/60_5family_dynamic_hidden_suffix/rougail/00-base.yml']), '__internal_attribute': ParamValue("frozen"), '__internal_variable': ParamValue("dyn{{ identifier }}.var"), 'suffix': ParamIdentifier(), 'when': ParamValue(True), 'inverse': ParamValue(False)}), help_function=func['jinja_to_property_help'])}), informations={'type': 'string'}) +option_4 = StrOption(name="var", doc="a new variable", properties=frozenset({"force_default_on_freeze", "standard", Calculation(func['jinja_to_property'], Params((ParamValue("frozen")), kwargs={'__internal_jinja': ParamValue("frozen_dyn{{ identifier }}.family.var"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['../rougail-tests/structures/60_5family_dynamic_hidden_suffix/rougail/00-base.yml']), '__internal_attribute': ParamValue("frozen"), '__internal_variable': ParamValue("dyn{{ identifier }}.family.var"), 'suffix': ParamIdentifier(), 'when': ParamValue(True), 'inverse': ParamValue(False)}), help_function=func['jinja_to_property_help'])}), informations={'type': 'string'}) optiondescription_3 = OptionDescription(name="family", doc="a family", children=[option_4], properties=frozenset({"standard"})) -optiondescription_1 = ConvertDynOptionDescription(name="dyn{{ identifier }}", doc="a dynamic family", identifiers=["val1", "val2"], children=[option_2, optiondescription_3], properties=frozenset({"standard", Calculation(func['jinja_to_property'], Params((ParamValue("hidden")), kwargs={'__internal_jinja': ParamValue("hidden_dyn{{ identifier }}"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['tests/dictionaries/60_5family_dynamic_hidden_suffix/dictionaries/rougail/00-base.yml']), '__internal_attribute': ParamValue("hidden"), '__internal_variable': ParamValue("dyn{{ identifier }}"), 'suffix': ParamIdentifier(), 'when': ParamValue(True), 'inverse': ParamValue(False)}), help_function=func['jinja_to_property_help'])})) +optiondescription_1 = ConvertDynOptionDescription(name="dyn{{ identifier }}", doc="a dynamic family", identifiers=["val1", "val2"], children=[option_2, optiondescription_3], properties=frozenset({"standard", Calculation(func['jinja_to_property'], Params((ParamValue("hidden")), kwargs={'__internal_jinja': ParamValue("hidden_dyn{{ identifier }}"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['../rougail-tests/structures/60_5family_dynamic_hidden_suffix/rougail/00-base.yml']), '__internal_attribute': ParamValue("hidden"), '__internal_variable': ParamValue("dyn{{ identifier }}"), 'suffix': ParamIdentifier(), 'when': ParamValue(True), 'inverse': ParamValue(False)}), help_function=func['jinja_to_property_help'])})) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_1]) 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 deleted file mode 100644 index 4b8c8ab44..000000000 --- a/tests/dictionaries/60_5family_dynamic_unknown_suffix/dictionaries/rougail/00-base.yml +++ /dev/null @@ -1,42 +0,0 @@ ---- -version: '1.1' -var: - description: a suffix variable - default: - - val1 - - val2 - test: - - val1 - - val2 - - val3 - - val4 - -"{{ identifier }}_dyn": - description: a dynamic family - dynamic: - variable: _.var - - var1: - description: a variable 1 - default: - type: identifier - - var2: - description: a variable 2 - default: - variable: rougail.{{ identifier }}_dyn.var1 - - var3: - description: a variable 3 - default: - variable: _.var1 - - var4: - description: a variable 4 - default: - variable: rougail.val4_dyn.var1 - disabled: - jinja: | - {% if 'val4' not in __.var %} - val4 is not a valid value - {% endif %} diff --git a/tests/dictionaries/60_5family_dynamic_unknown_suffix/force_namespace b/tests/dictionaries/60_5family_dynamic_unknown_suffix/force_namespace deleted file mode 100644 index e69de29bb..000000000 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 60c6523c2..2167ce1ea 100644 --- a/tests/dictionaries/60_5family_dynamic_unknown_suffix/tiramisu/base.py +++ b/tests/dictionaries/60_5family_dynamic_unknown_suffix/tiramisu/base.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') try: groups.namespace except: @@ -15,7 +15,7 @@ option_2 = StrOption(name="var", doc="a suffix variable", multi=True, default=[" option_4 = StrOption(name="var1", doc="a variable 1", default=Calculation(func['calc_value'], Params((ParamIdentifier()))), properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) option_5 = StrOption(name="var2", doc="a variable 2", default=Calculation(func['calc_value'], Params((ParamOption(option_4)))), properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) option_6 = StrOption(name="var3", doc="a variable 3", default=Calculation(func['calc_value'], Params((ParamOption(option_4)))), properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) -option_7 = StrOption(name="var4", doc="a variable 4", default=Calculation(func['calc_value'], Params((ParamDynOption(option_4, ["val4"])))), properties=frozenset({"mandatory", "standard", Calculation(func['jinja_to_property'], Params((ParamValue("disabled")), kwargs={'__internal_jinja': ParamValue("disabled_rougail.{{ identifier }}_dyn.var4"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['tests/dictionaries/60_5family_dynamic_unknown_suffix/dictionaries/rougail/00-base.yml']), '__internal_attribute': ParamValue("disabled"), '__internal_variable': ParamValue("rougail.{{ identifier }}_dyn.var4"), 'when': ParamValue(True), 'inverse': ParamValue(False), '__.var': ParamOption(option_2, notraisepropertyerror=True)}), help_function=func['jinja_to_property_help'])}), informations={'type': 'string'}) +option_7 = StrOption(name="var4", doc="a variable 4", default=Calculation(func['calc_value'], Params((ParamDynOption(option_4, ["val4"])))), properties=frozenset({"mandatory", "standard", Calculation(func['jinja_to_property'], Params((ParamValue("disabled")), kwargs={'__internal_jinja': ParamValue("disabled_rougail.{{ identifier }}_dyn.var4"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['../rougail-tests/structures/60_5family_dynamic_unknown_suffix/rougail/00-base.yml']), '__internal_attribute': ParamValue("disabled"), '__internal_variable': ParamValue("rougail.{{ identifier }}_dyn.var4"), 'when': ParamValue(True), 'inverse': ParamValue(False), '__.var': ParamOption(option_2, notraisepropertyerror=True)}), help_function=func['jinja_to_property_help'])}), informations={'type': 'string'}) optiondescription_3 = ConvertDynOptionDescription(name="{{ identifier }}_dyn", doc="a dynamic family", identifiers=Calculation(func['calc_value'], Params((ParamOption(option_2)))), children=[option_4, option_5, option_6, option_7], properties=frozenset({"standard"}), informations={'dynamic_variable': 'rougail.var'}) optiondescription_1 = OptionDescription(name="rougail", doc="Rougail", group_type=groups.namespace, children=[option_2, optiondescription_3], properties=frozenset({"standard"})) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_1]) 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 e52e74ec5..00c4196d4 100644 --- a/tests/dictionaries/60_5family_dynamic_unknown_suffix/tiramisu/multi.py +++ b/tests/dictionaries/60_5family_dynamic_unknown_suffix/tiramisu/multi.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') try: groups.namespace except: @@ -16,7 +16,7 @@ option_3 = StrOption(name="var", doc="a suffix variable", multi=True, default=[" option_5 = StrOption(name="var1", doc="a variable 1", default=Calculation(func['calc_value'], Params((ParamIdentifier()))), properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) option_6 = StrOption(name="var2", doc="a variable 2", default=Calculation(func['calc_value'], Params((ParamOption(option_5)))), properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) option_7 = StrOption(name="var3", doc="a variable 3", default=Calculation(func['calc_value'], Params((ParamOption(option_5)))), properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) -option_8 = StrOption(name="var4", doc="a variable 4", default=Calculation(func['calc_value'], Params((ParamDynOption(option_5, ["val4"])))), properties=frozenset({"mandatory", "standard", Calculation(func['jinja_to_property'], Params((ParamValue("disabled")), kwargs={'__internal_jinja': ParamValue("disabled_1.rougail.{{ identifier }}_dyn.var4"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['tests/dictionaries/60_5family_dynamic_unknown_suffix/dictionaries/rougail/00-base.yml']), '__internal_attribute': ParamValue("disabled"), '__internal_variable': ParamValue("1.rougail.{{ identifier }}_dyn.var4"), 'when': ParamValue(True), 'inverse': ParamValue(False), '__.var': ParamOption(option_3, notraisepropertyerror=True)}), help_function=func['jinja_to_property_help'])}), informations={'type': 'string'}) +option_8 = StrOption(name="var4", doc="a variable 4", default=Calculation(func['calc_value'], Params((ParamDynOption(option_5, ["val4"])))), properties=frozenset({"mandatory", "standard", Calculation(func['jinja_to_property'], Params((ParamValue("disabled")), kwargs={'__internal_jinja': ParamValue("disabled_1.rougail.{{ identifier }}_dyn.var4"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['../rougail-tests/structures/60_5family_dynamic_unknown_suffix/rougail/00-base.yml']), '__internal_attribute': ParamValue("disabled"), '__internal_variable': ParamValue("1.rougail.{{ identifier }}_dyn.var4"), 'when': ParamValue(True), 'inverse': ParamValue(False), '__.var': ParamOption(option_3, notraisepropertyerror=True)}), help_function=func['jinja_to_property_help'])}), informations={'type': 'string'}) optiondescription_4 = ConvertDynOptionDescription(name="{{ identifier }}_dyn", doc="a dynamic family", identifiers=Calculation(func['calc_value'], Params((ParamOption(option_3)))), children=[option_5, option_6, option_7, option_8], properties=frozenset({"standard"}), informations={'dynamic_variable': '1.rougail.var'}) optiondescription_2 = OptionDescription(name="rougail", doc="Rougail", group_type=groups.namespace, children=[option_3, optiondescription_4], properties=frozenset({"standard"})) optiondescription_1 = OptionDescription(name="1", doc="1", children=[optiondescription_2], properties=frozenset({"standard"})) @@ -24,7 +24,7 @@ option_11 = StrOption(name="var", doc="a suffix variable", multi=True, default=[ option_13 = StrOption(name="var1", doc="a variable 1", default=Calculation(func['calc_value'], Params((ParamIdentifier()))), properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) option_14 = StrOption(name="var2", doc="a variable 2", default=Calculation(func['calc_value'], Params((ParamOption(option_13)))), properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) option_15 = StrOption(name="var3", doc="a variable 3", default=Calculation(func['calc_value'], Params((ParamOption(option_13)))), properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) -option_16 = StrOption(name="var4", doc="a variable 4", default=Calculation(func['calc_value'], Params((ParamDynOption(option_13, ["val4"])))), properties=frozenset({"mandatory", "standard", Calculation(func['jinja_to_property'], Params((ParamValue("disabled")), kwargs={'__internal_jinja': ParamValue("disabled_2.rougail.{{ identifier }}_dyn.var4"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['tests/dictionaries/60_5family_dynamic_unknown_suffix/dictionaries/rougail/00-base.yml']), '__internal_attribute': ParamValue("disabled"), '__internal_variable': ParamValue("2.rougail.{{ identifier }}_dyn.var4"), 'when': ParamValue(True), 'inverse': ParamValue(False), '__.var': ParamOption(option_11, notraisepropertyerror=True)}), help_function=func['jinja_to_property_help'])}), informations={'type': 'string'}) +option_16 = StrOption(name="var4", doc="a variable 4", default=Calculation(func['calc_value'], Params((ParamDynOption(option_13, ["val4"])))), properties=frozenset({"mandatory", "standard", Calculation(func['jinja_to_property'], Params((ParamValue("disabled")), kwargs={'__internal_jinja': ParamValue("disabled_2.rougail.{{ identifier }}_dyn.var4"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['../rougail-tests/structures/60_5family_dynamic_unknown_suffix/rougail/00-base.yml']), '__internal_attribute': ParamValue("disabled"), '__internal_variable': ParamValue("2.rougail.{{ identifier }}_dyn.var4"), 'when': ParamValue(True), 'inverse': ParamValue(False), '__.var': ParamOption(option_11, notraisepropertyerror=True)}), help_function=func['jinja_to_property_help'])}), informations={'type': 'string'}) optiondescription_12 = ConvertDynOptionDescription(name="{{ identifier }}_dyn", doc="a dynamic family", identifiers=Calculation(func['calc_value'], Params((ParamOption(option_11)))), children=[option_13, option_14, option_15, option_16], properties=frozenset({"standard"}), informations={'dynamic_variable': '2.rougail.var'}) optiondescription_10 = OptionDescription(name="rougail", doc="Rougail", group_type=groups.namespace, children=[option_11, optiondescription_12], properties=frozenset({"standard"})) optiondescription_9 = OptionDescription(name="2", doc="2", children=[optiondescription_10], properties=frozenset({"standard"})) diff --git a/tests/dictionaries/60_5family_dynamic_unknown_suffix_empty/dictionaries/rougail/00-base.yml b/tests/dictionaries/60_5family_dynamic_unknown_suffix_empty/dictionaries/rougail/00-base.yml deleted file mode 100644 index 1c828eae7..000000000 --- a/tests/dictionaries/60_5family_dynamic_unknown_suffix_empty/dictionaries/rougail/00-base.yml +++ /dev/null @@ -1,41 +0,0 @@ ---- -version: '1.1' -var: - description: a suffix variable - multi: true - mandatory: false - test: - - val1 - - val2 - - val3 - - val4 - -"{{ identifier }}_dyn": - description: a dynamic family - dynamic: - variable: _.var - - var1: - description: a variable 1 - default: - type: identifier - - var2: - description: a variable 2 - default: - variable: rougail.{{ identifier }}_dyn.var1 - - var3: - description: a variable 3 - default: - variable: _.var1 - - var4: - description: a variable 4 - default: - variable: rougail.val4_dyn.var1 - disabled: - jinja: | - {% if 'val4' not in __.var %} - val4 is not a valid value - {% endif %} diff --git a/tests/dictionaries/60_5family_dynamic_unknown_suffix_empty/force_namespace b/tests/dictionaries/60_5family_dynamic_unknown_suffix_empty/force_namespace deleted file mode 100644 index e69de29bb..000000000 diff --git a/tests/dictionaries/60_5family_dynamic_unknown_suffix_empty/tiramisu/base.py b/tests/dictionaries/60_5family_dynamic_unknown_suffix_empty/tiramisu/base.py index 1d348bef9..ba0d7853c 100644 --- a/tests/dictionaries/60_5family_dynamic_unknown_suffix_empty/tiramisu/base.py +++ b/tests/dictionaries/60_5family_dynamic_unknown_suffix_empty/tiramisu/base.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') try: groups.namespace except: @@ -15,7 +15,7 @@ option_2 = StrOption(name="var", doc="a suffix variable", multi=True, properties option_4 = StrOption(name="var1", doc="a variable 1", default=Calculation(func['calc_value'], Params((ParamIdentifier()))), properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) option_5 = StrOption(name="var2", doc="a variable 2", default=Calculation(func['calc_value'], Params((ParamOption(option_4)))), properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) option_6 = StrOption(name="var3", doc="a variable 3", default=Calculation(func['calc_value'], Params((ParamOption(option_4)))), properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) -option_7 = StrOption(name="var4", doc="a variable 4", default=Calculation(func['calc_value'], Params((ParamDynOption(option_4, ["val4"])))), properties=frozenset({"mandatory", "standard", Calculation(func['jinja_to_property'], Params((ParamValue("disabled")), kwargs={'__internal_jinja': ParamValue("disabled_rougail.{{ identifier }}_dyn.var4"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['tests/dictionaries/60_5family_dynamic_unknown_suffix_empty/dictionaries/rougail/00-base.yml']), '__internal_attribute': ParamValue("disabled"), '__internal_variable': ParamValue("rougail.{{ identifier }}_dyn.var4"), 'when': ParamValue(True), 'inverse': ParamValue(False), '__.var': ParamOption(option_2, notraisepropertyerror=True)}), help_function=func['jinja_to_property_help'])}), informations={'type': 'string'}) +option_7 = StrOption(name="var4", doc="a variable 4", default=Calculation(func['calc_value'], Params((ParamDynOption(option_4, ["val4"])))), properties=frozenset({"mandatory", "standard", Calculation(func['jinja_to_property'], Params((ParamValue("disabled")), kwargs={'__internal_jinja': ParamValue("disabled_rougail.{{ identifier }}_dyn.var4"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['../rougail-tests/structures/60_5family_dynamic_unknown_suffix_empty/rougail/00-base.yml']), '__internal_attribute': ParamValue("disabled"), '__internal_variable': ParamValue("rougail.{{ identifier }}_dyn.var4"), 'when': ParamValue(True), 'inverse': ParamValue(False), '__.var': ParamOption(option_2, notraisepropertyerror=True)}), help_function=func['jinja_to_property_help'])}), informations={'type': 'string'}) optiondescription_3 = ConvertDynOptionDescription(name="{{ identifier }}_dyn", doc="a dynamic family", identifiers=Calculation(func['calc_value'], Params((ParamOption(option_2)))), children=[option_4, option_5, option_6, option_7], properties=frozenset({"standard"}), informations={'dynamic_variable': 'rougail.var'}) optiondescription_1 = OptionDescription(name="rougail", doc="Rougail", group_type=groups.namespace, children=[option_2, optiondescription_3], properties=frozenset({"standard"})) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_1]) diff --git a/tests/dictionaries/60_5family_dynamic_unknown_suffix_empty/tiramisu/multi.py b/tests/dictionaries/60_5family_dynamic_unknown_suffix_empty/tiramisu/multi.py index db23ca771..8a4dda90d 100644 --- a/tests/dictionaries/60_5family_dynamic_unknown_suffix_empty/tiramisu/multi.py +++ b/tests/dictionaries/60_5family_dynamic_unknown_suffix_empty/tiramisu/multi.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') try: groups.namespace except: @@ -16,7 +16,7 @@ option_3 = StrOption(name="var", doc="a suffix variable", multi=True, properties option_5 = StrOption(name="var1", doc="a variable 1", default=Calculation(func['calc_value'], Params((ParamIdentifier()))), properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) option_6 = StrOption(name="var2", doc="a variable 2", default=Calculation(func['calc_value'], Params((ParamOption(option_5)))), properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) option_7 = StrOption(name="var3", doc="a variable 3", default=Calculation(func['calc_value'], Params((ParamOption(option_5)))), properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) -option_8 = StrOption(name="var4", doc="a variable 4", default=Calculation(func['calc_value'], Params((ParamDynOption(option_5, ["val4"])))), properties=frozenset({"mandatory", "standard", Calculation(func['jinja_to_property'], Params((ParamValue("disabled")), kwargs={'__internal_jinja': ParamValue("disabled_1.rougail.{{ identifier }}_dyn.var4"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['tests/dictionaries/60_5family_dynamic_unknown_suffix_empty/dictionaries/rougail/00-base.yml']), '__internal_attribute': ParamValue("disabled"), '__internal_variable': ParamValue("1.rougail.{{ identifier }}_dyn.var4"), 'when': ParamValue(True), 'inverse': ParamValue(False), '__.var': ParamOption(option_3, notraisepropertyerror=True)}), help_function=func['jinja_to_property_help'])}), informations={'type': 'string'}) +option_8 = StrOption(name="var4", doc="a variable 4", default=Calculation(func['calc_value'], Params((ParamDynOption(option_5, ["val4"])))), properties=frozenset({"mandatory", "standard", Calculation(func['jinja_to_property'], Params((ParamValue("disabled")), kwargs={'__internal_jinja': ParamValue("disabled_1.rougail.{{ identifier }}_dyn.var4"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['../rougail-tests/structures/60_5family_dynamic_unknown_suffix_empty/rougail/00-base.yml']), '__internal_attribute': ParamValue("disabled"), '__internal_variable': ParamValue("1.rougail.{{ identifier }}_dyn.var4"), 'when': ParamValue(True), 'inverse': ParamValue(False), '__.var': ParamOption(option_3, notraisepropertyerror=True)}), help_function=func['jinja_to_property_help'])}), informations={'type': 'string'}) optiondescription_4 = ConvertDynOptionDescription(name="{{ identifier }}_dyn", doc="a dynamic family", identifiers=Calculation(func['calc_value'], Params((ParamOption(option_3)))), children=[option_5, option_6, option_7, option_8], properties=frozenset({"standard"}), informations={'dynamic_variable': '1.rougail.var'}) optiondescription_2 = OptionDescription(name="rougail", doc="Rougail", group_type=groups.namespace, children=[option_3, optiondescription_4], properties=frozenset({"standard"})) optiondescription_1 = OptionDescription(name="1", doc="1", children=[optiondescription_2], properties=frozenset({"standard"})) @@ -24,7 +24,7 @@ option_11 = StrOption(name="var", doc="a suffix variable", multi=True, propertie option_13 = StrOption(name="var1", doc="a variable 1", default=Calculation(func['calc_value'], Params((ParamIdentifier()))), properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) option_14 = StrOption(name="var2", doc="a variable 2", default=Calculation(func['calc_value'], Params((ParamOption(option_13)))), properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) option_15 = StrOption(name="var3", doc="a variable 3", default=Calculation(func['calc_value'], Params((ParamOption(option_13)))), properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) -option_16 = StrOption(name="var4", doc="a variable 4", default=Calculation(func['calc_value'], Params((ParamDynOption(option_13, ["val4"])))), properties=frozenset({"mandatory", "standard", Calculation(func['jinja_to_property'], Params((ParamValue("disabled")), kwargs={'__internal_jinja': ParamValue("disabled_2.rougail.{{ identifier }}_dyn.var4"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['tests/dictionaries/60_5family_dynamic_unknown_suffix_empty/dictionaries/rougail/00-base.yml']), '__internal_attribute': ParamValue("disabled"), '__internal_variable': ParamValue("2.rougail.{{ identifier }}_dyn.var4"), 'when': ParamValue(True), 'inverse': ParamValue(False), '__.var': ParamOption(option_11, notraisepropertyerror=True)}), help_function=func['jinja_to_property_help'])}), informations={'type': 'string'}) +option_16 = StrOption(name="var4", doc="a variable 4", default=Calculation(func['calc_value'], Params((ParamDynOption(option_13, ["val4"])))), properties=frozenset({"mandatory", "standard", Calculation(func['jinja_to_property'], Params((ParamValue("disabled")), kwargs={'__internal_jinja': ParamValue("disabled_2.rougail.{{ identifier }}_dyn.var4"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['../rougail-tests/structures/60_5family_dynamic_unknown_suffix_empty/rougail/00-base.yml']), '__internal_attribute': ParamValue("disabled"), '__internal_variable': ParamValue("2.rougail.{{ identifier }}_dyn.var4"), 'when': ParamValue(True), 'inverse': ParamValue(False), '__.var': ParamOption(option_11, notraisepropertyerror=True)}), help_function=func['jinja_to_property_help'])}), informations={'type': 'string'}) optiondescription_12 = ConvertDynOptionDescription(name="{{ identifier }}_dyn", doc="a dynamic family", identifiers=Calculation(func['calc_value'], Params((ParamOption(option_11)))), children=[option_13, option_14, option_15, option_16], properties=frozenset({"standard"}), informations={'dynamic_variable': '2.rougail.var'}) optiondescription_10 = OptionDescription(name="rougail", doc="Rougail", group_type=groups.namespace, children=[option_11, optiondescription_12], properties=frozenset({"standard"})) optiondescription_9 = OptionDescription(name="2", doc="2", children=[optiondescription_10], properties=frozenset({"standard"})) 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 deleted file mode 100644 index 3567759de..000000000 --- a/tests/dictionaries/60_5family_dynamic_variable_outside/dictionaries/rougail/00-base.yml +++ /dev/null @@ -1,19 +0,0 @@ ---- -version: '1.1' -var: # a suffix variable - - val1 - - val2 -"my_dyn_family_{{ identifier }}": - description: a dynamic family - dynamic: - variable: _.var - var: - description: a variable inside a dynamic family - default: - type: identifier - mandatory: false -var2: - description: a variable - multi: true - default: - variable: "rougail.my_dyn_family_{{ identifier }}.var" diff --git a/tests/dictionaries/60_5family_dynamic_variable_outside/force_namespace b/tests/dictionaries/60_5family_dynamic_variable_outside/force_namespace deleted file mode 100644 index e69de29bb..000000000 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 b77b62a1c..73244d062 100644 --- a/tests/dictionaries/60_5family_dynamic_variable_outside/tiramisu/base.py +++ b/tests/dictionaries/60_5family_dynamic_variable_outside/tiramisu/base.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') try: groups.namespace except: 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 35f245a18..df37dae41 100644 --- a/tests/dictionaries/60_5family_dynamic_variable_outside/tiramisu/multi.py +++ b/tests/dictionaries/60_5family_dynamic_variable_outside/tiramisu/multi.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') try: groups.namespace except: diff --git a/tests/dictionaries/60_5family_dynamic_variable_outside2/dictionaries/rougail/00-base.yml b/tests/dictionaries/60_5family_dynamic_variable_outside2/dictionaries/rougail/00-base.yml deleted file mode 100644 index 4713f6c8d..000000000 --- a/tests/dictionaries/60_5family_dynamic_variable_outside2/dictionaries/rougail/00-base.yml +++ /dev/null @@ -1,23 +0,0 @@ ---- -version: '1.1' - -var2: - description: a variable - multi: true - default: - variable: "rougail.my_dyn_family_{{ identifier }}.var" - -var: # a suffix variable - - val1 - - val2 - -"my_dyn_family_{{ identifier }}": - description: a dynamic family - dynamic: - variable: _.var - - var: - description: a variable inside a dynamic family - default: - type: identifier - mandatory: false diff --git a/tests/dictionaries/60_5family_dynamic_variable_outside2/force_namespace b/tests/dictionaries/60_5family_dynamic_variable_outside2/force_namespace deleted file mode 100644 index e69de29bb..000000000 diff --git a/tests/dictionaries/60_5family_dynamic_variable_outside2/tiramisu/base.py b/tests/dictionaries/60_5family_dynamic_variable_outside2/tiramisu/base.py index 8f9f2ce7c..dd4ed8245 100644 --- a/tests/dictionaries/60_5family_dynamic_variable_outside2/tiramisu/base.py +++ b/tests/dictionaries/60_5family_dynamic_variable_outside2/tiramisu/base.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') try: groups.namespace except: diff --git a/tests/dictionaries/60_5family_dynamic_variable_outside2/tiramisu/multi.py b/tests/dictionaries/60_5family_dynamic_variable_outside2/tiramisu/multi.py index 6ff32b28e..69d422897 100644 --- a/tests/dictionaries/60_5family_dynamic_variable_outside2/tiramisu/multi.py +++ b/tests/dictionaries/60_5family_dynamic_variable_outside2/tiramisu/multi.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') try: groups.namespace except: diff --git a/tests/dictionaries/60_5family_dynamic_variable_outside2_empty/dictionaries/rougail/00-base.yml b/tests/dictionaries/60_5family_dynamic_variable_outside2_empty/dictionaries/rougail/00-base.yml deleted file mode 100644 index 81167bc3a..000000000 --- a/tests/dictionaries/60_5family_dynamic_variable_outside2_empty/dictionaries/rougail/00-base.yml +++ /dev/null @@ -1,27 +0,0 @@ ---- -version: '1.1' - -var2: - description: a variable - multi: true - default: - variable: "rougail.my_dyn_family_{{ identifier }}.var" - -var: - description: a suffix variable - multi: true - mandatory: false - test: - - val1 - - val2 - -"my_dyn_family_{{ identifier }}": - description: a dynamic family - dynamic: - variable: _.var - - var: - description: a variable inside a dynamic family - default: - type: identifier - mandatory: false diff --git a/tests/dictionaries/60_5family_dynamic_variable_outside2_empty/force_namespace b/tests/dictionaries/60_5family_dynamic_variable_outside2_empty/force_namespace deleted file mode 100644 index e69de29bb..000000000 diff --git a/tests/dictionaries/60_5family_dynamic_variable_outside2_empty/tiramisu/base.py b/tests/dictionaries/60_5family_dynamic_variable_outside2_empty/tiramisu/base.py index 58559dfaf..78419a26d 100644 --- a/tests/dictionaries/60_5family_dynamic_variable_outside2_empty/tiramisu/base.py +++ b/tests/dictionaries/60_5family_dynamic_variable_outside2_empty/tiramisu/base.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') try: groups.namespace except: diff --git a/tests/dictionaries/60_5family_dynamic_variable_outside2_empty/tiramisu/multi.py b/tests/dictionaries/60_5family_dynamic_variable_outside2_empty/tiramisu/multi.py index 8684ef107..0c39e1c76 100644 --- a/tests/dictionaries/60_5family_dynamic_variable_outside2_empty/tiramisu/multi.py +++ b/tests/dictionaries/60_5family_dynamic_variable_outside2_empty/tiramisu/multi.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') try: groups.namespace except: diff --git a/tests/dictionaries/60_5family_dynamic_variable_outside_empty/dictionaries/rougail/00-base.yml b/tests/dictionaries/60_5family_dynamic_variable_outside_empty/dictionaries/rougail/00-base.yml deleted file mode 100644 index 53c8653d3..000000000 --- a/tests/dictionaries/60_5family_dynamic_variable_outside_empty/dictionaries/rougail/00-base.yml +++ /dev/null @@ -1,25 +0,0 @@ ---- -version: '1.1' - -var: - description: a suffix variable - multi: true - mandatory: false - test: - - val1 - - val2 - -"my_dyn_family_{{ identifier }}": - description: a dynamic family - dynamic: - variable: _.var - var: - description: a variable inside a dynamic family - default: - type: identifier - mandatory: false -var2: - description: a variable - multi: true - default: - variable: "rougail.my_dyn_family_{{ identifier }}.var" diff --git a/tests/dictionaries/60_5family_dynamic_variable_outside_empty/force_namespace b/tests/dictionaries/60_5family_dynamic_variable_outside_empty/force_namespace deleted file mode 100644 index e69de29bb..000000000 diff --git a/tests/dictionaries/60_5family_dynamic_variable_outside_empty/tiramisu/base.py b/tests/dictionaries/60_5family_dynamic_variable_outside_empty/tiramisu/base.py index 1f44635bd..11146bce5 100644 --- a/tests/dictionaries/60_5family_dynamic_variable_outside_empty/tiramisu/base.py +++ b/tests/dictionaries/60_5family_dynamic_variable_outside_empty/tiramisu/base.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') try: groups.namespace except: diff --git a/tests/dictionaries/60_5family_dynamic_variable_outside_empty/tiramisu/multi.py b/tests/dictionaries/60_5family_dynamic_variable_outside_empty/tiramisu/multi.py index e465e95f1..5173c81cd 100644 --- a/tests/dictionaries/60_5family_dynamic_variable_outside_empty/tiramisu/multi.py +++ b/tests/dictionaries/60_5family_dynamic_variable_outside_empty/tiramisu/multi.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') try: groups.namespace except: diff --git a/tests/dictionaries/60_5family_dynamic_variable_outside_jinja/dictionaries/rougail/00-base.yml b/tests/dictionaries/60_5family_dynamic_variable_outside_jinja/dictionaries/rougail/00-base.yml deleted file mode 100644 index cf0000848..000000000 --- a/tests/dictionaries/60_5family_dynamic_variable_outside_jinja/dictionaries/rougail/00-base.yml +++ /dev/null @@ -1,25 +0,0 @@ ---- -version: '1.1' -var: # a suffix variable - - val1 - - val2 -"my_dyn_family_{{ identifier }}": - description: a dynamic family - dynamic: - variable: _.var - var: - description: a variable inside a dynamic family - default: - type: identifier - mandatory: false -var2: - description: a variable - multi: true - default: - jinja: |- - {%- for v in var %} - {{ v }} - {%- endfor -%} - params: - var: - variable: rougail.my_dyn_family_{{ identifier }}.var diff --git a/tests/dictionaries/60_5family_dynamic_variable_outside_jinja/force_namespace b/tests/dictionaries/60_5family_dynamic_variable_outside_jinja/force_namespace deleted file mode 100644 index e69de29bb..000000000 diff --git a/tests/dictionaries/60_5family_dynamic_variable_outside_jinja/tiramisu/base.py b/tests/dictionaries/60_5family_dynamic_variable_outside_jinja/tiramisu/base.py index 1d0b1fd99..185886480 100644 --- a/tests/dictionaries/60_5family_dynamic_variable_outside_jinja/tiramisu/base.py +++ b/tests/dictionaries/60_5family_dynamic_variable_outside_jinja/tiramisu/base.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') try: groups.namespace except: @@ -14,6 +14,6 @@ dict_env['default_rougail.var2'] = "{%- for v in var %}\n{{ v }}\n{%- endfor -%} option_2 = StrOption(name="var", doc="a suffix variable", multi=True, default=["val1", "val2"], default_multi="val1", properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) option_4 = StrOption(name="var", doc="a variable inside a dynamic family", default=Calculation(func['calc_value'], Params((ParamIdentifier()))), properties=frozenset({"standard"}), informations={'type': 'string'}) optiondescription_3 = ConvertDynOptionDescription(name="my_dyn_family_{{ identifier }}", doc="a dynamic family", identifiers=Calculation(func['calc_value'], Params((ParamOption(option_2)))), children=[option_4], properties=frozenset({"standard"}), informations={'dynamic_variable': 'rougail.var'}) -option_5 = StrOption(name="var2", doc="a variable", multi=True, default=Calculation(func['jinja_to_function'], Params((), kwargs={'__internal_jinja': ParamValue("default_rougail.var2"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(True), '__internal_files': ParamValue(['tests/dictionaries/60_5family_dynamic_variable_outside_jinja/dictionaries/rougail/00-base.yml']), '__internal_attribute': ParamValue("default"), '__internal_variable': ParamValue("rougail.var2"), 'var': ParamOption(option_4)})), properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) +option_5 = StrOption(name="var2", doc="a variable", multi=True, default=Calculation(func['jinja_to_function'], Params((), kwargs={'__internal_jinja': ParamValue("default_rougail.var2"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(True), '__internal_files': ParamValue(['../rougail-tests/structures/60_5family_dynamic_variable_outside_jinja/rougail/00-base.yml']), '__internal_attribute': ParamValue("default"), '__internal_variable': ParamValue("rougail.var2"), 'var': ParamOption(option_4)})), properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) optiondescription_1 = OptionDescription(name="rougail", doc="Rougail", group_type=groups.namespace, children=[option_2, optiondescription_3, option_5], properties=frozenset({"standard"})) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_1]) diff --git a/tests/dictionaries/60_5family_dynamic_variable_outside_jinja/tiramisu/multi.py b/tests/dictionaries/60_5family_dynamic_variable_outside_jinja/tiramisu/multi.py index ebd029cef..fd62d03d7 100644 --- a/tests/dictionaries/60_5family_dynamic_variable_outside_jinja/tiramisu/multi.py +++ b/tests/dictionaries/60_5family_dynamic_variable_outside_jinja/tiramisu/multi.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') try: groups.namespace except: @@ -15,13 +15,13 @@ dict_env['default_2.rougail.var2'] = "{%- for v in var %}\n{{ v }}\n{%- endfor - option_3 = StrOption(name="var", doc="a suffix variable", multi=True, default=["val1", "val2"], default_multi="val1", properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) option_5 = StrOption(name="var", doc="a variable inside a dynamic family", default=Calculation(func['calc_value'], Params((ParamIdentifier()))), properties=frozenset({"standard"}), informations={'type': 'string'}) optiondescription_4 = ConvertDynOptionDescription(name="my_dyn_family_{{ identifier }}", doc="a dynamic family", identifiers=Calculation(func['calc_value'], Params((ParamOption(option_3)))), children=[option_5], properties=frozenset({"standard"}), informations={'dynamic_variable': '1.rougail.var'}) -option_6 = StrOption(name="var2", doc="a variable", multi=True, default=Calculation(func['jinja_to_function'], Params((), kwargs={'__internal_jinja': ParamValue("default_1.rougail.var2"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(True), '__internal_files': ParamValue(['tests/dictionaries/60_5family_dynamic_variable_outside_jinja/dictionaries/rougail/00-base.yml']), '__internal_attribute': ParamValue("default"), '__internal_variable': ParamValue("1.rougail.var2"), 'var': ParamOption(option_5)})), properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) +option_6 = StrOption(name="var2", doc="a variable", multi=True, default=Calculation(func['jinja_to_function'], Params((), kwargs={'__internal_jinja': ParamValue("default_1.rougail.var2"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(True), '__internal_files': ParamValue(['../rougail-tests/structures/60_5family_dynamic_variable_outside_jinja/rougail/00-base.yml']), '__internal_attribute': ParamValue("default"), '__internal_variable': ParamValue("1.rougail.var2"), 'var': ParamOption(option_5)})), properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) optiondescription_2 = OptionDescription(name="rougail", doc="Rougail", group_type=groups.namespace, children=[option_3, optiondescription_4, option_6], properties=frozenset({"standard"})) optiondescription_1 = OptionDescription(name="1", doc="1", children=[optiondescription_2], properties=frozenset({"standard"})) option_9 = StrOption(name="var", doc="a suffix variable", multi=True, default=["val1", "val2"], default_multi="val1", properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) option_11 = StrOption(name="var", doc="a variable inside a dynamic family", default=Calculation(func['calc_value'], Params((ParamIdentifier()))), properties=frozenset({"standard"}), informations={'type': 'string'}) optiondescription_10 = ConvertDynOptionDescription(name="my_dyn_family_{{ identifier }}", doc="a dynamic family", identifiers=Calculation(func['calc_value'], Params((ParamOption(option_9)))), children=[option_11], properties=frozenset({"standard"}), informations={'dynamic_variable': '2.rougail.var'}) -option_12 = StrOption(name="var2", doc="a variable", multi=True, default=Calculation(func['jinja_to_function'], Params((), kwargs={'__internal_jinja': ParamValue("default_2.rougail.var2"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(True), '__internal_files': ParamValue(['tests/dictionaries/60_5family_dynamic_variable_outside_jinja/dictionaries/rougail/00-base.yml']), '__internal_attribute': ParamValue("default"), '__internal_variable': ParamValue("2.rougail.var2"), 'var': ParamOption(option_11)})), properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) +option_12 = StrOption(name="var2", doc="a variable", multi=True, default=Calculation(func['jinja_to_function'], Params((), kwargs={'__internal_jinja': ParamValue("default_2.rougail.var2"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(True), '__internal_files': ParamValue(['../rougail-tests/structures/60_5family_dynamic_variable_outside_jinja/rougail/00-base.yml']), '__internal_attribute': ParamValue("default"), '__internal_variable': ParamValue("2.rougail.var2"), 'var': ParamOption(option_11)})), properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) optiondescription_8 = OptionDescription(name="rougail", doc="Rougail", group_type=groups.namespace, children=[option_9, optiondescription_10, option_12], properties=frozenset({"standard"})) optiondescription_7 = OptionDescription(name="2", doc="2", children=[optiondescription_8], properties=frozenset({"standard"})) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_1, optiondescription_7]) diff --git a/tests/dictionaries/60_5family_dynamic_variable_outside_jinja_empty/dictionaries/rougail/00-base.yml b/tests/dictionaries/60_5family_dynamic_variable_outside_jinja_empty/dictionaries/rougail/00-base.yml deleted file mode 100644 index e34a219f8..000000000 --- a/tests/dictionaries/60_5family_dynamic_variable_outside_jinja_empty/dictionaries/rougail/00-base.yml +++ /dev/null @@ -1,32 +0,0 @@ ---- -version: '1.1' - -var: - description: a suffix variable - multi: true - mandatory: false - test: - - val1 - - val2 - -"my_dyn_family_{{ identifier }}": - description: a dynamic family - dynamic: - variable: _.var - var: - description: a variable inside a dynamic family - default: - type: identifier - mandatory: false - -var2: - description: a variable - multi: true - default: - jinja: |- - {%- for v in var %} - {{ v }} - {%- endfor -%} - params: - var: - variable: rougail.my_dyn_family_{{ identifier }}.var diff --git a/tests/dictionaries/60_5family_dynamic_variable_outside_jinja_empty/force_namespace b/tests/dictionaries/60_5family_dynamic_variable_outside_jinja_empty/force_namespace deleted file mode 100644 index e69de29bb..000000000 diff --git a/tests/dictionaries/60_5family_dynamic_variable_outside_jinja_empty/tiramisu/base.py b/tests/dictionaries/60_5family_dynamic_variable_outside_jinja_empty/tiramisu/base.py index ae34ec6fc..29a5794b2 100644 --- a/tests/dictionaries/60_5family_dynamic_variable_outside_jinja_empty/tiramisu/base.py +++ b/tests/dictionaries/60_5family_dynamic_variable_outside_jinja_empty/tiramisu/base.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') try: groups.namespace except: @@ -14,6 +14,6 @@ dict_env['default_rougail.var2'] = "{%- for v in var %}\n{{ v }}\n{%- endfor -%} option_2 = StrOption(name="var", doc="a suffix variable", multi=True, properties=frozenset({"standard"}), informations={'type': 'string', 'test': ('val1', 'val2')}) option_4 = StrOption(name="var", doc="a variable inside a dynamic family", default=Calculation(func['calc_value'], Params((ParamIdentifier()))), properties=frozenset({"standard"}), informations={'type': 'string'}) optiondescription_3 = ConvertDynOptionDescription(name="my_dyn_family_{{ identifier }}", doc="a dynamic family", identifiers=Calculation(func['calc_value'], Params((ParamOption(option_2)))), children=[option_4], properties=frozenset({"standard"}), informations={'dynamic_variable': 'rougail.var'}) -option_5 = StrOption(name="var2", doc="a variable", multi=True, default=Calculation(func['jinja_to_function'], Params((), kwargs={'__internal_jinja': ParamValue("default_rougail.var2"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(True), '__internal_files': ParamValue(['tests/dictionaries/60_5family_dynamic_variable_outside_jinja_empty/dictionaries/rougail/00-base.yml']), '__internal_attribute': ParamValue("default"), '__internal_variable': ParamValue("rougail.var2"), 'var': ParamOption(option_4)})), properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) +option_5 = StrOption(name="var2", doc="a variable", multi=True, default=Calculation(func['jinja_to_function'], Params((), kwargs={'__internal_jinja': ParamValue("default_rougail.var2"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(True), '__internal_files': ParamValue(['../rougail-tests/structures/60_5family_dynamic_variable_outside_jinja_empty/rougail/00-base.yml']), '__internal_attribute': ParamValue("default"), '__internal_variable': ParamValue("rougail.var2"), 'var': ParamOption(option_4)})), properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) optiondescription_1 = OptionDescription(name="rougail", doc="Rougail", group_type=groups.namespace, children=[option_2, optiondescription_3, option_5], properties=frozenset({"standard"})) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_1]) diff --git a/tests/dictionaries/60_5family_dynamic_variable_outside_jinja_empty/tiramisu/multi.py b/tests/dictionaries/60_5family_dynamic_variable_outside_jinja_empty/tiramisu/multi.py index 4c5c68653..fccbdfa47 100644 --- a/tests/dictionaries/60_5family_dynamic_variable_outside_jinja_empty/tiramisu/multi.py +++ b/tests/dictionaries/60_5family_dynamic_variable_outside_jinja_empty/tiramisu/multi.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') try: groups.namespace except: @@ -15,13 +15,13 @@ dict_env['default_2.rougail.var2'] = "{%- for v in var %}\n{{ v }}\n{%- endfor - option_3 = StrOption(name="var", doc="a suffix variable", multi=True, properties=frozenset({"standard"}), informations={'type': 'string', 'test': ('val1', 'val2')}) option_5 = StrOption(name="var", doc="a variable inside a dynamic family", default=Calculation(func['calc_value'], Params((ParamIdentifier()))), properties=frozenset({"standard"}), informations={'type': 'string'}) optiondescription_4 = ConvertDynOptionDescription(name="my_dyn_family_{{ identifier }}", doc="a dynamic family", identifiers=Calculation(func['calc_value'], Params((ParamOption(option_3)))), children=[option_5], properties=frozenset({"standard"}), informations={'dynamic_variable': '1.rougail.var'}) -option_6 = StrOption(name="var2", doc="a variable", multi=True, default=Calculation(func['jinja_to_function'], Params((), kwargs={'__internal_jinja': ParamValue("default_1.rougail.var2"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(True), '__internal_files': ParamValue(['tests/dictionaries/60_5family_dynamic_variable_outside_jinja_empty/dictionaries/rougail/00-base.yml']), '__internal_attribute': ParamValue("default"), '__internal_variable': ParamValue("1.rougail.var2"), 'var': ParamOption(option_5)})), properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) +option_6 = StrOption(name="var2", doc="a variable", multi=True, default=Calculation(func['jinja_to_function'], Params((), kwargs={'__internal_jinja': ParamValue("default_1.rougail.var2"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(True), '__internal_files': ParamValue(['../rougail-tests/structures/60_5family_dynamic_variable_outside_jinja_empty/rougail/00-base.yml']), '__internal_attribute': ParamValue("default"), '__internal_variable': ParamValue("1.rougail.var2"), 'var': ParamOption(option_5)})), properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) optiondescription_2 = OptionDescription(name="rougail", doc="Rougail", group_type=groups.namespace, children=[option_3, optiondescription_4, option_6], properties=frozenset({"standard"})) optiondescription_1 = OptionDescription(name="1", doc="1", children=[optiondescription_2], properties=frozenset({"standard"})) option_9 = StrOption(name="var", doc="a suffix variable", multi=True, properties=frozenset({"standard"}), informations={'type': 'string', 'test': ('val1', 'val2')}) option_11 = StrOption(name="var", doc="a variable inside a dynamic family", default=Calculation(func['calc_value'], Params((ParamIdentifier()))), properties=frozenset({"standard"}), informations={'type': 'string'}) optiondescription_10 = ConvertDynOptionDescription(name="my_dyn_family_{{ identifier }}", doc="a dynamic family", identifiers=Calculation(func['calc_value'], Params((ParamOption(option_9)))), children=[option_11], properties=frozenset({"standard"}), informations={'dynamic_variable': '2.rougail.var'}) -option_12 = StrOption(name="var2", doc="a variable", multi=True, default=Calculation(func['jinja_to_function'], Params((), kwargs={'__internal_jinja': ParamValue("default_2.rougail.var2"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(True), '__internal_files': ParamValue(['tests/dictionaries/60_5family_dynamic_variable_outside_jinja_empty/dictionaries/rougail/00-base.yml']), '__internal_attribute': ParamValue("default"), '__internal_variable': ParamValue("2.rougail.var2"), 'var': ParamOption(option_11)})), properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) +option_12 = StrOption(name="var2", doc="a variable", multi=True, default=Calculation(func['jinja_to_function'], Params((), kwargs={'__internal_jinja': ParamValue("default_2.rougail.var2"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(True), '__internal_files': ParamValue(['../rougail-tests/structures/60_5family_dynamic_variable_outside_jinja_empty/rougail/00-base.yml']), '__internal_attribute': ParamValue("default"), '__internal_variable': ParamValue("2.rougail.var2"), 'var': ParamOption(option_11)})), properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) optiondescription_8 = OptionDescription(name="rougail", doc="Rougail", group_type=groups.namespace, children=[option_9, optiondescription_10, option_12], properties=frozenset({"standard"})) optiondescription_7 = OptionDescription(name="2", doc="2", children=[optiondescription_8], properties=frozenset({"standard"})) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_1, optiondescription_7]) 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 deleted file mode 100644 index d39d959dc..000000000 --- a/tests/dictionaries/60_5family_dynamic_variable_outside_sub_suffix/dictionaries/rougail/00-base.yml +++ /dev/null @@ -1,24 +0,0 @@ ---- -version: '1.1' -var: # a suffix variable - - val1 - - val2 -"my_dyn_family_{{ identifier }}": - description: a dynamic family - dynamic: - variable: _.var - propertyerror: false - "subdyn_{{ identifier }}": - description: a sub dynamic family - dynamic: - variable: rougail.var - var: - description: a variable inside a sub dynamic family - default: - type: identifier -var2: - description: a variable - mandatory: false - multi: true - default: - variable: "rougail.my_dyn_family_val1.subdyn_{{ identifier }}.var" diff --git a/tests/dictionaries/60_5family_dynamic_variable_outside_sub_suffix/force_namespace b/tests/dictionaries/60_5family_dynamic_variable_outside_sub_suffix/force_namespace deleted file mode 100644 index e69de29bb..000000000 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 5cc11ea62..63e03f96b 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 @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') try: groups.namespace except: 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 82bbc6157..784feb20d 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 @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') try: groups.namespace except: @@ -12,14 +12,14 @@ ALLOWED_LEADER_PROPERTIES.add("standard") ALLOWED_LEADER_PROPERTIES.add("advanced") option_3 = StrOption(name="var", doc="a suffix variable", multi=True, default=["val1", "val2"], default_multi="val1", properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) option_6 = StrOption(name="var", doc="a variable inside a sub dynamic family", default=Calculation(func['calc_value'], Params((ParamIdentifier()))), properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) -optiondescription_5 = ConvertDynOptionDescription(name="subdyn_{{ identifier }}", doc="a sub dynamic family", identifiers=Calculation(func['calc_value'], Params((ParamOption(option_3)))), children=[option_6], properties=frozenset({"standard"}), informations={'dynamic_variable': '1.var'}) +optiondescription_5 = ConvertDynOptionDescription(name="subdyn_{{ identifier }}", doc="a sub dynamic family", identifiers=Calculation(func['calc_value'], Params((ParamOption(option_3)))), children=[option_6], properties=frozenset({"standard"}), informations={'dynamic_variable': 'rougail.var'}) optiondescription_4 = ConvertDynOptionDescription(name="my_dyn_family_{{ identifier }}", doc="a dynamic family", identifiers=Calculation(func['calc_value'], Params((ParamOption(option_3, notraisepropertyerror=True)))), children=[optiondescription_5], properties=frozenset({"standard"}), informations={'dynamic_variable': '1.rougail.var'}) option_7 = StrOption(name="var2", doc="a variable", multi=True, default=Calculation(func['calc_value'], Params((ParamDynOption(option_6, ["val1", None])), kwargs={'__internal_multi': ParamValue(True)})), properties=frozenset({"standard"}), informations={'type': 'string'}) optiondescription_2 = OptionDescription(name="rougail", doc="Rougail", group_type=groups.namespace, children=[option_3, optiondescription_4, option_7], properties=frozenset({"standard"})) optiondescription_1 = OptionDescription(name="1", doc="1", children=[optiondescription_2], properties=frozenset({"standard"})) option_10 = StrOption(name="var", doc="a suffix variable", multi=True, default=["val1", "val2"], default_multi="val1", properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) option_13 = StrOption(name="var", doc="a variable inside a sub dynamic family", default=Calculation(func['calc_value'], Params((ParamIdentifier()))), properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) -optiondescription_12 = ConvertDynOptionDescription(name="subdyn_{{ identifier }}", doc="a sub dynamic family", identifiers=Calculation(func['calc_value'], Params((ParamOption(option_10)))), children=[option_13], properties=frozenset({"standard"}), informations={'dynamic_variable': '2.var'}) +optiondescription_12 = ConvertDynOptionDescription(name="subdyn_{{ identifier }}", doc="a sub dynamic family", identifiers=Calculation(func['calc_value'], Params((ParamOption(option_10)))), children=[option_13], properties=frozenset({"standard"}), informations={'dynamic_variable': 'rougail.var'}) optiondescription_11 = ConvertDynOptionDescription(name="my_dyn_family_{{ identifier }}", doc="a dynamic family", identifiers=Calculation(func['calc_value'], Params((ParamOption(option_10, notraisepropertyerror=True)))), children=[optiondescription_12], properties=frozenset({"standard"}), informations={'dynamic_variable': '2.rougail.var'}) option_14 = StrOption(name="var2", doc="a variable", multi=True, default=Calculation(func['calc_value'], Params((ParamDynOption(option_13, ["val1", None])), kwargs={'__internal_multi': ParamValue(True)})), properties=frozenset({"standard"}), informations={'type': 'string'}) optiondescription_9 = OptionDescription(name="rougail", doc="Rougail", group_type=groups.namespace, children=[option_10, optiondescription_11, option_14], properties=frozenset({"standard"})) diff --git a/tests/dictionaries/60_5family_dynamic_variable_outside_sub_suffix_empty/dictionaries/rougail/00-base.yml b/tests/dictionaries/60_5family_dynamic_variable_outside_sub_suffix_empty/dictionaries/rougail/00-base.yml deleted file mode 100644 index 87c3ffc61..000000000 --- a/tests/dictionaries/60_5family_dynamic_variable_outside_sub_suffix_empty/dictionaries/rougail/00-base.yml +++ /dev/null @@ -1,32 +0,0 @@ ---- -version: '1.1' - -var: - description: a suffix variable - multi: true - mandatory: false - test: - - val1 - - val2 - -"my_dyn_family_{{ identifier }}": - description: a dynamic family - dynamic: - variable: _.var - propertyerror: false - "subdyn_{{ identifier }}": - description: a sub dynamic family - dynamic: - variable: rougail.var - var: - description: a variable inside a sub dynamic family - default: - type: identifier - -var2: - description: a variable - mandatory: false - multi: true - default: - variable: "rougail.my_dyn_family_val1.subdyn_{{ identifier }}.var" - optional: true diff --git a/tests/dictionaries/60_5family_dynamic_variable_outside_sub_suffix_empty/force_namespace b/tests/dictionaries/60_5family_dynamic_variable_outside_sub_suffix_empty/force_namespace deleted file mode 100644 index e69de29bb..000000000 diff --git a/tests/dictionaries/60_5family_dynamic_variable_outside_sub_suffix_empty/tiramisu/base.py b/tests/dictionaries/60_5family_dynamic_variable_outside_sub_suffix_empty/tiramisu/base.py index 38d162e64..f5e5ccb25 100644 --- a/tests/dictionaries/60_5family_dynamic_variable_outside_sub_suffix_empty/tiramisu/base.py +++ b/tests/dictionaries/60_5family_dynamic_variable_outside_sub_suffix_empty/tiramisu/base.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') try: groups.namespace except: diff --git a/tests/dictionaries/60_5family_dynamic_variable_outside_sub_suffix_empty/tiramisu/multi.py b/tests/dictionaries/60_5family_dynamic_variable_outside_sub_suffix_empty/tiramisu/multi.py index 9fef16011..d673fdb1b 100644 --- a/tests/dictionaries/60_5family_dynamic_variable_outside_sub_suffix_empty/tiramisu/multi.py +++ b/tests/dictionaries/60_5family_dynamic_variable_outside_sub_suffix_empty/tiramisu/multi.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') try: groups.namespace except: @@ -12,14 +12,14 @@ ALLOWED_LEADER_PROPERTIES.add("standard") ALLOWED_LEADER_PROPERTIES.add("advanced") option_3 = StrOption(name="var", doc="a suffix variable", multi=True, properties=frozenset({"standard"}), informations={'type': 'string', 'test': ('val1', 'val2')}) option_6 = StrOption(name="var", doc="a variable inside a sub dynamic family", default=Calculation(func['calc_value'], Params((ParamIdentifier()))), properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) -optiondescription_5 = ConvertDynOptionDescription(name="subdyn_{{ identifier }}", doc="a sub dynamic family", identifiers=Calculation(func['calc_value'], Params((ParamOption(option_3)))), children=[option_6], properties=frozenset({"standard"}), informations={'dynamic_variable': '1.var'}) +optiondescription_5 = ConvertDynOptionDescription(name="subdyn_{{ identifier }}", doc="a sub dynamic family", identifiers=Calculation(func['calc_value'], Params((ParamOption(option_3)))), children=[option_6], properties=frozenset({"standard"}), informations={'dynamic_variable': 'rougail.var'}) optiondescription_4 = ConvertDynOptionDescription(name="my_dyn_family_{{ identifier }}", doc="a dynamic family", identifiers=Calculation(func['calc_value'], Params((ParamOption(option_3, notraisepropertyerror=True)))), children=[optiondescription_5], properties=frozenset({"standard"}), informations={'dynamic_variable': '1.rougail.var'}) option_7 = StrOption(name="var2", doc="a variable", multi=True, default=Calculation(func['calc_value'], Params((ParamDynOption(option_6, ["val1", None], optional=True)), kwargs={'__internal_multi': ParamValue(True)})), properties=frozenset({"standard"}), informations={'type': 'string'}) optiondescription_2 = OptionDescription(name="rougail", doc="Rougail", group_type=groups.namespace, children=[option_3, optiondescription_4, option_7], properties=frozenset({"standard"})) optiondescription_1 = OptionDescription(name="1", doc="1", children=[optiondescription_2], properties=frozenset({"standard"})) option_10 = StrOption(name="var", doc="a suffix variable", multi=True, properties=frozenset({"standard"}), informations={'type': 'string', 'test': ('val1', 'val2')}) option_13 = StrOption(name="var", doc="a variable inside a sub dynamic family", default=Calculation(func['calc_value'], Params((ParamIdentifier()))), properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) -optiondescription_12 = ConvertDynOptionDescription(name="subdyn_{{ identifier }}", doc="a sub dynamic family", identifiers=Calculation(func['calc_value'], Params((ParamOption(option_10)))), children=[option_13], properties=frozenset({"standard"}), informations={'dynamic_variable': '2.var'}) +optiondescription_12 = ConvertDynOptionDescription(name="subdyn_{{ identifier }}", doc="a sub dynamic family", identifiers=Calculation(func['calc_value'], Params((ParamOption(option_10)))), children=[option_13], properties=frozenset({"standard"}), informations={'dynamic_variable': 'rougail.var'}) optiondescription_11 = ConvertDynOptionDescription(name="my_dyn_family_{{ identifier }}", doc="a dynamic family", identifiers=Calculation(func['calc_value'], Params((ParamOption(option_10, notraisepropertyerror=True)))), children=[optiondescription_12], properties=frozenset({"standard"}), informations={'dynamic_variable': '2.rougail.var'}) option_14 = StrOption(name="var2", doc="a variable", multi=True, default=Calculation(func['calc_value'], Params((ParamDynOption(option_13, ["val1", None], optional=True)), kwargs={'__internal_multi': ParamValue(True)})), properties=frozenset({"standard"}), informations={'type': 'string'}) optiondescription_9 = OptionDescription(name="rougail", doc="Rougail", group_type=groups.namespace, children=[option_10, optiondescription_11, option_14], properties=frozenset({"standard"})) 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 deleted file mode 100644 index 363798d1c..000000000 --- a/tests/dictionaries/60_5family_dynamic_variable_outside_suffix/dictionaries/rougail/00-base.yml +++ /dev/null @@ -1,17 +0,0 @@ ---- -version: '1.1' -var: # a suffix variable - - val1 - - val2 -"dyn_{{ identifier }}": - description: a dynamic family - dynamic: - variable: _.var - var: - description: a variable inside dynamic family - default: - type: identifier -var2: - description: a variable - default: - 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 78db6b3b4..ddacabbf0 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 @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') try: groups.namespace except: 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 d0d0b8508..017822563 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 @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') try: groups.namespace except: 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 19e72b50c..3368798f5 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 @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") ALLOWED_LEADER_PROPERTIES.add("standard") ALLOWED_LEADER_PROPERTIES.add("advanced") diff --git a/tests/dictionaries/60_5family_dynamic_variable_outside_suffix_empty/dictionaries/rougail/00-base.yml b/tests/dictionaries/60_5family_dynamic_variable_outside_suffix_empty/dictionaries/rougail/00-base.yml deleted file mode 100644 index 6f4d3243f..000000000 --- a/tests/dictionaries/60_5family_dynamic_variable_outside_suffix_empty/dictionaries/rougail/00-base.yml +++ /dev/null @@ -1,27 +0,0 @@ ---- -version: '1.1' - -var: - description: asuffix variable - multi: true - mandatory: false - test: - - val1 - - val2 - -"dyn_{{ identifier }}": - description: a dynamic family - dynamic: - variable: _.var - - var: - description: a variable inside dynamic family - default: - type: identifier - -var2: - description: a variable - mandatory: false - default: - variable: _.dyn_val1.var - optional: true diff --git a/tests/dictionaries/60_5family_dynamic_variable_outside_suffix_empty/tiramisu/base.py b/tests/dictionaries/60_5family_dynamic_variable_outside_suffix_empty/tiramisu/base.py index 59faf0c9b..b737ba2d1 100644 --- a/tests/dictionaries/60_5family_dynamic_variable_outside_suffix_empty/tiramisu/base.py +++ b/tests/dictionaries/60_5family_dynamic_variable_outside_suffix_empty/tiramisu/base.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') try: groups.namespace except: diff --git a/tests/dictionaries/60_5family_dynamic_variable_outside_suffix_empty/tiramisu/multi.py b/tests/dictionaries/60_5family_dynamic_variable_outside_suffix_empty/tiramisu/multi.py index c23938901..c26fe9b8f 100644 --- a/tests/dictionaries/60_5family_dynamic_variable_outside_suffix_empty/tiramisu/multi.py +++ b/tests/dictionaries/60_5family_dynamic_variable_outside_suffix_empty/tiramisu/multi.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') try: groups.namespace except: diff --git a/tests/dictionaries/60_5family_dynamic_variable_outside_suffix_empty/tiramisu/no_namespace.py b/tests/dictionaries/60_5family_dynamic_variable_outside_suffix_empty/tiramisu/no_namespace.py index 592b5cabe..5a5911b36 100644 --- a/tests/dictionaries/60_5family_dynamic_variable_outside_suffix_empty/tiramisu/no_namespace.py +++ b/tests/dictionaries/60_5family_dynamic_variable_outside_suffix_empty/tiramisu/no_namespace.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") ALLOWED_LEADER_PROPERTIES.add("standard") ALLOWED_LEADER_PROPERTIES.add("advanced") 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 deleted file mode 100644 index b8f3e70f1..000000000 --- a/tests/dictionaries/60_6family_dynamic_inside/dictionaries/rougail/00-base.yml +++ /dev/null @@ -1,26 +0,0 @@ ---- -version: '1.1' -var: # a suffix variable - - val1 - - val2 - -"{{ identifier }}_dyn": - description: a dynamic family - dynamic: - variable: _.var - var1: - description: value is suffix - default: - type: identifier - var2: - description: value is first variable - default: - variable: rougail.{{ identifier }}_dyn.var1 - var3: - description: value is relative first variable - default: - variable: _.var1 - var4: - description: value is first variable of val1 - default: - variable: rougail.val1_dyn.var1 diff --git a/tests/dictionaries/60_6family_dynamic_inside/force_namespace b/tests/dictionaries/60_6family_dynamic_inside/force_namespace deleted file mode 100644 index e69de29bb..000000000 diff --git a/tests/dictionaries/60_6family_dynamic_inside/tiramisu/base.py b/tests/dictionaries/60_6family_dynamic_inside/tiramisu/base.py index 38de5be53..568b9b3cc 100644 --- a/tests/dictionaries/60_6family_dynamic_inside/tiramisu/base.py +++ b/tests/dictionaries/60_6family_dynamic_inside/tiramisu/base.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') try: groups.namespace except: diff --git a/tests/dictionaries/60_6family_dynamic_inside/tiramisu/multi.py b/tests/dictionaries/60_6family_dynamic_inside/tiramisu/multi.py index 5c70d4d68..b25722748 100644 --- a/tests/dictionaries/60_6family_dynamic_inside/tiramisu/multi.py +++ b/tests/dictionaries/60_6family_dynamic_inside/tiramisu/multi.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') try: groups.namespace except: diff --git a/tests/dictionaries/60_6family_dynamic_inside_empty/dictionaries/rougail/00-base.yml b/tests/dictionaries/60_6family_dynamic_inside_empty/dictionaries/rougail/00-base.yml deleted file mode 100644 index 3b4cd2a81..000000000 --- a/tests/dictionaries/60_6family_dynamic_inside_empty/dictionaries/rougail/00-base.yml +++ /dev/null @@ -1,31 +0,0 @@ ---- -version: '1.1' - -var: - description: a suffix variable - multi: true - mandatory: false - test: - - val1 - - val2 - -"{{ identifier }}_dyn": - description: a dynamic family - dynamic: - variable: _.var - var1: - description: value is suffix - default: - type: identifier - var2: - description: value is first variable - default: - variable: rougail.{{ identifier }}_dyn.var1 - var3: - description: value is relative first variable - default: - variable: _.var1 - var4: - description: value is first variable of val1 - default: - variable: rougail.val1_dyn.var1 diff --git a/tests/dictionaries/60_6family_dynamic_inside_empty/force_namespace b/tests/dictionaries/60_6family_dynamic_inside_empty/force_namespace deleted file mode 100644 index e69de29bb..000000000 diff --git a/tests/dictionaries/60_6family_dynamic_inside_empty/tiramisu/base.py b/tests/dictionaries/60_6family_dynamic_inside_empty/tiramisu/base.py index 8c8302da2..56054ebea 100644 --- a/tests/dictionaries/60_6family_dynamic_inside_empty/tiramisu/base.py +++ b/tests/dictionaries/60_6family_dynamic_inside_empty/tiramisu/base.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') try: groups.namespace except: diff --git a/tests/dictionaries/60_6family_dynamic_inside_empty/tiramisu/multi.py b/tests/dictionaries/60_6family_dynamic_inside_empty/tiramisu/multi.py index 3a8dfa926..c7a9bb4f7 100644 --- a/tests/dictionaries/60_6family_dynamic_inside_empty/tiramisu/multi.py +++ b/tests/dictionaries/60_6family_dynamic_inside_empty/tiramisu/multi.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') try: groups.namespace except: 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 deleted file mode 100644 index ee1283f8f..000000000 --- a/tests/dictionaries/60_6family_dynamic_leadership/dictionaries/rougail/00-base.yml +++ /dev/null @@ -1,21 +0,0 @@ ---- -version: '1.1' -var: # a suffix variable - - val1 - - val2 -"dyn{{ identifier }}": - description: a dynamic family - dynamic: - variable: _.var - leadership: - description: a leadership - type: leadership - leader: - description: a leader - multi: true - follower1: - description: a follower1 - mandatory: false - follower2: - description: a follower2 - mandatory: false diff --git a/tests/dictionaries/60_6family_dynamic_leadership/tiramisu/base.py b/tests/dictionaries/60_6family_dynamic_leadership/tiramisu/base.py index dc21f9db2..9cd5245fe 100644 --- a/tests/dictionaries/60_6family_dynamic_leadership/tiramisu/base.py +++ b/tests/dictionaries/60_6family_dynamic_leadership/tiramisu/base.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') try: groups.namespace except: diff --git a/tests/dictionaries/60_6family_dynamic_leadership/tiramisu/multi.py b/tests/dictionaries/60_6family_dynamic_leadership/tiramisu/multi.py index aaf1af5fc..16e723898 100644 --- a/tests/dictionaries/60_6family_dynamic_leadership/tiramisu/multi.py +++ b/tests/dictionaries/60_6family_dynamic_leadership/tiramisu/multi.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') try: groups.namespace except: 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 dec96c4a9..8eeed640c 100644 --- a/tests/dictionaries/60_6family_dynamic_leadership/tiramisu/no_namespace.py +++ b/tests/dictionaries/60_6family_dynamic_leadership/tiramisu/no_namespace.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") ALLOWED_LEADER_PROPERTIES.add("standard") ALLOWED_LEADER_PROPERTIES.add("advanced") diff --git a/tests/dictionaries/60_6family_dynamic_leadership_empty/dictionaries/rougail/00-base.yml b/tests/dictionaries/60_6family_dynamic_leadership_empty/dictionaries/rougail/00-base.yml deleted file mode 100644 index 998ccfe05..000000000 --- a/tests/dictionaries/60_6family_dynamic_leadership_empty/dictionaries/rougail/00-base.yml +++ /dev/null @@ -1,27 +0,0 @@ ---- -version: '1.1' - -var: - description: a suffix variable - multi: true - mandatory: false - test: - - val1 - - val2 - -"dyn{{ identifier }}": - description: a dynamic family - dynamic: - variable: _.var - leadership: - description: a leadership - type: leadership - leader: - description: a leader - multi: true - follower1: - description: a follower1 - mandatory: false - follower2: - description: a follower2 - mandatory: false diff --git a/tests/dictionaries/60_6family_dynamic_leadership_empty/tiramisu/base.py b/tests/dictionaries/60_6family_dynamic_leadership_empty/tiramisu/base.py index c3d63db7c..4061ae012 100644 --- a/tests/dictionaries/60_6family_dynamic_leadership_empty/tiramisu/base.py +++ b/tests/dictionaries/60_6family_dynamic_leadership_empty/tiramisu/base.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') try: groups.namespace except: diff --git a/tests/dictionaries/60_6family_dynamic_leadership_empty/tiramisu/multi.py b/tests/dictionaries/60_6family_dynamic_leadership_empty/tiramisu/multi.py index a6b375503..503ba4b08 100644 --- a/tests/dictionaries/60_6family_dynamic_leadership_empty/tiramisu/multi.py +++ b/tests/dictionaries/60_6family_dynamic_leadership_empty/tiramisu/multi.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') try: groups.namespace except: diff --git a/tests/dictionaries/60_6family_dynamic_leadership_empty/tiramisu/no_namespace.py b/tests/dictionaries/60_6family_dynamic_leadership_empty/tiramisu/no_namespace.py index 08ced2b9b..5df454563 100644 --- a/tests/dictionaries/60_6family_dynamic_leadership_empty/tiramisu/no_namespace.py +++ b/tests/dictionaries/60_6family_dynamic_leadership_empty/tiramisu/no_namespace.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") ALLOWED_LEADER_PROPERTIES.add("standard") ALLOWED_LEADER_PROPERTIES.add("advanced") 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 deleted file mode 100644 index 1e89265a9..000000000 --- a/tests/dictionaries/60_6family_dynamic_sub_dynamic/dictionaries/rougail/00-base.yml +++ /dev/null @@ -1,51 +0,0 @@ ---- -version: '1.1' - -var: # A identifier variable - - val1 - - val2 - -"dyn{{ identifier }}": - description: A dynamic family - dynamic: - variable: _.var - - var: - description: A dynamic variable - multi: true - default: - jinja: | - {% for val in __.var %} - t{{ val }} - {% endfor %} - description: add 't' to each var value - - "dyn_{{ identifier }}": - description: a Second dynamic variable - dynamic: - variable: "rougail.dyn{{ identifier }}.var" - - var: - description: A variable dynamic - default: - type: identifier - - var_identifier: - description: identifier from first family - default: - type: identifier - identifier: 0 - - var_identifiers: - description: merge identifiers - default: - jinja: | - {{ s1 }}-{{ s2 }} - params: - s1: - type: identifier - identifier: 0 - s2: - type: identifier - identifier: 1 - description: join identifier 1 et identifier 2 diff --git a/tests/dictionaries/60_6family_dynamic_sub_dynamic/force_namespace b/tests/dictionaries/60_6family_dynamic_sub_dynamic/force_namespace deleted file mode 100644 index e69de29bb..000000000 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 82e6d7946..744b442a0 100644 --- a/tests/dictionaries/60_6family_dynamic_sub_dynamic/tiramisu/base.py +++ b/tests/dictionaries/60_6family_dynamic_sub_dynamic/tiramisu/base.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') try: groups.namespace except: @@ -13,10 +13,10 @@ ALLOWED_LEADER_PROPERTIES.add("advanced") dict_env['default_rougail.dyn{{ identifier }}.var'] = "{% for val in __.var %}\nt{{ val }}\n{% endfor %}\n" dict_env['default_rougail.dyn{{ identifier }}.dyn_{{ identifier }}.var_identifiers'] = "{{ s1 }}-{{ s2 }}\n" option_2 = StrOption(name="var", doc="A identifier variable", multi=True, default=["val1", "val2"], default_multi="val1", properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) -option_4 = StrOption(name="var", doc="A dynamic variable", multi=True, default=Calculation(func['jinja_to_function'], Params((), kwargs={'__internal_jinja': ParamValue("default_rougail.dyn{{ identifier }}.var"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(True), '__internal_files': ParamValue(['tests/dictionaries/60_6family_dynamic_sub_dynamic/dictionaries/rougail/00-base.yml']), '__internal_attribute': ParamValue("default"), '__internal_variable': ParamValue("rougail.dyn{{ identifier }}.var"), '__.var': ParamOption(option_2, notraisepropertyerror=True)})), properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) +option_4 = StrOption(name="var", doc="A dynamic variable", multi=True, default=Calculation(func['jinja_to_function'], Params((), kwargs={'__internal_jinja': ParamValue("default_rougail.dyn{{ identifier }}.var"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(True), '__internal_files': ParamValue(['../rougail-tests/structures/60_6family_dynamic_sub_dynamic/rougail/00-base.yml']), '__internal_attribute': ParamValue("default"), '__internal_variable': ParamValue("rougail.dyn{{ identifier }}.var"), '__.var': ParamOption(option_2, notraisepropertyerror=True)})), properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) option_6 = StrOption(name="var", doc="A variable dynamic", default=Calculation(func['calc_value'], Params((ParamIdentifier()))), properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) option_7 = StrOption(name="var_identifier", doc="identifier from first family", default=Calculation(func['calc_value'], Params((ParamIdentifier(identifier_index=0)))), properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) -option_8 = StrOption(name="var_identifiers", doc="merge identifiers", default=Calculation(func['jinja_to_function'], Params((), kwargs={'__internal_jinja': ParamValue("default_rougail.dyn{{ identifier }}.dyn_{{ identifier }}.var_identifiers"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['tests/dictionaries/60_6family_dynamic_sub_dynamic/dictionaries/rougail/00-base.yml']), '__internal_attribute': ParamValue("default"), '__internal_variable': ParamValue("rougail.dyn{{ identifier }}.dyn_{{ identifier }}.var_identifiers"), 's1': ParamIdentifier(identifier_index=0), 's2': ParamIdentifier(identifier_index=1)})), properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) +option_8 = StrOption(name="var_identifiers", doc="merge identifiers", default=Calculation(func['jinja_to_function'], Params((), kwargs={'__internal_jinja': ParamValue("default_rougail.dyn{{ identifier }}.dyn_{{ identifier }}.var_identifiers"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['../rougail-tests/structures/60_6family_dynamic_sub_dynamic/rougail/00-base.yml']), '__internal_attribute': ParamValue("default"), '__internal_variable': ParamValue("rougail.dyn{{ identifier }}.dyn_{{ identifier }}.var_identifiers"), 's1': ParamIdentifier(identifier_index=0), 's2': ParamIdentifier(identifier_index=1)})), properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) optiondescription_5 = ConvertDynOptionDescription(name="dyn_{{ identifier }}", doc="a Second dynamic variable", identifiers=Calculation(func['calc_value'], Params((ParamOption(option_4)))), children=[option_6, option_7, option_8], properties=frozenset({"standard"}), informations={'dynamic_variable': 'rougail.dyn{{ identifier }}.var'}) optiondescription_3 = ConvertDynOptionDescription(name="dyn{{ identifier }}", doc="A dynamic family", identifiers=Calculation(func['calc_value'], Params((ParamOption(option_2)))), children=[option_4, optiondescription_5], properties=frozenset({"standard"}), informations={'dynamic_variable': 'rougail.var'}) optiondescription_1 = OptionDescription(name="rougail", doc="Rougail", group_type=groups.namespace, children=[option_2, optiondescription_3], properties=frozenset({"standard"})) 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 e55f53930..a17d78cf6 100644 --- a/tests/dictionaries/60_6family_dynamic_sub_dynamic/tiramisu/multi.py +++ b/tests/dictionaries/60_6family_dynamic_sub_dynamic/tiramisu/multi.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') try: groups.namespace except: @@ -15,20 +15,20 @@ dict_env['default_1.rougail.dyn{{ identifier }}.dyn_{{ identifier }}.var_identif dict_env['default_2.rougail.dyn{{ identifier }}.var'] = "{% for val in __.var %}\nt{{ val }}\n{% endfor %}\n" dict_env['default_2.rougail.dyn{{ identifier }}.dyn_{{ identifier }}.var_identifiers'] = "{{ s1 }}-{{ s2 }}\n" option_3 = StrOption(name="var", doc="A identifier variable", multi=True, default=["val1", "val2"], default_multi="val1", properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) -option_5 = StrOption(name="var", doc="A dynamic variable", multi=True, default=Calculation(func['jinja_to_function'], Params((), kwargs={'__internal_jinja': ParamValue("default_1.rougail.dyn{{ identifier }}.var"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(True), '__internal_files': ParamValue(['tests/dictionaries/60_6family_dynamic_sub_dynamic/dictionaries/rougail/00-base.yml']), '__internal_attribute': ParamValue("default"), '__internal_variable': ParamValue("1.rougail.dyn{{ identifier }}.var"), '__.var': ParamOption(option_3, notraisepropertyerror=True)})), properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) +option_5 = StrOption(name="var", doc="A dynamic variable", multi=True, default=Calculation(func['jinja_to_function'], Params((), kwargs={'__internal_jinja': ParamValue("default_1.rougail.dyn{{ identifier }}.var"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(True), '__internal_files': ParamValue(['../rougail-tests/structures/60_6family_dynamic_sub_dynamic/rougail/00-base.yml']), '__internal_attribute': ParamValue("default"), '__internal_variable': ParamValue("1.rougail.dyn{{ identifier }}.var"), '__.var': ParamOption(option_3, notraisepropertyerror=True)})), properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) option_7 = StrOption(name="var", doc="A variable dynamic", default=Calculation(func['calc_value'], Params((ParamIdentifier()))), properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) option_8 = StrOption(name="var_identifier", doc="identifier from first family", default=Calculation(func['calc_value'], Params((ParamIdentifier(identifier_index=0)))), properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) -option_9 = StrOption(name="var_identifiers", doc="merge identifiers", default=Calculation(func['jinja_to_function'], Params((), kwargs={'__internal_jinja': ParamValue("default_1.rougail.dyn{{ identifier }}.dyn_{{ identifier }}.var_identifiers"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['tests/dictionaries/60_6family_dynamic_sub_dynamic/dictionaries/rougail/00-base.yml']), '__internal_attribute': ParamValue("default"), '__internal_variable': ParamValue("1.rougail.dyn{{ identifier }}.dyn_{{ identifier }}.var_identifiers"), 's1': ParamIdentifier(identifier_index=0), 's2': ParamIdentifier(identifier_index=1)})), properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) -optiondescription_6 = ConvertDynOptionDescription(name="dyn_{{ identifier }}", doc="a Second dynamic variable", identifiers=Calculation(func['calc_value'], Params((ParamOption(option_5)))), children=[option_7, option_8, option_9], properties=frozenset({"standard"}), informations={'dynamic_variable': '1.dyn{{ identifier }}.var'}) +option_9 = StrOption(name="var_identifiers", doc="merge identifiers", default=Calculation(func['jinja_to_function'], Params((), kwargs={'__internal_jinja': ParamValue("default_1.rougail.dyn{{ identifier }}.dyn_{{ identifier }}.var_identifiers"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['../rougail-tests/structures/60_6family_dynamic_sub_dynamic/rougail/00-base.yml']), '__internal_attribute': ParamValue("default"), '__internal_variable': ParamValue("1.rougail.dyn{{ identifier }}.dyn_{{ identifier }}.var_identifiers"), 's1': ParamIdentifier(identifier_index=0), 's2': ParamIdentifier(identifier_index=1)})), properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) +optiondescription_6 = ConvertDynOptionDescription(name="dyn_{{ identifier }}", doc="a Second dynamic variable", identifiers=Calculation(func['calc_value'], Params((ParamOption(option_5)))), children=[option_7, option_8, option_9], properties=frozenset({"standard"}), informations={'dynamic_variable': 'rougail.dyn{{ identifier }}.var'}) optiondescription_4 = ConvertDynOptionDescription(name="dyn{{ identifier }}", doc="A dynamic family", identifiers=Calculation(func['calc_value'], Params((ParamOption(option_3)))), children=[option_5, optiondescription_6], properties=frozenset({"standard"}), informations={'dynamic_variable': '1.rougail.var'}) optiondescription_2 = OptionDescription(name="rougail", doc="Rougail", group_type=groups.namespace, children=[option_3, optiondescription_4], properties=frozenset({"standard"})) optiondescription_1 = OptionDescription(name="1", doc="1", children=[optiondescription_2], properties=frozenset({"standard"})) option_12 = StrOption(name="var", doc="A identifier variable", multi=True, default=["val1", "val2"], default_multi="val1", properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) -option_14 = StrOption(name="var", doc="A dynamic variable", multi=True, default=Calculation(func['jinja_to_function'], Params((), kwargs={'__internal_jinja': ParamValue("default_2.rougail.dyn{{ identifier }}.var"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(True), '__internal_files': ParamValue(['tests/dictionaries/60_6family_dynamic_sub_dynamic/dictionaries/rougail/00-base.yml']), '__internal_attribute': ParamValue("default"), '__internal_variable': ParamValue("2.rougail.dyn{{ identifier }}.var"), '__.var': ParamOption(option_12, notraisepropertyerror=True)})), properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) +option_14 = StrOption(name="var", doc="A dynamic variable", multi=True, default=Calculation(func['jinja_to_function'], Params((), kwargs={'__internal_jinja': ParamValue("default_2.rougail.dyn{{ identifier }}.var"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(True), '__internal_files': ParamValue(['../rougail-tests/structures/60_6family_dynamic_sub_dynamic/rougail/00-base.yml']), '__internal_attribute': ParamValue("default"), '__internal_variable': ParamValue("2.rougail.dyn{{ identifier }}.var"), '__.var': ParamOption(option_12, notraisepropertyerror=True)})), properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) option_16 = StrOption(name="var", doc="A variable dynamic", default=Calculation(func['calc_value'], Params((ParamIdentifier()))), properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) option_17 = StrOption(name="var_identifier", doc="identifier from first family", default=Calculation(func['calc_value'], Params((ParamIdentifier(identifier_index=0)))), properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) -option_18 = StrOption(name="var_identifiers", doc="merge identifiers", default=Calculation(func['jinja_to_function'], Params((), kwargs={'__internal_jinja': ParamValue("default_2.rougail.dyn{{ identifier }}.dyn_{{ identifier }}.var_identifiers"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['tests/dictionaries/60_6family_dynamic_sub_dynamic/dictionaries/rougail/00-base.yml']), '__internal_attribute': ParamValue("default"), '__internal_variable': ParamValue("2.rougail.dyn{{ identifier }}.dyn_{{ identifier }}.var_identifiers"), 's1': ParamIdentifier(identifier_index=0), 's2': ParamIdentifier(identifier_index=1)})), properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) -optiondescription_15 = ConvertDynOptionDescription(name="dyn_{{ identifier }}", doc="a Second dynamic variable", identifiers=Calculation(func['calc_value'], Params((ParamOption(option_14)))), children=[option_16, option_17, option_18], properties=frozenset({"standard"}), informations={'dynamic_variable': '2.dyn{{ identifier }}.var'}) +option_18 = StrOption(name="var_identifiers", doc="merge identifiers", default=Calculation(func['jinja_to_function'], Params((), kwargs={'__internal_jinja': ParamValue("default_2.rougail.dyn{{ identifier }}.dyn_{{ identifier }}.var_identifiers"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['../rougail-tests/structures/60_6family_dynamic_sub_dynamic/rougail/00-base.yml']), '__internal_attribute': ParamValue("default"), '__internal_variable': ParamValue("2.rougail.dyn{{ identifier }}.dyn_{{ identifier }}.var_identifiers"), 's1': ParamIdentifier(identifier_index=0), 's2': ParamIdentifier(identifier_index=1)})), properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) +optiondescription_15 = ConvertDynOptionDescription(name="dyn_{{ identifier }}", doc="a Second dynamic variable", identifiers=Calculation(func['calc_value'], Params((ParamOption(option_14)))), children=[option_16, option_17, option_18], properties=frozenset({"standard"}), informations={'dynamic_variable': 'rougail.dyn{{ identifier }}.var'}) optiondescription_13 = ConvertDynOptionDescription(name="dyn{{ identifier }}", doc="A dynamic family", identifiers=Calculation(func['calc_value'], Params((ParamOption(option_12)))), children=[option_14, optiondescription_15], properties=frozenset({"standard"}), informations={'dynamic_variable': '2.rougail.var'}) optiondescription_11 = OptionDescription(name="rougail", doc="Rougail", group_type=groups.namespace, children=[option_12, optiondescription_13], properties=frozenset({"standard"})) optiondescription_10 = OptionDescription(name="2", doc="2", children=[optiondescription_11], properties=frozenset({"standard"})) diff --git a/tests/dictionaries/60_6family_dynamic_sub_dynamic_1_0/dictionaries/rougail/00-base.yml b/tests/dictionaries/60_6family_dynamic_sub_dynamic_1_0/dictionaries/rougail/00-base.yml deleted file mode 100644 index a27b2871c..000000000 --- a/tests/dictionaries/60_6family_dynamic_sub_dynamic_1_0/dictionaries/rougail/00-base.yml +++ /dev/null @@ -1,54 +0,0 @@ ---- -version: '1.0' - -var: - description: A identifier variable - multi: true - default: - - val1 - - val2 - -"dyn{{ suffix }}": - description: A dynamic family - type: dynamic - variable: rougail.var - - var: - description: A dynamic variable - multi: true - default: - jinja: | - {% for val in rougail.var %} - t{{ val }} - {% endfor %} - description: add 't' to each var value - - "dyn_{{ suffix }}": - description: a Second dynamic variable - type: dynamic - variable: "rougail.dyn{{ suffix }}.var" - - var: - description: A variable dynamic - default: - type: identifier - - var_identifier: - description: identifier from first family - default: - type: identifier - identifier: 0 - - var_identifiers: - description: merge identifiers - default: - jinja: | - {{ s1 }}-{{ s2 }} - params: - s1: - type: identifier - identifier: 0 - s2: - type: identifier - identifier: 1 - description: join identifier 1 et identifier 2 diff --git a/tests/dictionaries/60_6family_dynamic_sub_dynamic_1_0/force_namespace b/tests/dictionaries/60_6family_dynamic_sub_dynamic_1_0/force_namespace deleted file mode 100644 index e69de29bb..000000000 diff --git a/tests/dictionaries/60_6family_dynamic_sub_dynamic_1_0/tiramisu/base.py b/tests/dictionaries/60_6family_dynamic_sub_dynamic_1_0/tiramisu/base.py index e2e0ca4e0..6da43de84 100644 --- a/tests/dictionaries/60_6family_dynamic_sub_dynamic_1_0/tiramisu/base.py +++ b/tests/dictionaries/60_6family_dynamic_sub_dynamic_1_0/tiramisu/base.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') try: groups.namespace except: @@ -13,10 +13,10 @@ ALLOWED_LEADER_PROPERTIES.add("advanced") dict_env['default_rougail.dyn{{ identifier }}.var'] = "{% for val in rougail.var %}\nt{{ val }}\n{% endfor %}\n" dict_env['default_rougail.dyn{{ identifier }}.dyn_{{ identifier }}.var_identifiers'] = "{{ s1 }}-{{ s2 }}\n" option_2 = StrOption(name="var", doc="A identifier variable", multi=True, default=["val1", "val2"], default_multi="val1", properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) -option_4 = StrOption(name="var", doc="A dynamic variable", multi=True, default=Calculation(func['jinja_to_function'], Params((), kwargs={'__internal_jinja': ParamValue("default_rougail.dyn{{ identifier }}.var"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(True), '__internal_files': ParamValue(['tests/dictionaries/60_6family_dynamic_sub_dynamic_1_0/dictionaries/rougail/00-base.yml']), '__internal_attribute': ParamValue("default"), '__internal_variable': ParamValue("rougail.dyn{{ identifier }}.var"), 'rougail.var': ParamOption(option_2)})), properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) +option_4 = StrOption(name="var", doc="A dynamic variable", multi=True, default=Calculation(func['jinja_to_function'], Params((), kwargs={'__internal_jinja': ParamValue("default_rougail.dyn{{ identifier }}.var"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(True), '__internal_files': ParamValue(['../rougail-tests/structures/60_6family_dynamic_sub_dynamic_1_0/rougail/00-base.yml']), '__internal_attribute': ParamValue("default"), '__internal_variable': ParamValue("rougail.dyn{{ identifier }}.var"), 'rougail.var': ParamOption(option_2)})), properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) option_6 = StrOption(name="var", doc="A variable dynamic", default=Calculation(func['calc_value'], Params((ParamIdentifier()))), properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) option_7 = StrOption(name="var_identifier", doc="identifier from first family", default=Calculation(func['calc_value'], Params((ParamIdentifier(identifier_index=0)))), properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) -option_8 = StrOption(name="var_identifiers", doc="merge identifiers", default=Calculation(func['jinja_to_function'], Params((), kwargs={'__internal_jinja': ParamValue("default_rougail.dyn{{ identifier }}.dyn_{{ identifier }}.var_identifiers"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['tests/dictionaries/60_6family_dynamic_sub_dynamic_1_0/dictionaries/rougail/00-base.yml']), '__internal_attribute': ParamValue("default"), '__internal_variable': ParamValue("rougail.dyn{{ identifier }}.dyn_{{ identifier }}.var_identifiers"), 's1': ParamIdentifier(identifier_index=0), 's2': ParamIdentifier(identifier_index=1)})), properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) +option_8 = StrOption(name="var_identifiers", doc="merge identifiers", default=Calculation(func['jinja_to_function'], Params((), kwargs={'__internal_jinja': ParamValue("default_rougail.dyn{{ identifier }}.dyn_{{ identifier }}.var_identifiers"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['../rougail-tests/structures/60_6family_dynamic_sub_dynamic_1_0/rougail/00-base.yml']), '__internal_attribute': ParamValue("default"), '__internal_variable': ParamValue("rougail.dyn{{ identifier }}.dyn_{{ identifier }}.var_identifiers"), 's1': ParamIdentifier(identifier_index=0), 's2': ParamIdentifier(identifier_index=1)})), properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) optiondescription_5 = ConvertDynOptionDescription(name="dyn_{{ identifier }}", doc="a Second dynamic variable", identifiers=Calculation(func['calc_value'], Params((ParamOption(option_4, notraisepropertyerror=True)), kwargs={'allow_none': ParamValue(True)})), children=[option_6, option_7, option_8], properties=frozenset({"standard"}), informations={'dynamic_variable': 'rougail.dyn{{ identifier }}.var'}) optiondescription_3 = ConvertDynOptionDescription(name="dyn{{ identifier }}", doc="A dynamic family", identifiers=Calculation(func['calc_value'], Params((ParamOption(option_2, notraisepropertyerror=True)), kwargs={'allow_none': ParamValue(True)})), children=[option_4, optiondescription_5], properties=frozenset({"standard"}), informations={'dynamic_variable': 'rougail.var'}) optiondescription_1 = OptionDescription(name="rougail", doc="Rougail", group_type=groups.namespace, children=[option_2, optiondescription_3], properties=frozenset({"standard"})) diff --git a/tests/dictionaries/60_6family_dynamic_sub_dynamic_1_0/tiramisu/multi.py b/tests/dictionaries/60_6family_dynamic_sub_dynamic_1_0/tiramisu/multi.py index c9ae25872..5e83b5d39 100644 --- a/tests/dictionaries/60_6family_dynamic_sub_dynamic_1_0/tiramisu/multi.py +++ b/tests/dictionaries/60_6family_dynamic_sub_dynamic_1_0/tiramisu/multi.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') try: groups.namespace except: @@ -15,21 +15,21 @@ dict_env['default_1.rougail.dyn{{ identifier }}.dyn_{{ identifier }}.var_identif dict_env['default_2.rougail.dyn{{ identifier }}.var'] = "{% for val in rougail.var %}\nt{{ val }}\n{% endfor %}\n" dict_env['default_2.rougail.dyn{{ identifier }}.dyn_{{ identifier }}.var_identifiers'] = "{{ s1 }}-{{ s2 }}\n" option_3 = StrOption(name="var", doc="A identifier variable", multi=True, default=["val1", "val2"], default_multi="val1", properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) -option_5 = StrOption(name="var", doc="A dynamic variable", multi=True, default=Calculation(func['jinja_to_function'], Params((), kwargs={'__internal_jinja': ParamValue("default_1.rougail.dyn{{ identifier }}.var"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(True), '__internal_files': ParamValue(['tests/dictionaries/60_6family_dynamic_sub_dynamic_1_0/dictionaries/rougail/00-base.yml']), '__internal_attribute': ParamValue("default"), '__internal_variable': ParamValue("1.rougail.dyn{{ identifier }}.var"), 'rougail.var': ParamOption(option_3)})), properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) +option_5 = StrOption(name="var", doc="A dynamic variable", multi=True, default=Calculation(func['jinja_to_function'], Params((), kwargs={'__internal_jinja': ParamValue("default_1.rougail.dyn{{ identifier }}.var"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(True), '__internal_files': ParamValue(['../rougail-tests/structures/60_6family_dynamic_sub_dynamic_1_0/rougail/00-base.yml']), '__internal_attribute': ParamValue("default"), '__internal_variable': ParamValue("1.rougail.dyn{{ identifier }}.var"), 'rougail.var': ParamOption(option_3)})), properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) option_7 = StrOption(name="var", doc="A variable dynamic", default=Calculation(func['calc_value'], Params((ParamIdentifier()))), properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) option_8 = StrOption(name="var_identifier", doc="identifier from first family", default=Calculation(func['calc_value'], Params((ParamIdentifier(identifier_index=0)))), properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) -option_9 = StrOption(name="var_identifiers", doc="merge identifiers", default=Calculation(func['jinja_to_function'], Params((), kwargs={'__internal_jinja': ParamValue("default_1.rougail.dyn{{ identifier }}.dyn_{{ identifier }}.var_identifiers"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['tests/dictionaries/60_6family_dynamic_sub_dynamic_1_0/dictionaries/rougail/00-base.yml']), '__internal_attribute': ParamValue("default"), '__internal_variable': ParamValue("1.rougail.dyn{{ identifier }}.dyn_{{ identifier }}.var_identifiers"), 's1': ParamIdentifier(identifier_index=0), 's2': ParamIdentifier(identifier_index=1)})), properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) -optiondescription_6 = ConvertDynOptionDescription(name="dyn_{{ identifier }}", doc="a Second dynamic variable", identifiers=Calculation(func['calc_value'], Params((ParamOption(option_5, notraisepropertyerror=True)), kwargs={'allow_none': ParamValue(True)})), children=[option_7, option_8, option_9], properties=frozenset({"standard"}), informations={'dynamic_variable': '1.dyn{{ identifier }}.var'}) -optiondescription_4 = ConvertDynOptionDescription(name="dyn{{ identifier }}", doc="A dynamic family", identifiers=Calculation(func['calc_value'], Params((ParamOption(option_3, notraisepropertyerror=True)), kwargs={'allow_none': ParamValue(True)})), children=[option_5, optiondescription_6], properties=frozenset({"standard"}), informations={'dynamic_variable': '1.var'}) +option_9 = StrOption(name="var_identifiers", doc="merge identifiers", default=Calculation(func['jinja_to_function'], Params((), kwargs={'__internal_jinja': ParamValue("default_1.rougail.dyn{{ identifier }}.dyn_{{ identifier }}.var_identifiers"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['../rougail-tests/structures/60_6family_dynamic_sub_dynamic_1_0/rougail/00-base.yml']), '__internal_attribute': ParamValue("default"), '__internal_variable': ParamValue("1.rougail.dyn{{ identifier }}.dyn_{{ identifier }}.var_identifiers"), 's1': ParamIdentifier(identifier_index=0), 's2': ParamIdentifier(identifier_index=1)})), properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) +optiondescription_6 = ConvertDynOptionDescription(name="dyn_{{ identifier }}", doc="a Second dynamic variable", identifiers=Calculation(func['calc_value'], Params((ParamOption(option_5, notraisepropertyerror=True)), kwargs={'allow_none': ParamValue(True)})), children=[option_7, option_8, option_9], properties=frozenset({"standard"}), informations={'dynamic_variable': 'rougail.dyn{{ identifier }}.var'}) +optiondescription_4 = ConvertDynOptionDescription(name="dyn{{ identifier }}", doc="A dynamic family", identifiers=Calculation(func['calc_value'], Params((ParamOption(option_3, notraisepropertyerror=True)), kwargs={'allow_none': ParamValue(True)})), children=[option_5, optiondescription_6], properties=frozenset({"standard"}), informations={'dynamic_variable': 'rougail.var'}) optiondescription_2 = OptionDescription(name="rougail", doc="Rougail", group_type=groups.namespace, children=[option_3, optiondescription_4], properties=frozenset({"standard"})) optiondescription_1 = OptionDescription(name="1", doc="1", children=[optiondescription_2], properties=frozenset({"standard"})) option_12 = StrOption(name="var", doc="A identifier variable", multi=True, default=["val1", "val2"], default_multi="val1", properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) -option_14 = StrOption(name="var", doc="A dynamic variable", multi=True, default=Calculation(func['jinja_to_function'], Params((), kwargs={'__internal_jinja': ParamValue("default_2.rougail.dyn{{ identifier }}.var"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(True), '__internal_files': ParamValue(['tests/dictionaries/60_6family_dynamic_sub_dynamic_1_0/dictionaries/rougail/00-base.yml']), '__internal_attribute': ParamValue("default"), '__internal_variable': ParamValue("2.rougail.dyn{{ identifier }}.var"), 'rougail.var': ParamOption(option_12)})), properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) +option_14 = StrOption(name="var", doc="A dynamic variable", multi=True, default=Calculation(func['jinja_to_function'], Params((), kwargs={'__internal_jinja': ParamValue("default_2.rougail.dyn{{ identifier }}.var"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(True), '__internal_files': ParamValue(['../rougail-tests/structures/60_6family_dynamic_sub_dynamic_1_0/rougail/00-base.yml']), '__internal_attribute': ParamValue("default"), '__internal_variable': ParamValue("2.rougail.dyn{{ identifier }}.var"), 'rougail.var': ParamOption(option_12)})), properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) option_16 = StrOption(name="var", doc="A variable dynamic", default=Calculation(func['calc_value'], Params((ParamIdentifier()))), properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) option_17 = StrOption(name="var_identifier", doc="identifier from first family", default=Calculation(func['calc_value'], Params((ParamIdentifier(identifier_index=0)))), properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) -option_18 = StrOption(name="var_identifiers", doc="merge identifiers", default=Calculation(func['jinja_to_function'], Params((), kwargs={'__internal_jinja': ParamValue("default_2.rougail.dyn{{ identifier }}.dyn_{{ identifier }}.var_identifiers"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['tests/dictionaries/60_6family_dynamic_sub_dynamic_1_0/dictionaries/rougail/00-base.yml']), '__internal_attribute': ParamValue("default"), '__internal_variable': ParamValue("2.rougail.dyn{{ identifier }}.dyn_{{ identifier }}.var_identifiers"), 's1': ParamIdentifier(identifier_index=0), 's2': ParamIdentifier(identifier_index=1)})), properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) -optiondescription_15 = ConvertDynOptionDescription(name="dyn_{{ identifier }}", doc="a Second dynamic variable", identifiers=Calculation(func['calc_value'], Params((ParamOption(option_14, notraisepropertyerror=True)), kwargs={'allow_none': ParamValue(True)})), children=[option_16, option_17, option_18], properties=frozenset({"standard"}), informations={'dynamic_variable': '2.dyn{{ identifier }}.var'}) -optiondescription_13 = ConvertDynOptionDescription(name="dyn{{ identifier }}", doc="A dynamic family", identifiers=Calculation(func['calc_value'], Params((ParamOption(option_12, notraisepropertyerror=True)), kwargs={'allow_none': ParamValue(True)})), children=[option_14, optiondescription_15], properties=frozenset({"standard"}), informations={'dynamic_variable': '2.var'}) +option_18 = StrOption(name="var_identifiers", doc="merge identifiers", default=Calculation(func['jinja_to_function'], Params((), kwargs={'__internal_jinja': ParamValue("default_2.rougail.dyn{{ identifier }}.dyn_{{ identifier }}.var_identifiers"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['../rougail-tests/structures/60_6family_dynamic_sub_dynamic_1_0/rougail/00-base.yml']), '__internal_attribute': ParamValue("default"), '__internal_variable': ParamValue("2.rougail.dyn{{ identifier }}.dyn_{{ identifier }}.var_identifiers"), 's1': ParamIdentifier(identifier_index=0), 's2': ParamIdentifier(identifier_index=1)})), properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) +optiondescription_15 = ConvertDynOptionDescription(name="dyn_{{ identifier }}", doc="a Second dynamic variable", identifiers=Calculation(func['calc_value'], Params((ParamOption(option_14, notraisepropertyerror=True)), kwargs={'allow_none': ParamValue(True)})), children=[option_16, option_17, option_18], properties=frozenset({"standard"}), informations={'dynamic_variable': 'rougail.dyn{{ identifier }}.var'}) +optiondescription_13 = ConvertDynOptionDescription(name="dyn{{ identifier }}", doc="A dynamic family", identifiers=Calculation(func['calc_value'], Params((ParamOption(option_12, notraisepropertyerror=True)), kwargs={'allow_none': ParamValue(True)})), children=[option_14, optiondescription_15], properties=frozenset({"standard"}), informations={'dynamic_variable': 'rougail.var'}) optiondescription_11 = OptionDescription(name="rougail", doc="Rougail", group_type=groups.namespace, children=[option_12, optiondescription_13], properties=frozenset({"standard"})) optiondescription_10 = OptionDescription(name="2", doc="2", children=[optiondescription_11], properties=frozenset({"standard"})) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_1, optiondescription_10]) diff --git a/tests/dictionaries/60_6family_dynamic_sub_dynamic_empty/dictionaries/rougail/00-base.yml b/tests/dictionaries/60_6family_dynamic_sub_dynamic_empty/dictionaries/rougail/00-base.yml deleted file mode 100644 index 3e7fa31f1..000000000 --- a/tests/dictionaries/60_6family_dynamic_sub_dynamic_empty/dictionaries/rougail/00-base.yml +++ /dev/null @@ -1,55 +0,0 @@ ---- -version: '1.1' - -var: - description: A identifier variable - multi: true - mandatory: false - test: - - val1 - - val2 - -"dyn{{ identifier }}": - description: A dynamic family - dynamic: - variable: _.var - - var: - description: A dynamic variable - multi: true - default: - jinja: | - {% for val in __.var %} - t{{ val }} - {% endfor %} - description: add 't' to each var value - - "dyn_{{ identifier }}": - description: a Second dynamic variable - dynamic: - variable: "rougail.dyn{{ identifier }}.var" - - var: - description: A variable dynamic - default: - type: identifier - - var_identifier: - description: identifier from first family - default: - type: identifier - identifier: 0 - - var_identifiers: - description: merge identifiers - default: - jinja: | - {{ s1 }}-{{ s2 }} - params: - s1: - type: identifier - identifier: 0 - s2: - type: identifier - identifier: 1 - description: join identifier 1 et identifier 2 diff --git a/tests/dictionaries/60_6family_dynamic_sub_dynamic_empty/force_namespace b/tests/dictionaries/60_6family_dynamic_sub_dynamic_empty/force_namespace deleted file mode 100644 index e69de29bb..000000000 diff --git a/tests/dictionaries/60_6family_dynamic_sub_dynamic_empty/tiramisu/base.py b/tests/dictionaries/60_6family_dynamic_sub_dynamic_empty/tiramisu/base.py index d5179f8b0..46c7e2a59 100644 --- a/tests/dictionaries/60_6family_dynamic_sub_dynamic_empty/tiramisu/base.py +++ b/tests/dictionaries/60_6family_dynamic_sub_dynamic_empty/tiramisu/base.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') try: groups.namespace except: @@ -13,10 +13,10 @@ ALLOWED_LEADER_PROPERTIES.add("advanced") dict_env['default_rougail.dyn{{ identifier }}.var'] = "{% for val in __.var %}\nt{{ val }}\n{% endfor %}\n" dict_env['default_rougail.dyn{{ identifier }}.dyn_{{ identifier }}.var_identifiers'] = "{{ s1 }}-{{ s2 }}\n" option_2 = StrOption(name="var", doc="A identifier variable", multi=True, properties=frozenset({"standard"}), informations={'type': 'string', 'test': ('val1', 'val2')}) -option_4 = StrOption(name="var", doc="A dynamic variable", multi=True, default=Calculation(func['jinja_to_function'], Params((), kwargs={'__internal_jinja': ParamValue("default_rougail.dyn{{ identifier }}.var"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(True), '__internal_files': ParamValue(['tests/dictionaries/60_6family_dynamic_sub_dynamic_empty/dictionaries/rougail/00-base.yml']), '__internal_attribute': ParamValue("default"), '__internal_variable': ParamValue("rougail.dyn{{ identifier }}.var"), '__.var': ParamOption(option_2, notraisepropertyerror=True)})), properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) +option_4 = StrOption(name="var", doc="A dynamic variable", multi=True, default=Calculation(func['jinja_to_function'], Params((), kwargs={'__internal_jinja': ParamValue("default_rougail.dyn{{ identifier }}.var"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(True), '__internal_files': ParamValue(['../rougail-tests/structures/60_6family_dynamic_sub_dynamic_empty/rougail/00-base.yml']), '__internal_attribute': ParamValue("default"), '__internal_variable': ParamValue("rougail.dyn{{ identifier }}.var"), '__.var': ParamOption(option_2, notraisepropertyerror=True)})), properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) option_6 = StrOption(name="var", doc="A variable dynamic", default=Calculation(func['calc_value'], Params((ParamIdentifier()))), properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) option_7 = StrOption(name="var_identifier", doc="identifier from first family", default=Calculation(func['calc_value'], Params((ParamIdentifier(identifier_index=0)))), properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) -option_8 = StrOption(name="var_identifiers", doc="merge identifiers", default=Calculation(func['jinja_to_function'], Params((), kwargs={'__internal_jinja': ParamValue("default_rougail.dyn{{ identifier }}.dyn_{{ identifier }}.var_identifiers"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['tests/dictionaries/60_6family_dynamic_sub_dynamic_empty/dictionaries/rougail/00-base.yml']), '__internal_attribute': ParamValue("default"), '__internal_variable': ParamValue("rougail.dyn{{ identifier }}.dyn_{{ identifier }}.var_identifiers"), 's1': ParamIdentifier(identifier_index=0), 's2': ParamIdentifier(identifier_index=1)})), properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) +option_8 = StrOption(name="var_identifiers", doc="merge identifiers", default=Calculation(func['jinja_to_function'], Params((), kwargs={'__internal_jinja': ParamValue("default_rougail.dyn{{ identifier }}.dyn_{{ identifier }}.var_identifiers"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['../rougail-tests/structures/60_6family_dynamic_sub_dynamic_empty/rougail/00-base.yml']), '__internal_attribute': ParamValue("default"), '__internal_variable': ParamValue("rougail.dyn{{ identifier }}.dyn_{{ identifier }}.var_identifiers"), 's1': ParamIdentifier(identifier_index=0), 's2': ParamIdentifier(identifier_index=1)})), properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) optiondescription_5 = ConvertDynOptionDescription(name="dyn_{{ identifier }}", doc="a Second dynamic variable", identifiers=Calculation(func['calc_value'], Params((ParamOption(option_4)))), children=[option_6, option_7, option_8], properties=frozenset({"standard"}), informations={'dynamic_variable': 'rougail.dyn{{ identifier }}.var'}) optiondescription_3 = ConvertDynOptionDescription(name="dyn{{ identifier }}", doc="A dynamic family", identifiers=Calculation(func['calc_value'], Params((ParamOption(option_2)))), children=[option_4, optiondescription_5], properties=frozenset({"standard"}), informations={'dynamic_variable': 'rougail.var'}) optiondescription_1 = OptionDescription(name="rougail", doc="Rougail", group_type=groups.namespace, children=[option_2, optiondescription_3], properties=frozenset({"standard"})) diff --git a/tests/dictionaries/60_6family_dynamic_sub_dynamic_empty/tiramisu/multi.py b/tests/dictionaries/60_6family_dynamic_sub_dynamic_empty/tiramisu/multi.py index 8683847b5..dc7d0f921 100644 --- a/tests/dictionaries/60_6family_dynamic_sub_dynamic_empty/tiramisu/multi.py +++ b/tests/dictionaries/60_6family_dynamic_sub_dynamic_empty/tiramisu/multi.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') try: groups.namespace except: @@ -15,20 +15,20 @@ dict_env['default_1.rougail.dyn{{ identifier }}.dyn_{{ identifier }}.var_identif dict_env['default_2.rougail.dyn{{ identifier }}.var'] = "{% for val in __.var %}\nt{{ val }}\n{% endfor %}\n" dict_env['default_2.rougail.dyn{{ identifier }}.dyn_{{ identifier }}.var_identifiers'] = "{{ s1 }}-{{ s2 }}\n" option_3 = StrOption(name="var", doc="A identifier variable", multi=True, properties=frozenset({"standard"}), informations={'type': 'string', 'test': ('val1', 'val2')}) -option_5 = StrOption(name="var", doc="A dynamic variable", multi=True, default=Calculation(func['jinja_to_function'], Params((), kwargs={'__internal_jinja': ParamValue("default_1.rougail.dyn{{ identifier }}.var"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(True), '__internal_files': ParamValue(['tests/dictionaries/60_6family_dynamic_sub_dynamic_empty/dictionaries/rougail/00-base.yml']), '__internal_attribute': ParamValue("default"), '__internal_variable': ParamValue("1.rougail.dyn{{ identifier }}.var"), '__.var': ParamOption(option_3, notraisepropertyerror=True)})), properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) +option_5 = StrOption(name="var", doc="A dynamic variable", multi=True, default=Calculation(func['jinja_to_function'], Params((), kwargs={'__internal_jinja': ParamValue("default_1.rougail.dyn{{ identifier }}.var"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(True), '__internal_files': ParamValue(['../rougail-tests/structures/60_6family_dynamic_sub_dynamic_empty/rougail/00-base.yml']), '__internal_attribute': ParamValue("default"), '__internal_variable': ParamValue("1.rougail.dyn{{ identifier }}.var"), '__.var': ParamOption(option_3, notraisepropertyerror=True)})), properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) option_7 = StrOption(name="var", doc="A variable dynamic", default=Calculation(func['calc_value'], Params((ParamIdentifier()))), properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) option_8 = StrOption(name="var_identifier", doc="identifier from first family", default=Calculation(func['calc_value'], Params((ParamIdentifier(identifier_index=0)))), properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) -option_9 = StrOption(name="var_identifiers", doc="merge identifiers", default=Calculation(func['jinja_to_function'], Params((), kwargs={'__internal_jinja': ParamValue("default_1.rougail.dyn{{ identifier }}.dyn_{{ identifier }}.var_identifiers"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['tests/dictionaries/60_6family_dynamic_sub_dynamic_empty/dictionaries/rougail/00-base.yml']), '__internal_attribute': ParamValue("default"), '__internal_variable': ParamValue("1.rougail.dyn{{ identifier }}.dyn_{{ identifier }}.var_identifiers"), 's1': ParamIdentifier(identifier_index=0), 's2': ParamIdentifier(identifier_index=1)})), properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) -optiondescription_6 = ConvertDynOptionDescription(name="dyn_{{ identifier }}", doc="a Second dynamic variable", identifiers=Calculation(func['calc_value'], Params((ParamOption(option_5)))), children=[option_7, option_8, option_9], properties=frozenset({"standard"}), informations={'dynamic_variable': '1.dyn{{ identifier }}.var'}) +option_9 = StrOption(name="var_identifiers", doc="merge identifiers", default=Calculation(func['jinja_to_function'], Params((), kwargs={'__internal_jinja': ParamValue("default_1.rougail.dyn{{ identifier }}.dyn_{{ identifier }}.var_identifiers"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['../rougail-tests/structures/60_6family_dynamic_sub_dynamic_empty/rougail/00-base.yml']), '__internal_attribute': ParamValue("default"), '__internal_variable': ParamValue("1.rougail.dyn{{ identifier }}.dyn_{{ identifier }}.var_identifiers"), 's1': ParamIdentifier(identifier_index=0), 's2': ParamIdentifier(identifier_index=1)})), properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) +optiondescription_6 = ConvertDynOptionDescription(name="dyn_{{ identifier }}", doc="a Second dynamic variable", identifiers=Calculation(func['calc_value'], Params((ParamOption(option_5)))), children=[option_7, option_8, option_9], properties=frozenset({"standard"}), informations={'dynamic_variable': 'rougail.dyn{{ identifier }}.var'}) optiondescription_4 = ConvertDynOptionDescription(name="dyn{{ identifier }}", doc="A dynamic family", identifiers=Calculation(func['calc_value'], Params((ParamOption(option_3)))), children=[option_5, optiondescription_6], properties=frozenset({"standard"}), informations={'dynamic_variable': '1.rougail.var'}) optiondescription_2 = OptionDescription(name="rougail", doc="Rougail", group_type=groups.namespace, children=[option_3, optiondescription_4], properties=frozenset({"standard"})) optiondescription_1 = OptionDescription(name="1", doc="1", children=[optiondescription_2], properties=frozenset({"standard"})) option_12 = StrOption(name="var", doc="A identifier variable", multi=True, properties=frozenset({"standard"}), informations={'type': 'string', 'test': ('val1', 'val2')}) -option_14 = StrOption(name="var", doc="A dynamic variable", multi=True, default=Calculation(func['jinja_to_function'], Params((), kwargs={'__internal_jinja': ParamValue("default_2.rougail.dyn{{ identifier }}.var"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(True), '__internal_files': ParamValue(['tests/dictionaries/60_6family_dynamic_sub_dynamic_empty/dictionaries/rougail/00-base.yml']), '__internal_attribute': ParamValue("default"), '__internal_variable': ParamValue("2.rougail.dyn{{ identifier }}.var"), '__.var': ParamOption(option_12, notraisepropertyerror=True)})), properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) +option_14 = StrOption(name="var", doc="A dynamic variable", multi=True, default=Calculation(func['jinja_to_function'], Params((), kwargs={'__internal_jinja': ParamValue("default_2.rougail.dyn{{ identifier }}.var"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(True), '__internal_files': ParamValue(['../rougail-tests/structures/60_6family_dynamic_sub_dynamic_empty/rougail/00-base.yml']), '__internal_attribute': ParamValue("default"), '__internal_variable': ParamValue("2.rougail.dyn{{ identifier }}.var"), '__.var': ParamOption(option_12, notraisepropertyerror=True)})), properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) option_16 = StrOption(name="var", doc="A variable dynamic", default=Calculation(func['calc_value'], Params((ParamIdentifier()))), properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) option_17 = StrOption(name="var_identifier", doc="identifier from first family", default=Calculation(func['calc_value'], Params((ParamIdentifier(identifier_index=0)))), properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) -option_18 = StrOption(name="var_identifiers", doc="merge identifiers", default=Calculation(func['jinja_to_function'], Params((), kwargs={'__internal_jinja': ParamValue("default_2.rougail.dyn{{ identifier }}.dyn_{{ identifier }}.var_identifiers"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['tests/dictionaries/60_6family_dynamic_sub_dynamic_empty/dictionaries/rougail/00-base.yml']), '__internal_attribute': ParamValue("default"), '__internal_variable': ParamValue("2.rougail.dyn{{ identifier }}.dyn_{{ identifier }}.var_identifiers"), 's1': ParamIdentifier(identifier_index=0), 's2': ParamIdentifier(identifier_index=1)})), properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) -optiondescription_15 = ConvertDynOptionDescription(name="dyn_{{ identifier }}", doc="a Second dynamic variable", identifiers=Calculation(func['calc_value'], Params((ParamOption(option_14)))), children=[option_16, option_17, option_18], properties=frozenset({"standard"}), informations={'dynamic_variable': '2.dyn{{ identifier }}.var'}) +option_18 = StrOption(name="var_identifiers", doc="merge identifiers", default=Calculation(func['jinja_to_function'], Params((), kwargs={'__internal_jinja': ParamValue("default_2.rougail.dyn{{ identifier }}.dyn_{{ identifier }}.var_identifiers"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__internal_files': ParamValue(['../rougail-tests/structures/60_6family_dynamic_sub_dynamic_empty/rougail/00-base.yml']), '__internal_attribute': ParamValue("default"), '__internal_variable': ParamValue("2.rougail.dyn{{ identifier }}.dyn_{{ identifier }}.var_identifiers"), 's1': ParamIdentifier(identifier_index=0), 's2': ParamIdentifier(identifier_index=1)})), properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) +optiondescription_15 = ConvertDynOptionDescription(name="dyn_{{ identifier }}", doc="a Second dynamic variable", identifiers=Calculation(func['calc_value'], Params((ParamOption(option_14)))), children=[option_16, option_17, option_18], properties=frozenset({"standard"}), informations={'dynamic_variable': 'rougail.dyn{{ identifier }}.var'}) optiondescription_13 = ConvertDynOptionDescription(name="dyn{{ identifier }}", doc="A dynamic family", identifiers=Calculation(func['calc_value'], Params((ParamOption(option_12)))), children=[option_14, optiondescription_15], properties=frozenset({"standard"}), informations={'dynamic_variable': '2.rougail.var'}) optiondescription_11 = OptionDescription(name="rougail", doc="Rougail", group_type=groups.namespace, children=[option_12, optiondescription_13], properties=frozenset({"standard"})) optiondescription_10 = OptionDescription(name="2", doc="2", children=[optiondescription_11], properties=frozenset({"standard"})) diff --git a/tests/dictionaries/60_9extra_dynamic/dictionaries/extra/00-base.yml b/tests/dictionaries/60_9extra_dynamic/dictionaries/extra/00-base.yml deleted file mode 100644 index 87fe0c39a..000000000 --- a/tests/dictionaries/60_9extra_dynamic/dictionaries/extra/00-base.yml +++ /dev/null @@ -1,6 +0,0 @@ ---- -version: 1.1 -dyn_{{ identifier }}: - dynamic: - variable: rougail.var - var: diff --git a/tests/dictionaries/60_9extra_dynamic/dictionaries/rougail/00-base.yml b/tests/dictionaries/60_9extra_dynamic/dictionaries/rougail/00-base.yml deleted file mode 100644 index af1ce8860..000000000 --- a/tests/dictionaries/60_9extra_dynamic/dictionaries/rougail/00-base.yml +++ /dev/null @@ -1,4 +0,0 @@ ---- -version: 1.1 -var: # a variable - - a diff --git a/tests/dictionaries/60_9extra_dynamic/force_namespace b/tests/dictionaries/60_9extra_dynamic/force_namespace deleted file mode 100644 index e69de29bb..000000000 diff --git a/tests/dictionaries/60_9extra_dynamic/tiramisu/base.py b/tests/dictionaries/60_9extra_dynamic/tiramisu/base.py index 12e93d984..594e91cad 100644 --- a/tests/dictionaries/60_9extra_dynamic/tiramisu/base.py +++ b/tests/dictionaries/60_9extra_dynamic/tiramisu/base.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') try: groups.namespace except: @@ -13,6 +13,6 @@ ALLOWED_LEADER_PROPERTIES.add("advanced") option_2 = StrOption(name="var", doc="a variable", multi=True, default=["a"], default_multi="a", properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) optiondescription_1 = OptionDescription(name="rougail", doc="Rougail", group_type=groups.namespace, children=[option_2], properties=frozenset({"standard"})) option_5 = StrOption(name="var", doc="var", properties=frozenset({"basic", "mandatory"}), informations={'type': 'string'}) -optiondescription_4 = ConvertDynOptionDescription(name="dyn_{{ identifier }}", doc="dyn_{{ identifier }}", identifiers=Calculation(func['calc_value'], Params((ParamOption(option_2)))), children=[option_5], properties=frozenset({"basic"}), informations={'dynamic_variable': 'extra.var'}) +optiondescription_4 = ConvertDynOptionDescription(name="dyn_{{ identifier }}", doc="dyn_{{ identifier }}", identifiers=Calculation(func['calc_value'], Params((ParamOption(option_2)))), children=[option_5], properties=frozenset({"basic"}), informations={'dynamic_variable': 'rougail.var'}) optiondescription_3 = OptionDescription(name="extra", doc="extra", group_type=groups.namespace, children=[optiondescription_4], properties=frozenset({"basic"})) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_1, optiondescription_3]) diff --git a/tests/dictionaries/60_9extra_dynamic/tiramisu/multi.py b/tests/dictionaries/60_9extra_dynamic/tiramisu/multi.py index 773dc637f..d76e13308 100644 --- a/tests/dictionaries/60_9extra_dynamic/tiramisu/multi.py +++ b/tests/dictionaries/60_9extra_dynamic/tiramisu/multi.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') try: groups.namespace except: @@ -13,13 +13,13 @@ ALLOWED_LEADER_PROPERTIES.add("advanced") option_3 = StrOption(name="var", doc="a variable", multi=True, default=["a"], default_multi="a", properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) optiondescription_2 = OptionDescription(name="rougail", doc="Rougail", group_type=groups.namespace, children=[option_3], properties=frozenset({"standard"})) option_6 = StrOption(name="var", doc="var", properties=frozenset({"basic", "mandatory"}), informations={'type': 'string'}) -optiondescription_5 = ConvertDynOptionDescription(name="dyn_{{ identifier }}", doc="dyn_{{ identifier }}", identifiers=Calculation(func['calc_value'], Params((ParamOption(option_3)))), children=[option_6], properties=frozenset({"basic"}), informations={'dynamic_variable': '1.var'}) +optiondescription_5 = ConvertDynOptionDescription(name="dyn_{{ identifier }}", doc="dyn_{{ identifier }}", identifiers=Calculation(func['calc_value'], Params((ParamOption(option_3)))), children=[option_6], properties=frozenset({"basic"}), informations={'dynamic_variable': 'rougail.var'}) optiondescription_4 = OptionDescription(name="extra", doc="extra", group_type=groups.namespace, children=[optiondescription_5], properties=frozenset({"basic"})) optiondescription_1 = OptionDescription(name="1", doc="1", children=[optiondescription_2, optiondescription_4], properties=frozenset({"basic"})) option_9 = StrOption(name="var", doc="a variable", multi=True, default=["a"], default_multi="a", properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) optiondescription_8 = OptionDescription(name="rougail", doc="Rougail", group_type=groups.namespace, children=[option_9], properties=frozenset({"standard"})) option_12 = StrOption(name="var", doc="var", properties=frozenset({"basic", "mandatory"}), informations={'type': 'string'}) -optiondescription_11 = ConvertDynOptionDescription(name="dyn_{{ identifier }}", doc="dyn_{{ identifier }}", identifiers=Calculation(func['calc_value'], Params((ParamOption(option_9)))), children=[option_12], properties=frozenset({"basic"}), informations={'dynamic_variable': '2.var'}) +optiondescription_11 = ConvertDynOptionDescription(name="dyn_{{ identifier }}", doc="dyn_{{ identifier }}", identifiers=Calculation(func['calc_value'], Params((ParamOption(option_9)))), children=[option_12], properties=frozenset({"basic"}), informations={'dynamic_variable': 'rougail.var'}) optiondescription_10 = OptionDescription(name="extra", doc="extra", group_type=groups.namespace, children=[optiondescription_11], properties=frozenset({"basic"})) optiondescription_7 = OptionDescription(name="2", doc="2", children=[optiondescription_8, optiondescription_10], properties=frozenset({"basic"})) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_1, optiondescription_7]) 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 deleted file mode 100644 index 46703943f..000000000 --- a/tests/dictionaries/60_9extra_dynamic_extra/dictionaries/extra/00-base.yml +++ /dev/null @@ -1,8 +0,0 @@ ---- -version: '1.1' -var: # a varaible - - a -"dyn_{{ identifier }}": - dynamic: - variable: _.var - var: diff --git a/tests/dictionaries/60_9extra_dynamic_extra/dictionaries/rougail/00-base.yml b/tests/dictionaries/60_9extra_dynamic_extra/dictionaries/rougail/00-base.yml deleted file mode 100644 index 2926dc5df..000000000 --- a/tests/dictionaries/60_9extra_dynamic_extra/dictionaries/rougail/00-base.yml +++ /dev/null @@ -1,9 +0,0 @@ -general: - description: général - varname: - type: string - description: No change - multi: true - default: - - a -version: '1.0' diff --git a/tests/dictionaries/60_9extra_dynamic_extra/force_namespace b/tests/dictionaries/60_9extra_dynamic_extra/force_namespace deleted file mode 100644 index e69de29bb..000000000 diff --git a/tests/dictionaries/60_9extra_dynamic_extra/tiramisu/base.py b/tests/dictionaries/60_9extra_dynamic_extra/tiramisu/base.py index 9657e60f7..9a8c6c689 100644 --- a/tests/dictionaries/60_9extra_dynamic_extra/tiramisu/base.py +++ b/tests/dictionaries/60_9extra_dynamic_extra/tiramisu/base.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') try: groups.namespace except: diff --git a/tests/dictionaries/60_9extra_dynamic_extra/tiramisu/multi.py b/tests/dictionaries/60_9extra_dynamic_extra/tiramisu/multi.py index 313f908e7..c0ba7848b 100644 --- a/tests/dictionaries/60_9extra_dynamic_extra/tiramisu/multi.py +++ b/tests/dictionaries/60_9extra_dynamic_extra/tiramisu/multi.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') try: groups.namespace except: 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 deleted file mode 100644 index e26057d1e..000000000 --- a/tests/dictionaries/60_9family_dynamic_calc_both/dictionaries/rougail/00-base.yml +++ /dev/null @@ -1,9 +0,0 @@ ---- -version: '1.1' -var: val2 # a suffix variable -"dyn{{ identifier }}": - description: a dynamic family - dynamic: - - val1 - - 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 353ca4a4e..d2404ee45 100644 --- a/tests/dictionaries/60_9family_dynamic_calc_both/tiramisu/base.py +++ b/tests/dictionaries/60_9family_dynamic_calc_both/tiramisu/base.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') try: groups.namespace except: 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 1b323ba1b..803cea325 100644 --- a/tests/dictionaries/60_9family_dynamic_calc_both/tiramisu/multi.py +++ b/tests/dictionaries/60_9family_dynamic_calc_both/tiramisu/multi.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') try: groups.namespace except: 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 0b77e5b25..2df28e250 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 @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") ALLOWED_LEADER_PROPERTIES.add("standard") ALLOWED_LEADER_PROPERTIES.add("advanced") diff --git a/tests/dictionaries/68_0family_leadership_mode/dictionaries/rougail/00-base.yml b/tests/dictionaries/68_0family_leadership_mode/dictionaries/rougail/00-base.yml deleted file mode 100644 index 1a65f94a2..000000000 --- a/tests/dictionaries/68_0family_leadership_mode/dictionaries/rougail/00-base.yml +++ /dev/null @@ -1,15 +0,0 @@ ---- -version: '1.0' -leader: - description: A leadership - type: leadership - leader: - description: A leader - multi: true - mandatory: false - follower1: - description: a follower1 - mandatory: false - follower2: - description: a follower2 - mode: basic diff --git a/tests/dictionaries/68_0family_leadership_mode/tiramisu/base.py b/tests/dictionaries/68_0family_leadership_mode/tiramisu/base.py index 3c59248ca..d85492b91 100644 --- a/tests/dictionaries/68_0family_leadership_mode/tiramisu/base.py +++ b/tests/dictionaries/68_0family_leadership_mode/tiramisu/base.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') try: groups.namespace except: diff --git a/tests/dictionaries/68_0family_leadership_mode/tiramisu/multi.py b/tests/dictionaries/68_0family_leadership_mode/tiramisu/multi.py index 8599346c9..a316e1e8a 100644 --- a/tests/dictionaries/68_0family_leadership_mode/tiramisu/multi.py +++ b/tests/dictionaries/68_0family_leadership_mode/tiramisu/multi.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') try: groups.namespace except: 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 e7b4aa9a1..8013426ce 100644 --- a/tests/dictionaries/68_0family_leadership_mode/tiramisu/no_namespace.py +++ b/tests/dictionaries/68_0family_leadership_mode/tiramisu/no_namespace.py @@ -2,7 +2,7 @@ from tiramisu import * from tiramisu.setting import ALLOWED_LEADER_PROPERTIES from re import compile as re_compile from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription -load_functions('tests/dictionaries/../eosfunc/test.py') +load_functions('../rougail-tests/funcs/test.py') ALLOWED_LEADER_PROPERTIES.add("basic") ALLOWED_LEADER_PROPERTIES.add("standard") ALLOWED_LEADER_PROPERTIES.add("advanced") diff --git a/tests/eosfunc/test.py b/tests/eosfunc/test.py deleted file mode 100644 index 3e4b84930..000000000 --- a/tests/eosfunc/test.py +++ /dev/null @@ -1,76 +0,0 @@ -def trange(start, stop): - return list(range(start, stop)) - - -def calc_val(*args, **kwargs): - if len(args) > 0: - return args[0] - - -def concat(*args, **kwargs): - pass - - -def calc_multi_condition(*args, **kwargs): - pass - - -def get_zone_name_bridge(*args, **kwargs): - pass - - -def get_devices(*args, **kwargs): - pass - - -def get_mount_point_device(*args, **kwargs): - pass - - -def valid_differ(*args, **kwargs): - pass - - -def valid_ipnetmask(*args, **kwargs): - pass - - -def valid_enum(*args, **kwargs): - pass - - -def valid_lower(*args, **kwargs): - pass - - -def list_files(*args, **kwargs): - # FIXME ? - return kwargs['default'] - - -def calc_multi_val(*args, **kwargs): - return args[0] - - -def cdrom_minormajor(*args, **kwargs): - pass - - -def device_type(*args, **kwargs): - pass - - -def calc_list(*args, **kwargs): - return list(args) - - -def test_index(index): - return index - - -def return_no(): - return 'no' - - -def return_yes(): - return 'yes' diff --git a/tests/test_1_flattener.py b/tests/test_1_flattener.py index 5174fa694..f348c63d4 100644 --- a/tests/test_1_flattener.py +++ b/tests/test_1_flattener.py @@ -1,4 +1,5 @@ from pytest import fixture, raises +from pathlib import Path from os import getcwd, listdir, environ, makedirs from os.path import isfile, join, isdir, dirname from shutil import rmtree, copyfile @@ -14,8 +15,9 @@ from .custom import CustomOption logger = logging.getLogger() logger.setLevel(logging.INFO) +dico_dirs = Path('../rougail-tests/structures') +rougail_test_dirs = Path('tests/dictionaries') -dico_dirs = 'tests/dictionaries' # if test_3_template.py failed, this temporary directory must be removed tmp_dir = join(dico_dirs, 'tmp') @@ -26,19 +28,24 @@ if isdir(tmp_dir): test_ok = set() test_raise = set() -for test in listdir(dico_dirs): - if isdir(join(dico_dirs, test)): - if isdir(join(dico_dirs, test, 'tiramisu')): - test_ok.add(test) + +def get_rougail_tests_dir(original_dir): + pass + + +for test in dico_dirs.iterdir(): + if test.is_dir(): + if rougail_test_dirs / 'test' / 'tiramisu': + test_ok.add(test.name) elif test != '__pycache__': - test_raise.add(test) + test_raise.add(test.name) excludes = set([ '80family_several', ]) test_ok -= excludes test_raise -= excludes -# test_ok = ['60_5family_dynamic_variable_outside_sub_suffix'] +#test_ok = ['00_9extra'] #test_ok = [] #test_raise = ['88valid_enum_invalid_default'] #test_raise = [] @@ -78,26 +85,28 @@ def get_tiramisu_filename(test_dir, subdir, multi, namespace): filename = 'base.py' else: filename = 'multi.py' - return join(test_dir, subdir, filename) + return str(rougail_test_dirs / Path(test_dir).name / subdir / filename) def load_rougail_object(test_dir, rougailconfig, multi=False, namespace=False): - rougailconfig['functions_file'] = [join(dico_dirs, '../eosfunc/test.py')] - dirs = [join(test_dir, 'dictionaries', 'rougail')] - subfolder = join(test_dir, 'dictionaries', 'rougail2') + rougailconfig['functions_file'] = [join('../rougail-tests/funcs/test.py')] + dirs = [join(test_dir, 'rougail')] + subfolder = join(test_dir, 'rougail2') if isdir(subfolder): dirs.append(subfolder) rougailconfig['dictionaries_dir'] = dirs extra_dictionaries = {} - extras = listdir(join(test_dir, 'dictionaries')) + extras = listdir(join(test_dir)) extras.sort() for extra in extras: if extra in ['rougail', 'rougail2']: continue - subfolder = join(test_dir, 'dictionaries', extra) + subfolder = join(test_dir, extra) if isdir(subfolder): extra_dictionaries[extra] = [subfolder] if extra_dictionaries: + if namespace is False and not multi: + return None rougailconfig['extra_dictionaries'] = extra_dictionaries rougailconfig['tiramisu_cache'] = get_tiramisu_filename(test_dir, 'tmp', multi, namespace) rougailconfig['custom_types']['custom'] = CustomOption @@ -132,12 +141,12 @@ def test_dictionary(test_dir): print('NAMESPACE!') return assert getcwd() == ORI_DIR - test_dir_ = join(dico_dirs, test_dir) + test_dir_ = str(rougail_test_dirs / test_dir) rougailconfig = RougailConfig.copy() rougailconfig['main_namespace'] = None - if isfile(join(test_dir_, 'force_namespace')): + if (dico_dirs / test_dir / 'force_namespace').is_file(): return - eolobj = load_rougail_object(test_dir_, rougailconfig) + eolobj = load_rougail_object(str(dico_dirs / test_dir), rougailconfig) if not eolobj: return save(test_dir_, eolobj) diff --git a/tests/test_2_makedict.py b/tests/test_2_makedict.py index cd43faf8f..e41e36c83 100644 --- a/tests/test_2_makedict.py +++ b/tests/test_2_makedict.py @@ -31,7 +31,7 @@ excludes = set([]) # excludes = set(['60_5family_dynamic_variable_outside_sub_suffix']) test_ok -= excludes -# test_ok = ['04_1default_calculation_hidden'] +# test_ok = ['60_0family_dynamic_static'] test_ok = list(test_ok) @@ -98,6 +98,7 @@ def launch_flattener(test_dir, config.property.setdefault(rw_append, 'read_write', 'append') config.information.set('test_information', 'value') + config.information.set('test_information_list', ['value']) config.property.read_only() config.property.remove('mandatory') config.information.set('info', 'value') @@ -227,7 +228,7 @@ def test_dictionary(test_dir): def test_dictionary_no_namespace(test_dir): test_dir = join(dico_dirs, test_dir) - if isfile(join(test_dir, 'force_namespace')): + if not isfile(Path(test_dir) / 'tiramisu' / 'no_namespace.py'): return launch_flattener(test_dir, 'no_namespace') @@ -237,4 +238,6 @@ def test_dictionary_multi(test_dir): print('FIXME') return test_dir = join(dico_dirs, test_dir) + if not isfile(Path(test_dir) / 'tiramisu' / 'multi.py'): + return launch_flattener(test_dir, 'multi')