Compare commits

...

6 commits

942 changed files with 2194 additions and 1739 deletions

View file

@ -17,26 +17,52 @@ param:
```
Dans ce cas, l'information de la configuration "server_name" sera utilisé comme valeur du paramètre.
Si l'information n'existe pas, la paramètre aura la valeur "None".
Si l'information n'existe pas, la paramètre aura la valeur "None" ou [] pour une variable multiple.
## Les informations de la cible
## Les informations d'une variable
Le paramètre peut être la valeur est issue d'une information de la cible du calcul :
Le paramètre peut être la valeur est issue d'une information d'une variable :
```xml
<param type="target_information">test</param>
<param type="target_information">help</param>
<param type="information" variable="a_variable">test</param>
<param type="information" variable="a_variable">help</param>
```
En YAML :
```yml
param:
- type: target_information
- type: information
variable: a_variable
text: test
- type: target_information
- type: information
variable: a_variable
text: help
```
Dans ce cas, l'information de la configuration "test" ou "help" sera utilisé comme valeur du paramètre.
Si l'information n'existe pas, la paramètre aura la valeur "None".
Dans ce cas, l'information de la variable "a_variable" "test" ou "help" sera utilisée comme valeur du paramètre.
Si l'information n'existe pas, la paramètre aura la valeur "None" ou [] pour une variable multiple.
## Les informations de la cible
Le paramètre peut être la valeur est issue d'une information de la cible du calcul (la target) :
```xml
<param type="information" variable="target_variable">test</param>
<param type="information" variable="target_variable">help</param>
```
En YAML :
```yml
param:
- type: information
variable: target_variable
text: test
- type: information
variable: target_variable
text: help
```
Dans ce cas, l'information de la variable de la cible (target_variable) "test" ou "help" sera utilisée comme valeur du paramètre.
Si l'information n'existe pas, la paramètre aura la valeur "None" ou [] pour une variable multiple.

View file

@ -45,22 +45,22 @@ class Rougail:
self.converted = RougailConvert(self.rougailconfig)
self.config = None
async def get_config(self):
def get_config(self):
if not self.config:
tiram_obj = self.converted.save(None)
optiondescription = {}
exec(tiram_obj, None, optiondescription)
self.config = await Config(optiondescription['option_0'])
self.config = Config(optiondescription['option_0'])
return self.config
async def template(self,
def template(self,
type: str='base',
) -> None:
config = await self.get_config()
config = self.get_config()
if type == 'base':
engine = RougailBaseTemplate(config, self.rougailconfig)
else:
engine = RougailSystemdTemplate(config, self.rougailconfig)
await engine.instance_files()
engine.instance_files()
__ALL__ = ('Rougail', 'RougailConvert', 'RougailBaseTemplate', 'RougailSystemdTemplate', 'RougailConfig', 'RougailUpgrade')

View file

@ -28,7 +28,7 @@ along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
"""
try:
import tiramisu3 as tiramisu
import tiramisu4 as tiramisu
except ModuleNotFoundError:
import tiramisu
@ -62,6 +62,9 @@ class ParamAnnotator:
if param.type in ['suffix', 'index']:
msg = _(f'"{param.type}" parameter must not have a value')
raise DictConsistencyError(msg, 28, obj.xmlfiles)
if param.type != 'information' and hasattr(param, 'variable'):
msg = _(f'"{param.type}" parameter must not have variable attribut')
raise DictConsistencyError(msg, 90, obj.xmlfiles)
if param.type in ['nil', 'space']:
if param.text is not None:
msg = _(f'"{param.type}" parameter must not have a value')
@ -103,6 +106,18 @@ class ParamAnnotator:
if param_idx != 0:
msg = _(f'function "{param.text}" must only set has first parameter')
raise DictConsistencyError(msg, 75, param.xmlfiles)
elif param.type == 'information':
if hasattr(param, 'variable'):
try:
param.variable = self.objectspace.paths.get_family(param.variable,
current_namespace=obj.namespace,
path_prefix=path_prefix,
)
except DictConsistencyError:
param.variable = self.objectspace.paths.get_variable(param.variable,
namespace=obj.namespace,
force_path_prefix=path_prefix,
)
elif variable_type:
self._convert_with_variable_type(variable_type, param)
continue

View file

@ -35,7 +35,7 @@ from rougail.utils import normalize_family
from rougail.error import DictConsistencyError
from rougail.annotator.variable import CONVERT_OPTION
try:
import tiramisu3 as tiramisu
import tiramisu4 as tiramisu
except ModuleNotFoundError:
import tiramisu
# a object's attribute has some annotations
@ -408,7 +408,7 @@ class Annotator:
)
certificate.catype = certificate.type
if not hasattr(certificate, 'domain'):
certificate.domain = self.objectspace.rougailconfig['default_cerficate_domain']
certificate.domain = self.objectspace.rougailconfig['default_certificate_domain']
variable = self.objectspace.paths.get_variable(certificate.domain,
certificate.namespace,
xmlfiles=certificate.xmlfiles,

View file

@ -69,7 +69,7 @@ RougailConfig = {'dictionaries_dir': [join(ROUGAILROOT, 'dictionaries')],
'default_files_included': 'no',
'default_overrides_engine': 'cheetah',
'default_service_names_engine': 'none',
'default_cerficate_domain': 'server_name',
'default_certificate_domain': 'server_name',
'base_option_name': 'baseoption',
'export_with_import': True,
'force_convert_dyn_option_description': False,

View file

@ -54,7 +54,7 @@
<!ATTLIST service manage (True|False) "True">
<!ATTLIST service servicelist CDATA #IMPLIED>
<!ATTLIST service disabled (True|False) "False">
<!ATTLIST service engine (none|cheetah|jinja) #IMPLIED>
<!ATTLIST service engine CDATA #IMPLIED>
<!ATTLIST service target CDATA #IMPLIED>
<!ATTLIST service type (service|mount|swap|timer|target) "service">
<!ATTLIST service undisable (True|False) "False">
@ -79,19 +79,21 @@
<!ATTLIST file group_type (unix_user|variable) "unix_user">
<!ATTLIST file filelist CDATA #IMPLIED>
<!ATTLIST file redefine (True|False) "False">
<!ATTLIST file engine (none|cheetah|jinja|creole_legacy) #IMPLIED>
<!ATTLIST file engine CDATA #IMPLIED>
<!ATTLIST file included (no|name|content) #IMPLIED>
<!ATTLIST file disabled (True|False) "False">
<!ELEMENT override EMPTY>
<!ATTLIST override source CDATA #IMPLIED>
<!ATTLIST override engine (none|cheetah|jinja) #IMPLIED>
<!ATTLIST override engine CDATA #IMPLIED>
<!ELEMENT certificate (#PCDATA)>
<!ATTLIST certificate certificate_type (string|variable) "string">
<!ATTLIST certificate authority CDATA #REQUIRED>
<!ATTLIST certificate owner CDATA #IMPLIED>
<!ATTLIST certificate owner_type (unix_user|variable) "unix_user">
<!ATTLIST certificate group CDATA #IMPLIED>
<!ATTLIST certificate group_type (unix_user|variable) "unix_user">
<!ATTLIST certificate server CDATA #IMPLIED>
<!ATTLIST certificate server_type (variable) "variable">
<!ATTLIST certificate domain CDATA #IMPLIED>
@ -101,6 +103,7 @@
<!ATTLIST certificate format (cert_key|pem) "cert_key">
<!ATTLIST certificate type (client|server) "client">
<!ATTLIST certificate redefine (True|False) "False">
<!ATTLIST certificate certificatelist CDATA #IMPLIED>
<!ELEMENT variables ((variable*|family*)*)>
@ -160,11 +163,12 @@
<!ATTLIST condition apply_on_fallback (True|False) #IMPLIED>
<!ELEMENT param (#PCDATA)>
<!ATTLIST param type (string|number|nil|space|boolean|variable|function|information|target_information|suffix|index) "string">
<!ATTLIST param type (string|number|nil|space|boolean|variable|function|information|suffix|index) "string">
<!ATTLIST param name CDATA #IMPLIED>
<!ATTLIST param variable CDATA #IMPLIED>
<!ATTLIST param propertyerror (True|False) "True">
<!ATTLIST param optional (True|False) "False">
<!ELEMENT target (#PCDATA)>
<!ATTLIST target type (variable|family|servicelist|filelist|iplist) "variable">
<!ATTLIST target type (variable|family|servicelist|filelist|iplist|certificatelist) "variable">
<!ATTLIST target optional (True|False) "False">

View file

@ -57,11 +57,6 @@ mapping:
- "content"
engine:
type: str
enum:
- "none"
- "cheetah"
- "jinja"
- "creole_legacy"
redefine:
type: bool
filelist:
@ -105,10 +100,6 @@ mapping:
type: str
engine:
type: str
enum:
- "none"
- "cheetah"
- "jinja"
certificate:
required: false
type: seq
@ -123,6 +114,8 @@ mapping:
enum:
- "string"
- "variable"
certificatelist:
type: str
redefine:
type: bool
type:
@ -153,6 +146,13 @@ mapping:
- "variable"
server:
type: str
group_type:
type: str
enum:
- "unix_user"
- "variable"
group:
type: str
owner_type:
type: str
enum:
@ -178,10 +178,6 @@ mapping:
type: str
engine:
type: str
enum:
- "none"
- "cheetah"
- "jinja"
disabled:
type: bool
servicelist:
@ -228,13 +224,14 @@ mapping:
- "variable"
- "function"
- "information"
- "target_information"
- "suffix"
- "index"
optional:
type: bool
propertyerror:
type: bool
variable:
type: str
name:
type: str
type:
@ -374,13 +371,14 @@ mapping:
- "variable"
- "function"
- "information"
- "target_information"
- "suffix"
- "index"
optional:
type: bool
propertyerror:
type: bool
variable:
type: str
name:
type: str
type:
@ -521,13 +519,14 @@ mapping:
- "variable"
- "function"
- "information"
- "target_information"
- "suffix"
- "index"
optional:
type: bool
propertyerror:
type: bool
variable:
type: str
name:
type: str
type:
@ -700,13 +699,14 @@ mapping:
- "variable"
- "function"
- "information"
- "target_information"
- "suffix"
- "index"
optional:
type: bool
propertyerror:
type: bool
variable:
type: str
name:
type: str
type:
@ -846,13 +846,14 @@ mapping:
- "variable"
- "function"
- "information"
- "target_information"
- "suffix"
- "index"
optional:
type: bool
propertyerror:
type: bool
variable:
type: str
name:
type: str
type:
@ -1009,13 +1010,14 @@ mapping:
- "variable"
- "function"
- "information"
- "target_information"
- "suffix"
- "index"
optional:
type: bool
propertyerror:
type: bool
variable:
type: str
name:
type: str
type:
@ -1155,13 +1157,14 @@ mapping:
- "variable"
- "function"
- "information"
- "target_information"
- "suffix"
- "index"
optional:
type: bool
propertyerror:
type: bool
variable:
type: str
name:
type: str
type:
@ -1318,13 +1321,14 @@ mapping:
- "variable"
- "function"
- "information"
- "target_information"
- "suffix"
- "index"
optional:
type: bool
propertyerror:
type: bool
variable:
type: str
name:
type: str
type:
@ -1453,6 +1457,7 @@ mapping:
- "servicelist"
- "filelist"
- "iplist"
- "certificatelist"
optional:
type: bool
param:
@ -1475,13 +1480,14 @@ mapping:
- "variable"
- "function"
- "information"
- "target_information"
- "suffix"
- "index"
optional:
type: bool
propertyerror:
type: bool
variable:
type: str
name:
type: str
name:
@ -1509,6 +1515,7 @@ mapping:
- "servicelist"
- "filelist"
- "iplist"
- "certificatelist"
optional:
type: bool
param:
@ -1531,13 +1538,14 @@ mapping:
- "variable"
- "function"
- "information"
- "target_information"
- "suffix"
- "index"
optional:
type: bool
propertyerror:
type: bool
variable:
type: str
name:
type: str
name:
@ -1570,6 +1578,7 @@ mapping:
- "servicelist"
- "filelist"
- "iplist"
- "certificatelist"
optional:
type: bool
param:
@ -1592,13 +1601,14 @@ mapping:
- "variable"
- "function"
- "information"
- "target_information"
- "suffix"
- "index"
optional:
type: bool
propertyerror:
type: bool
variable:
type: str
name:
type: str
name:

View file

@ -89,7 +89,7 @@ class Reflector:
else:
continue
if filename in filenames:
raise DictConsistencyError(_(f'duplicate dictionary file name {filename}'), 78, [filenames[filename], full_filename])
raise DictConsistencyError(_(f'duplicate dictionary file name {filename}'), 78, [filenames[filename][1], full_filename])
filenames[filename] = (ext, full_filename)
if not filenames and not just_doc:
raise DictConsistencyError(_('there is no dictionary file'), 77, folders)

View file

@ -9,7 +9,7 @@ Cadoles (http://www.cadoles.com)
Copyright (C) 2019-2021
Silique (https://www.silique.fr)
Copyright (C) 2022
Copyright (C) 2022-2023
distribued with GPL-2 or later license
@ -30,16 +30,16 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
from shutil import copy
import logging
from typing import Dict, Any
from typing import Dict, Any, Union
from subprocess import call
from os import listdir, makedirs, getcwd, chdir, unlink, rmdir, chmod
from os.path import dirname, join, isfile, isdir, abspath
try:
from tiramisu3 import Config, undefined
from tiramisu3.api import TiramisuOption
from tiramisu3.error import PropertiesOptionError # pragma: no cover
from tiramisu4 import Config, undefined
from tiramisu4.api import TiramisuOption
from tiramisu4.error import PropertiesOptionError # pragma: no cover
except ModuleNotFoundError: # pragma: no cover
from tiramisu import Config, undefined
from tiramisu.api import TiramisuOption
@ -161,7 +161,7 @@ class RougailLeader:
def __contains__(self, value):
return self._value.__contains__(value)
async def _add_follower(self,
def _add_follower(self,
config,
name: str,
path: str,
@ -171,7 +171,7 @@ class RougailLeader:
self._follower[name] = []
for index in range(len(self._value)):
try:
value = await config.option(path, index).value.get()
value = config.option(path, index).value.get()
except PropertiesOptionError as err:
value = err
self._follower[name].append(value)
@ -227,12 +227,12 @@ class RougailBaseTemplate:
"""Engine to process Creole cheetah template
"""
def __init__(self, # pylint: disable=R0913
config: Config,
root: Union[Config, TiramisuOption],
rougailconfig: RougailConfig=None,
) -> None:
if rougailconfig is None:
rougailconfig = RougailConfig
self.config = config
self.root = root
self.destinations_dir = abspath(rougailconfig['destinations_dir'])
self.tmp_dir = abspath(rougailconfig['tmp_dir'])
self.templates_dir = []
@ -359,35 +359,42 @@ class RougailBaseTemplate:
destfilenames.append(destfilename)
return destfilenames
async def load_variables(self):
for option in await self.config.option.list(type='all'):
namespace = await option.option.name()
is_variable_namespace = namespace == self.rougailconfig['variable_namespace']
def load_variables(self, with_flatten=True):
if isinstance(self.root, Config):
list_options = self.root.option.list(type='all')
else:
list_options = self.root.list(type='all')
for option in list_options:
namespace = option.name()
if with_flatten and namespace == self.rougailconfig['variable_namespace']:
is_variable_namespace = True
else:
is_variable_namespace = False
if namespace == 'services':
is_service_namespace = 'root'
else:
is_service_namespace = False
self.rougail_variables_dict[namespace] = await self._load_variables(option,
self.rougail_variables_dict[namespace] = self._load_variables(option,
is_variable_namespace,
is_service_namespace,
)
async def instance_file(self,
def instance_file(self,
template_name,
extra_variables=None,
) -> None:
if not self.rougail_variables_dict:
await self.load_variables()
self.load_variables()
self.prepare_templates()
for service_obj in await self.config.option('services').list('all'):
service_name = await service_obj.option.description()
service_desactived = await service_obj.option('activate').value.get() is False
for fills in await service_obj.list('optiondescription'):
type_ = await fills.option.name()
for fill_obj in await fills.list('all'):
fill = await fill_obj.value.dict()
for service_obj in self.root.option('services').list('all'):
service_name = service_obj.description()
service_desactived = service_obj.option('activate').value.get() is False
for fills in service_obj.list('optiondescription'):
type_ = fills.name()
for fill_obj in fills.list('all'):
fill = {path.split('.')[-1]: value for path, value in fill_obj.value.dict().items()}
self.get_default(type_, fill, fill_obj)
await self.get_informations(type_, fill, fill_obj)
self.get_informations(type_, fill, fill_obj)
if fill['source'] != template_name:
continue
if service_desactived:
@ -417,7 +424,7 @@ class RougailBaseTemplate:
raise TemplateError(f'Cannot find template {template_name}')
async def instance_files(self,
def instance_files(self,
extra_variables=None,
) -> None:
"""Run templatisation on all files
@ -429,36 +436,36 @@ class RougailBaseTemplate:
chdir(self.tmp_dir)
try:
if not self.rougail_variables_dict:
await self.load_variables()
self.load_variables()
self.prepare_templates()
files_to_delete = []
for included in (True, False):
for service_obj in await self.config.option('services').list('all'):
service_name = await service_obj.option.description()
if await service_obj.option('activate').value.get() is False:
if included is False and not await service_obj.information.get('undisable', False):
for service_obj in self.root.option('services').list('all'):
service_name = service_obj.description()
if service_obj.option('activate').value.get() is False:
if included is False and not service_obj.information.get('undisable', False):
self.desactive_service(service_name)
continue
if not included:
engine = await service_obj.information.get('engine', None)
engine = service_obj.information.get('engine', None)
if engine:
self._instance_file({'engine': engine},
'service',
service_name,
extra_variables,
)
target_name = await service_obj.information.get('target', None)
target_name = service_obj.information.get('target', None)
if target_name:
self.target_service(service_name,
target_name,
engine is None,
)
for fills in await service_obj.list('optiondescription'):
type_ = await fills.option.name()
for fill_obj in await fills.list('all'):
fill = await fill_obj.value.dict()
for fills in service_obj.list('optiondescription'):
type_ = fills.name()
for fill_obj in fills.list('all'):
fill = {path.split('.')[-1]: value for path, value in fill_obj.value.dict().items()}
self.get_default(type_, fill, fill_obj)
await self.get_informations(type_, fill, fill_obj)
self.get_informations(type_, fill, fill_obj)
if 'included' in fill:
if (fill['included'] == 'no' and included is True) or \
(fill['included'] != 'no' and included is False):
@ -512,7 +519,7 @@ class RougailBaseTemplate:
default_value = undefined
dico[key] = dico.get(key, default_value)
async def get_informations(self,
def get_informations(self,
type_: str,
dico: dict,
obj: 'Option',
@ -530,9 +537,9 @@ class RougailBaseTemplate:
default_value = RougailConfig[default_key]
else:
default_value = undefined
value = await obj.information.get(key, default_value)
if key not in ['target', 'undisable'] or value != default_value:
dico[key] = await obj.information.get(key, default_value)
value = obj.information.get(key, default_value)
if key != 'target' or value != default_value:
dico[key] = obj.information.get(key, default_value)
def desactive_service(self,
*args,
@ -606,7 +613,7 @@ class RougailBaseTemplate:
) -> None: # pragma: no cover
pass
async def _load_variables(self,
def _load_variables(self,
optiondescription,
is_variable_namespace: str,
is_service_namespace: str,
@ -614,46 +621,46 @@ class RougailBaseTemplate:
"""Load all variables and set it in RougailExtra objects
"""
variables = {}
if isinstance(self.config, TiramisuOption):
len_root_path = len(await self.config.option.path()) + 1
for option in await optiondescription.list('all'):
if await option.option.isoptiondescription():
if await option.option.isleadership():
for idx, suboption in enumerate(await option.list('all')):
if isinstance(self.root, TiramisuOption):
len_root_path = len(self.root.path()) + 1
for option in optiondescription.list('all'):
if option.isoptiondescription():
if option.isleadership():
for idx, suboption in enumerate(option.list('all')):
if idx == 0:
leader_name = await suboption.option.name()
leader = RougailLeader(leader_name, await suboption.value.get())
leadership_name = await option.option.name()
leader_name = suboption.name()
leader = RougailLeader(leader_name, suboption.value.get())
leadership_name = option.name()
if is_variable_namespace:
self.rougail_variables_dict[await suboption.option.name()] = leader
self.rougail_variables_dict[suboption.name()] = leader
else:
if isinstance(self.config, TiramisuOption):
path = (await suboption.option.path())[len_root_path:]
if isinstance(self.root, TiramisuOption):
path = (suboption.path())[len_root_path:]
else:
path = await suboption.option.path()
await leader._add_follower(self.config,
await suboption.option.name(),
path = suboption.path()
leader._add_follower(self.root,
suboption.name(),
path,
)
variables[leadership_name] = RougailExtra(await option.option.name(), {leader_name: leader}, await option.option.path())
variables[leadership_name] = RougailExtra(option.name(), {leader_name: leader}, option.path())
else:
if is_service_namespace == 'root':
new_is_service_namespace = 'service_name'
elif is_service_namespace == 'service_name':
new_is_service_namespace = await option.option.name()
new_is_service_namespace = option.name()
elif is_service_namespace in INFORMATIONS:
# remove 's'
new_is_service_namespace = is_service_namespace[:-1]
else:
new_is_service_namespace = is_service_namespace
subfamilies = await self._load_variables(option,
subfamilies = self._load_variables(option,
is_variable_namespace,
new_is_service_namespace,
)
variables[await option.option.name()] = subfamilies
variables[option.name()] = subfamilies
else:
name = await option.option.name()
value = await option.value.get()
name = option.name()
value = option.value.get()
if is_variable_namespace:
self.rougail_variables_dict[name] = value
variables[name] = value
@ -662,8 +669,8 @@ class RougailBaseTemplate:
variables,
optiondescription,
)
await self.get_informations(is_service_namespace + 's',
self.get_informations(is_service_namespace + 's',
variables,
optiondescription,
)
return RougailExtra(await optiondescription.option.name(), variables, await optiondescription.option.path())
return RougailExtra(optiondescription.name(), variables, optiondescription.path())

View file

@ -9,7 +9,7 @@ Cadoles (http://www.cadoles.com)
Copyright (C) 2021
Silique (https://www.silique.fr)
Copyright (C) 2022
Copyright (C) 2022-2023
distribued with GPL-2 or later license

View file

@ -51,7 +51,7 @@ class RougailSystemdTemplate(RougailBaseTemplate):
) -> None:
self.ip_per_service = None
super().__init__(config, rougailconfig)
self.rougail_tmpl_template = f"""%def display(%%file, %%filename)
self.rougail_tmpl_template = f"""%def display(%%file, %%filename, %%service_activate, %%file_activate)
"""
tmp_local_dir = (f"%%filename.startswith('{local_dir}')" for local_dir in LOCAL_DIR)
self.rougail_tmpl_template += '%if ' + ' or '.join(tmp_local_dir)
@ -59,23 +59,25 @@ class RougailSystemdTemplate(RougailBaseTemplate):
%if {self.rougailconfig['systemd_tmpfile_delete_before_create']}
r %%filename
%end if
%if %%service_activate and %%file_activate
%set %%mode = %%str(%%file.mode)
%if %%len(%%mode) == 3
%set %%mode = '0' + %%mode
%end if
C %%filename %%mode %%file.owner %%file.group - {self.rougailconfig['systemd_tmpfile_factory_dir']}%%filename
%end if
%end if
%end def
%for %%service in %%services
%if %%service.activate is True and %%hasattr(%%service, 'files')
%if %%hasattr(%%service, 'files')
%for %%file in %%service.files
%if %%file.activate is True and %%file.included != 'content'
%if %%hasattr(%%file, 'name') and %%file.included != 'content'
%if %%isinstance(%%file.name, list)
%for %%filename in %%file.name
%%display(%%file, %%filename)%slurp
%%display(%%file, %%filename, %%service.activate, %%file.activate)%slurp
%end for
%else
%%display(%%file, %%file.name)%slurp
%%display(%%file, %%file.name, %%service.activate, %%file.activate)%slurp
%end if
%end if
%end for

View file

@ -28,7 +28,7 @@ along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
"""
try:
from tiramisu3 import DynOptionDescription
from tiramisu4 import DynOptionDescription
except ModuleNotFoundError:
from tiramisu import DynOptionDescription
from .utils import normalize_family

View file

@ -91,7 +91,7 @@ class TiramisuReflector:
for func in internal_functions:
self.text['header'].append(f"setattr(func, '{func}', {func})")
self.text['header'].extend(["try:",
" from tiramisu3 import *",
" from tiramisu4 import *",
"except:",
" from tiramisu import *",
])
@ -115,7 +115,9 @@ class TiramisuReflector:
self.populate_family(basefamily,
elt,
)
basefamily.populate_informations()
# basefamily.populate_informations()
if not hasattr(basefamily.elt, 'information'):
basefamily.elt.information = self.objectspace.information(None)
basefamily.elt.information = self.objectspace.paths.get_providers_path()
basefamily.elt.information.update(self.objectspace.paths.get_suppliers_path())
else:
@ -132,9 +134,13 @@ class TiramisuReflector:
self.populate_family(baseprefix,
elt,
)
baseprefix.populate_informations()
baseprefix.elt.information = self.objectspace.paths.get_providers_path(path_prefix)
baseprefix.elt.information.update(self.objectspace.paths.get_suppliers_path(path_prefix))
if not hasattr(baseprefix.elt, 'information'):
baseprefix.elt.information = self.objectspace.information(baseprefix.elt.xmlfiles)
for key, value in self.objectspace.paths.get_providers_path(path_prefix).items():
setattr(baseprefix.elt.information, key, value)
for key, value in self.objectspace.paths.get_suppliers_path(path_prefix).items():
setattr(baseprefix.elt.information, key, value)
# baseprefix.populate_informations()
baseelt.name = normalize_family(self.cfg['base_option_name'])
baseelt.doc = self.cfg['base_option_name']
baseelt.reflector_object.get([], baseelt.doc, 'base') # pylint: disable=E1101
@ -280,12 +286,12 @@ class Common:
"""Populate properties
"""
option_name = child.source.reflector_object.get(self.calls, self.elt.path, 'property')
kwargs = (f"'condition': ParamOption({option_name}, todict=True, notraisepropertyerror=True), "
kwargs = (f"'condition': ParamOption({option_name}, notraisepropertyerror=True), "
f"'expected': {self.populate_param(child.expected)}")
if child.inverse:
kwargs += ", 'reverse_condition': ParamValue(True)"
return (f"Calculation(func.calc_value, Params(ParamValue('{child.name}'), "
f"kwargs={{{kwargs}}}))")
f"kwargs={{{kwargs}}}), func.calc_value_property_help)")
def populate_informations(self):
"""Populate Tiramisu's informations
@ -308,11 +314,8 @@ class Common:
):
"""Populate variable parameters
"""
if param.type in ['number', 'boolean', 'nil', 'string', 'port', 'choice', 'space']:
value = param.text
if param.type == 'string' and value is not None:
value = self.convert_str(value)
return f'ParamValue({value})'
if param.type in ['number', 'boolean', 'nil', 'port', 'choice', 'space']:
return f'ParamValue({param.text})'
if param.type in ['variable_name', 'variable']:
return self.build_option_param(param)
if param.type == 'information':
@ -320,14 +323,17 @@ class Common:
default = []
else:
default = None
if hasattr(param, 'variable'):
if param.variable.path == self.elt.path:
return f'ParamSelfInformation("{param.text}", {default})'
return f'ParamInformation("{param.text}", {default}, option={param.variable.reflector_object.get(self.calls, self.elt.path, "param")})'
return f'ParamInformation("{param.text}", {default})'
if param.type == 'target_information':
return f'ParamSelfInformation("{param.text}", None)'
if param.type == 'suffix':
return 'ParamSuffix()'
if param.type == 'index':
return 'ParamIndex()'
raise Exception(_(f'unknown type {param.type}')) # pragma: no cover
value = self.convert_str(param.text)
return f'ParamValue({value})'
def build_option_param(self,
param,

View file

@ -15,7 +15,7 @@ def _load_functions(path):
setattr(func, function, getattr(func_, function))
_load_functions('tests/dictionaries/../eosfunc/test.py')
try:
from tiramisu3 import *
from tiramisu4 import *
except:
from tiramisu import *
option_1 = BoolOption(name="activate", doc="activate", default=True)

View file

@ -15,7 +15,7 @@ def _load_functions(path):
setattr(func, function, getattr(func_, function))
_load_functions('tests/dictionaries/../eosfunc/test.py')
try:
from tiramisu3 import *
from tiramisu4 import *
except:
from tiramisu import *
option_1 = BoolOption(name="activate", doc="activate", default=True)

View file

@ -15,10 +15,10 @@ def _load_functions(path):
setattr(func, function, getattr(func_, function))
_load_functions('tests/dictionaries/../eosfunc/test.py')
try:
from tiramisu3 import *
from tiramisu4 import *
except:
from tiramisu import *
option_2 = BoolOption(name="server_deployed", doc="server_deployed", default=False, properties=frozenset({"mandatory", "normal"}))
option_1 = StrOption(name="myvar", doc="myvar", default="no", properties=frozenset({"basic", "force_store_value", "mandatory", Calculation(func.calc_value, Params(ParamValue('frozen'), kwargs={'condition': ParamOption(option_2, todict=True, notraisepropertyerror=True), 'expected': ParamValue(True)}))}))
option_1 = StrOption(name="myvar", doc="myvar", default="no", properties=frozenset({"basic", "force_store_value", "mandatory", Calculation(func.calc_value, Params(ParamValue('frozen'), kwargs={'condition': ParamOption(option_2, notraisepropertyerror=True), 'expected': ParamValue(True)}), func.calc_value_property_help)}))
optiondescription_3 = OptionDescription(name="rougail", doc="Rougail", children=[option_1, option_2])
option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_3])

View file

@ -15,15 +15,15 @@ def _load_functions(path):
setattr(func, function, getattr(func_, function))
_load_functions('tests/dictionaries/../eosfunc/test.py')
try:
from tiramisu3 import *
from tiramisu4 import *
except:
from tiramisu import *
option_2 = BoolOption(name="server_deployed", doc="server_deployed", default=False, properties=frozenset({"mandatory", "normal"}))
option_1 = StrOption(name="myvar", doc="myvar", default="no", properties=frozenset({"basic", "force_store_value", "mandatory", Calculation(func.calc_value, Params(ParamValue('frozen'), kwargs={'condition': ParamOption(option_2, todict=True, notraisepropertyerror=True), 'expected': ParamValue(True)}))}))
option_1 = StrOption(name="myvar", doc="myvar", default="no", properties=frozenset({"basic", "force_store_value", "mandatory", Calculation(func.calc_value, Params(ParamValue('frozen'), kwargs={'condition': ParamOption(option_2, notraisepropertyerror=True), 'expected': ParamValue(True)}), func.calc_value_property_help)}))
optiondescription_6 = OptionDescription(name="rougail", doc="Rougail", children=[option_1, option_2])
optiondescription_5 = OptionDescription(name="1", doc="1", children=[optiondescription_6])
option_4 = BoolOption(name="server_deployed", doc="server_deployed", default=False, properties=frozenset({"mandatory", "normal"}))
option_3 = StrOption(name="myvar", doc="myvar", default="no", properties=frozenset({"basic", "force_store_value", "mandatory", Calculation(func.calc_value, Params(ParamValue('frozen'), kwargs={'condition': ParamOption(option_4, todict=True, notraisepropertyerror=True), 'expected': ParamValue(True)}))}))
option_3 = StrOption(name="myvar", doc="myvar", default="no", properties=frozenset({"basic", "force_store_value", "mandatory", Calculation(func.calc_value, Params(ParamValue('frozen'), kwargs={'condition': ParamOption(option_4, notraisepropertyerror=True), 'expected': ParamValue(True)}), func.calc_value_property_help)}))
optiondescription_8 = OptionDescription(name="rougail", doc="Rougail", children=[option_3, option_4])
optiondescription_7 = OptionDescription(name="2", doc="2", children=[optiondescription_8])
option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_5, optiondescription_7])

View file

@ -15,10 +15,10 @@ def _load_functions(path):
setattr(func, function, getattr(func_, function))
_load_functions('tests/dictionaries/../eosfunc/test.py')
try:
from tiramisu3 import *
from tiramisu4 import *
except:
from tiramisu import *
option_2 = BoolOption(name="server_deployed", doc="server_deployed", default=False, properties=frozenset({"mandatory", "normal"}))
option_1 = StrOption(name="my_var", doc="my_var", default="no", properties=frozenset({"expert", "force_store_value", "mandatory", Calculation(func.calc_value, Params(ParamValue('frozen'), kwargs={'condition': ParamOption(option_2, todict=True, notraisepropertyerror=True), 'expected': ParamValue(True)}))}))
option_1 = StrOption(name="my_var", doc="my_var", default="no", properties=frozenset({"expert", "force_store_value", "mandatory", Calculation(func.calc_value, Params(ParamValue('frozen'), kwargs={'condition': ParamOption(option_2, notraisepropertyerror=True), 'expected': ParamValue(True)}), func.calc_value_property_help)}))
optiondescription_3 = OptionDescription(name="rougail", doc="Rougail", children=[option_1, option_2])
option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_3])

View file

@ -15,15 +15,15 @@ def _load_functions(path):
setattr(func, function, getattr(func_, function))
_load_functions('tests/dictionaries/../eosfunc/test.py')
try:
from tiramisu3 import *
from tiramisu4 import *
except:
from tiramisu import *
option_2 = BoolOption(name="server_deployed", doc="server_deployed", default=False, properties=frozenset({"mandatory", "normal"}))
option_1 = StrOption(name="my_var", doc="my_var", default="no", properties=frozenset({"expert", "force_store_value", "mandatory", Calculation(func.calc_value, Params(ParamValue('frozen'), kwargs={'condition': ParamOption(option_2, todict=True, notraisepropertyerror=True), 'expected': ParamValue(True)}))}))
option_1 = StrOption(name="my_var", doc="my_var", default="no", properties=frozenset({"expert", "force_store_value", "mandatory", Calculation(func.calc_value, Params(ParamValue('frozen'), kwargs={'condition': ParamOption(option_2, notraisepropertyerror=True), 'expected': ParamValue(True)}), func.calc_value_property_help)}))
optiondescription_6 = OptionDescription(name="rougail", doc="Rougail", children=[option_1, option_2])
optiondescription_5 = OptionDescription(name="1", doc="1", children=[optiondescription_6])
option_4 = BoolOption(name="server_deployed", doc="server_deployed", default=False, properties=frozenset({"mandatory", "normal"}))
option_3 = StrOption(name="my_var", doc="my_var", default="no", properties=frozenset({"expert", "force_store_value", "mandatory", Calculation(func.calc_value, Params(ParamValue('frozen'), kwargs={'condition': ParamOption(option_4, todict=True, notraisepropertyerror=True), 'expected': ParamValue(True)}))}))
option_3 = StrOption(name="my_var", doc="my_var", default="no", properties=frozenset({"expert", "force_store_value", "mandatory", Calculation(func.calc_value, Params(ParamValue('frozen'), kwargs={'condition': ParamOption(option_4, notraisepropertyerror=True), 'expected': ParamValue(True)}), func.calc_value_property_help)}))
optiondescription_8 = OptionDescription(name="rougail", doc="Rougail", children=[option_3, option_4])
optiondescription_7 = OptionDescription(name="2", doc="2", children=[optiondescription_8])
option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_5, optiondescription_7])

View file

@ -15,7 +15,7 @@ def _load_functions(path):
setattr(func, function, getattr(func_, function))
_load_functions('tests/dictionaries/../eosfunc/test.py')
try:
from tiramisu3 import *
from tiramisu4 import *
except:
from tiramisu import *
option_1 = BoolOption(name="server_deployed", doc="server_deployed", default=True, properties=frozenset({"mandatory", "normal"}))

View file

@ -15,7 +15,7 @@ def _load_functions(path):
setattr(func, function, getattr(func_, function))
_load_functions('tests/dictionaries/../eosfunc/test.py')
try:
from tiramisu3 import *
from tiramisu4 import *
except:
from tiramisu import *
option_1 = BoolOption(name="server_deployed", doc="server_deployed", default=True, properties=frozenset({"mandatory", "normal"}))

View file

@ -15,7 +15,7 @@ def _load_functions(path):
setattr(func, function, getattr(func_, function))
_load_functions('tests/dictionaries/../eosfunc/test.py')
try:
from tiramisu3 import *
from tiramisu4 import *
except:
from tiramisu import *
option_1 = BoolOption(name="server_deployed", doc="server_deployed", default=True, properties=frozenset({"mandatory", "normal"}))

View file

@ -15,7 +15,7 @@ def _load_functions(path):
setattr(func, function, getattr(func_, function))
_load_functions('tests/dictionaries/../eosfunc/test.py')
try:
from tiramisu3 import *
from tiramisu4 import *
except:
from tiramisu import *
option_1 = BoolOption(name="server_deployed", doc="server_deployed", default=True, properties=frozenset({"mandatory", "normal"}))

View file

@ -15,7 +15,7 @@ def _load_functions(path):
setattr(func, function, getattr(func_, function))
_load_functions('tests/dictionaries/../eosfunc/test.py')
try:
from tiramisu3 import *
from tiramisu4 import *
except:
from tiramisu import *
option_2 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal"}))

View file

@ -15,7 +15,7 @@ def _load_functions(path):
setattr(func, function, getattr(func_, function))
_load_functions('tests/dictionaries/../eosfunc/test.py')
try:
from tiramisu3 import *
from tiramisu4 import *
except:
from tiramisu import *
option_2 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal"}))

View file

@ -15,7 +15,7 @@ def _load_functions(path):
setattr(func, function, getattr(func_, function))
_load_functions('tests/dictionaries/../eosfunc/test.py')
try:
from tiramisu3 import *
from tiramisu4 import *
except:
from tiramisu import *
option_2 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal"}))

View file

@ -15,7 +15,7 @@ def _load_functions(path):
setattr(func, function, getattr(func_, function))
_load_functions('tests/dictionaries/../eosfunc/test.py')
try:
from tiramisu3 import *
from tiramisu4 import *
except:
from tiramisu import *
option_2 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal"}))

View file

@ -15,7 +15,7 @@ def _load_functions(path):
setattr(func, function, getattr(func_, function))
_load_functions('tests/dictionaries/../eosfunc/test.py')
try:
from tiramisu3 import *
from tiramisu4 import *
except:
from tiramisu import *
option_2 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal"}))

View file

@ -15,7 +15,7 @@ def _load_functions(path):
setattr(func, function, getattr(func_, function))
_load_functions('tests/dictionaries/../eosfunc/test.py')
try:
from tiramisu3 import *
from tiramisu4 import *
except:
from tiramisu import *
option_2 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal"}))

View file

@ -15,7 +15,7 @@ def _load_functions(path):
setattr(func, function, getattr(func_, function))
_load_functions('tests/dictionaries/../eosfunc/test.py')
try:
from tiramisu3 import *
from tiramisu4 import *
except:
from tiramisu import *
option_2 = StrOption(name="mode_conteneur_actif1", doc="No change", default="non", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal"}))

View file

@ -15,7 +15,7 @@ def _load_functions(path):
setattr(func, function, getattr(func_, function))
_load_functions('tests/dictionaries/../eosfunc/test.py')
try:
from tiramisu3 import *
from tiramisu4 import *
except:
from tiramisu import *
option_2 = StrOption(name="mode_conteneur_actif1", doc="No change", default="non", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal"}))

View file

@ -15,10 +15,10 @@ def _load_functions(path):
setattr(func, function, getattr(func_, function))
_load_functions('tests/dictionaries/../eosfunc/test.py')
try:
from tiramisu3 import *
from tiramisu4 import *
except:
from tiramisu import *
option_1 = BoolOption(name="server_deployed", doc="server_deployed", default=False, properties=frozenset({"mandatory", "normal"}))
option_2 = StrOption(name="my_variable", doc="my_variable", default=Calculation(func.calc_val, Params((ParamValue("yes")))), properties=frozenset({"basic", "force_store_value", "hidden", Calculation(func.calc_value, Params(ParamValue('frozen'), kwargs={'condition': ParamOption(option_1, todict=True, notraisepropertyerror=True), 'expected': ParamValue(True)}))}))
option_2 = StrOption(name="my_variable", doc="my_variable", default=Calculation(func.calc_val, Params((ParamValue("yes")))), properties=frozenset({"basic", "force_store_value", "hidden", Calculation(func.calc_value, Params(ParamValue('frozen'), kwargs={'condition': ParamOption(option_1, notraisepropertyerror=True), 'expected': ParamValue(True)}), func.calc_value_property_help)}))
optiondescription_3 = OptionDescription(name="rougail", doc="Rougail", children=[option_1, option_2])
option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_3])

View file

@ -15,15 +15,15 @@ def _load_functions(path):
setattr(func, function, getattr(func_, function))
_load_functions('tests/dictionaries/../eosfunc/test.py')
try:
from tiramisu3 import *
from tiramisu4 import *
except:
from tiramisu import *
option_1 = BoolOption(name="server_deployed", doc="server_deployed", default=False, properties=frozenset({"mandatory", "normal"}))
option_2 = StrOption(name="my_variable", doc="my_variable", default=Calculation(func.calc_val, Params((ParamValue("yes")))), properties=frozenset({"basic", "force_store_value", "hidden", Calculation(func.calc_value, Params(ParamValue('frozen'), kwargs={'condition': ParamOption(option_1, todict=True, notraisepropertyerror=True), 'expected': ParamValue(True)}))}))
option_2 = StrOption(name="my_variable", doc="my_variable", default=Calculation(func.calc_val, Params((ParamValue("yes")))), properties=frozenset({"basic", "force_store_value", "hidden", Calculation(func.calc_value, Params(ParamValue('frozen'), kwargs={'condition': ParamOption(option_1, notraisepropertyerror=True), 'expected': ParamValue(True)}), func.calc_value_property_help)}))
optiondescription_6 = OptionDescription(name="rougail", doc="Rougail", children=[option_1, option_2])
optiondescription_5 = OptionDescription(name="1", doc="1", children=[optiondescription_6])
option_3 = BoolOption(name="server_deployed", doc="server_deployed", default=False, properties=frozenset({"mandatory", "normal"}))
option_4 = StrOption(name="my_variable", doc="my_variable", default=Calculation(func.calc_val, Params((ParamValue("yes")))), properties=frozenset({"basic", "force_store_value", "hidden", Calculation(func.calc_value, Params(ParamValue('frozen'), kwargs={'condition': ParamOption(option_3, todict=True, notraisepropertyerror=True), 'expected': ParamValue(True)}))}))
option_4 = StrOption(name="my_variable", doc="my_variable", default=Calculation(func.calc_val, Params((ParamValue("yes")))), properties=frozenset({"basic", "force_store_value", "hidden", Calculation(func.calc_value, Params(ParamValue('frozen'), kwargs={'condition': ParamOption(option_3, notraisepropertyerror=True), 'expected': ParamValue(True)}), func.calc_value_property_help)}))
optiondescription_8 = OptionDescription(name="rougail", doc="Rougail", children=[option_3, option_4])
optiondescription_7 = OptionDescription(name="2", doc="2", children=[optiondescription_8])
option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_5, optiondescription_7])

View file

@ -15,7 +15,7 @@ def _load_functions(path):
setattr(func, function, getattr(func_, function))
_load_functions('tests/dictionaries/../eosfunc/test.py')
try:
from tiramisu3 import *
from tiramisu4 import *
except:
from tiramisu import *
option_3 = StrOption(name="mode_conteneur_actif1", doc="No change", default="non", properties=frozenset({"mandatory", "normal"}))

View file

@ -15,7 +15,7 @@ def _load_functions(path):
setattr(func, function, getattr(func_, function))
_load_functions('tests/dictionaries/../eosfunc/test.py')
try:
from tiramisu3 import *
from tiramisu4 import *
except:
from tiramisu import *
option_3 = StrOption(name="mode_conteneur_actif1", doc="No change", default="non", properties=frozenset({"mandatory", "normal"}))

View file

@ -15,7 +15,7 @@ def _load_functions(path):
setattr(func, function, getattr(func_, function))
_load_functions('tests/dictionaries/../eosfunc/test.py')
try:
from tiramisu3 import *
from tiramisu4 import *
except:
from tiramisu import *
option_2 = StrOption(name="mode_conteneur_actif", doc="No change", default=Calculation(func.calc_val, Params(())), properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "normal"}))

View file

@ -15,7 +15,7 @@ def _load_functions(path):
setattr(func, function, getattr(func_, function))
_load_functions('tests/dictionaries/../eosfunc/test.py')
try:
from tiramisu3 import *
from tiramisu4 import *
except:
from tiramisu import *
option_2 = StrOption(name="mode_conteneur_actif", doc="No change", default=Calculation(func.calc_val, Params(())), properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "normal"}))

View file

@ -15,7 +15,7 @@ def _load_functions(path):
setattr(func, function, getattr(func_, function))
_load_functions('tests/dictionaries/../eosfunc/test.py')
try:
from tiramisu3 import *
from tiramisu4 import *
except:
from tiramisu import *
option_1 = DomainnameOption(name="server_name", doc="server_name", default="example.net", type='domainname', allow_ip=False, properties=frozenset({"mandatory", "normal"}))

View file

@ -15,7 +15,7 @@ def _load_functions(path):
setattr(func, function, getattr(func_, function))
_load_functions('tests/dictionaries/../eosfunc/test.py')
try:
from tiramisu3 import *
from tiramisu4 import *
except:
from tiramisu import *
option_1 = DomainnameOption(name="server_name", doc="server_name", default="example.net", type='domainname', allow_ip=False, properties=frozenset({"mandatory", "normal"}))

View file

@ -15,7 +15,7 @@ def _load_functions(path):
setattr(func, function, getattr(func_, function))
_load_functions('tests/dictionaries/../eosfunc/test.py')
try:
from tiramisu3 import *
from tiramisu4 import *
except:
from tiramisu import *
option_1 = UsernameOption(name="owner", doc="owner", default="example", properties=frozenset({"mandatory", "normal"}))

View file

@ -15,7 +15,7 @@ def _load_functions(path):
setattr(func, function, getattr(func_, function))
_load_functions('tests/dictionaries/../eosfunc/test.py')
try:
from tiramisu3 import *
from tiramisu4 import *
except:
from tiramisu import *
option_1 = UsernameOption(name="owner", doc="owner", default="example", properties=frozenset({"mandatory", "normal"}))

View file

@ -15,7 +15,7 @@ def _load_functions(path):
setattr(func, function, getattr(func_, function))
_load_functions('tests/dictionaries/../eosfunc/test.py')
try:
from tiramisu3 import *
from tiramisu4 import *
except:
from tiramisu import *
option_2 = DomainnameOption(name="domain", doc="Description", default="my.domain.name", type='domainname', allow_ip=False, properties=frozenset({"mandatory", "normal"}))

View file

@ -15,7 +15,7 @@ def _load_functions(path):
setattr(func, function, getattr(func_, function))
_load_functions('tests/dictionaries/../eosfunc/test.py')
try:
from tiramisu3 import *
from tiramisu4 import *
except:
from tiramisu import *
option_2 = DomainnameOption(name="domain", doc="Description", default="my.domain.name", type='domainname', allow_ip=False, properties=frozenset({"mandatory", "normal"}))

View file

@ -15,7 +15,7 @@ def _load_functions(path):
setattr(func, function, getattr(func_, function))
_load_functions('tests/dictionaries/../eosfunc/test.py')
try:
from tiramisu3 import *
from tiramisu4 import *
except:
from tiramisu import *
option_2 = StrOption(name="mode_conteneur_actif", doc="Description", default="non", properties=frozenset({"mandatory", "normal"}))

View file

@ -15,7 +15,7 @@ def _load_functions(path):
setattr(func, function, getattr(func_, function))
_load_functions('tests/dictionaries/../eosfunc/test.py')
try:
from tiramisu3 import *
from tiramisu4 import *
except:
from tiramisu import *
option_2 = StrOption(name="mode_conteneur_actif", doc="Description", default="non", properties=frozenset({"mandatory", "normal"}))

View file

@ -15,7 +15,7 @@ def _load_functions(path):
setattr(func, function, getattr(func_, function))
_load_functions('tests/dictionaries/../eosfunc/test.py')
try:
from tiramisu3 import *
from tiramisu4 import *
except:
from tiramisu import *
option_2 = StrOption(name="mode_conteneur_actif", doc="Description", default="non", properties=frozenset({"mandatory", "normal"}))

View file

@ -15,7 +15,7 @@ def _load_functions(path):
setattr(func, function, getattr(func_, function))
_load_functions('tests/dictionaries/../eosfunc/test.py')
try:
from tiramisu3 import *
from tiramisu4 import *
except:
from tiramisu import *
option_2 = StrOption(name="mode_conteneur_actif", doc="Description", default="non", properties=frozenset({"mandatory", "normal"}))

View file

@ -15,7 +15,7 @@ def _load_functions(path):
setattr(func, function, getattr(func_, function))
_load_functions('tests/dictionaries/../eosfunc/test.py')
try:
from tiramisu3 import *
from tiramisu4 import *
except:
from tiramisu import *
option_2 = StrOption(name="mode_conteneur_actif", doc="Description", default="non", properties=frozenset({"mandatory", "normal"}))

View file

@ -15,7 +15,7 @@ def _load_functions(path):
setattr(func, function, getattr(func_, function))
_load_functions('tests/dictionaries/../eosfunc/test.py')
try:
from tiramisu3 import *
from tiramisu4 import *
except:
from tiramisu import *
option_2 = StrOption(name="mode_conteneur_actif", doc="Description", default="non", properties=frozenset({"mandatory", "normal"}))

View file

@ -15,7 +15,7 @@ def _load_functions(path):
setattr(func, function, getattr(func_, function))
_load_functions('tests/dictionaries/../eosfunc/test.py')
try:
from tiramisu3 import *
from tiramisu4 import *
except:
from tiramisu import *
option_2 = StrOption(name="mode_conteneur_actif", doc="Description", default="non", properties=frozenset({"mandatory", "normal"}))

View file

@ -15,7 +15,7 @@ def _load_functions(path):
setattr(func, function, getattr(func_, function))
_load_functions('tests/dictionaries/../eosfunc/test.py')
try:
from tiramisu3 import *
from tiramisu4 import *
except:
from tiramisu import *
option_2 = StrOption(name="mode_conteneur_actif", doc="Description", default="non", properties=frozenset({"mandatory", "normal"}))

View file

@ -15,7 +15,7 @@ def _load_functions(path):
setattr(func, function, getattr(func_, function))
_load_functions('tests/dictionaries/../eosfunc/test.py')
try:
from tiramisu3 import *
from tiramisu4 import *
except:
from tiramisu import *
option_2 = StrOption(name="mode_conteneur_actif", doc="Description", default="non", properties=frozenset({"mandatory", "normal"}))

View file

@ -15,7 +15,7 @@ def _load_functions(path):
setattr(func, function, getattr(func_, function))
_load_functions('tests/dictionaries/../eosfunc/test.py')
try:
from tiramisu3 import *
from tiramisu4 import *
except:
from tiramisu import *
option_2 = StrOption(name="mode_conteneur_actif", doc="Description", default="non", properties=frozenset({"mandatory", "normal"}))

View file

@ -15,7 +15,7 @@ def _load_functions(path):
setattr(func, function, getattr(func_, function))
_load_functions('tests/dictionaries/../eosfunc/test.py')
try:
from tiramisu3 import *
from tiramisu4 import *
except:
from tiramisu import *
option_5 = FilenameOption(name="name", doc="name", default="/etc/file")

View file

@ -15,7 +15,7 @@ def _load_functions(path):
setattr(func, function, getattr(func_, function))
_load_functions('tests/dictionaries/../eosfunc/test.py')
try:
from tiramisu3 import *
from tiramisu4 import *
except:
from tiramisu import *
option_5 = FilenameOption(name="name", doc="name", default="/etc/file")

View file

@ -15,7 +15,7 @@ def _load_functions(path):
setattr(func, function, getattr(func_, function))
_load_functions('tests/dictionaries/../eosfunc/test.py')
try:
from tiramisu3 import *
from tiramisu4 import *
except:
from tiramisu import *
option_5 = FilenameOption(name="name", doc="name", default="/etc/file")

View file

@ -15,7 +15,7 @@ def _load_functions(path):
setattr(func, function, getattr(func_, function))
_load_functions('tests/dictionaries/../eosfunc/test.py')
try:
from tiramisu3 import *
from tiramisu4 import *
except:
from tiramisu import *
option_5 = FilenameOption(name="name", doc="name", default="/etc/file")

View file

@ -15,7 +15,7 @@ def _load_functions(path):
setattr(func, function, getattr(func_, function))
_load_functions('tests/dictionaries/../eosfunc/test.py')
try:
from tiramisu3 import *
from tiramisu4 import *
except:
from tiramisu import *
option_2 = StrOption(name="mode_conteneur_actif", doc="Description", default="non", properties=frozenset({"mandatory", "normal"}))

View file

@ -15,7 +15,7 @@ def _load_functions(path):
setattr(func, function, getattr(func_, function))
_load_functions('tests/dictionaries/../eosfunc/test.py')
try:
from tiramisu3 import *
from tiramisu4 import *
except:
from tiramisu import *
option_2 = StrOption(name="mode_conteneur_actif", doc="Description", default="non", properties=frozenset({"mandatory", "normal"}))

View file

@ -15,7 +15,7 @@ def _load_functions(path):
setattr(func, function, getattr(func_, function))
_load_functions('tests/dictionaries/../eosfunc/test.py')
try:
from tiramisu3 import *
from tiramisu4 import *
except:
from tiramisu import *
option_2 = StrOption(name="mode_conteneur_actif", doc="Description", default="non", properties=frozenset({"mandatory", "normal"}))

View file

@ -15,7 +15,7 @@ def _load_functions(path):
setattr(func, function, getattr(func_, function))
_load_functions('tests/dictionaries/../eosfunc/test.py')
try:
from tiramisu3 import *
from tiramisu4 import *
except:
from tiramisu import *
option_2 = StrOption(name="mode_conteneur_actif", doc="Description", default="non", properties=frozenset({"mandatory", "normal"}))

View file

@ -15,7 +15,7 @@ def _load_functions(path):
setattr(func, function, getattr(func_, function))
_load_functions('tests/dictionaries/../eosfunc/test.py')
try:
from tiramisu3 import *
from tiramisu4 import *
except:
from tiramisu import *
option_2 = StrOption(name="mode_conteneur_actif", doc="Description", default="non", properties=frozenset({"mandatory", "normal"}))

View file

@ -15,7 +15,7 @@ def _load_functions(path):
setattr(func, function, getattr(func_, function))
_load_functions('tests/dictionaries/../eosfunc/test.py')
try:
from tiramisu3 import *
from tiramisu4 import *
except:
from tiramisu import *
option_2 = StrOption(name="mode_conteneur_actif", doc="Description", default="non", properties=frozenset({"mandatory", "normal"}))

View file

@ -15,7 +15,7 @@ def _load_functions(path):
setattr(func, function, getattr(func_, function))
_load_functions('tests/dictionaries/../eosfunc/test.py')
try:
from tiramisu3 import *
from tiramisu4 import *
except:
from tiramisu import *
option_2 = StrOption(name="mode_conteneur_actif", doc="Description", default="non", properties=frozenset({"mandatory", "normal"}))

View file

@ -15,7 +15,7 @@ def _load_functions(path):
setattr(func, function, getattr(func_, function))
_load_functions('tests/dictionaries/../eosfunc/test.py')
try:
from tiramisu3 import *
from tiramisu4 import *
except:
from tiramisu import *
option_2 = StrOption(name="mode_conteneur_actif", doc="Description", default="non", properties=frozenset({"mandatory", "normal"}))

View file

@ -15,7 +15,7 @@ def _load_functions(path):
setattr(func, function, getattr(func_, function))
_load_functions('tests/dictionaries/../eosfunc/test.py')
try:
from tiramisu3 import *
from tiramisu4 import *
except:
from tiramisu import *
option_2 = StrOption(name="mode_conteneur_actif", doc="Description", default="non", properties=frozenset({"mandatory", "normal"}))

View file

@ -15,7 +15,7 @@ def _load_functions(path):
setattr(func, function, getattr(func_, function))
_load_functions('tests/dictionaries/../eosfunc/test.py')
try:
from tiramisu3 import *
from tiramisu4 import *
except:
from tiramisu import *
option_2 = StrOption(name="mode_conteneur_actif", doc="Description", default="non", properties=frozenset({"mandatory", "normal"}))

View file

@ -15,7 +15,7 @@ def _load_functions(path):
setattr(func, function, getattr(func_, function))
_load_functions('tests/dictionaries/../eosfunc/test.py')
try:
from tiramisu3 import *
from tiramisu4 import *
except:
from tiramisu import *
option_2 = StrOption(name="mode_conteneur_actif", doc="Description", default="non", properties=frozenset({"mandatory", "normal"}))

View file

@ -15,7 +15,7 @@ def _load_functions(path):
setattr(func, function, getattr(func_, function))
_load_functions('tests/dictionaries/../eosfunc/test.py')
try:
from tiramisu3 import *
from tiramisu4 import *
except:
from tiramisu import *
option_2 = StrOption(name="mode_conteneur_actif", doc="Description", default="non", properties=frozenset({"mandatory", "normal"}))

View file

@ -15,7 +15,7 @@ def _load_functions(path):
setattr(func, function, getattr(func_, function))
_load_functions('tests/dictionaries/../eosfunc/test.py')
try:
from tiramisu3 import *
from tiramisu4 import *
except:
from tiramisu import *
option_2 = StrOption(name="source_var", doc="Description", default="file", properties=frozenset({"mandatory", "normal"}))

View file

@ -15,7 +15,7 @@ def _load_functions(path):
setattr(func, function, getattr(func_, function))
_load_functions('tests/dictionaries/../eosfunc/test.py')
try:
from tiramisu3 import *
from tiramisu4 import *
except:
from tiramisu import *
option_2 = StrOption(name="source_var", doc="Description", default="file", properties=frozenset({"mandatory", "normal"}))

View file

@ -15,7 +15,7 @@ def _load_functions(path):
setattr(func, function, getattr(func_, function))
_load_functions('tests/dictionaries/../eosfunc/test.py')
try:
from tiramisu3 import *
from tiramisu4 import *
except:
from tiramisu import *
option_2 = FloatOption(name="float", doc="Description", default=0.527, properties=frozenset({"mandatory", "normal"}))

View file

@ -15,7 +15,7 @@ def _load_functions(path):
setattr(func, function, getattr(func_, function))
_load_functions('tests/dictionaries/../eosfunc/test.py')
try:
from tiramisu3 import *
from tiramisu4 import *
except:
from tiramisu import *
option_2 = FloatOption(name="float", doc="Description", default=0.527, properties=frozenset({"mandatory", "normal"}))

View file

@ -15,7 +15,7 @@ def _load_functions(path):
setattr(func, function, getattr(func_, function))
_load_functions('tests/dictionaries/../eosfunc/test.py')
try:
from tiramisu3 import *
from tiramisu4 import *
except:
from tiramisu import *
option_2 = StrOption(name="mode_conteneur_actif", doc="Redefine description", properties=frozenset({"normal"}))

View file

@ -15,7 +15,7 @@ def _load_functions(path):
setattr(func, function, getattr(func_, function))
_load_functions('tests/dictionaries/../eosfunc/test.py')
try:
from tiramisu3 import *
from tiramisu4 import *
except:
from tiramisu import *
option_2 = StrOption(name="mode_conteneur_actif", doc="Redefine description", properties=frozenset({"normal"}))

View file

@ -15,7 +15,7 @@ def _load_functions(path):
setattr(func, function, getattr(func_, function))
_load_functions('tests/dictionaries/../eosfunc/test.py')
try:
from tiramisu3 import *
from tiramisu4 import *
except:
from tiramisu import *
option_2 = StrOption(name="mode_conteneur_actif", doc="Redefine description", multi=True, default=['non'], default_multi="non", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal"}))

View file

@ -15,7 +15,7 @@ def _load_functions(path):
setattr(func, function, getattr(func_, function))
_load_functions('tests/dictionaries/../eosfunc/test.py')
try:
from tiramisu3 import *
from tiramisu4 import *
except:
from tiramisu import *
option_2 = StrOption(name="mode_conteneur_actif", doc="Redefine description", multi=True, default=['non'], default_multi="non", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal"}))

View file

@ -15,7 +15,7 @@ def _load_functions(path):
setattr(func, function, getattr(func_, function))
_load_functions('tests/dictionaries/../eosfunc/test.py')
try:
from tiramisu3 import *
from tiramisu4 import *
except:
from tiramisu import *
option_2 = StrOption(name="mode_conteneur_actif", doc="Redefine description", multi=True, default=['non'], default_multi="non", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal", "notunique"}))

View file

@ -15,7 +15,7 @@ def _load_functions(path):
setattr(func, function, getattr(func_, function))
_load_functions('tests/dictionaries/../eosfunc/test.py')
try:
from tiramisu3 import *
from tiramisu4 import *
except:
from tiramisu import *
option_2 = StrOption(name="mode_conteneur_actif", doc="Redefine description", multi=True, default=['non'], default_multi="non", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal", "notunique"}))

View file

@ -15,7 +15,7 @@ def _load_functions(path):
setattr(func, function, getattr(func_, function))
_load_functions('tests/dictionaries/../eosfunc/test.py')
try:
from tiramisu3 import *
from tiramisu4 import *
except:
from tiramisu import *
option_2 = StrOption(name="mode_conteneur_actif", doc="Redefine description", multi=True, default=['non'], default_multi="non", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal", "unique"}))

View file

@ -15,7 +15,7 @@ def _load_functions(path):
setattr(func, function, getattr(func_, function))
_load_functions('tests/dictionaries/../eosfunc/test.py')
try:
from tiramisu3 import *
from tiramisu4 import *
except:
from tiramisu import *
option_2 = StrOption(name="mode_conteneur_actif", doc="Redefine description", multi=True, default=['non'], default_multi="non", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal", "unique"}))

View file

@ -15,7 +15,7 @@ def _load_functions(path):
setattr(func, function, getattr(func_, function))
_load_functions('tests/dictionaries/../eosfunc/test.py')
try:
from tiramisu3 import *
from tiramisu4 import *
except:
from tiramisu import *
option_2 = FloatOption(name="float", doc="Description", default=0.527, properties=frozenset({"mandatory", "normal"}))

View file

@ -15,7 +15,7 @@ def _load_functions(path):
setattr(func, function, getattr(func_, function))
_load_functions('tests/dictionaries/../eosfunc/test.py')
try:
from tiramisu3 import *
from tiramisu4 import *
except:
from tiramisu import *
option_2 = FloatOption(name="float", doc="Description", default=0.527, properties=frozenset({"mandatory", "normal"}))

View file

@ -15,7 +15,7 @@ def _load_functions(path):
setattr(func, function, getattr(func_, function))
_load_functions('tests/dictionaries/../eosfunc/test.py')
try:
from tiramisu3 import *
from tiramisu4 import *
except:
from tiramisu import *
option_1 = FloatOption(name="float", doc="Description", properties=frozenset({"normal"}))

View file

@ -15,7 +15,7 @@ def _load_functions(path):
setattr(func, function, getattr(func_, function))
_load_functions('tests/dictionaries/../eosfunc/test.py')
try:
from tiramisu3 import *
from tiramisu4 import *
except:
from tiramisu import *
option_1 = FloatOption(name="float", doc="Description", properties=frozenset({"normal"}))

View file

@ -15,7 +15,7 @@ def _load_functions(path):
setattr(func, function, getattr(func_, function))
_load_functions('tests/dictionaries/../eosfunc/test.py')
try:
from tiramisu3 import *
from tiramisu4 import *
except:
from tiramisu import *
option_2 = FloatOption(name="float", doc="Description", default=0.527, properties=frozenset({"hidden", "mandatory", "normal"}))

View file

@ -15,7 +15,7 @@ def _load_functions(path):
setattr(func, function, getattr(func_, function))
_load_functions('tests/dictionaries/../eosfunc/test.py')
try:
from tiramisu3 import *
from tiramisu4 import *
except:
from tiramisu import *
option_2 = FloatOption(name="float", doc="Description", default=0.527, properties=frozenset({"hidden", "mandatory", "normal"}))

View file

@ -15,7 +15,7 @@ def _load_functions(path):
setattr(func, function, getattr(func_, function))
_load_functions('tests/dictionaries/../eosfunc/test.py')
try:
from tiramisu3 import *
from tiramisu4 import *
except:
from tiramisu import *
option_2 = StrOption(name="mode_conteneur_actif", doc="Redefine description", default="quote\"", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal"}))

View file

@ -15,7 +15,7 @@ def _load_functions(path):
setattr(func, function, getattr(func_, function))
_load_functions('tests/dictionaries/../eosfunc/test.py')
try:
from tiramisu3 import *
from tiramisu4 import *
except:
from tiramisu import *
option_2 = StrOption(name="mode_conteneur_actif", doc="Redefine description", default="quote\"", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal"}))

View file

@ -15,7 +15,7 @@ def _load_functions(path):
setattr(func, function, getattr(func_, function))
_load_functions('tests/dictionaries/../eosfunc/test.py')
try:
from tiramisu3 import *
from tiramisu4 import *
except:
from tiramisu import *
option_2 = StrOption(name="mode_conteneur_actif", doc="Redefine description", default="quote'\"", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal"}))

View file

@ -15,7 +15,7 @@ def _load_functions(path):
setattr(func, function, getattr(func_, function))
_load_functions('tests/dictionaries/../eosfunc/test.py')
try:
from tiramisu3 import *
from tiramisu4 import *
except:
from tiramisu import *
option_2 = StrOption(name="mode_conteneur_actif", doc="Redefine description", default="quote'\"", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal"}))

View file

@ -15,7 +15,7 @@ def _load_functions(path):
setattr(func, function, getattr(func_, function))
_load_functions('tests/dictionaries/../eosfunc/test.py')
try:
from tiramisu3 import *
from tiramisu4 import *
except:
from tiramisu import *
option_2 = StrOption(name="mode_conteneur_actif", doc="Redefine description", default="quote\\\"\\'", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal"}))

View file

@ -15,7 +15,7 @@ def _load_functions(path):
setattr(func, function, getattr(func_, function))
_load_functions('tests/dictionaries/../eosfunc/test.py')
try:
from tiramisu3 import *
from tiramisu4 import *
except:
from tiramisu import *
option_2 = StrOption(name="mode_conteneur_actif", doc="Redefine description", default="quote\\\"\\'", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal"}))

View file

@ -15,7 +15,7 @@ def _load_functions(path):
setattr(func, function, getattr(func_, function))
_load_functions('tests/dictionaries/../eosfunc/test.py')
try:
from tiramisu3 import *
from tiramisu4 import *
except:
from tiramisu import *
option_2 = StrOption(name="mode_conteneur_actif", doc="Redefine description", multi=True, default=['quote"'], default_multi="quote\"", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal"}))

View file

@ -15,7 +15,7 @@ def _load_functions(path):
setattr(func, function, getattr(func_, function))
_load_functions('tests/dictionaries/../eosfunc/test.py')
try:
from tiramisu3 import *
from tiramisu4 import *
except:
from tiramisu import *
option_2 = StrOption(name="mode_conteneur_actif", doc="Redefine description", multi=True, default=['quote"'], default_multi="quote\"", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal"}))

View file

@ -15,7 +15,7 @@ def _load_functions(path):
setattr(func, function, getattr(func_, function))
_load_functions('tests/dictionaries/../eosfunc/test.py')
try:
from tiramisu3 import *
from tiramisu4 import *
except:
from tiramisu import *
option_2 = StrOption(name="mode_conteneur_actif", doc="Redefine description", multi=True, default=['quote\'"'], default_multi="quote'\"", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal"}))

View file

@ -15,7 +15,7 @@ def _load_functions(path):
setattr(func, function, getattr(func_, function))
_load_functions('tests/dictionaries/../eosfunc/test.py')
try:
from tiramisu3 import *
from tiramisu4 import *
except:
from tiramisu import *
option_2 = StrOption(name="mode_conteneur_actif", doc="Redefine description", multi=True, default=['quote\'"'], default_multi="quote'\"", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal"}))

View file

@ -15,7 +15,7 @@ def _load_functions(path):
setattr(func, function, getattr(func_, function))
_load_functions('tests/dictionaries/../eosfunc/test.py')
try:
from tiramisu3 import *
from tiramisu4 import *
except:
from tiramisu import *
option_2 = StrOption(name="mode_conteneur_actif", doc="Redefine description", multi=True, default=["quote'"], default_multi="quote'", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal"}))

View file

@ -15,7 +15,7 @@ def _load_functions(path):
setattr(func, function, getattr(func_, function))
_load_functions('tests/dictionaries/../eosfunc/test.py')
try:
from tiramisu3 import *
from tiramisu4 import *
except:
from tiramisu import *
option_2 = StrOption(name="mode_conteneur_actif", doc="Redefine description", multi=True, default=["quote'"], default_multi="quote'", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal"}))

View file

@ -15,7 +15,7 @@ def _load_functions(path):
setattr(func, function, getattr(func_, function))
_load_functions('tests/dictionaries/../eosfunc/test.py')
try:
from tiramisu3 import *
from tiramisu4 import *
except:
from tiramisu import *
option_2 = StrOption(name="mode_conteneur_actif", doc="Redefine description", default="quote'", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal"}))

Some files were not shown because too many files have changed in this diff Show more