pyproject.toml

@@ -4,7 +4,7 @@ requires = ["flit_core >=3.8.0,<4"]
 
 [project]
 name = "tiramisu"
-version = "5.2.0a16"
+version = "5.2.0a15"
 authors = [{name = "Emmanuel Garette", email = "gnunux@gnunux.info"}]
 readme = "README.md"
 description = "an options controller tool"

tiramisu/__version__.py

@@ -1 +1 @@
-__version__ = "5.2.0a16"
+__version__ = "5.2.0a15"

tiramisu/api.py

@@ -420,7 +420,7 @@ class _TiramisuOptionOptionDescription:
         index = self._index
         parent = self._subconfig.parent
         parent_option = parent.option
-        for is_default, woption in self._subconfig.option.get_dependencies(
+        for woption in self._subconfig.option.get_dependencies(
             self._config_bag.context
         ):
             option = woption()
@@ -428,10 +428,6 @@ class _TiramisuOptionOptionDescription:
                 for subconfig in context.get_dynamic_from_dyn_option(
                     self._subconfig, option
                 ):
-                    if subconfig.properties is None:
-                        subconfig.properties = undefined
-                    if is_default and subconfig.config_bag.context.get_owner(subconfig) != owners.default:
-                        continue
                     options.append(
                         TiramisuOption(
                             subconfig.path,
@@ -443,8 +439,6 @@ class _TiramisuOptionOptionDescription:
                 for subconfig in context.get_dynamic_from_dyn_option(
                     self._subconfig, option
                 ):
-                    if is_default and subconfig.config_bag.context.get_owner(subconfig) != owners.default:
-                        continue
                     options.append(
                         TiramisuOption(
                             subconfig.path,
@@ -466,18 +460,13 @@ class _TiramisuOptionOptionDescription:
                 else:
                     current_indexes = [None]
                 for current_index in current_indexes:
-                    t_option = TiramisuOption(
+                    options.append(
+                        TiramisuOption(
                             option.impl_getpath(),
                             current_index,
                             self._config_bag,
                             allow_dynoption=uncalculated,
                         )
-                    t_option._set_subconfig()
-                    subconfig = t_option._subconfig
-                    if is_default and subconfig.config_bag.context.get_owner(subconfig) != owners.default:
-                        continue
-                    options.append(
-                            t_option,
                     )
         return options
 

tiramisu/config.py

@@ -74,7 +74,6 @@ class CCache:
             self.reset_one_option_cache(
                 subconfig,
                 resetted_opts,
-                False,
             )
             subconfig.config_bag.properties = subconfig.config_bag.properties | {
                 "cache"
@@ -87,16 +86,13 @@ class CCache:
         self,
         subconfig,
         resetted_opts,
-        is_default,
     ):
         """reset cache for one option"""
         if subconfig.path in resetted_opts:
             return
         resetted_opts.append(subconfig.path)
         config_bag = subconfig.config_bag
-#        if is_default and config_bag.context.get_owner(subconfig) != owners.default:
+        for woption in subconfig.option.get_dependencies(subconfig.option):
-#            return
-        for is_default, woption in subconfig.option.get_dependencies(subconfig.option):
             option = woption()
             if option.issubdyn():
                 # it's an option in dynoptiondescription, remove cache for all generated option
@@ -104,14 +100,12 @@ class CCache:
                     subconfig,
                     option,
                     resetted_opts,
-                    is_default,
                 )
             elif option.impl_is_dynoptiondescription():
                 self.reset_cache_dyn_optiondescription(
                     option,
                     config_bag,
                     resetted_opts,
-                    is_default,
                 )
             else:
                 option_subconfig = self.get_sub_config(
@@ -124,7 +118,6 @@ class CCache:
                 self.reset_one_option_cache(
                     option_subconfig,
                     resetted_opts,
-                    is_default,
                 )
             del option
         subconfig.option.reset_cache(
@@ -156,7 +149,6 @@ class CCache:
         option,
         config_bag,
         resetted_opts,
-        is_default,
     ):
         # reset cache for all chidren
         for subconfig in self.get_dynamic_from_dyn_optiondescription(
@@ -166,7 +158,6 @@ class CCache:
             self.reset_one_option_cache(
                 subconfig,
                 resetted_opts,
-                is_default,
             )
             for walk_subconfig in self.walk(
                 subconfig,
@@ -176,7 +167,6 @@ class CCache:
                 self.reset_one_option_cache(
                     walk_subconfig,
                     resetted_opts,
-                    is_default,
                 )
 
     def get_dynamic_from_dyn_option(self, subconfig, option):
@@ -233,13 +223,11 @@ class CCache:
         subconfig,
         option,
         resetted_opts,
-        is_default,
     ):
         for dyn_option_subconfig in self.get_dynamic_from_dyn_option(subconfig, option):
             self.reset_one_option_cache(
                 dyn_option_subconfig,
                 resetted_opts,
-                is_default,
             )
 
 

tiramisu/option/baseoption.py

@@ -106,7 +106,7 @@ class Base:
                     )
                 for param in chain(prop.params.args, prop.params.kwargs.values()):
                     if isinstance(param, ParamOption):
-                        param.option._add_dependency(self, "property")
+                        param.option._add_dependency(self)
         if properties:
             _setattr(self, "_properties", properties)
         self.set_informations(informations)
@@ -150,12 +150,11 @@ class Base:
     def _add_dependency(
         self,
         option,
-        type_,
         is_identifier: bool = False,
     ) -> None:
         woption = weakref.ref(option)
         options = self.get_dependencies(None)
-        options.add((type_ == "default", woption))
+        options.add(woption)
         self._dependencies = tuple(
             options
         )  # pylint: disable=attribute-defined-outside-init
@@ -400,11 +399,7 @@ class BaseOption(Base):
         for param in chain(value.params.args, value.params.kwargs.values()):
             if isinstance(param, ParamOption):
                 # pylint: disable=protected-access
-                if is_identifier:
+                param.option._add_dependency(self, is_identifier=is_identifier)
-                    type_ = "identifier"
-                else:
-                    type_ = "default"
-                param.option._add_dependency(self, type_, is_identifier=is_identifier)
                 self._has_dependency = True
             elif isinstance(param, ParamInformation):
                 dest = self

tiramisu/option/choiceoption.py

@@ -47,7 +47,7 @@ class ChoiceOption(Option):
         if isinstance(values, Calculation):
             for param in chain(values.params.args, values.params.kwargs.values()):
                 if isinstance(param, ParamOption):
-                    param.option._add_dependency(self, "choice")
+                    param.option._add_dependency(self)
         elif not isinstance(values, tuple):
             raise TypeError(
                 _("values must be a tuple or a calculation for {0}").format(name)

tiramisu/option/leadership.py

@@ -75,7 +75,7 @@ class Leadership(OptionDescription):
                 # remove empty property for follower
                 child._properties = frozenset(child._properties - {"empty", "unique"})
                 followers.append(child)
-            child._add_dependency(self, "leadership")
+            child._add_dependency(self)
             child._leadership = weakref.ref(self)
         if __debug__:
             leader = children[0]

tiramisu/option/symlinkoption.py

@@ -55,7 +55,7 @@ class SymLinkOption(BaseOption):
         self._name = name
         self._opt = opt
         self._leadership = None
-        opt._add_dependency(self, "symlink")
+        opt._add_dependency(self)
 
     def __getattr__(
         self,

tiramisu/setting.py

@@ -143,29 +143,6 @@ RW_REMOVE = frozenset(
 )
 
 
-PROPERTIES_MAKE_SENSE = (
-    "cache"
-    "demoting_error_warning",
-    "disabled",
-    "empty",
-    "everything_frozen",
-    "expire",
-    "force_default_on_freeze",
-    "force_metaconfig_on_freeze",
-    "force_store_value",
-    "frozen",
-    "hidden",
-    "mandatory",
-    "notempty",
-    "notunique",
-    "novalidator",
-    "permissive",
-    "unique",
-    "validator",
-    "warnings",
-)
-
-
 FORBIDDEN_SET_PROPERTIES = frozenset(["force_store_value"])
 FORBIDDEN_SET_PERMISSIVES = frozenset(
     [

tiramisu/value.py

@@ -511,10 +511,9 @@ class Values:
                                  was present
         :returns: a `setting.owners.Owner` object
         """
-        s_properties = subconfig.properties
         if (
-            "frozen" in s_properties
+            "frozen" in subconfig.properties
-            and "force_default_on_freeze" in s_properties
+            and "force_default_on_freeze" in subconfig.properties
         ):
             return owners.default
         if only_default:
@@ -532,8 +531,8 @@ class Values:
             )[1]
         if validate_meta is not False and (
             owner is owners.default
-            or "frozen" in s_properties
+            or "frozen" in subconfig.properties
-            and "force_metaconfig_on_freeze" in s_properties
+            and "force_metaconfig_on_freeze" in subconfig.properties
         ):
             msubconfig = self._get_modified_parent(subconfig)
             if msubconfig is not None:
@@ -542,7 +541,7 @@ class Values:
                     msubconfig,
                     only_default=only_default,
                 )
-            elif "force_metaconfig_on_freeze" in s_properties:
+            elif "force_metaconfig_on_freeze" in subconfig.properties:
                 owner = owners.default
         return owner