Compare commits
No commits in common. "b087aa39f744129d8267d08945488dd3c670acea" and "b582a5779233a4f045c3ff503c3b646e656e2d88" have entirely different histories.
b087aa39f7
...
b582a57792
7 changed files with 8 additions and 17 deletions
|
|
@ -1,9 +1,3 @@
|
||||||
## 1.2.0a46 (2025-12-22)
|
|
||||||
|
|
||||||
### Fix
|
|
||||||
|
|
||||||
- duplicate description
|
|
||||||
|
|
||||||
## 1.2.0a45 (2025-12-22)
|
## 1.2.0a45 (2025-12-22)
|
||||||
|
|
||||||
### Feat
|
### Feat
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,6 @@
|
||||||
[project]
|
[project]
|
||||||
name = "rougail"
|
name = "rougail"
|
||||||
version = "1.2.0a46"
|
version = "1.2.0a45"
|
||||||
|
|
||||||
[tool.commitizen]
|
[tool.commitizen]
|
||||||
name = "cz_conventional_commits"
|
name = "cz_conventional_commits"
|
||||||
|
|
|
||||||
|
|
@ -4,7 +4,7 @@ requires = ["flit_core >=3.8.0,<4"]
|
||||||
|
|
||||||
[project]
|
[project]
|
||||||
name = "rougail-base"
|
name = "rougail-base"
|
||||||
version = "1.2.0a46"
|
version = "1.2.0a45"
|
||||||
authors = [{name = "Emmanuel Garette", email = "gnunux@gnunux.info"}]
|
authors = [{name = "Emmanuel Garette", email = "gnunux@gnunux.info"}]
|
||||||
readme = "README.md"
|
readme = "README.md"
|
||||||
description = "A consistency handling system that was initially designed in the configuration management"
|
description = "A consistency handling system that was initially designed in the configuration management"
|
||||||
|
|
|
||||||
|
|
@ -4,7 +4,7 @@ requires = ["flit_core >=3.8.0,<4"]
|
||||||
|
|
||||||
[project]
|
[project]
|
||||||
name = "rougail"
|
name = "rougail"
|
||||||
version = "1.2.0a46"
|
version = "1.2.0a45"
|
||||||
authors = [{name = "Emmanuel Garette", email = "gnunux@gnunux.info"}]
|
authors = [{name = "Emmanuel Garette", email = "gnunux@gnunux.info"}]
|
||||||
description = "A consistency handling system that was initially designed in the configuration management"
|
description = "A consistency handling system that was initially designed in the configuration management"
|
||||||
classifiers = [
|
classifiers = [
|
||||||
|
|
@ -18,7 +18,7 @@ classifiers = [
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"ruamel.yaml ~= 0.18.6",
|
"ruamel.yaml ~= 0.18.6",
|
||||||
"pydantic ~= 2.9.2",
|
"pydantic ~= 2.9.2",
|
||||||
"rougail-base == 1.2.0a46",
|
"rougail-base == 1.2.0a45",
|
||||||
]
|
]
|
||||||
|
|
||||||
[tool.flit.sdist]
|
[tool.flit.sdist]
|
||||||
|
|
|
||||||
|
|
@ -1 +1 @@
|
||||||
__version__ = "1.2.0a46"
|
__version__ = "1.2.0a45"
|
||||||
|
|
|
||||||
|
|
@ -28,7 +28,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
from pathlib import Path
|
from pathlib import Path
|
||||||
from tiramisu import Config
|
from tiramisu import Config
|
||||||
from tiramisu.error import display_list
|
|
||||||
from ruamel.yaml import YAML
|
from ruamel.yaml import YAML
|
||||||
from ..utils import _, load_modules
|
from ..utils import _, load_modules
|
||||||
from ..tiramisu import normalize_family
|
from ..tiramisu import normalize_family
|
||||||
|
|
@ -471,11 +470,9 @@ secret_manager: # {_("The secret manager")}
|
||||||
rougail_process += """ {% if _.output is not propertyerror and _.output == 'NAME' %}
|
rougail_process += """ {% if _.output is not propertyerror and _.output == 'NAME' %}
|
||||||
Cannot load user data for NAME output
|
Cannot load user data for NAME output
|
||||||
{% endif %}
|
{% endif %}
|
||||||
""".replace(
|
description: _('cannot load user data for NAME output')""".replace(
|
||||||
"NAME", hidden_output
|
"NAME", hidden_output
|
||||||
)
|
)
|
||||||
rougail_process += f""" description: _('outputs {0} did not allow user data')
|
|
||||||
""".format(display_list(hidden_outputs, add_quote=True, separator="or"))
|
|
||||||
elif objects:
|
elif objects:
|
||||||
rougail_process += " default: {DEFAULT}".format(
|
rougail_process += " default: {DEFAULT}".format(
|
||||||
DEFAULT=objects[0]["name"]
|
DEFAULT=objects[0]["name"]
|
||||||
|
|
|
||||||
|
|
@ -377,7 +377,7 @@ class UserData:
|
||||||
[_(prop) for prop in err.proptype], add_quote=False
|
[_(prop) for prop in err.proptype], add_quote=False
|
||||||
)
|
)
|
||||||
err_path = err.subconfig.path
|
err_path = err.subconfig.path
|
||||||
err_description = err.subconfig.option.impl_get_display_name(err.subconfig, with_quote=True)
|
err_description = err.subconfig.option.impl_get_display_name(err.subconfig)
|
||||||
display_name = option.description(with_quote=True)
|
display_name = option.description(with_quote=True)
|
||||||
if index is not None:
|
if index is not None:
|
||||||
if path == err_path:
|
if path == err_path:
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue