CHANGELOG.md

@@ -1,13 +1,3 @@
-## 0.1.0a21 (2025-11-06)
-
-### Feat
-
-- add some tests
-
-### Fix
-
-- always remove choice type + support warnings
-
 ## 0.1.0a20 (2025-11-03)
 
 ### Feat

pyproject.toml

@@ -4,7 +4,7 @@ requires = ["flit_core >=3.8.0,<4"]
 
 [project]
 name = "rougail.output_formatter"
-version = "0.1.0a21"
+version = "0.1.0a20"
 authors = [{name = "Emmanuel Garette", email = "gnunux@gnunux.info"}]
 readme = "README.md"
 description = "Rougail output formatter"

src/rougail/output_formatter/__init__.py

@@ -152,6 +152,8 @@ class RougailOutputFormatter:
 
     def get_attributes(self, obj, excludes=[]) -> dict:
         type_name = obj.__name__
+        if type_name == "Variable" and excludes == []:
+            raise Exception("pff")
         if type_name not in self.attributes:
             self.attributes[type_name] = {
                 str(attr): o.default
@@ -390,6 +392,8 @@ class RougailOutputFormatter:
                 and isinstance(variable["default"], list)
             ):
                 del variable["multi"]
+        elif variable.get("type") == "choice" and "choices" in variable:
+            del variable["type"]
         elif variable.get("type") == "string":
             # default type is string
             del variable["type"]
@@ -400,8 +404,6 @@ class RougailOutputFormatter:
             # if boolean, the default value is True
             del variable["type"]
             variable["default"] = True
-        if variable.get("type") == "choice" and "choices" in variable:
-            del variable["type"]
         if (
             "default" not in variable
             and variable.get("multi") is True
@@ -526,8 +528,6 @@ class RougailOutputFormatter:
                     jinja["description"] = LiteralScalarString(value.description.strip())
                 else:
                     jinja["description"] = value.description.strip()
-            if value.warnings:
-                jinja["warnings"] = True
             if value.params:
                 jinja["params"] = self.object_to_yaml(
                     "params", type_, value.params, multi, object_path

src/rougail/output_formatter/__version__.py

@@ -1 +1 @@
-__version__ = "0.1.0a21"
+__version__ = "0.1.0a20"

tests/results/00_7choice_quote/rougail/00-base.yml

@@ -4,6 +4,7 @@ version: 1.1
 
 var:
   description: A choice
+  type: choice
   choices:
     - quote'
     - quote"

tests/results/00_9choice_variables/rougail/00-base.yml

@@ -8,6 +8,7 @@ source_variable_2: val2  # the second source variable
 
 my_variable:
   description: a variable
+  type: choice
   choices:
     - variable: _.source_variable_1
     - variable: _.source_variable_2

tests/results/04_5validators_warnings/rougail/00-base.yml

@@ -1,15 +0,0 @@
-%YAML 1.2
----
-version: 1.1
-
-int:
-  description: An integer
-  validators:
-    - jinja: |-
-        {% if _.int > 100 %}
-          value is too high
-        {% endif %}
-      description: the max value is 100
-      warnings: true
-  default: 1000
-...

tests/results/04_5validators_warnings_all/rougail/00-base.yml

@@ -1,12 +0,0 @@
-%YAML 1.2
----
-version: 1.1
-
-int:
-  description: An integer
-  params:
-    min_integer: 10
-    max_integer: 100
-  warnings: true
-  default: 1000
-...

tests/results/16_6choice_redefine/rougail/00-base.yml

@@ -4,6 +4,7 @@ version: 1.1
 
 var:
   description: A choice
+  type: choice
   choices:
     - a
     - b

tests/results/60_5family_dynamic_calc_variable_disabled/rougail/00-base.yml

@@ -1,18 +0,0 @@
-%YAML 1.2
----
-version: 1.1
-
-dyn{{ identifier }}:
-  description: A dynamic famify for {{ identifier }}
-  dynamic:
-    - val1
-    - val2
-
-  var1:  # A dynamic variable
-
-  var2:
-    description: A new variable
-    disabled:
-      variable: _.var1
-      when: val1
-...

tests/results/60_5family_dynamic_calc_variable_disabled_outside/rougail/00-base.yml

@@ -1,18 +0,0 @@
-%YAML 1.2
----
-version: 1.1
-
-dyn{{ identifier }}:
-  description: A dynamic famify for {{ identifier }}
-  dynamic:
-    - val1
-    - val2
-
-  var1:  # A dynamic variable
-
-var2:
-  description: A new variable
-  disabled:
-    variable: _.dynval1.var1
-    when: val1
-...

tests/test_load.py

@@ -15,7 +15,7 @@ excludes = [
         ]
 
 test_ok = get_structures_list(excludes)
-# test_ok = [Path('../rougail-tests/structures/04_5validators_warnings')]
+# test_ok = [Path('../rougail-tests/structures/60_6family_dynamic_sub_dynamic_1_0_2')]
 
 
 def idfn(fixture_value):