From 8dee4d8f70b662b480e1871ccc7cecf4e34af5fb Mon Sep 17 00:00:00 2001 From: Sven Heidemann Date: Sat, 15 Apr 2023 11:47:13 +0200 Subject: [PATCH 01/29] Fixed config type --- 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_abc.py | 2 +- 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 ++-- tests/custom/general/src/general/application.py | 10 ++++++++++ .../general/src/general/appsettings.edrafts-pc.json | 4 ++++ tests/custom/general/src/general/test_settings.py | 6 ++++++ 19 files changed, 50 insertions(+), 30 deletions(-) create mode 100644 tests/custom/general/src/general/test_settings.py diff --git a/src/cpl_core/__init__.py b/src/cpl_core/__init__.py index 217cdd72..33f82aae 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" +__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_core/application/__init__.py b/src/cpl_core/application/__init__.py index b0b3ed12..3a87cd69 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" +__version__ = "2023.4.0.post1" 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") +version_info = VersionInfo(major="2023", minor="4", micro="0.post1") diff --git a/src/cpl_core/configuration/__init__.py b/src/cpl_core/configuration/__init__.py index 0d6466ac..1c84582e 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" +__version__ = "2023.4.0.post1" 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") +version_info = VersionInfo(major="2023", minor="4", micro="0.post1") diff --git a/src/cpl_core/configuration/configuration_abc.py b/src/cpl_core/configuration/configuration_abc.py index 96ae8401..1f4c8e3e 100644 --- a/src/cpl_core/configuration/configuration_abc.py +++ b/src/cpl_core/configuration/configuration_abc.py @@ -124,7 +124,7 @@ class ConfigurationABC(ABC): pass @abstractmethod - def get_configuration(self, search_type: T) -> Optional[T]: + def get_configuration(self, search_type: Type[T]) -> Optional[T]: r"""Returns value from configuration by given type Parameter: diff --git a/src/cpl_core/console/__init__.py b/src/cpl_core/console/__init__.py index 5ce225db..1f85043b 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" +__version__ = "2023.4.0.post1" 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") +version_info = VersionInfo(major="2023", minor="4", micro="0.post1") diff --git a/src/cpl_core/cpl-core.json b/src/cpl_core/cpl-core.json index 137ccad1..eccc2894 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" + "Micro": "0.post1" }, "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 beecbfd7..2ddbf2ce 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" +__version__ = "2023.4.0.post1" 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") +version_info = VersionInfo(major="2023", minor="4", micro="0.post1") diff --git a/src/cpl_core/database/connection/__init__.py b/src/cpl_core/database/connection/__init__.py index 1f13709c..5354b745 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" +__version__ = "2023.4.0.post1" 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") +version_info = VersionInfo(major="2023", minor="4", micro="0.post1") diff --git a/src/cpl_core/database/context/__init__.py b/src/cpl_core/database/context/__init__.py index dc42a7d5..7b72b757 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" +__version__ = "2023.4.0.post1" 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") +version_info = VersionInfo(major="2023", minor="4", micro="0.post1") diff --git a/src/cpl_core/dependency_injection/__init__.py b/src/cpl_core/dependency_injection/__init__.py index cf2c4ad1..b5474ba1 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" +__version__ = "2023.4.0.post1" 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") +version_info = VersionInfo(major="2023", minor="4", micro="0.post1") diff --git a/src/cpl_core/environment/__init__.py b/src/cpl_core/environment/__init__.py index ce175378..2e0a30cb 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" +__version__ = "2023.4.0.post1" 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") +version_info = VersionInfo(major="2023", minor="4", micro="0.post1") diff --git a/src/cpl_core/logging/__init__.py b/src/cpl_core/logging/__init__.py index ff387229..5c812d5a 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" +__version__ = "2023.4.0.post1" 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") +version_info = VersionInfo(major="2023", minor="4", micro="0.post1") diff --git a/src/cpl_core/mailing/__init__.py b/src/cpl_core/mailing/__init__.py index 6876693e..2ae416dd 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" +__version__ = "2023.4.0.post1" 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") +version_info = VersionInfo(major="2023", minor="4", micro="0.post1") diff --git a/src/cpl_core/pipes/__init__.py b/src/cpl_core/pipes/__init__.py index ed7a54cf..956b2267 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" +__version__ = "2023.4.0.post1" 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") +version_info = VersionInfo(major="2023", minor="4", micro="0.post1") diff --git a/src/cpl_core/time/__init__.py b/src/cpl_core/time/__init__.py index 070578f0..100defe5 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" +__version__ = "2023.4.0.post1" 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") +version_info = VersionInfo(major="2023", minor="4", micro="0.post1") diff --git a/src/cpl_core/utils/__init__.py b/src/cpl_core/utils/__init__.py index 8dde8c3b..27e32634 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" +__version__ = "2023.4.0.post1" 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") +version_info = VersionInfo(major="2023", minor="4", micro="0.post1") diff --git a/tests/custom/general/src/general/application.py b/tests/custom/general/src/general/application.py index f7f3ff72..2c8f23b8 100644 --- a/tests/custom/general/src/general/application.py +++ b/tests/custom/general/src/general/application.py @@ -8,6 +8,7 @@ from cpl_core.dependency_injection import ServiceProviderABC from cpl_core.logging import LoggerABC from cpl_core.mailing import EMailClientABC, EMail from cpl_core.pipes import IPAddressPipe +from general.test_settings import TestSettings from test_service import TestService @@ -57,4 +58,13 @@ class Application(ApplicationABC): Console.write_line("scope", scope) with self._services.create_scope() as s: Console.write_line("with scope", s) + + test_settings = self._configuration.get_configuration(TestSettings) + Console.write_line(test_settings.value) + Console.write_line("reload config") + self._configuration.add_json_file(f"appsettings.json") + self._configuration.add_json_file(f"appsettings.{self._environment.environment_name}.json") + self._configuration.add_json_file(f"appsettings.{self._environment.host_name}.json", optional=True) + test_settings1 = self._configuration.get_configuration(TestSettings) + Console.write_line(test_settings1.value) # self.test_send_mail() diff --git a/tests/custom/general/src/general/appsettings.edrafts-pc.json b/tests/custom/general/src/general/appsettings.edrafts-pc.json index 5d40a040..996cbe72 100644 --- a/tests/custom/general/src/general/appsettings.edrafts-pc.json +++ b/tests/custom/general/src/general/appsettings.edrafts-pc.json @@ -29,5 +29,9 @@ "UseUnicode": "true", "Buffered": "true", "AuthPlugin": "mysql_native_password" + }, + + "TestSettings": { + "Value": 20 } } \ No newline at end of file diff --git a/tests/custom/general/src/general/test_settings.py b/tests/custom/general/src/general/test_settings.py new file mode 100644 index 00000000..a4090edd --- /dev/null +++ b/tests/custom/general/src/general/test_settings.py @@ -0,0 +1,6 @@ +from cpl_core.configuration import ConfigurationModelABC + + +class TestSettings(ConfigurationModelABC): + def __init__(self, value: int = None): + self.value = value -- 2.54.0 From 8e12c72b077ec3b186d99959de0519b8d5c3410c Mon Sep 17 00:00:00 2001 From: Sven Heidemann Date: Mon, 12 Jun 2023 20:45:22 +0200 Subject: [PATCH 02/29] 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.54.0 From ea968d94e4a5cb1868aef78aa86cfc31263d5463 Mon Sep 17 00:00:00 2001 From: Sven Heidemann Date: Mon, 12 Jun 2023 20:45:42 +0200 Subject: [PATCH 03/29] 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.54.0 From e04d0beb68c5fea26e05d03f41d2e48288cfd897 Mon Sep 17 00:00:00 2001 From: Sven Heidemann Date: Tue, 13 Jun 2023 13:27:37 +0200 Subject: [PATCH 04/29] 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.54.0 From bea5b222517ff03b2094c9f07028234575d8dd6b Mon Sep 17 00:00:00 2001 From: Sven Heidemann Date: Tue, 13 Jun 2023 15:08:04 +0200 Subject: [PATCH 05/29] 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.54.0 From 81c2f1cba9d99be718f2f310b23be4cdaadc7b32 Mon Sep 17 00:00:00 2001 From: Sven Heidemann Date: Tue, 13 Jun 2023 15:38:04 +0200 Subject: [PATCH 06/29] 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.54.0 From a3504af376d7ef9b3bd2642b74f5d360abc6f84c Mon Sep 17 00:00:00 2001 From: Sven Heidemann Date: Tue, 13 Jun 2023 15:47:44 +0200 Subject: [PATCH 07/29] 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.54.0 From b3ed7101fc286aa06419cbc0fbbdb1d6ba1abac9 Mon Sep 17 00:00:00 2001 From: Sven Heidemann Date: Tue, 13 Jun 2023 15:56:46 +0200 Subject: [PATCH 08/29] 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.54.0 From b819eb439ca7a7c0639cbbf45e5a8a1dc28a1a05 Mon Sep 17 00:00:00 2001 From: Sven Heidemann Date: Tue, 13 Jun 2023 16:14:38 +0200 Subject: [PATCH 09/29] 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.54.0 From ed2377c2882671a3dc78a14522bcd5b971a04d17 Mon Sep 17 00:00:00 2001 From: Sven Heidemann Date: Tue, 13 Jun 2023 16:22:54 +0200 Subject: [PATCH 10/29] 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.54.0 From 708918464f3f4fa165562895593b0882cb98663e Mon Sep 17 00:00:00 2001 From: Sven Heidemann Date: Wed, 19 Jul 2023 11:15:24 +0200 Subject: [PATCH 11/29] 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.54.0 From 43ea732c5f9187ecb605999a670657f539544eba Mon Sep 17 00:00:00 2001 From: Sven Heidemann Date: Wed, 19 Jul 2023 11:28:14 +0200 Subject: [PATCH 12/29] 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.54.0 From affbbc822d8b7b85ce092fdde19f0c7e8ef13358 Mon Sep 17 00:00:00 2001 From: Sven Heidemann Date: Wed, 19 Jul 2023 11:33:59 +0200 Subject: [PATCH 13/29] 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.54.0 From 2d8ecd424ae446b76a6c0e79b966f39909c979f3 Mon Sep 17 00:00:00 2001 From: Sven Heidemann Date: Thu, 12 Oct 2023 20:11:14 +0200 Subject: [PATCH 14/29] Switched mysql package --- src/cpl_core/cpl-core.json | 8 ++-- .../connection/database_connection.py | 38 +++++++++---------- src/cpl_core/database/database_settings.py | 8 ++-- .../database/src/appsettings.edrafts-pc.json | 3 +- tests/custom/database/src/model/db_context.py | 4 +- tests/custom/database/src/startup.py | 2 +- 6 files changed, 31 insertions(+), 32 deletions(-) diff --git a/src/cpl_core/cpl-core.json b/src/cpl_core/cpl-core.json index c0971a86..b968200e 100644 --- a/src/cpl_core/cpl-core.json +++ b/src/cpl_core/cpl-core.json @@ -3,8 +3,8 @@ "Name": "cpl-core", "Version": { "Major": "2023", - "Minor": "4", - "Micro": "0.post5" + "Minor": "10", + "Micro": "0" }, "Author": "Sven Heidemann", "AuthorEmail": "sven.heidemann@sh-edraft.de", @@ -18,7 +18,6 @@ "Dependencies": [ "art>=5.9", "colorama>=0.4.6", - "mysql-connector>=2.2.9", "psutil>=5.9.4", "packaging>=23.0", "pynput>=1.7.6", @@ -26,7 +25,8 @@ "tabulate>=0.9.0", "termcolor>=2.2.0", "watchdog>=3.0.0", - "wheel>=0.40.0" + "wheel>=0.40.0", + "mysql-connector-python==8.1.0" ], "DevDependencies": [ "Sphinx==5.0.2", diff --git a/src/cpl_core/database/connection/database_connection.py b/src/cpl_core/database/connection/database_connection.py index 32ba2211..562618fc 100644 --- a/src/cpl_core/database/connection/database_connection.py +++ b/src/cpl_core/database/connection/database_connection.py @@ -25,27 +25,27 @@ class DatabaseConnection(DatabaseConnectionABC): def cursor(self) -> MySQLCursorBuffered: return self._cursor - def connect(self, database_settings: DatabaseSettings): + def connect(self, settings: DatabaseSettings): connection = sql.connect( - host=database_settings.host, - port=database_settings.port, - user=database_settings.user, - passwd=CredentialManager.decrypt(database_settings.password), - charset=database_settings.charset, - use_unicode=database_settings.use_unicode, - buffered=database_settings.buffered, - auth_plugin=database_settings.auth_plugin, + host=settings.host, + port=settings.port, + user=settings.user, + passwd=CredentialManager.decrypt(settings.password), + charset=settings.charset, + use_unicode=settings.use_unicode, + buffered=settings.buffered, + auth_plugin=settings.auth_plugin, ) - connection.cursor().execute(f"CREATE DATABASE IF NOT EXISTS `{database_settings.database}`;") + connection.cursor().execute(f"CREATE DATABASE IF NOT EXISTS `{settings.database}`;") self._database = sql.connect( - host=database_settings.host, - port=database_settings.port, - user=database_settings.user, - passwd=CredentialManager.decrypt(database_settings.password), - db=database_settings.database, - charset=database_settings.charset, - use_unicode=database_settings.use_unicode, - buffered=database_settings.buffered, - auth_plugin=database_settings.auth_plugin, + host=settings.host, + port=settings.port, + user=settings.user, + passwd=CredentialManager.decrypt(settings.password), + db=settings.database, + charset=settings.charset, + use_unicode=settings.use_unicode, + buffered=settings.buffered, + auth_plugin=settings.auth_plugin, ) self._cursor = self._database.cursor() diff --git a/src/cpl_core/database/database_settings.py b/src/cpl_core/database/database_settings.py index d6bac435..e1f774ed 100644 --- a/src/cpl_core/database/database_settings.py +++ b/src/cpl_core/database/database_settings.py @@ -13,10 +13,10 @@ class DatabaseSettings(ConfigurationModelABC): user: str = None, password: str = None, database: str = None, - charset: str = None, - use_unicode: bool = None, - buffered: bool = None, - auth_plugin: str = None, + charset: str = "utf8mb4", + use_unicode: bool = False, + buffered: bool = False, + auth_plugin: str = "caching_sha2_password", ): ConfigurationModelABC.__init__(self) diff --git a/tests/custom/database/src/appsettings.edrafts-pc.json b/tests/custom/database/src/appsettings.edrafts-pc.json index 66214fc1..78bff4d4 100644 --- a/tests/custom/database/src/appsettings.edrafts-pc.json +++ b/tests/custom/database/src/appsettings.edrafts-pc.json @@ -20,7 +20,6 @@ "Database": "sh_cpl", "Charset": "utf8mb4", "UseUnicode": "true", - "Buffered": "true", - "AuthPlugin": "mysql_native_password" + "Buffered": "true" } } \ No newline at end of file diff --git a/tests/custom/database/src/model/db_context.py b/tests/custom/database/src/model/db_context.py index 0d6fc017..73a28eb7 100644 --- a/tests/custom/database/src/model/db_context.py +++ b/tests/custom/database/src/model/db_context.py @@ -3,5 +3,5 @@ from cpl_core.database.context import DatabaseContext class DBContext(DatabaseContext): - def __init__(self, db_settings: DatabaseSettings): - DatabaseContext.__init__(self, db_settings) + def __init__(self): + DatabaseContext.__init__(self) diff --git a/tests/custom/database/src/startup.py b/tests/custom/database/src/startup.py index 0fa0daec..fbd1029a 100644 --- a/tests/custom/database/src/startup.py +++ b/tests/custom/database/src/startup.py @@ -21,7 +21,6 @@ class Startup(StartupABC): ) -> ConfigurationABC: configuration.add_environment_variables("PYTHON_") configuration.add_environment_variables("CPL_") - configuration.parse_console_arguments() configuration.add_json_file(f"appsettings.json") configuration.add_json_file(f"appsettings.{configuration.environment.environment_name}.json") configuration.add_json_file(f"appsettings.{configuration.environment.host_name}.json", optional=True) @@ -34,6 +33,7 @@ class Startup(StartupABC): self, services: ServiceCollectionABC, environment: ApplicationEnvironmentABC ) -> ServiceProviderABC: # Create and connect to database + self._configuration.parse_console_arguments(services) db_settings: DatabaseSettings = self._configuration.get_configuration(DatabaseSettings) services.add_db_context(DBContext, db_settings) -- 2.54.0 From f357e97ce50cfcdf0455c2b4151a550e9ea9ac1f Mon Sep 17 00:00:00 2001 From: Sven Heidemann Date: Thu, 12 Oct 2023 20:16:16 +0200 Subject: [PATCH 15/29] Build and formatted new version --- src/cpl_cli/_templates/build/__init__.py | 14 +++++++------- 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/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_translation/__init__.py | 15 ++++++++------- 16 files changed, 43 insertions(+), 42 deletions(-) diff --git a/src/cpl_cli/_templates/build/__init__.py b/src/cpl_cli/_templates/build/__init__.py index b0db4743..f8dc727c 100644 --- a/src/cpl_cli/_templates/build/__init__.py +++ b/src/cpl_cli/_templates/build/__init__.py @@ -11,16 +11,16 @@ CPL Command Line Interface """ -__title__ = "cpl_cli._templates.build" -__author__ = "Sven Heidemann" -__license__ = "MIT" -__copyright__ = "Copyright (c) 2020 - 2023 sh-edraft.de" -__version__ = "2023.4.0.post3" +__title__ = 'cpl_cli._templates.build' +__author__ = 'Sven Heidemann' +__license__ = 'MIT' +__copyright__ = 'Copyright (c) 2020 - 2023 sh-edraft.de' +__version__ = '2023.4.0.post3' from collections import namedtuple # imports: -VersionInfo = namedtuple("VersionInfo", "major minor micro") -version_info = VersionInfo(major="2023", minor="4", micro="0.post3") +VersionInfo = namedtuple('VersionInfo', 'major minor micro') +version_info = VersionInfo(major='2023', minor='4', micro='0.post3') diff --git a/src/cpl_core/__init__.py b/src/cpl_core/__init__.py index 33ce0454..ed3ace4f 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.post5" +__version__ = "2023.10.0" 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.post5") +version_info = VersionInfo(major="2023", minor="10", micro="0") diff --git a/src/cpl_core/application/__init__.py b/src/cpl_core/application/__init__.py index 5fcf7174..60d4c1b8 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.post5" +__version__ = "2023.10.0" 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.post5") +version_info = VersionInfo(major="2023", minor="10", micro="0") diff --git a/src/cpl_core/configuration/__init__.py b/src/cpl_core/configuration/__init__.py index 781834b2..43ef5fb5 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.post5" +__version__ = "2023.10.0" 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.post5") +version_info = VersionInfo(major="2023", minor="10", micro="0") diff --git a/src/cpl_core/console/__init__.py b/src/cpl_core/console/__init__.py index f6199039..435f9e82 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.post5" +__version__ = "2023.10.0" 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.post5") +version_info = VersionInfo(major="2023", minor="10", micro="0") diff --git a/src/cpl_core/database/__init__.py b/src/cpl_core/database/__init__.py index 5006ae8d..94d450f2 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.post5" +__version__ = "2023.10.0" 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.post5") +version_info = VersionInfo(major="2023", minor="10", micro="0") diff --git a/src/cpl_core/database/connection/__init__.py b/src/cpl_core/database/connection/__init__.py index a8df7d2b..ea268300 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.post5" +__version__ = "2023.10.0" 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.post5") +version_info = VersionInfo(major="2023", minor="10", micro="0") diff --git a/src/cpl_core/database/context/__init__.py b/src/cpl_core/database/context/__init__.py index 62c55f1c..5be4020a 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.post5" +__version__ = "2023.10.0" 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.post5") +version_info = VersionInfo(major="2023", minor="10", micro="0") diff --git a/src/cpl_core/dependency_injection/__init__.py b/src/cpl_core/dependency_injection/__init__.py index 14dbe033..866eb9b7 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.post5" +__version__ = "2023.10.0" 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.post5") +version_info = VersionInfo(major="2023", minor="10", micro="0") diff --git a/src/cpl_core/environment/__init__.py b/src/cpl_core/environment/__init__.py index 27d4f3fc..ebac8b19 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.post5" +__version__ = "2023.10.0" 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.post5") +version_info = VersionInfo(major="2023", minor="10", micro="0") diff --git a/src/cpl_core/logging/__init__.py b/src/cpl_core/logging/__init__.py index ba80edce..dac21e04 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.post5" +__version__ = "2023.10.0" 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.post5") +version_info = VersionInfo(major="2023", minor="10", micro="0") diff --git a/src/cpl_core/mailing/__init__.py b/src/cpl_core/mailing/__init__.py index 398e7dde..6330d10f 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.post5" +__version__ = "2023.10.0" 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.post5") +version_info = VersionInfo(major="2023", minor="10", micro="0") diff --git a/src/cpl_core/pipes/__init__.py b/src/cpl_core/pipes/__init__.py index ed79ae71..969e85da 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.post5" +__version__ = "2023.10.0" 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.post5") +version_info = VersionInfo(major="2023", minor="10", micro="0") diff --git a/src/cpl_core/time/__init__.py b/src/cpl_core/time/__init__.py index 514eeaea..7c3bc16a 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.post5" +__version__ = "2023.10.0" 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.post5") +version_info = VersionInfo(major="2023", minor="10", micro="0") diff --git a/src/cpl_core/utils/__init__.py b/src/cpl_core/utils/__init__.py index 19743778..f418f34b 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.post5" +__version__ = "2023.10.0" 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.post5") +version_info = VersionInfo(major="2023", minor="10", micro="0") diff --git a/src/cpl_translation/__init__.py b/src/cpl_translation/__init__.py index 7dcc71b7..3c896cf9 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,6 +25,7 @@ from .translate_pipe import TranslatePipe from .translation_service import TranslationService from .translation_service_abc import TranslationServiceABC from .translation_settings import TranslationSettings + # build-ignore @@ -51,5 +52,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.54.0 From 1dd48899d74c84cebeb2df1e4a44f9ef6ab7802a Mon Sep 17 00:00:00 2001 From: Sven Heidemann Date: Thu, 12 Oct 2023 20:41:34 +0200 Subject: [PATCH 16/29] Improved cpl-discords service loading for commands and events --- .../dependency_injection/service_provider.py | 8 ++--- .../service_provider_abc.py | 2 +- src/cpl_discord/cpl-discord.json | 4 +-- src/cpl_discord/service/discord_collection.py | 29 ++++++++----------- .../service/discord_collection_abc.py | 8 ----- src/cpl_discord/service/discord_service.py | 23 +++++---------- 6 files changed, 27 insertions(+), 47 deletions(-) diff --git a/src/cpl_core/dependency_injection/service_provider.py b/src/cpl_core/dependency_injection/service_provider.py index ac1225db..870b4d27 100644 --- a/src/cpl_core/dependency_injection/service_provider.py +++ b/src/cpl_core/dependency_injection/service_provider.py @@ -157,12 +157,12 @@ class ServiceProvider(ServiceProviderABC): return implementation - def get_services(self, service_type: typing.Type[T], *args, **kwargs) -> list[Optional[T]]: + def get_services(self, service_type: T, *args, **kwargs) -> list[Optional[T]]: implementations = [] - if typing.get_origin(service_type) != list: - raise Exception(f"Invalid type {service_type}! Expected list of type") + if typing.get_origin(service_type) == list: + raise Exception(f"Invalid type {service_type}! Expected single type not list of type") - implementations.extend(self._get_services(typing.get_args(service_type)[0])) + implementations.extend(self._get_services(service_type)) return implementations diff --git a/src/cpl_core/dependency_injection/service_provider_abc.py b/src/cpl_core/dependency_injection/service_provider_abc.py index dd195571..c5d6e7eb 100644 --- a/src/cpl_core/dependency_injection/service_provider_abc.py +++ b/src/cpl_core/dependency_injection/service_provider_abc.py @@ -76,7 +76,7 @@ class ServiceProviderABC(ABC): pass @abstractmethod - def get_services(self, service_type: Type[T], *args, **kwargs) -> list[Optional[T]]: + def get_services(self, service_type: T, *args, **kwargs) -> list[Optional[T]]: r"""Returns instance of given type Parameter diff --git a/src/cpl_discord/cpl-discord.json b/src/cpl_discord/cpl-discord.json index 25b40374..516dfd0f 100644 --- a/src/cpl_discord/cpl-discord.json +++ b/src/cpl_discord/cpl-discord.json @@ -3,8 +3,8 @@ "Name": "cpl-discord", "Version": { "Major": "2023", - "Minor": "4", - "Micro": "0.post3" + "Minor": "10", + "Micro": "0" }, "Author": "Sven Heidemann", "AuthorEmail": "sven.heidemann@sh-edraft.de", diff --git a/src/cpl_discord/service/discord_collection.py b/src/cpl_discord/service/discord_collection.py index a5b052da..f58219ae 100644 --- a/src/cpl_discord/service/discord_collection.py +++ b/src/cpl_discord/service/discord_collection.py @@ -1,11 +1,11 @@ -from typing import Type, Optional +from typing import Type +from cpl_core.console import Console, ForegroundColorEnum from cpl_core.dependency_injection import ServiceCollectionABC 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.list import List class DiscordCollection(DiscordCollectionABC): @@ -13,26 +13,21 @@ class DiscordCollection(DiscordCollectionABC): DiscordCollectionABC.__init__(self) self._services = service_collection - self._events: dict[str, List] = {} - self._commands = List(type(DiscordCommandABC)) self.add_event(DiscordEventTypesEnum.on_command_error.value, CommandErrorHandlerService) def add_command(self, _t: Type[DiscordCommandABC]): + Console.set_foreground_color(ForegroundColorEnum.yellow) + Console.write_line( + f"{type(self).__name__}.add_command is deprecated. Instead, use ServiceCollection.add_transient directly!" + ) + Console.color_reset() self._services.add_transient(DiscordCommandABC, _t) - self._commands.append(_t) - - def get_commands(self) -> List[DiscordCommandABC]: - return self._commands def add_event(self, _t_event: Type, _t: Type): + Console.set_foreground_color(ForegroundColorEnum.yellow) + Console.write_line( + f"{type(self).__name__}.add_event is deprecated. Instead, use ServiceCollection.add_transient directly!" + ) + Console.color_reset() self._services.add_transient(_t_event, _t) - if _t_event not in self._events: - self._events[_t_event] = List(type(_t_event)) - - self._events[_t_event].append(_t) - - def get_events_by_base(self, _t_event: Type) -> Optional[List]: - if _t_event not in self._events: - return None - return self._events[_t_event] diff --git a/src/cpl_discord/service/discord_collection_abc.py b/src/cpl_discord/service/discord_collection_abc.py index bb444f6d..1b9dde62 100644 --- a/src/cpl_discord/service/discord_collection_abc.py +++ b/src/cpl_discord/service/discord_collection_abc.py @@ -13,14 +13,6 @@ class DiscordCollectionABC(ABC): def add_command(self, _t: Type[DiscordCommandABC]): pass - @abstractmethod - def get_commands(self) -> List[DiscordCommandABC]: - pass - @abstractmethod def add_event(self, _t_event: Type, _t: Type): pass - - @abstractmethod - def get_events_by_base(self, _t_event: Type): - pass diff --git a/src/cpl_discord/service/discord_service.py b/src/cpl_discord/service/discord_service.py index 8995803c..9ddb5a4a 100644 --- a/src/cpl_discord/service/discord_service.py +++ b/src/cpl_discord/service/discord_service.py @@ -4,11 +4,12 @@ from typing import Optional, Sequence, Union, Type import discord from discord import RawReactionActionEvent from discord.ext import commands -from discord.ext.commands import Context, CommandError, Cog, Command +from discord.ext.commands import Context, CommandError, Cog from cpl_core.dependency_injection import ServiceProviderABC from cpl_core.logging import LoggerABC from cpl_core.utils import String +from cpl_discord.command import DiscordCommandABC from cpl_discord.command.discord_commands_meta import DiscordCogMeta from cpl_discord.events.on_bulk_message_delete_abc import OnBulkMessageDeleteABC from cpl_discord.events.on_command_abc import OnCommandABC @@ -66,25 +67,17 @@ from cpl_discord.events.on_typing_abc import OnTypingABC from cpl_discord.events.on_user_update_abc import OnUserUpdateABC from cpl_discord.events.on_voice_state_update_abc import OnVoiceStateUpdateABC from cpl_discord.events.on_webhooks_update_abc import OnWebhooksUpdateABC -from cpl_discord.service.discord_collection_abc import DiscordCollectionABC from cpl_discord.service.discord_service_abc import DiscordServiceABC class DiscordService(DiscordServiceABC, commands.Cog, metaclass=DiscordCogMeta): - def __init__(self, logger: LoggerABC, dc_collection: DiscordCollectionABC, services: ServiceProviderABC): + def __init__(self, logger: LoggerABC, services: ServiceProviderABC): DiscordServiceABC.__init__(self) self._logger = logger - self._collection = dc_collection self._services = services async def _handle_event(self, event: Type, *args, **kwargs): - event_collection = self._collection.get_events_by_base(event) - if event_collection is None: - return - - for event_type in event_collection: - event_instance = self._services.get_service(event_type) - + for event_instance in self._services.get_services(event): func_name = event.__name__ if func_name.endswith("ABC"): func_name = func_name.replace("ABC", "") @@ -104,11 +97,11 @@ class DiscordService(DiscordServiceABC, commands.Cog, metaclass=DiscordCogMeta): self._logger.error(__name__, f"{type(self).__name__} initialization failed", e) try: - for command_type in self._collection.get_commands(): - self._logger.trace(__name__, f"Register command {command_type.__name__}") - command: Cog = self._services.get_service(command_type) + for command in self._services.get_services(DiscordCommandABC): + self._logger.trace(__name__, f"Register command {type(command).__name__}") + command: Cog = command if command is None: - self._logger.warn(__name__, f"Instance of {command_type.__name__} not found") + self._logger.warn(__name__, f"Instance of {type(command).__name__} not found") continue await bot.add_cog(command) except Exception as e: -- 2.54.0 From b3fd122fcded07a8ad77536a0154b23d7dd06545 Mon Sep 17 00:00:00 2001 From: Sven Heidemann Date: Thu, 12 Oct 2023 20:42:24 +0200 Subject: [PATCH 17/29] Build cpl-discord new version --- 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/events/__init__.py | 4 ++-- src/cpl_discord/helper/__init__.py | 4 ++-- src/cpl_discord/service/__init__.py | 4 ++-- 9 files changed, 18 insertions(+), 18 deletions(-) diff --git a/src/cpl_discord/.cpl/__init__.py b/src/cpl_discord/.cpl/__init__.py index 3d6efdb0..7d25e36e 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.post3" +__version__ = "2023.10.0" 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="10", micro="0") diff --git a/src/cpl_discord/__init__.py b/src/cpl_discord/__init__.py index 6683f441..5973a14b 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.post3" +__version__ = "2023.10.0" 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.post3") +version_info = VersionInfo(major="2023", minor="10", micro="0") diff --git a/src/cpl_discord/application/__init__.py b/src/cpl_discord/application/__init__.py index 58f27536..2e0a1e05 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.post3" +__version__ = "2023.10.0" 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.post3") +version_info = VersionInfo(major="2023", minor="10", micro="0") diff --git a/src/cpl_discord/command/__init__.py b/src/cpl_discord/command/__init__.py index 70bc2380..670078ea 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.post3" +__version__ = "2023.10.0" 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.post3") +version_info = VersionInfo(major="2023", minor="10", micro="0") diff --git a/src/cpl_discord/configuration/__init__.py b/src/cpl_discord/configuration/__init__.py index 9cdc0334..b4810359 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.post3" +__version__ = "2023.10.0" 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.post3") +version_info = VersionInfo(major="2023", minor="10", micro="0") diff --git a/src/cpl_discord/container/__init__.py b/src/cpl_discord/container/__init__.py index a2e9c715..f8051fba 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.post3" +__version__ = "2023.10.0" 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.post3") +version_info = VersionInfo(major="2023", minor="10", micro="0") diff --git a/src/cpl_discord/events/__init__.py b/src/cpl_discord/events/__init__.py index 87de598f..1a8f5151 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.post3" +__version__ = "2023.10.0" 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.post3") +version_info = VersionInfo(major="2023", minor="10", micro="0") diff --git a/src/cpl_discord/helper/__init__.py b/src/cpl_discord/helper/__init__.py index 06523b11..c473fccf 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.post3" +__version__ = "2023.10.0" 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.post3") +version_info = VersionInfo(major="2023", minor="10", micro="0") diff --git a/src/cpl_discord/service/__init__.py b/src/cpl_discord/service/__init__.py index ea5539fc..4c0380bb 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.post3" +__version__ = "2023.10.0" 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.post3") +version_info = VersionInfo(major="2023", minor="10", micro="0") -- 2.54.0 From 7881294554b7be18ef3530d1f9f56e99756b25f8 Mon Sep 17 00:00:00 2001 From: Sven Heidemann Date: Thu, 12 Oct 2023 20:55:24 +0200 Subject: [PATCH 18/29] Fixed types --- src/cpl_core/configuration/configuration_abc.py | 8 ++++---- src/cpl_core/dependency_injection/service_provider.py | 2 +- src/cpl_core/dependency_injection/service_provider_abc.py | 4 ++-- src/cpl_discord/service/discord_service.py | 1 - 4 files changed, 7 insertions(+), 8 deletions(-) diff --git a/src/cpl_core/configuration/configuration_abc.py b/src/cpl_core/configuration/configuration_abc.py index 1f4c8e3e..16beb725 100644 --- a/src/cpl_core/configuration/configuration_abc.py +++ b/src/cpl_core/configuration/configuration_abc.py @@ -77,11 +77,11 @@ class ConfigurationABC(ABC): pass @abstractmethod - def add_configuration(self, key_type: Type[T], value: any): + def add_configuration(self, key_type: T, value: any): r"""Add configuration object Parameter: - key_type: Union[:class:`str`, :class:`type`] + key_type: :class:`cpl_core.type.T` Type of the value value: any Object of the value @@ -124,11 +124,11 @@ class ConfigurationABC(ABC): pass @abstractmethod - def get_configuration(self, search_type: Type[T]) -> Optional[T]: + def get_configuration(self, search_type: T) -> Optional[T]: r"""Returns value from configuration by given type Parameter: - search_type: Union[:class:`str`, Type[:class:`cpl_core.configuration.configuration_model_abc.ConfigurationModelABC`]] + search_type: :class:`cpl_core.type.T` Type to search for Returns: diff --git a/src/cpl_core/dependency_injection/service_provider.py b/src/cpl_core/dependency_injection/service_provider.py index 870b4d27..3b63eaa3 100644 --- a/src/cpl_core/dependency_injection/service_provider.py +++ b/src/cpl_core/dependency_injection/service_provider.py @@ -138,7 +138,7 @@ class ServiceProvider(ServiceProviderABC): sb = ScopeBuilder(ServiceProvider(descriptors, self._configuration, self._database_context)) return sb.build() - def get_service(self, service_type: typing.Type[T], *args, **kwargs) -> Optional[T]: + def get_service(self, service_type: T, *args, **kwargs) -> Optional[T]: result = self._find_service(service_type) if result is None: diff --git a/src/cpl_core/dependency_injection/service_provider_abc.py b/src/cpl_core/dependency_injection/service_provider_abc.py index c5d6e7eb..3af4b5fe 100644 --- a/src/cpl_core/dependency_injection/service_provider_abc.py +++ b/src/cpl_core/dependency_injection/service_provider_abc.py @@ -61,7 +61,7 @@ class ServiceProviderABC(ABC): pass @abstractmethod - def get_service(self, instance_type: Type[T], *args, **kwargs) -> Optional[T]: + def get_service(self, instance_type: T, *args, **kwargs) -> Optional[T]: r"""Returns instance of given type Parameter @@ -81,7 +81,7 @@ class ServiceProviderABC(ABC): Parameter --------- - instance_type: :class:`cpl_core.type.T` + service_type: :class:`cpl_core.type.T` The type of the searched instance Returns diff --git a/src/cpl_discord/service/discord_service.py b/src/cpl_discord/service/discord_service.py index 9ddb5a4a..82bcd35a 100644 --- a/src/cpl_discord/service/discord_service.py +++ b/src/cpl_discord/service/discord_service.py @@ -99,7 +99,6 @@ class DiscordService(DiscordServiceABC, commands.Cog, metaclass=DiscordCogMeta): try: for command in self._services.get_services(DiscordCommandABC): self._logger.trace(__name__, f"Register command {type(command).__name__}") - command: Cog = command if command is None: self._logger.warn(__name__, f"Instance of {type(command).__name__} not found") continue -- 2.54.0 From e7af5ce3228c7fe5b585b001d9f89772daeb7434 Mon Sep 17 00:00:00 2001 From: Sven Heidemann Date: Thu, 12 Oct 2023 21:05:38 +0200 Subject: [PATCH 19/29] Fixed cpl-query typing --- src/cpl_query/__init__.py | 4 ++-- src/cpl_query/base/__init__.py | 4 ++-- src/cpl_query/cpl-query.json | 4 ++-- src/cpl_query/enumerable/__init__.py | 4 ++-- src/cpl_query/extension/__init__.py | 4 ++-- src/cpl_query/extension/list.py | 4 +--- src/cpl_query/iterable/__init__.py | 4 ++-- 7 files changed, 13 insertions(+), 15 deletions(-) diff --git a/src/cpl_query/__init__.py b/src/cpl_query/__init__.py index bb13759e..08c95ea8 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.post1" +__version__ = "2023.10.0" 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="10", micro="0") diff --git a/src/cpl_query/base/__init__.py b/src/cpl_query/base/__init__.py index 2b10c00e..22d0f52d 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.post1" +__version__ = "2023.10.0" 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.post1") +version_info = VersionInfo(major="2023", minor="10", micro="0") diff --git a/src/cpl_query/cpl-query.json b/src/cpl_query/cpl-query.json index 3524aee1..a50bc50c 100644 --- a/src/cpl_query/cpl-query.json +++ b/src/cpl_query/cpl-query.json @@ -3,8 +3,8 @@ "Name": "cpl-query", "Version": { "Major": "2023", - "Minor": "4", - "Micro": "0.post1" + "Minor": "10", + "Micro": "0" }, "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 5d995c29..26b79116 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.post1" +__version__ = "2023.10.0" 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.post1") +version_info = VersionInfo(major="2023", minor="10", micro="0") diff --git a/src/cpl_query/extension/__init__.py b/src/cpl_query/extension/__init__.py index 1f6b54c1..82bedb80 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.post1" +__version__ = "2023.10.0" 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.post1") +version_info = VersionInfo(major="2023", minor="10", micro="0") diff --git a/src/cpl_query/extension/list.py b/src/cpl_query/extension/list.py index 0f397acb..3fdcbddf 100644 --- a/src/cpl_query/extension/list.py +++ b/src/cpl_query/extension/list.py @@ -1,12 +1,10 @@ -from typing import Iterator - from cpl_query.iterable.iterable import Iterable class List(Iterable): r"""Implementation of :class: `cpl_query.extension.iterable.Iterable`""" - def __init__(self, t: type = None, values: Iterator = None): + def __init__(self, t: type = None, values: Iterable = None): Iterable.__init__(self, t, values) def __getitem__(self, *args): diff --git a/src/cpl_query/iterable/__init__.py b/src/cpl_query/iterable/__init__.py index 20a51161..3aad6427 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.post1" +__version__ = "2023.10.0" 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.post1") +version_info = VersionInfo(major="2023", minor="10", micro="0") -- 2.54.0 From 41f974fe6e38fe61722ea4e0f6e8a7ed662de6ca Mon Sep 17 00:00:00 2001 From: Sven Heidemann Date: Thu, 12 Oct 2023 21:06:10 +0200 Subject: [PATCH 20/29] Fixed cpl-discord deps --- src/cpl_discord/cpl-discord.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/cpl_discord/cpl-discord.json b/src/cpl_discord/cpl-discord.json index 516dfd0f..c9682daf 100644 --- a/src/cpl_discord/cpl-discord.json +++ b/src/cpl_discord/cpl-discord.json @@ -16,9 +16,9 @@ "LicenseName": "MIT", "LicenseDescription": "MIT, see LICENSE for more details.", "Dependencies": [ - "cpl-core>=2023.4.0.post2", + "cpl-core>=2023.10.0", "discord.py>=2.3.0", - "cpl-query>=2023.4.0.post1" + "cpl-query>=2023.10.0" ], "DevDependencies": [ "cpl-cli>=2023.4.0.post3" -- 2.54.0 From 8ede2998fe48f7b9b7624dcc901bdba59ae4de5a Mon Sep 17 00:00:00 2001 From: Sven Heidemann Date: Thu, 12 Oct 2023 21:14:49 +0200 Subject: [PATCH 21/29] Fixed configuration typing --- src/cpl_core/configuration/configuration.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/cpl_core/configuration/configuration.py b/src/cpl_core/configuration/configuration.py index c3627cf5..72fafc2f 100644 --- a/src/cpl_core/configuration/configuration.py +++ b/src/cpl_core/configuration/configuration.py @@ -296,7 +296,7 @@ class Configuration(ConfigurationABC): self.add_configuration(sub, configuration) - def add_configuration(self, key_type: Type[T], value: any): + def add_configuration(self, key_type: T, value: any): self._config[key_type] = value def create_console_argument( -- 2.54.0 From c1b9c0fb4a444188ff3c34075abea7fbcb24c035 Mon Sep 17 00:00:00 2001 From: Sven Heidemann Date: Thu, 12 Oct 2023 21:20:36 +0200 Subject: [PATCH 22/29] Added R as return type --- src/cpl_core/configuration/configuration.py | 8 ++++---- src/cpl_core/configuration/configuration_abc.py | 4 ++-- src/cpl_core/dependency_injection/service_collection.py | 6 +++--- .../dependency_injection/service_collection_abc.py | 6 +++--- src/cpl_core/dependency_injection/service_provider.py | 8 ++++---- src/cpl_core/dependency_injection/service_provider_abc.py | 8 ++++---- src/cpl_core/type.py | 1 + 7 files changed, 21 insertions(+), 20 deletions(-) diff --git a/src/cpl_core/configuration/configuration.py b/src/cpl_core/configuration/configuration.py index 72fafc2f..2e3baa0f 100644 --- a/src/cpl_core/configuration/configuration.py +++ b/src/cpl_core/configuration/configuration.py @@ -24,7 +24,7 @@ from cpl_core.dependency_injection.service_provider_abc import ServiceProviderAB from cpl_core.environment.application_environment import ApplicationEnvironment from cpl_core.environment.application_environment_abc import ApplicationEnvironmentABC from cpl_core.environment.environment_name_enum import EnvironmentNameEnum -from cpl_core.type import T +from cpl_core.type import T, R from cpl_core.utils.json_processor import JSONProcessor @@ -316,7 +316,7 @@ class Configuration(ConfigurationABC): for arg in self._argument_types: call(arg) - def get_configuration(self, search_type: T) -> Optional[T]: + def get_configuration(self, search_type: T) -> Optional[R]: if type(search_type) is str: if search_type == ConfigurationVariableNameEnum.environment.value: return self._application_environment.environment_name @@ -357,7 +357,7 @@ class Configuration(ConfigurationABC): if exe.validators is not None: abort = False for validator_type in exe.validators: - validator: ValidatorABC = services.get_service(validator_type) + validator = services.get_service(validator_type) result = validator.validate() abort = not result if abort: @@ -366,7 +366,7 @@ class Configuration(ConfigurationABC): if abort: sys.exit() - cmd: ArgumentExecutableABC = services.get_service(exe.executable_type) + cmd = services.get_service(exe.executable_type) self._handle_pre_or_post_executables(True, exe, services) self._set_variable("ACTIVE_EXECUTABLE", exe.name) args = self.get_configuration("ARGS") diff --git a/src/cpl_core/configuration/configuration_abc.py b/src/cpl_core/configuration/configuration_abc.py index 16beb725..66bf3e35 100644 --- a/src/cpl_core/configuration/configuration_abc.py +++ b/src/cpl_core/configuration/configuration_abc.py @@ -6,7 +6,7 @@ from cpl_core.configuration.configuration_model_abc import ConfigurationModelABC from cpl_core.configuration.argument_abc import ArgumentABC from cpl_core.configuration.argument_type_enum import ArgumentTypeEnum from cpl_core.environment.application_environment_abc import ApplicationEnvironmentABC -from cpl_core.type import T +from cpl_core.type import T, R class ConfigurationABC(ABC): @@ -124,7 +124,7 @@ class ConfigurationABC(ABC): pass @abstractmethod - def get_configuration(self, search_type: T) -> Optional[T]: + def get_configuration(self, search_type: T) -> Optional[R]: r"""Returns value from configuration by given type Parameter: diff --git a/src/cpl_core/dependency_injection/service_collection.py b/src/cpl_core/dependency_injection/service_collection.py index 4f6be8c7..6b505765 100644 --- a/src/cpl_core/dependency_injection/service_collection.py +++ b/src/cpl_core/dependency_injection/service_collection.py @@ -61,15 +61,15 @@ class ServiceCollection(ServiceCollectionABC): self.add_transient(PipeABC, pipe) return self - def add_singleton(self, service_type: Type[T], service: T = None): + def add_singleton(self, service_type: T, service: T = None): self._add_descriptor_by_lifetime(service_type, ServiceLifetimeEnum.singleton, service) return self - def add_scoped(self, service_type: Type[T], service: Callable = None): + def add_scoped(self, service_type: T, service: T = None): self._add_descriptor_by_lifetime(service_type, ServiceLifetimeEnum.scoped, service) return self - def add_transient(self, service_type: Type[T], service: T = None): + def add_transient(self, service_type: T, service: T = None): self._add_descriptor_by_lifetime(service_type, ServiceLifetimeEnum.transient, service) return self diff --git a/src/cpl_core/dependency_injection/service_collection_abc.py b/src/cpl_core/dependency_injection/service_collection_abc.py index 62c1b5a8..8da9a519 100644 --- a/src/cpl_core/dependency_injection/service_collection_abc.py +++ b/src/cpl_core/dependency_injection/service_collection_abc.py @@ -46,7 +46,7 @@ class ServiceCollectionABC(ABC): pass @abstractmethod - def add_transient(self, service_type: Type[T], service: T = None) -> "ServiceCollectionABC": + def add_transient(self, service_type: T, service: T = None) -> "ServiceCollectionABC": r"""Adds a service with transient lifetime Parameter: @@ -61,7 +61,7 @@ class ServiceCollectionABC(ABC): pass @abstractmethod - def add_scoped(self, service_type: Type[T], service: T = None) -> "ServiceCollectionABC": + def add_scoped(self, service_type: T, service: T = None) -> "ServiceCollectionABC": r"""Adds a service with scoped lifetime Parameter: @@ -76,7 +76,7 @@ class ServiceCollectionABC(ABC): pass @abstractmethod - def add_singleton(self, service_type: Type[T], service: T = None) -> "ServiceCollectionABC": + def add_singleton(self, service_type: T, service: T = None) -> "ServiceCollectionABC": r"""Adds a service with singleton lifetime Parameter: diff --git a/src/cpl_core/dependency_injection/service_provider.py b/src/cpl_core/dependency_injection/service_provider.py index 3b63eaa3..164012ba 100644 --- a/src/cpl_core/dependency_injection/service_provider.py +++ b/src/cpl_core/dependency_injection/service_provider.py @@ -12,7 +12,7 @@ from cpl_core.dependency_injection.service_descriptor import ServiceDescriptor from cpl_core.dependency_injection.service_lifetime_enum import ServiceLifetimeEnum from cpl_core.dependency_injection.service_provider_abc import ServiceProviderABC from cpl_core.environment.application_environment_abc import ApplicationEnvironmentABC -from cpl_core.type import T +from cpl_core.type import T, R class ServiceProvider(ServiceProviderABC): @@ -80,7 +80,7 @@ class ServiceProvider(ServiceProviderABC): return implementations - def build_by_signature(self, sig: Signature) -> list[T]: + def build_by_signature(self, sig: Signature) -> list[R]: params = [] for param in sig.parameters.items(): parameter = param[1] @@ -138,7 +138,7 @@ class ServiceProvider(ServiceProviderABC): sb = ScopeBuilder(ServiceProvider(descriptors, self._configuration, self._database_context)) return sb.build() - def get_service(self, service_type: T, *args, **kwargs) -> Optional[T]: + def get_service(self, service_type: T, *args, **kwargs) -> Optional[R]: result = self._find_service(service_type) if result is None: @@ -157,7 +157,7 @@ class ServiceProvider(ServiceProviderABC): return implementation - def get_services(self, service_type: T, *args, **kwargs) -> list[Optional[T]]: + def get_services(self, service_type: T, *args, **kwargs) -> list[Optional[R]]: implementations = [] if typing.get_origin(service_type) == list: diff --git a/src/cpl_core/dependency_injection/service_provider_abc.py b/src/cpl_core/dependency_injection/service_provider_abc.py index 3af4b5fe..dde58278 100644 --- a/src/cpl_core/dependency_injection/service_provider_abc.py +++ b/src/cpl_core/dependency_injection/service_provider_abc.py @@ -4,7 +4,7 @@ from inspect import Signature, signature from typing import Optional, Type from cpl_core.dependency_injection.scope_abc import ScopeABC -from cpl_core.type import T +from cpl_core.type import T, R class ServiceProviderABC(ABC): @@ -21,7 +21,7 @@ class ServiceProviderABC(ABC): cls._provider = provider @abstractmethod - def build_by_signature(self, sig: Signature) -> list[T]: + def build_by_signature(self, sig: Signature) -> list[R]: pass @abstractmethod @@ -61,7 +61,7 @@ class ServiceProviderABC(ABC): pass @abstractmethod - def get_service(self, instance_type: T, *args, **kwargs) -> Optional[T]: + def get_service(self, instance_type: T, *args, **kwargs) -> Optional[R]: r"""Returns instance of given type Parameter @@ -76,7 +76,7 @@ class ServiceProviderABC(ABC): pass @abstractmethod - def get_services(self, service_type: T, *args, **kwargs) -> list[Optional[T]]: + def get_services(self, service_type: T, *args, **kwargs) -> list[Optional[R]]: r"""Returns instance of given type Parameter diff --git a/src/cpl_core/type.py b/src/cpl_core/type.py index b186d5ad..394d5c67 100644 --- a/src/cpl_core/type.py +++ b/src/cpl_core/type.py @@ -1,3 +1,4 @@ from typing import TypeVar T = TypeVar("T") +R = TypeVar("R") -- 2.54.0 From 4062a6ebe4906d41ca4ec3833fdbce09fbbe9ff4 Mon Sep 17 00:00:00 2001 From: Sven Heidemann Date: Fri, 13 Oct 2023 14:57:46 +0200 Subject: [PATCH 23/29] Updated deps --- src/cpl_core/cpl-core.json | 2 +- src/cpl_discord/cpl-discord.json | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/cpl_core/cpl-core.json b/src/cpl_core/cpl-core.json index b968200e..04975c27 100644 --- a/src/cpl_core/cpl-core.json +++ b/src/cpl_core/cpl-core.json @@ -26,7 +26,7 @@ "termcolor>=2.2.0", "watchdog>=3.0.0", "wheel>=0.40.0", - "mysql-connector-python==8.1.0" + "mysql-connector-python>=8.1.0" ], "DevDependencies": [ "Sphinx==5.0.2", diff --git a/src/cpl_discord/cpl-discord.json b/src/cpl_discord/cpl-discord.json index c9682daf..2b92fd28 100644 --- a/src/cpl_discord/cpl-discord.json +++ b/src/cpl_discord/cpl-discord.json @@ -17,11 +17,11 @@ "LicenseDescription": "MIT, see LICENSE for more details.", "Dependencies": [ "cpl-core>=2023.10.0", - "discord.py>=2.3.0", + "discord.py>=2.3.2", "cpl-query>=2023.10.0" ], "DevDependencies": [ - "cpl-cli>=2023.4.0.post3" + "cpl-cli>=2023.10.0" ], "PythonVersion": ">=3.10", "PythonPath": {}, -- 2.54.0 From 153fc8922e7f047b037a85cbeb48a6551c3db9ef Mon Sep 17 00:00:00 2001 From: Sven Heidemann Date: Fri, 13 Oct 2023 15:20:26 +0200 Subject: [PATCH 24/29] Fixed dc collection --- 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_collection.py | 2 +- 11 files changed, 20 insertions(+), 20 deletions(-) diff --git a/src/cpl_discord/.cpl/__init__.py b/src/cpl_discord/.cpl/__init__.py index 7d25e36e..6b56a505 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.10.0" +__version__ = "2023.10.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="10", micro="0") +version_info = VersionInfo(major="2023", minor="10", micro="0.post1") diff --git a/src/cpl_discord/__init__.py b/src/cpl_discord/__init__.py index 5973a14b..8633b454 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.10.0" +__version__ = "2023.10.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="10", micro="0") +version_info = VersionInfo(major="2023", minor="10", micro="0.post1") diff --git a/src/cpl_discord/application/__init__.py b/src/cpl_discord/application/__init__.py index 2e0a1e05..55268d11 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.10.0" +__version__ = "2023.10.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="10", micro="0") +version_info = VersionInfo(major="2023", minor="10", micro="0.post1") diff --git a/src/cpl_discord/command/__init__.py b/src/cpl_discord/command/__init__.py index 670078ea..488fddd8 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.10.0" +__version__ = "2023.10.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="10", micro="0") +version_info = VersionInfo(major="2023", minor="10", micro="0.post1") diff --git a/src/cpl_discord/configuration/__init__.py b/src/cpl_discord/configuration/__init__.py index b4810359..0c3b5632 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.10.0" +__version__ = "2023.10.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="10", micro="0") +version_info = VersionInfo(major="2023", minor="10", micro="0.post1") diff --git a/src/cpl_discord/container/__init__.py b/src/cpl_discord/container/__init__.py index f8051fba..d318cbfe 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.10.0" +__version__ = "2023.10.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="10", micro="0") +version_info = VersionInfo(major="2023", minor="10", micro="0.post1") diff --git a/src/cpl_discord/cpl-discord.json b/src/cpl_discord/cpl-discord.json index 2b92fd28..61a81dd9 100644 --- a/src/cpl_discord/cpl-discord.json +++ b/src/cpl_discord/cpl-discord.json @@ -4,7 +4,7 @@ "Version": { "Major": "2023", "Minor": "10", - "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 1a8f5151..74a2fed2 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.10.0" +__version__ = "2023.10.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="10", micro="0") +version_info = VersionInfo(major="2023", minor="10", micro="0.post1") diff --git a/src/cpl_discord/helper/__init__.py b/src/cpl_discord/helper/__init__.py index c473fccf..28a89154 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.10.0" +__version__ = "2023.10.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="10", micro="0") +version_info = VersionInfo(major="2023", minor="10", micro="0.post1") diff --git a/src/cpl_discord/service/__init__.py b/src/cpl_discord/service/__init__.py index 4c0380bb..45140b51 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.10.0" +__version__ = "2023.10.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="10", micro="0") +version_info = VersionInfo(major="2023", minor="10", micro="0.post1") diff --git a/src/cpl_discord/service/discord_collection.py b/src/cpl_discord/service/discord_collection.py index f58219ae..28b18122 100644 --- a/src/cpl_discord/service/discord_collection.py +++ b/src/cpl_discord/service/discord_collection.py @@ -14,7 +14,7 @@ class DiscordCollection(DiscordCollectionABC): self._services = service_collection - self.add_event(DiscordEventTypesEnum.on_command_error.value, CommandErrorHandlerService) + self._services.add_transient(DiscordEventTypesEnum.on_command_error.value, CommandErrorHandlerService) def add_command(self, _t: Type[DiscordCommandABC]): Console.set_foreground_color(ForegroundColorEnum.yellow) -- 2.54.0 From 347418bdc5aca76baebf79c785aa309e1201a463 Mon Sep 17 00:00:00 2001 From: Sven Heidemann Date: Wed, 6 Dec 2023 17:56:13 +0100 Subject: [PATCH 25/29] Added ssl_disabled option --- src/cpl_core/__init__.py | 14 +++++++------- src/cpl_core/application/__init__.py | 14 +++++++------- src/cpl_core/configuration/__init__.py | 14 +++++++------- src/cpl_core/console/__init__.py | 14 +++++++------- src/cpl_core/cpl-core.json | 2 +- src/cpl_core/database/__init__.py | 14 +++++++------- src/cpl_core/database/connection/__init__.py | 14 +++++++------- .../database/connection/database_connection.py | 7 +++++-- src/cpl_core/database/context/__init__.py | 14 +++++++------- src/cpl_core/database/database_settings.py | 10 ++++++++-- src/cpl_core/dependency_injection/__init__.py | 14 +++++++------- src/cpl_core/environment/__init__.py | 14 +++++++------- src/cpl_core/logging/__init__.py | 14 +++++++------- src/cpl_core/mailing/__init__.py | 14 +++++++------- src/cpl_core/pipes/__init__.py | 14 +++++++------- src/cpl_core/time/__init__.py | 14 +++++++------- src/cpl_core/utils/__init__.py | 14 +++++++------- 17 files changed, 112 insertions(+), 103 deletions(-) diff --git a/src/cpl_core/__init__.py b/src/cpl_core/__init__.py index ed3ace4f..14bfdc4e 100644 --- a/src/cpl_core/__init__.py +++ b/src/cpl_core/__init__.py @@ -11,16 +11,16 @@ CPL core package """ -__title__ = "cpl_core" -__author__ = "Sven Heidemann" -__license__ = "MIT" -__copyright__ = "Copyright (c) 2020 - 2023 sh-edraft.de" -__version__ = "2023.10.0" +__title__ = 'cpl_core' +__author__ = 'Sven Heidemann' +__license__ = 'MIT' +__copyright__ = 'Copyright (c) 2020 - 2023 sh-edraft.de' +__version__ = '2023.10.1' from collections import namedtuple # imports: -VersionInfo = namedtuple("VersionInfo", "major minor micro") -version_info = VersionInfo(major="2023", minor="10", micro="0") +VersionInfo = namedtuple('VersionInfo', 'major minor micro') +version_info = VersionInfo(major='2023', minor='10', micro='1') diff --git a/src/cpl_core/application/__init__.py b/src/cpl_core/application/__init__.py index 60d4c1b8..e71170a1 100644 --- a/src/cpl_core/application/__init__.py +++ b/src/cpl_core/application/__init__.py @@ -11,11 +11,11 @@ CPL core package """ -__title__ = "cpl_core.application" -__author__ = "Sven Heidemann" -__license__ = "MIT" -__copyright__ = "Copyright (c) 2020 - 2023 sh-edraft.de" -__version__ = "2023.10.0" +__title__ = 'cpl_core.application' +__author__ = 'Sven Heidemann' +__license__ = 'MIT' +__copyright__ = 'Copyright (c) 2020 - 2023 sh-edraft.de' +__version__ = '2023.10.1' from collections import namedtuple @@ -28,5 +28,5 @@ from .application_extension_abc import ApplicationExtensionABC from .startup_abc import StartupABC from .startup_extension_abc import StartupExtensionABC -VersionInfo = namedtuple("VersionInfo", "major minor micro") -version_info = VersionInfo(major="2023", minor="10", micro="0") +VersionInfo = namedtuple('VersionInfo', 'major minor micro') +version_info = VersionInfo(major='2023', minor='10', micro='1') diff --git a/src/cpl_core/configuration/__init__.py b/src/cpl_core/configuration/__init__.py index 43ef5fb5..235bac61 100644 --- a/src/cpl_core/configuration/__init__.py +++ b/src/cpl_core/configuration/__init__.py @@ -11,11 +11,11 @@ CPL core package """ -__title__ = "cpl_core.configuration" -__author__ = "Sven Heidemann" -__license__ = "MIT" -__copyright__ = "Copyright (c) 2020 - 2023 sh-edraft.de" -__version__ = "2023.10.0" +__title__ = 'cpl_core.configuration' +__author__ = 'Sven Heidemann' +__license__ = 'MIT' +__copyright__ = 'Copyright (c) 2020 - 2023 sh-edraft.de' +__version__ = '2023.10.1' from collections import namedtuple @@ -34,5 +34,5 @@ from .flag_argument import FlagArgument from .validator_abc import ValidatorABC from .variable_argument import VariableArgument -VersionInfo = namedtuple("VersionInfo", "major minor micro") -version_info = VersionInfo(major="2023", minor="10", micro="0") +VersionInfo = namedtuple('VersionInfo', 'major minor micro') +version_info = VersionInfo(major='2023', minor='10', micro='1') diff --git a/src/cpl_core/console/__init__.py b/src/cpl_core/console/__init__.py index 435f9e82..aff04b94 100644 --- a/src/cpl_core/console/__init__.py +++ b/src/cpl_core/console/__init__.py @@ -11,11 +11,11 @@ CPL core package """ -__title__ = "cpl_core.console" -__author__ = "Sven Heidemann" -__license__ = "MIT" -__copyright__ = "Copyright (c) 2020 - 2023 sh-edraft.de" -__version__ = "2023.10.0" +__title__ = 'cpl_core.console' +__author__ = 'Sven Heidemann' +__license__ = 'MIT' +__copyright__ = 'Copyright (c) 2020 - 2023 sh-edraft.de' +__version__ = '2023.10.1' from collections import namedtuple @@ -27,5 +27,5 @@ from .console_call import ConsoleCall from .foreground_color_enum import ForegroundColorEnum from .spinner_thread import SpinnerThread -VersionInfo = namedtuple("VersionInfo", "major minor micro") -version_info = VersionInfo(major="2023", minor="10", micro="0") +VersionInfo = namedtuple('VersionInfo', 'major minor micro') +version_info = VersionInfo(major='2023', minor='10', micro='1') diff --git a/src/cpl_core/cpl-core.json b/src/cpl_core/cpl-core.json index 04975c27..c54f904c 100644 --- a/src/cpl_core/cpl-core.json +++ b/src/cpl_core/cpl-core.json @@ -4,7 +4,7 @@ "Version": { "Major": "2023", "Minor": "10", - "Micro": "0" + "Micro": "1" }, "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 94d450f2..b7d94ebc 100644 --- a/src/cpl_core/database/__init__.py +++ b/src/cpl_core/database/__init__.py @@ -11,11 +11,11 @@ CPL core package """ -__title__ = "cpl_core.database" -__author__ = "Sven Heidemann" -__license__ = "MIT" -__copyright__ = "Copyright (c) 2020 - 2023 sh-edraft.de" -__version__ = "2023.10.0" +__title__ = 'cpl_core.database' +__author__ = 'Sven Heidemann' +__license__ = 'MIT' +__copyright__ = 'Copyright (c) 2020 - 2023 sh-edraft.de' +__version__ = '2023.10.1' from collections import namedtuple @@ -25,5 +25,5 @@ from .database_settings_name_enum import DatabaseSettingsNameEnum from .database_settings import DatabaseSettings from .table_abc import TableABC -VersionInfo = namedtuple("VersionInfo", "major minor micro") -version_info = VersionInfo(major="2023", minor="10", micro="0") +VersionInfo = namedtuple('VersionInfo', 'major minor micro') +version_info = VersionInfo(major='2023', minor='10', micro='1') diff --git a/src/cpl_core/database/connection/__init__.py b/src/cpl_core/database/connection/__init__.py index ea268300..8a2232b9 100644 --- a/src/cpl_core/database/connection/__init__.py +++ b/src/cpl_core/database/connection/__init__.py @@ -11,11 +11,11 @@ CPL core package """ -__title__ = "cpl_core.database.connection" -__author__ = "Sven Heidemann" -__license__ = "MIT" -__copyright__ = "Copyright (c) 2020 - 2023 sh-edraft.de" -__version__ = "2023.10.0" +__title__ = 'cpl_core.database.connection' +__author__ = 'Sven Heidemann' +__license__ = 'MIT' +__copyright__ = 'Copyright (c) 2020 - 2023 sh-edraft.de' +__version__ = '2023.10.1' from collections import namedtuple @@ -24,5 +24,5 @@ from collections import namedtuple from .database_connection import DatabaseConnection from .database_connection_abc import DatabaseConnectionABC -VersionInfo = namedtuple("VersionInfo", "major minor micro") -version_info = VersionInfo(major="2023", minor="10", micro="0") +VersionInfo = namedtuple('VersionInfo', 'major minor micro') +version_info = VersionInfo(major='2023', minor='10', micro='1') diff --git a/src/cpl_core/database/connection/database_connection.py b/src/cpl_core/database/connection/database_connection.py index 562618fc..a814fd0a 100644 --- a/src/cpl_core/database/connection/database_connection.py +++ b/src/cpl_core/database/connection/database_connection.py @@ -1,11 +1,12 @@ from typing import Optional import mysql.connector as sql +from mysql.connector.abstracts import MySQLConnectionAbstract +from mysql.connector.cursor import MySQLCursorBuffered + from cpl_core.database.connection.database_connection_abc import DatabaseConnectionABC from cpl_core.database.database_settings import DatabaseSettings from cpl_core.utils.credential_manager import CredentialManager -from mysql.connector.abstracts import MySQLConnectionAbstract -from mysql.connector.cursor import MySQLCursorBuffered class DatabaseConnection(DatabaseConnectionABC): @@ -35,6 +36,7 @@ class DatabaseConnection(DatabaseConnectionABC): use_unicode=settings.use_unicode, buffered=settings.buffered, auth_plugin=settings.auth_plugin, + ssl_disabled=settings.ssl_disabled, ) connection.cursor().execute(f"CREATE DATABASE IF NOT EXISTS `{settings.database}`;") self._database = sql.connect( @@ -47,5 +49,6 @@ class DatabaseConnection(DatabaseConnectionABC): use_unicode=settings.use_unicode, buffered=settings.buffered, auth_plugin=settings.auth_plugin, + ssl_disabled=settings.ssl_disabled, ) self._cursor = self._database.cursor() diff --git a/src/cpl_core/database/context/__init__.py b/src/cpl_core/database/context/__init__.py index 5be4020a..ac8ea4b6 100644 --- a/src/cpl_core/database/context/__init__.py +++ b/src/cpl_core/database/context/__init__.py @@ -11,11 +11,11 @@ CPL core package """ -__title__ = "cpl_core.database.context" -__author__ = "Sven Heidemann" -__license__ = "MIT" -__copyright__ = "Copyright (c) 2020 - 2023 sh-edraft.de" -__version__ = "2023.10.0" +__title__ = 'cpl_core.database.context' +__author__ = 'Sven Heidemann' +__license__ = 'MIT' +__copyright__ = 'Copyright (c) 2020 - 2023 sh-edraft.de' +__version__ = '2023.10.1' from collections import namedtuple @@ -24,5 +24,5 @@ from collections import namedtuple from .database_context import DatabaseContext from .database_context_abc import DatabaseContextABC -VersionInfo = namedtuple("VersionInfo", "major minor micro") -version_info = VersionInfo(major="2023", minor="10", micro="0") +VersionInfo = namedtuple('VersionInfo', 'major minor micro') +version_info = VersionInfo(major='2023', minor='10', micro='1') diff --git a/src/cpl_core/database/database_settings.py b/src/cpl_core/database/database_settings.py index e1f774ed..80572018 100644 --- a/src/cpl_core/database/database_settings.py +++ b/src/cpl_core/database/database_settings.py @@ -17,6 +17,7 @@ class DatabaseSettings(ConfigurationModelABC): use_unicode: bool = False, buffered: bool = False, auth_plugin: str = "caching_sha2_password", + ssl_disabled: bool = False, ): ConfigurationModelABC.__init__(self) @@ -24,11 +25,12 @@ class DatabaseSettings(ConfigurationModelABC): self._port: Optional[int] = port self._user: Optional[str] = user self._password: Optional[str] = password - self._databse: Optional[str] = database + self._database: Optional[str] = database self._charset: Optional[str] = charset self._use_unicode: Optional[bool] = use_unicode self._buffered: Optional[bool] = buffered self._auth_plugin: Optional[str] = auth_plugin + self._ssl_disabled: Optional[bool] = ssl_disabled @property def host(self) -> Optional[str]: @@ -48,7 +50,7 @@ class DatabaseSettings(ConfigurationModelABC): @property def database(self) -> Optional[str]: - return self._databse + return self._database @property def charset(self) -> Optional[str]: @@ -65,3 +67,7 @@ class DatabaseSettings(ConfigurationModelABC): @property def auth_plugin(self) -> Optional[str]: return self._auth_plugin + + @property + def ssl_disabled(self) -> Optional[bool]: + return self._ssl_disabled diff --git a/src/cpl_core/dependency_injection/__init__.py b/src/cpl_core/dependency_injection/__init__.py index 866eb9b7..ef3f36fa 100644 --- a/src/cpl_core/dependency_injection/__init__.py +++ b/src/cpl_core/dependency_injection/__init__.py @@ -11,11 +11,11 @@ CPL core package """ -__title__ = "cpl_core.dependency_injection" -__author__ = "Sven Heidemann" -__license__ = "MIT" -__copyright__ = "Copyright (c) 2020 - 2023 sh-edraft.de" -__version__ = "2023.10.0" +__title__ = 'cpl_core.dependency_injection' +__author__ = 'Sven Heidemann' +__license__ = 'MIT' +__copyright__ = 'Copyright (c) 2020 - 2023 sh-edraft.de' +__version__ = '2023.10.1' from collections import namedtuple @@ -30,5 +30,5 @@ from .service_lifetime_enum import ServiceLifetimeEnum from .service_provider import ServiceProvider from .service_provider_abc import ServiceProviderABC -VersionInfo = namedtuple("VersionInfo", "major minor micro") -version_info = VersionInfo(major="2023", minor="10", micro="0") +VersionInfo = namedtuple('VersionInfo', 'major minor micro') +version_info = VersionInfo(major='2023', minor='10', micro='1') diff --git a/src/cpl_core/environment/__init__.py b/src/cpl_core/environment/__init__.py index ebac8b19..1c45d8c0 100644 --- a/src/cpl_core/environment/__init__.py +++ b/src/cpl_core/environment/__init__.py @@ -11,11 +11,11 @@ CPL core package """ -__title__ = "cpl_core.environment" -__author__ = "Sven Heidemann" -__license__ = "MIT" -__copyright__ = "Copyright (c) 2020 - 2023 sh-edraft.de" -__version__ = "2023.10.0" +__title__ = 'cpl_core.environment' +__author__ = 'Sven Heidemann' +__license__ = 'MIT' +__copyright__ = 'Copyright (c) 2020 - 2023 sh-edraft.de' +__version__ = '2023.10.1' from collections import namedtuple @@ -25,5 +25,5 @@ from .application_environment_abc import ApplicationEnvironmentABC from .environment_name_enum import EnvironmentNameEnum from .application_environment import ApplicationEnvironment -VersionInfo = namedtuple("VersionInfo", "major minor micro") -version_info = VersionInfo(major="2023", minor="10", micro="0") +VersionInfo = namedtuple('VersionInfo', 'major minor micro') +version_info = VersionInfo(major='2023', minor='10', micro='1') diff --git a/src/cpl_core/logging/__init__.py b/src/cpl_core/logging/__init__.py index dac21e04..82dcde55 100644 --- a/src/cpl_core/logging/__init__.py +++ b/src/cpl_core/logging/__init__.py @@ -11,11 +11,11 @@ CPL core package """ -__title__ = "cpl_core.logging" -__author__ = "Sven Heidemann" -__license__ = "MIT" -__copyright__ = "Copyright (c) 2020 - 2023 sh-edraft.de" -__version__ = "2023.10.0" +__title__ = 'cpl_core.logging' +__author__ = 'Sven Heidemann' +__license__ = 'MIT' +__copyright__ = 'Copyright (c) 2020 - 2023 sh-edraft.de' +__version__ = '2023.10.1' from collections import namedtuple @@ -27,5 +27,5 @@ from .logging_level_enum import LoggingLevelEnum from .logging_settings import LoggingSettings from .logging_settings_name_enum import LoggingSettingsNameEnum -VersionInfo = namedtuple("VersionInfo", "major minor micro") -version_info = VersionInfo(major="2023", minor="10", micro="0") +VersionInfo = namedtuple('VersionInfo', 'major minor micro') +version_info = VersionInfo(major='2023', minor='10', micro='1') diff --git a/src/cpl_core/mailing/__init__.py b/src/cpl_core/mailing/__init__.py index 6330d10f..b05601d8 100644 --- a/src/cpl_core/mailing/__init__.py +++ b/src/cpl_core/mailing/__init__.py @@ -11,11 +11,11 @@ CPL core package """ -__title__ = "cpl_core.mailing" -__author__ = "Sven Heidemann" -__license__ = "MIT" -__copyright__ = "Copyright (c) 2020 - 2023 sh-edraft.de" -__version__ = "2023.10.0" +__title__ = 'cpl_core.mailing' +__author__ = 'Sven Heidemann' +__license__ = 'MIT' +__copyright__ = 'Copyright (c) 2020 - 2023 sh-edraft.de' +__version__ = '2023.10.1' from collections import namedtuple @@ -27,5 +27,5 @@ from .email_client_abc import EMailClientABC 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="10", micro="0") +VersionInfo = namedtuple('VersionInfo', 'major minor micro') +version_info = VersionInfo(major='2023', minor='10', micro='1') diff --git a/src/cpl_core/pipes/__init__.py b/src/cpl_core/pipes/__init__.py index 969e85da..4ab2c213 100644 --- a/src/cpl_core/pipes/__init__.py +++ b/src/cpl_core/pipes/__init__.py @@ -11,11 +11,11 @@ CPL core package """ -__title__ = "cpl_core.pipes" -__author__ = "Sven Heidemann" -__license__ = "MIT" -__copyright__ = "Copyright (c) 2020 - 2023 sh-edraft.de" -__version__ = "2023.10.0" +__title__ = 'cpl_core.pipes' +__author__ = 'Sven Heidemann' +__license__ = 'MIT' +__copyright__ = 'Copyright (c) 2020 - 2023 sh-edraft.de' +__version__ = '2023.10.1' from collections import namedtuple @@ -25,5 +25,5 @@ from .bool_pipe import BoolPipe from .ip_address_pipe import IPAddressPipe from .pipe_abc import PipeABC -VersionInfo = namedtuple("VersionInfo", "major minor micro") -version_info = VersionInfo(major="2023", minor="10", micro="0") +VersionInfo = namedtuple('VersionInfo', 'major minor micro') +version_info = VersionInfo(major='2023', minor='10', micro='1') diff --git a/src/cpl_core/time/__init__.py b/src/cpl_core/time/__init__.py index 7c3bc16a..36c5fbb3 100644 --- a/src/cpl_core/time/__init__.py +++ b/src/cpl_core/time/__init__.py @@ -11,11 +11,11 @@ CPL core package """ -__title__ = "cpl_core.time" -__author__ = "Sven Heidemann" -__license__ = "MIT" -__copyright__ = "Copyright (c) 2020 - 2023 sh-edraft.de" -__version__ = "2023.10.0" +__title__ = 'cpl_core.time' +__author__ = 'Sven Heidemann' +__license__ = 'MIT' +__copyright__ = 'Copyright (c) 2020 - 2023 sh-edraft.de' +__version__ = '2023.10.1' from collections import namedtuple @@ -24,5 +24,5 @@ from collections import namedtuple 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="10", micro="0") +VersionInfo = namedtuple('VersionInfo', 'major minor micro') +version_info = VersionInfo(major='2023', minor='10', micro='1') diff --git a/src/cpl_core/utils/__init__.py b/src/cpl_core/utils/__init__.py index f418f34b..e9cfc8cc 100644 --- a/src/cpl_core/utils/__init__.py +++ b/src/cpl_core/utils/__init__.py @@ -11,11 +11,11 @@ CPL core package """ -__title__ = "cpl_core.utils" -__author__ = "Sven Heidemann" -__license__ = "MIT" -__copyright__ = "Copyright (c) 2020 - 2023 sh-edraft.de" -__version__ = "2023.10.0" +__title__ = 'cpl_core.utils' +__author__ = 'Sven Heidemann' +__license__ = 'MIT' +__copyright__ = 'Copyright (c) 2020 - 2023 sh-edraft.de' +__version__ = '2023.10.1' from collections import namedtuple @@ -25,5 +25,5 @@ from .credential_manager import CredentialManager from .string import String from .pip import Pip -VersionInfo = namedtuple("VersionInfo", "major minor micro") -version_info = VersionInfo(major="2023", minor="10", micro="0") +VersionInfo = namedtuple('VersionInfo', 'major minor micro') +version_info = VersionInfo(major='2023', minor='10', micro='1') -- 2.54.0 From cae2e6d92e130d10b096c20847f5dbca92051edd Mon Sep 17 00:00:00 2001 From: Sven Heidemann Date: Sat, 13 Jan 2024 14:26:36 +0100 Subject: [PATCH 26/29] Hopefully fixed db errors --- src/cpl_core/__init__.py | 16 ++++++++-------- src/cpl_core/application/__init__.py | 16 ++++++++-------- src/cpl_core/configuration/__init__.py | 16 ++++++++-------- src/cpl_core/console/__init__.py | 16 ++++++++-------- src/cpl_core/cpl-core.json | 4 ++-- src/cpl_core/database/__init__.py | 16 ++++++++-------- src/cpl_core/database/connection/__init__.py | 16 ++++++++-------- src/cpl_core/database/context/__init__.py | 16 ++++++++-------- .../database/context/database_context.py | 5 +---- src/cpl_core/dependency_injection/__init__.py | 16 ++++++++-------- src/cpl_core/environment/__init__.py | 16 ++++++++-------- src/cpl_core/logging/__init__.py | 16 ++++++++-------- src/cpl_core/mailing/__init__.py | 16 ++++++++-------- src/cpl_core/pipes/__init__.py | 16 ++++++++-------- src/cpl_core/time/__init__.py | 16 ++++++++-------- src/cpl_core/utils/__init__.py | 16 ++++++++-------- 16 files changed, 115 insertions(+), 118 deletions(-) diff --git a/src/cpl_core/__init__.py b/src/cpl_core/__init__.py index 14bfdc4e..9d5f2cf8 100644 --- a/src/cpl_core/__init__.py +++ b/src/cpl_core/__init__.py @@ -6,21 +6,21 @@ cpl-core CPL core CPL core package -:copyright: (c) 2020 - 2023 sh-edraft.de +:copyright: (c) 2020 - 2024 sh-edraft.de :license: MIT, see LICENSE for more details. """ -__title__ = 'cpl_core' -__author__ = 'Sven Heidemann' -__license__ = 'MIT' -__copyright__ = 'Copyright (c) 2020 - 2023 sh-edraft.de' -__version__ = '2023.10.1' +__title__ = "cpl_core" +__author__ = "Sven Heidemann" +__license__ = "MIT" +__copyright__ = "Copyright (c) 2020 - 2024 sh-edraft.de" +__version__ = "2023.10.2" from collections import namedtuple # imports: -VersionInfo = namedtuple('VersionInfo', 'major minor micro') -version_info = VersionInfo(major='2023', minor='10', micro='1') +VersionInfo = namedtuple("VersionInfo", "major minor micro") +version_info = VersionInfo(major="2023", minor="10", micro="2") diff --git a/src/cpl_core/application/__init__.py b/src/cpl_core/application/__init__.py index e71170a1..f690a158 100644 --- a/src/cpl_core/application/__init__.py +++ b/src/cpl_core/application/__init__.py @@ -6,16 +6,16 @@ cpl-core CPL core CPL core package -:copyright: (c) 2020 - 2023 sh-edraft.de +:copyright: (c) 2020 - 2024 sh-edraft.de :license: MIT, see LICENSE for more details. """ -__title__ = 'cpl_core.application' -__author__ = 'Sven Heidemann' -__license__ = 'MIT' -__copyright__ = 'Copyright (c) 2020 - 2023 sh-edraft.de' -__version__ = '2023.10.1' +__title__ = "cpl_core.application" +__author__ = "Sven Heidemann" +__license__ = "MIT" +__copyright__ = "Copyright (c) 2020 - 2024 sh-edraft.de" +__version__ = "2023.10.2" from collections import namedtuple @@ -28,5 +28,5 @@ from .application_extension_abc import ApplicationExtensionABC from .startup_abc import StartupABC from .startup_extension_abc import StartupExtensionABC -VersionInfo = namedtuple('VersionInfo', 'major minor micro') -version_info = VersionInfo(major='2023', minor='10', micro='1') +VersionInfo = namedtuple("VersionInfo", "major minor micro") +version_info = VersionInfo(major="2023", minor="10", micro="2") diff --git a/src/cpl_core/configuration/__init__.py b/src/cpl_core/configuration/__init__.py index 235bac61..fa6e3537 100644 --- a/src/cpl_core/configuration/__init__.py +++ b/src/cpl_core/configuration/__init__.py @@ -6,16 +6,16 @@ cpl-core CPL core CPL core package -:copyright: (c) 2020 - 2023 sh-edraft.de +:copyright: (c) 2020 - 2024 sh-edraft.de :license: MIT, see LICENSE for more details. """ -__title__ = 'cpl_core.configuration' -__author__ = 'Sven Heidemann' -__license__ = 'MIT' -__copyright__ = 'Copyright (c) 2020 - 2023 sh-edraft.de' -__version__ = '2023.10.1' +__title__ = "cpl_core.configuration" +__author__ = "Sven Heidemann" +__license__ = "MIT" +__copyright__ = "Copyright (c) 2020 - 2024 sh-edraft.de" +__version__ = "2023.10.2" from collections import namedtuple @@ -34,5 +34,5 @@ from .flag_argument import FlagArgument from .validator_abc import ValidatorABC from .variable_argument import VariableArgument -VersionInfo = namedtuple('VersionInfo', 'major minor micro') -version_info = VersionInfo(major='2023', minor='10', micro='1') +VersionInfo = namedtuple("VersionInfo", "major minor micro") +version_info = VersionInfo(major="2023", minor="10", micro="2") diff --git a/src/cpl_core/console/__init__.py b/src/cpl_core/console/__init__.py index aff04b94..8cb0063e 100644 --- a/src/cpl_core/console/__init__.py +++ b/src/cpl_core/console/__init__.py @@ -6,16 +6,16 @@ cpl-core CPL core CPL core package -:copyright: (c) 2020 - 2023 sh-edraft.de +:copyright: (c) 2020 - 2024 sh-edraft.de :license: MIT, see LICENSE for more details. """ -__title__ = 'cpl_core.console' -__author__ = 'Sven Heidemann' -__license__ = 'MIT' -__copyright__ = 'Copyright (c) 2020 - 2023 sh-edraft.de' -__version__ = '2023.10.1' +__title__ = "cpl_core.console" +__author__ = "Sven Heidemann" +__license__ = "MIT" +__copyright__ = "Copyright (c) 2020 - 2024 sh-edraft.de" +__version__ = "2023.10.2" from collections import namedtuple @@ -27,5 +27,5 @@ from .console_call import ConsoleCall from .foreground_color_enum import ForegroundColorEnum from .spinner_thread import SpinnerThread -VersionInfo = namedtuple('VersionInfo', 'major minor micro') -version_info = VersionInfo(major='2023', minor='10', micro='1') +VersionInfo = namedtuple("VersionInfo", "major minor micro") +version_info = VersionInfo(major="2023", minor="10", micro="2") diff --git a/src/cpl_core/cpl-core.json b/src/cpl_core/cpl-core.json index c54f904c..ccde4c04 100644 --- a/src/cpl_core/cpl-core.json +++ b/src/cpl_core/cpl-core.json @@ -4,14 +4,14 @@ "Version": { "Major": "2023", "Minor": "10", - "Micro": "1" + "Micro": "2" }, "Author": "Sven Heidemann", "AuthorEmail": "sven.heidemann@sh-edraft.de", "Description": "CPL core", "LongDescription": "CPL core package", "URL": "https://www.sh-edraft.de", - "CopyrightDate": "2020 - 2023", + "CopyrightDate": "2020 - 2024", "CopyrightName": "sh-edraft.de", "LicenseName": "MIT", "LicenseDescription": "MIT, see LICENSE for more details.", diff --git a/src/cpl_core/database/__init__.py b/src/cpl_core/database/__init__.py index b7d94ebc..443edffb 100644 --- a/src/cpl_core/database/__init__.py +++ b/src/cpl_core/database/__init__.py @@ -6,16 +6,16 @@ cpl-core CPL core CPL core package -:copyright: (c) 2020 - 2023 sh-edraft.de +:copyright: (c) 2020 - 2024 sh-edraft.de :license: MIT, see LICENSE for more details. """ -__title__ = 'cpl_core.database' -__author__ = 'Sven Heidemann' -__license__ = 'MIT' -__copyright__ = 'Copyright (c) 2020 - 2023 sh-edraft.de' -__version__ = '2023.10.1' +__title__ = "cpl_core.database" +__author__ = "Sven Heidemann" +__license__ = "MIT" +__copyright__ = "Copyright (c) 2020 - 2024 sh-edraft.de" +__version__ = "2023.10.2" from collections import namedtuple @@ -25,5 +25,5 @@ from .database_settings_name_enum import DatabaseSettingsNameEnum from .database_settings import DatabaseSettings from .table_abc import TableABC -VersionInfo = namedtuple('VersionInfo', 'major minor micro') -version_info = VersionInfo(major='2023', minor='10', micro='1') +VersionInfo = namedtuple("VersionInfo", "major minor micro") +version_info = VersionInfo(major="2023", minor="10", micro="2") diff --git a/src/cpl_core/database/connection/__init__.py b/src/cpl_core/database/connection/__init__.py index 8a2232b9..919d3569 100644 --- a/src/cpl_core/database/connection/__init__.py +++ b/src/cpl_core/database/connection/__init__.py @@ -6,16 +6,16 @@ cpl-core CPL core CPL core package -:copyright: (c) 2020 - 2023 sh-edraft.de +:copyright: (c) 2020 - 2024 sh-edraft.de :license: MIT, see LICENSE for more details. """ -__title__ = 'cpl_core.database.connection' -__author__ = 'Sven Heidemann' -__license__ = 'MIT' -__copyright__ = 'Copyright (c) 2020 - 2023 sh-edraft.de' -__version__ = '2023.10.1' +__title__ = "cpl_core.database.connection" +__author__ = "Sven Heidemann" +__license__ = "MIT" +__copyright__ = "Copyright (c) 2020 - 2024 sh-edraft.de" +__version__ = "2023.10.2" from collections import namedtuple @@ -24,5 +24,5 @@ from collections import namedtuple from .database_connection import DatabaseConnection from .database_connection_abc import DatabaseConnectionABC -VersionInfo = namedtuple('VersionInfo', 'major minor micro') -version_info = VersionInfo(major='2023', minor='10', micro='1') +VersionInfo = namedtuple("VersionInfo", "major minor micro") +version_info = VersionInfo(major="2023", minor="10", micro="2") diff --git a/src/cpl_core/database/context/__init__.py b/src/cpl_core/database/context/__init__.py index ac8ea4b6..c810f41f 100644 --- a/src/cpl_core/database/context/__init__.py +++ b/src/cpl_core/database/context/__init__.py @@ -6,16 +6,16 @@ cpl-core CPL core CPL core package -:copyright: (c) 2020 - 2023 sh-edraft.de +:copyright: (c) 2020 - 2024 sh-edraft.de :license: MIT, see LICENSE for more details. """ -__title__ = 'cpl_core.database.context' -__author__ = 'Sven Heidemann' -__license__ = 'MIT' -__copyright__ = 'Copyright (c) 2020 - 2023 sh-edraft.de' -__version__ = '2023.10.1' +__title__ = "cpl_core.database.context" +__author__ = "Sven Heidemann" +__license__ = "MIT" +__copyright__ = "Copyright (c) 2020 - 2024 sh-edraft.de" +__version__ = "2023.10.2" from collections import namedtuple @@ -24,5 +24,5 @@ from collections import namedtuple from .database_context import DatabaseContext from .database_context_abc import DatabaseContextABC -VersionInfo = namedtuple('VersionInfo', 'major minor micro') -version_info = VersionInfo(major='2023', minor='10', micro='1') +VersionInfo = namedtuple("VersionInfo", "major minor micro") +version_info = VersionInfo(major="2023", minor="10", micro="2") diff --git a/src/cpl_core/database/context/database_context.py b/src/cpl_core/database/context/database_context.py index 809d206b..ce2a3e4e 100644 --- a/src/cpl_core/database/context/database_context.py +++ b/src/cpl_core/database/context/database_context.py @@ -21,7 +21,6 @@ class DatabaseContext(DatabaseContextABC): DatabaseContextABC.__init__(self) self._db: DatabaseConnectionABC = DatabaseConnection() - self._tables: list[TableABC] = TableABC.__subclasses__() self._settings: Optional[DatabaseSettings] = None @property @@ -32,7 +31,7 @@ class DatabaseContext(DatabaseContextABC): def _ping_and_reconnect(self): try: self._db.server.ping(reconnect=True, attempts=3, delay=5) - except mysql.connector.Error as err: + except Exception as err: # reconnect your cursor as you did in __init__ or wherever if self._settings is None: raise Exception("Call DatabaseContext.connect first") @@ -42,8 +41,6 @@ class DatabaseContext(DatabaseContextABC): if self._settings is None: self._settings = database_settings self._db.connect(database_settings) - for table in self._tables: - self._db.cursor.execute(table.get_create_string()) self.save_changes() diff --git a/src/cpl_core/dependency_injection/__init__.py b/src/cpl_core/dependency_injection/__init__.py index ef3f36fa..eab92e4e 100644 --- a/src/cpl_core/dependency_injection/__init__.py +++ b/src/cpl_core/dependency_injection/__init__.py @@ -6,16 +6,16 @@ cpl-core CPL core CPL core package -:copyright: (c) 2020 - 2023 sh-edraft.de +:copyright: (c) 2020 - 2024 sh-edraft.de :license: MIT, see LICENSE for more details. """ -__title__ = 'cpl_core.dependency_injection' -__author__ = 'Sven Heidemann' -__license__ = 'MIT' -__copyright__ = 'Copyright (c) 2020 - 2023 sh-edraft.de' -__version__ = '2023.10.1' +__title__ = "cpl_core.dependency_injection" +__author__ = "Sven Heidemann" +__license__ = "MIT" +__copyright__ = "Copyright (c) 2020 - 2024 sh-edraft.de" +__version__ = "2023.10.2" from collections import namedtuple @@ -30,5 +30,5 @@ from .service_lifetime_enum import ServiceLifetimeEnum from .service_provider import ServiceProvider from .service_provider_abc import ServiceProviderABC -VersionInfo = namedtuple('VersionInfo', 'major minor micro') -version_info = VersionInfo(major='2023', minor='10', micro='1') +VersionInfo = namedtuple("VersionInfo", "major minor micro") +version_info = VersionInfo(major="2023", minor="10", micro="2") diff --git a/src/cpl_core/environment/__init__.py b/src/cpl_core/environment/__init__.py index 1c45d8c0..e1ef090a 100644 --- a/src/cpl_core/environment/__init__.py +++ b/src/cpl_core/environment/__init__.py @@ -6,16 +6,16 @@ cpl-core CPL core CPL core package -:copyright: (c) 2020 - 2023 sh-edraft.de +:copyright: (c) 2020 - 2024 sh-edraft.de :license: MIT, see LICENSE for more details. """ -__title__ = 'cpl_core.environment' -__author__ = 'Sven Heidemann' -__license__ = 'MIT' -__copyright__ = 'Copyright (c) 2020 - 2023 sh-edraft.de' -__version__ = '2023.10.1' +__title__ = "cpl_core.environment" +__author__ = "Sven Heidemann" +__license__ = "MIT" +__copyright__ = "Copyright (c) 2020 - 2024 sh-edraft.de" +__version__ = "2023.10.2" from collections import namedtuple @@ -25,5 +25,5 @@ from .application_environment_abc import ApplicationEnvironmentABC from .environment_name_enum import EnvironmentNameEnum from .application_environment import ApplicationEnvironment -VersionInfo = namedtuple('VersionInfo', 'major minor micro') -version_info = VersionInfo(major='2023', minor='10', micro='1') +VersionInfo = namedtuple("VersionInfo", "major minor micro") +version_info = VersionInfo(major="2023", minor="10", micro="2") diff --git a/src/cpl_core/logging/__init__.py b/src/cpl_core/logging/__init__.py index 82dcde55..f28f1707 100644 --- a/src/cpl_core/logging/__init__.py +++ b/src/cpl_core/logging/__init__.py @@ -6,16 +6,16 @@ cpl-core CPL core CPL core package -:copyright: (c) 2020 - 2023 sh-edraft.de +:copyright: (c) 2020 - 2024 sh-edraft.de :license: MIT, see LICENSE for more details. """ -__title__ = 'cpl_core.logging' -__author__ = 'Sven Heidemann' -__license__ = 'MIT' -__copyright__ = 'Copyright (c) 2020 - 2023 sh-edraft.de' -__version__ = '2023.10.1' +__title__ = "cpl_core.logging" +__author__ = "Sven Heidemann" +__license__ = "MIT" +__copyright__ = "Copyright (c) 2020 - 2024 sh-edraft.de" +__version__ = "2023.10.2" from collections import namedtuple @@ -27,5 +27,5 @@ from .logging_level_enum import LoggingLevelEnum from .logging_settings import LoggingSettings from .logging_settings_name_enum import LoggingSettingsNameEnum -VersionInfo = namedtuple('VersionInfo', 'major minor micro') -version_info = VersionInfo(major='2023', minor='10', micro='1') +VersionInfo = namedtuple("VersionInfo", "major minor micro") +version_info = VersionInfo(major="2023", minor="10", micro="2") diff --git a/src/cpl_core/mailing/__init__.py b/src/cpl_core/mailing/__init__.py index b05601d8..f60b502e 100644 --- a/src/cpl_core/mailing/__init__.py +++ b/src/cpl_core/mailing/__init__.py @@ -6,16 +6,16 @@ cpl-core CPL core CPL core package -:copyright: (c) 2020 - 2023 sh-edraft.de +:copyright: (c) 2020 - 2024 sh-edraft.de :license: MIT, see LICENSE for more details. """ -__title__ = 'cpl_core.mailing' -__author__ = 'Sven Heidemann' -__license__ = 'MIT' -__copyright__ = 'Copyright (c) 2020 - 2023 sh-edraft.de' -__version__ = '2023.10.1' +__title__ = "cpl_core.mailing" +__author__ = "Sven Heidemann" +__license__ = "MIT" +__copyright__ = "Copyright (c) 2020 - 2024 sh-edraft.de" +__version__ = "2023.10.2" from collections import namedtuple @@ -27,5 +27,5 @@ from .email_client_abc import EMailClientABC 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='10', micro='1') +VersionInfo = namedtuple("VersionInfo", "major minor micro") +version_info = VersionInfo(major="2023", minor="10", micro="2") diff --git a/src/cpl_core/pipes/__init__.py b/src/cpl_core/pipes/__init__.py index 4ab2c213..3f3f90ef 100644 --- a/src/cpl_core/pipes/__init__.py +++ b/src/cpl_core/pipes/__init__.py @@ -6,16 +6,16 @@ cpl-core CPL core CPL core package -:copyright: (c) 2020 - 2023 sh-edraft.de +:copyright: (c) 2020 - 2024 sh-edraft.de :license: MIT, see LICENSE for more details. """ -__title__ = 'cpl_core.pipes' -__author__ = 'Sven Heidemann' -__license__ = 'MIT' -__copyright__ = 'Copyright (c) 2020 - 2023 sh-edraft.de' -__version__ = '2023.10.1' +__title__ = "cpl_core.pipes" +__author__ = "Sven Heidemann" +__license__ = "MIT" +__copyright__ = "Copyright (c) 2020 - 2024 sh-edraft.de" +__version__ = "2023.10.2" from collections import namedtuple @@ -25,5 +25,5 @@ from .bool_pipe import BoolPipe from .ip_address_pipe import IPAddressPipe from .pipe_abc import PipeABC -VersionInfo = namedtuple('VersionInfo', 'major minor micro') -version_info = VersionInfo(major='2023', minor='10', micro='1') +VersionInfo = namedtuple("VersionInfo", "major minor micro") +version_info = VersionInfo(major="2023", minor="10", micro="2") diff --git a/src/cpl_core/time/__init__.py b/src/cpl_core/time/__init__.py index 36c5fbb3..6dde12a8 100644 --- a/src/cpl_core/time/__init__.py +++ b/src/cpl_core/time/__init__.py @@ -6,16 +6,16 @@ cpl-core CPL core CPL core package -:copyright: (c) 2020 - 2023 sh-edraft.de +:copyright: (c) 2020 - 2024 sh-edraft.de :license: MIT, see LICENSE for more details. """ -__title__ = 'cpl_core.time' -__author__ = 'Sven Heidemann' -__license__ = 'MIT' -__copyright__ = 'Copyright (c) 2020 - 2023 sh-edraft.de' -__version__ = '2023.10.1' +__title__ = "cpl_core.time" +__author__ = "Sven Heidemann" +__license__ = "MIT" +__copyright__ = "Copyright (c) 2020 - 2024 sh-edraft.de" +__version__ = "2023.10.2" from collections import namedtuple @@ -24,5 +24,5 @@ from collections import namedtuple 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='10', micro='1') +VersionInfo = namedtuple("VersionInfo", "major minor micro") +version_info = VersionInfo(major="2023", minor="10", micro="2") diff --git a/src/cpl_core/utils/__init__.py b/src/cpl_core/utils/__init__.py index e9cfc8cc..118a8f7b 100644 --- a/src/cpl_core/utils/__init__.py +++ b/src/cpl_core/utils/__init__.py @@ -6,16 +6,16 @@ cpl-core CPL core CPL core package -:copyright: (c) 2020 - 2023 sh-edraft.de +:copyright: (c) 2020 - 2024 sh-edraft.de :license: MIT, see LICENSE for more details. """ -__title__ = 'cpl_core.utils' -__author__ = 'Sven Heidemann' -__license__ = 'MIT' -__copyright__ = 'Copyright (c) 2020 - 2023 sh-edraft.de' -__version__ = '2023.10.1' +__title__ = "cpl_core.utils" +__author__ = "Sven Heidemann" +__license__ = "MIT" +__copyright__ = "Copyright (c) 2020 - 2024 sh-edraft.de" +__version__ = "2023.10.2" from collections import namedtuple @@ -25,5 +25,5 @@ from .credential_manager import CredentialManager from .string import String from .pip import Pip -VersionInfo = namedtuple('VersionInfo', 'major minor micro') -version_info = VersionInfo(major='2023', minor='10', micro='1') +VersionInfo = namedtuple("VersionInfo", "major minor micro") +version_info = VersionInfo(major="2023", minor="10", micro="2") -- 2.54.0 From c3d51e29fc6c6b1e7bd6c0ef89c589b1c46a298a Mon Sep 17 00:00:00 2001 From: Sven Heidemann Date: Thu, 25 Jul 2024 17:32:11 +0200 Subject: [PATCH 27/29] Set version --- cpl-workspace.json | 1 + src/cpl_cli/.cpl/__init__.py | 8 +++---- src/cpl_cli/__init__.py | 8 +++---- src/cpl_cli/_templates/__init__.py | 8 +++---- src/cpl_cli/_templates/build/__init__.py | 16 ++++++------- src/cpl_cli/_templates/build/init_template.py | 14 +++++------ src/cpl_cli/_templates/publish/__init__.py | 8 +++---- src/cpl_cli/abc/__init__.py | 8 +++---- src/cpl_cli/command/__init__.py | 8 +++---- src/cpl_cli/configuration/__init__.py | 8 +++---- src/cpl_cli/cpl-cli.json | 10 ++++---- src/cpl_cli/helper/__init__.py | 8 +++---- src/cpl_cli/live_server/__init__.py | 8 +++---- src/cpl_cli/main.py | 10 ++++---- src/cpl_cli/migrations/__init__.py | 8 +++---- src/cpl_cli/migrations/base/__init__.py | 8 +++---- src/cpl_cli/migrations/service/__init__.py | 8 +++---- src/cpl_cli/publish/__init__.py | 8 +++---- src/cpl_cli/source_creator/__init__.py | 8 +++---- src/cpl_cli/startup_argument_extension.py | 11 +++++++++ src/cpl_cli/validators/__init__.py | 8 +++---- 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 | 2 +- src/cpl_core/console/__init__.py | 4 ++-- src/cpl_core/cpl-core.json | 24 +++++++++---------- 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 ++-- .../custom/general/src/general/application.py | 2 +- 38 files changed, 138 insertions(+), 128 deletions(-) diff --git a/cpl-workspace.json b/cpl-workspace.json index e00ea987..537b7e3b 100644 --- a/cpl-workspace.json +++ b/cpl-workspace.json @@ -7,6 +7,7 @@ "cpl-discord": "src/cpl_discord/cpl-discord.json", "cpl-query": "src/cpl_query/cpl-query.json", "cpl-translation": "src/cpl_translation/cpl-translation.json", + "cpl-bundle": "src/cpl_bundle/cpl-bundle.json", "set-version": "tools/set_version/set-version.json", "set-pip-urls": "tools/set_pip_urls/set-pip-urls.json", "unittests": "unittests/unittests/unittests.json", diff --git a/src/cpl_cli/.cpl/__init__.py b/src/cpl_cli/.cpl/__init__.py index b6c6f5f8..efbc86c5 100644 --- a/src/cpl_cli/.cpl/__init__.py +++ b/src/cpl_cli/.cpl/__init__.py @@ -6,7 +6,7 @@ cpl-cli CPL CLI CPL Command Line Interface -:copyright: (c) 2020 - 2023 sh-edraft.de +:copyright: (c) 2020 - 2024 sh-edraft.de :license: MIT, see LICENSE for more details. """ @@ -14,8 +14,8 @@ CPL Command Line Interface __title__ = "cpl_cli" __author__ = "Sven Heidemann" __license__ = "MIT" -__copyright__ = "Copyright (c) 2020 - 2023 sh-edraft.de" -__version__ = "2023.4.0.post3" +__copyright__ = "Copyright (c) 2020 - 2024 sh-edraft.de" +__version__ = "2024.10.0" 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="2024", minor="10", micro="0") diff --git a/src/cpl_cli/__init__.py b/src/cpl_cli/__init__.py index d5bbcd37..4333080a 100644 --- a/src/cpl_cli/__init__.py +++ b/src/cpl_cli/__init__.py @@ -6,7 +6,7 @@ cpl-cli CPL CLI CPL Command Line Interface -:copyright: (c) 2020 - 2023 sh-edraft.de +:copyright: (c) 2020 - 2024 sh-edraft.de :license: MIT, see LICENSE for more details. """ @@ -14,8 +14,8 @@ CPL Command Line Interface __title__ = "cpl_cli" __author__ = "Sven Heidemann" __license__ = "MIT" -__copyright__ = "Copyright (c) 2020 - 2023 sh-edraft.de" -__version__ = "2023.4.0.post3" +__copyright__ = "Copyright (c) 2020 - 2024 sh-edraft.de" +__version__ = "2024.10.0" 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.post3") +version_info = VersionInfo(major="2024", minor="10", micro="0") diff --git a/src/cpl_cli/_templates/__init__.py b/src/cpl_cli/_templates/__init__.py index b671d25b..1641e9f8 100644 --- a/src/cpl_cli/_templates/__init__.py +++ b/src/cpl_cli/_templates/__init__.py @@ -6,7 +6,7 @@ cpl-cli CPL CLI CPL Command Line Interface -:copyright: (c) 2020 - 2023 sh-edraft.de +:copyright: (c) 2020 - 2024 sh-edraft.de :license: MIT, see LICENSE for more details. """ @@ -14,8 +14,8 @@ CPL Command Line Interface __title__ = "cpl_cli._templates" __author__ = "Sven Heidemann" __license__ = "MIT" -__copyright__ = "Copyright (c) 2020 - 2023 sh-edraft.de" -__version__ = "2023.4.0.post3" +__copyright__ = "Copyright (c) 2020 - 2024 sh-edraft.de" +__version__ = "2024.10.0" 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="2024", minor="10", micro="0") diff --git a/src/cpl_cli/_templates/build/__init__.py b/src/cpl_cli/_templates/build/__init__.py index f8dc727c..cb014c59 100644 --- a/src/cpl_cli/_templates/build/__init__.py +++ b/src/cpl_cli/_templates/build/__init__.py @@ -6,21 +6,21 @@ cpl-cli CPL CLI CPL Command Line Interface -:copyright: (c) 2020 - 2023 sh-edraft.de +:copyright: (c) 2020 - 2024 sh-edraft.de :license: MIT, see LICENSE for more details. """ -__title__ = 'cpl_cli._templates.build' -__author__ = 'Sven Heidemann' -__license__ = 'MIT' -__copyright__ = 'Copyright (c) 2020 - 2023 sh-edraft.de' -__version__ = '2023.4.0.post3' +__title__ = "cpl_cli._templates.build" +__author__ = "Sven Heidemann" +__license__ = "MIT" +__copyright__ = "Copyright (c) 2020 - 2024 sh-edraft.de" +__version__ = "2024.10.0" from collections import namedtuple # imports: -VersionInfo = namedtuple('VersionInfo', 'major minor micro') -version_info = VersionInfo(major='2023', minor='4', micro='0.post3') +VersionInfo = namedtuple("VersionInfo", "major minor micro") +version_info = VersionInfo(major="2024", minor="10", micro="0") diff --git a/src/cpl_cli/_templates/build/init_template.py b/src/cpl_cli/_templates/build/init_template.py index 0529cb67..7cd24ca7 100644 --- a/src/cpl_cli/_templates/build/init_template.py +++ b/src/cpl_cli/_templates/build/init_template.py @@ -19,19 +19,19 @@ class InitTemplate: \"\"\" - __title__ = '$Title' - __author__ = '$Author' - __license__ = '$LicenseName' - __copyright__ = 'Copyright (c) $CopyrightDate $CopyrightName' - __version__ = '$Version' + __title__ = "$Title" + __author__ = "$Author" + __license__ = "$LicenseName" + __copyright__ = "Copyright (c) $CopyrightDate $CopyrightName" + __version__ = "$Version" from collections import namedtuple $Imports - VersionInfo = namedtuple('VersionInfo', 'major minor micro') - version_info = VersionInfo(major='$Major', minor='$Minor', micro='$Micro') + VersionInfo = namedtuple("VersionInfo", "major minor micro") + version_info = VersionInfo(major="$Major", minor="$Minor", micro="$Micro") """ ) diff --git a/src/cpl_cli/_templates/publish/__init__.py b/src/cpl_cli/_templates/publish/__init__.py index 41a9788e..1a4155df 100644 --- a/src/cpl_cli/_templates/publish/__init__.py +++ b/src/cpl_cli/_templates/publish/__init__.py @@ -6,7 +6,7 @@ cpl-cli CPL CLI CPL Command Line Interface -:copyright: (c) 2020 - 2023 sh-edraft.de +:copyright: (c) 2020 - 2024 sh-edraft.de :license: MIT, see LICENSE for more details. """ @@ -14,8 +14,8 @@ CPL Command Line Interface __title__ = "cpl_cli._templates.publish" __author__ = "Sven Heidemann" __license__ = "MIT" -__copyright__ = "Copyright (c) 2020 - 2023 sh-edraft.de" -__version__ = "2023.4.0.post3" +__copyright__ = "Copyright (c) 2020 - 2024 sh-edraft.de" +__version__ = "2024.10.0" 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="2024", minor="10", micro="0") diff --git a/src/cpl_cli/abc/__init__.py b/src/cpl_cli/abc/__init__.py index 6ff59c01..d42b0233 100644 --- a/src/cpl_cli/abc/__init__.py +++ b/src/cpl_cli/abc/__init__.py @@ -6,7 +6,7 @@ cpl-cli CPL CLI CPL Command Line Interface -:copyright: (c) 2020 - 2023 sh-edraft.de +:copyright: (c) 2020 - 2024 sh-edraft.de :license: MIT, see LICENSE for more details. """ @@ -14,8 +14,8 @@ CPL Command Line Interface __title__ = "cpl_cli.abc" __author__ = "Sven Heidemann" __license__ = "MIT" -__copyright__ = "Copyright (c) 2020 - 2023 sh-edraft.de" -__version__ = "2023.4.0.post3" +__copyright__ = "Copyright (c) 2020 - 2024 sh-edraft.de" +__version__ = "2024.10.0" 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="2024", minor="10", micro="0") diff --git a/src/cpl_cli/command/__init__.py b/src/cpl_cli/command/__init__.py index eab08d85..3bde029f 100644 --- a/src/cpl_cli/command/__init__.py +++ b/src/cpl_cli/command/__init__.py @@ -6,7 +6,7 @@ cpl-cli CPL CLI CPL Command Line Interface -:copyright: (c) 2020 - 2023 sh-edraft.de +:copyright: (c) 2020 - 2024 sh-edraft.de :license: MIT, see LICENSE for more details. """ @@ -14,8 +14,8 @@ CPL Command Line Interface __title__ = "cpl_cli.command" __author__ = "Sven Heidemann" __license__ = "MIT" -__copyright__ = "Copyright (c) 2020 - 2023 sh-edraft.de" -__version__ = "2023.4.0.post3" +__copyright__ = "Copyright (c) 2020 - 2024 sh-edraft.de" +__version__ = "2024.10.0" 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.post3") +version_info = VersionInfo(major="2024", minor="10", micro="0") diff --git a/src/cpl_cli/configuration/__init__.py b/src/cpl_cli/configuration/__init__.py index 86097d9c..ba679b35 100644 --- a/src/cpl_cli/configuration/__init__.py +++ b/src/cpl_cli/configuration/__init__.py @@ -6,7 +6,7 @@ cpl-cli CPL CLI CPL Command Line Interface -:copyright: (c) 2020 - 2023 sh-edraft.de +:copyright: (c) 2020 - 2024 sh-edraft.de :license: MIT, see LICENSE for more details. """ @@ -14,8 +14,8 @@ CPL Command Line Interface __title__ = "cpl_cli.configuration" __author__ = "Sven Heidemann" __license__ = "MIT" -__copyright__ = "Copyright (c) 2020 - 2023 sh-edraft.de" -__version__ = "2023.4.0.post3" +__copyright__ = "Copyright (c) 2020 - 2024 sh-edraft.de" +__version__ = "2024.10.0" 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.post3") +version_info = VersionInfo(major="2024", minor="10", micro="0") diff --git a/src/cpl_cli/cpl-cli.json b/src/cpl_cli/cpl-cli.json index c3047753..16f8b4ea 100644 --- a/src/cpl_cli/cpl-cli.json +++ b/src/cpl_cli/cpl-cli.json @@ -2,16 +2,16 @@ "ProjectSettings": { "Name": "cpl-cli", "Version": { - "Major": "2023", - "Minor": "4", - "Micro": "0.post3" + "Major": "2024", + "Minor": "10", + "Micro": "0" }, "Author": "Sven Heidemann", "AuthorEmail": "sven.heidemann@sh-edraft.de", "Description": "CPL CLI", "LongDescription": "CPL Command Line Interface", "URL": "https://www.sh-edraft.de", - "CopyrightDate": "2020 - 2023", + "CopyrightDate": "2020 - 2024", "CopyrightName": "sh-edraft.de", "LicenseName": "MIT", "LicenseDescription": "MIT, see LICENSE for more details.", @@ -19,7 +19,7 @@ "cpl-core>=2023.4.0" ], "DevDependencies": [], - "PythonVersion": ">=3.10", + "PythonVersion": ">=3.12", "PythonPath": { "linux": "../../venv" }, diff --git a/src/cpl_cli/helper/__init__.py b/src/cpl_cli/helper/__init__.py index b62b948f..1bd8e9a9 100644 --- a/src/cpl_cli/helper/__init__.py +++ b/src/cpl_cli/helper/__init__.py @@ -6,7 +6,7 @@ cpl-cli CPL CLI CPL Command Line Interface -:copyright: (c) 2020 - 2023 sh-edraft.de +:copyright: (c) 2020 - 2024 sh-edraft.de :license: MIT, see LICENSE for more details. """ @@ -14,8 +14,8 @@ CPL Command Line Interface __title__ = "cpl_cli.helper" __author__ = "Sven Heidemann" __license__ = "MIT" -__copyright__ = "Copyright (c) 2020 - 2023 sh-edraft.de" -__version__ = "2023.4.0.post3" +__copyright__ = "Copyright (c) 2020 - 2024 sh-edraft.de" +__version__ = "2024.10.0" 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="2024", minor="10", micro="0") diff --git a/src/cpl_cli/live_server/__init__.py b/src/cpl_cli/live_server/__init__.py index d7b99eac..1f64e6af 100644 --- a/src/cpl_cli/live_server/__init__.py +++ b/src/cpl_cli/live_server/__init__.py @@ -6,7 +6,7 @@ cpl-cli CPL CLI CPL Command Line Interface -:copyright: (c) 2020 - 2023 sh-edraft.de +:copyright: (c) 2020 - 2024 sh-edraft.de :license: MIT, see LICENSE for more details. """ @@ -14,8 +14,8 @@ CPL Command Line Interface __title__ = "cpl_cli.live_server" __author__ = "Sven Heidemann" __license__ = "MIT" -__copyright__ = "Copyright (c) 2020 - 2023 sh-edraft.de" -__version__ = "2023.4.0.post3" +__copyright__ = "Copyright (c) 2020 - 2024 sh-edraft.de" +__version__ = "2024.10.0" 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="2024", minor="10", micro="0") diff --git a/src/cpl_cli/main.py b/src/cpl_cli/main.py index f9c2bb83..4374caec 100644 --- a/src/cpl_cli/main.py +++ b/src/cpl_cli/main.py @@ -1,7 +1,6 @@ +import importlib.metadata from typing import Type -import pkg_resources - from cpl_cli.cli import CLI from cpl_cli.startup import Startup from cpl_cli.startup_argument_extension import StartupArgumentExtension @@ -16,13 +15,12 @@ def get_startup_extensions() -> list[Type[StartupExtensionABC]]: blacklisted_packages = ["cpl-cli"] startup_extensions = [] - installed_packages = pkg_resources.working_set + installed_packages = importlib.metadata.distributions() for p in installed_packages: - package = str(p).split(" ")[0] - if not package.startswith("cpl-") or package in blacklisted_packages: + if not p.name.startswith("cpl-") or p.name in blacklisted_packages: continue - package = package.replace("-", "_") + package = p.name.replace("-", "_") loaded_package = __import__(package) if "__cli_startup_extension__" not in dir(loaded_package): continue diff --git a/src/cpl_cli/migrations/__init__.py b/src/cpl_cli/migrations/__init__.py index e73ea308..7749078a 100644 --- a/src/cpl_cli/migrations/__init__.py +++ b/src/cpl_cli/migrations/__init__.py @@ -6,7 +6,7 @@ cpl-cli CPL CLI CPL Command Line Interface -:copyright: (c) 2020 - 2023 sh-edraft.de +:copyright: (c) 2020 - 2024 sh-edraft.de :license: MIT, see LICENSE for more details. """ @@ -14,8 +14,8 @@ CPL Command Line Interface __title__ = "cpl_cli.migrations" __author__ = "Sven Heidemann" __license__ = "MIT" -__copyright__ = "Copyright (c) 2020 - 2023 sh-edraft.de" -__version__ = "2023.4.0.post3" +__copyright__ = "Copyright (c) 2020 - 2024 sh-edraft.de" +__version__ = "2024.10.0" 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="2024", minor="10", micro="0") diff --git a/src/cpl_cli/migrations/base/__init__.py b/src/cpl_cli/migrations/base/__init__.py index ce731b48..b93bbf1b 100644 --- a/src/cpl_cli/migrations/base/__init__.py +++ b/src/cpl_cli/migrations/base/__init__.py @@ -6,7 +6,7 @@ cpl-cli CPL CLI CPL Command Line Interface -:copyright: (c) 2020 - 2023 sh-edraft.de +:copyright: (c) 2020 - 2024 sh-edraft.de :license: MIT, see LICENSE for more details. """ @@ -14,8 +14,8 @@ CPL Command Line Interface __title__ = "cpl_cli.migrations.base" __author__ = "Sven Heidemann" __license__ = "MIT" -__copyright__ = "Copyright (c) 2020 - 2023 sh-edraft.de" -__version__ = "2023.4.0.post3" +__copyright__ = "Copyright (c) 2020 - 2024 sh-edraft.de" +__version__ = "2024.10.0" 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="2024", minor="10", micro="0") diff --git a/src/cpl_cli/migrations/service/__init__.py b/src/cpl_cli/migrations/service/__init__.py index 5f1d228c..51ba1ed3 100644 --- a/src/cpl_cli/migrations/service/__init__.py +++ b/src/cpl_cli/migrations/service/__init__.py @@ -6,7 +6,7 @@ cpl-cli CPL CLI CPL Command Line Interface -:copyright: (c) 2020 - 2023 sh-edraft.de +:copyright: (c) 2020 - 2024 sh-edraft.de :license: MIT, see LICENSE for more details. """ @@ -14,8 +14,8 @@ CPL Command Line Interface __title__ = "cpl_cli.migrations.service" __author__ = "Sven Heidemann" __license__ = "MIT" -__copyright__ = "Copyright (c) 2020 - 2023 sh-edraft.de" -__version__ = "2023.4.0.post3" +__copyright__ = "Copyright (c) 2020 - 2024 sh-edraft.de" +__version__ = "2024.10.0" 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="2024", minor="10", micro="0") diff --git a/src/cpl_cli/publish/__init__.py b/src/cpl_cli/publish/__init__.py index 65d31499..10d17087 100644 --- a/src/cpl_cli/publish/__init__.py +++ b/src/cpl_cli/publish/__init__.py @@ -6,7 +6,7 @@ cpl-cli CPL CLI CPL Command Line Interface -:copyright: (c) 2020 - 2023 sh-edraft.de +:copyright: (c) 2020 - 2024 sh-edraft.de :license: MIT, see LICENSE for more details. """ @@ -14,8 +14,8 @@ CPL Command Line Interface __title__ = "cpl_cli.publish" __author__ = "Sven Heidemann" __license__ = "MIT" -__copyright__ = "Copyright (c) 2020 - 2023 sh-edraft.de" -__version__ = "2023.4.0.post3" +__copyright__ = "Copyright (c) 2020 - 2024 sh-edraft.de" +__version__ = "2024.10.0" 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.post3") +version_info = VersionInfo(major="2024", minor="10", micro="0") diff --git a/src/cpl_cli/source_creator/__init__.py b/src/cpl_cli/source_creator/__init__.py index e9f5393b..d98351dc 100644 --- a/src/cpl_cli/source_creator/__init__.py +++ b/src/cpl_cli/source_creator/__init__.py @@ -6,7 +6,7 @@ cpl-cli CPL CLI CPL Command Line Interface -:copyright: (c) 2020 - 2023 sh-edraft.de +:copyright: (c) 2020 - 2024 sh-edraft.de :license: MIT, see LICENSE for more details. """ @@ -14,8 +14,8 @@ CPL Command Line Interface __title__ = "cpl_cli.source_creator" __author__ = "Sven Heidemann" __license__ = "MIT" -__copyright__ = "Copyright (c) 2020 - 2023 sh-edraft.de" -__version__ = "2023.4.0.post3" +__copyright__ = "Copyright (c) 2020 - 2024 sh-edraft.de" +__version__ = "2024.10.0" 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="2024", minor="10", micro="0") diff --git a/src/cpl_cli/startup_argument_extension.py b/src/cpl_cli/startup_argument_extension.py index 6ec54482..b86dc06d 100644 --- a/src/cpl_cli/startup_argument_extension.py +++ b/src/cpl_cli/startup_argument_extension.py @@ -28,10 +28,13 @@ class StartupArgumentExtension(StartupExtensionABC): config.create_console_argument( ArgumentTypeEnum.Executable, "", "add", ["a", "A"], AddService, True, validators=[WorkspaceValidator] ).add_console_argument(ArgumentTypeEnum.Flag, "--", "simulate", ["s", "S"]) + config.create_console_argument( ArgumentTypeEnum.Executable, "", "build", ["b", "B"], BuildService, True, validators=[ProjectValidator] ) + config.create_console_argument(ArgumentTypeEnum.Executable, "", "generate", ["g", "G"], GenerateService, True) + config.create_console_argument( ArgumentTypeEnum.Executable, "", "install", ["i", "I"], InstallService, True, validators=[ProjectValidator] ).add_console_argument(ArgumentTypeEnum.Flag, "--", "dev", ["d", "D"]).add_console_argument( @@ -45,6 +48,7 @@ class StartupArgumentExtension(StartupExtensionABC): ).add_console_argument( ArgumentTypeEnum.Flag, "--", "cpl-dev", ["cd", "CD"] ) + config.create_console_argument( ArgumentTypeEnum.Executable, "", "new", ["n", "N"], NewService, True ).add_console_argument(ArgumentTypeEnum.Flag, "--", "async", ["a", "A"]).add_console_argument( @@ -60,18 +64,23 @@ class StartupArgumentExtension(StartupExtensionABC): ).add_console_argument( ArgumentTypeEnum.Flag, "--", "base", ["b", "B"] ) + config.create_console_argument( ArgumentTypeEnum.Executable, "", "publish", ["p", "P"], PublishService, True, validators=[ProjectValidator] ) + config.create_console_argument( ArgumentTypeEnum.Executable, "", "remove", ["r", "R"], RemoveService, True, validators=[WorkspaceValidator] ).add_console_argument(ArgumentTypeEnum.Flag, "--", "simulate", ["s", "S"]) + config.create_console_argument( ArgumentTypeEnum.Executable, "", "run", [], RunService, True, validators=[ProjectValidator] ).add_console_argument(ArgumentTypeEnum.Flag, "--", "dev", ["d", "D"]) + config.create_console_argument( ArgumentTypeEnum.Executable, "", "start", ["s", "S"], StartService, True, validators=[ProjectValidator] ).add_console_argument(ArgumentTypeEnum.Flag, "--", "dev", ["d", "D"]) + config.create_console_argument( ArgumentTypeEnum.Executable, "", @@ -85,6 +94,7 @@ class StartupArgumentExtension(StartupExtensionABC): ).add_console_argument( ArgumentTypeEnum.Flag, "--", "simulate", ["s", "S"] ) + config.create_console_argument( ArgumentTypeEnum.Executable, "", "update", ["u", "U"], UpdateService, True, validators=[ProjectValidator] ).add_console_argument(ArgumentTypeEnum.Flag, "--", "simulate", ["s", "S"]).add_console_argument( @@ -94,6 +104,7 @@ class StartupArgumentExtension(StartupExtensionABC): ).add_console_argument( ArgumentTypeEnum.Flag, "--", "cpl-dev", ["cd", "CD"] ) + config.create_console_argument(ArgumentTypeEnum.Executable, "", "version", ["v", "V"], VersionService, True) config.for_each_argument(lambda a: a.add_console_argument(ArgumentTypeEnum.Flag, "--", "help", ["h", "H"])) diff --git a/src/cpl_cli/validators/__init__.py b/src/cpl_cli/validators/__init__.py index 93f62649..873d1881 100644 --- a/src/cpl_cli/validators/__init__.py +++ b/src/cpl_cli/validators/__init__.py @@ -6,7 +6,7 @@ cpl-cli CPL CLI CPL Command Line Interface -:copyright: (c) 2020 - 2023 sh-edraft.de +:copyright: (c) 2020 - 2024 sh-edraft.de :license: MIT, see LICENSE for more details. """ @@ -14,8 +14,8 @@ CPL Command Line Interface __title__ = "cpl_cli.validators" __author__ = "Sven Heidemann" __license__ = "MIT" -__copyright__ = "Copyright (c) 2020 - 2023 sh-edraft.de" -__version__ = "2023.4.0.post3" +__copyright__ = "Copyright (c) 2020 - 2024 sh-edraft.de" +__version__ = "2024.10.0" 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="2024", minor="10", micro="0") diff --git a/src/cpl_core/__init__.py b/src/cpl_core/__init__.py index 9d5f2cf8..062b60a5 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 - 2024 sh-edraft.de" -__version__ = "2023.10.2" +__version__ = "2024.6.0" 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="10", micro="2") +version_info = VersionInfo(major="2024", minor="6", micro="0") diff --git a/src/cpl_core/application/__init__.py b/src/cpl_core/application/__init__.py index f690a158..bddf35ab 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 - 2024 sh-edraft.de" -__version__ = "2023.10.2" +__version__ = "2024.6.0" 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="10", micro="2") +version_info = VersionInfo(major="2024", minor="6", micro="0") diff --git a/src/cpl_core/configuration/__init__.py b/src/cpl_core/configuration/__init__.py index fa6e3537..1d50fdea 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 - 2024 sh-edraft.de" -__version__ = "2023.10.2" +__version__ = "2024.6.0" 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="10", micro="2") +version_info = VersionInfo(major="2024", minor="6", micro="0") diff --git a/src/cpl_core/configuration/configuration.py b/src/cpl_core/configuration/configuration.py index 2e3baa0f..71965d23 100644 --- a/src/cpl_core/configuration/configuration.py +++ b/src/cpl_core/configuration/configuration.py @@ -345,7 +345,7 @@ class Configuration(ConfigurationABC): executables: list[ExecutableArgument] = [] self._parse_arguments(executables, arg_list, self._argument_types) except Exception as e: - Console.error("An error occurred while parsing arguments.") + Console.error("An error occurred while parsing arguments.", traceback.format_exc()) sys.exit() try: diff --git a/src/cpl_core/console/__init__.py b/src/cpl_core/console/__init__.py index 8cb0063e..aeb3c5ce 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 - 2024 sh-edraft.de" -__version__ = "2023.10.2" +__version__ = "2024.6.0" 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="10", micro="2") +version_info = VersionInfo(major="2024", minor="6", micro="0") diff --git a/src/cpl_core/cpl-core.json b/src/cpl_core/cpl-core.json index ccde4c04..a914ef14 100644 --- a/src/cpl_core/cpl-core.json +++ b/src/cpl_core/cpl-core.json @@ -2,9 +2,9 @@ "ProjectSettings": { "Name": "cpl-core", "Version": { - "Major": "2023", - "Minor": "10", - "Micro": "2" + "Major": "2024", + "Minor": "6", + "Micro": "0" }, "Author": "Sven Heidemann", "AuthorEmail": "sven.heidemann@sh-edraft.de", @@ -16,17 +16,17 @@ "LicenseName": "MIT", "LicenseDescription": "MIT, see LICENSE for more details.", "Dependencies": [ - "art>=5.9", + "art>=6.2", "colorama>=0.4.6", - "psutil>=5.9.4", - "packaging>=23.0", + "psutil>=6.0.0", + "packaging>=24.1", "pynput>=1.7.6", - "setuptools>=67.6.1", + "setuptools>=70.1.0", "tabulate>=0.9.0", - "termcolor>=2.2.0", - "watchdog>=3.0.0", - "wheel>=0.40.0", - "mysql-connector-python>=8.1.0" + "termcolor>=2.4.0", + "watchdog>=4.0.1", + "wheel>=0.43.0", + "mysql-connector-python>=8.4.0" ], "DevDependencies": [ "Sphinx==5.0.2", @@ -36,7 +36,7 @@ "sphinx-markdown-builder==0.5.5", "pygount==1.5.1" ], - "PythonVersion": ">=3.10", + "PythonVersion": ">=3.12", "PythonPath": {}, "Classifiers": [] }, diff --git a/src/cpl_core/database/__init__.py b/src/cpl_core/database/__init__.py index 443edffb..310d1bd1 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 - 2024 sh-edraft.de" -__version__ = "2023.10.2" +__version__ = "2024.6.0" 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="10", micro="2") +version_info = VersionInfo(major="2024", minor="6", micro="0") diff --git a/src/cpl_core/database/connection/__init__.py b/src/cpl_core/database/connection/__init__.py index 919d3569..5c3c70d2 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 - 2024 sh-edraft.de" -__version__ = "2023.10.2" +__version__ = "2024.6.0" 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="10", micro="2") +version_info = VersionInfo(major="2024", minor="6", micro="0") diff --git a/src/cpl_core/database/context/__init__.py b/src/cpl_core/database/context/__init__.py index c810f41f..1b34178a 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 - 2024 sh-edraft.de" -__version__ = "2023.10.2" +__version__ = "2024.6.0" 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="10", micro="2") +version_info = VersionInfo(major="2024", minor="6", micro="0") diff --git a/src/cpl_core/dependency_injection/__init__.py b/src/cpl_core/dependency_injection/__init__.py index eab92e4e..4a793dc4 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 - 2024 sh-edraft.de" -__version__ = "2023.10.2" +__version__ = "2024.6.0" 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="10", micro="2") +version_info = VersionInfo(major="2024", minor="6", micro="0") diff --git a/src/cpl_core/environment/__init__.py b/src/cpl_core/environment/__init__.py index e1ef090a..7c5f985f 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 - 2024 sh-edraft.de" -__version__ = "2023.10.2" +__version__ = "2024.6.0" 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="10", micro="2") +version_info = VersionInfo(major="2024", minor="6", micro="0") diff --git a/src/cpl_core/logging/__init__.py b/src/cpl_core/logging/__init__.py index f28f1707..a8c5f0db 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 - 2024 sh-edraft.de" -__version__ = "2023.10.2" +__version__ = "2024.6.0" 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="10", micro="2") +version_info = VersionInfo(major="2024", minor="6", micro="0") diff --git a/src/cpl_core/mailing/__init__.py b/src/cpl_core/mailing/__init__.py index f60b502e..a8249b55 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 - 2024 sh-edraft.de" -__version__ = "2023.10.2" +__version__ = "2024.6.0" 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="10", micro="2") +version_info = VersionInfo(major="2024", minor="6", micro="0") diff --git a/src/cpl_core/pipes/__init__.py b/src/cpl_core/pipes/__init__.py index 3f3f90ef..304e0e34 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 - 2024 sh-edraft.de" -__version__ = "2023.10.2" +__version__ = "2024.6.0" 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="10", micro="2") +version_info = VersionInfo(major="2024", minor="6", micro="0") diff --git a/src/cpl_core/time/__init__.py b/src/cpl_core/time/__init__.py index 6dde12a8..3b2a72fe 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 - 2024 sh-edraft.de" -__version__ = "2023.10.2" +__version__ = "2024.6.0" 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="10", micro="2") +version_info = VersionInfo(major="2024", minor="6", micro="0") diff --git a/src/cpl_core/utils/__init__.py b/src/cpl_core/utils/__init__.py index 118a8f7b..ce4d64db 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 - 2024 sh-edraft.de" -__version__ = "2023.10.2" +__version__ = "2024.6.0" 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="10", micro="2") +version_info = VersionInfo(major="2024", minor="6", micro="0") diff --git a/tests/custom/general/src/general/application.py b/tests/custom/general/src/general/application.py index 2c8f23b8..c6024ce1 100644 --- a/tests/custom/general/src/general/application.py +++ b/tests/custom/general/src/general/application.py @@ -8,7 +8,7 @@ from cpl_core.dependency_injection import ServiceProviderABC from cpl_core.logging import LoggerABC from cpl_core.mailing import EMailClientABC, EMail from cpl_core.pipes import IPAddressPipe -from general.test_settings import TestSettings +from test_settings import TestSettings from test_service import TestService -- 2.54.0 From c3e33672641ee928dcbcec1f731b8ea23b827b8b Mon Sep 17 00:00:00 2001 From: Sven Heidemann Date: Thu, 25 Jul 2024 17:54:24 +0200 Subject: [PATCH 28/29] Removed bundle project --- cpl-workspace.json | 1 - 1 file changed, 1 deletion(-) diff --git a/cpl-workspace.json b/cpl-workspace.json index 537b7e3b..e00ea987 100644 --- a/cpl-workspace.json +++ b/cpl-workspace.json @@ -7,7 +7,6 @@ "cpl-discord": "src/cpl_discord/cpl-discord.json", "cpl-query": "src/cpl_query/cpl-query.json", "cpl-translation": "src/cpl_translation/cpl-translation.json", - "cpl-bundle": "src/cpl_bundle/cpl-bundle.json", "set-version": "tools/set_version/set-version.json", "set-pip-urls": "tools/set_pip_urls/set-pip-urls.json", "unittests": "unittests/unittests/unittests.json", -- 2.54.0 From c1e65bf0dccbbd4aaeda43b5dbbc3ea120a3a31d Mon Sep 17 00:00:00 2001 From: Sven Heidemann Date: Thu, 25 Jul 2024 17:56:25 +0200 Subject: [PATCH 29/29] Set correct version --- src/cpl_cli/cpl-cli.json | 4 ++-- src/cpl_core/cpl-core.json | 2 +- src/cpl_discord/cpl-discord.json | 12 ++++++------ src/cpl_query/cpl-query.json | 4 ++-- src/cpl_translation/cpl-translation.json | 10 +++++----- tools/set_pip_urls/set-pip-urls.json | 4 ++-- tools/set_version/set-version.json | 6 +++--- unittests/unittests/unittests.json | 6 +++--- unittests/unittests_cli/unittests_cli.json | 8 ++++---- unittests/unittests_core/unittests_core.json | 6 +++--- unittests/unittests_query/unittests_query.json | 8 ++++---- unittests/unittests_shared/unittests_shared.json | 6 +++--- .../unittests_translation/unittests_translation.json | 10 +++++----- 13 files changed, 43 insertions(+), 43 deletions(-) diff --git a/src/cpl_cli/cpl-cli.json b/src/cpl_cli/cpl-cli.json index 16f8b4ea..5a0384ac 100644 --- a/src/cpl_cli/cpl-cli.json +++ b/src/cpl_cli/cpl-cli.json @@ -3,7 +3,7 @@ "Name": "cpl-cli", "Version": { "Major": "2024", - "Minor": "10", + "Minor": "7", "Micro": "0" }, "Author": "Sven Heidemann", @@ -16,7 +16,7 @@ "LicenseName": "MIT", "LicenseDescription": "MIT, see LICENSE for more details.", "Dependencies": [ - "cpl-core>=2023.4.0" + "cpl-core>=2024.6.2024.07.0" ], "DevDependencies": [], "PythonVersion": ">=3.12", diff --git a/src/cpl_core/cpl-core.json b/src/cpl_core/cpl-core.json index a914ef14..5e3032d8 100644 --- a/src/cpl_core/cpl-core.json +++ b/src/cpl_core/cpl-core.json @@ -3,7 +3,7 @@ "Name": "cpl-core", "Version": { "Major": "2024", - "Minor": "6", + "Minor": "7", "Micro": "0" }, "Author": "Sven Heidemann", diff --git a/src/cpl_discord/cpl-discord.json b/src/cpl_discord/cpl-discord.json index 61a81dd9..26476457 100644 --- a/src/cpl_discord/cpl-discord.json +++ b/src/cpl_discord/cpl-discord.json @@ -2,9 +2,9 @@ "ProjectSettings": { "Name": "cpl-discord", "Version": { - "Major": "2023", - "Minor": "10", - "Micro": "0.post1" + "Major": "2024", + "Minor": "7", + "Micro": "0" }, "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.10.0", + "cpl-core>=2024.6.2024.07.0", "discord.py>=2.3.2", - "cpl-query>=2023.10.0" + "cpl-query>=2024.6.2024.07.0" ], "DevDependencies": [ - "cpl-cli>=2023.10.0" + "cpl-cli>=2024.6.2024.07.0" ], "PythonVersion": ">=3.10", "PythonPath": {}, diff --git a/src/cpl_query/cpl-query.json b/src/cpl_query/cpl-query.json index a50bc50c..f9c13f73 100644 --- a/src/cpl_query/cpl-query.json +++ b/src/cpl_query/cpl-query.json @@ -2,8 +2,8 @@ "ProjectSettings": { "Name": "cpl-query", "Version": { - "Major": "2023", - "Minor": "10", + "Major": "2024", + "Minor": "7", "Micro": "0" }, "Author": "Sven Heidemann", diff --git a/src/cpl_translation/cpl-translation.json b/src/cpl_translation/cpl-translation.json index f64ae4a7..a0e58a7c 100644 --- a/src/cpl_translation/cpl-translation.json +++ b/src/cpl_translation/cpl-translation.json @@ -2,9 +2,9 @@ "ProjectSettings": { "Name": "cpl-translation", "Version": { - "Major": "2023", - "Minor": "4", - "Micro": "0.post1" + "Major": "2024", + "Minor": "7", + "Micro": "0" }, "Author": "Sven Heidemann", "AuthorEmail": "sven.heidemann@sh-edraft.de", @@ -16,10 +16,10 @@ "LicenseName": "MIT", "LicenseDescription": "MIT, see LICENSE for more details.", "Dependencies": [ - "cpl-core>=2023.4.0" + "cpl-core>=2024.6.2024.07.0" ], "DevDependencies": [ - "cpl-cli>=2023.4.0" + "cpl-cli>=2024.6.2024.07.0" ], "PythonVersion": ">=3.10", "PythonPath": {}, diff --git a/tools/set_pip_urls/set-pip-urls.json b/tools/set_pip_urls/set-pip-urls.json index 098e63ad..348e4aa5 100644 --- a/tools/set_pip_urls/set-pip-urls.json +++ b/tools/set_pip_urls/set-pip-urls.json @@ -2,8 +2,8 @@ "ProjectSettings": { "Name": "set-pip-urls", "Version": { - "Major": "2022", - "Minor": "12", + "Major": "2024", + "Minor": "7", "Micro": "0" }, "Author": "Sven Heidemann", diff --git a/tools/set_version/set-version.json b/tools/set_version/set-version.json index 50782028..91e57f59 100644 --- a/tools/set_version/set-version.json +++ b/tools/set_version/set-version.json @@ -2,8 +2,8 @@ "ProjectSettings": { "Name": "set-version", "Version": { - "Major": "2022", - "Minor": "12", + "Major": "2024", + "Minor": "7", "Micro": "0" }, "Author": "Sven Heidemann", @@ -16,7 +16,7 @@ "LicenseName": "MIT", "LicenseDescription": "MIT, see LICENSE for more details.", "Dependencies": [ - "cpl-core>=2022.12.0", + "cpl-core>=2024.6.2024.07.0", "GitPython>=3.1.29" ], "DevDependencies": [], diff --git a/unittests/unittests/unittests.json b/unittests/unittests/unittests.json index 5dfe4196..93e25267 100644 --- a/unittests/unittests/unittests.json +++ b/unittests/unittests/unittests.json @@ -2,8 +2,8 @@ "ProjectSettings": { "Name": "unittests", "Version": { - "Major": "2023", - "Minor": "2", + "Major": "2024", + "Minor": "7", "Micro": "0" }, "Author": "", @@ -16,7 +16,7 @@ "LicenseName": "", "LicenseDescription": "", "Dependencies": [ - "cpl-core>=2023.2.0" + "cpl-core>=2024.6.2024.07.0" ], "PythonVersion": ">=3.10.4", "PythonPath": {}, diff --git a/unittests/unittests_cli/unittests_cli.json b/unittests/unittests_cli/unittests_cli.json index 0fb66aa3..c628239c 100644 --- a/unittests/unittests_cli/unittests_cli.json +++ b/unittests/unittests_cli/unittests_cli.json @@ -2,8 +2,8 @@ "ProjectSettings": { "Name": "unittest_cli", "Version": { - "Major": "2023", - "Minor": "2", + "Major": "2024", + "Minor": "7", "Micro": "0" }, "Author": "", @@ -16,8 +16,8 @@ "LicenseName": "", "LicenseDescription": "", "Dependencies": [ - "cpl-core>=2023.2.0", - "cpl-cli>=2023.2.0" + "cpl-core>=2024.6.2024.07.0", + "cpl-cli>=2024.6.2024.07.0" ], "PythonVersion": ">=3.10.4", "PythonPath": {}, diff --git a/unittests/unittests_core/unittests_core.json b/unittests/unittests_core/unittests_core.json index 86b29361..b975723e 100644 --- a/unittests/unittests_core/unittests_core.json +++ b/unittests/unittests_core/unittests_core.json @@ -2,8 +2,8 @@ "ProjectSettings": { "Name": "unittest_core", "Version": { - "Major": "2023", - "Minor": "2", + "Major": "2024", + "Minor": "7", "Micro": "0" }, "Author": "", @@ -16,7 +16,7 @@ "LicenseName": "", "LicenseDescription": "", "Dependencies": [ - "cpl-core>=2023.2.0" + "cpl-core>=2024.6.2024.07.0" ], "PythonVersion": ">=3.10.4", "PythonPath": {}, diff --git a/unittests/unittests_query/unittests_query.json b/unittests/unittests_query/unittests_query.json index 5763ae5d..d8f614a3 100644 --- a/unittests/unittests_query/unittests_query.json +++ b/unittests/unittests_query/unittests_query.json @@ -2,8 +2,8 @@ "ProjectSettings": { "Name": "unittest_query", "Version": { - "Major": "2023", - "Minor": "2", + "Major": "2024", + "Minor": "7", "Micro": "0" }, "Author": "", @@ -16,8 +16,8 @@ "LicenseName": "", "LicenseDescription": "", "Dependencies": [ - "cpl-core>=2023.2.0", - "cpl-query>=2023.2.0" + "cpl-core>=2024.6.2024.07.0", + "cpl-query>=2024.6.2024.07.0" ], "PythonVersion": ">=3.10.4", "PythonPath": {}, diff --git a/unittests/unittests_shared/unittests_shared.json b/unittests/unittests_shared/unittests_shared.json index 249c1d7e..74fca1ca 100644 --- a/unittests/unittests_shared/unittests_shared.json +++ b/unittests/unittests_shared/unittests_shared.json @@ -2,8 +2,8 @@ "ProjectSettings": { "Name": "unittest_shared", "Version": { - "Major": "2023", - "Minor": "2", + "Major": "2024", + "Minor": "7", "Micro": "0" }, "Author": "", @@ -16,7 +16,7 @@ "LicenseName": "", "LicenseDescription": "", "Dependencies": [ - "cpl-core>=2023.2.0" + "cpl-core>=2024.6.2024.07.0" ], "PythonVersion": ">=3.10.4", "PythonPath": {}, diff --git a/unittests/unittests_translation/unittests_translation.json b/unittests/unittests_translation/unittests_translation.json index 7449b8e5..956b832a 100644 --- a/unittests/unittests_translation/unittests_translation.json +++ b/unittests/unittests_translation/unittests_translation.json @@ -2,8 +2,8 @@ "ProjectSettings": { "Name": "unittests_translation", "Version": { - "Major": "2023", - "Minor": "2", + "Major": "2024", + "Minor": "7", "Micro": "0" }, "Author": "", @@ -16,11 +16,11 @@ "LicenseName": "", "LicenseDescription": "", "Dependencies": [ - "cpl-core>=2023.2.0", - "cpl-translation>=2023.2.0" + "cpl-core>=2024.6.2024.07.0", + "cpl-translation>=2024.6.2024.07.0" ], "DevDependencies": [ - "cpl-cli>=2023.2.0" + "cpl-cli>=2024.6.2024.07.0" ], "PythonVersion": ">=3.10.4", "PythonPath": {}, -- 2.54.0