sh-edraft.de/sh_cpl
1
1
Fork 0
Code Issues 4 Pull Requests 1 Actions Packages Projects 1 Releases 12 Wiki Activity

Fixed internal settings

Browse Source
This commit is contained in:
Sven Heidemann 2023-04-12 13:47:38 +02:00
parent 9839bcaa14
commit cbb1860f25
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/cpl_cli/configuration/build_settings.py
View File

@ -18,10 +18,10 @@ class BuildSettings(ConfigurationModelABC):
main: str = None, main: str = None,
entry_point: str = None, entry_point: str = None,
include_package_data: bool = None, include_package_data: bool = None,
included: list[str] = None, included: list = None,
excluded: list[str] = None, excluded: list = None,
package_data: dict[str, list[str]] = None, package_data: dict = None,
project_references: list[str] = None, project_references: list = None,
): ):
ConfigurationModelABC.__init__(self) ConfigurationModelABC.__init__(self)

6
src/cpl_core/utils/json_processor.py
View File

@ -17,12 +17,14 @@ class JSONProcessor:
name = String.first_to_upper(String.convert_to_camel_case(parameter.name)) name = String.first_to_upper(String.convert_to_camel_case(parameter.name))
name_first_lower = String.first_to_lower(name) name_first_lower = String.first_to_lower(name)
if name in values or name_first_lower in values: if name in values or name_first_lower in values or name.upper() in values:
value = "" value = ""
if name in values: if name in values:
value = values[name] value = values[name]
else: elif name_first_lower in values:
value = values[name_first_lower] value = values[name_first_lower]
else:
value = values[name.upper()]
if isinstance(value, dict) and not issubclass(parameter.annotation, dict): if isinstance(value, dict) and not issubclass(parameter.annotation, dict):
value = JSONProcessor.process(parameter.annotation, value) value = JSONProcessor.process(parameter.annotation, value)