From 8e12c72b077ec3b186d99959de0519b8d5c3410c Mon Sep 17 00:00:00 2001 From: Sven Heidemann Date: Mon, 12 Jun 2023 20:45:22 +0200 Subject: [PATCH 01/12] Fixed cpl update dev deps bug #170 --- src/cpl_cli/command/update_service.py | 33 +++++++++++++++++++-------- src/cpl_cli/cpl-cli.json | 2 +- 2 files changed, 25 insertions(+), 10 deletions(-) diff --git a/src/cpl_cli/command/update_service.py b/src/cpl_cli/command/update_service.py index 607de0d3..49554a43 100644 --- a/src/cpl_cli/command/update_service.py +++ b/src/cpl_cli/command/update_service.py @@ -154,6 +154,24 @@ class UpdateService(CommandABC): Console.write_line(f"\tUpdate with {Pip.get_executable()} -m pip install --upgrade ") Console.set_foreground_color(ForegroundColorEnum.default) + def _save_formatted_package_name_to_deps_collection(self, deps: [str], old_package: str, new_package: str): + if old_package not in deps: + return + + initial_package = new_package + + if "/" in new_package: + new_package = new_package.split("/")[0] + + if "\r" in new_package: + new_package = new_package.replace("\r", "") + + if new_package == initial_package: + return + + index = self._project_settings.dependencies.index(old_package) + deps[index] = new_package + def _project_json_update_dependency(self, old_package: str, new_package: str): """ Writes new package version to project.json @@ -164,15 +182,12 @@ class UpdateService(CommandABC): if self._is_simulation: return - if old_package in self._project_settings.dependencies: - index = self._project_settings.dependencies.index(old_package) - if "/" in new_package: - new_package = new_package.split("/")[0] - - if "\r" in new_package: - new_package = new_package.replace("\r", "") - - self._project_settings.dependencies[index] = new_package + self._save_formatted_package_name_to_deps_collection( + self._project_settings.dependencies, old_package, new_package + ) + self._save_formatted_package_name_to_deps_collection( + self._project_settings.dev_dependencies, old_package, new_package + ) config = { ProjectSettings.__name__: SettingsHelper.get_project_settings_dict(self._project_settings), diff --git a/src/cpl_cli/cpl-cli.json b/src/cpl_cli/cpl-cli.json index fedc4378..23a84eac 100644 --- a/src/cpl_cli/cpl-cli.json +++ b/src/cpl_cli/cpl-cli.json @@ -4,7 +4,7 @@ "Version": { "Major": "2023", "Minor": "4", - "Micro": "0" + "Micro": "0.post1" }, "Author": "Sven Heidemann", "AuthorEmail": "sven.heidemann@sh-edraft.de", -- 2.45.2 From ea968d94e4a5cb1868aef78aa86cfc31263d5463 Mon Sep 17 00:00:00 2001 From: Sven Heidemann Date: Mon, 12 Jun 2023 20:45:42 +0200 Subject: [PATCH 02/12] Build app --- src/cpl_cli/.cpl/__init__.py | 4 ++-- src/cpl_cli/__init__.py | 4 ++-- src/cpl_cli/_templates/__init__.py | 4 ++-- src/cpl_cli/_templates/build/__init__.py | 4 ++-- src/cpl_cli/_templates/publish/__init__.py | 4 ++-- src/cpl_cli/abc/__init__.py | 4 ++-- src/cpl_cli/command/__init__.py | 4 ++-- src/cpl_cli/configuration/__init__.py | 4 ++-- src/cpl_cli/helper/__init__.py | 4 ++-- src/cpl_cli/live_server/__init__.py | 4 ++-- src/cpl_cli/migrations/__init__.py | 4 ++-- src/cpl_cli/migrations/base/__init__.py | 4 ++-- src/cpl_cli/migrations/service/__init__.py | 4 ++-- src/cpl_cli/publish/__init__.py | 4 ++-- src/cpl_cli/source_creator/__init__.py | 4 ++-- src/cpl_cli/validators/__init__.py | 4 ++-- 16 files changed, 32 insertions(+), 32 deletions(-) diff --git a/src/cpl_cli/.cpl/__init__.py b/src/cpl_cli/.cpl/__init__.py index b89a974a..c58bda00 100644 --- a/src/cpl_cli/.cpl/__init__.py +++ b/src/cpl_cli/.cpl/__init__.py @@ -15,7 +15,7 @@ __title__ = "cpl_cli" __author__ = "Sven Heidemann" __license__ = "MIT" __copyright__ = "Copyright (c) 2020 - 2023 sh-edraft.de" -__version__ = "2023.4.0" +__version__ = "2023.4.0.post1" from collections import namedtuple @@ -23,4 +23,4 @@ from collections import namedtuple # imports: VersionInfo = namedtuple("VersionInfo", "major minor micro") -version_info = VersionInfo(major="2023", minor="4", micro="0") +version_info = VersionInfo(major="2023", minor="4", micro="0.post1") diff --git a/src/cpl_cli/__init__.py b/src/cpl_cli/__init__.py index daff2148..1711b0df 100644 --- a/src/cpl_cli/__init__.py +++ b/src/cpl_cli/__init__.py @@ -15,7 +15,7 @@ __title__ = "cpl_cli" __author__ = "Sven Heidemann" __license__ = "MIT" __copyright__ = "Copyright (c) 2020 - 2023 sh-edraft.de" -__version__ = "2023.4.0" +__version__ = "2023.4.0.post1" from collections import namedtuple @@ -28,4 +28,4 @@ from .main import main from .startup import Startup VersionInfo = namedtuple("VersionInfo", "major minor micro") -version_info = VersionInfo(major="2023", minor="4", micro="0") +version_info = VersionInfo(major="2023", minor="4", micro="0.post1") diff --git a/src/cpl_cli/_templates/__init__.py b/src/cpl_cli/_templates/__init__.py index 7d78b8f1..6b51d213 100644 --- a/src/cpl_cli/_templates/__init__.py +++ b/src/cpl_cli/_templates/__init__.py @@ -15,7 +15,7 @@ __title__ = "cpl_cli._templates" __author__ = "Sven Heidemann" __license__ = "MIT" __copyright__ = "Copyright (c) 2020 - 2023 sh-edraft.de" -__version__ = "2023.4.0" +__version__ = "2023.4.0.post1" from collections import namedtuple @@ -23,4 +23,4 @@ from collections import namedtuple # imports: VersionInfo = namedtuple("VersionInfo", "major minor micro") -version_info = VersionInfo(major="2023", minor="4", micro="0") +version_info = VersionInfo(major="2023", minor="4", micro="0.post1") diff --git a/src/cpl_cli/_templates/build/__init__.py b/src/cpl_cli/_templates/build/__init__.py index 64f62b54..1824be41 100644 --- a/src/cpl_cli/_templates/build/__init__.py +++ b/src/cpl_cli/_templates/build/__init__.py @@ -15,7 +15,7 @@ __title__ = "cpl_cli._templates.build" __author__ = "Sven Heidemann" __license__ = "MIT" __copyright__ = "Copyright (c) 2020 - 2023 sh-edraft.de" -__version__ = "2023.4.0" +__version__ = "2023.4.0.post1" from collections import namedtuple @@ -23,4 +23,4 @@ from collections import namedtuple # imports: VersionInfo = namedtuple("VersionInfo", "major minor micro") -version_info = VersionInfo(major="2023", minor="4", micro="0") +version_info = VersionInfo(major="2023", minor="4", micro="0.post1") diff --git a/src/cpl_cli/_templates/publish/__init__.py b/src/cpl_cli/_templates/publish/__init__.py index 4e2340d9..09192f90 100644 --- a/src/cpl_cli/_templates/publish/__init__.py +++ b/src/cpl_cli/_templates/publish/__init__.py @@ -15,7 +15,7 @@ __title__ = "cpl_cli._templates.publish" __author__ = "Sven Heidemann" __license__ = "MIT" __copyright__ = "Copyright (c) 2020 - 2023 sh-edraft.de" -__version__ = "2023.4.0" +__version__ = "2023.4.0.post1" from collections import namedtuple @@ -23,4 +23,4 @@ from collections import namedtuple # imports: VersionInfo = namedtuple("VersionInfo", "major minor micro") -version_info = VersionInfo(major="2023", minor="4", micro="0") +version_info = VersionInfo(major="2023", minor="4", micro="0.post1") diff --git a/src/cpl_cli/abc/__init__.py b/src/cpl_cli/abc/__init__.py index 92f00d2f..9b1fab82 100644 --- a/src/cpl_cli/abc/__init__.py +++ b/src/cpl_cli/abc/__init__.py @@ -15,7 +15,7 @@ __title__ = "cpl_cli.abc" __author__ = "Sven Heidemann" __license__ = "MIT" __copyright__ = "Copyright (c) 2020 - 2023 sh-edraft.de" -__version__ = "2023.4.0" +__version__ = "2023.4.0.post1" from collections import namedtuple @@ -23,4 +23,4 @@ from collections import namedtuple # imports VersionInfo = namedtuple("VersionInfo", "major minor micro") -version_info = VersionInfo(major="2023", minor="4", micro="0") +version_info = VersionInfo(major="2023", minor="4", micro="0.post1") diff --git a/src/cpl_cli/command/__init__.py b/src/cpl_cli/command/__init__.py index 8a33ad19..b29d24d9 100644 --- a/src/cpl_cli/command/__init__.py +++ b/src/cpl_cli/command/__init__.py @@ -15,7 +15,7 @@ __title__ = "cpl_cli.command" __author__ = "Sven Heidemann" __license__ = "MIT" __copyright__ = "Copyright (c) 2020 - 2023 sh-edraft.de" -__version__ = "2023.4.0" +__version__ = "2023.4.0.post1" from collections import namedtuple @@ -29,4 +29,4 @@ from .publish_service import PublishService from .version_service import VersionService VersionInfo = namedtuple("VersionInfo", "major minor micro") -version_info = VersionInfo(major="2023", minor="4", micro="0") +version_info = VersionInfo(major="2023", minor="4", micro="0.post1") diff --git a/src/cpl_cli/configuration/__init__.py b/src/cpl_cli/configuration/__init__.py index facabf20..e8ca3033 100644 --- a/src/cpl_cli/configuration/__init__.py +++ b/src/cpl_cli/configuration/__init__.py @@ -15,7 +15,7 @@ __title__ = "cpl_cli.configuration" __author__ = "Sven Heidemann" __license__ = "MIT" __copyright__ = "Copyright (c) 2020 - 2023 sh-edraft.de" -__version__ = "2023.4.0" +__version__ = "2023.4.0.post1" from collections import namedtuple @@ -31,4 +31,4 @@ from .workspace_settings import WorkspaceSettings from .workspace_settings_name_enum import WorkspaceSettingsNameEnum VersionInfo = namedtuple("VersionInfo", "major minor micro") -version_info = VersionInfo(major="2023", minor="4", micro="0") +version_info = VersionInfo(major="2023", minor="4", micro="0.post1") diff --git a/src/cpl_cli/helper/__init__.py b/src/cpl_cli/helper/__init__.py index 78ac4c3f..4b177678 100644 --- a/src/cpl_cli/helper/__init__.py +++ b/src/cpl_cli/helper/__init__.py @@ -15,7 +15,7 @@ __title__ = "cpl_cli.helper" __author__ = "Sven Heidemann" __license__ = "MIT" __copyright__ = "Copyright (c) 2020 - 2023 sh-edraft.de" -__version__ = "2023.4.0" +__version__ = "2023.4.0.post1" from collections import namedtuple @@ -23,4 +23,4 @@ from collections import namedtuple # imports: VersionInfo = namedtuple("VersionInfo", "major minor micro") -version_info = VersionInfo(major="2023", minor="4", micro="0") +version_info = VersionInfo(major="2023", minor="4", micro="0.post1") diff --git a/src/cpl_cli/live_server/__init__.py b/src/cpl_cli/live_server/__init__.py index ed81df4a..7fba1533 100644 --- a/src/cpl_cli/live_server/__init__.py +++ b/src/cpl_cli/live_server/__init__.py @@ -15,7 +15,7 @@ __title__ = "cpl_cli.live_server" __author__ = "Sven Heidemann" __license__ = "MIT" __copyright__ = "Copyright (c) 2020 - 2023 sh-edraft.de" -__version__ = "2023.4.0" +__version__ = "2023.4.0.post1" from collections import namedtuple @@ -23,4 +23,4 @@ from collections import namedtuple # imports: VersionInfo = namedtuple("VersionInfo", "major minor micro") -version_info = VersionInfo(major="2023", minor="4", micro="0") +version_info = VersionInfo(major="2023", minor="4", micro="0.post1") diff --git a/src/cpl_cli/migrations/__init__.py b/src/cpl_cli/migrations/__init__.py index f93b3ce8..57f94ee0 100644 --- a/src/cpl_cli/migrations/__init__.py +++ b/src/cpl_cli/migrations/__init__.py @@ -15,7 +15,7 @@ __title__ = "cpl_cli.migrations" __author__ = "Sven Heidemann" __license__ = "MIT" __copyright__ = "Copyright (c) 2020 - 2023 sh-edraft.de" -__version__ = "2023.4.0" +__version__ = "2023.4.0.post1" from collections import namedtuple @@ -23,4 +23,4 @@ from collections import namedtuple # imports VersionInfo = namedtuple("VersionInfo", "major minor micro") -version_info = VersionInfo(major="2023", minor="4", micro="0") +version_info = VersionInfo(major="2023", minor="4", micro="0.post1") diff --git a/src/cpl_cli/migrations/base/__init__.py b/src/cpl_cli/migrations/base/__init__.py index 98ed351b..43a8dbd4 100644 --- a/src/cpl_cli/migrations/base/__init__.py +++ b/src/cpl_cli/migrations/base/__init__.py @@ -15,7 +15,7 @@ __title__ = "cpl_cli.migrations.base" __author__ = "Sven Heidemann" __license__ = "MIT" __copyright__ = "Copyright (c) 2020 - 2023 sh-edraft.de" -__version__ = "2023.4.0" +__version__ = "2023.4.0.post1" from collections import namedtuple @@ -23,4 +23,4 @@ from collections import namedtuple # imports: VersionInfo = namedtuple("VersionInfo", "major minor micro") -version_info = VersionInfo(major="2023", minor="4", micro="0") +version_info = VersionInfo(major="2023", minor="4", micro="0.post1") diff --git a/src/cpl_cli/migrations/service/__init__.py b/src/cpl_cli/migrations/service/__init__.py index 7c0e2c76..64bb8fae 100644 --- a/src/cpl_cli/migrations/service/__init__.py +++ b/src/cpl_cli/migrations/service/__init__.py @@ -15,7 +15,7 @@ __title__ = "cpl_cli.migrations.service" __author__ = "Sven Heidemann" __license__ = "MIT" __copyright__ = "Copyright (c) 2020 - 2023 sh-edraft.de" -__version__ = "2023.4.0" +__version__ = "2023.4.0.post1" from collections import namedtuple @@ -23,4 +23,4 @@ from collections import namedtuple # imports: VersionInfo = namedtuple("VersionInfo", "major minor micro") -version_info = VersionInfo(major="2023", minor="4", micro="0") +version_info = VersionInfo(major="2023", minor="4", micro="0.post1") diff --git a/src/cpl_cli/publish/__init__.py b/src/cpl_cli/publish/__init__.py index e27216bb..d5a15371 100644 --- a/src/cpl_cli/publish/__init__.py +++ b/src/cpl_cli/publish/__init__.py @@ -15,7 +15,7 @@ __title__ = "cpl_cli.publish" __author__ = "Sven Heidemann" __license__ = "MIT" __copyright__ = "Copyright (c) 2020 - 2023 sh-edraft.de" -__version__ = "2023.4.0" +__version__ = "2023.4.0.post1" from collections import namedtuple @@ -25,4 +25,4 @@ from .publisher_abc import PublisherABC from .publisher_service import PublisherService VersionInfo = namedtuple("VersionInfo", "major minor micro") -version_info = VersionInfo(major="2023", minor="4", micro="0") +version_info = VersionInfo(major="2023", minor="4", micro="0.post1") diff --git a/src/cpl_cli/source_creator/__init__.py b/src/cpl_cli/source_creator/__init__.py index 4a700c0c..59fc89d5 100644 --- a/src/cpl_cli/source_creator/__init__.py +++ b/src/cpl_cli/source_creator/__init__.py @@ -15,7 +15,7 @@ __title__ = "cpl_cli.source_creator" __author__ = "Sven Heidemann" __license__ = "MIT" __copyright__ = "Copyright (c) 2020 - 2023 sh-edraft.de" -__version__ = "2023.4.0" +__version__ = "2023.4.0.post1" from collections import namedtuple @@ -23,4 +23,4 @@ from collections import namedtuple # imports: VersionInfo = namedtuple("VersionInfo", "major minor micro") -version_info = VersionInfo(major="2023", minor="4", micro="0") +version_info = VersionInfo(major="2023", minor="4", micro="0.post1") diff --git a/src/cpl_cli/validators/__init__.py b/src/cpl_cli/validators/__init__.py index 0d420638..ac1d3970 100644 --- a/src/cpl_cli/validators/__init__.py +++ b/src/cpl_cli/validators/__init__.py @@ -15,7 +15,7 @@ __title__ = "cpl_cli.validators" __author__ = "Sven Heidemann" __license__ = "MIT" __copyright__ = "Copyright (c) 2020 - 2023 sh-edraft.de" -__version__ = "2023.4.0" +__version__ = "2023.4.0.post1" from collections import namedtuple @@ -23,4 +23,4 @@ from collections import namedtuple # imports: VersionInfo = namedtuple("VersionInfo", "major minor micro") -version_info = VersionInfo(major="2023", minor="4", micro="0") +version_info = VersionInfo(major="2023", minor="4", micro="0.post1") -- 2.45.2 From e04d0beb68c5fea26e05d03f41d2e48288cfd897 Mon Sep 17 00:00:00 2001 From: Sven Heidemann Date: Tue, 13 Jun 2023 13:27:37 +0200 Subject: [PATCH 03/12] Fixed circular import from query package --- src/cpl_discord/.cpl/__init__.py | 4 ++-- src/cpl_discord/__init__.py | 4 ++-- src/cpl_discord/application/__init__.py | 4 ++-- src/cpl_discord/command/__init__.py | 4 ++-- src/cpl_discord/configuration/__init__.py | 4 ++-- src/cpl_discord/container/__init__.py | 4 ++-- src/cpl_discord/container/category_channel.py | 2 +- src/cpl_discord/container/guild.py | 2 +- src/cpl_discord/container/text_channel.py | 2 +- src/cpl_discord/container/thread.py | 2 +- src/cpl_discord/container/voice_channel.py | 2 +- src/cpl_discord/cpl-discord.json | 2 +- src/cpl_discord/events/__init__.py | 4 ++-- src/cpl_discord/helper/__init__.py | 4 ++-- src/cpl_discord/service/__init__.py | 4 ++-- src/cpl_discord/service/discord_collection.py | 2 +- src/cpl_discord/service/discord_collection_abc.py | 2 +- src/cpl_query/__init__.py | 4 ++-- src/cpl_query/base/__init__.py | 4 ++-- src/cpl_query/base/ordered_queryable.py | 4 ++-- src/cpl_query/cpl-query.json | 2 +- src/cpl_query/enumerable/__init__.py | 4 ++-- src/cpl_query/extension/__init__.py | 4 ++-- src/cpl_query/iterable/__init__.py | 4 ++-- 24 files changed, 39 insertions(+), 39 deletions(-) diff --git a/src/cpl_discord/.cpl/__init__.py b/src/cpl_discord/.cpl/__init__.py index 3c5411c5..817f9eb0 100644 --- a/src/cpl_discord/.cpl/__init__.py +++ b/src/cpl_discord/.cpl/__init__.py @@ -15,7 +15,7 @@ __title__ = "cpl_discord" __author__ = "Sven Heidemann" __license__ = "MIT" __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de" -__version__ = "2023.4.0" +__version__ = "2023.4.0.post1" from collections import namedtuple @@ -23,4 +23,4 @@ from collections import namedtuple # imports: VersionInfo = namedtuple("VersionInfo", "major minor micro") -version_info = VersionInfo(major="2023", minor="4", micro="0") +version_info = VersionInfo(major="2023", minor="4", micro="0.post1") diff --git a/src/cpl_discord/__init__.py b/src/cpl_discord/__init__.py index c1a6b138..f0ac26db 100644 --- a/src/cpl_discord/__init__.py +++ b/src/cpl_discord/__init__.py @@ -15,7 +15,7 @@ __title__ = "cpl_discord" __author__ = "Sven Heidemann" __license__ = "MIT" __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de" -__version__ = "2023.4.0" +__version__ = "2023.4.0.post1" from collections import namedtuple @@ -59,4 +59,4 @@ def get_discord_collection(services: "ServiceCollectionABC") -> "DiscordCollecti # build-ignore-end VersionInfo = namedtuple("VersionInfo", "major minor micro") -version_info = VersionInfo(major="2023", minor="4", micro="0") +version_info = VersionInfo(major="2023", minor="4", micro="0.post1") diff --git a/src/cpl_discord/application/__init__.py b/src/cpl_discord/application/__init__.py index 70e4c531..46c925d3 100644 --- a/src/cpl_discord/application/__init__.py +++ b/src/cpl_discord/application/__init__.py @@ -15,7 +15,7 @@ __title__ = "cpl_discord.application" __author__ = "Sven Heidemann" __license__ = "MIT" __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de" -__version__ = "2023.4.0" +__version__ = "2023.4.0.post1" from collections import namedtuple @@ -24,4 +24,4 @@ from collections import namedtuple from .discord_bot_application_abc import DiscordBotApplicationABC VersionInfo = namedtuple("VersionInfo", "major minor micro") -version_info = VersionInfo(major="2023", minor="4", micro="0") +version_info = VersionInfo(major="2023", minor="4", micro="0.post1") diff --git a/src/cpl_discord/command/__init__.py b/src/cpl_discord/command/__init__.py index 7b0adcc2..51e90f17 100644 --- a/src/cpl_discord/command/__init__.py +++ b/src/cpl_discord/command/__init__.py @@ -15,7 +15,7 @@ __title__ = "cpl_discord.command" __author__ = "Sven Heidemann" __license__ = "MIT" __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de" -__version__ = "2023.4.0" +__version__ = "2023.4.0.post1" from collections import namedtuple @@ -25,4 +25,4 @@ from .discord_command_abc import DiscordCommandABC from .discord_commands_meta import DiscordCogMeta VersionInfo = namedtuple("VersionInfo", "major minor micro") -version_info = VersionInfo(major="2023", minor="4", micro="0") +version_info = VersionInfo(major="2023", minor="4", micro="0.post1") diff --git a/src/cpl_discord/configuration/__init__.py b/src/cpl_discord/configuration/__init__.py index 30a98b85..1c64d289 100644 --- a/src/cpl_discord/configuration/__init__.py +++ b/src/cpl_discord/configuration/__init__.py @@ -15,7 +15,7 @@ __title__ = "cpl_discord.configuration" __author__ = "Sven Heidemann" __license__ = "MIT" __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de" -__version__ = "2023.4.0" +__version__ = "2023.4.0.post1" from collections import namedtuple @@ -24,4 +24,4 @@ from collections import namedtuple from .discord_bot_settings import DiscordBotSettings VersionInfo = namedtuple("VersionInfo", "major minor micro") -version_info = VersionInfo(major="2023", minor="4", micro="0") +version_info = VersionInfo(major="2023", minor="4", micro="0.post1") diff --git a/src/cpl_discord/container/__init__.py b/src/cpl_discord/container/__init__.py index 7372d5ba..45e09573 100644 --- a/src/cpl_discord/container/__init__.py +++ b/src/cpl_discord/container/__init__.py @@ -15,7 +15,7 @@ __title__ = "cpl_discord.container" __author__ = "Sven Heidemann" __license__ = "MIT" __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de" -__version__ = "2023.4.0" +__version__ = "2023.4.0.post1" from collections import namedtuple @@ -31,4 +31,4 @@ from .thread import Thread from .voice_channel import VoiceChannel VersionInfo = namedtuple("VersionInfo", "major minor micro") -version_info = VersionInfo(major="2023", minor="4", micro="0") +version_info = VersionInfo(major="2023", minor="4", micro="0.post1") diff --git a/src/cpl_discord/container/category_channel.py b/src/cpl_discord/container/category_channel.py index 1454535b..058a6792 100644 --- a/src/cpl_discord/container/category_channel.py +++ b/src/cpl_discord/container/category_channel.py @@ -4,7 +4,7 @@ from cpl_discord.container.container import Container from cpl_discord.container.text_channel import TextChannel from cpl_discord.container.voice_channel import VoiceChannel from cpl_discord.helper.to_containers_converter import ToContainersConverter -from cpl_query.extension import List +from cpl_query.extension.list import List class CategoryChannel(discord.CategoryChannel, Container): diff --git a/src/cpl_discord/container/guild.py b/src/cpl_discord/container/guild.py index 063ad1a1..91740f79 100644 --- a/src/cpl_discord/container/guild.py +++ b/src/cpl_discord/container/guild.py @@ -7,7 +7,7 @@ from cpl_discord.container.role import Role from cpl_discord.container.text_channel import TextChannel from cpl_discord.container.voice_channel import VoiceChannel from cpl_discord.helper.to_containers_converter import ToContainersConverter -from cpl_query.extension import List +from cpl_query.extension.list import List class Guild(Container, discord.Guild): diff --git a/src/cpl_discord/container/text_channel.py b/src/cpl_discord/container/text_channel.py index 9e158cc2..d6ae2782 100644 --- a/src/cpl_discord/container/text_channel.py +++ b/src/cpl_discord/container/text_channel.py @@ -4,7 +4,7 @@ from cpl_discord.container.container import Container from cpl_discord.container.member import Member from cpl_discord.container.thread import Thread from cpl_discord.helper.to_containers_converter import ToContainersConverter -from cpl_query.extension import List +from cpl_query.extension.list import List class TextChannel(discord.TextChannel, Container): diff --git a/src/cpl_discord/container/thread.py b/src/cpl_discord/container/thread.py index 62c1269f..66ecd49d 100644 --- a/src/cpl_discord/container/thread.py +++ b/src/cpl_discord/container/thread.py @@ -3,7 +3,7 @@ import discord from cpl_discord.container.container import Container from cpl_discord.container.member import Member from cpl_discord.helper.to_containers_converter import ToContainersConverter -from cpl_query.extension import List +from cpl_query.extension.list import List class Thread(discord.Thread, Container): diff --git a/src/cpl_discord/container/voice_channel.py b/src/cpl_discord/container/voice_channel.py index 20eb3edb..c273d036 100644 --- a/src/cpl_discord/container/voice_channel.py +++ b/src/cpl_discord/container/voice_channel.py @@ -3,7 +3,7 @@ import discord from cpl_discord.container.container import Container from cpl_discord.container.member import Member from cpl_discord.helper.to_containers_converter import ToContainersConverter -from cpl_query.extension import List +from cpl_query.extension.list import List class VoiceChannel(discord.VoiceChannel, Container): diff --git a/src/cpl_discord/cpl-discord.json b/src/cpl_discord/cpl-discord.json index 93e06e10..86c78c8a 100644 --- a/src/cpl_discord/cpl-discord.json +++ b/src/cpl_discord/cpl-discord.json @@ -4,7 +4,7 @@ "Version": { "Major": "2023", "Minor": "4", - "Micro": "0" + "Micro": "0.post1" }, "Author": "Sven Heidemann", "AuthorEmail": "sven.heidemann@sh-edraft.de", diff --git a/src/cpl_discord/events/__init__.py b/src/cpl_discord/events/__init__.py index ac4a3700..1f1c5131 100644 --- a/src/cpl_discord/events/__init__.py +++ b/src/cpl_discord/events/__init__.py @@ -15,7 +15,7 @@ __title__ = "cpl_discord.events" __author__ = "Sven Heidemann" __license__ = "MIT" __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de" -__version__ = "2023.4.0" +__version__ = "2023.4.0.post1" from collections import namedtuple @@ -69,4 +69,4 @@ from .on_voice_state_update_abc import OnVoiceStateUpdateABC from .on_webhooks_update_abc import OnWebhooksUpdateABC VersionInfo = namedtuple("VersionInfo", "major minor micro") -version_info = VersionInfo(major="2023", minor="4", micro="0") +version_info = VersionInfo(major="2023", minor="4", micro="0.post1") diff --git a/src/cpl_discord/helper/__init__.py b/src/cpl_discord/helper/__init__.py index 4c310fe5..153af02f 100644 --- a/src/cpl_discord/helper/__init__.py +++ b/src/cpl_discord/helper/__init__.py @@ -15,7 +15,7 @@ __title__ = "cpl_discord.helper" __author__ = "Sven Heidemann" __license__ = "MIT" __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de" -__version__ = "2023.4.0" +__version__ = "2023.4.0.post1" from collections import namedtuple @@ -24,4 +24,4 @@ from collections import namedtuple from .to_containers_converter import ToContainersConverter VersionInfo = namedtuple("VersionInfo", "major minor micro") -version_info = VersionInfo(major="2023", minor="4", micro="0") +version_info = VersionInfo(major="2023", minor="4", micro="0.post1") diff --git a/src/cpl_discord/service/__init__.py b/src/cpl_discord/service/__init__.py index b8ea43f0..79acd9ab 100644 --- a/src/cpl_discord/service/__init__.py +++ b/src/cpl_discord/service/__init__.py @@ -15,7 +15,7 @@ __title__ = "cpl_discord.service" __author__ = "Sven Heidemann" __license__ = "MIT" __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de" -__version__ = "2023.4.0" +__version__ = "2023.4.0.post1" from collections import namedtuple @@ -29,4 +29,4 @@ from .discord_service import DiscordService from .discord_service_abc import DiscordServiceABC VersionInfo = namedtuple("VersionInfo", "major minor micro") -version_info = VersionInfo(major="2023", minor="4", micro="0") +version_info = VersionInfo(major="2023", minor="4", micro="0.post1") diff --git a/src/cpl_discord/service/discord_collection.py b/src/cpl_discord/service/discord_collection.py index e93806ec..a5b052da 100644 --- a/src/cpl_discord/service/discord_collection.py +++ b/src/cpl_discord/service/discord_collection.py @@ -5,7 +5,7 @@ from cpl_discord.command.discord_command_abc import DiscordCommandABC from cpl_discord.discord_event_types_enum import DiscordEventTypesEnum from cpl_discord.service.command_error_handler_service import CommandErrorHandlerService from cpl_discord.service.discord_collection_abc import DiscordCollectionABC -from cpl_query.extension import List +from cpl_query.extension.list import List class DiscordCollection(DiscordCollectionABC): diff --git a/src/cpl_discord/service/discord_collection_abc.py b/src/cpl_discord/service/discord_collection_abc.py index f6982806..bb444f6d 100644 --- a/src/cpl_discord/service/discord_collection_abc.py +++ b/src/cpl_discord/service/discord_collection_abc.py @@ -2,7 +2,7 @@ from abc import ABC, abstractmethod from typing import Type from cpl_discord.command import DiscordCommandABC -from cpl_query.extension import List +from cpl_query.extension.list import List class DiscordCollectionABC(ABC): diff --git a/src/cpl_query/__init__.py b/src/cpl_query/__init__.py index 67c9bb4a..bb13759e 100644 --- a/src/cpl_query/__init__.py +++ b/src/cpl_query/__init__.py @@ -15,7 +15,7 @@ __title__ = "cpl_query" __author__ = "Sven Heidemann" __license__ = "MIT" __copyright__ = "Copyright (c) 2021 - 2023 sh-edraft.de" -__version__ = "2023.4.0" +__version__ = "2023.4.0.post1" from collections import namedtuple @@ -23,4 +23,4 @@ from collections import namedtuple # imports: VersionInfo = namedtuple("VersionInfo", "major minor micro") -version_info = VersionInfo(major="2023", minor="4", micro="0") +version_info = VersionInfo(major="2023", minor="4", micro="0.post1") diff --git a/src/cpl_query/base/__init__.py b/src/cpl_query/base/__init__.py index 7418aff7..2b10c00e 100644 --- a/src/cpl_query/base/__init__.py +++ b/src/cpl_query/base/__init__.py @@ -15,7 +15,7 @@ __title__ = "cpl_query.base" __author__ = "Sven Heidemann" __license__ = "MIT" __copyright__ = "Copyright (c) 2021 - 2023 sh-edraft.de" -__version__ = "2023.4.0" +__version__ = "2023.4.0.post1" from collections import namedtuple @@ -28,4 +28,4 @@ from .queryable_abc import QueryableABC from .sequence import Sequence VersionInfo = namedtuple("VersionInfo", "major minor micro") -version_info = VersionInfo(major="2023", minor="4", micro="0") +version_info = VersionInfo(major="2023", minor="4", micro="0.post1") diff --git a/src/cpl_query/base/ordered_queryable.py b/src/cpl_query/base/ordered_queryable.py index d865979f..9f0f7b56 100644 --- a/src/cpl_query/base/ordered_queryable.py +++ b/src/cpl_query/base/ordered_queryable.py @@ -1,14 +1,14 @@ from collections.abc import Callable +from cpl_query.base.queryable_abc import QueryableABC from cpl_query.base.ordered_queryable_abc import OrderedQueryableABC from cpl_query.exceptions import ArgumentNoneException, ExceptionArgument -from cpl_query.iterable.iterable import Iterable class OrderedQueryable(OrderedQueryableABC): r"""Implementation of :class: `cpl_query.base.ordered_queryable_abc.OrderedQueryableABC`""" - def __init__(self, _t: type, _values: Iterable = None, _func: Callable = None): + def __init__(self, _t: type, _values: QueryableABC = None, _func: Callable = None): OrderedQueryableABC.__init__(self, _t, _values, _func) def then_by(self, _func: Callable) -> OrderedQueryableABC: diff --git a/src/cpl_query/cpl-query.json b/src/cpl_query/cpl-query.json index 6585103a..3524aee1 100644 --- a/src/cpl_query/cpl-query.json +++ b/src/cpl_query/cpl-query.json @@ -4,7 +4,7 @@ "Version": { "Major": "2023", "Minor": "4", - "Micro": "0" + "Micro": "0.post1" }, "Author": "Sven Heidemann", "AuthorEmail": "sven.heidemann@sh-edraft.de", diff --git a/src/cpl_query/enumerable/__init__.py b/src/cpl_query/enumerable/__init__.py index 39a07797..5d995c29 100644 --- a/src/cpl_query/enumerable/__init__.py +++ b/src/cpl_query/enumerable/__init__.py @@ -15,7 +15,7 @@ __title__ = "cpl_query.enumerable" __author__ = "Sven Heidemann" __license__ = "MIT" __copyright__ = "Copyright (c) 2021 - 2023 sh-edraft.de" -__version__ = "2023.4.0" +__version__ = "2023.4.0.post1" from collections import namedtuple @@ -25,4 +25,4 @@ from .enumerable import Enumerable from .enumerable_abc import EnumerableABC VersionInfo = namedtuple("VersionInfo", "major minor micro") -version_info = VersionInfo(major="2023", minor="4", micro="0") +version_info = VersionInfo(major="2023", minor="4", micro="0.post1") diff --git a/src/cpl_query/extension/__init__.py b/src/cpl_query/extension/__init__.py index 6943b963..1f6b54c1 100644 --- a/src/cpl_query/extension/__init__.py +++ b/src/cpl_query/extension/__init__.py @@ -15,7 +15,7 @@ __title__ = "cpl_query.extension" __author__ = "Sven Heidemann" __license__ = "MIT" __copyright__ = "Copyright (c) 2021 - 2023 sh-edraft.de" -__version__ = "2023.4.0" +__version__ = "2023.4.0.post1" from collections import namedtuple @@ -24,4 +24,4 @@ from collections import namedtuple from .list import List VersionInfo = namedtuple("VersionInfo", "major minor micro") -version_info = VersionInfo(major="2023", minor="4", micro="0") +version_info = VersionInfo(major="2023", minor="4", micro="0.post1") diff --git a/src/cpl_query/iterable/__init__.py b/src/cpl_query/iterable/__init__.py index c1b5035a..20a51161 100644 --- a/src/cpl_query/iterable/__init__.py +++ b/src/cpl_query/iterable/__init__.py @@ -15,7 +15,7 @@ __title__ = "cpl_query.iterable" __author__ = "Sven Heidemann" __license__ = "MIT" __copyright__ = "Copyright (c) 2021 - 2023 sh-edraft.de" -__version__ = "2023.4.0" +__version__ = "2023.4.0.post1" from collections import namedtuple @@ -25,4 +25,4 @@ from .iterable_abc import IterableABC from .iterable import Iterable VersionInfo = namedtuple("VersionInfo", "major minor micro") -version_info = VersionInfo(major="2023", minor="4", micro="0") +version_info = VersionInfo(major="2023", minor="4", micro="0.post1") -- 2.45.2 From bea5b222517ff03b2094c9f07028234575d8dd6b Mon Sep 17 00:00:00 2001 From: Sven Heidemann Date: Tue, 13 Jun 2023 15:08:04 +0200 Subject: [PATCH 04/12] Fixed db settings default port --- src/cpl_core/__init__.py | 4 ++-- src/cpl_core/application/__init__.py | 4 ++-- src/cpl_core/configuration/__init__.py | 4 ++-- src/cpl_core/console/__init__.py | 4 ++-- src/cpl_core/cpl-core.json | 2 +- src/cpl_core/database/__init__.py | 4 ++-- src/cpl_core/database/connection/__init__.py | 4 ++-- src/cpl_core/database/context/__init__.py | 4 ++-- src/cpl_core/database/database_settings.py | 2 +- src/cpl_core/dependency_injection/__init__.py | 4 ++-- src/cpl_core/environment/__init__.py | 4 ++-- src/cpl_core/logging/__init__.py | 4 ++-- src/cpl_core/mailing/__init__.py | 4 ++-- src/cpl_core/pipes/__init__.py | 4 ++-- src/cpl_core/time/__init__.py | 4 ++-- src/cpl_core/utils/__init__.py | 4 ++-- 16 files changed, 30 insertions(+), 30 deletions(-) diff --git a/src/cpl_core/__init__.py b/src/cpl_core/__init__.py index 33f82aae..a80f88c8 100644 --- a/src/cpl_core/__init__.py +++ b/src/cpl_core/__init__.py @@ -15,7 +15,7 @@ __title__ = "cpl_core" __author__ = "Sven Heidemann" __license__ = "MIT" __copyright__ = "Copyright (c) 2020 - 2023 sh-edraft.de" -__version__ = "2023.4.0.post1" +__version__ = "2023.4.0.post2" from collections import namedtuple @@ -23,4 +23,4 @@ from collections import namedtuple # imports: VersionInfo = namedtuple("VersionInfo", "major minor micro") -version_info = VersionInfo(major="2023", minor="4", micro="0.post1") +version_info = VersionInfo(major="2023", minor="4", micro="0.post2") diff --git a/src/cpl_core/application/__init__.py b/src/cpl_core/application/__init__.py index 3a87cd69..39356226 100644 --- a/src/cpl_core/application/__init__.py +++ b/src/cpl_core/application/__init__.py @@ -15,7 +15,7 @@ __title__ = "cpl_core.application" __author__ = "Sven Heidemann" __license__ = "MIT" __copyright__ = "Copyright (c) 2020 - 2023 sh-edraft.de" -__version__ = "2023.4.0.post1" +__version__ = "2023.4.0.post2" from collections import namedtuple @@ -29,4 +29,4 @@ from .startup_abc import StartupABC from .startup_extension_abc import StartupExtensionABC VersionInfo = namedtuple("VersionInfo", "major minor micro") -version_info = VersionInfo(major="2023", minor="4", micro="0.post1") +version_info = VersionInfo(major="2023", minor="4", micro="0.post2") diff --git a/src/cpl_core/configuration/__init__.py b/src/cpl_core/configuration/__init__.py index 1c84582e..79096006 100644 --- a/src/cpl_core/configuration/__init__.py +++ b/src/cpl_core/configuration/__init__.py @@ -15,7 +15,7 @@ __title__ = "cpl_core.configuration" __author__ = "Sven Heidemann" __license__ = "MIT" __copyright__ = "Copyright (c) 2020 - 2023 sh-edraft.de" -__version__ = "2023.4.0.post1" +__version__ = "2023.4.0.post2" from collections import namedtuple @@ -35,4 +35,4 @@ from .validator_abc import ValidatorABC from .variable_argument import VariableArgument VersionInfo = namedtuple("VersionInfo", "major minor micro") -version_info = VersionInfo(major="2023", minor="4", micro="0.post1") +version_info = VersionInfo(major="2023", minor="4", micro="0.post2") diff --git a/src/cpl_core/console/__init__.py b/src/cpl_core/console/__init__.py index 1f85043b..624737d4 100644 --- a/src/cpl_core/console/__init__.py +++ b/src/cpl_core/console/__init__.py @@ -15,7 +15,7 @@ __title__ = "cpl_core.console" __author__ = "Sven Heidemann" __license__ = "MIT" __copyright__ = "Copyright (c) 2020 - 2023 sh-edraft.de" -__version__ = "2023.4.0.post1" +__version__ = "2023.4.0.post2" from collections import namedtuple @@ -28,4 +28,4 @@ from .foreground_color_enum import ForegroundColorEnum from .spinner_thread import SpinnerThread VersionInfo = namedtuple("VersionInfo", "major minor micro") -version_info = VersionInfo(major="2023", minor="4", micro="0.post1") +version_info = VersionInfo(major="2023", minor="4", micro="0.post2") diff --git a/src/cpl_core/cpl-core.json b/src/cpl_core/cpl-core.json index eccc2894..98136f5d 100644 --- a/src/cpl_core/cpl-core.json +++ b/src/cpl_core/cpl-core.json @@ -4,7 +4,7 @@ "Version": { "Major": "2023", "Minor": "4", - "Micro": "0.post1" + "Micro": "0.post2" }, "Author": "Sven Heidemann", "AuthorEmail": "sven.heidemann@sh-edraft.de", diff --git a/src/cpl_core/database/__init__.py b/src/cpl_core/database/__init__.py index 2ddbf2ce..2ab6f55f 100644 --- a/src/cpl_core/database/__init__.py +++ b/src/cpl_core/database/__init__.py @@ -15,7 +15,7 @@ __title__ = "cpl_core.database" __author__ = "Sven Heidemann" __license__ = "MIT" __copyright__ = "Copyright (c) 2020 - 2023 sh-edraft.de" -__version__ = "2023.4.0.post1" +__version__ = "2023.4.0.post2" from collections import namedtuple @@ -26,4 +26,4 @@ from .database_settings import DatabaseSettings from .table_abc import TableABC VersionInfo = namedtuple("VersionInfo", "major minor micro") -version_info = VersionInfo(major="2023", minor="4", micro="0.post1") +version_info = VersionInfo(major="2023", minor="4", micro="0.post2") diff --git a/src/cpl_core/database/connection/__init__.py b/src/cpl_core/database/connection/__init__.py index 5354b745..a29b36cf 100644 --- a/src/cpl_core/database/connection/__init__.py +++ b/src/cpl_core/database/connection/__init__.py @@ -15,7 +15,7 @@ __title__ = "cpl_core.database.connection" __author__ = "Sven Heidemann" __license__ = "MIT" __copyright__ = "Copyright (c) 2020 - 2023 sh-edraft.de" -__version__ = "2023.4.0.post1" +__version__ = "2023.4.0.post2" from collections import namedtuple @@ -25,4 +25,4 @@ from .database_connection import DatabaseConnection from .database_connection_abc import DatabaseConnectionABC VersionInfo = namedtuple("VersionInfo", "major minor micro") -version_info = VersionInfo(major="2023", minor="4", micro="0.post1") +version_info = VersionInfo(major="2023", minor="4", micro="0.post2") diff --git a/src/cpl_core/database/context/__init__.py b/src/cpl_core/database/context/__init__.py index 7b72b757..ab6b66a1 100644 --- a/src/cpl_core/database/context/__init__.py +++ b/src/cpl_core/database/context/__init__.py @@ -15,7 +15,7 @@ __title__ = "cpl_core.database.context" __author__ = "Sven Heidemann" __license__ = "MIT" __copyright__ = "Copyright (c) 2020 - 2023 sh-edraft.de" -__version__ = "2023.4.0.post1" +__version__ = "2023.4.0.post2" from collections import namedtuple @@ -25,4 +25,4 @@ from .database_context import DatabaseContext from .database_context_abc import DatabaseContextABC VersionInfo = namedtuple("VersionInfo", "major minor micro") -version_info = VersionInfo(major="2023", minor="4", micro="0.post1") +version_info = VersionInfo(major="2023", minor="4", micro="0.post2") diff --git a/src/cpl_core/database/database_settings.py b/src/cpl_core/database/database_settings.py index c8ee032f..d6bac435 100644 --- a/src/cpl_core/database/database_settings.py +++ b/src/cpl_core/database/database_settings.py @@ -9,7 +9,7 @@ class DatabaseSettings(ConfigurationModelABC): def __init__( self, host: str = None, - port: int = None, + port: int = 3306, user: str = None, password: str = None, database: str = None, diff --git a/src/cpl_core/dependency_injection/__init__.py b/src/cpl_core/dependency_injection/__init__.py index b5474ba1..10cef790 100644 --- a/src/cpl_core/dependency_injection/__init__.py +++ b/src/cpl_core/dependency_injection/__init__.py @@ -15,7 +15,7 @@ __title__ = "cpl_core.dependency_injection" __author__ = "Sven Heidemann" __license__ = "MIT" __copyright__ = "Copyright (c) 2020 - 2023 sh-edraft.de" -__version__ = "2023.4.0.post1" +__version__ = "2023.4.0.post2" from collections import namedtuple @@ -31,4 +31,4 @@ from .service_provider import ServiceProvider from .service_provider_abc import ServiceProviderABC VersionInfo = namedtuple("VersionInfo", "major minor micro") -version_info = VersionInfo(major="2023", minor="4", micro="0.post1") +version_info = VersionInfo(major="2023", minor="4", micro="0.post2") diff --git a/src/cpl_core/environment/__init__.py b/src/cpl_core/environment/__init__.py index 2e0a30cb..04d2c03f 100644 --- a/src/cpl_core/environment/__init__.py +++ b/src/cpl_core/environment/__init__.py @@ -15,7 +15,7 @@ __title__ = "cpl_core.environment" __author__ = "Sven Heidemann" __license__ = "MIT" __copyright__ = "Copyright (c) 2020 - 2023 sh-edraft.de" -__version__ = "2023.4.0.post1" +__version__ = "2023.4.0.post2" from collections import namedtuple @@ -26,4 +26,4 @@ from .environment_name_enum import EnvironmentNameEnum from .application_environment import ApplicationEnvironment VersionInfo = namedtuple("VersionInfo", "major minor micro") -version_info = VersionInfo(major="2023", minor="4", micro="0.post1") +version_info = VersionInfo(major="2023", minor="4", micro="0.post2") diff --git a/src/cpl_core/logging/__init__.py b/src/cpl_core/logging/__init__.py index 5c812d5a..6cd5310a 100644 --- a/src/cpl_core/logging/__init__.py +++ b/src/cpl_core/logging/__init__.py @@ -15,7 +15,7 @@ __title__ = "cpl_core.logging" __author__ = "Sven Heidemann" __license__ = "MIT" __copyright__ = "Copyright (c) 2020 - 2023 sh-edraft.de" -__version__ = "2023.4.0.post1" +__version__ = "2023.4.0.post2" from collections import namedtuple @@ -28,4 +28,4 @@ from .logging_settings import LoggingSettings from .logging_settings_name_enum import LoggingSettingsNameEnum VersionInfo = namedtuple("VersionInfo", "major minor micro") -version_info = VersionInfo(major="2023", minor="4", micro="0.post1") +version_info = VersionInfo(major="2023", minor="4", micro="0.post2") diff --git a/src/cpl_core/mailing/__init__.py b/src/cpl_core/mailing/__init__.py index 2ae416dd..e7f1f297 100644 --- a/src/cpl_core/mailing/__init__.py +++ b/src/cpl_core/mailing/__init__.py @@ -15,7 +15,7 @@ __title__ = "cpl_core.mailing" __author__ = "Sven Heidemann" __license__ = "MIT" __copyright__ = "Copyright (c) 2020 - 2023 sh-edraft.de" -__version__ = "2023.4.0.post1" +__version__ = "2023.4.0.post2" from collections import namedtuple @@ -28,4 +28,4 @@ from .email_client_settings import EMailClientSettings from .email_client_settings_name_enum import EMailClientSettingsNameEnum VersionInfo = namedtuple("VersionInfo", "major minor micro") -version_info = VersionInfo(major="2023", minor="4", micro="0.post1") +version_info = VersionInfo(major="2023", minor="4", micro="0.post2") diff --git a/src/cpl_core/pipes/__init__.py b/src/cpl_core/pipes/__init__.py index 956b2267..7733a261 100644 --- a/src/cpl_core/pipes/__init__.py +++ b/src/cpl_core/pipes/__init__.py @@ -15,7 +15,7 @@ __title__ = "cpl_core.pipes" __author__ = "Sven Heidemann" __license__ = "MIT" __copyright__ = "Copyright (c) 2020 - 2023 sh-edraft.de" -__version__ = "2023.4.0.post1" +__version__ = "2023.4.0.post2" from collections import namedtuple @@ -26,4 +26,4 @@ from .ip_address_pipe import IPAddressPipe from .pipe_abc import PipeABC VersionInfo = namedtuple("VersionInfo", "major minor micro") -version_info = VersionInfo(major="2023", minor="4", micro="0.post1") +version_info = VersionInfo(major="2023", minor="4", micro="0.post2") diff --git a/src/cpl_core/time/__init__.py b/src/cpl_core/time/__init__.py index 100defe5..f75e94d0 100644 --- a/src/cpl_core/time/__init__.py +++ b/src/cpl_core/time/__init__.py @@ -15,7 +15,7 @@ __title__ = "cpl_core.time" __author__ = "Sven Heidemann" __license__ = "MIT" __copyright__ = "Copyright (c) 2020 - 2023 sh-edraft.de" -__version__ = "2023.4.0.post1" +__version__ = "2023.4.0.post2" from collections import namedtuple @@ -25,4 +25,4 @@ from .time_format_settings import TimeFormatSettings from .time_format_settings_names_enum import TimeFormatSettingsNamesEnum VersionInfo = namedtuple("VersionInfo", "major minor micro") -version_info = VersionInfo(major="2023", minor="4", micro="0.post1") +version_info = VersionInfo(major="2023", minor="4", micro="0.post2") diff --git a/src/cpl_core/utils/__init__.py b/src/cpl_core/utils/__init__.py index 27e32634..1b7e8a01 100644 --- a/src/cpl_core/utils/__init__.py +++ b/src/cpl_core/utils/__init__.py @@ -15,7 +15,7 @@ __title__ = "cpl_core.utils" __author__ = "Sven Heidemann" __license__ = "MIT" __copyright__ = "Copyright (c) 2020 - 2023 sh-edraft.de" -__version__ = "2023.4.0.post1" +__version__ = "2023.4.0.post2" from collections import namedtuple @@ -26,4 +26,4 @@ from .string import String from .pip import Pip VersionInfo = namedtuple("VersionInfo", "major minor micro") -version_info = VersionInfo(major="2023", minor="4", micro="0.post1") +version_info = VersionInfo(major="2023", minor="4", micro="0.post2") -- 2.45.2 From 81c2f1cba9d99be718f2f310b23be4cdaadc7b32 Mon Sep 17 00:00:00 2001 From: Sven Heidemann Date: Tue, 13 Jun 2023 15:38:04 +0200 Subject: [PATCH 05/12] Fixed discord service config loading --- src/cpl_discord/.cpl/__init__.py | 4 ++-- src/cpl_discord/__init__.py | 4 ++-- src/cpl_discord/application/__init__.py | 4 ++-- src/cpl_discord/command/__init__.py | 4 ++-- src/cpl_discord/configuration/__init__.py | 4 ++-- src/cpl_discord/container/__init__.py | 4 ++-- src/cpl_discord/cpl-discord.json | 2 +- src/cpl_discord/events/__init__.py | 4 ++-- src/cpl_discord/helper/__init__.py | 4 ++-- src/cpl_discord/service/__init__.py | 4 ++-- src/cpl_discord/service/discord_bot_service.py | 13 ++++++------- 11 files changed, 25 insertions(+), 26 deletions(-) diff --git a/src/cpl_discord/.cpl/__init__.py b/src/cpl_discord/.cpl/__init__.py index 817f9eb0..aefe2fd8 100644 --- a/src/cpl_discord/.cpl/__init__.py +++ b/src/cpl_discord/.cpl/__init__.py @@ -15,7 +15,7 @@ __title__ = "cpl_discord" __author__ = "Sven Heidemann" __license__ = "MIT" __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de" -__version__ = "2023.4.0.post1" +__version__ = "2023.4.0.post2" from collections import namedtuple @@ -23,4 +23,4 @@ from collections import namedtuple # imports: VersionInfo = namedtuple("VersionInfo", "major minor micro") -version_info = VersionInfo(major="2023", minor="4", micro="0.post1") +version_info = VersionInfo(major="2023", minor="4", micro="0.post2") diff --git a/src/cpl_discord/__init__.py b/src/cpl_discord/__init__.py index f0ac26db..95763308 100644 --- a/src/cpl_discord/__init__.py +++ b/src/cpl_discord/__init__.py @@ -15,7 +15,7 @@ __title__ = "cpl_discord" __author__ = "Sven Heidemann" __license__ = "MIT" __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de" -__version__ = "2023.4.0.post1" +__version__ = "2023.4.0.post2" from collections import namedtuple @@ -59,4 +59,4 @@ def get_discord_collection(services: "ServiceCollectionABC") -> "DiscordCollecti # build-ignore-end VersionInfo = namedtuple("VersionInfo", "major minor micro") -version_info = VersionInfo(major="2023", minor="4", micro="0.post1") +version_info = VersionInfo(major="2023", minor="4", micro="0.post2") diff --git a/src/cpl_discord/application/__init__.py b/src/cpl_discord/application/__init__.py index 46c925d3..0561a912 100644 --- a/src/cpl_discord/application/__init__.py +++ b/src/cpl_discord/application/__init__.py @@ -15,7 +15,7 @@ __title__ = "cpl_discord.application" __author__ = "Sven Heidemann" __license__ = "MIT" __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de" -__version__ = "2023.4.0.post1" +__version__ = "2023.4.0.post2" from collections import namedtuple @@ -24,4 +24,4 @@ from collections import namedtuple from .discord_bot_application_abc import DiscordBotApplicationABC VersionInfo = namedtuple("VersionInfo", "major minor micro") -version_info = VersionInfo(major="2023", minor="4", micro="0.post1") +version_info = VersionInfo(major="2023", minor="4", micro="0.post2") diff --git a/src/cpl_discord/command/__init__.py b/src/cpl_discord/command/__init__.py index 51e90f17..6de7d6d1 100644 --- a/src/cpl_discord/command/__init__.py +++ b/src/cpl_discord/command/__init__.py @@ -15,7 +15,7 @@ __title__ = "cpl_discord.command" __author__ = "Sven Heidemann" __license__ = "MIT" __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de" -__version__ = "2023.4.0.post1" +__version__ = "2023.4.0.post2" from collections import namedtuple @@ -25,4 +25,4 @@ from .discord_command_abc import DiscordCommandABC from .discord_commands_meta import DiscordCogMeta VersionInfo = namedtuple("VersionInfo", "major minor micro") -version_info = VersionInfo(major="2023", minor="4", micro="0.post1") +version_info = VersionInfo(major="2023", minor="4", micro="0.post2") diff --git a/src/cpl_discord/configuration/__init__.py b/src/cpl_discord/configuration/__init__.py index 1c64d289..13b46e90 100644 --- a/src/cpl_discord/configuration/__init__.py +++ b/src/cpl_discord/configuration/__init__.py @@ -15,7 +15,7 @@ __title__ = "cpl_discord.configuration" __author__ = "Sven Heidemann" __license__ = "MIT" __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de" -__version__ = "2023.4.0.post1" +__version__ = "2023.4.0.post2" from collections import namedtuple @@ -24,4 +24,4 @@ from collections import namedtuple from .discord_bot_settings import DiscordBotSettings VersionInfo = namedtuple("VersionInfo", "major minor micro") -version_info = VersionInfo(major="2023", minor="4", micro="0.post1") +version_info = VersionInfo(major="2023", minor="4", micro="0.post2") diff --git a/src/cpl_discord/container/__init__.py b/src/cpl_discord/container/__init__.py index 45e09573..eeb810a9 100644 --- a/src/cpl_discord/container/__init__.py +++ b/src/cpl_discord/container/__init__.py @@ -15,7 +15,7 @@ __title__ = "cpl_discord.container" __author__ = "Sven Heidemann" __license__ = "MIT" __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de" -__version__ = "2023.4.0.post1" +__version__ = "2023.4.0.post2" from collections import namedtuple @@ -31,4 +31,4 @@ from .thread import Thread from .voice_channel import VoiceChannel VersionInfo = namedtuple("VersionInfo", "major minor micro") -version_info = VersionInfo(major="2023", minor="4", micro="0.post1") +version_info = VersionInfo(major="2023", minor="4", micro="0.post2") diff --git a/src/cpl_discord/cpl-discord.json b/src/cpl_discord/cpl-discord.json index 86c78c8a..1d59031e 100644 --- a/src/cpl_discord/cpl-discord.json +++ b/src/cpl_discord/cpl-discord.json @@ -4,7 +4,7 @@ "Version": { "Major": "2023", "Minor": "4", - "Micro": "0.post1" + "Micro": "0.post2" }, "Author": "Sven Heidemann", "AuthorEmail": "sven.heidemann@sh-edraft.de", diff --git a/src/cpl_discord/events/__init__.py b/src/cpl_discord/events/__init__.py index 1f1c5131..80164c3b 100644 --- a/src/cpl_discord/events/__init__.py +++ b/src/cpl_discord/events/__init__.py @@ -15,7 +15,7 @@ __title__ = "cpl_discord.events" __author__ = "Sven Heidemann" __license__ = "MIT" __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de" -__version__ = "2023.4.0.post1" +__version__ = "2023.4.0.post2" from collections import namedtuple @@ -69,4 +69,4 @@ from .on_voice_state_update_abc import OnVoiceStateUpdateABC from .on_webhooks_update_abc import OnWebhooksUpdateABC VersionInfo = namedtuple("VersionInfo", "major minor micro") -version_info = VersionInfo(major="2023", minor="4", micro="0.post1") +version_info = VersionInfo(major="2023", minor="4", micro="0.post2") diff --git a/src/cpl_discord/helper/__init__.py b/src/cpl_discord/helper/__init__.py index 153af02f..8214211d 100644 --- a/src/cpl_discord/helper/__init__.py +++ b/src/cpl_discord/helper/__init__.py @@ -15,7 +15,7 @@ __title__ = "cpl_discord.helper" __author__ = "Sven Heidemann" __license__ = "MIT" __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de" -__version__ = "2023.4.0.post1" +__version__ = "2023.4.0.post2" from collections import namedtuple @@ -24,4 +24,4 @@ from collections import namedtuple from .to_containers_converter import ToContainersConverter VersionInfo = namedtuple("VersionInfo", "major minor micro") -version_info = VersionInfo(major="2023", minor="4", micro="0.post1") +version_info = VersionInfo(major="2023", minor="4", micro="0.post2") diff --git a/src/cpl_discord/service/__init__.py b/src/cpl_discord/service/__init__.py index 79acd9ab..0d670dfe 100644 --- a/src/cpl_discord/service/__init__.py +++ b/src/cpl_discord/service/__init__.py @@ -15,7 +15,7 @@ __title__ = "cpl_discord.service" __author__ = "Sven Heidemann" __license__ = "MIT" __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de" -__version__ = "2023.4.0.post1" +__version__ = "2023.4.0.post2" from collections import namedtuple @@ -29,4 +29,4 @@ from .discord_service import DiscordService from .discord_service_abc import DiscordServiceABC VersionInfo = namedtuple("VersionInfo", "major minor micro") -version_info = VersionInfo(major="2023", minor="4", micro="0.post1") +version_info = VersionInfo(major="2023", minor="4", micro="0.post2") diff --git a/src/cpl_discord/service/discord_bot_service.py b/src/cpl_discord/service/discord_bot_service.py index 07873a11..4213eabd 100644 --- a/src/cpl_discord/service/discord_bot_service.py +++ b/src/cpl_discord/service/discord_bot_service.py @@ -56,14 +56,13 @@ class DiscordBotService(DiscordBotServiceABC): env_token = self._config.get_configuration("TOKEN") env_prefix = self._config.get_configuration("PREFIX") - new_settings.from_dict( - { - "Token": env_token if token is None or token == "" else token, - "Prefix": ("! " if self._is_string_invalid(env_prefix) else env_prefix) - if self._is_string_invalid(prefix) - else prefix, - } + new_settings = DiscordBotSettings( + env_token if token is None or token == "" else token, + ("! " if self._is_string_invalid(env_prefix) else env_prefix) + if self._is_string_invalid(prefix) + else prefix, ) + if new_settings.token is None or new_settings.token == "": raise Exception("You have to configure discord token by appsettings or environment variables") return new_settings -- 2.45.2 From a3504af376d7ef9b3bd2642b74f5d360abc6f84c Mon Sep 17 00:00:00 2001 From: Sven Heidemann Date: Tue, 13 Jun 2023 15:47:44 +0200 Subject: [PATCH 06/12] Fixed update command --- src/cpl_cli/.cpl/__init__.py | 4 ++-- src/cpl_cli/__init__.py | 4 ++-- src/cpl_cli/_templates/__init__.py | 4 ++-- src/cpl_cli/_templates/build/__init__.py | 4 ++-- src/cpl_cli/_templates/publish/__init__.py | 4 ++-- src/cpl_cli/abc/__init__.py | 4 ++-- src/cpl_cli/command/__init__.py | 4 ++-- src/cpl_cli/command/update_service.py | 2 +- src/cpl_cli/configuration/__init__.py | 4 ++-- src/cpl_cli/cpl-cli.json | 2 +- src/cpl_cli/helper/__init__.py | 4 ++-- src/cpl_cli/live_server/__init__.py | 4 ++-- src/cpl_cli/migrations/__init__.py | 4 ++-- src/cpl_cli/migrations/base/__init__.py | 4 ++-- src/cpl_cli/migrations/service/__init__.py | 4 ++-- src/cpl_cli/publish/__init__.py | 4 ++-- src/cpl_cli/source_creator/__init__.py | 4 ++-- src/cpl_cli/validators/__init__.py | 4 ++-- 18 files changed, 34 insertions(+), 34 deletions(-) diff --git a/src/cpl_cli/.cpl/__init__.py b/src/cpl_cli/.cpl/__init__.py index c58bda00..05115394 100644 --- a/src/cpl_cli/.cpl/__init__.py +++ b/src/cpl_cli/.cpl/__init__.py @@ -15,7 +15,7 @@ __title__ = "cpl_cli" __author__ = "Sven Heidemann" __license__ = "MIT" __copyright__ = "Copyright (c) 2020 - 2023 sh-edraft.de" -__version__ = "2023.4.0.post1" +__version__ = "2023.4.0.post2" from collections import namedtuple @@ -23,4 +23,4 @@ from collections import namedtuple # imports: VersionInfo = namedtuple("VersionInfo", "major minor micro") -version_info = VersionInfo(major="2023", minor="4", micro="0.post1") +version_info = VersionInfo(major="2023", minor="4", micro="0.post2") diff --git a/src/cpl_cli/__init__.py b/src/cpl_cli/__init__.py index 1711b0df..47c2acf6 100644 --- a/src/cpl_cli/__init__.py +++ b/src/cpl_cli/__init__.py @@ -15,7 +15,7 @@ __title__ = "cpl_cli" __author__ = "Sven Heidemann" __license__ = "MIT" __copyright__ = "Copyright (c) 2020 - 2023 sh-edraft.de" -__version__ = "2023.4.0.post1" +__version__ = "2023.4.0.post2" from collections import namedtuple @@ -28,4 +28,4 @@ from .main import main from .startup import Startup VersionInfo = namedtuple("VersionInfo", "major minor micro") -version_info = VersionInfo(major="2023", minor="4", micro="0.post1") +version_info = VersionInfo(major="2023", minor="4", micro="0.post2") diff --git a/src/cpl_cli/_templates/__init__.py b/src/cpl_cli/_templates/__init__.py index 6b51d213..14540167 100644 --- a/src/cpl_cli/_templates/__init__.py +++ b/src/cpl_cli/_templates/__init__.py @@ -15,7 +15,7 @@ __title__ = "cpl_cli._templates" __author__ = "Sven Heidemann" __license__ = "MIT" __copyright__ = "Copyright (c) 2020 - 2023 sh-edraft.de" -__version__ = "2023.4.0.post1" +__version__ = "2023.4.0.post2" from collections import namedtuple @@ -23,4 +23,4 @@ from collections import namedtuple # imports: VersionInfo = namedtuple("VersionInfo", "major minor micro") -version_info = VersionInfo(major="2023", minor="4", micro="0.post1") +version_info = VersionInfo(major="2023", minor="4", micro="0.post2") diff --git a/src/cpl_cli/_templates/build/__init__.py b/src/cpl_cli/_templates/build/__init__.py index 1824be41..10c021c1 100644 --- a/src/cpl_cli/_templates/build/__init__.py +++ b/src/cpl_cli/_templates/build/__init__.py @@ -15,7 +15,7 @@ __title__ = "cpl_cli._templates.build" __author__ = "Sven Heidemann" __license__ = "MIT" __copyright__ = "Copyright (c) 2020 - 2023 sh-edraft.de" -__version__ = "2023.4.0.post1" +__version__ = "2023.4.0.post2" from collections import namedtuple @@ -23,4 +23,4 @@ from collections import namedtuple # imports: VersionInfo = namedtuple("VersionInfo", "major minor micro") -version_info = VersionInfo(major="2023", minor="4", micro="0.post1") +version_info = VersionInfo(major="2023", minor="4", micro="0.post2") diff --git a/src/cpl_cli/_templates/publish/__init__.py b/src/cpl_cli/_templates/publish/__init__.py index 09192f90..a4cabd93 100644 --- a/src/cpl_cli/_templates/publish/__init__.py +++ b/src/cpl_cli/_templates/publish/__init__.py @@ -15,7 +15,7 @@ __title__ = "cpl_cli._templates.publish" __author__ = "Sven Heidemann" __license__ = "MIT" __copyright__ = "Copyright (c) 2020 - 2023 sh-edraft.de" -__version__ = "2023.4.0.post1" +__version__ = "2023.4.0.post2" from collections import namedtuple @@ -23,4 +23,4 @@ from collections import namedtuple # imports: VersionInfo = namedtuple("VersionInfo", "major minor micro") -version_info = VersionInfo(major="2023", minor="4", micro="0.post1") +version_info = VersionInfo(major="2023", minor="4", micro="0.post2") diff --git a/src/cpl_cli/abc/__init__.py b/src/cpl_cli/abc/__init__.py index 9b1fab82..b4967b56 100644 --- a/src/cpl_cli/abc/__init__.py +++ b/src/cpl_cli/abc/__init__.py @@ -15,7 +15,7 @@ __title__ = "cpl_cli.abc" __author__ = "Sven Heidemann" __license__ = "MIT" __copyright__ = "Copyright (c) 2020 - 2023 sh-edraft.de" -__version__ = "2023.4.0.post1" +__version__ = "2023.4.0.post2" from collections import namedtuple @@ -23,4 +23,4 @@ from collections import namedtuple # imports VersionInfo = namedtuple("VersionInfo", "major minor micro") -version_info = VersionInfo(major="2023", minor="4", micro="0.post1") +version_info = VersionInfo(major="2023", minor="4", micro="0.post2") diff --git a/src/cpl_cli/command/__init__.py b/src/cpl_cli/command/__init__.py index b29d24d9..0fa1f713 100644 --- a/src/cpl_cli/command/__init__.py +++ b/src/cpl_cli/command/__init__.py @@ -15,7 +15,7 @@ __title__ = "cpl_cli.command" __author__ = "Sven Heidemann" __license__ = "MIT" __copyright__ = "Copyright (c) 2020 - 2023 sh-edraft.de" -__version__ = "2023.4.0.post1" +__version__ = "2023.4.0.post2" from collections import namedtuple @@ -29,4 +29,4 @@ from .publish_service import PublishService from .version_service import VersionService VersionInfo = namedtuple("VersionInfo", "major minor micro") -version_info = VersionInfo(major="2023", minor="4", micro="0.post1") +version_info = VersionInfo(major="2023", minor="4", micro="0.post2") diff --git a/src/cpl_cli/command/update_service.py b/src/cpl_cli/command/update_service.py index 49554a43..99938c2d 100644 --- a/src/cpl_cli/command/update_service.py +++ b/src/cpl_cli/command/update_service.py @@ -166,7 +166,7 @@ class UpdateService(CommandABC): if "\r" in new_package: new_package = new_package.replace("\r", "") - if new_package == initial_package: + if new_package == old_package: return index = self._project_settings.dependencies.index(old_package) diff --git a/src/cpl_cli/configuration/__init__.py b/src/cpl_cli/configuration/__init__.py index e8ca3033..48348f29 100644 --- a/src/cpl_cli/configuration/__init__.py +++ b/src/cpl_cli/configuration/__init__.py @@ -15,7 +15,7 @@ __title__ = "cpl_cli.configuration" __author__ = "Sven Heidemann" __license__ = "MIT" __copyright__ = "Copyright (c) 2020 - 2023 sh-edraft.de" -__version__ = "2023.4.0.post1" +__version__ = "2023.4.0.post2" from collections import namedtuple @@ -31,4 +31,4 @@ from .workspace_settings import WorkspaceSettings from .workspace_settings_name_enum import WorkspaceSettingsNameEnum VersionInfo = namedtuple("VersionInfo", "major minor micro") -version_info = VersionInfo(major="2023", minor="4", micro="0.post1") +version_info = VersionInfo(major="2023", minor="4", micro="0.post2") diff --git a/src/cpl_cli/cpl-cli.json b/src/cpl_cli/cpl-cli.json index 23a84eac..9c3a2e2f 100644 --- a/src/cpl_cli/cpl-cli.json +++ b/src/cpl_cli/cpl-cli.json @@ -4,7 +4,7 @@ "Version": { "Major": "2023", "Minor": "4", - "Micro": "0.post1" + "Micro": "0.post2" }, "Author": "Sven Heidemann", "AuthorEmail": "sven.heidemann@sh-edraft.de", diff --git a/src/cpl_cli/helper/__init__.py b/src/cpl_cli/helper/__init__.py index 4b177678..7ca0afc7 100644 --- a/src/cpl_cli/helper/__init__.py +++ b/src/cpl_cli/helper/__init__.py @@ -15,7 +15,7 @@ __title__ = "cpl_cli.helper" __author__ = "Sven Heidemann" __license__ = "MIT" __copyright__ = "Copyright (c) 2020 - 2023 sh-edraft.de" -__version__ = "2023.4.0.post1" +__version__ = "2023.4.0.post2" from collections import namedtuple @@ -23,4 +23,4 @@ from collections import namedtuple # imports: VersionInfo = namedtuple("VersionInfo", "major minor micro") -version_info = VersionInfo(major="2023", minor="4", micro="0.post1") +version_info = VersionInfo(major="2023", minor="4", micro="0.post2") diff --git a/src/cpl_cli/live_server/__init__.py b/src/cpl_cli/live_server/__init__.py index 7fba1533..c637579e 100644 --- a/src/cpl_cli/live_server/__init__.py +++ b/src/cpl_cli/live_server/__init__.py @@ -15,7 +15,7 @@ __title__ = "cpl_cli.live_server" __author__ = "Sven Heidemann" __license__ = "MIT" __copyright__ = "Copyright (c) 2020 - 2023 sh-edraft.de" -__version__ = "2023.4.0.post1" +__version__ = "2023.4.0.post2" from collections import namedtuple @@ -23,4 +23,4 @@ from collections import namedtuple # imports: VersionInfo = namedtuple("VersionInfo", "major minor micro") -version_info = VersionInfo(major="2023", minor="4", micro="0.post1") +version_info = VersionInfo(major="2023", minor="4", micro="0.post2") diff --git a/src/cpl_cli/migrations/__init__.py b/src/cpl_cli/migrations/__init__.py index 57f94ee0..9a5cfd06 100644 --- a/src/cpl_cli/migrations/__init__.py +++ b/src/cpl_cli/migrations/__init__.py @@ -15,7 +15,7 @@ __title__ = "cpl_cli.migrations" __author__ = "Sven Heidemann" __license__ = "MIT" __copyright__ = "Copyright (c) 2020 - 2023 sh-edraft.de" -__version__ = "2023.4.0.post1" +__version__ = "2023.4.0.post2" from collections import namedtuple @@ -23,4 +23,4 @@ from collections import namedtuple # imports VersionInfo = namedtuple("VersionInfo", "major minor micro") -version_info = VersionInfo(major="2023", minor="4", micro="0.post1") +version_info = VersionInfo(major="2023", minor="4", micro="0.post2") diff --git a/src/cpl_cli/migrations/base/__init__.py b/src/cpl_cli/migrations/base/__init__.py index 43a8dbd4..c63a2dbe 100644 --- a/src/cpl_cli/migrations/base/__init__.py +++ b/src/cpl_cli/migrations/base/__init__.py @@ -15,7 +15,7 @@ __title__ = "cpl_cli.migrations.base" __author__ = "Sven Heidemann" __license__ = "MIT" __copyright__ = "Copyright (c) 2020 - 2023 sh-edraft.de" -__version__ = "2023.4.0.post1" +__version__ = "2023.4.0.post2" from collections import namedtuple @@ -23,4 +23,4 @@ from collections import namedtuple # imports: VersionInfo = namedtuple("VersionInfo", "major minor micro") -version_info = VersionInfo(major="2023", minor="4", micro="0.post1") +version_info = VersionInfo(major="2023", minor="4", micro="0.post2") diff --git a/src/cpl_cli/migrations/service/__init__.py b/src/cpl_cli/migrations/service/__init__.py index 64bb8fae..cc132f64 100644 --- a/src/cpl_cli/migrations/service/__init__.py +++ b/src/cpl_cli/migrations/service/__init__.py @@ -15,7 +15,7 @@ __title__ = "cpl_cli.migrations.service" __author__ = "Sven Heidemann" __license__ = "MIT" __copyright__ = "Copyright (c) 2020 - 2023 sh-edraft.de" -__version__ = "2023.4.0.post1" +__version__ = "2023.4.0.post2" from collections import namedtuple @@ -23,4 +23,4 @@ from collections import namedtuple # imports: VersionInfo = namedtuple("VersionInfo", "major minor micro") -version_info = VersionInfo(major="2023", minor="4", micro="0.post1") +version_info = VersionInfo(major="2023", minor="4", micro="0.post2") diff --git a/src/cpl_cli/publish/__init__.py b/src/cpl_cli/publish/__init__.py index d5a15371..3180c9c2 100644 --- a/src/cpl_cli/publish/__init__.py +++ b/src/cpl_cli/publish/__init__.py @@ -15,7 +15,7 @@ __title__ = "cpl_cli.publish" __author__ = "Sven Heidemann" __license__ = "MIT" __copyright__ = "Copyright (c) 2020 - 2023 sh-edraft.de" -__version__ = "2023.4.0.post1" +__version__ = "2023.4.0.post2" from collections import namedtuple @@ -25,4 +25,4 @@ from .publisher_abc import PublisherABC from .publisher_service import PublisherService VersionInfo = namedtuple("VersionInfo", "major minor micro") -version_info = VersionInfo(major="2023", minor="4", micro="0.post1") +version_info = VersionInfo(major="2023", minor="4", micro="0.post2") diff --git a/src/cpl_cli/source_creator/__init__.py b/src/cpl_cli/source_creator/__init__.py index 59fc89d5..bfb50606 100644 --- a/src/cpl_cli/source_creator/__init__.py +++ b/src/cpl_cli/source_creator/__init__.py @@ -15,7 +15,7 @@ __title__ = "cpl_cli.source_creator" __author__ = "Sven Heidemann" __license__ = "MIT" __copyright__ = "Copyright (c) 2020 - 2023 sh-edraft.de" -__version__ = "2023.4.0.post1" +__version__ = "2023.4.0.post2" from collections import namedtuple @@ -23,4 +23,4 @@ from collections import namedtuple # imports: VersionInfo = namedtuple("VersionInfo", "major minor micro") -version_info = VersionInfo(major="2023", minor="4", micro="0.post1") +version_info = VersionInfo(major="2023", minor="4", micro="0.post2") diff --git a/src/cpl_cli/validators/__init__.py b/src/cpl_cli/validators/__init__.py index ac1d3970..bc092614 100644 --- a/src/cpl_cli/validators/__init__.py +++ b/src/cpl_cli/validators/__init__.py @@ -15,7 +15,7 @@ __title__ = "cpl_cli.validators" __author__ = "Sven Heidemann" __license__ = "MIT" __copyright__ = "Copyright (c) 2020 - 2023 sh-edraft.de" -__version__ = "2023.4.0.post1" +__version__ = "2023.4.0.post2" from collections import namedtuple @@ -23,4 +23,4 @@ from collections import namedtuple # imports: VersionInfo = namedtuple("VersionInfo", "major minor micro") -version_info = VersionInfo(major="2023", minor="4", micro="0.post1") +version_info = VersionInfo(major="2023", minor="4", micro="0.post2") -- 2.45.2 From b3ed7101fc286aa06419cbc0fbbdb1d6ba1abac9 Mon Sep 17 00:00:00 2001 From: Sven Heidemann Date: Tue, 13 Jun 2023 15:56:46 +0200 Subject: [PATCH 07/12] Fixed update command --- src/cpl_cli/.cpl/__init__.py | 4 ++-- src/cpl_cli/__init__.py | 4 ++-- src/cpl_cli/_templates/__init__.py | 4 ++-- src/cpl_cli/_templates/build/__init__.py | 4 ++-- src/cpl_cli/_templates/publish/__init__.py | 4 ++-- src/cpl_cli/abc/__init__.py | 4 ++-- src/cpl_cli/command/__init__.py | 4 ++-- src/cpl_cli/command/update_service.py | 2 +- src/cpl_cli/configuration/__init__.py | 4 ++-- src/cpl_cli/cpl-cli.json | 2 +- src/cpl_cli/helper/__init__.py | 4 ++-- src/cpl_cli/live_server/__init__.py | 4 ++-- src/cpl_cli/migrations/__init__.py | 4 ++-- src/cpl_cli/migrations/base/__init__.py | 4 ++-- src/cpl_cli/migrations/service/__init__.py | 4 ++-- src/cpl_cli/publish/__init__.py | 4 ++-- src/cpl_cli/source_creator/__init__.py | 4 ++-- src/cpl_cli/validators/__init__.py | 4 ++-- 18 files changed, 34 insertions(+), 34 deletions(-) diff --git a/src/cpl_cli/.cpl/__init__.py b/src/cpl_cli/.cpl/__init__.py index 05115394..b6c6f5f8 100644 --- a/src/cpl_cli/.cpl/__init__.py +++ b/src/cpl_cli/.cpl/__init__.py @@ -15,7 +15,7 @@ __title__ = "cpl_cli" __author__ = "Sven Heidemann" __license__ = "MIT" __copyright__ = "Copyright (c) 2020 - 2023 sh-edraft.de" -__version__ = "2023.4.0.post2" +__version__ = "2023.4.0.post3" from collections import namedtuple @@ -23,4 +23,4 @@ from collections import namedtuple # imports: VersionInfo = namedtuple("VersionInfo", "major minor micro") -version_info = VersionInfo(major="2023", minor="4", micro="0.post2") +version_info = VersionInfo(major="2023", minor="4", micro="0.post3") diff --git a/src/cpl_cli/__init__.py b/src/cpl_cli/__init__.py index 47c2acf6..d5bbcd37 100644 --- a/src/cpl_cli/__init__.py +++ b/src/cpl_cli/__init__.py @@ -15,7 +15,7 @@ __title__ = "cpl_cli" __author__ = "Sven Heidemann" __license__ = "MIT" __copyright__ = "Copyright (c) 2020 - 2023 sh-edraft.de" -__version__ = "2023.4.0.post2" +__version__ = "2023.4.0.post3" from collections import namedtuple @@ -28,4 +28,4 @@ from .main import main from .startup import Startup VersionInfo = namedtuple("VersionInfo", "major minor micro") -version_info = VersionInfo(major="2023", minor="4", micro="0.post2") +version_info = VersionInfo(major="2023", minor="4", micro="0.post3") diff --git a/src/cpl_cli/_templates/__init__.py b/src/cpl_cli/_templates/__init__.py index 14540167..b671d25b 100644 --- a/src/cpl_cli/_templates/__init__.py +++ b/src/cpl_cli/_templates/__init__.py @@ -15,7 +15,7 @@ __title__ = "cpl_cli._templates" __author__ = "Sven Heidemann" __license__ = "MIT" __copyright__ = "Copyright (c) 2020 - 2023 sh-edraft.de" -__version__ = "2023.4.0.post2" +__version__ = "2023.4.0.post3" from collections import namedtuple @@ -23,4 +23,4 @@ from collections import namedtuple # imports: VersionInfo = namedtuple("VersionInfo", "major minor micro") -version_info = VersionInfo(major="2023", minor="4", micro="0.post2") +version_info = VersionInfo(major="2023", minor="4", micro="0.post3") diff --git a/src/cpl_cli/_templates/build/__init__.py b/src/cpl_cli/_templates/build/__init__.py index 10c021c1..b0db4743 100644 --- a/src/cpl_cli/_templates/build/__init__.py +++ b/src/cpl_cli/_templates/build/__init__.py @@ -15,7 +15,7 @@ __title__ = "cpl_cli._templates.build" __author__ = "Sven Heidemann" __license__ = "MIT" __copyright__ = "Copyright (c) 2020 - 2023 sh-edraft.de" -__version__ = "2023.4.0.post2" +__version__ = "2023.4.0.post3" from collections import namedtuple @@ -23,4 +23,4 @@ from collections import namedtuple # imports: VersionInfo = namedtuple("VersionInfo", "major minor micro") -version_info = VersionInfo(major="2023", minor="4", micro="0.post2") +version_info = VersionInfo(major="2023", minor="4", micro="0.post3") diff --git a/src/cpl_cli/_templates/publish/__init__.py b/src/cpl_cli/_templates/publish/__init__.py index a4cabd93..41a9788e 100644 --- a/src/cpl_cli/_templates/publish/__init__.py +++ b/src/cpl_cli/_templates/publish/__init__.py @@ -15,7 +15,7 @@ __title__ = "cpl_cli._templates.publish" __author__ = "Sven Heidemann" __license__ = "MIT" __copyright__ = "Copyright (c) 2020 - 2023 sh-edraft.de" -__version__ = "2023.4.0.post2" +__version__ = "2023.4.0.post3" from collections import namedtuple @@ -23,4 +23,4 @@ from collections import namedtuple # imports: VersionInfo = namedtuple("VersionInfo", "major minor micro") -version_info = VersionInfo(major="2023", minor="4", micro="0.post2") +version_info = VersionInfo(major="2023", minor="4", micro="0.post3") diff --git a/src/cpl_cli/abc/__init__.py b/src/cpl_cli/abc/__init__.py index b4967b56..6ff59c01 100644 --- a/src/cpl_cli/abc/__init__.py +++ b/src/cpl_cli/abc/__init__.py @@ -15,7 +15,7 @@ __title__ = "cpl_cli.abc" __author__ = "Sven Heidemann" __license__ = "MIT" __copyright__ = "Copyright (c) 2020 - 2023 sh-edraft.de" -__version__ = "2023.4.0.post2" +__version__ = "2023.4.0.post3" from collections import namedtuple @@ -23,4 +23,4 @@ from collections import namedtuple # imports VersionInfo = namedtuple("VersionInfo", "major minor micro") -version_info = VersionInfo(major="2023", minor="4", micro="0.post2") +version_info = VersionInfo(major="2023", minor="4", micro="0.post3") diff --git a/src/cpl_cli/command/__init__.py b/src/cpl_cli/command/__init__.py index 0fa1f713..eab08d85 100644 --- a/src/cpl_cli/command/__init__.py +++ b/src/cpl_cli/command/__init__.py @@ -15,7 +15,7 @@ __title__ = "cpl_cli.command" __author__ = "Sven Heidemann" __license__ = "MIT" __copyright__ = "Copyright (c) 2020 - 2023 sh-edraft.de" -__version__ = "2023.4.0.post2" +__version__ = "2023.4.0.post3" from collections import namedtuple @@ -29,4 +29,4 @@ from .publish_service import PublishService from .version_service import VersionService VersionInfo = namedtuple("VersionInfo", "major minor micro") -version_info = VersionInfo(major="2023", minor="4", micro="0.post2") +version_info = VersionInfo(major="2023", minor="4", micro="0.post3") diff --git a/src/cpl_cli/command/update_service.py b/src/cpl_cli/command/update_service.py index 99938c2d..290c51d6 100644 --- a/src/cpl_cli/command/update_service.py +++ b/src/cpl_cli/command/update_service.py @@ -169,7 +169,7 @@ class UpdateService(CommandABC): if new_package == old_package: return - index = self._project_settings.dependencies.index(old_package) + index = deps.index(old_package) deps[index] = new_package def _project_json_update_dependency(self, old_package: str, new_package: str): diff --git a/src/cpl_cli/configuration/__init__.py b/src/cpl_cli/configuration/__init__.py index 48348f29..86097d9c 100644 --- a/src/cpl_cli/configuration/__init__.py +++ b/src/cpl_cli/configuration/__init__.py @@ -15,7 +15,7 @@ __title__ = "cpl_cli.configuration" __author__ = "Sven Heidemann" __license__ = "MIT" __copyright__ = "Copyright (c) 2020 - 2023 sh-edraft.de" -__version__ = "2023.4.0.post2" +__version__ = "2023.4.0.post3" from collections import namedtuple @@ -31,4 +31,4 @@ from .workspace_settings import WorkspaceSettings from .workspace_settings_name_enum import WorkspaceSettingsNameEnum VersionInfo = namedtuple("VersionInfo", "major minor micro") -version_info = VersionInfo(major="2023", minor="4", micro="0.post2") +version_info = VersionInfo(major="2023", minor="4", micro="0.post3") diff --git a/src/cpl_cli/cpl-cli.json b/src/cpl_cli/cpl-cli.json index 9c3a2e2f..c3047753 100644 --- a/src/cpl_cli/cpl-cli.json +++ b/src/cpl_cli/cpl-cli.json @@ -4,7 +4,7 @@ "Version": { "Major": "2023", "Minor": "4", - "Micro": "0.post2" + "Micro": "0.post3" }, "Author": "Sven Heidemann", "AuthorEmail": "sven.heidemann@sh-edraft.de", diff --git a/src/cpl_cli/helper/__init__.py b/src/cpl_cli/helper/__init__.py index 7ca0afc7..b62b948f 100644 --- a/src/cpl_cli/helper/__init__.py +++ b/src/cpl_cli/helper/__init__.py @@ -15,7 +15,7 @@ __title__ = "cpl_cli.helper" __author__ = "Sven Heidemann" __license__ = "MIT" __copyright__ = "Copyright (c) 2020 - 2023 sh-edraft.de" -__version__ = "2023.4.0.post2" +__version__ = "2023.4.0.post3" from collections import namedtuple @@ -23,4 +23,4 @@ from collections import namedtuple # imports: VersionInfo = namedtuple("VersionInfo", "major minor micro") -version_info = VersionInfo(major="2023", minor="4", micro="0.post2") +version_info = VersionInfo(major="2023", minor="4", micro="0.post3") diff --git a/src/cpl_cli/live_server/__init__.py b/src/cpl_cli/live_server/__init__.py index c637579e..d7b99eac 100644 --- a/src/cpl_cli/live_server/__init__.py +++ b/src/cpl_cli/live_server/__init__.py @@ -15,7 +15,7 @@ __title__ = "cpl_cli.live_server" __author__ = "Sven Heidemann" __license__ = "MIT" __copyright__ = "Copyright (c) 2020 - 2023 sh-edraft.de" -__version__ = "2023.4.0.post2" +__version__ = "2023.4.0.post3" from collections import namedtuple @@ -23,4 +23,4 @@ from collections import namedtuple # imports: VersionInfo = namedtuple("VersionInfo", "major minor micro") -version_info = VersionInfo(major="2023", minor="4", micro="0.post2") +version_info = VersionInfo(major="2023", minor="4", micro="0.post3") diff --git a/src/cpl_cli/migrations/__init__.py b/src/cpl_cli/migrations/__init__.py index 9a5cfd06..e73ea308 100644 --- a/src/cpl_cli/migrations/__init__.py +++ b/src/cpl_cli/migrations/__init__.py @@ -15,7 +15,7 @@ __title__ = "cpl_cli.migrations" __author__ = "Sven Heidemann" __license__ = "MIT" __copyright__ = "Copyright (c) 2020 - 2023 sh-edraft.de" -__version__ = "2023.4.0.post2" +__version__ = "2023.4.0.post3" from collections import namedtuple @@ -23,4 +23,4 @@ from collections import namedtuple # imports VersionInfo = namedtuple("VersionInfo", "major minor micro") -version_info = VersionInfo(major="2023", minor="4", micro="0.post2") +version_info = VersionInfo(major="2023", minor="4", micro="0.post3") diff --git a/src/cpl_cli/migrations/base/__init__.py b/src/cpl_cli/migrations/base/__init__.py index c63a2dbe..ce731b48 100644 --- a/src/cpl_cli/migrations/base/__init__.py +++ b/src/cpl_cli/migrations/base/__init__.py @@ -15,7 +15,7 @@ __title__ = "cpl_cli.migrations.base" __author__ = "Sven Heidemann" __license__ = "MIT" __copyright__ = "Copyright (c) 2020 - 2023 sh-edraft.de" -__version__ = "2023.4.0.post2" +__version__ = "2023.4.0.post3" from collections import namedtuple @@ -23,4 +23,4 @@ from collections import namedtuple # imports: VersionInfo = namedtuple("VersionInfo", "major minor micro") -version_info = VersionInfo(major="2023", minor="4", micro="0.post2") +version_info = VersionInfo(major="2023", minor="4", micro="0.post3") diff --git a/src/cpl_cli/migrations/service/__init__.py b/src/cpl_cli/migrations/service/__init__.py index cc132f64..5f1d228c 100644 --- a/src/cpl_cli/migrations/service/__init__.py +++ b/src/cpl_cli/migrations/service/__init__.py @@ -15,7 +15,7 @@ __title__ = "cpl_cli.migrations.service" __author__ = "Sven Heidemann" __license__ = "MIT" __copyright__ = "Copyright (c) 2020 - 2023 sh-edraft.de" -__version__ = "2023.4.0.post2" +__version__ = "2023.4.0.post3" from collections import namedtuple @@ -23,4 +23,4 @@ from collections import namedtuple # imports: VersionInfo = namedtuple("VersionInfo", "major minor micro") -version_info = VersionInfo(major="2023", minor="4", micro="0.post2") +version_info = VersionInfo(major="2023", minor="4", micro="0.post3") diff --git a/src/cpl_cli/publish/__init__.py b/src/cpl_cli/publish/__init__.py index 3180c9c2..65d31499 100644 --- a/src/cpl_cli/publish/__init__.py +++ b/src/cpl_cli/publish/__init__.py @@ -15,7 +15,7 @@ __title__ = "cpl_cli.publish" __author__ = "Sven Heidemann" __license__ = "MIT" __copyright__ = "Copyright (c) 2020 - 2023 sh-edraft.de" -__version__ = "2023.4.0.post2" +__version__ = "2023.4.0.post3" from collections import namedtuple @@ -25,4 +25,4 @@ from .publisher_abc import PublisherABC from .publisher_service import PublisherService VersionInfo = namedtuple("VersionInfo", "major minor micro") -version_info = VersionInfo(major="2023", minor="4", micro="0.post2") +version_info = VersionInfo(major="2023", minor="4", micro="0.post3") diff --git a/src/cpl_cli/source_creator/__init__.py b/src/cpl_cli/source_creator/__init__.py index bfb50606..e9f5393b 100644 --- a/src/cpl_cli/source_creator/__init__.py +++ b/src/cpl_cli/source_creator/__init__.py @@ -15,7 +15,7 @@ __title__ = "cpl_cli.source_creator" __author__ = "Sven Heidemann" __license__ = "MIT" __copyright__ = "Copyright (c) 2020 - 2023 sh-edraft.de" -__version__ = "2023.4.0.post2" +__version__ = "2023.4.0.post3" from collections import namedtuple @@ -23,4 +23,4 @@ from collections import namedtuple # imports: VersionInfo = namedtuple("VersionInfo", "major minor micro") -version_info = VersionInfo(major="2023", minor="4", micro="0.post2") +version_info = VersionInfo(major="2023", minor="4", micro="0.post3") diff --git a/src/cpl_cli/validators/__init__.py b/src/cpl_cli/validators/__init__.py index bc092614..93f62649 100644 --- a/src/cpl_cli/validators/__init__.py +++ b/src/cpl_cli/validators/__init__.py @@ -15,7 +15,7 @@ __title__ = "cpl_cli.validators" __author__ = "Sven Heidemann" __license__ = "MIT" __copyright__ = "Copyright (c) 2020 - 2023 sh-edraft.de" -__version__ = "2023.4.0.post2" +__version__ = "2023.4.0.post3" from collections import namedtuple @@ -23,4 +23,4 @@ from collections import namedtuple # imports: VersionInfo = namedtuple("VersionInfo", "major minor micro") -version_info = VersionInfo(major="2023", minor="4", micro="0.post2") +version_info = VersionInfo(major="2023", minor="4", micro="0.post3") -- 2.45.2 From b819eb439ca7a7c0639cbbf45e5a8a1dc28a1a05 Mon Sep 17 00:00:00 2001 From: Sven Heidemann Date: Tue, 13 Jun 2023 16:14:38 +0200 Subject: [PATCH 08/12] Fixed translaiton settings --- src/cpl_translation/__init__.py | 4 ++-- src/cpl_translation/cpl-translation.json | 2 +- src/cpl_translation/translation_settings.py | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/cpl_translation/__init__.py b/src/cpl_translation/__init__.py index 1a7cbe5d..3c896cf9 100644 --- a/src/cpl_translation/__init__.py +++ b/src/cpl_translation/__init__.py @@ -15,7 +15,7 @@ __title__ = "cpl_translation" __author__ = "Sven Heidemann" __license__ = "MIT" __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de" -__version__ = "2023.4.0" +__version__ = "2023.4.0.post1" from collections import namedtuple @@ -53,4 +53,4 @@ init() # build-ignore-end VersionInfo = namedtuple("VersionInfo", "major minor micro") -version_info = VersionInfo(major="2023", minor="4", micro="0") +version_info = VersionInfo(major="2023", minor="4", micro="0.post1") diff --git a/src/cpl_translation/cpl-translation.json b/src/cpl_translation/cpl-translation.json index f5eb9b0d..f64ae4a7 100644 --- a/src/cpl_translation/cpl-translation.json +++ b/src/cpl_translation/cpl-translation.json @@ -4,7 +4,7 @@ "Version": { "Major": "2023", "Minor": "4", - "Micro": "0" + "Micro": "0.post1" }, "Author": "Sven Heidemann", "AuthorEmail": "sven.heidemann@sh-edraft.de", diff --git a/src/cpl_translation/translation_settings.py b/src/cpl_translation/translation_settings.py index f4902513..2549cc3d 100644 --- a/src/cpl_translation/translation_settings.py +++ b/src/cpl_translation/translation_settings.py @@ -5,12 +5,12 @@ class TranslationSettings(ConfigurationModelABC): def __init__( self, languages: list = None, - default_lang: str = None, + default_language: str = None, ): ConfigurationModelABC.__init__(self) self._languages = [] if languages is None else languages - self._default_lang = default_lang + self._default_lang = default_language @property def languages(self) -> list[str]: -- 2.45.2 From ed2377c2882671a3dc78a14522bcd5b971a04d17 Mon Sep 17 00:00:00 2001 From: Sven Heidemann Date: Tue, 13 Jun 2023 16:22:54 +0200 Subject: [PATCH 09/12] Updated discord.py --- src/cpl_discord/.cpl/__init__.py | 4 ++-- src/cpl_discord/__init__.py | 4 ++-- src/cpl_discord/application/__init__.py | 4 ++-- src/cpl_discord/command/__init__.py | 4 ++-- src/cpl_discord/configuration/__init__.py | 4 ++-- src/cpl_discord/container/__init__.py | 4 ++-- src/cpl_discord/cpl-discord.json | 10 +++++----- src/cpl_discord/events/__init__.py | 4 ++-- src/cpl_discord/helper/__init__.py | 4 ++-- src/cpl_discord/service/__init__.py | 4 ++-- 10 files changed, 23 insertions(+), 23 deletions(-) diff --git a/src/cpl_discord/.cpl/__init__.py b/src/cpl_discord/.cpl/__init__.py index aefe2fd8..3d6efdb0 100644 --- a/src/cpl_discord/.cpl/__init__.py +++ b/src/cpl_discord/.cpl/__init__.py @@ -15,7 +15,7 @@ __title__ = "cpl_discord" __author__ = "Sven Heidemann" __license__ = "MIT" __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de" -__version__ = "2023.4.0.post2" +__version__ = "2023.4.0.post3" from collections import namedtuple @@ -23,4 +23,4 @@ from collections import namedtuple # imports: VersionInfo = namedtuple("VersionInfo", "major minor micro") -version_info = VersionInfo(major="2023", minor="4", micro="0.post2") +version_info = VersionInfo(major="2023", minor="4", micro="0.post3") diff --git a/src/cpl_discord/__init__.py b/src/cpl_discord/__init__.py index 95763308..6683f441 100644 --- a/src/cpl_discord/__init__.py +++ b/src/cpl_discord/__init__.py @@ -15,7 +15,7 @@ __title__ = "cpl_discord" __author__ = "Sven Heidemann" __license__ = "MIT" __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de" -__version__ = "2023.4.0.post2" +__version__ = "2023.4.0.post3" from collections import namedtuple @@ -59,4 +59,4 @@ def get_discord_collection(services: "ServiceCollectionABC") -> "DiscordCollecti # build-ignore-end VersionInfo = namedtuple("VersionInfo", "major minor micro") -version_info = VersionInfo(major="2023", minor="4", micro="0.post2") +version_info = VersionInfo(major="2023", minor="4", micro="0.post3") diff --git a/src/cpl_discord/application/__init__.py b/src/cpl_discord/application/__init__.py index 0561a912..58f27536 100644 --- a/src/cpl_discord/application/__init__.py +++ b/src/cpl_discord/application/__init__.py @@ -15,7 +15,7 @@ __title__ = "cpl_discord.application" __author__ = "Sven Heidemann" __license__ = "MIT" __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de" -__version__ = "2023.4.0.post2" +__version__ = "2023.4.0.post3" from collections import namedtuple @@ -24,4 +24,4 @@ from collections import namedtuple from .discord_bot_application_abc import DiscordBotApplicationABC VersionInfo = namedtuple("VersionInfo", "major minor micro") -version_info = VersionInfo(major="2023", minor="4", micro="0.post2") +version_info = VersionInfo(major="2023", minor="4", micro="0.post3") diff --git a/src/cpl_discord/command/__init__.py b/src/cpl_discord/command/__init__.py index 6de7d6d1..70bc2380 100644 --- a/src/cpl_discord/command/__init__.py +++ b/src/cpl_discord/command/__init__.py @@ -15,7 +15,7 @@ __title__ = "cpl_discord.command" __author__ = "Sven Heidemann" __license__ = "MIT" __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de" -__version__ = "2023.4.0.post2" +__version__ = "2023.4.0.post3" from collections import namedtuple @@ -25,4 +25,4 @@ from .discord_command_abc import DiscordCommandABC from .discord_commands_meta import DiscordCogMeta VersionInfo = namedtuple("VersionInfo", "major minor micro") -version_info = VersionInfo(major="2023", minor="4", micro="0.post2") +version_info = VersionInfo(major="2023", minor="4", micro="0.post3") diff --git a/src/cpl_discord/configuration/__init__.py b/src/cpl_discord/configuration/__init__.py index 13b46e90..9cdc0334 100644 --- a/src/cpl_discord/configuration/__init__.py +++ b/src/cpl_discord/configuration/__init__.py @@ -15,7 +15,7 @@ __title__ = "cpl_discord.configuration" __author__ = "Sven Heidemann" __license__ = "MIT" __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de" -__version__ = "2023.4.0.post2" +__version__ = "2023.4.0.post3" from collections import namedtuple @@ -24,4 +24,4 @@ from collections import namedtuple from .discord_bot_settings import DiscordBotSettings VersionInfo = namedtuple("VersionInfo", "major minor micro") -version_info = VersionInfo(major="2023", minor="4", micro="0.post2") +version_info = VersionInfo(major="2023", minor="4", micro="0.post3") diff --git a/src/cpl_discord/container/__init__.py b/src/cpl_discord/container/__init__.py index eeb810a9..a2e9c715 100644 --- a/src/cpl_discord/container/__init__.py +++ b/src/cpl_discord/container/__init__.py @@ -15,7 +15,7 @@ __title__ = "cpl_discord.container" __author__ = "Sven Heidemann" __license__ = "MIT" __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de" -__version__ = "2023.4.0.post2" +__version__ = "2023.4.0.post3" from collections import namedtuple @@ -31,4 +31,4 @@ from .thread import Thread from .voice_channel import VoiceChannel VersionInfo = namedtuple("VersionInfo", "major minor micro") -version_info = VersionInfo(major="2023", minor="4", micro="0.post2") +version_info = VersionInfo(major="2023", minor="4", micro="0.post3") diff --git a/src/cpl_discord/cpl-discord.json b/src/cpl_discord/cpl-discord.json index 1d59031e..25b40374 100644 --- a/src/cpl_discord/cpl-discord.json +++ b/src/cpl_discord/cpl-discord.json @@ -4,7 +4,7 @@ "Version": { "Major": "2023", "Minor": "4", - "Micro": "0.post2" + "Micro": "0.post3" }, "Author": "Sven Heidemann", "AuthorEmail": "sven.heidemann@sh-edraft.de", @@ -16,12 +16,12 @@ "LicenseName": "MIT", "LicenseDescription": "MIT, see LICENSE for more details.", "Dependencies": [ - "cpl-core>=2023.4.0", - "discord.py>=2.2.2", - "cpl-query>=2023.4.0" + "cpl-core>=2023.4.0.post2", + "discord.py>=2.3.0", + "cpl-query>=2023.4.0.post1" ], "DevDependencies": [ - "cpl-cli>=2023.4.0" + "cpl-cli>=2023.4.0.post3" ], "PythonVersion": ">=3.10", "PythonPath": {}, diff --git a/src/cpl_discord/events/__init__.py b/src/cpl_discord/events/__init__.py index 80164c3b..87de598f 100644 --- a/src/cpl_discord/events/__init__.py +++ b/src/cpl_discord/events/__init__.py @@ -15,7 +15,7 @@ __title__ = "cpl_discord.events" __author__ = "Sven Heidemann" __license__ = "MIT" __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de" -__version__ = "2023.4.0.post2" +__version__ = "2023.4.0.post3" from collections import namedtuple @@ -69,4 +69,4 @@ from .on_voice_state_update_abc import OnVoiceStateUpdateABC from .on_webhooks_update_abc import OnWebhooksUpdateABC VersionInfo = namedtuple("VersionInfo", "major minor micro") -version_info = VersionInfo(major="2023", minor="4", micro="0.post2") +version_info = VersionInfo(major="2023", minor="4", micro="0.post3") diff --git a/src/cpl_discord/helper/__init__.py b/src/cpl_discord/helper/__init__.py index 8214211d..06523b11 100644 --- a/src/cpl_discord/helper/__init__.py +++ b/src/cpl_discord/helper/__init__.py @@ -15,7 +15,7 @@ __title__ = "cpl_discord.helper" __author__ = "Sven Heidemann" __license__ = "MIT" __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de" -__version__ = "2023.4.0.post2" +__version__ = "2023.4.0.post3" from collections import namedtuple @@ -24,4 +24,4 @@ from collections import namedtuple from .to_containers_converter import ToContainersConverter VersionInfo = namedtuple("VersionInfo", "major minor micro") -version_info = VersionInfo(major="2023", minor="4", micro="0.post2") +version_info = VersionInfo(major="2023", minor="4", micro="0.post3") diff --git a/src/cpl_discord/service/__init__.py b/src/cpl_discord/service/__init__.py index 0d670dfe..ea5539fc 100644 --- a/src/cpl_discord/service/__init__.py +++ b/src/cpl_discord/service/__init__.py @@ -15,7 +15,7 @@ __title__ = "cpl_discord.service" __author__ = "Sven Heidemann" __license__ = "MIT" __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de" -__version__ = "2023.4.0.post2" +__version__ = "2023.4.0.post3" from collections import namedtuple @@ -29,4 +29,4 @@ from .discord_service import DiscordService from .discord_service_abc import DiscordServiceABC VersionInfo = namedtuple("VersionInfo", "major minor micro") -version_info = VersionInfo(major="2023", minor="4", micro="0.post2") +version_info = VersionInfo(major="2023", minor="4", micro="0.post3") -- 2.45.2 From 708918464f3f4fa165562895593b0882cb98663e Mon Sep 17 00:00:00 2001 From: Sven Heidemann Date: Wed, 19 Jul 2023 11:15:24 +0200 Subject: [PATCH 10/12] Improved config loading --- src/cpl_core/__init__.py | 4 +-- src/cpl_core/application/__init__.py | 4 +-- src/cpl_core/configuration/__init__.py | 4 +-- src/cpl_core/configuration/configuration.py | 28 ++++++++++--------- src/cpl_core/console/__init__.py | 4 +-- src/cpl_core/cpl-core.json | 2 +- src/cpl_core/database/__init__.py | 4 +-- src/cpl_core/database/connection/__init__.py | 4 +-- src/cpl_core/database/context/__init__.py | 4 +-- src/cpl_core/dependency_injection/__init__.py | 4 +-- src/cpl_core/environment/__init__.py | 4 +-- src/cpl_core/logging/__init__.py | 4 +-- src/cpl_core/mailing/__init__.py | 4 +-- src/cpl_core/pipes/__init__.py | 4 +-- src/cpl_core/time/__init__.py | 4 +-- src/cpl_core/utils/__init__.py | 4 +-- src/cpl_core/utils/json_processor.py | 3 ++ 17 files changed, 47 insertions(+), 42 deletions(-) diff --git a/src/cpl_core/__init__.py b/src/cpl_core/__init__.py index a80f88c8..f5e4c6d0 100644 --- a/src/cpl_core/__init__.py +++ b/src/cpl_core/__init__.py @@ -15,7 +15,7 @@ __title__ = "cpl_core" __author__ = "Sven Heidemann" __license__ = "MIT" __copyright__ = "Copyright (c) 2020 - 2023 sh-edraft.de" -__version__ = "2023.4.0.post2" +__version__ = "2023.4.0.post3" from collections import namedtuple @@ -23,4 +23,4 @@ from collections import namedtuple # imports: VersionInfo = namedtuple("VersionInfo", "major minor micro") -version_info = VersionInfo(major="2023", minor="4", micro="0.post2") +version_info = VersionInfo(major="2023", minor="4", micro="0.post3") diff --git a/src/cpl_core/application/__init__.py b/src/cpl_core/application/__init__.py index 39356226..03fa6f22 100644 --- a/src/cpl_core/application/__init__.py +++ b/src/cpl_core/application/__init__.py @@ -15,7 +15,7 @@ __title__ = "cpl_core.application" __author__ = "Sven Heidemann" __license__ = "MIT" __copyright__ = "Copyright (c) 2020 - 2023 sh-edraft.de" -__version__ = "2023.4.0.post2" +__version__ = "2023.4.0.post3" from collections import namedtuple @@ -29,4 +29,4 @@ from .startup_abc import StartupABC from .startup_extension_abc import StartupExtensionABC VersionInfo = namedtuple("VersionInfo", "major minor micro") -version_info = VersionInfo(major="2023", minor="4", micro="0.post2") +version_info = VersionInfo(major="2023", minor="4", micro="0.post3") diff --git a/src/cpl_core/configuration/__init__.py b/src/cpl_core/configuration/__init__.py index 79096006..f61ed590 100644 --- a/src/cpl_core/configuration/__init__.py +++ b/src/cpl_core/configuration/__init__.py @@ -15,7 +15,7 @@ __title__ = "cpl_core.configuration" __author__ = "Sven Heidemann" __license__ = "MIT" __copyright__ = "Copyright (c) 2020 - 2023 sh-edraft.de" -__version__ = "2023.4.0.post2" +__version__ = "2023.4.0.post3" from collections import namedtuple @@ -35,4 +35,4 @@ from .validator_abc import ValidatorABC from .variable_argument import VariableArgument VersionInfo = namedtuple("VersionInfo", "major minor micro") -version_info = VersionInfo(major="2023", minor="4", micro="0.post2") +version_info = VersionInfo(major="2023", minor="4", micro="0.post3") diff --git a/src/cpl_core/configuration/configuration.py b/src/cpl_core/configuration/configuration.py index aa3eab53..c3627cf5 100644 --- a/src/cpl_core/configuration/configuration.py +++ b/src/cpl_core/configuration/configuration.py @@ -278,21 +278,23 @@ class Configuration(ConfigurationABC): config_from_file = self._load_json_file(file_path, output) for sub in ConfigurationModelABC.__subclasses__(): for key, value in config_from_file.items(): - if sub.__name__ == key or sub.__name__.replace("Settings", "") == key: - configuration = sub() - from_dict = getattr(configuration, "from_dict", None) + if sub.__name__ != key and sub.__name__.replace("Settings", "") != key: + continue - if from_dict is not None and not hasattr(from_dict, "is_base_func"): - Console.set_foreground_color(ForegroundColorEnum.yellow) - Console.write_line( - f"{sub.__name__}.from_dict is deprecated. Instead, set attributes as typed arguments in __init__. They can be None by default!" - ) - Console.color_reset() - configuration.from_dict(value) - else: - configuration = JSONProcessor.process(sub, value) + configuration = sub() + from_dict = getattr(configuration, "from_dict", None) - self.add_configuration(sub, configuration) + if from_dict is not None and not hasattr(from_dict, "is_base_func"): + Console.set_foreground_color(ForegroundColorEnum.yellow) + Console.write_line( + f"{sub.__name__}.from_dict is deprecated. Instead, set attributes as typed arguments in __init__. They can be None by default!" + ) + Console.color_reset() + configuration.from_dict(value) + else: + configuration = JSONProcessor.process(sub, value) + + self.add_configuration(sub, configuration) def add_configuration(self, key_type: Type[T], value: any): self._config[key_type] = value diff --git a/src/cpl_core/console/__init__.py b/src/cpl_core/console/__init__.py index 624737d4..1c7635be 100644 --- a/src/cpl_core/console/__init__.py +++ b/src/cpl_core/console/__init__.py @@ -15,7 +15,7 @@ __title__ = "cpl_core.console" __author__ = "Sven Heidemann" __license__ = "MIT" __copyright__ = "Copyright (c) 2020 - 2023 sh-edraft.de" -__version__ = "2023.4.0.post2" +__version__ = "2023.4.0.post3" from collections import namedtuple @@ -28,4 +28,4 @@ from .foreground_color_enum import ForegroundColorEnum from .spinner_thread import SpinnerThread VersionInfo = namedtuple("VersionInfo", "major minor micro") -version_info = VersionInfo(major="2023", minor="4", micro="0.post2") +version_info = VersionInfo(major="2023", minor="4", micro="0.post3") diff --git a/src/cpl_core/cpl-core.json b/src/cpl_core/cpl-core.json index 98136f5d..16116b35 100644 --- a/src/cpl_core/cpl-core.json +++ b/src/cpl_core/cpl-core.json @@ -4,7 +4,7 @@ "Version": { "Major": "2023", "Minor": "4", - "Micro": "0.post2" + "Micro": "0.post3" }, "Author": "Sven Heidemann", "AuthorEmail": "sven.heidemann@sh-edraft.de", diff --git a/src/cpl_core/database/__init__.py b/src/cpl_core/database/__init__.py index 2ab6f55f..c26c232c 100644 --- a/src/cpl_core/database/__init__.py +++ b/src/cpl_core/database/__init__.py @@ -15,7 +15,7 @@ __title__ = "cpl_core.database" __author__ = "Sven Heidemann" __license__ = "MIT" __copyright__ = "Copyright (c) 2020 - 2023 sh-edraft.de" -__version__ = "2023.4.0.post2" +__version__ = "2023.4.0.post3" from collections import namedtuple @@ -26,4 +26,4 @@ from .database_settings import DatabaseSettings from .table_abc import TableABC VersionInfo = namedtuple("VersionInfo", "major minor micro") -version_info = VersionInfo(major="2023", minor="4", micro="0.post2") +version_info = VersionInfo(major="2023", minor="4", micro="0.post3") diff --git a/src/cpl_core/database/connection/__init__.py b/src/cpl_core/database/connection/__init__.py index a29b36cf..8536a129 100644 --- a/src/cpl_core/database/connection/__init__.py +++ b/src/cpl_core/database/connection/__init__.py @@ -15,7 +15,7 @@ __title__ = "cpl_core.database.connection" __author__ = "Sven Heidemann" __license__ = "MIT" __copyright__ = "Copyright (c) 2020 - 2023 sh-edraft.de" -__version__ = "2023.4.0.post2" +__version__ = "2023.4.0.post3" from collections import namedtuple @@ -25,4 +25,4 @@ from .database_connection import DatabaseConnection from .database_connection_abc import DatabaseConnectionABC VersionInfo = namedtuple("VersionInfo", "major minor micro") -version_info = VersionInfo(major="2023", minor="4", micro="0.post2") +version_info = VersionInfo(major="2023", minor="4", micro="0.post3") diff --git a/src/cpl_core/database/context/__init__.py b/src/cpl_core/database/context/__init__.py index ab6b66a1..4c483373 100644 --- a/src/cpl_core/database/context/__init__.py +++ b/src/cpl_core/database/context/__init__.py @@ -15,7 +15,7 @@ __title__ = "cpl_core.database.context" __author__ = "Sven Heidemann" __license__ = "MIT" __copyright__ = "Copyright (c) 2020 - 2023 sh-edraft.de" -__version__ = "2023.4.0.post2" +__version__ = "2023.4.0.post3" from collections import namedtuple @@ -25,4 +25,4 @@ from .database_context import DatabaseContext from .database_context_abc import DatabaseContextABC VersionInfo = namedtuple("VersionInfo", "major minor micro") -version_info = VersionInfo(major="2023", minor="4", micro="0.post2") +version_info = VersionInfo(major="2023", minor="4", micro="0.post3") diff --git a/src/cpl_core/dependency_injection/__init__.py b/src/cpl_core/dependency_injection/__init__.py index 10cef790..8304d96f 100644 --- a/src/cpl_core/dependency_injection/__init__.py +++ b/src/cpl_core/dependency_injection/__init__.py @@ -15,7 +15,7 @@ __title__ = "cpl_core.dependency_injection" __author__ = "Sven Heidemann" __license__ = "MIT" __copyright__ = "Copyright (c) 2020 - 2023 sh-edraft.de" -__version__ = "2023.4.0.post2" +__version__ = "2023.4.0.post3" from collections import namedtuple @@ -31,4 +31,4 @@ from .service_provider import ServiceProvider from .service_provider_abc import ServiceProviderABC VersionInfo = namedtuple("VersionInfo", "major minor micro") -version_info = VersionInfo(major="2023", minor="4", micro="0.post2") +version_info = VersionInfo(major="2023", minor="4", micro="0.post3") diff --git a/src/cpl_core/environment/__init__.py b/src/cpl_core/environment/__init__.py index 04d2c03f..645781bd 100644 --- a/src/cpl_core/environment/__init__.py +++ b/src/cpl_core/environment/__init__.py @@ -15,7 +15,7 @@ __title__ = "cpl_core.environment" __author__ = "Sven Heidemann" __license__ = "MIT" __copyright__ = "Copyright (c) 2020 - 2023 sh-edraft.de" -__version__ = "2023.4.0.post2" +__version__ = "2023.4.0.post3" from collections import namedtuple @@ -26,4 +26,4 @@ from .environment_name_enum import EnvironmentNameEnum from .application_environment import ApplicationEnvironment VersionInfo = namedtuple("VersionInfo", "major minor micro") -version_info = VersionInfo(major="2023", minor="4", micro="0.post2") +version_info = VersionInfo(major="2023", minor="4", micro="0.post3") diff --git a/src/cpl_core/logging/__init__.py b/src/cpl_core/logging/__init__.py index 6cd5310a..2c247283 100644 --- a/src/cpl_core/logging/__init__.py +++ b/src/cpl_core/logging/__init__.py @@ -15,7 +15,7 @@ __title__ = "cpl_core.logging" __author__ = "Sven Heidemann" __license__ = "MIT" __copyright__ = "Copyright (c) 2020 - 2023 sh-edraft.de" -__version__ = "2023.4.0.post2" +__version__ = "2023.4.0.post3" from collections import namedtuple @@ -28,4 +28,4 @@ from .logging_settings import LoggingSettings from .logging_settings_name_enum import LoggingSettingsNameEnum VersionInfo = namedtuple("VersionInfo", "major minor micro") -version_info = VersionInfo(major="2023", minor="4", micro="0.post2") +version_info = VersionInfo(major="2023", minor="4", micro="0.post3") diff --git a/src/cpl_core/mailing/__init__.py b/src/cpl_core/mailing/__init__.py index e7f1f297..311d9d1e 100644 --- a/src/cpl_core/mailing/__init__.py +++ b/src/cpl_core/mailing/__init__.py @@ -15,7 +15,7 @@ __title__ = "cpl_core.mailing" __author__ = "Sven Heidemann" __license__ = "MIT" __copyright__ = "Copyright (c) 2020 - 2023 sh-edraft.de" -__version__ = "2023.4.0.post2" +__version__ = "2023.4.0.post3" from collections import namedtuple @@ -28,4 +28,4 @@ from .email_client_settings import EMailClientSettings from .email_client_settings_name_enum import EMailClientSettingsNameEnum VersionInfo = namedtuple("VersionInfo", "major minor micro") -version_info = VersionInfo(major="2023", minor="4", micro="0.post2") +version_info = VersionInfo(major="2023", minor="4", micro="0.post3") diff --git a/src/cpl_core/pipes/__init__.py b/src/cpl_core/pipes/__init__.py index 7733a261..155d35e4 100644 --- a/src/cpl_core/pipes/__init__.py +++ b/src/cpl_core/pipes/__init__.py @@ -15,7 +15,7 @@ __title__ = "cpl_core.pipes" __author__ = "Sven Heidemann" __license__ = "MIT" __copyright__ = "Copyright (c) 2020 - 2023 sh-edraft.de" -__version__ = "2023.4.0.post2" +__version__ = "2023.4.0.post3" from collections import namedtuple @@ -26,4 +26,4 @@ from .ip_address_pipe import IPAddressPipe from .pipe_abc import PipeABC VersionInfo = namedtuple("VersionInfo", "major minor micro") -version_info = VersionInfo(major="2023", minor="4", micro="0.post2") +version_info = VersionInfo(major="2023", minor="4", micro="0.post3") diff --git a/src/cpl_core/time/__init__.py b/src/cpl_core/time/__init__.py index f75e94d0..1e3ff04b 100644 --- a/src/cpl_core/time/__init__.py +++ b/src/cpl_core/time/__init__.py @@ -15,7 +15,7 @@ __title__ = "cpl_core.time" __author__ = "Sven Heidemann" __license__ = "MIT" __copyright__ = "Copyright (c) 2020 - 2023 sh-edraft.de" -__version__ = "2023.4.0.post2" +__version__ = "2023.4.0.post3" from collections import namedtuple @@ -25,4 +25,4 @@ from .time_format_settings import TimeFormatSettings from .time_format_settings_names_enum import TimeFormatSettingsNamesEnum VersionInfo = namedtuple("VersionInfo", "major minor micro") -version_info = VersionInfo(major="2023", minor="4", micro="0.post2") +version_info = VersionInfo(major="2023", minor="4", micro="0.post3") diff --git a/src/cpl_core/utils/__init__.py b/src/cpl_core/utils/__init__.py index 1b7e8a01..f5cf9829 100644 --- a/src/cpl_core/utils/__init__.py +++ b/src/cpl_core/utils/__init__.py @@ -15,7 +15,7 @@ __title__ = "cpl_core.utils" __author__ = "Sven Heidemann" __license__ = "MIT" __copyright__ = "Copyright (c) 2020 - 2023 sh-edraft.de" -__version__ = "2023.4.0.post2" +__version__ = "2023.4.0.post3" from collections import namedtuple @@ -26,4 +26,4 @@ from .string import String from .pip import Pip VersionInfo = namedtuple("VersionInfo", "major minor micro") -version_info = VersionInfo(major="2023", minor="4", micro="0.post2") +version_info = VersionInfo(major="2023", minor="4", micro="0.post3") diff --git a/src/cpl_core/utils/json_processor.py b/src/cpl_core/utils/json_processor.py index 1269263e..b168a093 100644 --- a/src/cpl_core/utils/json_processor.py +++ b/src/cpl_core/utils/json_processor.py @@ -37,6 +37,9 @@ class JSONProcessor: args.append(value) + elif parameter.name == "kwargs" and parameter.annotation == dict: + kwargs = values + elif parameter.default != Parameter.empty: args.append(parameter.default) -- 2.45.2 From 43ea732c5f9187ecb605999a670657f539544eba Mon Sep 17 00:00:00 2001 From: Sven Heidemann Date: Wed, 19 Jul 2023 11:28:14 +0200 Subject: [PATCH 11/12] Fixed config loading --- src/cpl_core/__init__.py | 4 ++-- src/cpl_core/application/__init__.py | 4 ++-- src/cpl_core/configuration/__init__.py | 4 ++-- src/cpl_core/console/__init__.py | 4 ++-- src/cpl_core/cpl-core.json | 2 +- src/cpl_core/database/__init__.py | 4 ++-- src/cpl_core/database/connection/__init__.py | 4 ++-- src/cpl_core/database/context/__init__.py | 4 ++-- src/cpl_core/dependency_injection/__init__.py | 4 ++-- src/cpl_core/environment/__init__.py | 4 ++-- src/cpl_core/logging/__init__.py | 4 ++-- src/cpl_core/mailing/__init__.py | 4 ++-- src/cpl_core/pipes/__init__.py | 4 ++-- src/cpl_core/time/__init__.py | 4 ++-- src/cpl_core/utils/__init__.py | 4 ++-- src/cpl_core/utils/json_processor.py | 3 ++- 16 files changed, 31 insertions(+), 30 deletions(-) diff --git a/src/cpl_core/__init__.py b/src/cpl_core/__init__.py index f5e4c6d0..395a2c6e 100644 --- a/src/cpl_core/__init__.py +++ b/src/cpl_core/__init__.py @@ -15,7 +15,7 @@ __title__ = "cpl_core" __author__ = "Sven Heidemann" __license__ = "MIT" __copyright__ = "Copyright (c) 2020 - 2023 sh-edraft.de" -__version__ = "2023.4.0.post3" +__version__ = "2023.4.0.post4" from collections import namedtuple @@ -23,4 +23,4 @@ from collections import namedtuple # imports: VersionInfo = namedtuple("VersionInfo", "major minor micro") -version_info = VersionInfo(major="2023", minor="4", micro="0.post3") +version_info = VersionInfo(major="2023", minor="4", micro="0.post4") diff --git a/src/cpl_core/application/__init__.py b/src/cpl_core/application/__init__.py index 03fa6f22..23173a75 100644 --- a/src/cpl_core/application/__init__.py +++ b/src/cpl_core/application/__init__.py @@ -15,7 +15,7 @@ __title__ = "cpl_core.application" __author__ = "Sven Heidemann" __license__ = "MIT" __copyright__ = "Copyright (c) 2020 - 2023 sh-edraft.de" -__version__ = "2023.4.0.post3" +__version__ = "2023.4.0.post4" from collections import namedtuple @@ -29,4 +29,4 @@ from .startup_abc import StartupABC from .startup_extension_abc import StartupExtensionABC VersionInfo = namedtuple("VersionInfo", "major minor micro") -version_info = VersionInfo(major="2023", minor="4", micro="0.post3") +version_info = VersionInfo(major="2023", minor="4", micro="0.post4") diff --git a/src/cpl_core/configuration/__init__.py b/src/cpl_core/configuration/__init__.py index f61ed590..2af258d6 100644 --- a/src/cpl_core/configuration/__init__.py +++ b/src/cpl_core/configuration/__init__.py @@ -15,7 +15,7 @@ __title__ = "cpl_core.configuration" __author__ = "Sven Heidemann" __license__ = "MIT" __copyright__ = "Copyright (c) 2020 - 2023 sh-edraft.de" -__version__ = "2023.4.0.post3" +__version__ = "2023.4.0.post4" from collections import namedtuple @@ -35,4 +35,4 @@ from .validator_abc import ValidatorABC from .variable_argument import VariableArgument VersionInfo = namedtuple("VersionInfo", "major minor micro") -version_info = VersionInfo(major="2023", minor="4", micro="0.post3") +version_info = VersionInfo(major="2023", minor="4", micro="0.post4") diff --git a/src/cpl_core/console/__init__.py b/src/cpl_core/console/__init__.py index 1c7635be..d8a49683 100644 --- a/src/cpl_core/console/__init__.py +++ b/src/cpl_core/console/__init__.py @@ -15,7 +15,7 @@ __title__ = "cpl_core.console" __author__ = "Sven Heidemann" __license__ = "MIT" __copyright__ = "Copyright (c) 2020 - 2023 sh-edraft.de" -__version__ = "2023.4.0.post3" +__version__ = "2023.4.0.post4" from collections import namedtuple @@ -28,4 +28,4 @@ from .foreground_color_enum import ForegroundColorEnum from .spinner_thread import SpinnerThread VersionInfo = namedtuple("VersionInfo", "major minor micro") -version_info = VersionInfo(major="2023", minor="4", micro="0.post3") +version_info = VersionInfo(major="2023", minor="4", micro="0.post4") diff --git a/src/cpl_core/cpl-core.json b/src/cpl_core/cpl-core.json index 16116b35..0be3075d 100644 --- a/src/cpl_core/cpl-core.json +++ b/src/cpl_core/cpl-core.json @@ -4,7 +4,7 @@ "Version": { "Major": "2023", "Minor": "4", - "Micro": "0.post3" + "Micro": "0.post4" }, "Author": "Sven Heidemann", "AuthorEmail": "sven.heidemann@sh-edraft.de", diff --git a/src/cpl_core/database/__init__.py b/src/cpl_core/database/__init__.py index c26c232c..acb78aa8 100644 --- a/src/cpl_core/database/__init__.py +++ b/src/cpl_core/database/__init__.py @@ -15,7 +15,7 @@ __title__ = "cpl_core.database" __author__ = "Sven Heidemann" __license__ = "MIT" __copyright__ = "Copyright (c) 2020 - 2023 sh-edraft.de" -__version__ = "2023.4.0.post3" +__version__ = "2023.4.0.post4" from collections import namedtuple @@ -26,4 +26,4 @@ from .database_settings import DatabaseSettings from .table_abc import TableABC VersionInfo = namedtuple("VersionInfo", "major minor micro") -version_info = VersionInfo(major="2023", minor="4", micro="0.post3") +version_info = VersionInfo(major="2023", minor="4", micro="0.post4") diff --git a/src/cpl_core/database/connection/__init__.py b/src/cpl_core/database/connection/__init__.py index 8536a129..dd82ba22 100644 --- a/src/cpl_core/database/connection/__init__.py +++ b/src/cpl_core/database/connection/__init__.py @@ -15,7 +15,7 @@ __title__ = "cpl_core.database.connection" __author__ = "Sven Heidemann" __license__ = "MIT" __copyright__ = "Copyright (c) 2020 - 2023 sh-edraft.de" -__version__ = "2023.4.0.post3" +__version__ = "2023.4.0.post4" from collections import namedtuple @@ -25,4 +25,4 @@ from .database_connection import DatabaseConnection from .database_connection_abc import DatabaseConnectionABC VersionInfo = namedtuple("VersionInfo", "major minor micro") -version_info = VersionInfo(major="2023", minor="4", micro="0.post3") +version_info = VersionInfo(major="2023", minor="4", micro="0.post4") diff --git a/src/cpl_core/database/context/__init__.py b/src/cpl_core/database/context/__init__.py index 4c483373..84fd04a7 100644 --- a/src/cpl_core/database/context/__init__.py +++ b/src/cpl_core/database/context/__init__.py @@ -15,7 +15,7 @@ __title__ = "cpl_core.database.context" __author__ = "Sven Heidemann" __license__ = "MIT" __copyright__ = "Copyright (c) 2020 - 2023 sh-edraft.de" -__version__ = "2023.4.0.post3" +__version__ = "2023.4.0.post4" from collections import namedtuple @@ -25,4 +25,4 @@ from .database_context import DatabaseContext from .database_context_abc import DatabaseContextABC VersionInfo = namedtuple("VersionInfo", "major minor micro") -version_info = VersionInfo(major="2023", minor="4", micro="0.post3") +version_info = VersionInfo(major="2023", minor="4", micro="0.post4") diff --git a/src/cpl_core/dependency_injection/__init__.py b/src/cpl_core/dependency_injection/__init__.py index 8304d96f..d6b8f528 100644 --- a/src/cpl_core/dependency_injection/__init__.py +++ b/src/cpl_core/dependency_injection/__init__.py @@ -15,7 +15,7 @@ __title__ = "cpl_core.dependency_injection" __author__ = "Sven Heidemann" __license__ = "MIT" __copyright__ = "Copyright (c) 2020 - 2023 sh-edraft.de" -__version__ = "2023.4.0.post3" +__version__ = "2023.4.0.post4" from collections import namedtuple @@ -31,4 +31,4 @@ from .service_provider import ServiceProvider from .service_provider_abc import ServiceProviderABC VersionInfo = namedtuple("VersionInfo", "major minor micro") -version_info = VersionInfo(major="2023", minor="4", micro="0.post3") +version_info = VersionInfo(major="2023", minor="4", micro="0.post4") diff --git a/src/cpl_core/environment/__init__.py b/src/cpl_core/environment/__init__.py index 645781bd..17e2d075 100644 --- a/src/cpl_core/environment/__init__.py +++ b/src/cpl_core/environment/__init__.py @@ -15,7 +15,7 @@ __title__ = "cpl_core.environment" __author__ = "Sven Heidemann" __license__ = "MIT" __copyright__ = "Copyright (c) 2020 - 2023 sh-edraft.de" -__version__ = "2023.4.0.post3" +__version__ = "2023.4.0.post4" from collections import namedtuple @@ -26,4 +26,4 @@ from .environment_name_enum import EnvironmentNameEnum from .application_environment import ApplicationEnvironment VersionInfo = namedtuple("VersionInfo", "major minor micro") -version_info = VersionInfo(major="2023", minor="4", micro="0.post3") +version_info = VersionInfo(major="2023", minor="4", micro="0.post4") diff --git a/src/cpl_core/logging/__init__.py b/src/cpl_core/logging/__init__.py index 2c247283..d4349c28 100644 --- a/src/cpl_core/logging/__init__.py +++ b/src/cpl_core/logging/__init__.py @@ -15,7 +15,7 @@ __title__ = "cpl_core.logging" __author__ = "Sven Heidemann" __license__ = "MIT" __copyright__ = "Copyright (c) 2020 - 2023 sh-edraft.de" -__version__ = "2023.4.0.post3" +__version__ = "2023.4.0.post4" from collections import namedtuple @@ -28,4 +28,4 @@ from .logging_settings import LoggingSettings from .logging_settings_name_enum import LoggingSettingsNameEnum VersionInfo = namedtuple("VersionInfo", "major minor micro") -version_info = VersionInfo(major="2023", minor="4", micro="0.post3") +version_info = VersionInfo(major="2023", minor="4", micro="0.post4") diff --git a/src/cpl_core/mailing/__init__.py b/src/cpl_core/mailing/__init__.py index 311d9d1e..edcced6b 100644 --- a/src/cpl_core/mailing/__init__.py +++ b/src/cpl_core/mailing/__init__.py @@ -15,7 +15,7 @@ __title__ = "cpl_core.mailing" __author__ = "Sven Heidemann" __license__ = "MIT" __copyright__ = "Copyright (c) 2020 - 2023 sh-edraft.de" -__version__ = "2023.4.0.post3" +__version__ = "2023.4.0.post4" from collections import namedtuple @@ -28,4 +28,4 @@ from .email_client_settings import EMailClientSettings from .email_client_settings_name_enum import EMailClientSettingsNameEnum VersionInfo = namedtuple("VersionInfo", "major minor micro") -version_info = VersionInfo(major="2023", minor="4", micro="0.post3") +version_info = VersionInfo(major="2023", minor="4", micro="0.post4") diff --git a/src/cpl_core/pipes/__init__.py b/src/cpl_core/pipes/__init__.py index 155d35e4..d567a2b0 100644 --- a/src/cpl_core/pipes/__init__.py +++ b/src/cpl_core/pipes/__init__.py @@ -15,7 +15,7 @@ __title__ = "cpl_core.pipes" __author__ = "Sven Heidemann" __license__ = "MIT" __copyright__ = "Copyright (c) 2020 - 2023 sh-edraft.de" -__version__ = "2023.4.0.post3" +__version__ = "2023.4.0.post4" from collections import namedtuple @@ -26,4 +26,4 @@ from .ip_address_pipe import IPAddressPipe from .pipe_abc import PipeABC VersionInfo = namedtuple("VersionInfo", "major minor micro") -version_info = VersionInfo(major="2023", minor="4", micro="0.post3") +version_info = VersionInfo(major="2023", minor="4", micro="0.post4") diff --git a/src/cpl_core/time/__init__.py b/src/cpl_core/time/__init__.py index 1e3ff04b..947db762 100644 --- a/src/cpl_core/time/__init__.py +++ b/src/cpl_core/time/__init__.py @@ -15,7 +15,7 @@ __title__ = "cpl_core.time" __author__ = "Sven Heidemann" __license__ = "MIT" __copyright__ = "Copyright (c) 2020 - 2023 sh-edraft.de" -__version__ = "2023.4.0.post3" +__version__ = "2023.4.0.post4" from collections import namedtuple @@ -25,4 +25,4 @@ from .time_format_settings import TimeFormatSettings from .time_format_settings_names_enum import TimeFormatSettingsNamesEnum VersionInfo = namedtuple("VersionInfo", "major minor micro") -version_info = VersionInfo(major="2023", minor="4", micro="0.post3") +version_info = VersionInfo(major="2023", minor="4", micro="0.post4") diff --git a/src/cpl_core/utils/__init__.py b/src/cpl_core/utils/__init__.py index f5cf9829..2f671fc8 100644 --- a/src/cpl_core/utils/__init__.py +++ b/src/cpl_core/utils/__init__.py @@ -15,7 +15,7 @@ __title__ = "cpl_core.utils" __author__ = "Sven Heidemann" __license__ = "MIT" __copyright__ = "Copyright (c) 2020 - 2023 sh-edraft.de" -__version__ = "2023.4.0.post3" +__version__ = "2023.4.0.post4" from collections import namedtuple @@ -26,4 +26,4 @@ from .string import String from .pip import Pip VersionInfo = namedtuple("VersionInfo", "major minor micro") -version_info = VersionInfo(major="2023", minor="4", micro="0.post3") +version_info = VersionInfo(major="2023", minor="4", micro="0.post4") diff --git a/src/cpl_core/utils/json_processor.py b/src/cpl_core/utils/json_processor.py index b168a093..148ffbf1 100644 --- a/src/cpl_core/utils/json_processor.py +++ b/src/cpl_core/utils/json_processor.py @@ -8,6 +8,7 @@ class JSONProcessor: @staticmethod def process(_t: type, values: dict) -> object: args = [] + kwargs = {} sig = signature(_t.__init__) for param in sig.parameters.items(): @@ -46,4 +47,4 @@ class JSONProcessor: else: args.append(None) - return _t(*args) + return _t(*args, **kwargs) -- 2.45.2 From affbbc822d8b7b85ce092fdde19f0c7e8ef13358 Mon Sep 17 00:00:00 2001 From: Sven Heidemann Date: Wed, 19 Jul 2023 11:33:59 +0200 Subject: [PATCH 12/12] Removed handled vars from values in JP --- src/cpl_core/__init__.py | 4 ++-- src/cpl_core/application/__init__.py | 4 ++-- src/cpl_core/configuration/__init__.py | 4 ++-- src/cpl_core/console/__init__.py | 4 ++-- src/cpl_core/cpl-core.json | 2 +- src/cpl_core/database/__init__.py | 4 ++-- src/cpl_core/database/connection/__init__.py | 4 ++-- src/cpl_core/database/context/__init__.py | 4 ++-- src/cpl_core/dependency_injection/__init__.py | 4 ++-- src/cpl_core/environment/__init__.py | 4 ++-- src/cpl_core/logging/__init__.py | 4 ++-- src/cpl_core/mailing/__init__.py | 4 ++-- src/cpl_core/pipes/__init__.py | 4 ++-- src/cpl_core/time/__init__.py | 4 ++-- src/cpl_core/utils/__init__.py | 4 ++-- src/cpl_core/utils/json_processor.py | 3 +++ src/cpl_translation/__init__.py | 15 +++++++-------- 17 files changed, 39 insertions(+), 37 deletions(-) diff --git a/src/cpl_core/__init__.py b/src/cpl_core/__init__.py index 395a2c6e..33ce0454 100644 --- a/src/cpl_core/__init__.py +++ b/src/cpl_core/__init__.py @@ -15,7 +15,7 @@ __title__ = "cpl_core" __author__ = "Sven Heidemann" __license__ = "MIT" __copyright__ = "Copyright (c) 2020 - 2023 sh-edraft.de" -__version__ = "2023.4.0.post4" +__version__ = "2023.4.0.post5" from collections import namedtuple @@ -23,4 +23,4 @@ from collections import namedtuple # imports: VersionInfo = namedtuple("VersionInfo", "major minor micro") -version_info = VersionInfo(major="2023", minor="4", micro="0.post4") +version_info = VersionInfo(major="2023", minor="4", micro="0.post5") diff --git a/src/cpl_core/application/__init__.py b/src/cpl_core/application/__init__.py index 23173a75..5fcf7174 100644 --- a/src/cpl_core/application/__init__.py +++ b/src/cpl_core/application/__init__.py @@ -15,7 +15,7 @@ __title__ = "cpl_core.application" __author__ = "Sven Heidemann" __license__ = "MIT" __copyright__ = "Copyright (c) 2020 - 2023 sh-edraft.de" -__version__ = "2023.4.0.post4" +__version__ = "2023.4.0.post5" from collections import namedtuple @@ -29,4 +29,4 @@ from .startup_abc import StartupABC from .startup_extension_abc import StartupExtensionABC VersionInfo = namedtuple("VersionInfo", "major minor micro") -version_info = VersionInfo(major="2023", minor="4", micro="0.post4") +version_info = VersionInfo(major="2023", minor="4", micro="0.post5") diff --git a/src/cpl_core/configuration/__init__.py b/src/cpl_core/configuration/__init__.py index 2af258d6..781834b2 100644 --- a/src/cpl_core/configuration/__init__.py +++ b/src/cpl_core/configuration/__init__.py @@ -15,7 +15,7 @@ __title__ = "cpl_core.configuration" __author__ = "Sven Heidemann" __license__ = "MIT" __copyright__ = "Copyright (c) 2020 - 2023 sh-edraft.de" -__version__ = "2023.4.0.post4" +__version__ = "2023.4.0.post5" from collections import namedtuple @@ -35,4 +35,4 @@ from .validator_abc import ValidatorABC from .variable_argument import VariableArgument VersionInfo = namedtuple("VersionInfo", "major minor micro") -version_info = VersionInfo(major="2023", minor="4", micro="0.post4") +version_info = VersionInfo(major="2023", minor="4", micro="0.post5") diff --git a/src/cpl_core/console/__init__.py b/src/cpl_core/console/__init__.py index d8a49683..f6199039 100644 --- a/src/cpl_core/console/__init__.py +++ b/src/cpl_core/console/__init__.py @@ -15,7 +15,7 @@ __title__ = "cpl_core.console" __author__ = "Sven Heidemann" __license__ = "MIT" __copyright__ = "Copyright (c) 2020 - 2023 sh-edraft.de" -__version__ = "2023.4.0.post4" +__version__ = "2023.4.0.post5" from collections import namedtuple @@ -28,4 +28,4 @@ from .foreground_color_enum import ForegroundColorEnum from .spinner_thread import SpinnerThread VersionInfo = namedtuple("VersionInfo", "major minor micro") -version_info = VersionInfo(major="2023", minor="4", micro="0.post4") +version_info = VersionInfo(major="2023", minor="4", micro="0.post5") diff --git a/src/cpl_core/cpl-core.json b/src/cpl_core/cpl-core.json index 0be3075d..c0971a86 100644 --- a/src/cpl_core/cpl-core.json +++ b/src/cpl_core/cpl-core.json @@ -4,7 +4,7 @@ "Version": { "Major": "2023", "Minor": "4", - "Micro": "0.post4" + "Micro": "0.post5" }, "Author": "Sven Heidemann", "AuthorEmail": "sven.heidemann@sh-edraft.de", diff --git a/src/cpl_core/database/__init__.py b/src/cpl_core/database/__init__.py index acb78aa8..5006ae8d 100644 --- a/src/cpl_core/database/__init__.py +++ b/src/cpl_core/database/__init__.py @@ -15,7 +15,7 @@ __title__ = "cpl_core.database" __author__ = "Sven Heidemann" __license__ = "MIT" __copyright__ = "Copyright (c) 2020 - 2023 sh-edraft.de" -__version__ = "2023.4.0.post4" +__version__ = "2023.4.0.post5" from collections import namedtuple @@ -26,4 +26,4 @@ from .database_settings import DatabaseSettings from .table_abc import TableABC VersionInfo = namedtuple("VersionInfo", "major minor micro") -version_info = VersionInfo(major="2023", minor="4", micro="0.post4") +version_info = VersionInfo(major="2023", minor="4", micro="0.post5") diff --git a/src/cpl_core/database/connection/__init__.py b/src/cpl_core/database/connection/__init__.py index dd82ba22..a8df7d2b 100644 --- a/src/cpl_core/database/connection/__init__.py +++ b/src/cpl_core/database/connection/__init__.py @@ -15,7 +15,7 @@ __title__ = "cpl_core.database.connection" __author__ = "Sven Heidemann" __license__ = "MIT" __copyright__ = "Copyright (c) 2020 - 2023 sh-edraft.de" -__version__ = "2023.4.0.post4" +__version__ = "2023.4.0.post5" from collections import namedtuple @@ -25,4 +25,4 @@ from .database_connection import DatabaseConnection from .database_connection_abc import DatabaseConnectionABC VersionInfo = namedtuple("VersionInfo", "major minor micro") -version_info = VersionInfo(major="2023", minor="4", micro="0.post4") +version_info = VersionInfo(major="2023", minor="4", micro="0.post5") diff --git a/src/cpl_core/database/context/__init__.py b/src/cpl_core/database/context/__init__.py index 84fd04a7..62c55f1c 100644 --- a/src/cpl_core/database/context/__init__.py +++ b/src/cpl_core/database/context/__init__.py @@ -15,7 +15,7 @@ __title__ = "cpl_core.database.context" __author__ = "Sven Heidemann" __license__ = "MIT" __copyright__ = "Copyright (c) 2020 - 2023 sh-edraft.de" -__version__ = "2023.4.0.post4" +__version__ = "2023.4.0.post5" from collections import namedtuple @@ -25,4 +25,4 @@ from .database_context import DatabaseContext from .database_context_abc import DatabaseContextABC VersionInfo = namedtuple("VersionInfo", "major minor micro") -version_info = VersionInfo(major="2023", minor="4", micro="0.post4") +version_info = VersionInfo(major="2023", minor="4", micro="0.post5") diff --git a/src/cpl_core/dependency_injection/__init__.py b/src/cpl_core/dependency_injection/__init__.py index d6b8f528..14dbe033 100644 --- a/src/cpl_core/dependency_injection/__init__.py +++ b/src/cpl_core/dependency_injection/__init__.py @@ -15,7 +15,7 @@ __title__ = "cpl_core.dependency_injection" __author__ = "Sven Heidemann" __license__ = "MIT" __copyright__ = "Copyright (c) 2020 - 2023 sh-edraft.de" -__version__ = "2023.4.0.post4" +__version__ = "2023.4.0.post5" from collections import namedtuple @@ -31,4 +31,4 @@ from .service_provider import ServiceProvider from .service_provider_abc import ServiceProviderABC VersionInfo = namedtuple("VersionInfo", "major minor micro") -version_info = VersionInfo(major="2023", minor="4", micro="0.post4") +version_info = VersionInfo(major="2023", minor="4", micro="0.post5") diff --git a/src/cpl_core/environment/__init__.py b/src/cpl_core/environment/__init__.py index 17e2d075..27d4f3fc 100644 --- a/src/cpl_core/environment/__init__.py +++ b/src/cpl_core/environment/__init__.py @@ -15,7 +15,7 @@ __title__ = "cpl_core.environment" __author__ = "Sven Heidemann" __license__ = "MIT" __copyright__ = "Copyright (c) 2020 - 2023 sh-edraft.de" -__version__ = "2023.4.0.post4" +__version__ = "2023.4.0.post5" from collections import namedtuple @@ -26,4 +26,4 @@ from .environment_name_enum import EnvironmentNameEnum from .application_environment import ApplicationEnvironment VersionInfo = namedtuple("VersionInfo", "major minor micro") -version_info = VersionInfo(major="2023", minor="4", micro="0.post4") +version_info = VersionInfo(major="2023", minor="4", micro="0.post5") diff --git a/src/cpl_core/logging/__init__.py b/src/cpl_core/logging/__init__.py index d4349c28..ba80edce 100644 --- a/src/cpl_core/logging/__init__.py +++ b/src/cpl_core/logging/__init__.py @@ -15,7 +15,7 @@ __title__ = "cpl_core.logging" __author__ = "Sven Heidemann" __license__ = "MIT" __copyright__ = "Copyright (c) 2020 - 2023 sh-edraft.de" -__version__ = "2023.4.0.post4" +__version__ = "2023.4.0.post5" from collections import namedtuple @@ -28,4 +28,4 @@ from .logging_settings import LoggingSettings from .logging_settings_name_enum import LoggingSettingsNameEnum VersionInfo = namedtuple("VersionInfo", "major minor micro") -version_info = VersionInfo(major="2023", minor="4", micro="0.post4") +version_info = VersionInfo(major="2023", minor="4", micro="0.post5") diff --git a/src/cpl_core/mailing/__init__.py b/src/cpl_core/mailing/__init__.py index edcced6b..398e7dde 100644 --- a/src/cpl_core/mailing/__init__.py +++ b/src/cpl_core/mailing/__init__.py @@ -15,7 +15,7 @@ __title__ = "cpl_core.mailing" __author__ = "Sven Heidemann" __license__ = "MIT" __copyright__ = "Copyright (c) 2020 - 2023 sh-edraft.de" -__version__ = "2023.4.0.post4" +__version__ = "2023.4.0.post5" from collections import namedtuple @@ -28,4 +28,4 @@ from .email_client_settings import EMailClientSettings from .email_client_settings_name_enum import EMailClientSettingsNameEnum VersionInfo = namedtuple("VersionInfo", "major minor micro") -version_info = VersionInfo(major="2023", minor="4", micro="0.post4") +version_info = VersionInfo(major="2023", minor="4", micro="0.post5") diff --git a/src/cpl_core/pipes/__init__.py b/src/cpl_core/pipes/__init__.py index d567a2b0..ed79ae71 100644 --- a/src/cpl_core/pipes/__init__.py +++ b/src/cpl_core/pipes/__init__.py @@ -15,7 +15,7 @@ __title__ = "cpl_core.pipes" __author__ = "Sven Heidemann" __license__ = "MIT" __copyright__ = "Copyright (c) 2020 - 2023 sh-edraft.de" -__version__ = "2023.4.0.post4" +__version__ = "2023.4.0.post5" from collections import namedtuple @@ -26,4 +26,4 @@ from .ip_address_pipe import IPAddressPipe from .pipe_abc import PipeABC VersionInfo = namedtuple("VersionInfo", "major minor micro") -version_info = VersionInfo(major="2023", minor="4", micro="0.post4") +version_info = VersionInfo(major="2023", minor="4", micro="0.post5") diff --git a/src/cpl_core/time/__init__.py b/src/cpl_core/time/__init__.py index 947db762..514eeaea 100644 --- a/src/cpl_core/time/__init__.py +++ b/src/cpl_core/time/__init__.py @@ -15,7 +15,7 @@ __title__ = "cpl_core.time" __author__ = "Sven Heidemann" __license__ = "MIT" __copyright__ = "Copyright (c) 2020 - 2023 sh-edraft.de" -__version__ = "2023.4.0.post4" +__version__ = "2023.4.0.post5" from collections import namedtuple @@ -25,4 +25,4 @@ from .time_format_settings import TimeFormatSettings from .time_format_settings_names_enum import TimeFormatSettingsNamesEnum VersionInfo = namedtuple("VersionInfo", "major minor micro") -version_info = VersionInfo(major="2023", minor="4", micro="0.post4") +version_info = VersionInfo(major="2023", minor="4", micro="0.post5") diff --git a/src/cpl_core/utils/__init__.py b/src/cpl_core/utils/__init__.py index 2f671fc8..19743778 100644 --- a/src/cpl_core/utils/__init__.py +++ b/src/cpl_core/utils/__init__.py @@ -15,7 +15,7 @@ __title__ = "cpl_core.utils" __author__ = "Sven Heidemann" __license__ = "MIT" __copyright__ = "Copyright (c) 2020 - 2023 sh-edraft.de" -__version__ = "2023.4.0.post4" +__version__ = "2023.4.0.post5" from collections import namedtuple @@ -26,4 +26,4 @@ from .string import String from .pip import Pip VersionInfo = namedtuple("VersionInfo", "major minor micro") -version_info = VersionInfo(major="2023", minor="4", micro="0.post4") +version_info = VersionInfo(major="2023", minor="4", micro="0.post5") diff --git a/src/cpl_core/utils/json_processor.py b/src/cpl_core/utils/json_processor.py index 148ffbf1..a01245a0 100644 --- a/src/cpl_core/utils/json_processor.py +++ b/src/cpl_core/utils/json_processor.py @@ -22,10 +22,13 @@ class JSONProcessor: value = "" if name in values: value = values[name] + values.pop(name) elif name_first_lower in values: value = values[name_first_lower] + values.pop(name_first_lower) else: value = values[name.upper()] + values.pop(name.upper()) if isinstance(value, dict) and not issubclass(parameter.annotation, dict): value = JSONProcessor.process(parameter.annotation, value) diff --git a/src/cpl_translation/__init__.py b/src/cpl_translation/__init__.py index 3c896cf9..7dcc71b7 100644 --- a/src/cpl_translation/__init__.py +++ b/src/cpl_translation/__init__.py @@ -11,11 +11,11 @@ CPL translation extension """ -__title__ = "cpl_translation" -__author__ = "Sven Heidemann" -__license__ = "MIT" -__copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de" -__version__ = "2023.4.0.post1" +__title__ = 'cpl_translation' +__author__ = 'Sven Heidemann' +__license__ = 'MIT' +__copyright__ = 'Copyright (c) 2022 - 2023 sh-edraft.de' +__version__ = '2023.4.0.post1' from collections import namedtuple @@ -25,7 +25,6 @@ from .translate_pipe import TranslatePipe from .translation_service import TranslationService from .translation_service_abc import TranslationServiceABC from .translation_settings import TranslationSettings - # build-ignore @@ -52,5 +51,5 @@ def init(): init() # build-ignore-end -VersionInfo = namedtuple("VersionInfo", "major minor micro") -version_info = VersionInfo(major="2023", minor="4", micro="0.post1") +VersionInfo = namedtuple('VersionInfo', 'major minor micro') +version_info = VersionInfo(major='2023', minor='4', micro='0.post1') -- 2.45.2