sh-edraft.de/sh_discord_bot
5
1
Fork 1
Code Issues 26 Pull Requests Actions Packages Projects 3 Releases 27 Wiki Activity

Formatted stuff #405

Browse Source
This commit is contained in:
Sven Heidemann
2023-10-15 11:30:29 +02:00
parent 3a7daf8b42
commit be6361f619
226 changed files with 1083 additions and 3252 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
bot/tools/get_version/startup.py
View File

@@ -14,14 +14,10 @@ class Startup(StartupABC):
def configure_configuration(
self, configuration: ConfigurationABC, environment: ApplicationEnvironment
) -> ConfigurationABC:
environment.set_working_directory(
os.path.abspath(os.path.join(environment.working_directory, "../../"))
)
environment.set_working_directory(os.path.abspath(os.path.join(environment.working_directory, "../../")))
configuration.add_json_file(f"cpl-workspace.json", optional=False, output=False)
ws: WorkspaceSettings = configuration.get_configuration(WorkspaceSettings)
configuration.add_json_file(
ws.projects[ws.default_project], optional=False, output=False
)
configuration.add_json_file(ws.projects[ws.default_project], optional=False, output=False)
return configuration

8
bot/tools/post_build/post_build_settings.py
View File

@@ -24,9 +24,5 @@ class PostBuildSettings(ConfigurationModelABC):
self._keep_config = settings["KeepConfigs"]
self._config_paths = settings["ConfigPaths"]
except Exception as e:
Console.error(
f"[ ERROR ] [ {__name__} ]: Reading error in {type(self).__name__} settings"
)
Console.error(
f"[ EXCEPTION ] [ {__name__} ]: {e} -> {traceback.format_exc()}"
)
Console.error(f"[ ERROR ] [ {__name__} ]: Reading error in {type(self).__name__} settings")
Console.error(f"[ EXCEPTION ] [ {__name__} ]: {e} -> {traceback.format_exc()}")

4
bot/tools/post_build/service/dependencies.py
View File

@@ -54,9 +54,7 @@ class Dependencies:
)
for project in self._workspace.projects:
project_file = os.path.join(
self._env.working_directory, self._workspace.projects[project]
)
project_file = os.path.join(self._env.working_directory, self._workspace.projects[project])
self._config.add_json_file(project_file, output=False, optional=False)
project: ProjectSettings = self._config.get_configuration(ProjectSettings)
self._add_dependencies(project.dependencies)

8
bot/tools/post_build/startup.py
View File

@@ -18,14 +18,10 @@ class Startup(StartupABC):
self, configuration: ConfigurationABC, environment: ApplicationEnvironment
) -> ConfigurationABC:
configuration.add_json_file(f"appsettings.json", optional=False, output=False)
environment.set_working_directory(
os.path.abspath(os.path.join(environment.working_directory, "../../"))
)
environment.set_working_directory(os.path.abspath(os.path.join(environment.working_directory, "../../")))
configuration.add_json_file(f"cpl-workspace.json", optional=False, output=False)
ws: WorkspaceSettings = configuration.get_configuration(WorkspaceSettings)
configuration.add_json_file(
ws.projects[ws.default_project], optional=False, output=False
)
configuration.add_json_file(ws.projects[ws.default_project], optional=False, output=False)
return configuration

34
bot/tools/set_version/application.py
View File

@@ -22,9 +22,7 @@ class Application(ApplicationABC):
self._workspace: WorkspaceSettings = config.get_configuration(WorkspaceSettings)
self._git_service: GitService = self._services.get_service(GitService)
self._version_setter: VersionSetterService = self._services.get_service(
VersionSetterService
)
self._version_setter: VersionSetterService = self._services.get_service(VersionSetterService)
self._version_pipe: VersionPipe = self._services.get_service(VersionPipe)
def configure(self):
@@ -63,15 +61,11 @@ class Application(ApplicationABC):
optional=False,
output=False,
)
ps: ProjectSettings = self._configuration.get_configuration(
ProjectSettings
)
ps: ProjectSettings = self._configuration.get_configuration(ProjectSettings)
version[VersionSettingsNameEnum.major.value] = ps.version.major
version[VersionSettingsNameEnum.minor.value] = ps.version.minor
version[
VersionSettingsNameEnum.micro.value
] = f'dev{branch.split("#")[1]}'
version[VersionSettingsNameEnum.micro.value] = f'dev{branch.split("#")[1]}'
else:
if "." not in branch and "." in suffix:
branch = suffix
@@ -86,9 +80,7 @@ class Application(ApplicationABC):
else:
if not suffix.startswith(".") and suffix != "":
suffix = f".{suffix}"
version[
VersionSettingsNameEnum.micro.value
] = f'{branch.split(".")[2]}{suffix}'
version[VersionSettingsNameEnum.micro.value] = f'{branch.split(".")[2]}{suffix}'
except Exception as e:
Console.error(f"Branch {branch} does not contain valid version")
return
@@ -114,18 +106,12 @@ class Application(ApplicationABC):
try:
skipped = []
for project in self._workspace.projects:
if (
project not in diff_paths
and String.convert_to_snake_case(project) not in diff_paths
and not force
):
if project not in diff_paths and String.convert_to_snake_case(project) not in diff_paths and not force:
# Console.write_line(f'Skipping {project} due to missing changes')
skipped.append(project)
continue
Console.write_line(
f"Set dependencies {self._version_pipe.transform(version)} for {project}"
)
Console.write_line(f"Set dependencies {self._version_pipe.transform(version)} for {project}")
self._version_setter.set_dependencies(
self._workspace.projects[project],
version,
@@ -139,12 +125,8 @@ class Application(ApplicationABC):
skipped=skipped,
)
Console.write_line(
f"Set version {self._version_pipe.transform(version)} for {project}"
)
self._version_setter.set_version(
self._workspace.projects[project], version
)
Console.write_line(f"Set version {self._version_pipe.transform(version)} for {project}")
self._version_setter.set_version(self._workspace.projects[project], version)
except Exception as e:
Console.error("Version could not be set", traceback.format_exc())
return

8
bot/tools/set_version/startup.py
View File

@@ -19,12 +19,8 @@ class Startup(StartupABC):
) -> ConfigurationABC:
configuration.add_json_file("cpl-workspace.json", optional=True, output=False)
if configuration.get_configuration(WorkspaceSettings) is None:
environment.set_working_directory(
os.path.join(environment.working_directory, "../../")
)
configuration.add_json_file(
"cpl-workspace.json", optional=False, output=False
)
environment.set_working_directory(os.path.join(environment.working_directory, "../../"))
configuration.add_json_file("cpl-workspace.json", optional=False, output=False)
return configuration

13
bot/tools/set_version/version_setter_service.py
View File

@@ -12,9 +12,7 @@ class VersionSetterService:
def _read_file(self, file: str) -> dict:
project_json = {}
with open(
os.path.join(self._env.working_directory, file), "r", encoding="utf-8"
) as f:
with open(os.path.join(self._env.working_directory, file), "r", encoding="utf-8") as f:
# load json
project_json = json.load(f)
f.close()
@@ -22,9 +20,7 @@ class VersionSetterService:
return project_json
def _write_file(self, file: str, project_json: dict):
with open(
os.path.join(self._env.working_directory, file), "w", encoding="utf-8"
) as f:
with open(os.path.join(self._env.working_directory, file), "w", encoding="utf-8") as f:
f.write(json.dumps(project_json, indent=2))
f.close()
@@ -52,10 +48,7 @@ class VersionSetterService:
if (
skipped is not None
and (
dep_name in skipped
or String.convert_to_snake_case(dep_name) in skipped
)
and (dep_name in skipped or String.convert_to_snake_case(dep_name) in skipped)
or dep_version == ""
):
new_deps.append(dependency)