Merge pull request '#161' (#162) from #161 into 2023.4

Reviewed-on: #162
Closes #161

src/cpl_cli/.cpl/__init__.py

@@ -15,7 +15,7 @@ __title__ = "cpl_cli"
 __author__ = "Sven Heidemann"
 __license__ = "MIT"
 __copyright__ = "Copyright (c) 2020 - 2023 sh-edraft.de"
-__version__ = "2023.2.0"
+__version__ = "2023.4.0"
 
 from collections import namedtuple
 
@@ -23,4 +23,4 @@ from collections import namedtuple
 # imports:
 
 VersionInfo = namedtuple("VersionInfo", "major minor micro")
-version_info = VersionInfo(major="2023", minor="2", micro="0")
+version_info = VersionInfo(major="2023", minor="4", micro="0")

src/cpl_cli/__init__.py

@@ -15,7 +15,7 @@ __title__ = "cpl_cli"
 __author__ = "Sven Heidemann"
 __license__ = "MIT"
 __copyright__ = "Copyright (c) 2020 - 2023 sh-edraft.de"
-__version__ = "2023.2.0"
+__version__ = "2023.4.0"
 
 from collections import namedtuple
 
@@ -28,4 +28,4 @@ from .main import main
 from .startup import Startup
 
 VersionInfo = namedtuple("VersionInfo", "major minor micro")
-version_info = VersionInfo(major="2023", minor="2", micro="0")
+version_info = VersionInfo(major="2023", minor="4", micro="0")

src/cpl_cli/_templates/__init__.py

@@ -15,7 +15,7 @@ __title__ = "cpl_cli._templates"
 __author__ = "Sven Heidemann"
 __license__ = "MIT"
 __copyright__ = "Copyright (c) 2020 - 2023 sh-edraft.de"
-__version__ = "2023.2.0"
+__version__ = "2023.4.0"
 
 from collections import namedtuple
 
@@ -23,4 +23,4 @@ from collections import namedtuple
 # imports:
 
 VersionInfo = namedtuple("VersionInfo", "major minor micro")
-version_info = VersionInfo(major="2023", minor="2", micro="0")
+version_info = VersionInfo(major="2023", minor="4", micro="0")

src/cpl_cli/_templates/build/__init__.py

@@ -11,16 +11,16 @@ CPL Command Line Interface
 
 """
 
-__title__ = "cpl_cli._templates.build"
+__title__ = 'cpl_cli._templates.build'
-__author__ = "Sven Heidemann"
+__author__ = 'Sven Heidemann'
-__license__ = "MIT"
+__license__ = 'MIT'
-__copyright__ = "Copyright (c) 2020 - 2023 sh-edraft.de"
+__copyright__ = 'Copyright (c) 2020 - 2023 sh-edraft.de'
-__version__ = "2023.2.0"
+__version__ = '2023.4.0'
 
 from collections import namedtuple
 
 
 # imports:
 
-VersionInfo = namedtuple("VersionInfo", "major minor micro")
+VersionInfo = namedtuple('VersionInfo', 'major minor micro')
-version_info = VersionInfo(major="2023", minor="2", micro="0")
+version_info = VersionInfo(major='2023', minor='4', micro='0')

src/cpl_cli/_templates/publish/__init__.py

@@ -15,7 +15,7 @@ __title__ = "cpl_cli._templates.publish"
 __author__ = "Sven Heidemann"
 __license__ = "MIT"
 __copyright__ = "Copyright (c) 2020 - 2023 sh-edraft.de"
-__version__ = "2023.2.0"
+__version__ = "2023.4.0"
 
 from collections import namedtuple
 
@@ -23,4 +23,4 @@ from collections import namedtuple
 # imports:
 
 VersionInfo = namedtuple("VersionInfo", "major minor micro")
-version_info = VersionInfo(major="2023", minor="2", micro="0")
+version_info = VersionInfo(major="2023", minor="4", micro="0")

src/cpl_cli/abc/__init__.py

@@ -15,7 +15,7 @@ __title__ = "cpl_cli.abc"
 __author__ = "Sven Heidemann"
 __license__ = "MIT"
 __copyright__ = "Copyright (c) 2020 - 2023 sh-edraft.de"
-__version__ = "2023.2.0"
+__version__ = "2023.4.0"
 
 from collections import namedtuple
 
@@ -23,4 +23,4 @@ from collections import namedtuple
 # imports
 
 VersionInfo = namedtuple("VersionInfo", "major minor micro")
-version_info = VersionInfo(major="2023", minor="2", micro="0")
+version_info = VersionInfo(major="2023", minor="4", micro="0")

src/cpl_cli/command/__init__.py

@@ -15,7 +15,7 @@ __title__ = "cpl_cli.command"
 __author__ = "Sven Heidemann"
 __license__ = "MIT"
 __copyright__ = "Copyright (c) 2020 - 2023 sh-edraft.de"
-__version__ = "2023.2.0"
+__version__ = "2023.4.0"
 
 from collections import namedtuple
 
@@ -29,4 +29,4 @@ from .publish_service import PublishService
 from .version_service import VersionService
 
 VersionInfo = namedtuple("VersionInfo", "major minor micro")
-version_info = VersionInfo(major="2023", minor="2", micro="0")
+version_info = VersionInfo(major="2023", minor="4", micro="0")

src/cpl_cli/configuration/__init__.py

@@ -15,7 +15,7 @@ __title__ = "cpl_cli.configuration"
 __author__ = "Sven Heidemann"
 __license__ = "MIT"
 __copyright__ = "Copyright (c) 2020 - 2023 sh-edraft.de"
-__version__ = "2023.2.0"
+__version__ = "2023.4.0"
 
 from collections import namedtuple
 
@@ -31,4 +31,4 @@ from .workspace_settings import WorkspaceSettings
 from .workspace_settings_name_enum import WorkspaceSettingsNameEnum
 
 VersionInfo = namedtuple("VersionInfo", "major minor micro")
-version_info = VersionInfo(major="2023", minor="2", micro="0")
+version_info = VersionInfo(major="2023", minor="4", micro="0")

src/cpl_cli/cpl-cli.json

@@ -3,7 +3,7 @@
     "Name": "cpl-cli",
     "Version": {
       "Major": "2023",
-      "Minor": "2",
+      "Minor": "4",
       "Micro": "0"
     },
     "Author": "Sven Heidemann",
@@ -16,7 +16,7 @@
     "LicenseName": "MIT",
     "LicenseDescription": "MIT, see LICENSE for more details.",
     "Dependencies": [
-      "cpl-core>=2023.2.0"
+      "cpl-core>=2023.4.0"
     ],
     "DevDependencies": [],
     "PythonVersion": ">=3.10",

src/cpl_cli/helper/__init__.py

@@ -15,7 +15,7 @@ __title__ = "cpl_cli.helper"
 __author__ = "Sven Heidemann"
 __license__ = "MIT"
 __copyright__ = "Copyright (c) 2020 - 2023 sh-edraft.de"
-__version__ = "2023.2.0"
+__version__ = "2023.4.0"
 
 from collections import namedtuple
 
@@ -23,4 +23,4 @@ from collections import namedtuple
 # imports:
 
 VersionInfo = namedtuple("VersionInfo", "major minor micro")
-version_info = VersionInfo(major="2023", minor="2", micro="0")
+version_info = VersionInfo(major="2023", minor="4", micro="0")

src/cpl_cli/live_server/__init__.py

@@ -15,7 +15,7 @@ __title__ = "cpl_cli.live_server"
 __author__ = "Sven Heidemann"
 __license__ = "MIT"
 __copyright__ = "Copyright (c) 2020 - 2023 sh-edraft.de"
-__version__ = "2023.2.0"
+__version__ = "2023.4.0"
 
 from collections import namedtuple
 
@@ -23,4 +23,4 @@ from collections import namedtuple
 # imports:
 
 VersionInfo = namedtuple("VersionInfo", "major minor micro")
-version_info = VersionInfo(major="2023", minor="2", micro="0")
+version_info = VersionInfo(major="2023", minor="4", micro="0")

src/cpl_cli/migrations/__init__.py

@@ -15,7 +15,7 @@ __title__ = "cpl_cli.migrations"
 __author__ = "Sven Heidemann"
 __license__ = "MIT"
 __copyright__ = "Copyright (c) 2020 - 2023 sh-edraft.de"
-__version__ = "2023.2.0"
+__version__ = "2023.4.0"
 
 from collections import namedtuple
 
@@ -23,4 +23,4 @@ from collections import namedtuple
 # imports
 
 VersionInfo = namedtuple("VersionInfo", "major minor micro")
-version_info = VersionInfo(major="2023", minor="2", micro="0")
+version_info = VersionInfo(major="2023", minor="4", micro="0")

src/cpl_cli/migrations/base/__init__.py

@@ -15,7 +15,7 @@ __title__ = "cpl_cli.migrations.base"
 __author__ = "Sven Heidemann"
 __license__ = "MIT"
 __copyright__ = "Copyright (c) 2020 - 2023 sh-edraft.de"
-__version__ = "2023.2.0"
+__version__ = "2023.4.0"
 
 from collections import namedtuple
 
@@ -23,4 +23,4 @@ from collections import namedtuple
 # imports:
 
 VersionInfo = namedtuple("VersionInfo", "major minor micro")
-version_info = VersionInfo(major="2023", minor="2", micro="0")
+version_info = VersionInfo(major="2023", minor="4", micro="0")

src/cpl_cli/migrations/service/__init__.py

@@ -15,7 +15,7 @@ __title__ = "cpl_cli.migrations.service"
 __author__ = "Sven Heidemann"
 __license__ = "MIT"
 __copyright__ = "Copyright (c) 2020 - 2023 sh-edraft.de"
-__version__ = "2023.2.0"
+__version__ = "2023.4.0"
 
 from collections import namedtuple
 
@@ -23,4 +23,4 @@ from collections import namedtuple
 # imports:
 
 VersionInfo = namedtuple("VersionInfo", "major minor micro")
-version_info = VersionInfo(major="2023", minor="2", micro="0")
+version_info = VersionInfo(major="2023", minor="4", micro="0")

src/cpl_cli/publish/__init__.py

@@ -15,7 +15,7 @@ __title__ = "cpl_cli.publish"
 __author__ = "Sven Heidemann"
 __license__ = "MIT"
 __copyright__ = "Copyright (c) 2020 - 2023 sh-edraft.de"
-__version__ = "2023.2.0"
+__version__ = "2023.4.0"
 
 from collections import namedtuple
 
@@ -25,4 +25,4 @@ from .publisher_abc import PublisherABC
 from .publisher_service import PublisherService
 
 VersionInfo = namedtuple("VersionInfo", "major minor micro")
-version_info = VersionInfo(major="2023", minor="2", micro="0")
+version_info = VersionInfo(major="2023", minor="4", micro="0")

src/cpl_cli/source_creator/__init__.py

@@ -15,7 +15,7 @@ __title__ = "cpl_cli.source_creator"
 __author__ = "Sven Heidemann"
 __license__ = "MIT"
 __copyright__ = "Copyright (c) 2020 - 2023 sh-edraft.de"
-__version__ = "2023.2.0"
+__version__ = "2023.4.0"
 
 from collections import namedtuple
 
@@ -23,4 +23,4 @@ from collections import namedtuple
 # imports:
 
 VersionInfo = namedtuple("VersionInfo", "major minor micro")
-version_info = VersionInfo(major="2023", minor="2", micro="0")
+version_info = VersionInfo(major="2023", minor="4", micro="0")

src/cpl_cli/validators/__init__.py

@@ -15,7 +15,7 @@ __title__ = "cpl_cli.validators"
 __author__ = "Sven Heidemann"
 __license__ = "MIT"
 __copyright__ = "Copyright (c) 2020 - 2023 sh-edraft.de"
-__version__ = "2023.2.0"
+__version__ = "2023.4.0"
 
 from collections import namedtuple
 
@@ -23,4 +23,4 @@ from collections import namedtuple
 # imports:
 
 VersionInfo = namedtuple("VersionInfo", "major minor micro")
-version_info = VersionInfo(major="2023", minor="2", micro="0")
+version_info = VersionInfo(major="2023", minor="4", micro="0")

src/cpl_core/__init__.py

@@ -15,7 +15,7 @@ __title__ = "cpl_core"
 __author__ = "Sven Heidemann"
 __license__ = "MIT"
 __copyright__ = "Copyright (c) 2020 - 2023 sh-edraft.de"
-__version__ = "2023.2.0"
+__version__ = "2023.4.0"
 
 from collections import namedtuple
 
@@ -23,4 +23,4 @@ from collections import namedtuple
 # imports:
 
 VersionInfo = namedtuple("VersionInfo", "major minor micro")
-version_info = VersionInfo(major="2023", minor="2", micro="0")
+version_info = VersionInfo(major="2023", minor="4", micro="0")

src/cpl_core/application/__init__.py

@@ -15,7 +15,7 @@ __title__ = "cpl_core.application"
 __author__ = "Sven Heidemann"
 __license__ = "MIT"
 __copyright__ = "Copyright (c) 2020 - 2023 sh-edraft.de"
-__version__ = "2023.2.0"
+__version__ = "2023.4.0"
 
 from collections import namedtuple
 
@@ -29,4 +29,4 @@ from .startup_abc import StartupABC
 from .startup_extension_abc import StartupExtensionABC
 
 VersionInfo = namedtuple("VersionInfo", "major minor micro")
-version_info = VersionInfo(major="2023", minor="2", micro="0")
+version_info = VersionInfo(major="2023", minor="4", micro="0")

src/cpl_core/configuration/__init__.py

@@ -15,7 +15,7 @@ __title__ = "cpl_core.configuration"
 __author__ = "Sven Heidemann"
 __license__ = "MIT"
 __copyright__ = "Copyright (c) 2020 - 2023 sh-edraft.de"
-__version__ = "2023.2.0"
+__version__ = "2023.4.0"
 
 from collections import namedtuple
 
@@ -35,4 +35,4 @@ from .validator_abc import ValidatorABC
 from .variable_argument import VariableArgument
 
 VersionInfo = namedtuple("VersionInfo", "major minor micro")
-version_info = VersionInfo(major="2023", minor="2", micro="0")
+version_info = VersionInfo(major="2023", minor="4", micro="0")

src/cpl_core/console/__init__.py

@@ -15,7 +15,7 @@ __title__ = "cpl_core.console"
 __author__ = "Sven Heidemann"
 __license__ = "MIT"
 __copyright__ = "Copyright (c) 2020 - 2023 sh-edraft.de"
-__version__ = "2023.2.0"
+__version__ = "2023.4.0"
 
 from collections import namedtuple
 
@@ -28,4 +28,4 @@ from .foreground_color_enum import ForegroundColorEnum
 from .spinner_thread import SpinnerThread
 
 VersionInfo = namedtuple("VersionInfo", "major minor micro")
-version_info = VersionInfo(major="2023", minor="2", micro="0")
+version_info = VersionInfo(major="2023", minor="4", micro="0")

src/cpl_core/cpl-core.json

@@ -3,7 +3,7 @@
     "Name": "cpl-core",
     "Version": {
       "Major": "2023",
-      "Minor": "2",
+      "Minor": "4",
       "Micro": "0"
     },
     "Author": "Sven Heidemann",
@@ -16,17 +16,17 @@
     "LicenseName": "MIT",
     "LicenseDescription": "MIT, see LICENSE for more details.",
     "Dependencies": [
-      "art==5.8",
+      "art==5.9",
       "colorama==0.4.6",
       "mysql-connector==2.2.9",
       "psutil==5.9.4",
-      "packaging==22.0",
+      "packaging==23.0",
       "pynput==1.7.6",
-      "setuptools==65.6.3",
+      "setuptools==67.6.1",
       "tabulate==0.9.0",
-      "termcolor==2.1.1",
+      "termcolor==2.2.0",
-      "watchdog==2.2.0",
+      "watchdog==3.0.0",
-      "wheel==0.38.4"
+      "wheel==0.40.0"
     ],
     "DevDependencies": [
       "Sphinx==5.0.2",
@@ -36,7 +36,7 @@
       "sphinx-markdown-builder==0.5.5",
       "pygount==1.5.1"
     ],
-    "PythonVersion": ">=3.10",
+    "PythonVersion": ">=3.11",
     "PythonPath": {},
     "Classifiers": []
   },

src/cpl_core/database/__init__.py

@@ -15,7 +15,7 @@ __title__ = "cpl_core.database"
 __author__ = "Sven Heidemann"
 __license__ = "MIT"
 __copyright__ = "Copyright (c) 2020 - 2023 sh-edraft.de"
-__version__ = "2023.2.0"
+__version__ = "2023.4.0"
 
 from collections import namedtuple
 
@@ -26,4 +26,4 @@ from .database_settings import DatabaseSettings
 from .table_abc import TableABC
 
 VersionInfo = namedtuple("VersionInfo", "major minor micro")
-version_info = VersionInfo(major="2023", minor="2", micro="0")
+version_info = VersionInfo(major="2023", minor="4", micro="0")

src/cpl_core/database/connection/__init__.py

@@ -15,7 +15,7 @@ __title__ = "cpl_core.database.connection"
 __author__ = "Sven Heidemann"
 __license__ = "MIT"
 __copyright__ = "Copyright (c) 2020 - 2023 sh-edraft.de"
-__version__ = "2023.2.0"
+__version__ = "2023.4.0"
 
 from collections import namedtuple
 
@@ -25,4 +25,4 @@ from .database_connection import DatabaseConnection
 from .database_connection_abc import DatabaseConnectionABC
 
 VersionInfo = namedtuple("VersionInfo", "major minor micro")
-version_info = VersionInfo(major="2023", minor="2", micro="0")
+version_info = VersionInfo(major="2023", minor="4", micro="0")

src/cpl_core/database/context/__init__.py

@@ -15,7 +15,7 @@ __title__ = "cpl_core.database.context"
 __author__ = "Sven Heidemann"
 __license__ = "MIT"
 __copyright__ = "Copyright (c) 2020 - 2023 sh-edraft.de"
-__version__ = "2023.2.0"
+__version__ = "2023.4.0"
 
 from collections import namedtuple
 
@@ -25,4 +25,4 @@ from .database_context import DatabaseContext
 from .database_context_abc import DatabaseContextABC
 
 VersionInfo = namedtuple("VersionInfo", "major minor micro")
-version_info = VersionInfo(major="2023", minor="2", micro="0")
+version_info = VersionInfo(major="2023", minor="4", micro="0")

src/cpl_core/dependency_injection/__init__.py

@@ -15,7 +15,7 @@ __title__ = "cpl_core.dependency_injection"
 __author__ = "Sven Heidemann"
 __license__ = "MIT"
 __copyright__ = "Copyright (c) 2020 - 2023 sh-edraft.de"
-__version__ = "2023.2.0"
+__version__ = "2023.4.0"
 
 from collections import namedtuple
 
@@ -31,4 +31,4 @@ from .service_provider import ServiceProvider
 from .service_provider_abc import ServiceProviderABC
 
 VersionInfo = namedtuple("VersionInfo", "major minor micro")
-version_info = VersionInfo(major="2023", minor="2", micro="0")
+version_info = VersionInfo(major="2023", minor="4", micro="0")

src/cpl_core/environment/__init__.py

@@ -15,7 +15,7 @@ __title__ = "cpl_core.environment"
 __author__ = "Sven Heidemann"
 __license__ = "MIT"
 __copyright__ = "Copyright (c) 2020 - 2023 sh-edraft.de"
-__version__ = "2023.2.0"
+__version__ = "2023.4.0"
 
 from collections import namedtuple
 
@@ -26,4 +26,4 @@ from .environment_name_enum import EnvironmentNameEnum
 from .application_environment import ApplicationEnvironment
 
 VersionInfo = namedtuple("VersionInfo", "major minor micro")
-version_info = VersionInfo(major="2023", minor="2", micro="0")
+version_info = VersionInfo(major="2023", minor="4", micro="0")

src/cpl_core/logging/__init__.py

@@ -15,7 +15,7 @@ __title__ = "cpl_core.logging"
 __author__ = "Sven Heidemann"
 __license__ = "MIT"
 __copyright__ = "Copyright (c) 2020 - 2023 sh-edraft.de"
-__version__ = "2023.2.0"
+__version__ = "2023.4.0"
 
 from collections import namedtuple
 
@@ -28,4 +28,4 @@ from .logging_settings import LoggingSettings
 from .logging_settings_name_enum import LoggingSettingsNameEnum
 
 VersionInfo = namedtuple("VersionInfo", "major minor micro")
-version_info = VersionInfo(major="2023", minor="2", micro="0")
+version_info = VersionInfo(major="2023", minor="4", micro="0")

src/cpl_core/mailing/__init__.py

@@ -15,7 +15,7 @@ __title__ = "cpl_core.mailing"
 __author__ = "Sven Heidemann"
 __license__ = "MIT"
 __copyright__ = "Copyright (c) 2020 - 2023 sh-edraft.de"
-__version__ = "2023.2.0"
+__version__ = "2023.4.0"
 
 from collections import namedtuple
 
@@ -28,4 +28,4 @@ from .email_client_settings import EMailClientSettings
 from .email_client_settings_name_enum import EMailClientSettingsNameEnum
 
 VersionInfo = namedtuple("VersionInfo", "major minor micro")
-version_info = VersionInfo(major="2023", minor="2", micro="0")
+version_info = VersionInfo(major="2023", minor="4", micro="0")

src/cpl_core/pipes/__init__.py

@@ -15,7 +15,7 @@ __title__ = "cpl_core.pipes"
 __author__ = "Sven Heidemann"
 __license__ = "MIT"
 __copyright__ = "Copyright (c) 2020 - 2023 sh-edraft.de"
-__version__ = "2023.2.0"
+__version__ = "2023.4.0"
 
 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="2023", minor="2", micro="0")
+version_info = VersionInfo(major="2023", minor="4", micro="0")

src/cpl_core/time/__init__.py

@@ -15,7 +15,7 @@ __title__ = "cpl_core.time"
 __author__ = "Sven Heidemann"
 __license__ = "MIT"
 __copyright__ = "Copyright (c) 2020 - 2023 sh-edraft.de"
-__version__ = "2023.2.0"
+__version__ = "2023.4.0"
 
 from collections import namedtuple
 
@@ -25,4 +25,4 @@ from .time_format_settings import TimeFormatSettings
 from .time_format_settings_names_enum import TimeFormatSettingsNamesEnum
 
 VersionInfo = namedtuple("VersionInfo", "major minor micro")
-version_info = VersionInfo(major="2023", minor="2", micro="0")
+version_info = VersionInfo(major="2023", minor="4", micro="0")

src/cpl_core/utils/__init__.py

@@ -15,7 +15,7 @@ __title__ = "cpl_core.utils"
 __author__ = "Sven Heidemann"
 __license__ = "MIT"
 __copyright__ = "Copyright (c) 2020 - 2023 sh-edraft.de"
-__version__ = "2023.2.0"
+__version__ = "2023.4.0"
 
 from collections import namedtuple
 
@@ -26,4 +26,4 @@ from .string import String
 from .pip import Pip
 
 VersionInfo = namedtuple("VersionInfo", "major minor micro")
-version_info = VersionInfo(major="2023", minor="2", micro="0")
+version_info = VersionInfo(major="2023", minor="4", micro="0")

src/cpl_discord/.cpl/__init__.py

@@ -15,7 +15,7 @@ __title__ = "cpl_discord"
 __author__ = "Sven Heidemann"
 __license__ = "MIT"
 __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de"
-__version__ = "2023.2.0"
+__version__ = "2023.4.0"
 
 from collections import namedtuple
 
@@ -23,4 +23,4 @@ from collections import namedtuple
 # imports:
 
 VersionInfo = namedtuple("VersionInfo", "major minor micro")
-version_info = VersionInfo(major="2023", minor="2", micro="0")
+version_info = VersionInfo(major="2023", minor="4", micro="0")

src/cpl_discord/__init__.py

@@ -15,7 +15,7 @@ __title__ = "cpl_discord"
 __author__ = "Sven Heidemann"
 __license__ = "MIT"
 __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de"
-__version__ = "2023.2.0"
+__version__ = "2023.4.0"
 
 from collections import namedtuple
 
@@ -59,4 +59,4 @@ def get_discord_collection(services: "ServiceCollectionABC") -> "DiscordCollecti
 # build-ignore-end
 
 VersionInfo = namedtuple("VersionInfo", "major minor micro")
-version_info = VersionInfo(major="2023", minor="2", micro="0")
+version_info = VersionInfo(major="2023", minor="4", micro="0")

src/cpl_discord/application/__init__.py

@@ -15,7 +15,7 @@ __title__ = "cpl_discord.application"
 __author__ = "Sven Heidemann"
 __license__ = "MIT"
 __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de"
-__version__ = "2023.2.0"
+__version__ = "2023.4.0"
 
 from collections import namedtuple
 
@@ -24,4 +24,4 @@ from collections import namedtuple
 from .discord_bot_application_abc import DiscordBotApplicationABC
 
 VersionInfo = namedtuple("VersionInfo", "major minor micro")
-version_info = VersionInfo(major="2023", minor="2", micro="0")
+version_info = VersionInfo(major="2023", minor="4", micro="0")

src/cpl_discord/command/__init__.py

@@ -15,7 +15,7 @@ __title__ = "cpl_discord.command"
 __author__ = "Sven Heidemann"
 __license__ = "MIT"
 __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de"
-__version__ = "2023.2.0"
+__version__ = "2023.4.0"
 
 from collections import namedtuple
 
@@ -25,4 +25,4 @@ from .discord_command_abc import DiscordCommandABC
 from .discord_commands_meta import DiscordCogMeta
 
 VersionInfo = namedtuple("VersionInfo", "major minor micro")
-version_info = VersionInfo(major="2023", minor="2", micro="0")
+version_info = VersionInfo(major="2023", minor="4", micro="0")

src/cpl_discord/configuration/__init__.py

@@ -15,7 +15,7 @@ __title__ = "cpl_discord.configuration"
 __author__ = "Sven Heidemann"
 __license__ = "MIT"
 __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de"
-__version__ = "2023.2.0"
+__version__ = "2023.4.0"
 
 from collections import namedtuple
 
@@ -24,4 +24,4 @@ from collections import namedtuple
 from .discord_bot_settings import DiscordBotSettings
 
 VersionInfo = namedtuple("VersionInfo", "major minor micro")
-version_info = VersionInfo(major="2023", minor="2", micro="0")
+version_info = VersionInfo(major="2023", minor="4", micro="0")

src/cpl_discord/container/__init__.py

@@ -15,7 +15,7 @@ __title__ = "cpl_discord.container"
 __author__ = "Sven Heidemann"
 __license__ = "MIT"
 __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de"
-__version__ = "2023.2.0"
+__version__ = "2023.4.0"
 
 from collections import namedtuple
 
@@ -31,4 +31,4 @@ from .thread import Thread
 from .voice_channel import VoiceChannel
 
 VersionInfo = namedtuple("VersionInfo", "major minor micro")
-version_info = VersionInfo(major="2023", minor="2", micro="0")
+version_info = VersionInfo(major="2023", minor="4", micro="0")

src/cpl_discord/cpl-discord.json

@@ -3,7 +3,7 @@
     "Name": "cpl-discord",
     "Version": {
       "Major": "2023",
-      "Minor": "2",
+      "Minor": "4",
       "Micro": "0"
     },
     "Author": "Sven Heidemann",
@@ -16,12 +16,12 @@
     "LicenseName": "MIT",
     "LicenseDescription": "MIT, see LICENSE for more details.",
     "Dependencies": [
-      "cpl-core>=2023.2.0",
+      "cpl-core>=2023.4.0",
       "discord.py==2.1.0",
-      "cpl-query>=2023.2.0"
+      "cpl-query>=2023.4.0"
     ],
     "DevDependencies": [
-      "cpl-cli>=2023.2.0"
+      "cpl-cli>=2023.4.0"
     ],
     "PythonVersion": ">=3.10",
     "PythonPath": {},

src/cpl_discord/events/__init__.py

@@ -15,7 +15,7 @@ __title__ = "cpl_discord.events"
 __author__ = "Sven Heidemann"
 __license__ = "MIT"
 __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de"
-__version__ = "2023.2.0"
+__version__ = "2023.4.0"
 
 from collections import namedtuple
 
@@ -69,4 +69,4 @@ from .on_voice_state_update_abc import OnVoiceStateUpdateABC
 from .on_webhooks_update_abc import OnWebhooksUpdateABC
 
 VersionInfo = namedtuple("VersionInfo", "major minor micro")
-version_info = VersionInfo(major="2023", minor="2", micro="0")
+version_info = VersionInfo(major="2023", minor="4", micro="0")

src/cpl_discord/helper/__init__.py

@@ -15,7 +15,7 @@ __title__ = "cpl_discord.helper"
 __author__ = "Sven Heidemann"
 __license__ = "MIT"
 __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de"
-__version__ = "2023.2.0"
+__version__ = "2023.4.0"
 
 from collections import namedtuple
 
@@ -24,4 +24,4 @@ from collections import namedtuple
 from .to_containers_converter import ToContainersConverter
 
 VersionInfo = namedtuple("VersionInfo", "major minor micro")
-version_info = VersionInfo(major="2023", minor="2", micro="0")
+version_info = VersionInfo(major="2023", minor="4", micro="0")

src/cpl_discord/service/__init__.py

@@ -15,7 +15,7 @@ __title__ = "cpl_discord.service"
 __author__ = "Sven Heidemann"
 __license__ = "MIT"
 __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de"
-__version__ = "2023.2.0"
+__version__ = "2023.4.0"
 
 from collections import namedtuple
 
@@ -29,4 +29,4 @@ from .discord_service import DiscordService
 from .discord_service_abc import DiscordServiceABC
 
 VersionInfo = namedtuple("VersionInfo", "major minor micro")
-version_info = VersionInfo(major="2023", minor="2", micro="0")
+version_info = VersionInfo(major="2023", minor="4", micro="0")

src/cpl_query/__init__.py

@@ -15,7 +15,7 @@ __title__ = "cpl_query"
 __author__ = "Sven Heidemann"
 __license__ = "MIT"
 __copyright__ = "Copyright (c) 2021 - 2023 sh-edraft.de"
-__version__ = "2023.2.0"
+__version__ = "2023.4.0"
 
 from collections import namedtuple
 
@@ -23,4 +23,4 @@ from collections import namedtuple
 # imports:
 
 VersionInfo = namedtuple("VersionInfo", "major minor micro")
-version_info = VersionInfo(major="2023", minor="2", micro="0")
+version_info = VersionInfo(major="2023", minor="4", micro="0")

src/cpl_query/base/__init__.py

@@ -15,12 +15,16 @@ __title__ = "cpl_query.base"
 __author__ = "Sven Heidemann"
 __license__ = "MIT"
 __copyright__ = "Copyright (c) 2021 - 2023 sh-edraft.de"
-__version__ = "2023.2.0"
+__version__ = "2023.4.0"
 
 from collections import namedtuple
 
-
 # imports:
+from .default_lambda import default_lambda
+from .ordered_queryable import OrderedQueryable
+from .ordered_queryable_abc import OrderedQueryableABC
+from .queryable_abc import QueryableABC
+from .sequence import Sequence
 
 VersionInfo = namedtuple("VersionInfo", "major minor micro")
-version_info = VersionInfo(major="2023", minor="2", micro="0")
+version_info = VersionInfo(major="2023", minor="4", micro="0")

src/cpl_query/base/ordered_queryable.py

@@ -1,4 +1,5 @@
 from collections.abc import Callable
+from typing import Self
 
 from cpl_query.base.ordered_queryable_abc import OrderedQueryableABC
 from cpl_query.exceptions import ArgumentNoneException, ExceptionArgument
@@ -6,12 +7,12 @@ from cpl_query.iterable.iterable import Iterable
 
 
 class OrderedQueryable(OrderedQueryableABC):
-    r"""Implementation of :class: `cpl_query.extension.Iterable` `cpl_query.extension.OrderedIterableABC`"""
+    r"""Implementation of :class: `cpl_query.base.ordered_queryable_abc.OrderedQueryableABC`"""
 
     def __init__(self, _t: type, _values: Iterable = None, _func: Callable = None):
         OrderedQueryableABC.__init__(self, _t, _values, _func)
 
-    def then_by(self: OrderedQueryableABC, _func: Callable) -> OrderedQueryableABC:
+    def then_by(self, _func: Callable) -> Self:
         if self is None:
             raise ArgumentNoneException(ExceptionArgument.list)
 
@@ -22,7 +23,7 @@ class OrderedQueryable(OrderedQueryableABC):
 
         return OrderedQueryable(self.type, sorted(self, key=lambda *args: [f(*args) for f in self._funcs]), _func)
 
-    def then_by_descending(self: OrderedQueryableABC, _func: Callable) -> OrderedQueryableABC:
+    def then_by_descending(self, _func: Callable) -> Self:
         if self is None:
             raise ArgumentNoneException(ExceptionArgument.list)
 

src/cpl_query/base/ordered_queryable_abc.py

@@ -1,6 +1,6 @@
 from abc import abstractmethod
 from collections.abc import Callable
-from typing import Iterable
+from typing import Iterable, Self
 
 from cpl_query.base.queryable_abc import QueryableABC
 
@@ -14,7 +14,7 @@ class OrderedQueryableABC(QueryableABC):
             self._funcs.append(_func)
 
     @abstractmethod
-    def then_by(self, func: Callable) -> "OrderedQueryableABC":
+    def then_by(self, func: Callable) -> Self:
         r"""Sorts OrderedList in ascending order by function
 
         Parameter:
@@ -26,7 +26,7 @@ class OrderedQueryableABC(QueryableABC):
         pass
 
     @abstractmethod
-    def then_by_descending(self, func: Callable) -> "OrderedQueryableABC":
+    def then_by_descending(self, func: Callable) -> Self:
         r"""Sorts OrderedList in descending order by function
 
         Parameter:

src/cpl_query/base/queryable_abc.py

@@ -1,6 +1,12 @@
-from typing import Optional, Callable, Union, Iterable
+from __future__ import annotations
+
+from typing import Optional, Callable, Union, Iterable, Self, Any
+from typing import TYPE_CHECKING
 
 from cpl_query._helper import is_number
+
+if TYPE_CHECKING:
+    from cpl_query.base.ordered_queryable_abc import OrderedQueryableABC
 from cpl_query.base.sequence import Sequence
 from cpl_query.exceptions import (
     InvalidTypeException,
@@ -103,7 +109,7 @@ class QueryableABC(Sequence):
 
         return self.where(_func).count()
 
-    def distinct(self, _func: Callable = None) -> "QueryableABC":
+    def distinct(self, _func: Callable = None) -> Self:
         r"""Returns list without redundancies
 
         Parameter
@@ -212,7 +218,7 @@ class QueryableABC(Sequence):
 
         return self
 
-    def group_by(self, _func: Callable = None) -> "QueryableABC":
+    def group_by(self, _func: Callable = None) -> Self:
         r"""Groups by func
 
         Returns
@@ -315,7 +321,7 @@ class QueryableABC(Sequence):
 
         return _func(min(self, key=_func))
 
-    def order_by(self, _func: Callable = None) -> "OrderedQueryableABC":
+    def order_by(self, _func: Callable = None) -> OrderedQueryableABC:
         r"""Sorts elements by function in ascending order
 
         Parameter
@@ -353,7 +359,7 @@ class QueryableABC(Sequence):
 
         return OrderedQueryable(self.type, sorted(self, key=_func, reverse=True), _func)
 
-    def reverse(self) -> "QueryableABC":
+    def reverse(self) -> Self:
         r"""Reverses list
 
         Returns
@@ -362,7 +368,7 @@ class QueryableABC(Sequence):
         """
         return type(self)(self._type, reversed(self._values))
 
-    def select(self, _func: Callable) -> "QueryableABC":
+    def select(self, _func: Callable) -> Self:
         r"""Formats each element of list to a given format
 
         Returns
@@ -372,9 +378,12 @@ class QueryableABC(Sequence):
         if _func is None:
             _func = _default_lambda
 
-        return type(self)(object, [_func(_o) for _o in self])
+        _l = [_func(_o) for _o in self]
+        _t = type(_l[0]) if len(_l) > 0 else Any
 
-    def select_many(self, _func: Callable) -> "QueryableABC":
+        return type(self)(_t, _l)
+
+    def select_many(self, _func: Callable) -> Self:
         r"""Flattens resulting lists to one
 
         Returns
@@ -418,7 +427,7 @@ class QueryableABC(Sequence):
 
         return self._values[0]
 
-    def skip(self, _index: int) -> "QueryableABC":
+    def skip(self, _index: int) -> Self:
         r"""Skips all elements from index
 
         Parameter
@@ -435,7 +444,7 @@ class QueryableABC(Sequence):
 
         return type(self)(self.type, self._values[_index:])
 
-    def skip_last(self, _index: int) -> "QueryableABC":
+    def skip_last(self, _index: int) -> Self:
         r"""Skips all elements after index
 
         Parameter
@@ -477,7 +486,7 @@ class QueryableABC(Sequence):
 
         return result
 
-    def split(self, _func: Callable) -> "QueryableABC":
+    def split(self, _func: Callable) -> Self:
         r"""Splits the list by given function
 
 
@@ -510,7 +519,7 @@ class QueryableABC(Sequence):
 
         return type(self)(self._type, query_groups)
 
-    def take(self, _index: int) -> "QueryableABC":
+    def take(self, _index: int) -> Self:
         r"""Takes all elements from index
 
         Parameter
@@ -527,7 +536,7 @@ class QueryableABC(Sequence):
 
         return type(self)(self._type, self._values[:_index])
 
-    def take_last(self, _index: int) -> "QueryableABC":
+    def take_last(self, _index: int) -> Self:
         r"""Takes all elements after index
 
         Parameter
@@ -546,7 +555,7 @@ class QueryableABC(Sequence):
 
         return type(self)(self._type, self._values[index:])
 
-    def where(self, _func: Callable = None) -> "QueryableABC":
+    def where(self, _func: Callable = None) -> Self:
         r"""Select element by function
 
         Parameter

src/cpl_query/base/sequence.py

@@ -25,7 +25,7 @@ class Sequence(ABC):
         return self.to_list().__len__()
 
     @classmethod
-    def __class_getitem__(cls, _t: type):
+    def __class_getitem__(cls, _t: type) -> type:
         return _t
 
     def __repr__(self):

src/cpl_query/cpl-query.json

@@ -3,7 +3,7 @@
     "Name": "cpl-query",
     "Version": {
       "Major": "2023",
-      "Minor": "2",
+      "Minor": "4",
       "Micro": "0"
     },
     "Author": "Sven Heidemann",
@@ -17,7 +17,7 @@
     "LicenseDescription": "MIT, see LICENSE for more details.",
     "Dependencies": [],
     "DevDependencies": [],
-    "PythonVersion": ">=3.10",
+    "PythonVersion": ">=3.11",
     "PythonPath": {},
     "Classifiers": []
   },

src/cpl_query/enumerable/__init__.py

@@ -15,7 +15,7 @@ __title__ = "cpl_query.enumerable"
 __author__ = "Sven Heidemann"
 __license__ = "MIT"
 __copyright__ = "Copyright (c) 2021 - 2023 sh-edraft.de"
-__version__ = "2023.2.0"
+__version__ = "2023.4.0"
 
 from collections import namedtuple
 
@@ -25,4 +25,4 @@ from .enumerable import Enumerable
 from .enumerable_abc import EnumerableABC
 
 VersionInfo = namedtuple("VersionInfo", "major minor micro")
-version_info = VersionInfo(major="2023", minor="2", micro="0")
+version_info = VersionInfo(major="2023", minor="4", micro="0")

src/cpl_query/extension/__init__.py

@@ -15,7 +15,7 @@ __title__ = "cpl_query.extension"
 __author__ = "Sven Heidemann"
 __license__ = "MIT"
 __copyright__ = "Copyright (c) 2021 - 2023 sh-edraft.de"
-__version__ = "2023.2.0"
+__version__ = "2023.4.0"
 
 from collections import namedtuple
 
@@ -24,4 +24,4 @@ from collections import namedtuple
 from .list import List
 
 VersionInfo = namedtuple("VersionInfo", "major minor micro")
-version_info = VersionInfo(major="2023", minor="2", micro="0")
+version_info = VersionInfo(major="2023", minor="4", micro="0")

src/cpl_query/iterable/__init__.py

@@ -15,7 +15,7 @@ __title__ = "cpl_query.iterable"
 __author__ = "Sven Heidemann"
 __license__ = "MIT"
 __copyright__ = "Copyright (c) 2021 - 2023 sh-edraft.de"
-__version__ = "2023.2.0"
+__version__ = "2023.4.0"
 
 from collections import namedtuple
 
@@ -25,4 +25,4 @@ from .iterable_abc import IterableABC
 from .iterable import Iterable
 
 VersionInfo = namedtuple("VersionInfo", "major minor micro")
-version_info = VersionInfo(major="2023", minor="2", micro="0")
+version_info = VersionInfo(major="2023", minor="4", micro="0")

src/cpl_translation/__init__.py

@@ -15,7 +15,7 @@ __title__ = "cpl_translation"
 __author__ = "Sven Heidemann"
 __license__ = "MIT"
 __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de"
-__version__ = "2023.2.0"
+__version__ = "2023.4.0"
 
 from collections import namedtuple
 
@@ -53,4 +53,4 @@ init()
 # build-ignore-end
 
 VersionInfo = namedtuple("VersionInfo", "major minor micro")
-version_info = VersionInfo(major="2023", minor="2", micro="0")
+version_info = VersionInfo(major="2023", minor="4", micro="0")

src/cpl_translation/cpl-translation.json

@@ -3,7 +3,7 @@
     "Name": "cpl-translation",
     "Version": {
       "Major": "2023",
-      "Minor": "2",
+      "Minor": "4",
       "Micro": "0"
     },
     "Author": "Sven Heidemann",
@@ -16,10 +16,10 @@
     "LicenseName": "MIT",
     "LicenseDescription": "MIT, see LICENSE for more details.",
     "Dependencies": [
-      "cpl-core>=2023.2.0"
+      "cpl-core>=2023.4.0"
     ],
     "DevDependencies": [
-      "cpl-cli>=2023.2.0"
+      "cpl-cli>=2023.4.0"
     ],
     "PythonVersion": ">=3.10",
     "PythonPath": {},

unittests/unittests_query/iterable_query_test_case.py

@@ -270,6 +270,12 @@ class IterableQueryTestCase(unittest.TestCase):
         self.assertEqual(res.to_list(), l_res)
 
     def test_select(self):
+        def test(_l: List) -> List[int]:
+            return _l.select(lambda user: user.address.nr)
+
+        self.assertEqual(List[User], self._tests.type)
+        self.assertEqual(List[int], test(self._tests).type)
+
         range_list = List(int, range(0, 100))
         selected_range = range_list.select(lambda x: x + 1)