From 23eadd926911c05f3977d2e584f1934625708fd0 Mon Sep 17 00:00:00 2001 From: Emmanuel Garette Date: Wed, 11 Dec 2024 21:29:44 +0100 Subject: [PATCH] feat: rename file to yaml --- .../{user_data_file.po => user_data_yaml.po} | 20 +- ...ta_file.pot => rougail_user_data_yaml.pot} | 14 +- pyproject.toml | 8 +- .../locale/fr/LC_MESSAGES/user_data_file.mo | Bin 703 -> 0 bytes .../__init__.py | 21 +- .../config.py | 10 +- .../i18n.py | 2 +- .../locale/fr/LC_MESSAGES/user_data_yaml.mo | Bin 703 -> 708 bytes tests/results/00_0empty/file/all.yml | 1 - tests/results/00_0empty/file/all_exclude.yml | 2 +- tests/results/00_0empty/file/mandatories.yml | 2 +- .../00_0version_underscore/file/all.yml | 7 +- .../file/all_exclude.yml | 7 +- .../file/mandatories.yml | 7 +- tests/results/00_1empty_variable/file/all.yml | 7 +- .../00_1empty_variable/file/all_exclude.yml | 7 +- .../00_1empty_variable/file/mandatories.yml | 7 +- .../00_2default_calculated/file/all.yml | 16 +- .../file/all_exclude.yml | 16 +- .../file/mandatories.yml | 2 +- .../00_2default_calculated_multi/file/all.yml | 23 +- .../file/all_exclude.yml | 23 +- .../file/mandatories.yml | 2 +- .../file/all.yml | 19 +- .../file/all_exclude.yml | 19 +- .../file/mandatories.yml | 12 +- tests/results/00_4load_subfolder/file/all.yml | 8 +- .../00_4load_subfolder/file/all_exclude.yml | 8 +- .../00_4load_subfolder/file/mandatories.yml | 8 +- .../00_4load_subfolder/makedict/all.json | 3 +- .../makedict/mandatories.json | 3 +- tests/results/00_5load_notype/file/all.yml | 7 +- .../00_5load_notype/file/all_exclude.yml | 7 +- .../00_5load_notype/file/mandatories.yml | 2 +- tests/results/00_6boolean/file/all.yml | 17 +- .../results/00_6boolean/file/all_exclude.yml | 17 +- .../results/00_6boolean/file/mandatories.yml | 2 +- .../00_6boolean_no_mandatory/file/all.yml | 7 +- .../file/all_exclude.yml | 7 +- .../file/mandatories.yml | 2 +- tests/results/00_6choice/file/all.yml | 17 +- tests/results/00_6choice/file/all_exclude.yml | 17 +- tests/results/00_6choice/file/mandatories.yml | 9 +- .../00_6choice_calculation/file/all.yml | 7 +- .../file/all_exclude.yml | 7 +- .../file/mandatories.yml | 2 +- .../results/00_6choice_variable/file/all.yml | 16 +- .../00_6choice_variable/file/all_exclude.yml | 16 +- .../00_6choice_variable/file/mandatories.yml | 2 +- tests/results/00_6custom/file/all.yml | 9 +- tests/results/00_6custom/file/all_exclude.yml | 9 +- tests/results/00_6custom/file/mandatories.yml | 7 +- tests/results/00_6domainname/file/all.yml | 7 +- .../00_6domainname/file/all_exclude.yml | 7 +- .../00_6domainname/file/mandatories.yml | 2 +- .../00_6domainname_params/file/all.yml | 7 +- .../file/all_exclude.yml | 7 +- .../file/mandatories.yml | 2 +- tests/results/00_6float/file/all.yml | 17 +- tests/results/00_6float/file/all_exclude.yml | 17 +- tests/results/00_6float/file/mandatories.yml | 2 +- tests/results/00_6number/file/all.yml | 17 +- tests/results/00_6number/file/all_exclude.yml | 17 +- tests/results/00_6number/file/mandatories.yml | 2 +- tests/results/00_6port/file/all.yml | 11 +- tests/results/00_6port/file/all_exclude.yml | 11 +- tests/results/00_6port/file/mandatories.yml | 7 +- tests/results/00_6regexp/file/all.yml | 7 +- tests/results/00_6regexp/file/all_exclude.yml | 7 +- tests/results/00_6regexp/file/mandatories.yml | 2 +- tests/results/00_6string/file/all.yml | 17 +- tests/results/00_6string/file/all_exclude.yml | 17 +- tests/results/00_6string/file/mandatories.yml | 11 +- tests/results/00_7choice_quote/file/all.yml | 7 +- .../00_7choice_quote/file/all_exclude.yml | 7 +- .../00_7choice_quote/file/mandatories.yml | 2 +- tests/results/00_7help_quote/file/all.yml | 9 +- .../00_7help_quote/file/all_exclude.yml | 9 +- .../00_7help_quote/file/mandatories.yml | 9 +- .../00_7value_doublequote/file/all.yml | 7 +- .../file/all_exclude.yml | 7 +- .../file/mandatories.yml | 2 +- .../00_7value_doublequote2/file/all.yml | 7 +- .../file/all_exclude.yml | 7 +- .../file/mandatories.yml | 2 +- .../00_7value_doublequote3/file/all.yml | 7 +- .../file/all_exclude.yml | 7 +- .../file/mandatories.yml | 2 +- tests/results/00_7value_quote/file/all.yml | 7 +- .../00_7value_quote/file/all_exclude.yml | 7 +- .../00_7value_quote/file/mandatories.yml | 2 +- .../00_8calculation_information/file/all.yml | 7 +- .../file/all_exclude.yml | 7 +- .../file/mandatories.yml | 7 +- tests/results/00_8test/file/all.yml | 22 +- tests/results/00_8test/file/all_exclude.yml | 22 +- tests/results/00_8test/file/mandatories.yml | 16 +- .../00_9choice_variable_multi/file/all.yml | 19 +- .../file/all_exclude.yml | 19 +- .../file/mandatories.yml | 12 +- .../results/00_9choice_variables/file/all.yml | 11 +- .../00_9choice_variables/file/all_exclude.yml | 11 +- .../00_9choice_variables/file/mandatories.yml | 2 +- .../00_9default_calculation/file/all.yml | 7 +- .../file/all_exclude.yml | 7 +- .../file/mandatories.yml | 2 +- .../file/all.yml | 7 +- .../file/all_exclude.yml | 7 +- .../file/mandatories.yml | 7 +- .../file/all.yml | 9 +- .../file/all_exclude.yml | 9 +- .../file/mandatories.yml | 9 +- .../file/all.yml | 16 +- .../file/all_exclude.yml | 16 +- .../file/mandatories.yml | 2 +- .../file/all.yml | 16 +- .../file/all_exclude.yml | 16 +- .../file/mandatories.yml | 2 +- .../file/all.yml | 14 +- .../file/all_exclude.yml | 14 +- .../file/mandatories.yml | 14 +- .../file/all.yml | 23 +- .../file/all_exclude.yml | 23 +- .../file/mandatories.yml | 2 +- .../file/all.yml | 9 +- .../file/all_exclude.yml | 9 +- .../file/mandatories.yml | 2 +- .../file/all.yml | 9 +- .../file/all_exclude.yml | 9 +- .../file/mandatories.yml | 9 +- .../results/00_9default_integer/file/all.yml | 7 +- .../00_9default_integer/file/all_exclude.yml | 7 +- .../00_9default_integer/file/mandatories.yml | 2 +- tests/results/00_9extra/file/all.yml | 10 +- tests/results/00_9extra/file/all_exclude.yml | 10 +- tests/results/00_9extra/file/mandatories.yml | 2 +- tests/results/00_9extra/makedict/all.json | 3 +- .../00_9extra/makedict/mandatories.json | 3 +- .../00_9extra_calculation/file/all.yml | 12 +- .../file/all_exclude.yml | 12 +- .../file/mandatories.yml | 2 +- .../00_9extra_calculation/makedict/all.json | 5 +- .../makedict/mandatories.json | 5 +- tests/results/01_6boolean_multi/file/all.yml | 45 +-- .../01_6boolean_multi/file/all_exclude.yml | 45 +-- .../01_6boolean_multi/file/mandatories.yml | 2 +- tests/results/01_6custom_multi/file/all.yml | 23 +- .../01_6custom_multi/file/all_exclude.yml | 23 +- .../01_6custom_multi/file/mandatories.yml | 14 +- tests/results/01_6float_multi/file/all.yml | 77 ++--- .../01_6float_multi/file/all_exclude.yml | 77 ++--- .../01_6float_multi/file/mandatories.yml | 2 +- tests/results/01_6number_multi/file/all.yml | 77 ++--- .../01_6number_multi/file/all_exclude.yml | 77 ++--- .../01_6number_multi/file/mandatories.yml | 2 +- tests/results/01_6string_empty/file/all.yml | 14 +- .../01_6string_empty/file/all_exclude.yml | 14 +- .../01_6string_empty/file/mandatories.yml | 14 +- tests/results/01_6string_multi/file/all.yml | 70 +++-- .../01_6string_multi/file/all_exclude.yml | 70 +++-- .../01_6string_multi/file/mandatories.yml | 25 +- .../01_7value_multi_doublequote/file/all.yml | 14 +- .../file/all_exclude.yml | 14 +- .../file/mandatories.yml | 2 +- .../01_7value_multi_doublequote2/file/all.yml | 14 +- .../file/all_exclude.yml | 14 +- .../file/mandatories.yml | 2 +- .../01_7value_multi_quote/file/all.yml | 14 +- .../file/all_exclude.yml | 14 +- .../file/mandatories.yml | 2 +- .../file/all.yml | 14 +- .../file/all_exclude.yml | 14 +- .../file/mandatories.yml | 10 +- .../makedict/mandatories.json | 4 +- .../01_9choice_variable_multi/file/all.yml | 16 +- .../file/all_exclude.yml | 16 +- .../file/mandatories.yml | 7 +- tests/results/04_0type_param/file/all.yml | 7 +- .../04_0type_param/file/all_exclude.yml | 7 +- .../04_0type_param/file/mandatories.yml | 2 +- tests/results/04_1auto_save/file/all.yml | 7 +- .../04_1auto_save/file/all_exclude.yml | 7 +- .../04_1auto_save/file/mandatories.yml | 2 +- .../04_1auto_save_and_calculated/file/all.yml | 9 +- .../file/all_exclude.yml | 9 +- .../file/mandatories.yml | 2 +- .../file/all.yml | 9 +- .../file/all_exclude.yml | 9 +- .../file/mandatories.yml | 2 +- .../04_1auto_save_and_hidden/file/all.yml | 7 +- .../file/all_exclude.yml | 7 +- .../file/mandatories.yml | 2 +- .../file/all.yml | 11 +- .../file/all_exclude.yml | 11 +- .../file/mandatories.yml | 7 +- .../file/all.yml | 11 +- .../file/all_exclude.yml | 11 +- .../file/mandatories.yml | 9 +- .../04_5disabled_calculation/file/all.yml | 11 +- .../file/all_exclude.yml | 11 +- .../file/mandatories.yml | 9 +- .../file/all.yml | 11 +- .../file/all_exclude.yml | 11 +- .../file/mandatories.yml | 2 +- .../file/all.yml | 11 +- .../file/all_exclude.yml | 11 +- .../file/mandatories.yml | 2 +- .../file/all.yml | 9 +- .../file/all_exclude.yml | 9 +- .../file/mandatories.yml | 7 +- .../file/all.yml | 9 +- .../file/all_exclude.yml | 9 +- .../file/mandatories.yml | 7 +- .../file/all.yml | 9 +- .../file/all_exclude.yml | 9 +- .../file/mandatories.yml | 7 +- .../file/all.yml | 9 +- .../file/all_exclude.yml | 9 +- .../file/mandatories.yml | 7 +- .../04_5hidden_calculation/file/all.yml | 11 +- .../file/all_exclude.yml | 11 +- .../file/mandatories.yml | 2 +- .../04_5hidden_calculation2/file/all.yml | 11 +- .../file/all_exclude.yml | 11 +- .../file/mandatories.yml | 2 +- .../file/all.yml | 11 +- .../file/all_exclude.yml | 11 +- .../file/mandatories.yml | 2 +- tests/results/04_5validators/file/all.yml | 7 +- .../04_5validators/file/all_exclude.yml | 7 +- .../04_5validators/file/mandatories.yml | 7 +- .../04_5validators_differ/file/all.yml | 9 +- .../file/all_exclude.yml | 9 +- .../file/mandatories.yml | 2 +- .../results/04_5validators_multi/file/all.yml | 14 +- .../04_5validators_multi/file/all_exclude.yml | 14 +- .../04_5validators_multi/file/mandatories.yml | 2 +- .../04_5validators_multi2/file/all.yml | 12 +- .../file/all_exclude.yml | 12 +- .../file/mandatories.yml | 2 +- tests/results/05_0multi_not_uniq/file/all.yml | 14 +- .../05_0multi_not_uniq/file/all_exclude.yml | 14 +- .../05_0multi_not_uniq/file/mandatories.yml | 2 +- tests/results/05_0multi_uniq/file/all.yml | 14 +- .../05_0multi_uniq/file/all_exclude.yml | 14 +- .../05_0multi_uniq/file/mandatories.yml | 2 +- .../results/12_1auto_save_expert/file/all.yml | 7 +- .../12_1auto_save_expert/file/all_exclude.yml | 7 +- .../12_1auto_save_expert/file/mandatories.yml | 2 +- .../16_0redefine_description/file/all.yml | 7 +- .../file/all_exclude.yml | 7 +- .../file/mandatories.yml | 7 +- .../file/all.yml | 10 +- .../file/all_exclude.yml | 10 +- .../file/mandatories.yml | 10 +- .../16_2family_redefine_disabled/file/all.yml | 10 +- .../file/all_exclude.yml | 10 +- .../file/mandatories.yml | 10 +- .../results/16_5exists_nonexists/file/all.yml | 9 +- .../16_5exists_nonexists/file/all_exclude.yml | 9 +- .../16_5exists_nonexists/file/mandatories.yml | 2 +- .../results/16_5exists_redefine/file/all.yml | 7 +- .../16_5exists_redefine/file/all_exclude.yml | 7 +- .../16_5exists_redefine/file/mandatories.yml | 2 +- .../16_5redefine_calculation/file/all.yml | 7 +- .../file/all_exclude.yml | 7 +- .../file/mandatories.yml | 2 +- .../results/16_5redefine_choice/file/all.yml | 7 +- .../16_5redefine_choice/file/all_exclude.yml | 7 +- .../16_5redefine_choice/file/mandatories.yml | 7 +- .../results/16_5redefine_default/file/all.yml | 7 +- .../16_5redefine_default/file/all_exclude.yml | 7 +- .../16_5redefine_default/file/mandatories.yml | 2 +- .../file/all.yml | 7 +- .../file/all_exclude.yml | 7 +- .../file/mandatories.yml | 7 +- .../results/16_5redefine_family/file/all.yml | 10 +- .../16_5redefine_family/file/all_exclude.yml | 10 +- .../16_5redefine_family/file/mandatories.yml | 10 +- tests/results/16_5redefine_help/file/all.yml | 10 +- .../16_5redefine_help/file/all_exclude.yml | 10 +- .../16_5redefine_help/file/mandatories.yml | 10 +- .../results/16_5redefine_hidden/file/all.yml | 7 +- .../16_5redefine_hidden/file/all_exclude.yml | 7 +- .../16_5redefine_hidden/file/mandatories.yml | 2 +- tests/results/16_5redefine_multi/file/all.yml | 14 +- .../16_5redefine_multi/file/all_exclude.yml | 14 +- .../16_5redefine_multi/file/mandatories.yml | 2 +- .../file/all.yml | 9 +- .../file/all_exclude.yml | 9 +- .../file/mandatories.yml | 7 +- tests/results/16_5test_redefine/file/all.yml | 11 +- .../16_5test_redefine/file/all_exclude.yml | 11 +- .../16_5test_redefine/file/mandatories.yml | 7 +- .../results/16_6choice_redefine/file/all.yml | 7 +- .../16_6choice_redefine/file/all_exclude.yml | 7 +- .../16_6choice_redefine/file/mandatories.yml | 2 +- .../errors/all.json | 0 .../errors/mandatories.json | 0 .../16_6exists_redefine_family/file/all.yml | 10 + .../file/all_exclude.yml | 10 + .../file/mandatories.yml | 10 + .../makedict/all.json | 4 + .../makedict/mandatories.json | 4 + tests/results/16exists_exists/file/all.yml | 7 +- .../16exists_exists/file/all_exclude.yml | 7 +- .../16exists_exists/file/mandatories.yml | 7 +- .../17_5redefine_leadership/file/all.yml | 20 +- .../file/all_exclude.yml | 20 +- .../file/mandatories.yml | 2 +- tests/results/20_0empty_family/file/all.yml | 2 +- .../20_0empty_family/file/all_exclude.yml | 2 +- .../20_0empty_family/file/mandatories.yml | 2 +- tests/results/20_0family_append/file/all.yml | 12 +- .../20_0family_append/file/all_exclude.yml | 12 +- .../20_0family_append/file/mandatories.yml | 12 +- .../20_0family_underscore/file/all.yml | 38 ++- .../file/all_exclude.yml | 38 ++- .../file/mandatories.yml | 2 +- tests/results/20_0multi_family/file/all.yml | 13 +- .../20_0multi_family/file/all_exclude.yml | 13 +- .../20_0multi_family/file/mandatories.yml | 2 +- .../20_0multi_family_basic/file/all.yml | 13 +- .../file/all_exclude.yml | 13 +- .../file/mandatories.yml | 13 +- .../20_0multi_family_expert/file/all.yml | 13 +- .../file/all_exclude.yml | 13 +- .../file/mandatories.yml | 2 +- .../20_0multi_family_order/file/all.yml | 19 +- .../file/all_exclude.yml | 19 +- .../file/mandatories.yml | 19 +- .../file/all.yml | 11 +- .../file/all_exclude.yml | 11 +- .../file/mandatories.yml | 2 +- .../results/20_1empty_subfamily/file/all.yml | 2 +- .../20_1empty_subfamily/file/all_exclude.yml | 2 +- .../20_1empty_subfamily/file/mandatories.yml | 2 +- .../file/all.yml | 12 +- .../file/all_exclude.yml | 12 +- .../file/mandatories.yml | 12 +- .../24_0family_hidden_condition/file/all.yml | 12 +- .../file/all_exclude.yml | 12 +- .../file/mandatories.yml | 10 +- .../file/all.yml | 12 +- .../file/all_exclude.yml | 12 +- .../file/mandatories.yml | 2 +- .../file/all.yml | 15 +- .../file/all_exclude.yml | 15 +- .../file/mandatories.yml | 13 +- .../file/all.yml | 15 +- .../file/all_exclude.yml | 15 +- .../file/mandatories.yml | 2 +- .../file/all.yml | 14 +- .../file/all_exclude.yml | 14 +- .../file/mandatories.yml | 2 +- .../file/all.yml | 15 +- .../file/all_exclude.yml | 15 +- .../file/mandatories.yml | 13 +- .../file/all.yml | 9 +- .../file/all_exclude.yml | 9 +- .../file/mandatories.yml | 2 +- .../file/all.yml | 9 +- .../file/all_exclude.yml | 9 +- .../file/mandatories.yml | 7 +- .../file/all.yml | 12 +- .../file/all_exclude.yml | 12 +- .../file/mandatories.yml | 10 +- .../file/all.yml | 12 +- .../file/all_exclude.yml | 12 +- .../file/mandatories.yml | 10 +- tests/results/40_0leadership/file/all.yml | 32 ++- .../40_0leadership/file/all_exclude.yml | 32 ++- .../40_0leadership/file/mandatories.yml | 32 ++- .../40_0leadership_diff_name/file/all.yml | 32 ++- .../file/all_exclude.yml | 32 ++- .../file/mandatories.yml | 32 ++- .../results/40_0leadership_empty/file/all.yml | 2 +- .../40_0leadership_empty/file/all_exclude.yml | 2 +- .../40_0leadership_empty/file/mandatories.yml | 2 +- .../file/all.yml | 32 ++- .../file/all_exclude.yml | 32 ++- .../file/mandatories.yml | 20 +- .../file/all.yml | 29 -- .../file/all_exclude.yml | 29 -- .../file/mandatories.yml | 3 - .../makedict/all.json | 43 --- .../makedict/mandatories.json | 14 - .../file/all.yml | 29 -- .../file/all_exclude.yml | 29 -- .../file/mandatories.yml | 3 - .../makedict/all.json | 43 --- .../makedict/mandatories.json | 13 - .../file/all.yml | 26 +- .../file/all_exclude.yml | 26 +- .../file/mandatories.yml | 2 +- .../file/all.yml | 40 ++- .../file/all_exclude.yml | 40 ++- .../file/mandatories.yml | 35 ++- .../file/all.yml | 38 ++- .../file/all_exclude.yml | 38 ++- .../file/mandatories.yml | 38 ++- .../file/all.yml | 26 +- .../file/all_exclude.yml | 26 +- .../file/mandatories.yml | 14 +- .../file/all.yml | 26 +- .../file/all_exclude.yml | 26 +- .../file/mandatories.yml | 14 +- .../file/all.yml | 32 ++- .../file/all_exclude.yml | 32 ++- .../file/mandatories.yml | 20 +- .../errors/all.json | 4 - .../errors/mandatories.json | 4 - .../file/all.yml | 29 -- .../file/all_exclude.yml | 29 -- .../file/mandatories.yml | 17 -- .../makedict/all.json | 43 --- .../makedict/mandatories.json | 37 --- .../40_8calculation_boolean/file/all.yml | 17 +- .../file/all_exclude.yml | 17 +- .../file/mandatories.yml | 2 +- .../file/all.yml | 9 +- .../file/all_exclude.yml | 9 +- .../file/mandatories.yml | 7 +- .../40_8calculation_integer/file/all.yml | 11 +- .../file/all_exclude.yml | 11 +- .../file/mandatories.yml | 2 +- .../file/all.yml | 18 +- .../file/all_exclude.yml | 18 +- .../file/mandatories.yml | 2 +- .../file/all.yml | 12 +- .../file/all_exclude.yml | 12 +- .../file/mandatories.yml | 2 +- .../file/all.yml | 15 +- .../file/all_exclude.yml | 15 +- .../file/mandatories.yml | 2 +- tests/results/41_0choice_leader/file/all.yml | 26 +- .../41_0choice_leader/file/all_exclude.yml | 26 +- .../41_0choice_leader/file/mandatories.yml | 2 +- .../44_0leadership_hidden/file/all.yml | 20 +- .../file/all_exclude.yml | 20 +- .../file/mandatories.yml | 2 +- .../44_0leadership_leader_hidden/file/all.yml | 20 +- .../file/all_exclude.yml | 20 +- .../file/mandatories.yml | 2 +- .../file/all.yml | 20 +- .../file/all_exclude.yml | 20 +- .../file/mandatories.yml | 2 +- .../file/all.yml | 28 +- .../file/all_exclude.yml | 28 +- .../file/mandatories.yml | 12 +- .../44_4leadership_mandatory/file/all.yml | 26 +- .../file/all_exclude.yml | 26 +- .../file/mandatories.yml | 20 +- .../file/all.yml | 26 +- .../file/all_exclude.yml | 26 +- .../file/mandatories.yml | 2 +- .../file/all.yml | 28 +- .../file/all_exclude.yml | 28 +- .../file/mandatories.yml | 2 +- .../file/all.yml | 28 +- .../file/all_exclude.yml | 28 +- .../file/mandatories.yml | 26 +- .../file/all.yml | 26 +- .../file/all_exclude.yml | 26 +- .../file/mandatories.yml | 12 +- tests/results/60_0family_dynamic/file/all.yml | 25 +- .../60_0family_dynamic/file/all_exclude.yml | 21 +- .../60_0family_dynamic/file/mandatories.yml | 15 +- .../60_0family_dynamic/makedict/all.json | 10 +- .../60_0family_dynamic_1_0/file/all.yml | 25 +- .../file/all_exclude.yml | 21 +- .../file/mandatories.yml | 2 +- .../60_0family_dynamic_1_0/makedict/all.json | 10 +- .../60_0family_dynamic_1_0_empty/file/all.yml | 22 +- .../file/all_exclude.yml | 15 +- .../file/mandatories.yml | 2 +- .../60_0family_dynamic_1_0_type/file/all.yml | 25 +- .../file/all_exclude.yml | 21 +- .../file/mandatories.yml | 15 +- .../makedict/all.json | 10 +- .../file/all.yml | 22 +- .../file/all_exclude.yml | 15 +- .../file/mandatories.yml | 2 +- .../60_0family_dynamic_1_1/file/all.yml | 25 +- .../file/all_exclude.yml | 21 +- .../file/mandatories.yml | 15 +- .../60_0family_dynamic_1_1/makedict/all.json | 10 +- .../60_0family_dynamic_1_1_empty/file/all.yml | 22 +- .../file/all_exclude.yml | 15 +- .../file/mandatories.yml | 2 +- .../60_0family_dynamic_empty/file/all.yml | 29 +- .../file/all_exclude.yml | 20 +- .../file/mandatories.yml | 2 +- .../file/all.yml | 27 +- .../file/all_exclude.yml | 23 +- .../file/mandatories.yml | 2 +- .../makedict/all.json | 4 +- .../file/all.yml | 24 +- .../file/all_exclude.yml | 17 +- .../file/mandatories.yml | 7 +- .../file/all.yml | 25 +- .../file/all_exclude.yml | 21 +- .../file/mandatories.yml | 15 +- .../makedict/all.json | 10 +- .../file/all.yml | 22 +- .../file/all_exclude.yml | 15 +- .../file/mandatories.yml | 2 +- .../60_0family_dynamic_static/file/all.yml | 15 +- .../file/all_exclude.yml | 15 +- .../file/mandatories.yml | 15 +- .../60_0family_dynamic_test/file/all.yml | 22 +- .../file/all_exclude.yml | 15 +- .../file/mandatories.yml | 22 +- .../file/all.yml | 29 +- .../file/all_exclude.yml | 20 +- .../file/mandatories.yml | 14 +- .../file/all.yml | 25 +- .../file/all_exclude.yml | 21 +- .../file/mandatories.yml | 2 +- .../makedict/all.json | 10 +- .../file/all.yml | 22 +- .../file/all_exclude.yml | 15 +- .../file/mandatories.yml | 12 +- tests/results/60_0family_empty/file/all.yml | 2 +- .../60_0family_empty/file/all_exclude.yml | 2 +- .../60_0family_empty/file/mandatories.yml | 2 +- tests/results/60_0family_hidden/file/all.yml | 10 +- .../60_0family_hidden/file/all_exclude.yml | 10 +- .../60_0family_hidden/file/mandatories.yml | 2 +- tests/results/60_0family_mode/file/all.yml | 10 +- .../60_0family_mode/file/all_exclude.yml | 10 +- .../60_0family_mode/file/mandatories.yml | 2 +- .../60_1family_dynamic_jinja/file/all.yml | 29 +- .../file/all_exclude.yml | 29 +- .../file/mandatories.yml | 2 +- .../file/all.yml | 34 ++- .../file/all_exclude.yml | 30 +- .../file/mandatories.yml | 21 +- .../makedict/all.json | 10 +- .../file/all.yml | 34 ++- .../file/all_exclude.yml | 30 +- .../file/mandatories.yml | 2 +- .../makedict/all.json | 10 +- .../file/all.yml | 30 +- .../file/all_exclude.yml | 23 +- .../file/mandatories.yml | 2 +- .../file/all.yml | 30 +- .../file/all_exclude.yml | 23 +- .../file/mandatories.yml | 2 +- .../file/all.yml | 27 +- .../file/all_exclude.yml | 23 +- .../file/mandatories.yml | 2 +- .../makedict/all.json | 10 +- .../file/all.yml | 24 +- .../file/all_exclude.yml | 17 +- .../file/mandatories.yml | 2 +- .../60_5family_dynamic_calc2/file/all.yml | 27 +- .../file/all_exclude.yml | 23 +- .../file/mandatories.yml | 7 +- .../makedict/all.json | 10 +- .../file/all.yml | 24 +- .../file/all_exclude.yml | 17 +- .../file/mandatories.yml | 7 +- .../file/all.yml | 27 +- .../file/all_exclude.yml | 23 +- .../file/mandatories.yml | 15 +- .../makedict/all.json | 10 +- .../file/all.yml | 25 +- .../file/all_exclude.yml | 21 +- .../file/mandatories.yml | 2 +- .../makedict/all.json | 10 +- .../file/all.yml | 22 +- .../file/all_exclude.yml | 15 +- .../file/mandatories.yml | 2 +- .../file/all.yml | 15 +- .../file/all_exclude.yml | 15 +- .../file/mandatories.yml | 15 +- .../file/all.yml | 24 +- .../file/all_exclude.yml | 17 +- .../file/mandatories.yml | 7 +- .../file/all.yml | 25 +- .../file/all_exclude.yml | 21 +- .../file/mandatories.yml | 2 +- .../makedict/all.json | 10 +- .../file/all.yml | 22 +- .../file/all_exclude.yml | 15 +- .../file/mandatories.yml | 2 +- .../file/all.yml | 27 +- .../file/all_exclude.yml | 23 +- .../file/mandatories.yml | 15 +- .../makedict/all.json | 10 +- .../file/all.yml | 24 +- .../file/all_exclude.yml | 17 +- .../file/mandatories.yml | 7 +- .../file/all.yml | 25 +- .../file/all_exclude.yml | 25 +- .../file/mandatories.yml | 2 +- .../errors/all.json | 5 +- .../file/all.yml | 46 ++- .../file/all_exclude.yml | 42 ++- .../file/mandatories.yml | 2 +- .../makedict/all.json | 16 +- .../file/all.yml | 60 ++-- .../file/all_exclude.yml | 49 ++-- .../file/mandatories.yml | 2 +- .../file/all.yml | 34 ++- .../file/all_exclude.yml | 30 +- .../file/mandatories.yml | 2 +- .../makedict/all.json | 10 +- .../file/all.yml | 34 ++- .../file/all_exclude.yml | 30 +- .../file/mandatories.yml | 2 +- .../makedict/all.json | 10 +- .../file/all.yml | 31 ++- .../file/all_exclude.yml | 24 +- .../file/mandatories.yml | 14 +- .../file/all.yml | 31 ++- .../file/all_exclude.yml | 24 +- .../file/mandatories.yml | 14 +- .../file/all.yml | 34 ++- .../file/all_exclude.yml | 30 +- .../file/mandatories.yml | 2 +- .../makedict/all.json | 10 +- .../file/all.yml | 31 ++- .../file/all_exclude.yml | 24 +- .../file/mandatories.yml | 14 +- .../file/all.yml | 59 ++-- .../file/all_exclude.yml | 55 ++-- .../file/mandatories.yml | 2 +- .../makedict/all.json | 18 +- .../file/all.yml | 47 ++-- .../file/all_exclude.yml | 40 ++- .../file/mandatories.yml | 2 +- .../file/all.yml | 27 +- .../file/all_exclude.yml | 23 +- .../file/mandatories.yml | 2 +- .../makedict/all.json | 10 +- .../file/all.yml | 24 +- .../file/all_exclude.yml | 17 +- .../file/mandatories.yml | 2 +- .../60_6family_dynamic_inside/file/all.yml | 40 +-- .../file/all_exclude.yml | 36 ++- .../file/mandatories.yml | 2 +- .../makedict/all.json | 25 +- .../file/all.yml | 34 ++- .../file/all_exclude.yml | 27 +- .../file/mandatories.yml | 2 +- .../file/all.yml | 84 +++--- .../file/all_exclude.yml | 80 +++--- .../file/mandatories.yml | 41 ++- .../makedict/all.json | 62 ++--- .../file/all.yml | 72 +++-- .../file/all_exclude.yml | 65 +++-- .../file/mandatories.yml | 2 +- .../file/all.yml | 96 +++---- .../file/all_exclude.yml | 84 ++---- .../file/mandatories.yml | 2 +- .../makedict/all.json | 63 ++--- .../file/all.yml | 96 +++---- .../file/all_exclude.yml | 84 ++---- .../file/mandatories.yml | 2 +- .../makedict/all.json | 63 ++--- .../file/all.yml | 78 +++--- .../file/all_exclude.yml | 63 ++--- .../file/mandatories.yml | 2 +- .../makedict/all.json | 40 ++- .../errors/all.json | 0 .../errors/mandatories.json | 0 .../file/all.yml | 52 ++++ .../file/all_exclude.yml | 38 +++ .../file/mandatories.yml | 1 + .../makedict/all.json | 34 +++ .../makedict/mandatories.json | 8 + tests/results/60_9extra_dynamic/file/all.yml | 17 +- .../60_9extra_dynamic/file/all_exclude.yml | 12 +- .../60_9extra_dynamic/file/mandatories.yml | 8 +- .../60_9extra_dynamic/makedict/all.json | 7 +- .../makedict/mandatories.json | 3 +- .../60_9extra_dynamic_extra/file/all.yml | 25 +- .../file/all_exclude.yml | 22 +- .../file/mandatories.yml | 8 +- .../60_9extra_dynamic_extra/makedict/all.json | 6 +- .../makedict/mandatories.json | 6 +- .../60_9family_dynamic_calc_both/file/all.yml | 17 +- .../file/all_exclude.yml | 17 +- .../file/mandatories.yml | 15 +- .../68_0family_leadership_mode/file/all.yml | 32 ++- .../file/all_exclude.yml | 32 ++- .../file/mandatories.yml | 2 +- tests/test_file.py | 262 ------------------ tests/test_load.py | 117 ++++++++ 691 files changed, 6222 insertions(+), 4578 deletions(-) rename locale/fr/LC_MESSAGES/{user_data_file.po => user_data_yaml.po} (60%) rename locale/{rougail_user_data_file.pot => rougail_user_data_yaml.pot} (67%) delete mode 100644 src/rougail/user_data_file/locale/fr/LC_MESSAGES/user_data_file.mo rename src/rougail/{user_data_file => user_data_yaml}/__init__.py (88%) rename src/rougail/{user_data_file => user_data_yaml}/config.py (88%) rename src/rougail/{user_data_file => user_data_yaml}/i18n.py (92%) rename locale/fr/LC_MESSAGES/user_data_file.mo => src/rougail/user_data_yaml/locale/fr/LC_MESSAGES/user_data_yaml.mo (50%) rename tests/results/{40_0leadership_follower_default_submulti => 16_6exists_redefine_family}/errors/all.json (100%) rename tests/results/{40_0leadership_follower_default_submulti => 16_6exists_redefine_family}/errors/mandatories.json (100%) create mode 100644 tests/results/16_6exists_redefine_family/file/all.yml create mode 100644 tests/results/16_6exists_redefine_family/file/all_exclude.yml create mode 100644 tests/results/16_6exists_redefine_family/file/mandatories.yml create mode 100644 tests/results/16_6exists_redefine_family/makedict/all.json create mode 100644 tests/results/16_6exists_redefine_family/makedict/mandatories.json delete mode 100644 tests/results/40_0leadership_follower_default_submulti/file/all.yml delete mode 100644 tests/results/40_0leadership_follower_default_submulti/file/all_exclude.yml delete mode 100644 tests/results/40_0leadership_follower_default_submulti/file/mandatories.yml delete mode 100644 tests/results/40_0leadership_follower_default_submulti/makedict/all.json delete mode 100644 tests/results/40_0leadership_follower_default_submulti/makedict/mandatories.json delete mode 100644 tests/results/40_0leadership_follower_default_submulti_calculation/file/all.yml delete mode 100644 tests/results/40_0leadership_follower_default_submulti_calculation/file/all_exclude.yml delete mode 100644 tests/results/40_0leadership_follower_default_submulti_calculation/file/mandatories.yml delete mode 100644 tests/results/40_0leadership_follower_default_submulti_calculation/makedict/all.json delete mode 100644 tests/results/40_0leadership_follower_default_submulti_calculation/makedict/mandatories.json delete mode 100644 tests/results/40_6leadership_follower_multi/errors/all.json delete mode 100644 tests/results/40_6leadership_follower_multi/errors/mandatories.json delete mode 100644 tests/results/40_6leadership_follower_multi/file/all.yml delete mode 100644 tests/results/40_6leadership_follower_multi/file/all_exclude.yml delete mode 100644 tests/results/40_6leadership_follower_multi/file/mandatories.yml delete mode 100644 tests/results/40_6leadership_follower_multi/makedict/all.json delete mode 100644 tests/results/40_6leadership_follower_multi/makedict/mandatories.json rename tests/results/{40_0leadership_follower_default_submulti_calculation => 60_6family_dynamic_sub_dynamic_empty2}/errors/all.json (100%) rename tests/results/{40_0leadership_follower_default_submulti_calculation => 60_6family_dynamic_sub_dynamic_empty2}/errors/mandatories.json (100%) create mode 100644 tests/results/60_6family_dynamic_sub_dynamic_empty2/file/all.yml create mode 100644 tests/results/60_6family_dynamic_sub_dynamic_empty2/file/all_exclude.yml create mode 100644 tests/results/60_6family_dynamic_sub_dynamic_empty2/file/mandatories.yml create mode 100644 tests/results/60_6family_dynamic_sub_dynamic_empty2/makedict/all.json create mode 100644 tests/results/60_6family_dynamic_sub_dynamic_empty2/makedict/mandatories.json delete mode 100644 tests/test_file.py create mode 100644 tests/test_load.py diff --git a/locale/fr/LC_MESSAGES/user_data_file.po b/locale/fr/LC_MESSAGES/user_data_yaml.po similarity index 60% rename from locale/fr/LC_MESSAGES/user_data_file.po rename to locale/fr/LC_MESSAGES/user_data_yaml.po index ba4cc6b..b0ee0e8 100644 --- a/locale/fr/LC_MESSAGES/user_data_file.po +++ b/locale/fr/LC_MESSAGES/user_data_yaml.po @@ -5,8 +5,8 @@ msgid "" msgstr "" "Project-Id-Version: \n" -"POT-Creation-Date: 2024-11-01 12:12+0100\n" -"PO-Revision-Date: 2024-11-01 12:13+0100\n" +"POT-Creation-Date: 2024-12-11 21:26+0100\n" +"PO-Revision-Date: 2024-12-11 21:27+0100\n" "Last-Translator: \n" "Language-Team: \n" "Language: fr\n" @@ -16,20 +16,20 @@ msgstr "" "Generated-By: pygettext.py 1.5\n" "X-Generator: Poedit 3.5\n" -#: src/rougail/user_data_file/__init__.py:40 -msgid "file is not set in step.user_data" -msgstr "\"file\" n'est pas défini dans step.user_data" +#: src/rougail/user_data_yaml/__init__.py:42 +msgid "yaml is not set in step.user_data" +msgstr "\"yaml\" n'est pas défini dans step.user_data" -#: src/rougail/user_data_file/__init__.py:58 +#: src/rougail/user_data_yaml/__init__.py:61 msgid "cannot load \"{0}\", the root value is not a dict but \"{1}\"" msgstr "" "ne peut charger \"{0}\", la valeur racine n'est pas une dictionnaire mais " "\"{1}\"" -#: src/rougail/user_data_file/__init__.py:66 -msgid "file ({0})" -msgstr "fichier ({0})" +#: src/rougail/user_data_yaml/__init__.py:74 +msgid "yaml ({0})" +msgstr "fichier yaml ({0})" -#: src/rougail/user_data_file/__init__.py:88 +#: src/rougail/user_data_yaml/__init__.py:103 msgid "\"{0}\" in {1} has an unknown value" msgstr "\"{0}\" dans {1} a une valeur inconnue" diff --git a/locale/rougail_user_data_file.pot b/locale/rougail_user_data_yaml.pot similarity index 67% rename from locale/rougail_user_data_file.pot rename to locale/rougail_user_data_yaml.pot index 39158d7..517deb0 100644 --- a/locale/rougail_user_data_file.pot +++ b/locale/rougail_user_data_yaml.pot @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2024-11-01 12:13+0100\n" +"POT-Creation-Date: 2024-12-11 21:27+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -15,19 +15,19 @@ msgstr "" "Generated-By: pygettext.py 1.5\n" -#: src/rougail/user_data_file/__init__.py:40 -msgid "file is not set in step.user_data" +#: src/rougail/user_data_yaml/__init__.py:42 +msgid "yaml is not set in step.user_data" msgstr "" -#: src/rougail/user_data_file/__init__.py:58 +#: src/rougail/user_data_yaml/__init__.py:61 msgid "cannot load \"{0}\", the root value is not a dict but \"{1}\"" msgstr "" -#: src/rougail/user_data_file/__init__.py:66 -msgid "file ({0})" +#: src/rougail/user_data_yaml/__init__.py:74 +msgid "yaml ({0})" msgstr "" -#: src/rougail/user_data_file/__init__.py:88 +#: src/rougail/user_data_yaml/__init__.py:103 msgid "\"{0}\" in {1} has an unknown value" msgstr "" diff --git a/pyproject.toml b/pyproject.toml index 340800f..d5a1672 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -3,11 +3,11 @@ build-backend = "flit_core.buildapi" requires = ["flit_core >=3.8.0,<4"] [project] -name = "rougail.user_data_file" +name = "rougail.user_data_yaml" version = "0.1.1a0" authors = [{name = "Emmanuel Garette", email = "gnunux@gnunux.info"}] readme = "README.md" -description = "Rougail user_data file" +description = "Rougail user_data yaml" requires-python = ">=3.8" license = {file = "LICENSE"} classifiers = [ @@ -29,12 +29,12 @@ dependencies = [ ] [project.urls] -Home = "https://forge.cloud.silique.fr/stove/rougail-user-data-file" +Home = "https://forge.cloud.silique.fr/stove/rougail-user-data-yaml" [tool.commitizen] name = "cz_conventional_commits" tag_format = "$version" version_scheme = "pep440" version_provider = "pep621" -#update_changelog_on_bump = true +update_changelog_on_bump = true changelog_merge_prerelease = true diff --git a/src/rougail/user_data_file/locale/fr/LC_MESSAGES/user_data_file.mo b/src/rougail/user_data_file/locale/fr/LC_MESSAGES/user_data_file.mo deleted file mode 100644 index b81ab3941ad6f00d5b09450d7700fcead6132a93..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 703 zcmZ9J!DnYhz}93B7Q>LLi~ydNwNVhf!GhJ_352v^B!5DQ$44tX~_t6 zawP79(21!#P6{L90@coxv`}wRm@;{Xn^&VrO%uM7SxzEXcG8i zxYyLi%3~^~#$)0qugA~T&RQ3HP1vhFDO_o#%4z4&hV%ssdkk8tr?Z@zS;Zk1>o+sf z{Rin=btZ^2jvSXZ&^GeP(uNX67e-*0op4+)cOJ_soCvHys$r}*&Q!5q*-@L7(wo9U wB)7N?)WFSHCAxwIim{&Q*uaIAJ;l_b%F>};bgOsnYx(p0#EPZGQ2&|r55%d(`~Uy| diff --git a/src/rougail/user_data_file/__init__.py b/src/rougail/user_data_yaml/__init__.py similarity index 88% rename from src/rougail/user_data_file/__init__.py rename to src/rougail/user_data_yaml/__init__.py index 437be9d..70d829e 100644 --- a/src/rougail/user_data_file/__init__.py +++ b/src/rougail/user_data_yaml/__init__.py @@ -15,15 +15,16 @@ details. You should have received a copy of the GNU Lesser General Public License along with this program. If not, see . """ +from ruamel.yaml import YAML from rougail import RougailConfig -from ruamel.yaml import YAML +from rougail.error import ExtentionError from tiramisu.error import ValueOptionError, PropertiesOptionError, LeadershipError from .i18n import _ -class RougailUserDataFile: +class RougailUserDataYaml: def __init__( self, config, @@ -33,14 +34,14 @@ class RougailUserDataFile: if rougailconfig is None: rougailconfig = RougailConfig user_data = rougailconfig["step.user_data"] - if "file" not in user_data: - user_data.append("file") + if "yaml" not in user_data: + user_data.append("yaml") rougailconfig["step.user_data"] = user_data user_data = rougailconfig["step.user_data"] - if "file" not in user_data: - raise Exception(_("file is not set in step.user_data")) + if "yaml" not in user_data: + raise ExtentionError(_("yaml is not set in step.user_data")) self.rougailconfig = rougailconfig - self.filenames = self.rougailconfig["file.filename"] + self.filenames = self.rougailconfig["yaml.filename"] self.config = config self.errors = [] self.warnings = [] @@ -70,7 +71,7 @@ class RougailUserDataFile: ) user_datas.append( { - "source": _("file ({0})").format(filename), + "source": _("yaml ({0})").format(filename), "errors": self.errors, "warnings": self.warnings, "values": values, @@ -116,7 +117,7 @@ class RougailUserDataFile: values[path] = value -RougailUserData = RougailUserDataFile +RougailUserData = RougailUserDataYaml -__all__ = ("RougailUserDataFile",) +__all__ = ("RougailUserDataYaml",) diff --git a/src/rougail/user_data_file/config.py b/src/rougail/user_data_yaml/config.py similarity index 88% rename from src/rougail/user_data_file/config.py rename to src/rougail/user_data_yaml/config.py index c5809ef..d33d57c 100644 --- a/src/rougail/user_data_file/config.py +++ b/src/rougail/user_data_yaml/config.py @@ -1,5 +1,5 @@ """ -Config file for Rougail-user-data +Config yaml for Rougail-user-data Silique (https://www.silique.fr) Copyright (C) 2024 @@ -24,12 +24,12 @@ def get_rougail_config( backward_compatibility=True, ) -> dict: options = """ -file: - description: Configuration rougail-user-data-file +yaml: + description: Configuration rougail-user-data-yaml disabled: type: jinja jinja: | - {% if 'file' not in step.user_data %} + {% if 'yaml' not in step.user_data %} disabled {% endif %} filename: @@ -44,7 +44,7 @@ file: - file """ return { - "name": "file", + "name": "yaml", "process": "user data", "options": options, "level": 50, diff --git a/src/rougail/user_data_file/i18n.py b/src/rougail/user_data_yaml/i18n.py similarity index 92% rename from src/rougail/user_data_file/i18n.py rename to src/rougail/user_data_yaml/i18n.py index 2fd30dc..b8a1f55 100644 --- a/src/rougail/user_data_file/i18n.py +++ b/src/rougail/user_data_yaml/i18n.py @@ -20,7 +20,7 @@ from gettext import translation from pathlib import Path t = translation( - "rougail_user_data_file", str(Path(__file__).parent / "locale"), fallback=True + "rougail_user_data_yaml", str(Path(__file__).parent / "locale"), fallback=True ) _ = t.gettext diff --git a/locale/fr/LC_MESSAGES/user_data_file.mo b/src/rougail/user_data_yaml/locale/fr/LC_MESSAGES/user_data_yaml.mo similarity index 50% rename from locale/fr/LC_MESSAGES/user_data_file.mo rename to src/rougail/user_data_yaml/locale/fr/LC_MESSAGES/user_data_yaml.mo index b81ab3941ad6f00d5b09450d7700fcead6132a93..e681824ffea648ed4f1ead8a13d023cc120eb86d 100644 GIT binary patch delta 107 zcmdnbdW3aCjHVC+149cF1A`8bo(`lLfix=+GXpUQ0ENJSWnyare`R8Bj)F$DL9HeO jh&l0#H3M delta 102 zcmX@Yx}SAIj3zGw149cF1A`8bo&=;Bfiw#cGXpUz5CerEU}9?me_Ccvs)9zfL9HeO jh&l0#H