sh-edraft.de/sh_cpl
1
1
Fork 0
Code Issues 4 Pull Requests 1 Actions Packages Projects 1 Releases 12 Wiki Activity

Merge pull request 'py12' (#177) from py12 into master

Browse Source 
Reviewed-on: #177
This commit is contained in:
Sven Heidemann 2024-07-25 17:55:07 +02:00
commit 688381b106
37 changed files with 137 additions and 128 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/cpl_cli/.cpl/__init__.py
View File

@ -6,7 +6,7 @@ cpl-cli CPL CLI
CPL Command Line Interface 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. :license: MIT, see LICENSE for more details.
""" """
@ -14,8 +14,8 @@ CPL Command Line Interface
__title__ = "cpl_cli" __title__ = "cpl_cli"
__author__ = "Sven Heidemann" __author__ = "Sven Heidemann"
__license__ = "MIT" __license__ = "MIT"
__copyright__ = "Copyright (c) 2020 - 2023 sh-edraft.de" __copyright__ = "Copyright (c) 2020 - 2024 sh-edraft.de"
__version__ = "2023.4.0.post3" __version__ = "2024.10.0"
from collections import namedtuple from collections import namedtuple
@ -23,4 +23,4 @@ from collections import namedtuple
# imports: # imports:
VersionInfo = namedtuple("VersionInfo", "major minor micro") 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")

8
src/cpl_cli/__init__.py
View File

@ -6,7 +6,7 @@ cpl-cli CPL CLI
CPL Command Line Interface 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. :license: MIT, see LICENSE for more details.
""" """
@ -14,8 +14,8 @@ CPL Command Line Interface
__title__ = "cpl_cli" __title__ = "cpl_cli"
__author__ = "Sven Heidemann" __author__ = "Sven Heidemann"
__license__ = "MIT" __license__ = "MIT"
__copyright__ = "Copyright (c) 2020 - 2023 sh-edraft.de" __copyright__ = "Copyright (c) 2020 - 2024 sh-edraft.de"
__version__ = "2023.4.0.post3" __version__ = "2024.10.0"
from collections import namedtuple from collections import namedtuple
@ -28,4 +28,4 @@ from .main import main
from .startup import Startup from .startup import Startup
VersionInfo = namedtuple("VersionInfo", "major minor micro") 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")

8
src/cpl_cli/_templates/__init__.py
View File

@ -6,7 +6,7 @@ cpl-cli CPL CLI
CPL Command Line Interface 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. :license: MIT, see LICENSE for more details.
""" """
@ -14,8 +14,8 @@ CPL Command Line Interface
__title__ = "cpl_cli._templates" __title__ = "cpl_cli._templates"
__author__ = "Sven Heidemann" __author__ = "Sven Heidemann"
__license__ = "MIT" __license__ = "MIT"
__copyright__ = "Copyright (c) 2020 - 2023 sh-edraft.de" __copyright__ = "Copyright (c) 2020 - 2024 sh-edraft.de"
__version__ = "2023.4.0.post3" __version__ = "2024.10.0"
from collections import namedtuple from collections import namedtuple
@ -23,4 +23,4 @@ from collections import namedtuple
# imports: # imports:
VersionInfo = namedtuple("VersionInfo", "major minor micro") 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")

16
src/cpl_cli/_templates/build/__init__.py
View File

@ -6,21 +6,21 @@ cpl-cli CPL CLI
CPL Command Line Interface 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. :license: MIT, see LICENSE for more details.
""" """
__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 - 2024 sh-edraft.de"
__version__ = '2023.4.0.post3' __version__ = "2024.10.0"
from collections import namedtuple from collections import namedtuple
# imports: # imports:
VersionInfo = namedtuple('VersionInfo', 'major minor micro') 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")

14
src/cpl_cli/_templates/build/init_template.py
View File

@ -19,19 +19,19 @@ class InitTemplate:
\"\"\" \"\"\"
__title__ = '$Title' __title__ = "$Title"
__author__ = '$Author' __author__ = "$Author"
__license__ = '$LicenseName' __license__ = "$LicenseName"
__copyright__ = 'Copyright (c) $CopyrightDate $CopyrightName' __copyright__ = "Copyright (c) $CopyrightDate $CopyrightName"
__version__ = '$Version' __version__ = "$Version"
from collections import namedtuple from collections import namedtuple
$Imports $Imports
VersionInfo = namedtuple('VersionInfo', 'major minor micro') VersionInfo = namedtuple("VersionInfo", "major minor micro")
version_info = VersionInfo(major='$Major', minor='$Minor', micro='$Micro') version_info = VersionInfo(major="$Major", minor="$Minor", micro="$Micro")
""" """
) )

8
src/cpl_cli/_templates/publish/__init__.py
View File

@ -6,7 +6,7 @@ cpl-cli CPL CLI
CPL Command Line Interface 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. :license: MIT, see LICENSE for more details.
""" """
@ -14,8 +14,8 @@ CPL Command Line Interface
__title__ = "cpl_cli._templates.publish" __title__ = "cpl_cli._templates.publish"
__author__ = "Sven Heidemann" __author__ = "Sven Heidemann"
__license__ = "MIT" __license__ = "MIT"
__copyright__ = "Copyright (c) 2020 - 2023 sh-edraft.de" __copyright__ = "Copyright (c) 2020 - 2024 sh-edraft.de"
__version__ = "2023.4.0.post3" __version__ = "2024.10.0"
from collections import namedtuple from collections import namedtuple
@ -23,4 +23,4 @@ from collections import namedtuple
# imports: # imports:
VersionInfo = namedtuple("VersionInfo", "major minor micro") 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")

8
src/cpl_cli/abc/__init__.py
View File

@ -6,7 +6,7 @@ cpl-cli CPL CLI
CPL Command Line Interface 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. :license: MIT, see LICENSE for more details.
""" """
@ -14,8 +14,8 @@ CPL Command Line Interface
__title__ = "cpl_cli.abc" __title__ = "cpl_cli.abc"
__author__ = "Sven Heidemann" __author__ = "Sven Heidemann"
__license__ = "MIT" __license__ = "MIT"
__copyright__ = "Copyright (c) 2020 - 2023 sh-edraft.de" __copyright__ = "Copyright (c) 2020 - 2024 sh-edraft.de"
__version__ = "2023.4.0.post3" __version__ = "2024.10.0"
from collections import namedtuple from collections import namedtuple
@ -23,4 +23,4 @@ from collections import namedtuple
# imports # imports
VersionInfo = namedtuple("VersionInfo", "major minor micro") 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")

8
src/cpl_cli/command/__init__.py
View File

@ -6,7 +6,7 @@ cpl-cli CPL CLI
CPL Command Line Interface 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. :license: MIT, see LICENSE for more details.
""" """
@ -14,8 +14,8 @@ CPL Command Line Interface
__title__ = "cpl_cli.command" __title__ = "cpl_cli.command"
__author__ = "Sven Heidemann" __author__ = "Sven Heidemann"
__license__ = "MIT" __license__ = "MIT"
__copyright__ = "Copyright (c) 2020 - 2023 sh-edraft.de" __copyright__ = "Copyright (c) 2020 - 2024 sh-edraft.de"
__version__ = "2023.4.0.post3" __version__ = "2024.10.0"
from collections import namedtuple from collections import namedtuple
@ -29,4 +29,4 @@ from .publish_service import PublishService
from .version_service import VersionService from .version_service import VersionService
VersionInfo = namedtuple("VersionInfo", "major minor micro") 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")

8
src/cpl_cli/configuration/__init__.py
View File

@ -6,7 +6,7 @@ cpl-cli CPL CLI
CPL Command Line Interface 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. :license: MIT, see LICENSE for more details.
""" """
@ -14,8 +14,8 @@ CPL Command Line Interface
__title__ = "cpl_cli.configuration" __title__ = "cpl_cli.configuration"
__author__ = "Sven Heidemann" __author__ = "Sven Heidemann"
__license__ = "MIT" __license__ = "MIT"
__copyright__ = "Copyright (c) 2020 - 2023 sh-edraft.de" __copyright__ = "Copyright (c) 2020 - 2024 sh-edraft.de"
__version__ = "2023.4.0.post3" __version__ = "2024.10.0"
from collections import namedtuple from collections import namedtuple
@ -31,4 +31,4 @@ from .workspace_settings import WorkspaceSettings
from .workspace_settings_name_enum import WorkspaceSettingsNameEnum from .workspace_settings_name_enum import WorkspaceSettingsNameEnum
VersionInfo = namedtuple("VersionInfo", "major minor micro") 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")

10
src/cpl_cli/cpl-cli.json
View File

@ -2,16 +2,16 @@
"ProjectSettings": { "ProjectSettings": {
"Name": "cpl-cli", "Name": "cpl-cli",
"Version": { "Version": {
"Major": "2023", "Major": "2024",
"Minor": "4", "Minor": "10",
"Micro": "0.post3" "Micro": "0"
}, },
"Author": "Sven Heidemann", "Author": "Sven Heidemann",
"AuthorEmail": "sven.heidemann@sh-edraft.de", "AuthorEmail": "sven.heidemann@sh-edraft.de",
"Description": "CPL CLI", "Description": "CPL CLI",
"LongDescription": "CPL Command Line Interface", "LongDescription": "CPL Command Line Interface",
"URL": "https://www.sh-edraft.de", "URL": "https://www.sh-edraft.de",
"CopyrightDate": "2020 - 2023", "CopyrightDate": "2020 - 2024",
"CopyrightName": "sh-edraft.de", "CopyrightName": "sh-edraft.de",
"LicenseName": "MIT", "LicenseName": "MIT",
"LicenseDescription": "MIT, see LICENSE for more details.", "LicenseDescription": "MIT, see LICENSE for more details.",
@ -19,7 +19,7 @@
"cpl-core>=2023.4.0" "cpl-core>=2023.4.0"
], ],
"DevDependencies": [], "DevDependencies": [],
"PythonVersion": ">=3.10", "PythonVersion": ">=3.12",
"PythonPath": { "PythonPath": {
"linux": "../../venv" "linux": "../../venv"
}, },

8
src/cpl_cli/helper/__init__.py
View File

@ -6,7 +6,7 @@ cpl-cli CPL CLI
CPL Command Line Interface 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. :license: MIT, see LICENSE for more details.
""" """
@ -14,8 +14,8 @@ CPL Command Line Interface
__title__ = "cpl_cli.helper" __title__ = "cpl_cli.helper"
__author__ = "Sven Heidemann" __author__ = "Sven Heidemann"
__license__ = "MIT" __license__ = "MIT"
__copyright__ = "Copyright (c) 2020 - 2023 sh-edraft.de" __copyright__ = "Copyright (c) 2020 - 2024 sh-edraft.de"
__version__ = "2023.4.0.post3" __version__ = "2024.10.0"
from collections import namedtuple from collections import namedtuple
@ -23,4 +23,4 @@ from collections import namedtuple
# imports: # imports:
VersionInfo = namedtuple("VersionInfo", "major minor micro") 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")

8
src/cpl_cli/live_server/__init__.py
View File

@ -6,7 +6,7 @@ cpl-cli CPL CLI
CPL Command Line Interface 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. :license: MIT, see LICENSE for more details.
""" """
@ -14,8 +14,8 @@ CPL Command Line Interface
__title__ = "cpl_cli.live_server" __title__ = "cpl_cli.live_server"
__author__ = "Sven Heidemann" __author__ = "Sven Heidemann"
__license__ = "MIT" __license__ = "MIT"
__copyright__ = "Copyright (c) 2020 - 2023 sh-edraft.de" __copyright__ = "Copyright (c) 2020 - 2024 sh-edraft.de"
__version__ = "2023.4.0.post3" __version__ = "2024.10.0"
from collections import namedtuple from collections import namedtuple
@ -23,4 +23,4 @@ from collections import namedtuple
# imports: # imports:
VersionInfo = namedtuple("VersionInfo", "major minor micro") 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")

10
src/cpl_cli/main.py
View File

@ -1,7 +1,6 @@
import importlib.metadata
from typing import Type from typing import Type
import pkg_resources
from cpl_cli.cli import CLI from cpl_cli.cli import CLI
from cpl_cli.startup import Startup from cpl_cli.startup import Startup
from cpl_cli.startup_argument_extension import StartupArgumentExtension from cpl_cli.startup_argument_extension import StartupArgumentExtension
@ -16,13 +15,12 @@ def get_startup_extensions() -> list[Type[StartupExtensionABC]]:
blacklisted_packages = ["cpl-cli"] blacklisted_packages = ["cpl-cli"]
startup_extensions = [] startup_extensions = []
installed_packages = pkg_resources.working_set installed_packages = importlib.metadata.distributions()
for p in installed_packages: for p in installed_packages:
package = str(p).split(" ")[0] if not p.name.startswith("cpl-") or p.name in blacklisted_packages:
if not package.startswith("cpl-") or package in blacklisted_packages:
continue continue
package = package.replace("-", "_") package = p.name.replace("-", "_")
loaded_package = __import__(package) loaded_package = __import__(package)
if "__cli_startup_extension__" not in dir(loaded_package): if "__cli_startup_extension__" not in dir(loaded_package):
continue continue

8
src/cpl_cli/migrations/__init__.py
View File

@ -6,7 +6,7 @@ cpl-cli CPL CLI
CPL Command Line Interface 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. :license: MIT, see LICENSE for more details.
""" """
@ -14,8 +14,8 @@ CPL Command Line Interface
__title__ = "cpl_cli.migrations" __title__ = "cpl_cli.migrations"
__author__ = "Sven Heidemann" __author__ = "Sven Heidemann"
__license__ = "MIT" __license__ = "MIT"
__copyright__ = "Copyright (c) 2020 - 2023 sh-edraft.de" __copyright__ = "Copyright (c) 2020 - 2024 sh-edraft.de"
__version__ = "2023.4.0.post3" __version__ = "2024.10.0"
from collections import namedtuple from collections import namedtuple
@ -23,4 +23,4 @@ from collections import namedtuple
# imports # imports
VersionInfo = namedtuple("VersionInfo", "major minor micro") 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")

8
src/cpl_cli/migrations/base/__init__.py
View File

@ -6,7 +6,7 @@ cpl-cli CPL CLI
CPL Command Line Interface 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. :license: MIT, see LICENSE for more details.
""" """
@ -14,8 +14,8 @@ CPL Command Line Interface
__title__ = "cpl_cli.migrations.base" __title__ = "cpl_cli.migrations.base"
__author__ = "Sven Heidemann" __author__ = "Sven Heidemann"
__license__ = "MIT" __license__ = "MIT"
__copyright__ = "Copyright (c) 2020 - 2023 sh-edraft.de" __copyright__ = "Copyright (c) 2020 - 2024 sh-edraft.de"
__version__ = "2023.4.0.post3" __version__ = "2024.10.0"
from collections import namedtuple from collections import namedtuple
@ -23,4 +23,4 @@ from collections import namedtuple
# imports: # imports:
VersionInfo = namedtuple("VersionInfo", "major minor micro") 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")

8
src/cpl_cli/migrations/service/__init__.py
View File

@ -6,7 +6,7 @@ cpl-cli CPL CLI
CPL Command Line Interface 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. :license: MIT, see LICENSE for more details.
""" """
@ -14,8 +14,8 @@ CPL Command Line Interface
__title__ = "cpl_cli.migrations.service" __title__ = "cpl_cli.migrations.service"
__author__ = "Sven Heidemann" __author__ = "Sven Heidemann"
__license__ = "MIT" __license__ = "MIT"
__copyright__ = "Copyright (c) 2020 - 2023 sh-edraft.de" __copyright__ = "Copyright (c) 2020 - 2024 sh-edraft.de"
__version__ = "2023.4.0.post3" __version__ = "2024.10.0"
from collections import namedtuple from collections import namedtuple
@ -23,4 +23,4 @@ from collections import namedtuple
# imports: # imports:
VersionInfo = namedtuple("VersionInfo", "major minor micro") 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")

8
src/cpl_cli/publish/__init__.py
View File

@ -6,7 +6,7 @@ cpl-cli CPL CLI
CPL Command Line Interface 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. :license: MIT, see LICENSE for more details.
""" """
@ -14,8 +14,8 @@ CPL Command Line Interface
__title__ = "cpl_cli.publish" __title__ = "cpl_cli.publish"
__author__ = "Sven Heidemann" __author__ = "Sven Heidemann"
__license__ = "MIT" __license__ = "MIT"
__copyright__ = "Copyright (c) 2020 - 2023 sh-edraft.de" __copyright__ = "Copyright (c) 2020 - 2024 sh-edraft.de"
__version__ = "2023.4.0.post3" __version__ = "2024.10.0"
from collections import namedtuple from collections import namedtuple
@ -25,4 +25,4 @@ from .publisher_abc import PublisherABC
from .publisher_service import PublisherService from .publisher_service import PublisherService
VersionInfo = namedtuple("VersionInfo", "major minor micro") 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")

8
src/cpl_cli/source_creator/__init__.py
View File

@ -6,7 +6,7 @@ cpl-cli CPL CLI
CPL Command Line Interface 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. :license: MIT, see LICENSE for more details.
""" """
@ -14,8 +14,8 @@ CPL Command Line Interface
__title__ = "cpl_cli.source_creator" __title__ = "cpl_cli.source_creator"
__author__ = "Sven Heidemann" __author__ = "Sven Heidemann"
__license__ = "MIT" __license__ = "MIT"
__copyright__ = "Copyright (c) 2020 - 2023 sh-edraft.de" __copyright__ = "Copyright (c) 2020 - 2024 sh-edraft.de"
__version__ = "2023.4.0.post3" __version__ = "2024.10.0"
from collections import namedtuple from collections import namedtuple
@ -23,4 +23,4 @@ from collections import namedtuple
# imports: # imports:
VersionInfo = namedtuple("VersionInfo", "major minor micro") 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")

11
src/cpl_cli/startup_argument_extension.py
View File

@ -28,10 +28,13 @@ class StartupArgumentExtension(StartupExtensionABC):
config.create_console_argument( config.create_console_argument(
ArgumentTypeEnum.Executable, "", "add", ["a", "A"], AddService, True, validators=[WorkspaceValidator] ArgumentTypeEnum.Executable, "", "add", ["a", "A"], AddService, True, validators=[WorkspaceValidator]
).add_console_argument(ArgumentTypeEnum.Flag, "--", "simulate", ["s", "S"]) ).add_console_argument(ArgumentTypeEnum.Flag, "--", "simulate", ["s", "S"])
config.create_console_argument( config.create_console_argument(
ArgumentTypeEnum.Executable, "", "build", ["b", "B"], BuildService, True, validators=[ProjectValidator] 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, "", "generate", ["g", "G"], GenerateService, True)
config.create_console_argument( config.create_console_argument(
ArgumentTypeEnum.Executable, "", "install", ["i", "I"], InstallService, True, validators=[ProjectValidator] ArgumentTypeEnum.Executable, "", "install", ["i", "I"], InstallService, True, validators=[ProjectValidator]
).add_console_argument(ArgumentTypeEnum.Flag, "--", "dev", ["d", "D"]).add_console_argument( ).add_console_argument(ArgumentTypeEnum.Flag, "--", "dev", ["d", "D"]).add_console_argument(
@ -45,6 +48,7 @@ class StartupArgumentExtension(StartupExtensionABC):
).add_console_argument( ).add_console_argument(
ArgumentTypeEnum.Flag, "--", "cpl-dev", ["cd", "CD"] ArgumentTypeEnum.Flag, "--", "cpl-dev", ["cd", "CD"]
) )
config.create_console_argument( config.create_console_argument(
ArgumentTypeEnum.Executable, "", "new", ["n", "N"], NewService, True ArgumentTypeEnum.Executable, "", "new", ["n", "N"], NewService, True
).add_console_argument(ArgumentTypeEnum.Flag, "--", "async", ["a", "A"]).add_console_argument( ).add_console_argument(ArgumentTypeEnum.Flag, "--", "async", ["a", "A"]).add_console_argument(
@ -60,18 +64,23 @@ class StartupArgumentExtension(StartupExtensionABC):
).add_console_argument( ).add_console_argument(
ArgumentTypeEnum.Flag, "--", "base", ["b", "B"] ArgumentTypeEnum.Flag, "--", "base", ["b", "B"]
) )
config.create_console_argument( config.create_console_argument(
ArgumentTypeEnum.Executable, "", "publish", ["p", "P"], PublishService, True, validators=[ProjectValidator] ArgumentTypeEnum.Executable, "", "publish", ["p", "P"], PublishService, True, validators=[ProjectValidator]
) )
config.create_console_argument( config.create_console_argument(
ArgumentTypeEnum.Executable, "", "remove", ["r", "R"], RemoveService, True, validators=[WorkspaceValidator] ArgumentTypeEnum.Executable, "", "remove", ["r", "R"], RemoveService, True, validators=[WorkspaceValidator]
).add_console_argument(ArgumentTypeEnum.Flag, "--", "simulate", ["s", "S"]) ).add_console_argument(ArgumentTypeEnum.Flag, "--", "simulate", ["s", "S"])
config.create_console_argument( config.create_console_argument(
ArgumentTypeEnum.Executable, "", "run", [], RunService, True, validators=[ProjectValidator] ArgumentTypeEnum.Executable, "", "run", [], RunService, True, validators=[ProjectValidator]
).add_console_argument(ArgumentTypeEnum.Flag, "--", "dev", ["d", "D"]) ).add_console_argument(ArgumentTypeEnum.Flag, "--", "dev", ["d", "D"])
config.create_console_argument( config.create_console_argument(
ArgumentTypeEnum.Executable, "", "start", ["s", "S"], StartService, True, validators=[ProjectValidator] ArgumentTypeEnum.Executable, "", "start", ["s", "S"], StartService, True, validators=[ProjectValidator]
).add_console_argument(ArgumentTypeEnum.Flag, "--", "dev", ["d", "D"]) ).add_console_argument(ArgumentTypeEnum.Flag, "--", "dev", ["d", "D"])
config.create_console_argument( config.create_console_argument(
ArgumentTypeEnum.Executable, ArgumentTypeEnum.Executable,
"", "",
@ -85,6 +94,7 @@ class StartupArgumentExtension(StartupExtensionABC):
).add_console_argument( ).add_console_argument(
ArgumentTypeEnum.Flag, "--", "simulate", ["s", "S"] ArgumentTypeEnum.Flag, "--", "simulate", ["s", "S"]
) )
config.create_console_argument( config.create_console_argument(
ArgumentTypeEnum.Executable, "", "update", ["u", "U"], UpdateService, True, validators=[ProjectValidator] ArgumentTypeEnum.Executable, "", "update", ["u", "U"], UpdateService, True, validators=[ProjectValidator]
).add_console_argument(ArgumentTypeEnum.Flag, "--", "simulate", ["s", "S"]).add_console_argument( ).add_console_argument(ArgumentTypeEnum.Flag, "--", "simulate", ["s", "S"]).add_console_argument(
@ -94,6 +104,7 @@ class StartupArgumentExtension(StartupExtensionABC):
).add_console_argument( ).add_console_argument(
ArgumentTypeEnum.Flag, "--", "cpl-dev", ["cd", "CD"] ArgumentTypeEnum.Flag, "--", "cpl-dev", ["cd", "CD"]
) )
config.create_console_argument(ArgumentTypeEnum.Executable, "", "version", ["v", "V"], VersionService, True) 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"])) config.for_each_argument(lambda a: a.add_console_argument(ArgumentTypeEnum.Flag, "--", "help", ["h", "H"]))

8
src/cpl_cli/validators/__init__.py
View File

@ -6,7 +6,7 @@ cpl-cli CPL CLI
CPL Command Line Interface 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. :license: MIT, see LICENSE for more details.
""" """
@ -14,8 +14,8 @@ CPL Command Line Interface
__title__ = "cpl_cli.validators" __title__ = "cpl_cli.validators"
__author__ = "Sven Heidemann" __author__ = "Sven Heidemann"
__license__ = "MIT" __license__ = "MIT"
__copyright__ = "Copyright (c) 2020 - 2023 sh-edraft.de" __copyright__ = "Copyright (c) 2020 - 2024 sh-edraft.de"
__version__ = "2023.4.0.post3" __version__ = "2024.10.0"
from collections import namedtuple from collections import namedtuple
@ -23,4 +23,4 @@ from collections import namedtuple
# imports: # imports:
VersionInfo = namedtuple("VersionInfo", "major minor micro") 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")

4
src/cpl_core/__init__.py
View File

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

4
src/cpl_core/application/__init__.py
View File

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

4
src/cpl_core/configuration/__init__.py
View File

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

2
src/cpl_core/configuration/configuration.py
View File

@ -345,7 +345,7 @@ class Configuration(ConfigurationABC):
executables: list[ExecutableArgument] = [] executables: list[ExecutableArgument] = []
self._parse_arguments(executables, arg_list, self._argument_types) self._parse_arguments(executables, arg_list, self._argument_types)
except Exception as e: 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() sys.exit()
try: try:

4
src/cpl_core/console/__init__.py
View File

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

24
src/cpl_core/cpl-core.json
View File

@ -2,9 +2,9 @@
"ProjectSettings": { "ProjectSettings": {
"Name": "cpl-core", "Name": "cpl-core",
"Version": { "Version": {
"Major": "2023", "Major": "2024",
"Minor": "10", "Minor": "6",
"Micro": "2" "Micro": "0"
}, },
"Author": "Sven Heidemann", "Author": "Sven Heidemann",
"AuthorEmail": "sven.heidemann@sh-edraft.de", "AuthorEmail": "sven.heidemann@sh-edraft.de",
@ -16,17 +16,17 @@
"LicenseName": "MIT", "LicenseName": "MIT",
"LicenseDescription": "MIT, see LICENSE for more details.", "LicenseDescription": "MIT, see LICENSE for more details.",
"Dependencies": [ "Dependencies": [
"art>=5.9", "art>=6.2",
"colorama>=0.4.6", "colorama>=0.4.6",
"psutil>=5.9.4", "psutil>=6.0.0",
"packaging>=23.0", "packaging>=24.1",
"pynput>=1.7.6", "pynput>=1.7.6",
"setuptools>=67.6.1", "setuptools>=70.1.0",
"tabulate>=0.9.0", "tabulate>=0.9.0",
"termcolor>=2.2.0", "termcolor>=2.4.0",
"watchdog>=3.0.0", "watchdog>=4.0.1",
"wheel>=0.40.0", "wheel>=0.43.0",
"mysql-connector-python>=8.1.0" "mysql-connector-python>=8.4.0"
], ],
"DevDependencies": [ "DevDependencies": [
"Sphinx==5.0.2", "Sphinx==5.0.2",
@ -36,7 +36,7 @@
"sphinx-markdown-builder==0.5.5", "sphinx-markdown-builder==0.5.5",
"pygount==1.5.1" "pygount==1.5.1"
], ],
"PythonVersion": ">=3.10", "PythonVersion": ">=3.12",
"PythonPath": {}, "PythonPath": {},
"Classifiers": [] "Classifiers": []
}, },

4
src/cpl_core/database/__init__.py
View File

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

4
src/cpl_core/database/connection/__init__.py
View File

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

4
src/cpl_core/database/context/__init__.py
View File

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

4
src/cpl_core/dependency_injection/__init__.py
View File

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

4
src/cpl_core/environment/__init__.py
View File

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

4
src/cpl_core/logging/__init__.py
View File

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

4
src/cpl_core/mailing/__init__.py
View File

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

4
src/cpl_core/pipes/__init__.py
View File

@ -15,7 +15,7 @@ __title__ = "cpl_core.pipes"
__author__ = "Sven Heidemann" __author__ = "Sven Heidemann"
__license__ = "MIT" __license__ = "MIT"
__copyright__ = "Copyright (c) 2020 - 2024 sh-edraft.de" __copyright__ = "Copyright (c) 2020 - 2024 sh-edraft.de"
__version__ = "2023.10.2" __version__ = "2024.6.0"
from collections import namedtuple from collections import namedtuple
@ -26,4 +26,4 @@ from .ip_address_pipe import IPAddressPipe
from .pipe_abc import PipeABC from .pipe_abc import PipeABC
VersionInfo = namedtuple("VersionInfo", "major minor micro") VersionInfo = namedtuple("VersionInfo", "major minor micro")
version_info = VersionInfo(major="2023", minor="10", micro="2") version_info = VersionInfo(major="2024", minor="6", micro="0")

4
src/cpl_core/time/__init__.py
View File

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

4
src/cpl_core/utils/__init__.py
View File

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

2
tests/custom/general/src/general/application.py
View File

@ -8,7 +8,7 @@ from cpl_core.dependency_injection import ServiceProviderABC
from cpl_core.logging import LoggerABC from cpl_core.logging import LoggerABC
from cpl_core.mailing import EMailClientABC, EMail from cpl_core.mailing import EMailClientABC, EMail
from cpl_core.pipes import IPAddressPipe from cpl_core.pipes import IPAddressPipe
from general.test_settings import TestSettings from test_settings import TestSettings
from test_service import TestService from test_service import TestService