diff --git a/src/cpl_core/__init__.py b/src/cpl_core/__init__.py index ed3ace4f..14bfdc4e 100644 --- a/src/cpl_core/__init__.py +++ b/src/cpl_core/__init__.py @@ -11,16 +11,16 @@ CPL core package """ -__title__ = "cpl_core" -__author__ = "Sven Heidemann" -__license__ = "MIT" -__copyright__ = "Copyright (c) 2020 - 2023 sh-edraft.de" -__version__ = "2023.10.0" +__title__ = 'cpl_core' +__author__ = 'Sven Heidemann' +__license__ = 'MIT' +__copyright__ = 'Copyright (c) 2020 - 2023 sh-edraft.de' +__version__ = '2023.10.1' from collections import namedtuple # imports: -VersionInfo = namedtuple("VersionInfo", "major minor micro") -version_info = VersionInfo(major="2023", minor="10", micro="0") +VersionInfo = namedtuple('VersionInfo', 'major minor micro') +version_info = VersionInfo(major='2023', minor='10', micro='1') diff --git a/src/cpl_core/application/__init__.py b/src/cpl_core/application/__init__.py index 60d4c1b8..e71170a1 100644 --- a/src/cpl_core/application/__init__.py +++ b/src/cpl_core/application/__init__.py @@ -11,11 +11,11 @@ CPL core package """ -__title__ = "cpl_core.application" -__author__ = "Sven Heidemann" -__license__ = "MIT" -__copyright__ = "Copyright (c) 2020 - 2023 sh-edraft.de" -__version__ = "2023.10.0" +__title__ = 'cpl_core.application' +__author__ = 'Sven Heidemann' +__license__ = 'MIT' +__copyright__ = 'Copyright (c) 2020 - 2023 sh-edraft.de' +__version__ = '2023.10.1' from collections import namedtuple @@ -28,5 +28,5 @@ from .application_extension_abc import ApplicationExtensionABC from .startup_abc import StartupABC from .startup_extension_abc import StartupExtensionABC -VersionInfo = namedtuple("VersionInfo", "major minor micro") -version_info = VersionInfo(major="2023", minor="10", micro="0") +VersionInfo = namedtuple('VersionInfo', 'major minor micro') +version_info = VersionInfo(major='2023', minor='10', micro='1') diff --git a/src/cpl_core/configuration/__init__.py b/src/cpl_core/configuration/__init__.py index 43ef5fb5..235bac61 100644 --- a/src/cpl_core/configuration/__init__.py +++ b/src/cpl_core/configuration/__init__.py @@ -11,11 +11,11 @@ CPL core package """ -__title__ = "cpl_core.configuration" -__author__ = "Sven Heidemann" -__license__ = "MIT" -__copyright__ = "Copyright (c) 2020 - 2023 sh-edraft.de" -__version__ = "2023.10.0" +__title__ = 'cpl_core.configuration' +__author__ = 'Sven Heidemann' +__license__ = 'MIT' +__copyright__ = 'Copyright (c) 2020 - 2023 sh-edraft.de' +__version__ = '2023.10.1' from collections import namedtuple @@ -34,5 +34,5 @@ from .flag_argument import FlagArgument from .validator_abc import ValidatorABC from .variable_argument import VariableArgument -VersionInfo = namedtuple("VersionInfo", "major minor micro") -version_info = VersionInfo(major="2023", minor="10", micro="0") +VersionInfo = namedtuple('VersionInfo', 'major minor micro') +version_info = VersionInfo(major='2023', minor='10', micro='1') diff --git a/src/cpl_core/console/__init__.py b/src/cpl_core/console/__init__.py index 435f9e82..aff04b94 100644 --- a/src/cpl_core/console/__init__.py +++ b/src/cpl_core/console/__init__.py @@ -11,11 +11,11 @@ CPL core package """ -__title__ = "cpl_core.console" -__author__ = "Sven Heidemann" -__license__ = "MIT" -__copyright__ = "Copyright (c) 2020 - 2023 sh-edraft.de" -__version__ = "2023.10.0" +__title__ = 'cpl_core.console' +__author__ = 'Sven Heidemann' +__license__ = 'MIT' +__copyright__ = 'Copyright (c) 2020 - 2023 sh-edraft.de' +__version__ = '2023.10.1' from collections import namedtuple @@ -27,5 +27,5 @@ from .console_call import ConsoleCall from .foreground_color_enum import ForegroundColorEnum from .spinner_thread import SpinnerThread -VersionInfo = namedtuple("VersionInfo", "major minor micro") -version_info = VersionInfo(major="2023", minor="10", micro="0") +VersionInfo = namedtuple('VersionInfo', 'major minor micro') +version_info = VersionInfo(major='2023', minor='10', micro='1') diff --git a/src/cpl_core/cpl-core.json b/src/cpl_core/cpl-core.json index 04975c27..c54f904c 100644 --- a/src/cpl_core/cpl-core.json +++ b/src/cpl_core/cpl-core.json @@ -4,7 +4,7 @@ "Version": { "Major": "2023", "Minor": "10", - "Micro": "0" + "Micro": "1" }, "Author": "Sven Heidemann", "AuthorEmail": "sven.heidemann@sh-edraft.de", diff --git a/src/cpl_core/database/__init__.py b/src/cpl_core/database/__init__.py index 94d450f2..b7d94ebc 100644 --- a/src/cpl_core/database/__init__.py +++ b/src/cpl_core/database/__init__.py @@ -11,11 +11,11 @@ CPL core package """ -__title__ = "cpl_core.database" -__author__ = "Sven Heidemann" -__license__ = "MIT" -__copyright__ = "Copyright (c) 2020 - 2023 sh-edraft.de" -__version__ = "2023.10.0" +__title__ = 'cpl_core.database' +__author__ = 'Sven Heidemann' +__license__ = 'MIT' +__copyright__ = 'Copyright (c) 2020 - 2023 sh-edraft.de' +__version__ = '2023.10.1' from collections import namedtuple @@ -25,5 +25,5 @@ from .database_settings_name_enum import DatabaseSettingsNameEnum from .database_settings import DatabaseSettings from .table_abc import TableABC -VersionInfo = namedtuple("VersionInfo", "major minor micro") -version_info = VersionInfo(major="2023", minor="10", micro="0") +VersionInfo = namedtuple('VersionInfo', 'major minor micro') +version_info = VersionInfo(major='2023', minor='10', micro='1') diff --git a/src/cpl_core/database/connection/__init__.py b/src/cpl_core/database/connection/__init__.py index ea268300..8a2232b9 100644 --- a/src/cpl_core/database/connection/__init__.py +++ b/src/cpl_core/database/connection/__init__.py @@ -11,11 +11,11 @@ CPL core package """ -__title__ = "cpl_core.database.connection" -__author__ = "Sven Heidemann" -__license__ = "MIT" -__copyright__ = "Copyright (c) 2020 - 2023 sh-edraft.de" -__version__ = "2023.10.0" +__title__ = 'cpl_core.database.connection' +__author__ = 'Sven Heidemann' +__license__ = 'MIT' +__copyright__ = 'Copyright (c) 2020 - 2023 sh-edraft.de' +__version__ = '2023.10.1' from collections import namedtuple @@ -24,5 +24,5 @@ from collections import namedtuple from .database_connection import DatabaseConnection from .database_connection_abc import DatabaseConnectionABC -VersionInfo = namedtuple("VersionInfo", "major minor micro") -version_info = VersionInfo(major="2023", minor="10", micro="0") +VersionInfo = namedtuple('VersionInfo', 'major minor micro') +version_info = VersionInfo(major='2023', minor='10', micro='1') diff --git a/src/cpl_core/database/connection/database_connection.py b/src/cpl_core/database/connection/database_connection.py index 562618fc..a814fd0a 100644 --- a/src/cpl_core/database/connection/database_connection.py +++ b/src/cpl_core/database/connection/database_connection.py @@ -1,11 +1,12 @@ from typing import Optional import mysql.connector as sql +from mysql.connector.abstracts import MySQLConnectionAbstract +from mysql.connector.cursor import MySQLCursorBuffered + from cpl_core.database.connection.database_connection_abc import DatabaseConnectionABC from cpl_core.database.database_settings import DatabaseSettings from cpl_core.utils.credential_manager import CredentialManager -from mysql.connector.abstracts import MySQLConnectionAbstract -from mysql.connector.cursor import MySQLCursorBuffered class DatabaseConnection(DatabaseConnectionABC): @@ -35,6 +36,7 @@ class DatabaseConnection(DatabaseConnectionABC): use_unicode=settings.use_unicode, buffered=settings.buffered, auth_plugin=settings.auth_plugin, + ssl_disabled=settings.ssl_disabled, ) connection.cursor().execute(f"CREATE DATABASE IF NOT EXISTS `{settings.database}`;") self._database = sql.connect( @@ -47,5 +49,6 @@ class DatabaseConnection(DatabaseConnectionABC): use_unicode=settings.use_unicode, buffered=settings.buffered, auth_plugin=settings.auth_plugin, + ssl_disabled=settings.ssl_disabled, ) self._cursor = self._database.cursor() diff --git a/src/cpl_core/database/context/__init__.py b/src/cpl_core/database/context/__init__.py index 5be4020a..ac8ea4b6 100644 --- a/src/cpl_core/database/context/__init__.py +++ b/src/cpl_core/database/context/__init__.py @@ -11,11 +11,11 @@ CPL core package """ -__title__ = "cpl_core.database.context" -__author__ = "Sven Heidemann" -__license__ = "MIT" -__copyright__ = "Copyright (c) 2020 - 2023 sh-edraft.de" -__version__ = "2023.10.0" +__title__ = 'cpl_core.database.context' +__author__ = 'Sven Heidemann' +__license__ = 'MIT' +__copyright__ = 'Copyright (c) 2020 - 2023 sh-edraft.de' +__version__ = '2023.10.1' from collections import namedtuple @@ -24,5 +24,5 @@ from collections import namedtuple from .database_context import DatabaseContext from .database_context_abc import DatabaseContextABC -VersionInfo = namedtuple("VersionInfo", "major minor micro") -version_info = VersionInfo(major="2023", minor="10", micro="0") +VersionInfo = namedtuple('VersionInfo', 'major minor micro') +version_info = VersionInfo(major='2023', minor='10', micro='1') diff --git a/src/cpl_core/database/database_settings.py b/src/cpl_core/database/database_settings.py index e1f774ed..80572018 100644 --- a/src/cpl_core/database/database_settings.py +++ b/src/cpl_core/database/database_settings.py @@ -17,6 +17,7 @@ class DatabaseSettings(ConfigurationModelABC): use_unicode: bool = False, buffered: bool = False, auth_plugin: str = "caching_sha2_password", + ssl_disabled: bool = False, ): ConfigurationModelABC.__init__(self) @@ -24,11 +25,12 @@ class DatabaseSettings(ConfigurationModelABC): self._port: Optional[int] = port self._user: Optional[str] = user self._password: Optional[str] = password - self._databse: Optional[str] = database + self._database: Optional[str] = database self._charset: Optional[str] = charset self._use_unicode: Optional[bool] = use_unicode self._buffered: Optional[bool] = buffered self._auth_plugin: Optional[str] = auth_plugin + self._ssl_disabled: Optional[bool] = ssl_disabled @property def host(self) -> Optional[str]: @@ -48,7 +50,7 @@ class DatabaseSettings(ConfigurationModelABC): @property def database(self) -> Optional[str]: - return self._databse + return self._database @property def charset(self) -> Optional[str]: @@ -65,3 +67,7 @@ class DatabaseSettings(ConfigurationModelABC): @property def auth_plugin(self) -> Optional[str]: return self._auth_plugin + + @property + def ssl_disabled(self) -> Optional[bool]: + return self._ssl_disabled diff --git a/src/cpl_core/dependency_injection/__init__.py b/src/cpl_core/dependency_injection/__init__.py index 866eb9b7..ef3f36fa 100644 --- a/src/cpl_core/dependency_injection/__init__.py +++ b/src/cpl_core/dependency_injection/__init__.py @@ -11,11 +11,11 @@ CPL core package """ -__title__ = "cpl_core.dependency_injection" -__author__ = "Sven Heidemann" -__license__ = "MIT" -__copyright__ = "Copyright (c) 2020 - 2023 sh-edraft.de" -__version__ = "2023.10.0" +__title__ = 'cpl_core.dependency_injection' +__author__ = 'Sven Heidemann' +__license__ = 'MIT' +__copyright__ = 'Copyright (c) 2020 - 2023 sh-edraft.de' +__version__ = '2023.10.1' from collections import namedtuple @@ -30,5 +30,5 @@ from .service_lifetime_enum import ServiceLifetimeEnum from .service_provider import ServiceProvider from .service_provider_abc import ServiceProviderABC -VersionInfo = namedtuple("VersionInfo", "major minor micro") -version_info = VersionInfo(major="2023", minor="10", micro="0") +VersionInfo = namedtuple('VersionInfo', 'major minor micro') +version_info = VersionInfo(major='2023', minor='10', micro='1') diff --git a/src/cpl_core/environment/__init__.py b/src/cpl_core/environment/__init__.py index ebac8b19..1c45d8c0 100644 --- a/src/cpl_core/environment/__init__.py +++ b/src/cpl_core/environment/__init__.py @@ -11,11 +11,11 @@ CPL core package """ -__title__ = "cpl_core.environment" -__author__ = "Sven Heidemann" -__license__ = "MIT" -__copyright__ = "Copyright (c) 2020 - 2023 sh-edraft.de" -__version__ = "2023.10.0" +__title__ = 'cpl_core.environment' +__author__ = 'Sven Heidemann' +__license__ = 'MIT' +__copyright__ = 'Copyright (c) 2020 - 2023 sh-edraft.de' +__version__ = '2023.10.1' from collections import namedtuple @@ -25,5 +25,5 @@ from .application_environment_abc import ApplicationEnvironmentABC from .environment_name_enum import EnvironmentNameEnum from .application_environment import ApplicationEnvironment -VersionInfo = namedtuple("VersionInfo", "major minor micro") -version_info = VersionInfo(major="2023", minor="10", micro="0") +VersionInfo = namedtuple('VersionInfo', 'major minor micro') +version_info = VersionInfo(major='2023', minor='10', micro='1') diff --git a/src/cpl_core/logging/__init__.py b/src/cpl_core/logging/__init__.py index dac21e04..82dcde55 100644 --- a/src/cpl_core/logging/__init__.py +++ b/src/cpl_core/logging/__init__.py @@ -11,11 +11,11 @@ CPL core package """ -__title__ = "cpl_core.logging" -__author__ = "Sven Heidemann" -__license__ = "MIT" -__copyright__ = "Copyright (c) 2020 - 2023 sh-edraft.de" -__version__ = "2023.10.0" +__title__ = 'cpl_core.logging' +__author__ = 'Sven Heidemann' +__license__ = 'MIT' +__copyright__ = 'Copyright (c) 2020 - 2023 sh-edraft.de' +__version__ = '2023.10.1' from collections import namedtuple @@ -27,5 +27,5 @@ from .logging_level_enum import LoggingLevelEnum from .logging_settings import LoggingSettings from .logging_settings_name_enum import LoggingSettingsNameEnum -VersionInfo = namedtuple("VersionInfo", "major minor micro") -version_info = VersionInfo(major="2023", minor="10", micro="0") +VersionInfo = namedtuple('VersionInfo', 'major minor micro') +version_info = VersionInfo(major='2023', minor='10', micro='1') diff --git a/src/cpl_core/mailing/__init__.py b/src/cpl_core/mailing/__init__.py index 6330d10f..b05601d8 100644 --- a/src/cpl_core/mailing/__init__.py +++ b/src/cpl_core/mailing/__init__.py @@ -11,11 +11,11 @@ CPL core package """ -__title__ = "cpl_core.mailing" -__author__ = "Sven Heidemann" -__license__ = "MIT" -__copyright__ = "Copyright (c) 2020 - 2023 sh-edraft.de" -__version__ = "2023.10.0" +__title__ = 'cpl_core.mailing' +__author__ = 'Sven Heidemann' +__license__ = 'MIT' +__copyright__ = 'Copyright (c) 2020 - 2023 sh-edraft.de' +__version__ = '2023.10.1' from collections import namedtuple @@ -27,5 +27,5 @@ from .email_client_abc import EMailClientABC from .email_client_settings import EMailClientSettings from .email_client_settings_name_enum import EMailClientSettingsNameEnum -VersionInfo = namedtuple("VersionInfo", "major minor micro") -version_info = VersionInfo(major="2023", minor="10", micro="0") +VersionInfo = namedtuple('VersionInfo', 'major minor micro') +version_info = VersionInfo(major='2023', minor='10', micro='1') diff --git a/src/cpl_core/pipes/__init__.py b/src/cpl_core/pipes/__init__.py index 969e85da..4ab2c213 100644 --- a/src/cpl_core/pipes/__init__.py +++ b/src/cpl_core/pipes/__init__.py @@ -11,11 +11,11 @@ CPL core package """ -__title__ = "cpl_core.pipes" -__author__ = "Sven Heidemann" -__license__ = "MIT" -__copyright__ = "Copyright (c) 2020 - 2023 sh-edraft.de" -__version__ = "2023.10.0" +__title__ = 'cpl_core.pipes' +__author__ = 'Sven Heidemann' +__license__ = 'MIT' +__copyright__ = 'Copyright (c) 2020 - 2023 sh-edraft.de' +__version__ = '2023.10.1' from collections import namedtuple @@ -25,5 +25,5 @@ from .bool_pipe import BoolPipe from .ip_address_pipe import IPAddressPipe from .pipe_abc import PipeABC -VersionInfo = namedtuple("VersionInfo", "major minor micro") -version_info = VersionInfo(major="2023", minor="10", micro="0") +VersionInfo = namedtuple('VersionInfo', 'major minor micro') +version_info = VersionInfo(major='2023', minor='10', micro='1') diff --git a/src/cpl_core/time/__init__.py b/src/cpl_core/time/__init__.py index 7c3bc16a..36c5fbb3 100644 --- a/src/cpl_core/time/__init__.py +++ b/src/cpl_core/time/__init__.py @@ -11,11 +11,11 @@ CPL core package """ -__title__ = "cpl_core.time" -__author__ = "Sven Heidemann" -__license__ = "MIT" -__copyright__ = "Copyright (c) 2020 - 2023 sh-edraft.de" -__version__ = "2023.10.0" +__title__ = 'cpl_core.time' +__author__ = 'Sven Heidemann' +__license__ = 'MIT' +__copyright__ = 'Copyright (c) 2020 - 2023 sh-edraft.de' +__version__ = '2023.10.1' from collections import namedtuple @@ -24,5 +24,5 @@ from collections import namedtuple from .time_format_settings import TimeFormatSettings from .time_format_settings_names_enum import TimeFormatSettingsNamesEnum -VersionInfo = namedtuple("VersionInfo", "major minor micro") -version_info = VersionInfo(major="2023", minor="10", micro="0") +VersionInfo = namedtuple('VersionInfo', 'major minor micro') +version_info = VersionInfo(major='2023', minor='10', micro='1') diff --git a/src/cpl_core/utils/__init__.py b/src/cpl_core/utils/__init__.py index f418f34b..e9cfc8cc 100644 --- a/src/cpl_core/utils/__init__.py +++ b/src/cpl_core/utils/__init__.py @@ -11,11 +11,11 @@ CPL core package """ -__title__ = "cpl_core.utils" -__author__ = "Sven Heidemann" -__license__ = "MIT" -__copyright__ = "Copyright (c) 2020 - 2023 sh-edraft.de" -__version__ = "2023.10.0" +__title__ = 'cpl_core.utils' +__author__ = 'Sven Heidemann' +__license__ = 'MIT' +__copyright__ = 'Copyright (c) 2020 - 2023 sh-edraft.de' +__version__ = '2023.10.1' from collections import namedtuple @@ -25,5 +25,5 @@ from .credential_manager import CredentialManager from .string import String from .pip import Pip -VersionInfo = namedtuple("VersionInfo", "major minor micro") -version_info = VersionInfo(major="2023", minor="10", micro="0") +VersionInfo = namedtuple('VersionInfo', 'major minor micro') +version_info = VersionInfo(major='2023', minor='10', micro='1')