From 6389a940bcb5aeb60cd2f4667351cb9e46849e2c Mon Sep 17 00:00:00 2001 From: Sven Heidemann Date: Sat, 7 Jan 2023 15:00:38 +0100 Subject: [PATCH 01/12] Fixed static di injection --- src/cpl_core/cpl-core.json | 2 +- src/cpl_core/dependency_injection/service_provider_abc.py | 8 +++++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/cpl_core/cpl-core.json b/src/cpl_core/cpl-core.json index 1af2960f..2072dda3 100644 --- a/src/cpl_core/cpl-core.json +++ b/src/cpl_core/cpl-core.json @@ -4,7 +4,7 @@ "Version": { "Major": "2022", "Minor": "12", - "Micro": "1" + "Micro": "1.post1" }, "Author": "Sven Heidemann", "AuthorEmail": "sven.heidemann@sh-edraft.de", diff --git a/src/cpl_core/dependency_injection/service_provider_abc.py b/src/cpl_core/dependency_injection/service_provider_abc.py index a3f7158c..f2890d3c 100644 --- a/src/cpl_core/dependency_injection/service_provider_abc.py +++ b/src/cpl_core/dependency_injection/service_provider_abc.py @@ -13,14 +13,16 @@ class ServiceProviderABC(ABC): _provider: Optional['ServiceProviderABC'] = None @abstractmethod - def __init__(self): pass + def __init__(self): + pass @classmethod def set_global_provider(cls, provider: 'ServiceProviderABC'): cls._provider = provider @abstractmethod - def build_by_signature(self, sig: Signature) -> list[T]: pass + def build_by_signature(self, sig: Signature) -> list[T]: + pass @abstractmethod def build_service(self, service_type: type) -> object: @@ -108,7 +110,7 @@ class ServiceProviderABC(ABC): if cls._provider is None: raise Exception(f'{cls.__name__} not build!') - injection = cls._provider.build_by_signature(signature(f)) + injection = [x for x in cls._provider.build_by_signature(signature(f)) if x is not None] return f(*injection, *args, **kwargs) return inner From e0ca7c2ae67d8b84068581c8c4d287bb54dc66dc Mon Sep 17 00:00:00 2001 From: Sven Heidemann Date: Sat, 7 Jan 2023 15:03:21 +0100 Subject: [PATCH 02/12] Build fixed version --- 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/cpl-cli.json | 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 ++-- 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 ++-- 31 files changed, 62 insertions(+), 62 deletions(-) diff --git a/src/cpl_cli/.cpl/__init__.py b/src/cpl_cli/.cpl/__init__.py index fd1901ed..ed92c57b 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__ = '2022.12.1' +__version__ = '2022.12.1.post1' from collections import namedtuple @@ -23,4 +23,4 @@ from collections import namedtuple # imports: VersionInfo = namedtuple('VersionInfo', 'major minor micro') -version_info = VersionInfo(major='2022', minor='12', micro='1') +version_info = VersionInfo(major='2022', minor='12', micro='1.post1') diff --git a/src/cpl_cli/__init__.py b/src/cpl_cli/__init__.py index 88563c33..53ec2fcf 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__ = '2022.12.1' +__version__ = '2022.12.1.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='2022', minor='12', micro='1') +version_info = VersionInfo(major='2022', minor='12', micro='1.post1') diff --git a/src/cpl_cli/_templates/__init__.py b/src/cpl_cli/_templates/__init__.py index 56690313..67bd56a9 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__ = '2022.12.1' +__version__ = '2022.12.1.post1' from collections import namedtuple @@ -23,4 +23,4 @@ from collections import namedtuple # imports: VersionInfo = namedtuple('VersionInfo', 'major minor micro') -version_info = VersionInfo(major='2022', minor='12', micro='1') +version_info = VersionInfo(major='2022', minor='12', micro='1.post1') diff --git a/src/cpl_cli/_templates/build/__init__.py b/src/cpl_cli/_templates/build/__init__.py index 8b300e0f..11fffe93 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__ = '2022.12.1' +__version__ = '2022.12.1.post1' from collections import namedtuple @@ -23,4 +23,4 @@ from collections import namedtuple # imports: VersionInfo = namedtuple('VersionInfo', 'major minor micro') -version_info = VersionInfo(major='2022', minor='12', micro='1') +version_info = VersionInfo(major='2022', minor='12', micro='1.post1') diff --git a/src/cpl_cli/_templates/publish/__init__.py b/src/cpl_cli/_templates/publish/__init__.py index d8dabf44..42a25dbc 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__ = '2022.12.1' +__version__ = '2022.12.1.post1' from collections import namedtuple @@ -23,4 +23,4 @@ from collections import namedtuple # imports: VersionInfo = namedtuple('VersionInfo', 'major minor micro') -version_info = VersionInfo(major='2022', minor='12', micro='1') +version_info = VersionInfo(major='2022', minor='12', micro='1.post1') diff --git a/src/cpl_cli/abc/__init__.py b/src/cpl_cli/abc/__init__.py index 7d010963..6b5c6e66 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__ = '2022.12.1' +__version__ = '2022.12.1.post1' from collections import namedtuple @@ -23,4 +23,4 @@ from collections import namedtuple # imports VersionInfo = namedtuple('VersionInfo', 'major minor micro') -version_info = VersionInfo(major='2022', minor='12', micro='1') +version_info = VersionInfo(major='2022', minor='12', micro='1.post1') diff --git a/src/cpl_cli/command/__init__.py b/src/cpl_cli/command/__init__.py index 01e0cf59..c0204374 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__ = '2022.12.1' +__version__ = '2022.12.1.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='2022', minor='12', micro='1') +version_info = VersionInfo(major='2022', minor='12', micro='1.post1') diff --git a/src/cpl_cli/configuration/__init__.py b/src/cpl_cli/configuration/__init__.py index 406767ad..ced3056f 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__ = '2022.12.1' +__version__ = '2022.12.1.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='2022', minor='12', micro='1') +version_info = VersionInfo(major='2022', minor='12', micro='1.post1') diff --git a/src/cpl_cli/cpl-cli.json b/src/cpl_cli/cpl-cli.json index 83680ef7..d9ee48ce 100644 --- a/src/cpl_cli/cpl-cli.json +++ b/src/cpl_cli/cpl-cli.json @@ -4,7 +4,7 @@ "Version": { "Major": "2022", "Minor": "12", - "Micro": "1" + "Micro": "1.post1" }, "Author": "Sven Heidemann", "AuthorEmail": "sven.heidemann@sh-edraft.de", @@ -16,7 +16,7 @@ "LicenseName": "MIT", "LicenseDescription": "MIT, see LICENSE for more details.", "Dependencies": [ - "cpl-core>=2022.12.1" + "cpl-core==2022.12.1.post1" ], "DevDependencies": [], "PythonVersion": ">=3.10", diff --git a/src/cpl_cli/helper/__init__.py b/src/cpl_cli/helper/__init__.py index 124de6fe..503db400 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__ = '2022.12.1' +__version__ = '2022.12.1.post1' from collections import namedtuple @@ -23,4 +23,4 @@ from collections import namedtuple # imports: VersionInfo = namedtuple('VersionInfo', 'major minor micro') -version_info = VersionInfo(major='2022', minor='12', micro='1') +version_info = VersionInfo(major='2022', minor='12', micro='1.post1') diff --git a/src/cpl_cli/live_server/__init__.py b/src/cpl_cli/live_server/__init__.py index 943290d4..27db3bf9 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__ = '2022.12.1' +__version__ = '2022.12.1.post1' from collections import namedtuple @@ -23,4 +23,4 @@ from collections import namedtuple # imports: VersionInfo = namedtuple('VersionInfo', 'major minor micro') -version_info = VersionInfo(major='2022', minor='12', micro='1') +version_info = VersionInfo(major='2022', minor='12', micro='1.post1') diff --git a/src/cpl_cli/migrations/__init__.py b/src/cpl_cli/migrations/__init__.py index d1c8ff93..b6c9cb3b 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__ = '2022.12.1' +__version__ = '2022.12.1.post1' from collections import namedtuple @@ -23,4 +23,4 @@ from collections import namedtuple # imports VersionInfo = namedtuple('VersionInfo', 'major minor micro') -version_info = VersionInfo(major='2022', minor='12', micro='1') +version_info = VersionInfo(major='2022', minor='12', micro='1.post1') diff --git a/src/cpl_cli/migrations/base/__init__.py b/src/cpl_cli/migrations/base/__init__.py index 3c86ea88..549d754b 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__ = '2022.12.1' +__version__ = '2022.12.1.post1' from collections import namedtuple @@ -23,4 +23,4 @@ from collections import namedtuple # imports: VersionInfo = namedtuple('VersionInfo', 'major minor micro') -version_info = VersionInfo(major='2022', minor='12', micro='1') +version_info = VersionInfo(major='2022', minor='12', micro='1.post1') diff --git a/src/cpl_cli/migrations/service/__init__.py b/src/cpl_cli/migrations/service/__init__.py index d32c377e..3f4c03bc 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__ = '2022.12.1' +__version__ = '2022.12.1.post1' from collections import namedtuple @@ -23,4 +23,4 @@ from collections import namedtuple # imports: VersionInfo = namedtuple('VersionInfo', 'major minor micro') -version_info = VersionInfo(major='2022', minor='12', micro='1') +version_info = VersionInfo(major='2022', minor='12', micro='1.post1') diff --git a/src/cpl_cli/publish/__init__.py b/src/cpl_cli/publish/__init__.py index 8e9f1d9a..b0e5f369 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__ = '2022.12.1' +__version__ = '2022.12.1.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='2022', minor='12', micro='1') +version_info = VersionInfo(major='2022', minor='12', micro='1.post1') diff --git a/src/cpl_cli/source_creator/__init__.py b/src/cpl_cli/source_creator/__init__.py index 5d65164f..48148416 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__ = '2022.12.1' +__version__ = '2022.12.1.post1' from collections import namedtuple @@ -23,4 +23,4 @@ from collections import namedtuple # imports: VersionInfo = namedtuple('VersionInfo', 'major minor micro') -version_info = VersionInfo(major='2022', minor='12', micro='1') +version_info = VersionInfo(major='2022', minor='12', micro='1.post1') diff --git a/src/cpl_cli/validators/__init__.py b/src/cpl_cli/validators/__init__.py index d12f3ddb..4b99fdf1 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__ = '2022.12.1' +__version__ = '2022.12.1.post1' from collections import namedtuple @@ -23,4 +23,4 @@ from collections import namedtuple # imports: VersionInfo = namedtuple('VersionInfo', 'major minor micro') -version_info = VersionInfo(major='2022', minor='12', micro='1') +version_info = VersionInfo(major='2022', minor='12', micro='1.post1') diff --git a/src/cpl_core/__init__.py b/src/cpl_core/__init__.py index c3d854c2..26bafa4d 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__ = '2022.12.1' +__version__ = '2022.12.1.post1' from collections import namedtuple @@ -23,4 +23,4 @@ from collections import namedtuple # imports: VersionInfo = namedtuple('VersionInfo', 'major minor micro') -version_info = VersionInfo(major='2022', minor='12', micro='1') +version_info = VersionInfo(major='2022', minor='12', micro='1.post1') diff --git a/src/cpl_core/application/__init__.py b/src/cpl_core/application/__init__.py index d088dc08..bdd6bed6 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__ = '2022.12.1' +__version__ = '2022.12.1.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='2022', minor='12', micro='1') +version_info = VersionInfo(major='2022', minor='12', micro='1.post1') diff --git a/src/cpl_core/configuration/__init__.py b/src/cpl_core/configuration/__init__.py index 18ebabec..e0067e11 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__ = '2022.12.1' +__version__ = '2022.12.1.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='2022', minor='12', micro='1') +version_info = VersionInfo(major='2022', minor='12', micro='1.post1') diff --git a/src/cpl_core/console/__init__.py b/src/cpl_core/console/__init__.py index 4e227f6b..5a40db23 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__ = '2022.12.1' +__version__ = '2022.12.1.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='2022', minor='12', micro='1') +version_info = VersionInfo(major='2022', minor='12', micro='1.post1') diff --git a/src/cpl_core/database/__init__.py b/src/cpl_core/database/__init__.py index d3c418a4..5ad62306 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__ = '2022.12.1' +__version__ = '2022.12.1.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='2022', minor='12', micro='1') +version_info = VersionInfo(major='2022', minor='12', micro='1.post1') diff --git a/src/cpl_core/database/connection/__init__.py b/src/cpl_core/database/connection/__init__.py index fcc95e63..b6f63817 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__ = '2022.12.1' +__version__ = '2022.12.1.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='2022', minor='12', micro='1') +version_info = VersionInfo(major='2022', minor='12', micro='1.post1') diff --git a/src/cpl_core/database/context/__init__.py b/src/cpl_core/database/context/__init__.py index 5f819a4e..d128019a 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__ = '2022.12.1' +__version__ = '2022.12.1.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='2022', minor='12', micro='1') +version_info = VersionInfo(major='2022', minor='12', micro='1.post1') diff --git a/src/cpl_core/dependency_injection/__init__.py b/src/cpl_core/dependency_injection/__init__.py index c52c7f25..c1b685b7 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__ = '2022.12.1' +__version__ = '2022.12.1.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='2022', minor='12', micro='1') +version_info = VersionInfo(major='2022', minor='12', micro='1.post1') diff --git a/src/cpl_core/environment/__init__.py b/src/cpl_core/environment/__init__.py index b0ab6498..97f9efd9 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__ = '2022.12.1' +__version__ = '2022.12.1.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='2022', minor='12', micro='1') +version_info = VersionInfo(major='2022', minor='12', micro='1.post1') diff --git a/src/cpl_core/logging/__init__.py b/src/cpl_core/logging/__init__.py index 6c781e79..26668484 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__ = '2022.12.1' +__version__ = '2022.12.1.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='2022', minor='12', micro='1') +version_info = VersionInfo(major='2022', minor='12', micro='1.post1') diff --git a/src/cpl_core/mailing/__init__.py b/src/cpl_core/mailing/__init__.py index 2fcf2337..c9aeb63f 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__ = '2022.12.1' +__version__ = '2022.12.1.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='2022', minor='12', micro='1') +version_info = VersionInfo(major='2022', minor='12', micro='1.post1') diff --git a/src/cpl_core/pipes/__init__.py b/src/cpl_core/pipes/__init__.py index cff6ea21..07021212 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__ = '2022.12.1' +__version__ = '2022.12.1.post1' from collections import namedtuple @@ -30,4 +30,4 @@ from .to_camel_case_pipe import ToCamelCasePipe from .to_snake_case_pipe import ToSnakeCasePipe VersionInfo = namedtuple('VersionInfo', 'major minor micro') -version_info = VersionInfo(major='2022', minor='12', micro='1') +version_info = VersionInfo(major='2022', minor='12', micro='1.post1') diff --git a/src/cpl_core/time/__init__.py b/src/cpl_core/time/__init__.py index 4718504f..86eccbd7 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__ = '2022.12.1' +__version__ = '2022.12.1.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='2022', minor='12', micro='1') +version_info = VersionInfo(major='2022', minor='12', micro='1.post1') diff --git a/src/cpl_core/utils/__init__.py b/src/cpl_core/utils/__init__.py index 3ced2335..2680a639 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__ = '2022.12.1' +__version__ = '2022.12.1.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='2022', minor='12', micro='1') +version_info = VersionInfo(major='2022', minor='12', micro='1.post1') From 7f46fbe87ab287b9152ea1c5f06588e1fb3f1ac8 Mon Sep 17 00:00:00 2001 From: Sven Heidemann Date: Thu, 12 Jan 2023 08:57:01 +0100 Subject: [PATCH 03/12] Added *args and **kwargs support to discord bot and DI --- src/cpl_core/cpl-core.json | 2 +- .../dependency_injection/service_provider.py | 14 +++++++------- .../dependency_injection/service_provider_abc.py | 6 +++--- src/cpl_discord/cpl-discord.json | 4 ++-- src/cpl_discord/service/discord_bot_service.py | 15 ++++++++++++--- .../service/discord_bot_service_abc.py | 4 ++-- 6 files changed, 27 insertions(+), 18 deletions(-) diff --git a/src/cpl_core/cpl-core.json b/src/cpl_core/cpl-core.json index 2072dda3..681f8c9c 100644 --- a/src/cpl_core/cpl-core.json +++ b/src/cpl_core/cpl-core.json @@ -4,7 +4,7 @@ "Version": { "Major": "2022", "Minor": "12", - "Micro": "1.post1" + "Micro": "1.post2" }, "Author": "Sven Heidemann", "AuthorEmail": "sven.heidemann@sh-edraft.de", diff --git a/src/cpl_core/dependency_injection/service_provider.py b/src/cpl_core/dependency_injection/service_provider.py index 4e388440..0be8f567 100644 --- a/src/cpl_core/dependency_injection/service_provider.py +++ b/src/cpl_core/dependency_injection/service_provider.py @@ -57,7 +57,7 @@ class ServiceProvider(ServiceProviderABC): # raise Exception(f'Service {parameter.annotation} not found') - def _get_services(self, t: type) -> list[Optional[object]]: + def _get_services(self, t: type, *args, **kwargs) -> list[Optional[object]]: implementations = [] for descriptor in self._service_descriptors: if descriptor.service_type == t or issubclass(descriptor.service_type, t): @@ -65,7 +65,7 @@ class ServiceProvider(ServiceProviderABC): implementations.append(descriptor.implementation) continue - implementation = self.build_service(descriptor.service_type) + implementation = self.build_service(descriptor.service_type, *args, **kwargs) if descriptor.lifetime == ServiceLifetimeEnum.singleton: descriptor.implementation = implementation @@ -102,7 +102,7 @@ class ServiceProvider(ServiceProviderABC): return params - def build_service(self, service_type: type) -> object: + def build_service(self, service_type: type, *args, **kwargs) -> object: for descriptor in self._service_descriptors: if descriptor.service_type == service_type or issubclass(descriptor.service_type, service_type): if descriptor.implementation is not None: @@ -115,7 +115,7 @@ class ServiceProvider(ServiceProviderABC): sig = signature(service_type.__init__) params = self.build_by_signature(sig) - return service_type(*params) + return service_type(*params, *args, **kwargs) def set_scope(self, scope: ScopeABC): self._scope = scope @@ -124,7 +124,7 @@ class ServiceProvider(ServiceProviderABC): sb = ScopeBuilder(ServiceProvider(copy.deepcopy(self._service_descriptors), self._configuration, self._database_context)) return sb.build() - def get_service(self, service_type: T) -> Optional[T]: + def get_service(self, service_type: T, *args, **kwargs) -> Optional[T]: result = self._find_service(service_type) if result is None: @@ -133,13 +133,13 @@ class ServiceProvider(ServiceProviderABC): if result.implementation is not None: return result.implementation - implementation = self.build_service(service_type) + implementation = self.build_service(service_type, *args, **kwargs) if result.lifetime == ServiceLifetimeEnum.singleton or result.lifetime == ServiceLifetimeEnum.scoped and self._scope is not None: result.implementation = implementation return implementation - def get_services(self, service_type: T) -> list[Optional[T]]: + def get_services(self, service_type: T, *args, **kwargs) -> list[Optional[T]]: 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 f2890d3c..bf7e851e 100644 --- a/src/cpl_core/dependency_injection/service_provider_abc.py +++ b/src/cpl_core/dependency_injection/service_provider_abc.py @@ -25,7 +25,7 @@ class ServiceProviderABC(ABC): pass @abstractmethod - def build_service(self, service_type: type) -> object: + def build_service(self, service_type: type, *args, **kwargs) -> object: r"""Creates instance of given type Parameter @@ -61,7 +61,7 @@ class ServiceProviderABC(ABC): pass @abstractmethod - def get_service(self, instance_type: T) -> Optional[T]: + def get_service(self, instance_type: T, *args, **kwargs) -> Optional[T]: r"""Returns instance of given type Parameter @@ -76,7 +76,7 @@ class ServiceProviderABC(ABC): pass @abstractmethod - def get_services(self, service_type: T) -> 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 cd29ffcf..d75b5cf7 100644 --- a/src/cpl_discord/cpl-discord.json +++ b/src/cpl_discord/cpl-discord.json @@ -4,7 +4,7 @@ "Version": { "Major": "2022", "Minor": "12", - "Micro": "1" + "Micro": "1.post1" }, "Author": "Sven Heidemann", "AuthorEmail": "sven.heidemann@sh-edraft.de", @@ -16,7 +16,7 @@ "LicenseName": "MIT", "LicenseDescription": "MIT, see LICENSE for more details.", "Dependencies": [ - "cpl-core>=2022.12.1", + "cpl-core>=2022.12.1.post2", "discord.py==2.1.0", "cpl-query>=2022.12.2.post1" ], diff --git a/src/cpl_discord/service/discord_bot_service.py b/src/cpl_discord/service/discord_bot_service.py index fe86b908..4c4716d7 100644 --- a/src/cpl_discord/service/discord_bot_service.py +++ b/src/cpl_discord/service/discord_bot_service.py @@ -21,7 +21,9 @@ class DiscordBotService(DiscordBotServiceABC): discord_bot_settings: DiscordBotSettings, env: ApplicationEnvironmentABC, logging_st: LoggingSettings, - discord_service: DiscordServiceABC + discord_service: DiscordServiceABC, + *args, + **kwargs ): # services self._config = config @@ -34,7 +36,12 @@ class DiscordBotService(DiscordBotServiceABC): self._discord_settings = self._get_settings(discord_bot_settings) # setup super - DiscordBotServiceABC.__init__(self, command_prefix=self._discord_settings.prefix, help_command=None, intents=discord.Intents().all()) + DiscordBotServiceABC.__init__( + self, + *args, + command_prefix=self._discord_settings.prefix, help_command=None, intents=discord.Intents().all(), + **kwargs + ) self._base = super(DiscordBotServiceABC, self) @staticmethod @@ -50,7 +57,9 @@ class DiscordBotService(DiscordBotServiceABC): 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 + 'Prefix': + ('! ' 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') diff --git a/src/cpl_discord/service/discord_bot_service_abc.py b/src/cpl_discord/service/discord_bot_service_abc.py index b96a5ee8..399e5a3f 100644 --- a/src/cpl_discord/service/discord_bot_service_abc.py +++ b/src/cpl_discord/service/discord_bot_service_abc.py @@ -8,8 +8,8 @@ from cpl_query.extension.list import List class DiscordBotServiceABC(commands.Bot): - def __init__(self, **kwargs): - commands.Bot.__init__(self, **kwargs) + def __init__(self, *args, **kwargs): + commands.Bot.__init__(self, *args, **kwargs) @abstractmethod async def start_async(self): pass From b18a7297a72786cdbde584f0bf6c15f3e04f6ccd Mon Sep 17 00:00:00 2001 From: Sven Heidemann Date: Thu, 12 Jan 2023 08:58:05 +0100 Subject: [PATCH 04/12] Build fix version --- 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_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 ++-- 23 files changed, 46 insertions(+), 46 deletions(-) diff --git a/src/cpl_core/__init__.py b/src/cpl_core/__init__.py index 26bafa4d..e75ed564 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__ = '2022.12.1.post1' +__version__ = '2022.12.1.post2' from collections import namedtuple @@ -23,4 +23,4 @@ from collections import namedtuple # imports: VersionInfo = namedtuple('VersionInfo', 'major minor micro') -version_info = VersionInfo(major='2022', minor='12', micro='1.post1') +version_info = VersionInfo(major='2022', minor='12', micro='1.post2') diff --git a/src/cpl_core/application/__init__.py b/src/cpl_core/application/__init__.py index bdd6bed6..3ab17bdb 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__ = '2022.12.1.post1' +__version__ = '2022.12.1.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='2022', minor='12', micro='1.post1') +version_info = VersionInfo(major='2022', minor='12', micro='1.post2') diff --git a/src/cpl_core/configuration/__init__.py b/src/cpl_core/configuration/__init__.py index e0067e11..ff4e64ca 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__ = '2022.12.1.post1' +__version__ = '2022.12.1.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='2022', minor='12', micro='1.post1') +version_info = VersionInfo(major='2022', minor='12', micro='1.post2') diff --git a/src/cpl_core/console/__init__.py b/src/cpl_core/console/__init__.py index 5a40db23..d74f0dd6 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__ = '2022.12.1.post1' +__version__ = '2022.12.1.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='2022', minor='12', micro='1.post1') +version_info = VersionInfo(major='2022', minor='12', micro='1.post2') diff --git a/src/cpl_core/database/__init__.py b/src/cpl_core/database/__init__.py index 5ad62306..1422f1e1 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__ = '2022.12.1.post1' +__version__ = '2022.12.1.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='2022', minor='12', micro='1.post1') +version_info = VersionInfo(major='2022', minor='12', micro='1.post2') diff --git a/src/cpl_core/database/connection/__init__.py b/src/cpl_core/database/connection/__init__.py index b6f63817..36aa42d7 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__ = '2022.12.1.post1' +__version__ = '2022.12.1.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='2022', minor='12', micro='1.post1') +version_info = VersionInfo(major='2022', minor='12', micro='1.post2') diff --git a/src/cpl_core/database/context/__init__.py b/src/cpl_core/database/context/__init__.py index d128019a..4436f9c1 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__ = '2022.12.1.post1' +__version__ = '2022.12.1.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='2022', minor='12', micro='1.post1') +version_info = VersionInfo(major='2022', minor='12', micro='1.post2') diff --git a/src/cpl_core/dependency_injection/__init__.py b/src/cpl_core/dependency_injection/__init__.py index c1b685b7..05a2037c 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__ = '2022.12.1.post1' +__version__ = '2022.12.1.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='2022', minor='12', micro='1.post1') +version_info = VersionInfo(major='2022', minor='12', micro='1.post2') diff --git a/src/cpl_core/environment/__init__.py b/src/cpl_core/environment/__init__.py index 97f9efd9..2a3ba33d 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__ = '2022.12.1.post1' +__version__ = '2022.12.1.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='2022', minor='12', micro='1.post1') +version_info = VersionInfo(major='2022', minor='12', micro='1.post2') diff --git a/src/cpl_core/logging/__init__.py b/src/cpl_core/logging/__init__.py index 26668484..f8bef11e 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__ = '2022.12.1.post1' +__version__ = '2022.12.1.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='2022', minor='12', micro='1.post1') +version_info = VersionInfo(major='2022', minor='12', micro='1.post2') diff --git a/src/cpl_core/mailing/__init__.py b/src/cpl_core/mailing/__init__.py index c9aeb63f..4cd5012b 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__ = '2022.12.1.post1' +__version__ = '2022.12.1.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='2022', minor='12', micro='1.post1') +version_info = VersionInfo(major='2022', minor='12', micro='1.post2') diff --git a/src/cpl_core/pipes/__init__.py b/src/cpl_core/pipes/__init__.py index 07021212..dc270fdc 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__ = '2022.12.1.post1' +__version__ = '2022.12.1.post2' from collections import namedtuple @@ -30,4 +30,4 @@ from .to_camel_case_pipe import ToCamelCasePipe from .to_snake_case_pipe import ToSnakeCasePipe VersionInfo = namedtuple('VersionInfo', 'major minor micro') -version_info = VersionInfo(major='2022', minor='12', micro='1.post1') +version_info = VersionInfo(major='2022', minor='12', micro='1.post2') diff --git a/src/cpl_core/time/__init__.py b/src/cpl_core/time/__init__.py index 86eccbd7..aae4c510 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__ = '2022.12.1.post1' +__version__ = '2022.12.1.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='2022', minor='12', micro='1.post1') +version_info = VersionInfo(major='2022', minor='12', micro='1.post2') diff --git a/src/cpl_core/utils/__init__.py b/src/cpl_core/utils/__init__.py index 2680a639..166772e9 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__ = '2022.12.1.post1' +__version__ = '2022.12.1.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='2022', minor='12', micro='1.post1') +version_info = VersionInfo(major='2022', minor='12', micro='1.post2') diff --git a/src/cpl_discord/.cpl/__init__.py b/src/cpl_discord/.cpl/__init__.py index e2b391ae..25c717b1 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__ = '2022.12.1' +__version__ = '2022.12.1.post1' from collections import namedtuple @@ -23,4 +23,4 @@ from collections import namedtuple # imports: VersionInfo = namedtuple('VersionInfo', 'major minor micro') -version_info = VersionInfo(major='2022', minor='12', micro='1') +version_info = VersionInfo(major='2022', minor='12', micro='1.post1') diff --git a/src/cpl_discord/__init__.py b/src/cpl_discord/__init__.py index b90ee3d0..046a599f 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__ = '2022.12.1' +__version__ = '2022.12.1.post1' from collections import namedtuple @@ -55,4 +55,4 @@ def get_discord_collection(services: 'ServiceCollectionABC') -> 'DiscordCollecti # build-ignore-end VersionInfo = namedtuple('VersionInfo', 'major minor micro') -version_info = VersionInfo(major='2022', minor='12', micro='1') +version_info = VersionInfo(major='2022', minor='12', micro='1.post1') diff --git a/src/cpl_discord/application/__init__.py b/src/cpl_discord/application/__init__.py index cdfee203..fc324cb3 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__ = '2022.12.1' +__version__ = '2022.12.1.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='2022', minor='12', micro='1') +version_info = VersionInfo(major='2022', minor='12', micro='1.post1') diff --git a/src/cpl_discord/command/__init__.py b/src/cpl_discord/command/__init__.py index f0306bd2..bd8ffa24 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__ = '2022.12.1' +__version__ = '2022.12.1.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='2022', minor='12', micro='1') +version_info = VersionInfo(major='2022', minor='12', micro='1.post1') diff --git a/src/cpl_discord/configuration/__init__.py b/src/cpl_discord/configuration/__init__.py index 5fcaa9a4..8fca7136 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__ = '2022.12.1' +__version__ = '2022.12.1.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='2022', minor='12', micro='1') +version_info = VersionInfo(major='2022', minor='12', micro='1.post1') diff --git a/src/cpl_discord/container/__init__.py b/src/cpl_discord/container/__init__.py index 2b27e09c..430aac56 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__ = '2022.12.1' +__version__ = '2022.12.1.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='2022', minor='12', micro='1') +version_info = VersionInfo(major='2022', minor='12', micro='1.post1') diff --git a/src/cpl_discord/events/__init__.py b/src/cpl_discord/events/__init__.py index e5259830..6c4fe2b3 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__ = '2022.12.1' +__version__ = '2022.12.1.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='2022', minor='12', micro='1') +version_info = VersionInfo(major='2022', minor='12', micro='1.post1') diff --git a/src/cpl_discord/helper/__init__.py b/src/cpl_discord/helper/__init__.py index dd67de1f..caaec2b4 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__ = '2022.12.1' +__version__ = '2022.12.1.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='2022', minor='12', micro='1') +version_info = VersionInfo(major='2022', minor='12', micro='1.post1') diff --git a/src/cpl_discord/service/__init__.py b/src/cpl_discord/service/__init__.py index 110b1d4b..6f0d18c5 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__ = '2022.12.1' +__version__ = '2022.12.1.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='2022', minor='12', micro='1') +version_info = VersionInfo(major='2022', minor='12', micro='1.post1') From 7be3cf38dc727182f89932fa0ddfb4a8e4616fbe Mon Sep 17 00:00:00 2001 From: Sven Heidemann Date: Thu, 12 Jan 2023 09:05:24 +0100 Subject: [PATCH 05/12] Fixed cpl-cli deps --- 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/cpl-cli.json | 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 ++-- 17 files changed, 34 insertions(+), 34 deletions(-) diff --git a/src/cpl_cli/.cpl/__init__.py b/src/cpl_cli/.cpl/__init__.py index ed92c57b..574614d3 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__ = '2022.12.1.post1' +__version__ = '2022.12.1.post2' from collections import namedtuple @@ -23,4 +23,4 @@ from collections import namedtuple # imports: VersionInfo = namedtuple('VersionInfo', 'major minor micro') -version_info = VersionInfo(major='2022', minor='12', micro='1.post1') +version_info = VersionInfo(major='2022', minor='12', micro='1.post2') diff --git a/src/cpl_cli/__init__.py b/src/cpl_cli/__init__.py index 53ec2fcf..eadf291f 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__ = '2022.12.1.post1' +__version__ = '2022.12.1.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='2022', minor='12', micro='1.post1') +version_info = VersionInfo(major='2022', minor='12', micro='1.post2') diff --git a/src/cpl_cli/_templates/__init__.py b/src/cpl_cli/_templates/__init__.py index 67bd56a9..7129a39f 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__ = '2022.12.1.post1' +__version__ = '2022.12.1.post2' from collections import namedtuple @@ -23,4 +23,4 @@ from collections import namedtuple # imports: VersionInfo = namedtuple('VersionInfo', 'major minor micro') -version_info = VersionInfo(major='2022', minor='12', micro='1.post1') +version_info = VersionInfo(major='2022', minor='12', micro='1.post2') diff --git a/src/cpl_cli/_templates/build/__init__.py b/src/cpl_cli/_templates/build/__init__.py index 11fffe93..c2c411b3 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__ = '2022.12.1.post1' +__version__ = '2022.12.1.post2' from collections import namedtuple @@ -23,4 +23,4 @@ from collections import namedtuple # imports: VersionInfo = namedtuple('VersionInfo', 'major minor micro') -version_info = VersionInfo(major='2022', minor='12', micro='1.post1') +version_info = VersionInfo(major='2022', minor='12', micro='1.post2') diff --git a/src/cpl_cli/_templates/publish/__init__.py b/src/cpl_cli/_templates/publish/__init__.py index 42a25dbc..8d3ec898 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__ = '2022.12.1.post1' +__version__ = '2022.12.1.post2' from collections import namedtuple @@ -23,4 +23,4 @@ from collections import namedtuple # imports: VersionInfo = namedtuple('VersionInfo', 'major minor micro') -version_info = VersionInfo(major='2022', minor='12', micro='1.post1') +version_info = VersionInfo(major='2022', minor='12', micro='1.post2') diff --git a/src/cpl_cli/abc/__init__.py b/src/cpl_cli/abc/__init__.py index 6b5c6e66..067beecf 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__ = '2022.12.1.post1' +__version__ = '2022.12.1.post2' from collections import namedtuple @@ -23,4 +23,4 @@ from collections import namedtuple # imports VersionInfo = namedtuple('VersionInfo', 'major minor micro') -version_info = VersionInfo(major='2022', minor='12', micro='1.post1') +version_info = VersionInfo(major='2022', minor='12', micro='1.post2') diff --git a/src/cpl_cli/command/__init__.py b/src/cpl_cli/command/__init__.py index c0204374..461d1eae 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__ = '2022.12.1.post1' +__version__ = '2022.12.1.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='2022', minor='12', micro='1.post1') +version_info = VersionInfo(major='2022', minor='12', micro='1.post2') diff --git a/src/cpl_cli/configuration/__init__.py b/src/cpl_cli/configuration/__init__.py index ced3056f..ffdc24c5 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__ = '2022.12.1.post1' +__version__ = '2022.12.1.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='2022', minor='12', micro='1.post1') +version_info = VersionInfo(major='2022', minor='12', micro='1.post2') diff --git a/src/cpl_cli/cpl-cli.json b/src/cpl_cli/cpl-cli.json index d9ee48ce..8dadccc0 100644 --- a/src/cpl_cli/cpl-cli.json +++ b/src/cpl_cli/cpl-cli.json @@ -4,7 +4,7 @@ "Version": { "Major": "2022", "Minor": "12", - "Micro": "1.post1" + "Micro": "1.post2" }, "Author": "Sven Heidemann", "AuthorEmail": "sven.heidemann@sh-edraft.de", @@ -16,7 +16,7 @@ "LicenseName": "MIT", "LicenseDescription": "MIT, see LICENSE for more details.", "Dependencies": [ - "cpl-core==2022.12.1.post1" + "cpl-core>=2022.12.1.post2" ], "DevDependencies": [], "PythonVersion": ">=3.10", diff --git a/src/cpl_cli/helper/__init__.py b/src/cpl_cli/helper/__init__.py index 503db400..bead37b9 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__ = '2022.12.1.post1' +__version__ = '2022.12.1.post2' from collections import namedtuple @@ -23,4 +23,4 @@ from collections import namedtuple # imports: VersionInfo = namedtuple('VersionInfo', 'major minor micro') -version_info = VersionInfo(major='2022', minor='12', micro='1.post1') +version_info = VersionInfo(major='2022', minor='12', micro='1.post2') diff --git a/src/cpl_cli/live_server/__init__.py b/src/cpl_cli/live_server/__init__.py index 27db3bf9..8f3432eb 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__ = '2022.12.1.post1' +__version__ = '2022.12.1.post2' from collections import namedtuple @@ -23,4 +23,4 @@ from collections import namedtuple # imports: VersionInfo = namedtuple('VersionInfo', 'major minor micro') -version_info = VersionInfo(major='2022', minor='12', micro='1.post1') +version_info = VersionInfo(major='2022', minor='12', micro='1.post2') diff --git a/src/cpl_cli/migrations/__init__.py b/src/cpl_cli/migrations/__init__.py index b6c9cb3b..a5949242 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__ = '2022.12.1.post1' +__version__ = '2022.12.1.post2' from collections import namedtuple @@ -23,4 +23,4 @@ from collections import namedtuple # imports VersionInfo = namedtuple('VersionInfo', 'major minor micro') -version_info = VersionInfo(major='2022', minor='12', micro='1.post1') +version_info = VersionInfo(major='2022', minor='12', micro='1.post2') diff --git a/src/cpl_cli/migrations/base/__init__.py b/src/cpl_cli/migrations/base/__init__.py index 549d754b..c34d71d5 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__ = '2022.12.1.post1' +__version__ = '2022.12.1.post2' from collections import namedtuple @@ -23,4 +23,4 @@ from collections import namedtuple # imports: VersionInfo = namedtuple('VersionInfo', 'major minor micro') -version_info = VersionInfo(major='2022', minor='12', micro='1.post1') +version_info = VersionInfo(major='2022', minor='12', micro='1.post2') diff --git a/src/cpl_cli/migrations/service/__init__.py b/src/cpl_cli/migrations/service/__init__.py index 3f4c03bc..0345dff1 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__ = '2022.12.1.post1' +__version__ = '2022.12.1.post2' from collections import namedtuple @@ -23,4 +23,4 @@ from collections import namedtuple # imports: VersionInfo = namedtuple('VersionInfo', 'major minor micro') -version_info = VersionInfo(major='2022', minor='12', micro='1.post1') +version_info = VersionInfo(major='2022', minor='12', micro='1.post2') diff --git a/src/cpl_cli/publish/__init__.py b/src/cpl_cli/publish/__init__.py index b0e5f369..33e0b02f 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__ = '2022.12.1.post1' +__version__ = '2022.12.1.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='2022', minor='12', micro='1.post1') +version_info = VersionInfo(major='2022', minor='12', micro='1.post2') diff --git a/src/cpl_cli/source_creator/__init__.py b/src/cpl_cli/source_creator/__init__.py index 48148416..7db8f07b 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__ = '2022.12.1.post1' +__version__ = '2022.12.1.post2' from collections import namedtuple @@ -23,4 +23,4 @@ from collections import namedtuple # imports: VersionInfo = namedtuple('VersionInfo', 'major minor micro') -version_info = VersionInfo(major='2022', minor='12', micro='1.post1') +version_info = VersionInfo(major='2022', minor='12', micro='1.post2') diff --git a/src/cpl_cli/validators/__init__.py b/src/cpl_cli/validators/__init__.py index 4b99fdf1..777b1f30 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__ = '2022.12.1.post1' +__version__ = '2022.12.1.post2' from collections import namedtuple @@ -23,4 +23,4 @@ from collections import namedtuple # imports: VersionInfo = namedtuple('VersionInfo', 'major minor micro') -version_info = VersionInfo(major='2022', minor='12', micro='1.post1') +version_info = VersionInfo(major='2022', minor='12', micro='1.post2') From 8b40c656612a7dcf067af799b88a7147cfec35ca Mon Sep 17 00:00:00 2001 From: Sven Heidemann Date: Thu, 12 Jan 2023 13:48:55 +0100 Subject: [PATCH 06/12] Fixed discord event schematic --- src/cpl_discord/.cpl/__init__.py | 4 +- .../.cpl/schematic_discord_event.py | 38 ++++++++++++++----- 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 +- 11 files changed, 48 insertions(+), 28 deletions(-) diff --git a/src/cpl_discord/.cpl/__init__.py b/src/cpl_discord/.cpl/__init__.py index 25c717b1..6c75166f 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__ = '2022.12.1.post1' +__version__ = '2022.12.1.post2' from collections import namedtuple @@ -23,4 +23,4 @@ from collections import namedtuple # imports: VersionInfo = namedtuple('VersionInfo', 'major minor micro') -version_info = VersionInfo(major='2022', minor='12', micro='1.post1') +version_info = VersionInfo(major='2022', minor='12', micro='1.post2') diff --git a/src/cpl_discord/.cpl/schematic_discord_event.py b/src/cpl_discord/.cpl/schematic_discord_event.py index 43f08354..d3c2387b 100644 --- a/src/cpl_discord/.cpl/schematic_discord_event.py +++ b/src/cpl_discord/.cpl/schematic_discord_event.py @@ -12,14 +12,16 @@ class Event(GenerateSchematicABC): GenerateSchematicABC.__init__(self, name, schematic, path) event = None + event_class = None from cpl_discord.discord_event_types_enum import DiscordEventTypesEnum for event_type in DiscordEventTypesEnum: event_name = event_type.value.__name__.replace("ABC", '') - if event_name in name: + if name.endswith(event_name): name = name.replace(event_name, "") event = event_name + event_class = event_type.value break if event is None: @@ -29,15 +31,27 @@ class Event(GenerateSchematicABC): Console.write_line(f'\t{event_type.value.__name__.replace("ABC", "")}') sys.exit() - self._event_class = f'{event}ABC' - self._name = f'{String.convert_to_snake_case(self._event_class.replace("ABC", ""))}_{schematic}.py' - self._class_name = f'{self._event_class.replace("ABC", "")}{String.first_to_upper(schematic)}' + self._event_class_name = f'{event}ABC' + event_snake_case = String.convert_to_snake_case(self._event_class_name.replace("ABC", "")) + + if event_snake_case.lower() not in dir(event_class): + Console.error(f'Error in event {event}: Function {event_snake_case} not found!') + sys.exit() + + self._name = f'{event_snake_case}_{schematic}.py' + self._class_name = f'{self._event_class_name.replace("ABC", "")}{String.first_to_upper(schematic)}' + + from inspect import signature + self._func_name = event_snake_case + self._signature = str(signature(getattr(event_class, event_snake_case)))[1:][:-1] + if name != '': - self._name = f'{String.convert_to_snake_case(name)}_{self._name}' - self._class_name = f'{String.first_to_upper(name)}{self._class_name}' + self._name = f'{String.convert_to_snake_case(name)}_{self._name}' + self._class_name = f'{String.first_to_upper(name)}{self._class_name}' def get_code(self) -> str: code = """\ + import discord from cpl_core.logging import LoggerABC from cpl_discord.events import $EventClass from cpl_discord.service import DiscordBotServiceABC @@ -50,15 +64,21 @@ class Event(GenerateSchematicABC): logger: LoggerABC, bot: DiscordBotServiceABC, ): - OnReadyABC.__init__(self) + $EventClass.__init__(self) self._logger = logger self._bot = bot - async def on_ready(self): + async def $Func($Signature): pass """ - return self.build_code_str(code, Name=self._class_name, EventClass=self._event_class) + return self.build_code_str( + code, + Name=self._class_name, + EventClass=self._event_class_name, + Func=self._func_name, + Signature=self._signature + ) @classmethod def register(cls): diff --git a/src/cpl_discord/__init__.py b/src/cpl_discord/__init__.py index 046a599f..2d33b3f7 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__ = '2022.12.1.post1' +__version__ = '2022.12.1.post2' from collections import namedtuple @@ -55,4 +55,4 @@ def get_discord_collection(services: 'ServiceCollectionABC') -> 'DiscordCollecti # build-ignore-end VersionInfo = namedtuple('VersionInfo', 'major minor micro') -version_info = VersionInfo(major='2022', minor='12', micro='1.post1') +version_info = VersionInfo(major='2022', minor='12', micro='1.post2') diff --git a/src/cpl_discord/application/__init__.py b/src/cpl_discord/application/__init__.py index fc324cb3..caabdd76 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__ = '2022.12.1.post1' +__version__ = '2022.12.1.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='2022', minor='12', micro='1.post1') +version_info = VersionInfo(major='2022', minor='12', micro='1.post2') diff --git a/src/cpl_discord/command/__init__.py b/src/cpl_discord/command/__init__.py index bd8ffa24..1d3836b2 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__ = '2022.12.1.post1' +__version__ = '2022.12.1.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='2022', minor='12', micro='1.post1') +version_info = VersionInfo(major='2022', minor='12', micro='1.post2') diff --git a/src/cpl_discord/configuration/__init__.py b/src/cpl_discord/configuration/__init__.py index 8fca7136..7278a1b9 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__ = '2022.12.1.post1' +__version__ = '2022.12.1.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='2022', minor='12', micro='1.post1') +version_info = VersionInfo(major='2022', minor='12', micro='1.post2') diff --git a/src/cpl_discord/container/__init__.py b/src/cpl_discord/container/__init__.py index 430aac56..606b067c 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__ = '2022.12.1.post1' +__version__ = '2022.12.1.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='2022', minor='12', micro='1.post1') +version_info = VersionInfo(major='2022', minor='12', micro='1.post2') diff --git a/src/cpl_discord/cpl-discord.json b/src/cpl_discord/cpl-discord.json index d75b5cf7..bf3c28fe 100644 --- a/src/cpl_discord/cpl-discord.json +++ b/src/cpl_discord/cpl-discord.json @@ -4,7 +4,7 @@ "Version": { "Major": "2022", "Minor": "12", - "Micro": "1.post1" + "Micro": "1.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 6c4fe2b3..499ed9ac 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__ = '2022.12.1.post1' +__version__ = '2022.12.1.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='2022', minor='12', micro='1.post1') +version_info = VersionInfo(major='2022', minor='12', micro='1.post2') diff --git a/src/cpl_discord/helper/__init__.py b/src/cpl_discord/helper/__init__.py index caaec2b4..6fabdc5c 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__ = '2022.12.1.post1' +__version__ = '2022.12.1.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='2022', minor='12', micro='1.post1') +version_info = VersionInfo(major='2022', minor='12', micro='1.post2') diff --git a/src/cpl_discord/service/__init__.py b/src/cpl_discord/service/__init__.py index 6f0d18c5..a7e5d9c6 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__ = '2022.12.1.post1' +__version__ = '2022.12.1.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='2022', minor='12', micro='1.post1') +version_info = VersionInfo(major='2022', minor='12', micro='1.post2') From 269f083662f283425d2a6490bfbdf0bc8ea6cae1 Mon Sep 17 00:00:00 2001 From: Sven Heidemann Date: Sun, 15 Jan 2023 02:33:56 +0100 Subject: [PATCH 07/12] Fixed static inject args order --- 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/dependency_injection/service_provider_abc.py | 2 +- 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 e75ed564..6c188e3c 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__ = '2022.12.1.post2' +__version__ = '2022.12.1.post3' from collections import namedtuple @@ -23,4 +23,4 @@ from collections import namedtuple # imports: VersionInfo = namedtuple('VersionInfo', 'major minor micro') -version_info = VersionInfo(major='2022', minor='12', micro='1.post2') +version_info = VersionInfo(major='2022', minor='12', micro='1.post3') diff --git a/src/cpl_core/application/__init__.py b/src/cpl_core/application/__init__.py index 3ab17bdb..37306db8 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__ = '2022.12.1.post2' +__version__ = '2022.12.1.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='2022', minor='12', micro='1.post2') +version_info = VersionInfo(major='2022', minor='12', micro='1.post3') diff --git a/src/cpl_core/configuration/__init__.py b/src/cpl_core/configuration/__init__.py index ff4e64ca..eb98dff5 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__ = '2022.12.1.post2' +__version__ = '2022.12.1.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='2022', minor='12', micro='1.post2') +version_info = VersionInfo(major='2022', minor='12', micro='1.post3') diff --git a/src/cpl_core/console/__init__.py b/src/cpl_core/console/__init__.py index d74f0dd6..847102e2 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__ = '2022.12.1.post2' +__version__ = '2022.12.1.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='2022', minor='12', micro='1.post2') +version_info = VersionInfo(major='2022', minor='12', micro='1.post3') diff --git a/src/cpl_core/cpl-core.json b/src/cpl_core/cpl-core.json index 681f8c9c..cf09d6ac 100644 --- a/src/cpl_core/cpl-core.json +++ b/src/cpl_core/cpl-core.json @@ -4,7 +4,7 @@ "Version": { "Major": "2022", "Minor": "12", - "Micro": "1.post2" + "Micro": "1.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 1422f1e1..e24fcdb7 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__ = '2022.12.1.post2' +__version__ = '2022.12.1.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='2022', minor='12', micro='1.post2') +version_info = VersionInfo(major='2022', minor='12', micro='1.post3') diff --git a/src/cpl_core/database/connection/__init__.py b/src/cpl_core/database/connection/__init__.py index 36aa42d7..2a74b218 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__ = '2022.12.1.post2' +__version__ = '2022.12.1.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='2022', minor='12', micro='1.post2') +version_info = VersionInfo(major='2022', minor='12', micro='1.post3') diff --git a/src/cpl_core/database/context/__init__.py b/src/cpl_core/database/context/__init__.py index 4436f9c1..409ec55e 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__ = '2022.12.1.post2' +__version__ = '2022.12.1.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='2022', minor='12', micro='1.post2') +version_info = VersionInfo(major='2022', minor='12', micro='1.post3') diff --git a/src/cpl_core/dependency_injection/__init__.py b/src/cpl_core/dependency_injection/__init__.py index 05a2037c..1b3a6251 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__ = '2022.12.1.post2' +__version__ = '2022.12.1.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='2022', minor='12', micro='1.post2') +version_info = VersionInfo(major='2022', minor='12', micro='1.post3') diff --git a/src/cpl_core/dependency_injection/service_provider_abc.py b/src/cpl_core/dependency_injection/service_provider_abc.py index bf7e851e..5013a670 100644 --- a/src/cpl_core/dependency_injection/service_provider_abc.py +++ b/src/cpl_core/dependency_injection/service_provider_abc.py @@ -111,6 +111,6 @@ class ServiceProviderABC(ABC): raise Exception(f'{cls.__name__} not build!') injection = [x for x in cls._provider.build_by_signature(signature(f)) if x is not None] - return f(*injection, *args, **kwargs) + return f(*args, *injection, **kwargs) return inner diff --git a/src/cpl_core/environment/__init__.py b/src/cpl_core/environment/__init__.py index 2a3ba33d..3325be9f 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__ = '2022.12.1.post2' +__version__ = '2022.12.1.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='2022', minor='12', micro='1.post2') +version_info = VersionInfo(major='2022', minor='12', micro='1.post3') diff --git a/src/cpl_core/logging/__init__.py b/src/cpl_core/logging/__init__.py index f8bef11e..290a53ea 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__ = '2022.12.1.post2' +__version__ = '2022.12.1.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='2022', minor='12', micro='1.post2') +version_info = VersionInfo(major='2022', minor='12', micro='1.post3') diff --git a/src/cpl_core/mailing/__init__.py b/src/cpl_core/mailing/__init__.py index 4cd5012b..661fff4e 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__ = '2022.12.1.post2' +__version__ = '2022.12.1.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='2022', minor='12', micro='1.post2') +version_info = VersionInfo(major='2022', minor='12', micro='1.post3') diff --git a/src/cpl_core/pipes/__init__.py b/src/cpl_core/pipes/__init__.py index dc270fdc..ff519295 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__ = '2022.12.1.post2' +__version__ = '2022.12.1.post3' from collections import namedtuple @@ -30,4 +30,4 @@ from .to_camel_case_pipe import ToCamelCasePipe from .to_snake_case_pipe import ToSnakeCasePipe VersionInfo = namedtuple('VersionInfo', 'major minor micro') -version_info = VersionInfo(major='2022', minor='12', micro='1.post2') +version_info = VersionInfo(major='2022', minor='12', micro='1.post3') diff --git a/src/cpl_core/time/__init__.py b/src/cpl_core/time/__init__.py index aae4c510..4356202e 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__ = '2022.12.1.post2' +__version__ = '2022.12.1.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='2022', minor='12', micro='1.post2') +version_info = VersionInfo(major='2022', minor='12', micro='1.post3') diff --git a/src/cpl_core/utils/__init__.py b/src/cpl_core/utils/__init__.py index 166772e9..522edc1f 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__ = '2022.12.1.post2' +__version__ = '2022.12.1.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='2022', minor='12', micro='1.post2') +version_info = VersionInfo(major='2022', minor='12', micro='1.post3') From 2c3664c1b961ab165c40097a812c4a034ab7eee6 Mon Sep 17 00:00:00 2001 From: Sven Heidemann Date: Sun, 15 Jan 2023 10:01:05 +0100 Subject: [PATCH 08/12] Fixed schematic schematic --- src/cpl_cli/.cpl/__init__.py | 4 ++-- src/cpl_cli/.cpl/schematic_schematic.py | 2 +- 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/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 574614d3..98e1b444 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__ = '2022.12.1.post2' +__version__ = '2022.12.1.post3' from collections import namedtuple @@ -23,4 +23,4 @@ from collections import namedtuple # imports: VersionInfo = namedtuple('VersionInfo', 'major minor micro') -version_info = VersionInfo(major='2022', minor='12', micro='1.post2') +version_info = VersionInfo(major='2022', minor='12', micro='1.post3') diff --git a/src/cpl_cli/.cpl/schematic_schematic.py b/src/cpl_cli/.cpl/schematic_schematic.py index b62d2277..20d5bc2b 100644 --- a/src/cpl_cli/.cpl/schematic_schematic.py +++ b/src/cpl_cli/.cpl/schematic_schematic.py @@ -40,7 +40,7 @@ class Schematic(GenerateSchematicABC): [] ) """ - return self.build_code_str(code, Name=self._class_name) + return self.build_code_str(code, Name=self._class_name, NameLower=self._class_name.lower()) @classmethod def register(cls): diff --git a/src/cpl_cli/__init__.py b/src/cpl_cli/__init__.py index eadf291f..399fcd14 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__ = '2022.12.1.post2' +__version__ = '2022.12.1.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='2022', minor='12', micro='1.post2') +version_info = VersionInfo(major='2022', minor='12', micro='1.post3') diff --git a/src/cpl_cli/_templates/__init__.py b/src/cpl_cli/_templates/__init__.py index 7129a39f..85154315 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__ = '2022.12.1.post2' +__version__ = '2022.12.1.post3' from collections import namedtuple @@ -23,4 +23,4 @@ from collections import namedtuple # imports: VersionInfo = namedtuple('VersionInfo', 'major minor micro') -version_info = VersionInfo(major='2022', minor='12', micro='1.post2') +version_info = VersionInfo(major='2022', minor='12', micro='1.post3') diff --git a/src/cpl_cli/_templates/build/__init__.py b/src/cpl_cli/_templates/build/__init__.py index c2c411b3..923492ff 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__ = '2022.12.1.post2' +__version__ = '2022.12.1.post3' from collections import namedtuple @@ -23,4 +23,4 @@ from collections import namedtuple # imports: VersionInfo = namedtuple('VersionInfo', 'major minor micro') -version_info = VersionInfo(major='2022', minor='12', micro='1.post2') +version_info = VersionInfo(major='2022', minor='12', micro='1.post3') diff --git a/src/cpl_cli/_templates/publish/__init__.py b/src/cpl_cli/_templates/publish/__init__.py index 8d3ec898..6ec123a5 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__ = '2022.12.1.post2' +__version__ = '2022.12.1.post3' from collections import namedtuple @@ -23,4 +23,4 @@ from collections import namedtuple # imports: VersionInfo = namedtuple('VersionInfo', 'major minor micro') -version_info = VersionInfo(major='2022', minor='12', micro='1.post2') +version_info = VersionInfo(major='2022', minor='12', micro='1.post3') diff --git a/src/cpl_cli/abc/__init__.py b/src/cpl_cli/abc/__init__.py index 067beecf..f3154093 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__ = '2022.12.1.post2' +__version__ = '2022.12.1.post3' from collections import namedtuple @@ -23,4 +23,4 @@ from collections import namedtuple # imports VersionInfo = namedtuple('VersionInfo', 'major minor micro') -version_info = VersionInfo(major='2022', minor='12', micro='1.post2') +version_info = VersionInfo(major='2022', minor='12', micro='1.post3') diff --git a/src/cpl_cli/command/__init__.py b/src/cpl_cli/command/__init__.py index 461d1eae..db2a56ce 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__ = '2022.12.1.post2' +__version__ = '2022.12.1.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='2022', minor='12', micro='1.post2') +version_info = VersionInfo(major='2022', minor='12', micro='1.post3') diff --git a/src/cpl_cli/configuration/__init__.py b/src/cpl_cli/configuration/__init__.py index ffdc24c5..d31b59b9 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__ = '2022.12.1.post2' +__version__ = '2022.12.1.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='2022', minor='12', micro='1.post2') +version_info = VersionInfo(major='2022', minor='12', micro='1.post3') diff --git a/src/cpl_cli/cpl-cli.json b/src/cpl_cli/cpl-cli.json index 8dadccc0..49a57385 100644 --- a/src/cpl_cli/cpl-cli.json +++ b/src/cpl_cli/cpl-cli.json @@ -4,7 +4,7 @@ "Version": { "Major": "2022", "Minor": "12", - "Micro": "1.post2" + "Micro": "1.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 bead37b9..f937b598 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__ = '2022.12.1.post2' +__version__ = '2022.12.1.post3' from collections import namedtuple @@ -23,4 +23,4 @@ from collections import namedtuple # imports: VersionInfo = namedtuple('VersionInfo', 'major minor micro') -version_info = VersionInfo(major='2022', minor='12', micro='1.post2') +version_info = VersionInfo(major='2022', minor='12', micro='1.post3') diff --git a/src/cpl_cli/live_server/__init__.py b/src/cpl_cli/live_server/__init__.py index 8f3432eb..95eb917c 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__ = '2022.12.1.post2' +__version__ = '2022.12.1.post3' from collections import namedtuple @@ -23,4 +23,4 @@ from collections import namedtuple # imports: VersionInfo = namedtuple('VersionInfo', 'major minor micro') -version_info = VersionInfo(major='2022', minor='12', micro='1.post2') +version_info = VersionInfo(major='2022', minor='12', micro='1.post3') diff --git a/src/cpl_cli/migrations/__init__.py b/src/cpl_cli/migrations/__init__.py index a5949242..74997010 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__ = '2022.12.1.post2' +__version__ = '2022.12.1.post3' from collections import namedtuple @@ -23,4 +23,4 @@ from collections import namedtuple # imports VersionInfo = namedtuple('VersionInfo', 'major minor micro') -version_info = VersionInfo(major='2022', minor='12', micro='1.post2') +version_info = VersionInfo(major='2022', minor='12', micro='1.post3') diff --git a/src/cpl_cli/migrations/base/__init__.py b/src/cpl_cli/migrations/base/__init__.py index c34d71d5..612dba9b 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__ = '2022.12.1.post2' +__version__ = '2022.12.1.post3' from collections import namedtuple @@ -23,4 +23,4 @@ from collections import namedtuple # imports: VersionInfo = namedtuple('VersionInfo', 'major minor micro') -version_info = VersionInfo(major='2022', minor='12', micro='1.post2') +version_info = VersionInfo(major='2022', minor='12', micro='1.post3') diff --git a/src/cpl_cli/migrations/service/__init__.py b/src/cpl_cli/migrations/service/__init__.py index 0345dff1..010f6a3f 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__ = '2022.12.1.post2' +__version__ = '2022.12.1.post3' from collections import namedtuple @@ -23,4 +23,4 @@ from collections import namedtuple # imports: VersionInfo = namedtuple('VersionInfo', 'major minor micro') -version_info = VersionInfo(major='2022', minor='12', micro='1.post2') +version_info = VersionInfo(major='2022', minor='12', micro='1.post3') diff --git a/src/cpl_cli/publish/__init__.py b/src/cpl_cli/publish/__init__.py index 33e0b02f..411850e7 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__ = '2022.12.1.post2' +__version__ = '2022.12.1.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='2022', minor='12', micro='1.post2') +version_info = VersionInfo(major='2022', minor='12', micro='1.post3') diff --git a/src/cpl_cli/source_creator/__init__.py b/src/cpl_cli/source_creator/__init__.py index 7db8f07b..6e881ddb 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__ = '2022.12.1.post2' +__version__ = '2022.12.1.post3' from collections import namedtuple @@ -23,4 +23,4 @@ from collections import namedtuple # imports: VersionInfo = namedtuple('VersionInfo', 'major minor micro') -version_info = VersionInfo(major='2022', minor='12', micro='1.post2') +version_info = VersionInfo(major='2022', minor='12', micro='1.post3') diff --git a/src/cpl_cli/validators/__init__.py b/src/cpl_cli/validators/__init__.py index 777b1f30..f7a04b6d 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__ = '2022.12.1.post2' +__version__ = '2022.12.1.post3' from collections import namedtuple @@ -23,4 +23,4 @@ from collections import namedtuple # imports: VersionInfo = namedtuple('VersionInfo', 'major minor micro') -version_info = VersionInfo(major='2022', minor='12', micro='1.post2') +version_info = VersionInfo(major='2022', minor='12', micro='1.post3') From 81795082488fc135c1f45188da7d457d21e1ccbb Mon Sep 17 00:00:00 2001 From: Sven Heidemann Date: Mon, 13 Feb 2023 16:58:46 +0100 Subject: [PATCH 09/12] Added scheduled event support for cpl-discord --- 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/discord_event_types_enum.py | 10 +++++++ src/cpl_discord/events/__init__.py | 4 +-- .../events/on_scheduled_event_create_abc.py | 11 +++++++ .../events/on_scheduled_event_delete_abc.py | 11 +++++++ .../events/on_scheduled_event_update_abc.py | 11 +++++++ .../events/on_scheduled_event_user_add_abc.py | 11 +++++++ .../on_scheduled_event_user_remove_abc.py | 11 +++++++ src/cpl_discord/helper/__init__.py | 4 +-- src/cpl_discord/service/__init__.py | 4 +-- src/cpl_discord/service/discord_service.py | 30 +++++++++++++++++++ 17 files changed, 118 insertions(+), 23 deletions(-) create mode 100644 src/cpl_discord/events/on_scheduled_event_create_abc.py create mode 100644 src/cpl_discord/events/on_scheduled_event_delete_abc.py create mode 100644 src/cpl_discord/events/on_scheduled_event_update_abc.py create mode 100644 src/cpl_discord/events/on_scheduled_event_user_add_abc.py create mode 100644 src/cpl_discord/events/on_scheduled_event_user_remove_abc.py diff --git a/src/cpl_discord/.cpl/__init__.py b/src/cpl_discord/.cpl/__init__.py index 6c75166f..dcada057 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__ = '2022.12.1.post2' +__version__ = '2022.12.2' from collections import namedtuple @@ -23,4 +23,4 @@ from collections import namedtuple # imports: VersionInfo = namedtuple('VersionInfo', 'major minor micro') -version_info = VersionInfo(major='2022', minor='12', micro='1.post2') +version_info = VersionInfo(major='2022', minor='12', micro='2') diff --git a/src/cpl_discord/__init__.py b/src/cpl_discord/__init__.py index 2d33b3f7..100e9dd6 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__ = '2022.12.1.post2' +__version__ = '2022.12.2' from collections import namedtuple @@ -55,4 +55,4 @@ def get_discord_collection(services: 'ServiceCollectionABC') -> 'DiscordCollecti # build-ignore-end VersionInfo = namedtuple('VersionInfo', 'major minor micro') -version_info = VersionInfo(major='2022', minor='12', micro='1.post2') +version_info = VersionInfo(major='2022', minor='12', micro='2') diff --git a/src/cpl_discord/application/__init__.py b/src/cpl_discord/application/__init__.py index caabdd76..838c6c15 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__ = '2022.12.1.post2' +__version__ = '2022.12.2' 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='2022', minor='12', micro='1.post2') +version_info = VersionInfo(major='2022', minor='12', micro='2') diff --git a/src/cpl_discord/command/__init__.py b/src/cpl_discord/command/__init__.py index 1d3836b2..0b5b94db 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__ = '2022.12.1.post2' +__version__ = '2022.12.2' 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='2022', minor='12', micro='1.post2') +version_info = VersionInfo(major='2022', minor='12', micro='2') diff --git a/src/cpl_discord/configuration/__init__.py b/src/cpl_discord/configuration/__init__.py index 7278a1b9..0fefae46 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__ = '2022.12.1.post2' +__version__ = '2022.12.2' 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='2022', minor='12', micro='1.post2') +version_info = VersionInfo(major='2022', minor='12', micro='2') diff --git a/src/cpl_discord/container/__init__.py b/src/cpl_discord/container/__init__.py index 606b067c..3ce5277a 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__ = '2022.12.1.post2' +__version__ = '2022.12.2' 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='2022', minor='12', micro='1.post2') +version_info = VersionInfo(major='2022', minor='12', micro='2') diff --git a/src/cpl_discord/cpl-discord.json b/src/cpl_discord/cpl-discord.json index bf3c28fe..b9ece160 100644 --- a/src/cpl_discord/cpl-discord.json +++ b/src/cpl_discord/cpl-discord.json @@ -4,7 +4,7 @@ "Version": { "Major": "2022", "Minor": "12", - "Micro": "1.post2" + "Micro": "2" }, "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>=2022.12.1.post2", - "discord.py==2.1.0", - "cpl-query>=2022.12.2.post1" + "cpl-core==2022.12.1.post3", + "discord.py==2.1.1", + "cpl-query==2022.12.2.post1" ], "DevDependencies": [ - "cpl-cli>=2022.12.1" + "cpl-cli==2022.12.1.post3" ], "PythonVersion": ">=3.10", "PythonPath": {}, diff --git a/src/cpl_discord/discord_event_types_enum.py b/src/cpl_discord/discord_event_types_enum.py index c8069eab..9d306cb7 100644 --- a/src/cpl_discord/discord_event_types_enum.py +++ b/src/cpl_discord/discord_event_types_enum.py @@ -47,6 +47,11 @@ from cpl_discord.events.on_reaction_clear_emoji_abc import OnReactionClearEmojiA from cpl_discord.events.on_reaction_remove_abc import OnReactionRemoveABC from cpl_discord.events.on_ready_abc import OnReadyABC from cpl_discord.events.on_resume_abc import OnResumeABC +from cpl_discord.events.on_scheduled_event_create_abc import OnScheduledEventCreateABC +from cpl_discord.events.on_scheduled_event_delete_abc import OnScheduledEventDeleteABC +from cpl_discord.events.on_scheduled_event_update_abc import OnScheduledEventUpdateABC +from cpl_discord.events.on_scheduled_event_user_add_abc import OnScheduledEventUserAddABC +from cpl_discord.events.on_scheduled_event_user_remove_abc import OnScheduledEventUserRemoveABC 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 @@ -76,6 +81,11 @@ class DiscordEventTypesEnum(Enum): on_guild_role_delete = OnGuildRoleDeleteABC on_guild_role_update = OnGuildRoleUpdateABC on_guild_unavailable = OnGuildUnavailableABC + on_scheduled_event_create = OnScheduledEventCreateABC + on_scheduled_event_delete = OnScheduledEventDeleteABC + on_scheduled_event_update = OnScheduledEventUpdateABC + on_scheduled_event_user_add = OnScheduledEventUserAddABC + on_scheduled_event_user_remove = OnScheduledEventUserRemoveABC on_guild_update = OnGuildUpdateABC on_invite_create = OnInviteCreateABC on_invite_delete = OnInviteDeleteABC diff --git a/src/cpl_discord/events/__init__.py b/src/cpl_discord/events/__init__.py index 499ed9ac..dd5c3304 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__ = '2022.12.1.post2' +__version__ = '2022.12.2' 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='2022', minor='12', micro='1.post2') +version_info = VersionInfo(major='2022', minor='12', micro='2') diff --git a/src/cpl_discord/events/on_scheduled_event_create_abc.py b/src/cpl_discord/events/on_scheduled_event_create_abc.py new file mode 100644 index 00000000..a83a6e33 --- /dev/null +++ b/src/cpl_discord/events/on_scheduled_event_create_abc.py @@ -0,0 +1,11 @@ +from abc import ABC, abstractmethod +import discord + + +class OnScheduledEventCreateABC(ABC): + + @abstractmethod + def __init__(self): pass + + @abstractmethod + async def on_scheduled_event_create(self, event: discord.ScheduledEvent): pass diff --git a/src/cpl_discord/events/on_scheduled_event_delete_abc.py b/src/cpl_discord/events/on_scheduled_event_delete_abc.py new file mode 100644 index 00000000..afec0ce7 --- /dev/null +++ b/src/cpl_discord/events/on_scheduled_event_delete_abc.py @@ -0,0 +1,11 @@ +from abc import ABC, abstractmethod +import discord + + +class OnScheduledEventDeleteABC(ABC): + + @abstractmethod + def __init__(self): pass + + @abstractmethod + async def on_scheduled_event_delete(self, event: discord.ScheduledEvent): pass diff --git a/src/cpl_discord/events/on_scheduled_event_update_abc.py b/src/cpl_discord/events/on_scheduled_event_update_abc.py new file mode 100644 index 00000000..b78ba357 --- /dev/null +++ b/src/cpl_discord/events/on_scheduled_event_update_abc.py @@ -0,0 +1,11 @@ +from abc import ABC, abstractmethod +import discord + + +class OnScheduledEventUpdateABC(ABC): + + @abstractmethod + def __init__(self): pass + + @abstractmethod + async def on_scheduled_event_update(self, before: discord.ScheduledEvent, after: discord.ScheduledEvent): pass diff --git a/src/cpl_discord/events/on_scheduled_event_user_add_abc.py b/src/cpl_discord/events/on_scheduled_event_user_add_abc.py new file mode 100644 index 00000000..944ab298 --- /dev/null +++ b/src/cpl_discord/events/on_scheduled_event_user_add_abc.py @@ -0,0 +1,11 @@ +from abc import ABC, abstractmethod +import discord + + +class OnScheduledEventUserAddABC(ABC): + + @abstractmethod + def __init__(self): pass + + @abstractmethod + async def on_scheduled_event_user_add(self, event: discord.ScheduledEvent, user: discord.User): pass diff --git a/src/cpl_discord/events/on_scheduled_event_user_remove_abc.py b/src/cpl_discord/events/on_scheduled_event_user_remove_abc.py new file mode 100644 index 00000000..0839207f --- /dev/null +++ b/src/cpl_discord/events/on_scheduled_event_user_remove_abc.py @@ -0,0 +1,11 @@ +from abc import ABC, abstractmethod +import discord + + +class OnScheduledEventUserRemoveABC(ABC): + + @abstractmethod + def __init__(self): pass + + @abstractmethod + async def on_scheduled_event_user_remove(self, event: discord.ScheduledEvent, user: discord.User): pass diff --git a/src/cpl_discord/helper/__init__.py b/src/cpl_discord/helper/__init__.py index 6fabdc5c..b29a74a0 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__ = '2022.12.1.post2' +__version__ = '2022.12.2' 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='2022', minor='12', micro='1.post2') +version_info = VersionInfo(major='2022', minor='12', micro='2') diff --git a/src/cpl_discord/service/__init__.py b/src/cpl_discord/service/__init__.py index a7e5d9c6..d8e5a409 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__ = '2022.12.1.post2' +__version__ = '2022.12.2' 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='2022', minor='12', micro='1.post2') +version_info = VersionInfo(major='2022', minor='12', micro='2') diff --git a/src/cpl_discord/service/discord_service.py b/src/cpl_discord/service/discord_service.py index 6316952d..44c09db6 100644 --- a/src/cpl_discord/service/discord_service.py +++ b/src/cpl_discord/service/discord_service.py @@ -57,6 +57,11 @@ from cpl_discord.events.on_reaction_clear_emoji_abc import OnReactionClearEmojiA from cpl_discord.events.on_reaction_remove_abc import OnReactionRemoveABC from cpl_discord.events.on_ready_abc import OnReadyABC from cpl_discord.events.on_resume_abc import OnResumeABC +from cpl_discord.events.on_scheduled_event_create_abc import OnScheduledEventCreateABC +from cpl_discord.events.on_scheduled_event_delete_abc import OnScheduledEventDeleteABC +from cpl_discord.events.on_scheduled_event_update_abc import OnScheduledEventUpdateABC +from cpl_discord.events.on_scheduled_event_user_add_abc import OnScheduledEventUserAddABC +from cpl_discord.events.on_scheduled_event_user_remove_abc import OnScheduledEventUserRemoveABC 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 @@ -339,6 +344,31 @@ class DiscordService(DiscordServiceABC, commands.Cog, metaclass=DiscordCogMeta): self._logger.trace(__name__, f'Received on_guild_unavailable:\n\t{guild}') await self._handle_event(OnGuildUnavailableABC, guild) + @commands.Cog.listener() + async def on_scheduled_event_create(self, event: discord.ScheduledEvent): + self._logger.trace(__name__, f'Received on_scheduled_event_create:\n\t{event}') + await self._handle_event(OnScheduledEventCreateABC, event) + + @commands.Cog.listener() + async def on_scheduled_event_delete(self, event: discord.ScheduledEvent): + self._logger.trace(__name__, f'Received on_scheduled_event_delete:\n\t{event}') + await self._handle_event(OnScheduledEventDeleteABC, event) + + @commands.Cog.listener() + async def on_scheduled_event_update(self, before: discord.ScheduledEvent, after: discord.ScheduledEvent): + self._logger.trace(__name__, f'Received on_scheduled_event_update:\n\t{before}, {after}') + await self._handle_event(OnScheduledEventUpdateABC, before, after) + + @commands.Cog.listener() + async def on_scheduled_event_user_add(self, event: discord.ScheduledEvent, user: discord.User): + self._logger.trace(__name__, f'Received on_scheduled_event_user_add:\n\t{event}, {user}') + await self._handle_event(OnScheduledEventUserAddABC, event, user) + + @commands.Cog.listener() + async def on_scheduled_event_user_remove(self, event: discord.ScheduledEvent, user: discord.User): + self._logger.trace(__name__, f'Received on_scheduled_event_user_remove:\n\t{event}, {user}') + await self._handle_event(OnScheduledEventUserRemoveABC, event, user) + @commands.Cog.listener() async def on_voice_state_update(self, member: discord.Member, before: discord.VoiceState, after: discord.VoiceState): self._logger.trace(__name__, f'Received on_voice_state_update:\n\t{member}\n\t{before}\n\t{after}') From faa030df966a30eb8b0af2cdd5c1abe3233e8d8a Mon Sep 17 00:00:00 2001 From: Sven Heidemann Date: Mon, 6 Mar 2023 19:03:01 +0100 Subject: [PATCH 10/12] Fixed typing --- src/cpl_query/base/queryable_abc.py | 8 ++++---- src/cpl_query/cpl-query.json | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/cpl_query/base/queryable_abc.py b/src/cpl_query/base/queryable_abc.py index e7d8f5ec..ca42e3f3 100644 --- a/src/cpl_query/base/queryable_abc.py +++ b/src/cpl_query/base/queryable_abc.py @@ -315,7 +315,7 @@ class QueryableABC(Sequence): return _func(min(self, key=_func)) - def order_by(self, _func: Callable = None) -> 'QueryableABC': + def order_by(self, _func: Callable = None) -> 'OrderedQueryableABC': r"""Sorts elements by function in ascending order Parameter @@ -325,7 +325,7 @@ class QueryableABC(Sequence): Returns ------- - :class: `cpl_query.base.queryable_abc.QueryableABC` + :class: `cpl_query.base.ordered_queryable_abc.OrderedQueryableABC` """ if _func is None: _func = _default_lambda @@ -333,7 +333,7 @@ class QueryableABC(Sequence): from cpl_query.base.ordered_queryable import OrderedQueryable return OrderedQueryable(self.type, sorted(self, key=_func), _func) - def order_by_descending(self, _func: Callable = None) -> 'QueryableABC': + def order_by_descending(self, _func: Callable = None) -> 'OrderedQueryableABC': r"""Sorts elements by function in descending order Parameter @@ -343,7 +343,7 @@ class QueryableABC(Sequence): Returns ------- - :class: `cpl_query.base.queryable_abc.QueryableABC` + :class: `cpl_query.base.ordered_queryable_abc.OrderedQueryableABC` """ if _func is None: _func = _default_lambda diff --git a/src/cpl_query/cpl-query.json b/src/cpl_query/cpl-query.json index 655b7172..b142b2bf 100644 --- a/src/cpl_query/cpl-query.json +++ b/src/cpl_query/cpl-query.json @@ -4,7 +4,7 @@ "Version": { "Major": "2022", "Minor": "12", - "Micro": "2.post1" + "Micro": "2.post2" }, "Author": "Sven Heidemann", "AuthorEmail": "sven.heidemann@sh-edraft.de", From 7bf5e25c5ebe833c92d55aa2e2543072eb84f719 Mon Sep 17 00:00:00 2001 From: Sven Heidemann Date: Mon, 6 Mar 2023 19:03:01 +0100 Subject: [PATCH 11/12] Fixed typing --- src/cpl_query/__init__.py | 4 ++-- src/cpl_query/base/__init__.py | 4 ++-- src/cpl_query/enumerable/__init__.py | 4 ++-- src/cpl_query/extension/__init__.py | 4 ++-- src/cpl_query/iterable/__init__.py | 4 ++-- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/cpl_query/__init__.py b/src/cpl_query/__init__.py index 725fedf2..c50fc93b 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__ = '2022.12.2.post1' +__version__ = '2022.12.2.post2' from collections import namedtuple @@ -23,4 +23,4 @@ from collections import namedtuple # imports: VersionInfo = namedtuple('VersionInfo', 'major minor micro') -version_info = VersionInfo(major='2022', minor='12', micro='2.post1') +version_info = VersionInfo(major='2022', minor='12', micro='2.post2') diff --git a/src/cpl_query/base/__init__.py b/src/cpl_query/base/__init__.py index 137b82cb..16c97ab6 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__ = '2022.12.2.post1' +__version__ = '2022.12.2.post2' from collections import namedtuple @@ -23,4 +23,4 @@ from collections import namedtuple # imports: VersionInfo = namedtuple('VersionInfo', 'major minor micro') -version_info = VersionInfo(major='2022', minor='12', micro='2.post1') +version_info = VersionInfo(major='2022', minor='12', micro='2.post2') diff --git a/src/cpl_query/enumerable/__init__.py b/src/cpl_query/enumerable/__init__.py index 7387ab0a..b459f26f 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__ = '2022.12.2.post1' +__version__ = '2022.12.2.post2' 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='2022', minor='12', micro='2.post1') +version_info = VersionInfo(major='2022', minor='12', micro='2.post2') diff --git a/src/cpl_query/extension/__init__.py b/src/cpl_query/extension/__init__.py index a08c06a4..442981f9 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__ = '2022.12.2.post1' +__version__ = '2022.12.2.post2' 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='2022', minor='12', micro='2.post1') +version_info = VersionInfo(major='2022', minor='12', micro='2.post2') diff --git a/src/cpl_query/iterable/__init__.py b/src/cpl_query/iterable/__init__.py index de80b4df..98177a11 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__ = '2022.12.2.post1' +__version__ = '2022.12.2.post2' 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='2022', minor='12', micro='2.post1') +version_info = VersionInfo(major='2022', minor='12', micro='2.post2') From 43710717c9e5c0bb6f98e2a6c6d9155dacc01a00 Mon Sep 17 00:00:00 2001 From: Sven Heidemann Date: Sat, 11 Mar 2023 01:33:56 +0100 Subject: [PATCH 12/12] Fixed cpl-discord deps --- 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 | 6 +++--- src/cpl_discord/events/__init__.py | 4 ++-- src/cpl_discord/helper/__init__.py | 4 ++-- src/cpl_discord/service/__init__.py | 4 ++-- 10 files changed, 21 insertions(+), 21 deletions(-) diff --git a/src/cpl_discord/.cpl/__init__.py b/src/cpl_discord/.cpl/__init__.py index dcada057..d9230a9d 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__ = '2022.12.2' +__version__ = '2022.12.2.post1' from collections import namedtuple @@ -23,4 +23,4 @@ from collections import namedtuple # imports: VersionInfo = namedtuple('VersionInfo', 'major minor micro') -version_info = VersionInfo(major='2022', minor='12', micro='2') +version_info = VersionInfo(major='2022', minor='12', micro='2.post1') diff --git a/src/cpl_discord/__init__.py b/src/cpl_discord/__init__.py index 100e9dd6..c53db801 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__ = '2022.12.2' +__version__ = '2022.12.2.post1' from collections import namedtuple @@ -55,4 +55,4 @@ def get_discord_collection(services: 'ServiceCollectionABC') -> 'DiscordCollecti # build-ignore-end VersionInfo = namedtuple('VersionInfo', 'major minor micro') -version_info = VersionInfo(major='2022', minor='12', micro='2') +version_info = VersionInfo(major='2022', minor='12', micro='2.post1') diff --git a/src/cpl_discord/application/__init__.py b/src/cpl_discord/application/__init__.py index 838c6c15..3d2c0714 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__ = '2022.12.2' +__version__ = '2022.12.2.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='2022', minor='12', micro='2') +version_info = VersionInfo(major='2022', minor='12', micro='2.post1') diff --git a/src/cpl_discord/command/__init__.py b/src/cpl_discord/command/__init__.py index 0b5b94db..1389aceb 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__ = '2022.12.2' +__version__ = '2022.12.2.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='2022', minor='12', micro='2') +version_info = VersionInfo(major='2022', minor='12', micro='2.post1') diff --git a/src/cpl_discord/configuration/__init__.py b/src/cpl_discord/configuration/__init__.py index 0fefae46..3dcfc327 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__ = '2022.12.2' +__version__ = '2022.12.2.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='2022', minor='12', micro='2') +version_info = VersionInfo(major='2022', minor='12', micro='2.post1') diff --git a/src/cpl_discord/container/__init__.py b/src/cpl_discord/container/__init__.py index 3ce5277a..07303b94 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__ = '2022.12.2' +__version__ = '2022.12.2.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='2022', minor='12', micro='2') +version_info = VersionInfo(major='2022', minor='12', micro='2.post1') diff --git a/src/cpl_discord/cpl-discord.json b/src/cpl_discord/cpl-discord.json index b9ece160..b6c968da 100644 --- a/src/cpl_discord/cpl-discord.json +++ b/src/cpl_discord/cpl-discord.json @@ -4,7 +4,7 @@ "Version": { "Major": "2022", "Minor": "12", - "Micro": "2" + "Micro": "2.post1" }, "Author": "Sven Heidemann", "AuthorEmail": "sven.heidemann@sh-edraft.de", @@ -16,9 +16,9 @@ "LicenseName": "MIT", "LicenseDescription": "MIT, see LICENSE for more details.", "Dependencies": [ - "cpl-core==2022.12.1.post3", + "cpl-core>=2022.12.1.post3", "discord.py==2.1.1", - "cpl-query==2022.12.2.post1" + "cpl-query>=2022.12.2.post1" ], "DevDependencies": [ "cpl-cli==2022.12.1.post3" diff --git a/src/cpl_discord/events/__init__.py b/src/cpl_discord/events/__init__.py index dd5c3304..e982c4ef 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__ = '2022.12.2' +__version__ = '2022.12.2.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='2022', minor='12', micro='2') +version_info = VersionInfo(major='2022', minor='12', micro='2.post1') diff --git a/src/cpl_discord/helper/__init__.py b/src/cpl_discord/helper/__init__.py index b29a74a0..ab96ae9e 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__ = '2022.12.2' +__version__ = '2022.12.2.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='2022', minor='12', micro='2') +version_info = VersionInfo(major='2022', minor='12', micro='2.post1') diff --git a/src/cpl_discord/service/__init__.py b/src/cpl_discord/service/__init__.py index d8e5a409..e9927a53 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__ = '2022.12.2' +__version__ = '2022.12.2.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='2022', minor='12', micro='2') +version_info = VersionInfo(major='2022', minor='12', micro='2.post1')