Compare commits
No commits in common. "51be10e39f0e0ae0ec0933deadd469e0949e2933" and "8bb9bb7e16a527aeb943e2a979b38a1e8f8ec0d5" have entirely different histories.
51be10e39f
...
8bb9bb7e16
22 changed files with 14 additions and 136 deletions
|
|
@ -1,9 +1,3 @@
|
|||
## 0.2.0a16 (2025-11-21)
|
||||
|
||||
### Feat
|
||||
|
||||
- add 'add_help' option un TiramisuCmdLineParser + -ff => -yf
|
||||
|
||||
## 0.2.0a15 (2025-11-06)
|
||||
|
||||
### Fix
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@ requires = ["flit_core >=3.8.0,<4"]
|
|||
|
||||
[project]
|
||||
name = "rougail.user_data_yaml"
|
||||
version = "0.2.0a16"
|
||||
version = "0.2.0a15"
|
||||
authors = [{name = "Emmanuel Garette", email = "gnunux@gnunux.info"}]
|
||||
readme = "README.md"
|
||||
description = "Rougail user_data yaml"
|
||||
|
|
|
|||
|
|
@ -19,7 +19,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|||
from ruamel.yaml import YAML
|
||||
from pathlib import Path
|
||||
|
||||
from rougail.error import ExtensionError
|
||||
from rougail.error import ExtentionError
|
||||
from tiramisu.error import ValueOptionError, PropertiesOptionError, LeadershipError
|
||||
|
||||
from .i18n import _
|
||||
|
|
@ -43,7 +43,7 @@ class RougailUserDataYaml:
|
|||
rougailconfig["step.user_data"] = user_data
|
||||
user_data = rougailconfig["step.user_data"]
|
||||
if "yaml" not in user_data:
|
||||
raise ExtensionError(_("yaml is not set in step.user_data"))
|
||||
raise ExtentionError(_("yaml is not set in step.user_data"))
|
||||
self.rougailconfig = rougailconfig
|
||||
self.filenames = self.rougailconfig["yaml.filename"]
|
||||
self.file_with_secrets = self.rougailconfig["yaml.file_with_secrets"]
|
||||
|
|
|
|||
|
|
@ -1 +1 @@
|
|||
__version__ = "0.2.0a16"
|
||||
__version__ = "0.2.0a15"
|
||||
|
|
|
|||
|
|
@ -36,7 +36,7 @@ yaml:
|
|||
|
||||
filename:
|
||||
description: {_("File or directory name where user datas are stored")}
|
||||
alternative_name: yf
|
||||
alternative_name: ff
|
||||
type: unix_filename
|
||||
multi: true
|
||||
params:
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
{
|
||||
"rougail": {
|
||||
"variable1": 80,
|
||||
"variable2": 80,
|
||||
"variable3": 80
|
||||
"variable1": "80",
|
||||
"variable2": "80",
|
||||
"variable3": "80"
|
||||
}
|
||||
}
|
||||
|
|
@ -1,7 +1,7 @@
|
|||
{
|
||||
"rougail": {
|
||||
"variable1": 80,
|
||||
"variable2": 80,
|
||||
"variable3": 80
|
||||
"variable1": "80",
|
||||
"variable2": "80",
|
||||
"variable3": "80"
|
||||
}
|
||||
}
|
||||
|
|
@ -1,5 +1,5 @@
|
|||
{
|
||||
"rougail": {
|
||||
"variable1": 80
|
||||
"variable1": "80"
|
||||
}
|
||||
}
|
||||
|
|
@ -1,4 +0,0 @@
|
|||
{
|
||||
"errors": [],
|
||||
"warnings": []
|
||||
}
|
||||
|
|
@ -1,4 +0,0 @@
|
|||
{
|
||||
"errors": [],
|
||||
"warnings": []
|
||||
}
|
||||
|
|
@ -1,14 +0,0 @@
|
|||
{
|
||||
"rougail": {
|
||||
"var1": [
|
||||
"string1",
|
||||
"string2",
|
||||
"string3"
|
||||
],
|
||||
"var2": [
|
||||
"string1",
|
||||
"string2",
|
||||
"string3"
|
||||
]
|
||||
}
|
||||
}
|
||||
|
|
@ -1,14 +0,0 @@
|
|||
{
|
||||
"rougail": {
|
||||
"var1": [
|
||||
"string1",
|
||||
"string2",
|
||||
"string3"
|
||||
],
|
||||
"var2": [
|
||||
"string1",
|
||||
"string2",
|
||||
"string3"
|
||||
]
|
||||
}
|
||||
}
|
||||
|
|
@ -1 +0,0 @@
|
|||
{}
|
||||
|
|
@ -1,12 +0,0 @@
|
|||
{
|
||||
"rougail.var1": [
|
||||
"string1",
|
||||
"string2",
|
||||
"string3"
|
||||
],
|
||||
"rougail.var2": [
|
||||
"string1",
|
||||
"string2",
|
||||
"string3"
|
||||
]
|
||||
}
|
||||
|
|
@ -1,11 +0,0 @@
|
|||
{
|
||||
"rougail.var1": [
|
||||
"val1",
|
||||
"val2",
|
||||
"val3"
|
||||
],
|
||||
"rougail.var2": [
|
||||
"val4",
|
||||
"val5"
|
||||
]
|
||||
}
|
||||
|
|
@ -1,4 +0,0 @@
|
|||
{
|
||||
"errors": [],
|
||||
"warnings": []
|
||||
}
|
||||
|
|
@ -1,16 +0,0 @@
|
|||
{
|
||||
"rougail": {
|
||||
"dynval1": {
|
||||
"var": "string1"
|
||||
},
|
||||
"dynval2": {
|
||||
"var": "string1"
|
||||
},
|
||||
"var1": "string1",
|
||||
"var2": [
|
||||
"string1",
|
||||
"string2",
|
||||
"string3"
|
||||
]
|
||||
}
|
||||
}
|
||||
|
|
@ -1,16 +0,0 @@
|
|||
{
|
||||
"rougail": {
|
||||
"dynval1": {
|
||||
"var": "string1"
|
||||
},
|
||||
"dynval2": {
|
||||
"var": "string1"
|
||||
},
|
||||
"var1": "string1",
|
||||
"var2": [
|
||||
"string1",
|
||||
"string2",
|
||||
"string3"
|
||||
]
|
||||
}
|
||||
}
|
||||
|
|
@ -1,11 +0,0 @@
|
|||
{
|
||||
"rougail": {
|
||||
"dynval1": {
|
||||
"var": "string1"
|
||||
},
|
||||
"dynval2": {
|
||||
"var": "string1"
|
||||
},
|
||||
"var1": "string1"
|
||||
}
|
||||
}
|
||||
|
|
@ -1,10 +0,0 @@
|
|||
{
|
||||
"rougail.dynval1.var": "string1",
|
||||
"rougail.dynval2.var": "string1",
|
||||
"rougail.var1": "string1",
|
||||
"rougail.var2": [
|
||||
"string1",
|
||||
"string2",
|
||||
"string3"
|
||||
]
|
||||
}
|
||||
|
|
@ -24,6 +24,7 @@ def _test_invalid_no_error(filename):
|
|||
ufilename = ifilename
|
||||
generated_user_data = RougailUserDataYaml(config, rougailconfig=rougailconfig).run()
|
||||
errors = rougail.user_datas(generated_user_data, invalid_user_datas_error=invalid_user_datas_error, unknown_user_datas_error=unknown_user_datas_error)
|
||||
print(errors)
|
||||
#expected output
|
||||
expected_filename = Path('tests') / 'invalid' / 'results' / ufilename / "errors.json"
|
||||
if not expected_filename.is_file():
|
||||
|
|
|
|||
|
|
@ -20,7 +20,7 @@ excludes = [
|
|||
]
|
||||
|
||||
test_ok = get_structures_list(excludes)
|
||||
# test_ok = [Path('../rougail-tests/structures/00_6port')]
|
||||
# test_ok = [Path('../rougail-tests/structures/60_0family_dynamic_source_hidden')]
|
||||
|
||||
|
||||
def idfn(fixture_value):
|
||||
|
|
|
|||
Loading…
Reference in a new issue