CHANGELOG.md

@@ -1,9 +1,3 @@
-## 1.2.0a29 (2025-06-20)
-
-### Fix
-
-- UserDatas, do now set modified option in second round
-
 ## 1.2.0a28 (2025-06-18)
 
 ### Fix

pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "rougail"
-version = "1.2.0a29"
+version = "1.2.0a28"
 
 [tool.commitizen]
 name = "cz_conventional_commits"

rougail-base-pyproject.toml

@@ -4,7 +4,7 @@ requires = ["flit_core >=3.8.0,<4"]
 
 [project]
 name = "rougail-base"
-version = "1.2.0a29"
+version = "1.2.0a28"
 authors = [{name = "Emmanuel Garette", email = "gnunux@gnunux.info"}]
 readme = "README.md"
 description = "A consistency handling system that was initially designed in the configuration management"

rougail-pyproject.toml

@@ -4,7 +4,7 @@ requires = ["flit_core >=3.8.0,<4"]
 
 [project]
 name = "rougail"
-version = "1.2.0a29"
+version = "1.2.0a28"
 authors = [{name = "Emmanuel Garette", email = "gnunux@gnunux.info"}]
 description = "A consistency handling system that was initially designed in the configuration management"
 classifiers = [
@@ -18,7 +18,7 @@ classifiers = [
 dependencies = [
     "ruamel.yaml ~= 0.18.6",
     "pydantic ~= 2.9.2",
-    "rougail-base == 1.2.0a29",
+    "rougail-base == 1.2.0a28",
 ]
 
 [tool.flit.sdist]

src/rougail/__version__.py

@@ -1 +1 @@
-__version__ = "1.2.0a29"
+__version__ = "1.2.0a28"

src/rougail/convert/object_model.py

@@ -28,12 +28,13 @@ from pydantic import (
 )
 import tiramisu
 from tiramisu.config import get_common_path
-from ..utils import get_jinja_variable_to_param, calc_multi_for_type_variable, undefined, PROPERTY_ATTRIBUTE
+from ..utils import get_jinja_variable_to_param, calc_multi_for_type_variable, undefined
 from ..i18n import _
 from ..error import DictConsistencyError, VariableCalculationDependencyError
 from ..tiramisu import CONVERT_OPTION
 
 BASETYPE = Union[StrictBool, StrictInt, StrictFloat, StrictStr, None]
+PROPERTY_ATTRIBUTE = ["frozen", "hidden", "disabled", "mandatory"]
 
 
 def get_convert_option_types():

src/rougail/user_datas.py

@@ -22,7 +22,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 from typing import List
 from re import findall
 
-from tiramisu import Calculation, owners
+from tiramisu import Calculation
 from tiramisu.error import (
     PropertiesOptionError,
     AttributeOptionError,
@@ -46,13 +46,11 @@ class UserDatas:
            *,
            return_values_not_error=False,
            user_datas_type: str="user_datas",
-           only_default: bool=False,
         ):
         self.values = {}
         self.errors = []
         self.warnings = []
         self.show_secrets = False
-        self.only_default = only_default
         if user_datas_type == "user_datas":
             self._populate_values(user_datas)
         else:
@@ -200,9 +198,6 @@ class UserDatas:
                 path = option.path()
                 if path not in self.values:
                     continue
-                if self.only_default and option.owner.get() != owners.default:
-                    self.values.pop(path)
-                    continue
                 options = self.values[path].get("options", {})
                 if (
                     options.get("allow_secrets_variables", True) is False

src/rougail/utils.py

@@ -44,8 +44,6 @@ from .error import DictConsistencyError
 
 NAME_REGEXP = re.compile(r"^[a-z0-9_]*$")
 
-PROPERTY_ATTRIBUTE = ["frozen", "hidden", "disabled", "mandatory"]
-
 
 def valid_variable_family_name(
     name: str,