diff --git a/CHANGELOG.md b/CHANGELOG.md index e27685654..e521d4129 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,9 @@ +## 1.2.0a29 (2025-06-20) + +### Fix + +- UserDatas, do now set modified option in second round + ## 1.2.0a28 (2025-06-18) ### Fix diff --git a/pyproject.toml b/pyproject.toml index 90a0196fc..4a75d2489 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [project] name = "rougail" -version = "1.2.0a28" +version = "1.2.0a29" [tool.commitizen] name = "cz_conventional_commits" diff --git a/rougail-base-pyproject.toml b/rougail-base-pyproject.toml index 62957ef88..f262bc72a 100644 --- a/rougail-base-pyproject.toml +++ b/rougail-base-pyproject.toml @@ -4,7 +4,7 @@ requires = ["flit_core >=3.8.0,<4"] [project] name = "rougail-base" -version = "1.2.0a28" +version = "1.2.0a29" authors = [{name = "Emmanuel Garette", email = "gnunux@gnunux.info"}] readme = "README.md" description = "A consistency handling system that was initially designed in the configuration management" diff --git a/rougail-pyproject.toml b/rougail-pyproject.toml index b9b17e4dd..aa84fbd75 100644 --- a/rougail-pyproject.toml +++ b/rougail-pyproject.toml @@ -4,7 +4,7 @@ requires = ["flit_core >=3.8.0,<4"] [project] name = "rougail" -version = "1.2.0a28" +version = "1.2.0a29" 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.0a28", + "rougail-base == 1.2.0a29", ] [tool.flit.sdist] diff --git a/src/rougail/__version__.py b/src/rougail/__version__.py index f7040b982..e9ee28ad1 100644 --- a/src/rougail/__version__.py +++ b/src/rougail/__version__.py @@ -1 +1 @@ -__version__ = "1.2.0a28" +__version__ = "1.2.0a29" diff --git a/src/rougail/convert/object_model.py b/src/rougail/convert/object_model.py index 12bb0d272..7908a4956 100644 --- a/src/rougail/convert/object_model.py +++ b/src/rougail/convert/object_model.py @@ -28,13 +28,12 @@ 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 +from ..utils import get_jinja_variable_to_param, calc_multi_for_type_variable, undefined, PROPERTY_ATTRIBUTE 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(): diff --git a/src/rougail/utils.py b/src/rougail/utils.py index 8ed16d099..44e393e26 100644 --- a/src/rougail/utils.py +++ b/src/rougail/utils.py @@ -44,6 +44,8 @@ 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,