From c3d51e29fc6c6b1e7bd6c0ef89c589b1c46a298a Mon Sep 17 00:00:00 2001 From: Sven Heidemann Date: Thu, 25 Jul 2024 17:32:11 +0200 Subject: [PATCH] Set version --- cpl-workspace.json | 1 + src/cpl_cli/.cpl/__init__.py | 8 +++---- src/cpl_cli/__init__.py | 8 +++---- src/cpl_cli/_templates/__init__.py | 8 +++---- src/cpl_cli/_templates/build/__init__.py | 16 ++++++------- src/cpl_cli/_templates/build/init_template.py | 14 +++++------ src/cpl_cli/_templates/publish/__init__.py | 8 +++---- src/cpl_cli/abc/__init__.py | 8 +++---- src/cpl_cli/command/__init__.py | 8 +++---- src/cpl_cli/configuration/__init__.py | 8 +++---- src/cpl_cli/cpl-cli.json | 10 ++++---- src/cpl_cli/helper/__init__.py | 8 +++---- src/cpl_cli/live_server/__init__.py | 8 +++---- src/cpl_cli/main.py | 10 ++++---- src/cpl_cli/migrations/__init__.py | 8 +++---- src/cpl_cli/migrations/base/__init__.py | 8 +++---- src/cpl_cli/migrations/service/__init__.py | 8 +++---- src/cpl_cli/publish/__init__.py | 8 +++---- src/cpl_cli/source_creator/__init__.py | 8 +++---- src/cpl_cli/startup_argument_extension.py | 11 +++++++++ src/cpl_cli/validators/__init__.py | 8 +++---- src/cpl_core/__init__.py | 4 ++-- src/cpl_core/application/__init__.py | 4 ++-- src/cpl_core/configuration/__init__.py | 4 ++-- src/cpl_core/configuration/configuration.py | 2 +- src/cpl_core/console/__init__.py | 4 ++-- src/cpl_core/cpl-core.json | 24 +++++++++---------- src/cpl_core/database/__init__.py | 4 ++-- src/cpl_core/database/connection/__init__.py | 4 ++-- src/cpl_core/database/context/__init__.py | 4 ++-- src/cpl_core/dependency_injection/__init__.py | 4 ++-- src/cpl_core/environment/__init__.py | 4 ++-- src/cpl_core/logging/__init__.py | 4 ++-- src/cpl_core/mailing/__init__.py | 4 ++-- src/cpl_core/pipes/__init__.py | 4 ++-- src/cpl_core/time/__init__.py | 4 ++-- src/cpl_core/utils/__init__.py | 4 ++-- .../custom/general/src/general/application.py | 2 +- 38 files changed, 138 insertions(+), 128 deletions(-) diff --git a/cpl-workspace.json b/cpl-workspace.json index e00ea987..537b7e3b 100644 --- a/cpl-workspace.json +++ b/cpl-workspace.json @@ -7,6 +7,7 @@ "cpl-discord": "src/cpl_discord/cpl-discord.json", "cpl-query": "src/cpl_query/cpl-query.json", "cpl-translation": "src/cpl_translation/cpl-translation.json", + "cpl-bundle": "src/cpl_bundle/cpl-bundle.json", "set-version": "tools/set_version/set-version.json", "set-pip-urls": "tools/set_pip_urls/set-pip-urls.json", "unittests": "unittests/unittests/unittests.json", diff --git a/src/cpl_cli/.cpl/__init__.py b/src/cpl_cli/.cpl/__init__.py index b6c6f5f8..efbc86c5 100644 --- a/src/cpl_cli/.cpl/__init__.py +++ b/src/cpl_cli/.cpl/__init__.py @@ -6,7 +6,7 @@ cpl-cli CPL CLI CPL Command Line Interface -:copyright: (c) 2020 - 2023 sh-edraft.de +:copyright: (c) 2020 - 2024 sh-edraft.de :license: MIT, see LICENSE for more details. """ @@ -14,8 +14,8 @@ CPL Command Line Interface __title__ = "cpl_cli" __author__ = "Sven Heidemann" __license__ = "MIT" -__copyright__ = "Copyright (c) 2020 - 2023 sh-edraft.de" -__version__ = "2023.4.0.post3" +__copyright__ = "Copyright (c) 2020 - 2024 sh-edraft.de" +__version__ = "2024.10.0" from collections import namedtuple @@ -23,4 +23,4 @@ from collections import namedtuple # imports: VersionInfo = namedtuple("VersionInfo", "major minor micro") -version_info = VersionInfo(major="2023", minor="4", micro="0.post3") +version_info = VersionInfo(major="2024", minor="10", micro="0") diff --git a/src/cpl_cli/__init__.py b/src/cpl_cli/__init__.py index d5bbcd37..4333080a 100644 --- a/src/cpl_cli/__init__.py +++ b/src/cpl_cli/__init__.py @@ -6,7 +6,7 @@ cpl-cli CPL CLI CPL Command Line Interface -:copyright: (c) 2020 - 2023 sh-edraft.de +:copyright: (c) 2020 - 2024 sh-edraft.de :license: MIT, see LICENSE for more details. """ @@ -14,8 +14,8 @@ CPL Command Line Interface __title__ = "cpl_cli" __author__ = "Sven Heidemann" __license__ = "MIT" -__copyright__ = "Copyright (c) 2020 - 2023 sh-edraft.de" -__version__ = "2023.4.0.post3" +__copyright__ = "Copyright (c) 2020 - 2024 sh-edraft.de" +__version__ = "2024.10.0" from collections import namedtuple @@ -28,4 +28,4 @@ from .main import main from .startup import Startup VersionInfo = namedtuple("VersionInfo", "major minor micro") -version_info = VersionInfo(major="2023", minor="4", micro="0.post3") +version_info = VersionInfo(major="2024", minor="10", micro="0") diff --git a/src/cpl_cli/_templates/__init__.py b/src/cpl_cli/_templates/__init__.py index b671d25b..1641e9f8 100644 --- a/src/cpl_cli/_templates/__init__.py +++ b/src/cpl_cli/_templates/__init__.py @@ -6,7 +6,7 @@ cpl-cli CPL CLI CPL Command Line Interface -:copyright: (c) 2020 - 2023 sh-edraft.de +:copyright: (c) 2020 - 2024 sh-edraft.de :license: MIT, see LICENSE for more details. """ @@ -14,8 +14,8 @@ CPL Command Line Interface __title__ = "cpl_cli._templates" __author__ = "Sven Heidemann" __license__ = "MIT" -__copyright__ = "Copyright (c) 2020 - 2023 sh-edraft.de" -__version__ = "2023.4.0.post3" +__copyright__ = "Copyright (c) 2020 - 2024 sh-edraft.de" +__version__ = "2024.10.0" from collections import namedtuple @@ -23,4 +23,4 @@ from collections import namedtuple # imports: VersionInfo = namedtuple("VersionInfo", "major minor micro") -version_info = VersionInfo(major="2023", minor="4", micro="0.post3") +version_info = VersionInfo(major="2024", minor="10", micro="0") diff --git a/src/cpl_cli/_templates/build/__init__.py b/src/cpl_cli/_templates/build/__init__.py index f8dc727c..cb014c59 100644 --- a/src/cpl_cli/_templates/build/__init__.py +++ b/src/cpl_cli/_templates/build/__init__.py @@ -6,21 +6,21 @@ cpl-cli CPL CLI CPL Command Line Interface -:copyright: (c) 2020 - 2023 sh-edraft.de +:copyright: (c) 2020 - 2024 sh-edraft.de :license: MIT, see LICENSE for more details. """ -__title__ = 'cpl_cli._templates.build' -__author__ = 'Sven Heidemann' -__license__ = 'MIT' -__copyright__ = 'Copyright (c) 2020 - 2023 sh-edraft.de' -__version__ = '2023.4.0.post3' +__title__ = "cpl_cli._templates.build" +__author__ = "Sven Heidemann" +__license__ = "MIT" +__copyright__ = "Copyright (c) 2020 - 2024 sh-edraft.de" +__version__ = "2024.10.0" from collections import namedtuple # imports: -VersionInfo = namedtuple('VersionInfo', 'major minor micro') -version_info = VersionInfo(major='2023', minor='4', micro='0.post3') +VersionInfo = namedtuple("VersionInfo", "major minor micro") +version_info = VersionInfo(major="2024", minor="10", micro="0") diff --git a/src/cpl_cli/_templates/build/init_template.py b/src/cpl_cli/_templates/build/init_template.py index 0529cb67..7cd24ca7 100644 --- a/src/cpl_cli/_templates/build/init_template.py +++ b/src/cpl_cli/_templates/build/init_template.py @@ -19,19 +19,19 @@ class InitTemplate: \"\"\" - __title__ = '$Title' - __author__ = '$Author' - __license__ = '$LicenseName' - __copyright__ = 'Copyright (c) $CopyrightDate $CopyrightName' - __version__ = '$Version' + __title__ = "$Title" + __author__ = "$Author" + __license__ = "$LicenseName" + __copyright__ = "Copyright (c) $CopyrightDate $CopyrightName" + __version__ = "$Version" from collections import namedtuple $Imports - VersionInfo = namedtuple('VersionInfo', 'major minor micro') - version_info = VersionInfo(major='$Major', minor='$Minor', micro='$Micro') + VersionInfo = namedtuple("VersionInfo", "major minor micro") + version_info = VersionInfo(major="$Major", minor="$Minor", micro="$Micro") """ ) diff --git a/src/cpl_cli/_templates/publish/__init__.py b/src/cpl_cli/_templates/publish/__init__.py index 41a9788e..1a4155df 100644 --- a/src/cpl_cli/_templates/publish/__init__.py +++ b/src/cpl_cli/_templates/publish/__init__.py @@ -6,7 +6,7 @@ cpl-cli CPL CLI CPL Command Line Interface -:copyright: (c) 2020 - 2023 sh-edraft.de +:copyright: (c) 2020 - 2024 sh-edraft.de :license: MIT, see LICENSE for more details. """ @@ -14,8 +14,8 @@ CPL Command Line Interface __title__ = "cpl_cli._templates.publish" __author__ = "Sven Heidemann" __license__ = "MIT" -__copyright__ = "Copyright (c) 2020 - 2023 sh-edraft.de" -__version__ = "2023.4.0.post3" +__copyright__ = "Copyright (c) 2020 - 2024 sh-edraft.de" +__version__ = "2024.10.0" from collections import namedtuple @@ -23,4 +23,4 @@ from collections import namedtuple # imports: VersionInfo = namedtuple("VersionInfo", "major minor micro") -version_info = VersionInfo(major="2023", minor="4", micro="0.post3") +version_info = VersionInfo(major="2024", minor="10", micro="0") diff --git a/src/cpl_cli/abc/__init__.py b/src/cpl_cli/abc/__init__.py index 6ff59c01..d42b0233 100644 --- a/src/cpl_cli/abc/__init__.py +++ b/src/cpl_cli/abc/__init__.py @@ -6,7 +6,7 @@ cpl-cli CPL CLI CPL Command Line Interface -:copyright: (c) 2020 - 2023 sh-edraft.de +:copyright: (c) 2020 - 2024 sh-edraft.de :license: MIT, see LICENSE for more details. """ @@ -14,8 +14,8 @@ CPL Command Line Interface __title__ = "cpl_cli.abc" __author__ = "Sven Heidemann" __license__ = "MIT" -__copyright__ = "Copyright (c) 2020 - 2023 sh-edraft.de" -__version__ = "2023.4.0.post3" +__copyright__ = "Copyright (c) 2020 - 2024 sh-edraft.de" +__version__ = "2024.10.0" from collections import namedtuple @@ -23,4 +23,4 @@ from collections import namedtuple # imports VersionInfo = namedtuple("VersionInfo", "major minor micro") -version_info = VersionInfo(major="2023", minor="4", micro="0.post3") +version_info = VersionInfo(major="2024", minor="10", micro="0") diff --git a/src/cpl_cli/command/__init__.py b/src/cpl_cli/command/__init__.py index eab08d85..3bde029f 100644 --- a/src/cpl_cli/command/__init__.py +++ b/src/cpl_cli/command/__init__.py @@ -6,7 +6,7 @@ cpl-cli CPL CLI CPL Command Line Interface -:copyright: (c) 2020 - 2023 sh-edraft.de +:copyright: (c) 2020 - 2024 sh-edraft.de :license: MIT, see LICENSE for more details. """ @@ -14,8 +14,8 @@ CPL Command Line Interface __title__ = "cpl_cli.command" __author__ = "Sven Heidemann" __license__ = "MIT" -__copyright__ = "Copyright (c) 2020 - 2023 sh-edraft.de" -__version__ = "2023.4.0.post3" +__copyright__ = "Copyright (c) 2020 - 2024 sh-edraft.de" +__version__ = "2024.10.0" from collections import namedtuple @@ -29,4 +29,4 @@ from .publish_service import PublishService from .version_service import VersionService VersionInfo = namedtuple("VersionInfo", "major minor micro") -version_info = VersionInfo(major="2023", minor="4", micro="0.post3") +version_info = VersionInfo(major="2024", minor="10", micro="0") diff --git a/src/cpl_cli/configuration/__init__.py b/src/cpl_cli/configuration/__init__.py index 86097d9c..ba679b35 100644 --- a/src/cpl_cli/configuration/__init__.py +++ b/src/cpl_cli/configuration/__init__.py @@ -6,7 +6,7 @@ cpl-cli CPL CLI CPL Command Line Interface -:copyright: (c) 2020 - 2023 sh-edraft.de +:copyright: (c) 2020 - 2024 sh-edraft.de :license: MIT, see LICENSE for more details. """ @@ -14,8 +14,8 @@ CPL Command Line Interface __title__ = "cpl_cli.configuration" __author__ = "Sven Heidemann" __license__ = "MIT" -__copyright__ = "Copyright (c) 2020 - 2023 sh-edraft.de" -__version__ = "2023.4.0.post3" +__copyright__ = "Copyright (c) 2020 - 2024 sh-edraft.de" +__version__ = "2024.10.0" from collections import namedtuple @@ -31,4 +31,4 @@ from .workspace_settings import WorkspaceSettings from .workspace_settings_name_enum import WorkspaceSettingsNameEnum VersionInfo = namedtuple("VersionInfo", "major minor micro") -version_info = VersionInfo(major="2023", minor="4", micro="0.post3") +version_info = VersionInfo(major="2024", minor="10", micro="0") diff --git a/src/cpl_cli/cpl-cli.json b/src/cpl_cli/cpl-cli.json index c3047753..16f8b4ea 100644 --- a/src/cpl_cli/cpl-cli.json +++ b/src/cpl_cli/cpl-cli.json @@ -2,16 +2,16 @@ "ProjectSettings": { "Name": "cpl-cli", "Version": { - "Major": "2023", - "Minor": "4", - "Micro": "0.post3" + "Major": "2024", + "Minor": "10", + "Micro": "0" }, "Author": "Sven Heidemann", "AuthorEmail": "sven.heidemann@sh-edraft.de", "Description": "CPL CLI", "LongDescription": "CPL Command Line Interface", "URL": "https://www.sh-edraft.de", - "CopyrightDate": "2020 - 2023", + "CopyrightDate": "2020 - 2024", "CopyrightName": "sh-edraft.de", "LicenseName": "MIT", "LicenseDescription": "MIT, see LICENSE for more details.", @@ -19,7 +19,7 @@ "cpl-core>=2023.4.0" ], "DevDependencies": [], - "PythonVersion": ">=3.10", + "PythonVersion": ">=3.12", "PythonPath": { "linux": "../../venv" }, diff --git a/src/cpl_cli/helper/__init__.py b/src/cpl_cli/helper/__init__.py index b62b948f..1bd8e9a9 100644 --- a/src/cpl_cli/helper/__init__.py +++ b/src/cpl_cli/helper/__init__.py @@ -6,7 +6,7 @@ cpl-cli CPL CLI CPL Command Line Interface -:copyright: (c) 2020 - 2023 sh-edraft.de +:copyright: (c) 2020 - 2024 sh-edraft.de :license: MIT, see LICENSE for more details. """ @@ -14,8 +14,8 @@ CPL Command Line Interface __title__ = "cpl_cli.helper" __author__ = "Sven Heidemann" __license__ = "MIT" -__copyright__ = "Copyright (c) 2020 - 2023 sh-edraft.de" -__version__ = "2023.4.0.post3" +__copyright__ = "Copyright (c) 2020 - 2024 sh-edraft.de" +__version__ = "2024.10.0" from collections import namedtuple @@ -23,4 +23,4 @@ from collections import namedtuple # imports: VersionInfo = namedtuple("VersionInfo", "major minor micro") -version_info = VersionInfo(major="2023", minor="4", micro="0.post3") +version_info = VersionInfo(major="2024", minor="10", micro="0") diff --git a/src/cpl_cli/live_server/__init__.py b/src/cpl_cli/live_server/__init__.py index d7b99eac..1f64e6af 100644 --- a/src/cpl_cli/live_server/__init__.py +++ b/src/cpl_cli/live_server/__init__.py @@ -6,7 +6,7 @@ cpl-cli CPL CLI CPL Command Line Interface -:copyright: (c) 2020 - 2023 sh-edraft.de +:copyright: (c) 2020 - 2024 sh-edraft.de :license: MIT, see LICENSE for more details. """ @@ -14,8 +14,8 @@ CPL Command Line Interface __title__ = "cpl_cli.live_server" __author__ = "Sven Heidemann" __license__ = "MIT" -__copyright__ = "Copyright (c) 2020 - 2023 sh-edraft.de" -__version__ = "2023.4.0.post3" +__copyright__ = "Copyright (c) 2020 - 2024 sh-edraft.de" +__version__ = "2024.10.0" from collections import namedtuple @@ -23,4 +23,4 @@ from collections import namedtuple # imports: VersionInfo = namedtuple("VersionInfo", "major minor micro") -version_info = VersionInfo(major="2023", minor="4", micro="0.post3") +version_info = VersionInfo(major="2024", minor="10", micro="0") diff --git a/src/cpl_cli/main.py b/src/cpl_cli/main.py index f9c2bb83..4374caec 100644 --- a/src/cpl_cli/main.py +++ b/src/cpl_cli/main.py @@ -1,7 +1,6 @@ +import importlib.metadata from typing import Type -import pkg_resources - from cpl_cli.cli import CLI from cpl_cli.startup import Startup from cpl_cli.startup_argument_extension import StartupArgumentExtension @@ -16,13 +15,12 @@ def get_startup_extensions() -> list[Type[StartupExtensionABC]]: blacklisted_packages = ["cpl-cli"] startup_extensions = [] - installed_packages = pkg_resources.working_set + installed_packages = importlib.metadata.distributions() for p in installed_packages: - package = str(p).split(" ")[0] - if not package.startswith("cpl-") or package in blacklisted_packages: + if not p.name.startswith("cpl-") or p.name in blacklisted_packages: continue - package = package.replace("-", "_") + package = p.name.replace("-", "_") loaded_package = __import__(package) if "__cli_startup_extension__" not in dir(loaded_package): continue diff --git a/src/cpl_cli/migrations/__init__.py b/src/cpl_cli/migrations/__init__.py index e73ea308..7749078a 100644 --- a/src/cpl_cli/migrations/__init__.py +++ b/src/cpl_cli/migrations/__init__.py @@ -6,7 +6,7 @@ cpl-cli CPL CLI CPL Command Line Interface -:copyright: (c) 2020 - 2023 sh-edraft.de +:copyright: (c) 2020 - 2024 sh-edraft.de :license: MIT, see LICENSE for more details. """ @@ -14,8 +14,8 @@ CPL Command Line Interface __title__ = "cpl_cli.migrations" __author__ = "Sven Heidemann" __license__ = "MIT" -__copyright__ = "Copyright (c) 2020 - 2023 sh-edraft.de" -__version__ = "2023.4.0.post3" +__copyright__ = "Copyright (c) 2020 - 2024 sh-edraft.de" +__version__ = "2024.10.0" from collections import namedtuple @@ -23,4 +23,4 @@ from collections import namedtuple # imports VersionInfo = namedtuple("VersionInfo", "major minor micro") -version_info = VersionInfo(major="2023", minor="4", micro="0.post3") +version_info = VersionInfo(major="2024", minor="10", micro="0") diff --git a/src/cpl_cli/migrations/base/__init__.py b/src/cpl_cli/migrations/base/__init__.py index ce731b48..b93bbf1b 100644 --- a/src/cpl_cli/migrations/base/__init__.py +++ b/src/cpl_cli/migrations/base/__init__.py @@ -6,7 +6,7 @@ cpl-cli CPL CLI CPL Command Line Interface -:copyright: (c) 2020 - 2023 sh-edraft.de +:copyright: (c) 2020 - 2024 sh-edraft.de :license: MIT, see LICENSE for more details. """ @@ -14,8 +14,8 @@ CPL Command Line Interface __title__ = "cpl_cli.migrations.base" __author__ = "Sven Heidemann" __license__ = "MIT" -__copyright__ = "Copyright (c) 2020 - 2023 sh-edraft.de" -__version__ = "2023.4.0.post3" +__copyright__ = "Copyright (c) 2020 - 2024 sh-edraft.de" +__version__ = "2024.10.0" from collections import namedtuple @@ -23,4 +23,4 @@ from collections import namedtuple # imports: VersionInfo = namedtuple("VersionInfo", "major minor micro") -version_info = VersionInfo(major="2023", minor="4", micro="0.post3") +version_info = VersionInfo(major="2024", minor="10", micro="0") diff --git a/src/cpl_cli/migrations/service/__init__.py b/src/cpl_cli/migrations/service/__init__.py index 5f1d228c..51ba1ed3 100644 --- a/src/cpl_cli/migrations/service/__init__.py +++ b/src/cpl_cli/migrations/service/__init__.py @@ -6,7 +6,7 @@ cpl-cli CPL CLI CPL Command Line Interface -:copyright: (c) 2020 - 2023 sh-edraft.de +:copyright: (c) 2020 - 2024 sh-edraft.de :license: MIT, see LICENSE for more details. """ @@ -14,8 +14,8 @@ CPL Command Line Interface __title__ = "cpl_cli.migrations.service" __author__ = "Sven Heidemann" __license__ = "MIT" -__copyright__ = "Copyright (c) 2020 - 2023 sh-edraft.de" -__version__ = "2023.4.0.post3" +__copyright__ = "Copyright (c) 2020 - 2024 sh-edraft.de" +__version__ = "2024.10.0" from collections import namedtuple @@ -23,4 +23,4 @@ from collections import namedtuple # imports: VersionInfo = namedtuple("VersionInfo", "major minor micro") -version_info = VersionInfo(major="2023", minor="4", micro="0.post3") +version_info = VersionInfo(major="2024", minor="10", micro="0") diff --git a/src/cpl_cli/publish/__init__.py b/src/cpl_cli/publish/__init__.py index 65d31499..10d17087 100644 --- a/src/cpl_cli/publish/__init__.py +++ b/src/cpl_cli/publish/__init__.py @@ -6,7 +6,7 @@ cpl-cli CPL CLI CPL Command Line Interface -:copyright: (c) 2020 - 2023 sh-edraft.de +:copyright: (c) 2020 - 2024 sh-edraft.de :license: MIT, see LICENSE for more details. """ @@ -14,8 +14,8 @@ CPL Command Line Interface __title__ = "cpl_cli.publish" __author__ = "Sven Heidemann" __license__ = "MIT" -__copyright__ = "Copyright (c) 2020 - 2023 sh-edraft.de" -__version__ = "2023.4.0.post3" +__copyright__ = "Copyright (c) 2020 - 2024 sh-edraft.de" +__version__ = "2024.10.0" from collections import namedtuple @@ -25,4 +25,4 @@ from .publisher_abc import PublisherABC from .publisher_service import PublisherService VersionInfo = namedtuple("VersionInfo", "major minor micro") -version_info = VersionInfo(major="2023", minor="4", micro="0.post3") +version_info = VersionInfo(major="2024", minor="10", micro="0") diff --git a/src/cpl_cli/source_creator/__init__.py b/src/cpl_cli/source_creator/__init__.py index e9f5393b..d98351dc 100644 --- a/src/cpl_cli/source_creator/__init__.py +++ b/src/cpl_cli/source_creator/__init__.py @@ -6,7 +6,7 @@ cpl-cli CPL CLI CPL Command Line Interface -:copyright: (c) 2020 - 2023 sh-edraft.de +:copyright: (c) 2020 - 2024 sh-edraft.de :license: MIT, see LICENSE for more details. """ @@ -14,8 +14,8 @@ CPL Command Line Interface __title__ = "cpl_cli.source_creator" __author__ = "Sven Heidemann" __license__ = "MIT" -__copyright__ = "Copyright (c) 2020 - 2023 sh-edraft.de" -__version__ = "2023.4.0.post3" +__copyright__ = "Copyright (c) 2020 - 2024 sh-edraft.de" +__version__ = "2024.10.0" from collections import namedtuple @@ -23,4 +23,4 @@ from collections import namedtuple # imports: VersionInfo = namedtuple("VersionInfo", "major minor micro") -version_info = VersionInfo(major="2023", minor="4", micro="0.post3") +version_info = VersionInfo(major="2024", minor="10", micro="0") diff --git a/src/cpl_cli/startup_argument_extension.py b/src/cpl_cli/startup_argument_extension.py index 6ec54482..b86dc06d 100644 --- a/src/cpl_cli/startup_argument_extension.py +++ b/src/cpl_cli/startup_argument_extension.py @@ -28,10 +28,13 @@ class StartupArgumentExtension(StartupExtensionABC): config.create_console_argument( ArgumentTypeEnum.Executable, "", "add", ["a", "A"], AddService, True, validators=[WorkspaceValidator] ).add_console_argument(ArgumentTypeEnum.Flag, "--", "simulate", ["s", "S"]) + config.create_console_argument( ArgumentTypeEnum.Executable, "", "build", ["b", "B"], BuildService, True, validators=[ProjectValidator] ) + config.create_console_argument(ArgumentTypeEnum.Executable, "", "generate", ["g", "G"], GenerateService, True) + config.create_console_argument( ArgumentTypeEnum.Executable, "", "install", ["i", "I"], InstallService, True, validators=[ProjectValidator] ).add_console_argument(ArgumentTypeEnum.Flag, "--", "dev", ["d", "D"]).add_console_argument( @@ -45,6 +48,7 @@ class StartupArgumentExtension(StartupExtensionABC): ).add_console_argument( ArgumentTypeEnum.Flag, "--", "cpl-dev", ["cd", "CD"] ) + config.create_console_argument( ArgumentTypeEnum.Executable, "", "new", ["n", "N"], NewService, True ).add_console_argument(ArgumentTypeEnum.Flag, "--", "async", ["a", "A"]).add_console_argument( @@ -60,18 +64,23 @@ class StartupArgumentExtension(StartupExtensionABC): ).add_console_argument( ArgumentTypeEnum.Flag, "--", "base", ["b", "B"] ) + config.create_console_argument( ArgumentTypeEnum.Executable, "", "publish", ["p", "P"], PublishService, True, validators=[ProjectValidator] ) + config.create_console_argument( ArgumentTypeEnum.Executable, "", "remove", ["r", "R"], RemoveService, True, validators=[WorkspaceValidator] ).add_console_argument(ArgumentTypeEnum.Flag, "--", "simulate", ["s", "S"]) + config.create_console_argument( ArgumentTypeEnum.Executable, "", "run", [], RunService, True, validators=[ProjectValidator] ).add_console_argument(ArgumentTypeEnum.Flag, "--", "dev", ["d", "D"]) + config.create_console_argument( ArgumentTypeEnum.Executable, "", "start", ["s", "S"], StartService, True, validators=[ProjectValidator] ).add_console_argument(ArgumentTypeEnum.Flag, "--", "dev", ["d", "D"]) + config.create_console_argument( ArgumentTypeEnum.Executable, "", @@ -85,6 +94,7 @@ class StartupArgumentExtension(StartupExtensionABC): ).add_console_argument( ArgumentTypeEnum.Flag, "--", "simulate", ["s", "S"] ) + config.create_console_argument( ArgumentTypeEnum.Executable, "", "update", ["u", "U"], UpdateService, True, validators=[ProjectValidator] ).add_console_argument(ArgumentTypeEnum.Flag, "--", "simulate", ["s", "S"]).add_console_argument( @@ -94,6 +104,7 @@ class StartupArgumentExtension(StartupExtensionABC): ).add_console_argument( ArgumentTypeEnum.Flag, "--", "cpl-dev", ["cd", "CD"] ) + config.create_console_argument(ArgumentTypeEnum.Executable, "", "version", ["v", "V"], VersionService, True) config.for_each_argument(lambda a: a.add_console_argument(ArgumentTypeEnum.Flag, "--", "help", ["h", "H"])) diff --git a/src/cpl_cli/validators/__init__.py b/src/cpl_cli/validators/__init__.py index 93f62649..873d1881 100644 --- a/src/cpl_cli/validators/__init__.py +++ b/src/cpl_cli/validators/__init__.py @@ -6,7 +6,7 @@ cpl-cli CPL CLI CPL Command Line Interface -:copyright: (c) 2020 - 2023 sh-edraft.de +:copyright: (c) 2020 - 2024 sh-edraft.de :license: MIT, see LICENSE for more details. """ @@ -14,8 +14,8 @@ CPL Command Line Interface __title__ = "cpl_cli.validators" __author__ = "Sven Heidemann" __license__ = "MIT" -__copyright__ = "Copyright (c) 2020 - 2023 sh-edraft.de" -__version__ = "2023.4.0.post3" +__copyright__ = "Copyright (c) 2020 - 2024 sh-edraft.de" +__version__ = "2024.10.0" from collections import namedtuple @@ -23,4 +23,4 @@ from collections import namedtuple # imports: VersionInfo = namedtuple("VersionInfo", "major minor micro") -version_info = VersionInfo(major="2023", minor="4", micro="0.post3") +version_info = VersionInfo(major="2024", minor="10", micro="0") diff --git a/src/cpl_core/__init__.py b/src/cpl_core/__init__.py index 9d5f2cf8..062b60a5 100644 --- a/src/cpl_core/__init__.py +++ b/src/cpl_core/__init__.py @@ -15,7 +15,7 @@ __title__ = "cpl_core" __author__ = "Sven Heidemann" __license__ = "MIT" __copyright__ = "Copyright (c) 2020 - 2024 sh-edraft.de" -__version__ = "2023.10.2" +__version__ = "2024.6.0" from collections import namedtuple @@ -23,4 +23,4 @@ from collections import namedtuple # imports: VersionInfo = namedtuple("VersionInfo", "major minor micro") -version_info = VersionInfo(major="2023", minor="10", micro="2") +version_info = VersionInfo(major="2024", minor="6", micro="0") diff --git a/src/cpl_core/application/__init__.py b/src/cpl_core/application/__init__.py index f690a158..bddf35ab 100644 --- a/src/cpl_core/application/__init__.py +++ b/src/cpl_core/application/__init__.py @@ -15,7 +15,7 @@ __title__ = "cpl_core.application" __author__ = "Sven Heidemann" __license__ = "MIT" __copyright__ = "Copyright (c) 2020 - 2024 sh-edraft.de" -__version__ = "2023.10.2" +__version__ = "2024.6.0" from collections import namedtuple @@ -29,4 +29,4 @@ from .startup_abc import StartupABC from .startup_extension_abc import StartupExtensionABC VersionInfo = namedtuple("VersionInfo", "major minor micro") -version_info = VersionInfo(major="2023", minor="10", micro="2") +version_info = VersionInfo(major="2024", minor="6", micro="0") diff --git a/src/cpl_core/configuration/__init__.py b/src/cpl_core/configuration/__init__.py index fa6e3537..1d50fdea 100644 --- a/src/cpl_core/configuration/__init__.py +++ b/src/cpl_core/configuration/__init__.py @@ -15,7 +15,7 @@ __title__ = "cpl_core.configuration" __author__ = "Sven Heidemann" __license__ = "MIT" __copyright__ = "Copyright (c) 2020 - 2024 sh-edraft.de" -__version__ = "2023.10.2" +__version__ = "2024.6.0" from collections import namedtuple @@ -35,4 +35,4 @@ from .validator_abc import ValidatorABC from .variable_argument import VariableArgument VersionInfo = namedtuple("VersionInfo", "major minor micro") -version_info = VersionInfo(major="2023", minor="10", micro="2") +version_info = VersionInfo(major="2024", minor="6", micro="0") diff --git a/src/cpl_core/configuration/configuration.py b/src/cpl_core/configuration/configuration.py index 2e3baa0f..71965d23 100644 --- a/src/cpl_core/configuration/configuration.py +++ b/src/cpl_core/configuration/configuration.py @@ -345,7 +345,7 @@ class Configuration(ConfigurationABC): executables: list[ExecutableArgument] = [] self._parse_arguments(executables, arg_list, self._argument_types) except Exception as e: - Console.error("An error occurred while parsing arguments.") + Console.error("An error occurred while parsing arguments.", traceback.format_exc()) sys.exit() try: diff --git a/src/cpl_core/console/__init__.py b/src/cpl_core/console/__init__.py index 8cb0063e..aeb3c5ce 100644 --- a/src/cpl_core/console/__init__.py +++ b/src/cpl_core/console/__init__.py @@ -15,7 +15,7 @@ __title__ = "cpl_core.console" __author__ = "Sven Heidemann" __license__ = "MIT" __copyright__ = "Copyright (c) 2020 - 2024 sh-edraft.de" -__version__ = "2023.10.2" +__version__ = "2024.6.0" from collections import namedtuple @@ -28,4 +28,4 @@ from .foreground_color_enum import ForegroundColorEnum from .spinner_thread import SpinnerThread VersionInfo = namedtuple("VersionInfo", "major minor micro") -version_info = VersionInfo(major="2023", minor="10", micro="2") +version_info = VersionInfo(major="2024", minor="6", micro="0") diff --git a/src/cpl_core/cpl-core.json b/src/cpl_core/cpl-core.json index ccde4c04..a914ef14 100644 --- a/src/cpl_core/cpl-core.json +++ b/src/cpl_core/cpl-core.json @@ -2,9 +2,9 @@ "ProjectSettings": { "Name": "cpl-core", "Version": { - "Major": "2023", - "Minor": "10", - "Micro": "2" + "Major": "2024", + "Minor": "6", + "Micro": "0" }, "Author": "Sven Heidemann", "AuthorEmail": "sven.heidemann@sh-edraft.de", @@ -16,17 +16,17 @@ "LicenseName": "MIT", "LicenseDescription": "MIT, see LICENSE for more details.", "Dependencies": [ - "art>=5.9", + "art>=6.2", "colorama>=0.4.6", - "psutil>=5.9.4", - "packaging>=23.0", + "psutil>=6.0.0", + "packaging>=24.1", "pynput>=1.7.6", - "setuptools>=67.6.1", + "setuptools>=70.1.0", "tabulate>=0.9.0", - "termcolor>=2.2.0", - "watchdog>=3.0.0", - "wheel>=0.40.0", - "mysql-connector-python>=8.1.0" + "termcolor>=2.4.0", + "watchdog>=4.0.1", + "wheel>=0.43.0", + "mysql-connector-python>=8.4.0" ], "DevDependencies": [ "Sphinx==5.0.2", @@ -36,7 +36,7 @@ "sphinx-markdown-builder==0.5.5", "pygount==1.5.1" ], - "PythonVersion": ">=3.10", + "PythonVersion": ">=3.12", "PythonPath": {}, "Classifiers": [] }, diff --git a/src/cpl_core/database/__init__.py b/src/cpl_core/database/__init__.py index 443edffb..310d1bd1 100644 --- a/src/cpl_core/database/__init__.py +++ b/src/cpl_core/database/__init__.py @@ -15,7 +15,7 @@ __title__ = "cpl_core.database" __author__ = "Sven Heidemann" __license__ = "MIT" __copyright__ = "Copyright (c) 2020 - 2024 sh-edraft.de" -__version__ = "2023.10.2" +__version__ = "2024.6.0" from collections import namedtuple @@ -26,4 +26,4 @@ from .database_settings import DatabaseSettings from .table_abc import TableABC VersionInfo = namedtuple("VersionInfo", "major minor micro") -version_info = VersionInfo(major="2023", minor="10", micro="2") +version_info = VersionInfo(major="2024", minor="6", micro="0") diff --git a/src/cpl_core/database/connection/__init__.py b/src/cpl_core/database/connection/__init__.py index 919d3569..5c3c70d2 100644 --- a/src/cpl_core/database/connection/__init__.py +++ b/src/cpl_core/database/connection/__init__.py @@ -15,7 +15,7 @@ __title__ = "cpl_core.database.connection" __author__ = "Sven Heidemann" __license__ = "MIT" __copyright__ = "Copyright (c) 2020 - 2024 sh-edraft.de" -__version__ = "2023.10.2" +__version__ = "2024.6.0" from collections import namedtuple @@ -25,4 +25,4 @@ from .database_connection import DatabaseConnection from .database_connection_abc import DatabaseConnectionABC VersionInfo = namedtuple("VersionInfo", "major minor micro") -version_info = VersionInfo(major="2023", minor="10", micro="2") +version_info = VersionInfo(major="2024", minor="6", micro="0") diff --git a/src/cpl_core/database/context/__init__.py b/src/cpl_core/database/context/__init__.py index c810f41f..1b34178a 100644 --- a/src/cpl_core/database/context/__init__.py +++ b/src/cpl_core/database/context/__init__.py @@ -15,7 +15,7 @@ __title__ = "cpl_core.database.context" __author__ = "Sven Heidemann" __license__ = "MIT" __copyright__ = "Copyright (c) 2020 - 2024 sh-edraft.de" -__version__ = "2023.10.2" +__version__ = "2024.6.0" from collections import namedtuple @@ -25,4 +25,4 @@ from .database_context import DatabaseContext from .database_context_abc import DatabaseContextABC VersionInfo = namedtuple("VersionInfo", "major minor micro") -version_info = VersionInfo(major="2023", minor="10", micro="2") +version_info = VersionInfo(major="2024", minor="6", micro="0") diff --git a/src/cpl_core/dependency_injection/__init__.py b/src/cpl_core/dependency_injection/__init__.py index eab92e4e..4a793dc4 100644 --- a/src/cpl_core/dependency_injection/__init__.py +++ b/src/cpl_core/dependency_injection/__init__.py @@ -15,7 +15,7 @@ __title__ = "cpl_core.dependency_injection" __author__ = "Sven Heidemann" __license__ = "MIT" __copyright__ = "Copyright (c) 2020 - 2024 sh-edraft.de" -__version__ = "2023.10.2" +__version__ = "2024.6.0" from collections import namedtuple @@ -31,4 +31,4 @@ from .service_provider import ServiceProvider from .service_provider_abc import ServiceProviderABC VersionInfo = namedtuple("VersionInfo", "major minor micro") -version_info = VersionInfo(major="2023", minor="10", micro="2") +version_info = VersionInfo(major="2024", minor="6", micro="0") diff --git a/src/cpl_core/environment/__init__.py b/src/cpl_core/environment/__init__.py index e1ef090a..7c5f985f 100644 --- a/src/cpl_core/environment/__init__.py +++ b/src/cpl_core/environment/__init__.py @@ -15,7 +15,7 @@ __title__ = "cpl_core.environment" __author__ = "Sven Heidemann" __license__ = "MIT" __copyright__ = "Copyright (c) 2020 - 2024 sh-edraft.de" -__version__ = "2023.10.2" +__version__ = "2024.6.0" from collections import namedtuple @@ -26,4 +26,4 @@ from .environment_name_enum import EnvironmentNameEnum from .application_environment import ApplicationEnvironment VersionInfo = namedtuple("VersionInfo", "major minor micro") -version_info = VersionInfo(major="2023", minor="10", micro="2") +version_info = VersionInfo(major="2024", minor="6", micro="0") diff --git a/src/cpl_core/logging/__init__.py b/src/cpl_core/logging/__init__.py index f28f1707..a8c5f0db 100644 --- a/src/cpl_core/logging/__init__.py +++ b/src/cpl_core/logging/__init__.py @@ -15,7 +15,7 @@ __title__ = "cpl_core.logging" __author__ = "Sven Heidemann" __license__ = "MIT" __copyright__ = "Copyright (c) 2020 - 2024 sh-edraft.de" -__version__ = "2023.10.2" +__version__ = "2024.6.0" from collections import namedtuple @@ -28,4 +28,4 @@ from .logging_settings import LoggingSettings from .logging_settings_name_enum import LoggingSettingsNameEnum VersionInfo = namedtuple("VersionInfo", "major minor micro") -version_info = VersionInfo(major="2023", minor="10", micro="2") +version_info = VersionInfo(major="2024", minor="6", micro="0") diff --git a/src/cpl_core/mailing/__init__.py b/src/cpl_core/mailing/__init__.py index f60b502e..a8249b55 100644 --- a/src/cpl_core/mailing/__init__.py +++ b/src/cpl_core/mailing/__init__.py @@ -15,7 +15,7 @@ __title__ = "cpl_core.mailing" __author__ = "Sven Heidemann" __license__ = "MIT" __copyright__ = "Copyright (c) 2020 - 2024 sh-edraft.de" -__version__ = "2023.10.2" +__version__ = "2024.6.0" from collections import namedtuple @@ -28,4 +28,4 @@ from .email_client_settings import EMailClientSettings from .email_client_settings_name_enum import EMailClientSettingsNameEnum VersionInfo = namedtuple("VersionInfo", "major minor micro") -version_info = VersionInfo(major="2023", minor="10", micro="2") +version_info = VersionInfo(major="2024", minor="6", micro="0") diff --git a/src/cpl_core/pipes/__init__.py b/src/cpl_core/pipes/__init__.py index 3f3f90ef..304e0e34 100644 --- a/src/cpl_core/pipes/__init__.py +++ b/src/cpl_core/pipes/__init__.py @@ -15,7 +15,7 @@ __title__ = "cpl_core.pipes" __author__ = "Sven Heidemann" __license__ = "MIT" __copyright__ = "Copyright (c) 2020 - 2024 sh-edraft.de" -__version__ = "2023.10.2" +__version__ = "2024.6.0" from collections import namedtuple @@ -26,4 +26,4 @@ from .ip_address_pipe import IPAddressPipe from .pipe_abc import PipeABC VersionInfo = namedtuple("VersionInfo", "major minor micro") -version_info = VersionInfo(major="2023", minor="10", micro="2") +version_info = VersionInfo(major="2024", minor="6", micro="0") diff --git a/src/cpl_core/time/__init__.py b/src/cpl_core/time/__init__.py index 6dde12a8..3b2a72fe 100644 --- a/src/cpl_core/time/__init__.py +++ b/src/cpl_core/time/__init__.py @@ -15,7 +15,7 @@ __title__ = "cpl_core.time" __author__ = "Sven Heidemann" __license__ = "MIT" __copyright__ = "Copyright (c) 2020 - 2024 sh-edraft.de" -__version__ = "2023.10.2" +__version__ = "2024.6.0" from collections import namedtuple @@ -25,4 +25,4 @@ from .time_format_settings import TimeFormatSettings from .time_format_settings_names_enum import TimeFormatSettingsNamesEnum VersionInfo = namedtuple("VersionInfo", "major minor micro") -version_info = VersionInfo(major="2023", minor="10", micro="2") +version_info = VersionInfo(major="2024", minor="6", micro="0") diff --git a/src/cpl_core/utils/__init__.py b/src/cpl_core/utils/__init__.py index 118a8f7b..ce4d64db 100644 --- a/src/cpl_core/utils/__init__.py +++ b/src/cpl_core/utils/__init__.py @@ -15,7 +15,7 @@ __title__ = "cpl_core.utils" __author__ = "Sven Heidemann" __license__ = "MIT" __copyright__ = "Copyright (c) 2020 - 2024 sh-edraft.de" -__version__ = "2023.10.2" +__version__ = "2024.6.0" from collections import namedtuple @@ -26,4 +26,4 @@ from .string import String from .pip import Pip VersionInfo = namedtuple("VersionInfo", "major minor micro") -version_info = VersionInfo(major="2023", minor="10", micro="2") +version_info = VersionInfo(major="2024", minor="6", micro="0") diff --git a/tests/custom/general/src/general/application.py b/tests/custom/general/src/general/application.py index 2c8f23b8..c6024ce1 100644 --- a/tests/custom/general/src/general/application.py +++ b/tests/custom/general/src/general/application.py @@ -8,7 +8,7 @@ from cpl_core.dependency_injection import ServiceProviderABC from cpl_core.logging import LoggerABC from cpl_core.mailing import EMailClientABC, EMail from cpl_core.pipes import IPAddressPipe -from general.test_settings import TestSettings +from test_settings import TestSettings from test_service import TestService