2022.6.1 #57

Merged
edraft merged 3 commits from 2022.6.1 into 2022.6 2022-04-30 17:16:50 +02:00
62 changed files with 235 additions and 239 deletions

1
.gitignore vendored
View File

@ -106,6 +106,7 @@ celerybeat.pid
.venv .venv
env/ env/
venv/ venv/
venv_*/
ENV/ ENV/
env.bak/ env.bak/
venv.bak/ venv.bak/

View File

@ -1,4 +1,4 @@
MIT License Copyright (c) 2020 - 2021 sh-edraft.de MIT License Copyright (c) 2020 - 2022 sh-edraft.de
Permission is hereby granted, free of charge, to any person obtaining a copy Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal of this software and associated documentation files (the "Software"), to deal

View File

@ -1,6 +1,6 @@
#!/bin/bash #!/bin/bash
# activate venv # activate venv
source /home/sven/Nextcloud_Sven/Schreibtisch/git_sh-edraft_de/sh_cpl/cpl-env/bin/activate source /home/sven/Nextcloud_Sven/Schreibtisch/git_sh-edraft_de/sh_cpl/venv/bin/activate
# CPL # CPL
cd /home/sven/Nextcloud_Sven/Schreibtisch/git_sh-edraft_de/sh_cpl/src/cpl_core cd /home/sven/Nextcloud_Sven/Schreibtisch/git_sh-edraft_de/sh_cpl/src/cpl_core

View File

@ -1,16 +1,16 @@
#!/bin/bash #!/bin/bash
if [ $1 == "-prod" ]; then if [ $1 == "-prod" ]; then
twine upload -r pip.sh-edraft.de dist/sh_cpl-cli/publish/setup/* twine upload -r pip.sh-edraft.de dist/cpl-cli/publish/setup/*
twine upload -r pip.sh-edraft.de dist/sh_cpl-core/publish/setup/* twine upload -r pip.sh-edraft.de dist/cpl-core/publish/setup/*
twine upload -r pip.sh-edraft.de dist/sh_cpl-query/publish/setup/* twine upload -r pip.sh-edraft.de dist/cpl-query/publish/setup/*
elif [ $1 == "-prod" ]; then elif [ $1 == "-exp" ]; then
twine upload -r pip-exp.sh-edraft.de dist/sh_cpl-cli/publish/setup/* twine upload -r pip-exp.sh-edraft.de dist/cpl-cli/publish/setup/*
twine upload -r pip-exp.sh-edraft.de dist/sh_cpl-core/publish/setup/* twine upload -r pip-exp.sh-edraft.de dist/cpl-core/publish/setup/*
twine upload -r pip-.sh-edraft.de dist/sh_cpl-query/publish/setup/* twine upload -r pip-.sh-edraft.de dist/cpl-query/publish/setup/*
else else
twine upload -r pip-dev.sh-edraft.de dist/sh_cpl-cli/publish/setup/* twine upload -r pip-dev.sh-edraft.de dist/cpl-cli/publish/setup/*
twine upload -r pip-dev.sh-edraft.de dist/sh_cpl-core/publish/setup/* twine upload -r pip-dev.sh-edraft.de dist/cpl-core/publish/setup/*
twine upload -r pip-dev.sh-edraft.de dist/sh_cpl-query/publish/setup/* twine upload -r pip-dev.sh-edraft.de dist/cpl-query/publish/setup/*
fi fi

View File

@ -1,12 +1,12 @@
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
""" """
sh_cpl-cli sh-edraft Common Python library CLI cpl-cli sh-edraft Common Python library CLI
~~~~~~~~~~~~~~~~~~~ ~~~~~~~~~~~~~~~~~~~
sh-edraft Common Python library Command Line Interface sh-edraft Common Python library Command Line Interface
:copyright: (c) 2020 - 2021 sh-edraft.de :copyright: (c) 2020 - 2022 sh-edraft.de
:license: MIT, see LICENSE for more details. :license: MIT, see LICENSE for more details.
""" """
@ -14,8 +14,8 @@ sh-edraft Common Python library Command Line Interface
__title__ = 'cpl_cli' __title__ = 'cpl_cli'
__author__ = 'Sven Heidemann' __author__ = 'Sven Heidemann'
__license__ = 'MIT' __license__ = 'MIT'
__copyright__ = 'Copyright (c) 2020 - 2021 sh-edraft.de' __copyright__ = 'Copyright (c) 2020 - 2022 sh-edraft.de'
__version__ = '2021.11.0.post5' __version__ = '2022.6.1'
from collections import namedtuple from collections import namedtuple
@ -29,4 +29,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='2021', minor='11', micro='0.post5') version_info = VersionInfo(major='2022', minor='6', micro='1')

View File

@ -1,12 +1,12 @@
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
""" """
sh_cpl-cli sh-edraft Common Python library CLI cpl-cli sh-edraft Common Python library CLI
~~~~~~~~~~~~~~~~~~~ ~~~~~~~~~~~~~~~~~~~
sh-edraft Common Python library Command Line Interface sh-edraft Common Python library Command Line Interface
:copyright: (c) 2020 - 2021 sh-edraft.de :copyright: (c) 2020 - 2022 sh-edraft.de
:license: MIT, see LICENSE for more details. :license: MIT, see LICENSE for more details.
""" """
@ -14,12 +14,12 @@ sh-edraft Common Python library 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 - 2021 sh-edraft.de' __copyright__ = 'Copyright (c) 2020 - 2022 sh-edraft.de'
__version__ = '2021.11.0.post5' __version__ = '2022.6.1'
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='2021', minor='11', micro='0.post5') version_info = VersionInfo(major='2022', minor='6', micro='1')

View File

@ -1,12 +1,12 @@
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
""" """
sh_cpl-cli sh-edraft Common Python library CLI cpl-cli sh-edraft Common Python library CLI
~~~~~~~~~~~~~~~~~~~ ~~~~~~~~~~~~~~~~~~~
sh-edraft Common Python library Command Line Interface sh-edraft Common Python library Command Line Interface
:copyright: (c) 2020 - 2021 sh-edraft.de :copyright: (c) 2020 - 2022 sh-edraft.de
:license: MIT, see LICENSE for more details. :license: MIT, see LICENSE for more details.
""" """
@ -14,12 +14,12 @@ sh-edraft Common Python library 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 - 2021 sh-edraft.de' __copyright__ = 'Copyright (c) 2020 - 2022 sh-edraft.de'
__version__ = '2021.11.0.post5' __version__ = '2022.6.1'
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='2021', minor='11', micro='0.post5') version_info = VersionInfo(major='2022', minor='6', micro='1')

View File

@ -1,12 +1,12 @@
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
""" """
sh_cpl-cli sh-edraft Common Python library CLI cpl-cli sh-edraft Common Python library CLI
~~~~~~~~~~~~~~~~~~~ ~~~~~~~~~~~~~~~~~~~
sh-edraft Common Python library Command Line Interface sh-edraft Common Python library Command Line Interface
:copyright: (c) 2020 - 2021 sh-edraft.de :copyright: (c) 2020 - 2022 sh-edraft.de
:license: MIT, see LICENSE for more details. :license: MIT, see LICENSE for more details.
""" """
@ -14,12 +14,12 @@ sh-edraft Common Python library Command Line Interface
__title__ = 'cpl_cli._templates.generate' __title__ = 'cpl_cli._templates.generate'
__author__ = 'Sven Heidemann' __author__ = 'Sven Heidemann'
__license__ = 'MIT' __license__ = 'MIT'
__copyright__ = 'Copyright (c) 2020 - 2021 sh-edraft.de' __copyright__ = 'Copyright (c) 2020 - 2022 sh-edraft.de'
__version__ = '2021.11.0.post5' __version__ = '2022.6.1'
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='2021', minor='11', micro='0.post5') version_info = VersionInfo(major='2022', minor='6', micro='1')

View File

@ -1,12 +1,12 @@
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
""" """
sh_cpl-cli sh-edraft Common Python library CLI cpl-cli sh-edraft Common Python library CLI
~~~~~~~~~~~~~~~~~~~ ~~~~~~~~~~~~~~~~~~~
sh-edraft Common Python library Command Line Interface sh-edraft Common Python library Command Line Interface
:copyright: (c) 2020 - 2021 sh-edraft.de :copyright: (c) 2020 - 2022 sh-edraft.de
:license: MIT, see LICENSE for more details. :license: MIT, see LICENSE for more details.
""" """
@ -14,12 +14,12 @@ sh-edraft Common Python library Command Line Interface
__title__ = 'cpl_cli._templates.new' __title__ = 'cpl_cli._templates.new'
__author__ = 'Sven Heidemann' __author__ = 'Sven Heidemann'
__license__ = 'MIT' __license__ = 'MIT'
__copyright__ = 'Copyright (c) 2020 - 2021 sh-edraft.de' __copyright__ = 'Copyright (c) 2020 - 2022 sh-edraft.de'
__version__ = '2021.11.0.post5' __version__ = '2022.6.1'
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='2021', minor='11', micro='0.post5') version_info = VersionInfo(major='2022', minor='6', micro='1')

View File

@ -1,12 +1,12 @@
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
""" """
sh_cpl-cli sh-edraft Common Python library CLI cpl-cli sh-edraft Common Python library CLI
~~~~~~~~~~~~~~~~~~~ ~~~~~~~~~~~~~~~~~~~
sh-edraft Common Python library Command Line Interface sh-edraft Common Python library Command Line Interface
:copyright: (c) 2020 - 2021 sh-edraft.de :copyright: (c) 2020 - 2022 sh-edraft.de
:license: MIT, see LICENSE for more details. :license: MIT, see LICENSE for more details.
""" """
@ -14,12 +14,12 @@ sh-edraft Common Python library Command Line Interface
__title__ = 'cpl_cli._templates.new.console' __title__ = 'cpl_cli._templates.new.console'
__author__ = 'Sven Heidemann' __author__ = 'Sven Heidemann'
__license__ = 'MIT' __license__ = 'MIT'
__copyright__ = 'Copyright (c) 2020 - 2021 sh-edraft.de' __copyright__ = 'Copyright (c) 2020 - 2022 sh-edraft.de'
__version__ = '2021.11.0.post5' __version__ = '2022.6.1'
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='2021', minor='11', micro='0.post5') version_info = VersionInfo(major='2022', minor='6', micro='1')

View File

@ -1,12 +1,12 @@
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
""" """
sh_cpl-cli sh-edraft Common Python library CLI cpl-cli sh-edraft Common Python library CLI
~~~~~~~~~~~~~~~~~~~ ~~~~~~~~~~~~~~~~~~~
sh-edraft Common Python library Command Line Interface sh-edraft Common Python library Command Line Interface
:copyright: (c) 2020 - 2021 sh-edraft.de :copyright: (c) 2020 - 2022 sh-edraft.de
:license: MIT, see LICENSE for more details. :license: MIT, see LICENSE for more details.
""" """
@ -14,12 +14,12 @@ sh-edraft Common Python library Command Line Interface
__title__ = 'cpl_cli._templates.new.console.source' __title__ = 'cpl_cli._templates.new.console.source'
__author__ = 'Sven Heidemann' __author__ = 'Sven Heidemann'
__license__ = 'MIT' __license__ = 'MIT'
__copyright__ = 'Copyright (c) 2020 - 2021 sh-edraft.de' __copyright__ = 'Copyright (c) 2020 - 2022 sh-edraft.de'
__version__ = '2021.11.0.post5' __version__ = '2022.6.1'
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='2021', minor='11', micro='0.post5') version_info = VersionInfo(major='2022', minor='6', micro='1')

View File

@ -1,12 +1,12 @@
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
""" """
sh_cpl-cli sh-edraft Common Python library CLI cpl-cli sh-edraft Common Python library CLI
~~~~~~~~~~~~~~~~~~~ ~~~~~~~~~~~~~~~~~~~
sh-edraft Common Python library Command Line Interface sh-edraft Common Python library Command Line Interface
:copyright: (c) 2020 - 2021 sh-edraft.de :copyright: (c) 2020 - 2022 sh-edraft.de
:license: MIT, see LICENSE for more details. :license: MIT, see LICENSE for more details.
""" """
@ -14,12 +14,12 @@ sh-edraft Common Python library Command Line Interface
__title__ = 'cpl_cli._templates.new.console.source.name' __title__ = 'cpl_cli._templates.new.console.source.name'
__author__ = 'Sven Heidemann' __author__ = 'Sven Heidemann'
__license__ = 'MIT' __license__ = 'MIT'
__copyright__ = 'Copyright (c) 2020 - 2021 sh-edraft.de' __copyright__ = 'Copyright (c) 2020 - 2022 sh-edraft.de'
__version__ = '2021.11.0.post5' __version__ = '2022.6.1'
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='2021', minor='11', micro='0.post5') version_info = VersionInfo(major='2022', minor='6', micro='1')

View File

@ -1,12 +1,12 @@
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
""" """
sh_cpl-cli sh-edraft Common Python library CLI cpl-cli sh-edraft Common Python library CLI
~~~~~~~~~~~~~~~~~~~ ~~~~~~~~~~~~~~~~~~~
sh-edraft Common Python library Command Line Interface sh-edraft Common Python library Command Line Interface
:copyright: (c) 2020 - 2021 sh-edraft.de :copyright: (c) 2020 - 2022 sh-edraft.de
:license: MIT, see LICENSE for more details. :license: MIT, see LICENSE for more details.
""" """
@ -14,12 +14,12 @@ sh-edraft Common Python library Command Line Interface
__title__ = 'cpl_cli._templates.new.console.source.tests' __title__ = 'cpl_cli._templates.new.console.source.tests'
__author__ = 'Sven Heidemann' __author__ = 'Sven Heidemann'
__license__ = 'MIT' __license__ = 'MIT'
__copyright__ = 'Copyright (c) 2020 - 2021 sh-edraft.de' __copyright__ = 'Copyright (c) 2020 - 2022 sh-edraft.de'
__version__ = '2021.11.0.post5' __version__ = '2022.6.1'
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='2021', minor='11', micro='0.post5') version_info = VersionInfo(major='2022', minor='6', micro='1')

View File

@ -1,12 +1,12 @@
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
""" """
sh_cpl-cli sh-edraft Common Python library CLI cpl-cli sh-edraft Common Python library CLI
~~~~~~~~~~~~~~~~~~~ ~~~~~~~~~~~~~~~~~~~
sh-edraft Common Python library Command Line Interface sh-edraft Common Python library Command Line Interface
:copyright: (c) 2020 - 2021 sh-edraft.de :copyright: (c) 2020 - 2022 sh-edraft.de
:license: MIT, see LICENSE for more details. :license: MIT, see LICENSE for more details.
""" """
@ -14,12 +14,12 @@ sh-edraft Common Python library Command Line Interface
__title__ = 'cpl_cli._templates.new.library' __title__ = 'cpl_cli._templates.new.library'
__author__ = 'Sven Heidemann' __author__ = 'Sven Heidemann'
__license__ = 'MIT' __license__ = 'MIT'
__copyright__ = 'Copyright (c) 2020 - 2021 sh-edraft.de' __copyright__ = 'Copyright (c) 2020 - 2022 sh-edraft.de'
__version__ = '2021.11.0.post5' __version__ = '2022.6.1'
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='2021', minor='11', micro='0.post5') version_info = VersionInfo(major='2022', minor='6', micro='1')

View File

@ -1,12 +1,12 @@
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
""" """
sh_cpl-cli sh-edraft Common Python library CLI cpl-cli sh-edraft Common Python library CLI
~~~~~~~~~~~~~~~~~~~ ~~~~~~~~~~~~~~~~~~~
sh-edraft Common Python library Command Line Interface sh-edraft Common Python library Command Line Interface
:copyright: (c) 2020 - 2021 sh-edraft.de :copyright: (c) 2020 - 2022 sh-edraft.de
:license: MIT, see LICENSE for more details. :license: MIT, see LICENSE for more details.
""" """
@ -14,12 +14,12 @@ sh-edraft Common Python library Command Line Interface
__title__ = 'cpl_cli._templates.new.library.source' __title__ = 'cpl_cli._templates.new.library.source'
__author__ = 'Sven Heidemann' __author__ = 'Sven Heidemann'
__license__ = 'MIT' __license__ = 'MIT'
__copyright__ = 'Copyright (c) 2020 - 2021 sh-edraft.de' __copyright__ = 'Copyright (c) 2020 - 2022 sh-edraft.de'
__version__ = '2021.11.0.post5' __version__ = '2022.6.1'
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='2021', minor='11', micro='0.post5') version_info = VersionInfo(major='2022', minor='6', micro='1')

View File

@ -1,12 +1,12 @@
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
""" """
sh_cpl-cli sh-edraft Common Python library CLI cpl-cli sh-edraft Common Python library CLI
~~~~~~~~~~~~~~~~~~~ ~~~~~~~~~~~~~~~~~~~
sh-edraft Common Python library Command Line Interface sh-edraft Common Python library Command Line Interface
:copyright: (c) 2020 - 2021 sh-edraft.de :copyright: (c) 2020 - 2022 sh-edraft.de
:license: MIT, see LICENSE for more details. :license: MIT, see LICENSE for more details.
""" """
@ -14,12 +14,12 @@ sh-edraft Common Python library Command Line Interface
__title__ = 'cpl_cli._templates.new.library.source.name' __title__ = 'cpl_cli._templates.new.library.source.name'
__author__ = 'Sven Heidemann' __author__ = 'Sven Heidemann'
__license__ = 'MIT' __license__ = 'MIT'
__copyright__ = 'Copyright (c) 2020 - 2021 sh-edraft.de' __copyright__ = 'Copyright (c) 2020 - 2022 sh-edraft.de'
__version__ = '2021.11.0.post5' __version__ = '2022.6.1'
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='2021', minor='11', micro='0.post5') version_info = VersionInfo(major='2022', minor='6', micro='1')

View File

@ -1,12 +1,12 @@
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
""" """
sh_cpl-cli sh-edraft Common Python library CLI cpl-cli sh-edraft Common Python library CLI
~~~~~~~~~~~~~~~~~~~ ~~~~~~~~~~~~~~~~~~~
sh-edraft Common Python library Command Line Interface sh-edraft Common Python library Command Line Interface
:copyright: (c) 2020 - 2021 sh-edraft.de :copyright: (c) 2020 - 2022 sh-edraft.de
:license: MIT, see LICENSE for more details. :license: MIT, see LICENSE for more details.
""" """
@ -14,12 +14,12 @@ sh-edraft Common Python library Command Line Interface
__title__ = 'cpl_cli._templates.new.library.source.tests' __title__ = 'cpl_cli._templates.new.library.source.tests'
__author__ = 'Sven Heidemann' __author__ = 'Sven Heidemann'
__license__ = 'MIT' __license__ = 'MIT'
__copyright__ = 'Copyright (c) 2020 - 2021 sh-edraft.de' __copyright__ = 'Copyright (c) 2020 - 2022 sh-edraft.de'
__version__ = '2021.11.0.post5' __version__ = '2022.6.1'
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='2021', minor='11', micro='0.post5') version_info = VersionInfo(major='2022', minor='6', micro='1')

View File

@ -1,12 +1,12 @@
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
""" """
sh_cpl-cli sh-edraft Common Python library CLI cpl-cli sh-edraft Common Python library CLI
~~~~~~~~~~~~~~~~~~~ ~~~~~~~~~~~~~~~~~~~
sh-edraft Common Python library Command Line Interface sh-edraft Common Python library Command Line Interface
:copyright: (c) 2020 - 2021 sh-edraft.de :copyright: (c) 2020 - 2022 sh-edraft.de
:license: MIT, see LICENSE for more details. :license: MIT, see LICENSE for more details.
""" """
@ -14,12 +14,12 @@ sh-edraft Common Python library 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 - 2021 sh-edraft.de' __copyright__ = 'Copyright (c) 2020 - 2022 sh-edraft.de'
__version__ = '2021.11.0.post5' __version__ = '2022.6.1'
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='2021', minor='11', micro='0.post5') version_info = VersionInfo(major='2022', minor='6', micro='1')

View File

@ -1,12 +1,12 @@
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
""" """
sh_cpl-cli sh-edraft Common Python library CLI cpl-cli sh-edraft Common Python library CLI
~~~~~~~~~~~~~~~~~~~ ~~~~~~~~~~~~~~~~~~~
sh-edraft Common Python library Command Line Interface sh-edraft Common Python library Command Line Interface
:copyright: (c) 2020 - 2021 sh-edraft.de :copyright: (c) 2020 - 2022 sh-edraft.de
:license: MIT, see LICENSE for more details. :license: MIT, see LICENSE for more details.
""" """
@ -14,8 +14,8 @@ sh-edraft Common Python library 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 - 2021 sh-edraft.de' __copyright__ = 'Copyright (c) 2020 - 2022 sh-edraft.de'
__version__ = '2021.11.0.post5' __version__ = '2022.6.1'
from collections import namedtuple from collections import namedtuple
@ -28,4 +28,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='2021', minor='11', micro='0.post5') version_info = VersionInfo(major='2022', minor='6', micro='1')

View File

@ -1,7 +1,6 @@
import os import os
import sys import sys
import textwrap import textwrap
from collections import Callable
from cpl_core.configuration.configuration_abc import ConfigurationABC from cpl_core.configuration.configuration_abc import ConfigurationABC
from cpl_core.console.foreground_color_enum import ForegroundColorEnum from cpl_core.console.foreground_color_enum import ForegroundColorEnum
@ -108,7 +107,7 @@ class GenerateService(CommandABC):
template.write(value) template.write(value)
template.close() template.close()
def _generate(self, schematic: str, name: str, template: Callable[TemplateFileABC]): def _generate(self, schematic: str, name: str, template: TemplateFileABC):
""" """
Generates files by given schematic, name and template Generates files by given schematic, name and template
:param schematic: :param schematic:

View File

@ -1,11 +1,9 @@
from collections import Callable
from cpl_cli.command_abc import CommandABC from cpl_cli.command_abc import CommandABC
class CommandModel: class CommandModel:
def __init__(self, name: str, aliases: list[str], command: Callable[CommandABC], is_workspace_needed: bool, def __init__(self, name: str, aliases: list[str], command: CommandABC, is_workspace_needed: bool,
is_project_needed: bool, change_cwd: bool): is_project_needed: bool, change_cwd: bool):
self._name = name self._name = name
self._aliases = aliases self._aliases = aliases
@ -23,7 +21,7 @@ class CommandModel:
return self._aliases return self._aliases
@property @property
def command(self) -> Callable[CommandABC]: def command(self) -> CommandABC:
return self._command return self._command
@property @property

View File

@ -1,12 +1,12 @@
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
""" """
sh_cpl-cli sh-edraft Common Python library CLI cpl-cli sh-edraft Common Python library CLI
~~~~~~~~~~~~~~~~~~~ ~~~~~~~~~~~~~~~~~~~
sh-edraft Common Python library Command Line Interface sh-edraft Common Python library Command Line Interface
:copyright: (c) 2020 - 2021 sh-edraft.de :copyright: (c) 2020 - 2022 sh-edraft.de
:license: MIT, see LICENSE for more details. :license: MIT, see LICENSE for more details.
""" """
@ -14,8 +14,8 @@ sh-edraft Common Python library 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 - 2021 sh-edraft.de' __copyright__ = 'Copyright (c) 2020 - 2022 sh-edraft.de'
__version__ = '2021.11.0.post5' __version__ = '2022.6.1'
from collections import namedtuple from collections import namedtuple
@ -30,4 +30,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='2021', minor='11', micro='0.post5') version_info = VersionInfo(major='2022', minor='6', micro='1')

View File

@ -1,24 +1,24 @@
{ {
"ProjectSettings": { "ProjectSettings": {
"Name": "sh_cpl-cli", "Name": "cpl-cli",
"Version": { "Version": {
"Major": "2021", "Major": "2022",
"Minor": "11", "Minor": "6",
"Micro": "0.post5" "Micro": "1"
}, },
"Author": "Sven Heidemann", "Author": "Sven Heidemann",
"AuthorEmail": "sven.heidemann@sh-edraft.de", "AuthorEmail": "sven.heidemann@sh-edraft.de",
"Description": "sh-edraft Common Python library CLI", "Description": "sh-edraft Common Python library CLI",
"LongDescription": "sh-edraft Common Python library Command Line Interface", "LongDescription": "sh-edraft Common Python library Command Line Interface",
"URL": "https://www.sh-edraft.de", "URL": "https://www.sh-edraft.de",
"CopyrightDate": "2020 - 2021", "CopyrightDate": "2020 - 2022",
"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.",
"Dependencies": [ "Dependencies": [
"sh_cpl-core>=2021.11.0.post5" "cpl-core>=2022.6.1"
], ],
"PythonVersion": ">=3.8", "PythonVersion": ">=3.10",
"PythonPath": {}, "PythonPath": {},
"Classifiers": [] "Classifiers": []
}, },

View File

@ -1,12 +1,12 @@
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
""" """
sh_cpl-cli sh-edraft Common Python library CLI cpl-cli sh-edraft Common Python library CLI
~~~~~~~~~~~~~~~~~~~ ~~~~~~~~~~~~~~~~~~~
sh-edraft Common Python library Command Line Interface sh-edraft Common Python library Command Line Interface
:copyright: (c) 2020 - 2021 sh-edraft.de :copyright: (c) 2020 - 2022 sh-edraft.de
:license: MIT, see LICENSE for more details. :license: MIT, see LICENSE for more details.
""" """
@ -14,12 +14,12 @@ sh-edraft Common Python library 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 - 2021 sh-edraft.de' __copyright__ = 'Copyright (c) 2020 - 2022 sh-edraft.de'
__version__ = '2021.11.0.post5' __version__ = '2022.6.1'
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='2021', minor='11', micro='0.post5') version_info = VersionInfo(major='2022', minor='6', micro='1')

View File

@ -1,12 +1,12 @@
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
""" """
sh_cpl-cli sh-edraft Common Python library CLI cpl-cli sh-edraft Common Python library CLI
~~~~~~~~~~~~~~~~~~~ ~~~~~~~~~~~~~~~~~~~
sh-edraft Common Python library Command Line Interface sh-edraft Common Python library Command Line Interface
:copyright: (c) 2020 - 2021 sh-edraft.de :copyright: (c) 2020 - 2022 sh-edraft.de
:license: MIT, see LICENSE for more details. :license: MIT, see LICENSE for more details.
""" """
@ -14,8 +14,8 @@ sh-edraft Common Python library 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 - 2021 sh-edraft.de' __copyright__ = 'Copyright (c) 2020 - 2022 sh-edraft.de'
__version__ = '2021.11.0.post5' __version__ = '2022.6.1'
from collections import namedtuple from collections import namedtuple
@ -24,4 +24,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='2021', minor='11', micro='0.post5') version_info = VersionInfo(major='2022', minor='6', micro='1')

View File

@ -1,12 +1,12 @@
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
""" """
sh_cpl-cli sh-edraft Common Python library CLI cpl-cli sh-edraft Common Python library CLI
~~~~~~~~~~~~~~~~~~~ ~~~~~~~~~~~~~~~~~~~
sh-edraft Common Python library Command Line Interface sh-edraft Common Python library Command Line Interface
:copyright: (c) 2020 - 2021 sh-edraft.de :copyright: (c) 2020 - 2022 sh-edraft.de
:license: MIT, see LICENSE for more details. :license: MIT, see LICENSE for more details.
""" """
@ -14,12 +14,12 @@ sh-edraft Common Python library 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 - 2021 sh-edraft.de' __copyright__ = 'Copyright (c) 2020 - 2022 sh-edraft.de'
__version__ = '2021.11.0.post5' __version__ = '2022.6.1'
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='2021', minor='11', micro='0.post5') version_info = VersionInfo(major='2022', minor='6', micro='1')

View File

@ -1,12 +1,12 @@
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
""" """
sh_cpl-core sh-edraft Common Python library cpl-core sh-edraft Common Python library
~~~~~~~~~~~~~~~~~~~ ~~~~~~~~~~~~~~~~~~~
sh-edraft Common Python library sh-edraft Common Python library
:copyright: (c) 2020 - 2021 sh-edraft.de :copyright: (c) 2020 - 2022 sh-edraft.de
:license: MIT, see LICENSE for more details. :license: MIT, see LICENSE for more details.
""" """
@ -14,12 +14,12 @@ sh-edraft Common Python library
__title__ = 'cpl_core' __title__ = 'cpl_core'
__author__ = 'Sven Heidemann' __author__ = 'Sven Heidemann'
__license__ = 'MIT' __license__ = 'MIT'
__copyright__ = 'Copyright (c) 2020 - 2021 sh-edraft.de' __copyright__ = 'Copyright (c) 2020 - 2022 sh-edraft.de'
__version__ = '2021.11.0.post5' __version__ = '2022.6.1'
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='2021', minor='11', micro='0.post5') version_info = VersionInfo(major='2022', minor='6', micro='1')

View File

@ -1,12 +1,12 @@
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
""" """
sh_cpl-core sh-edraft Common Python library cpl-core sh-edraft Common Python library
~~~~~~~~~~~~~~~~~~~ ~~~~~~~~~~~~~~~~~~~
sh-edraft Common Python library sh-edraft Common Python library
:copyright: (c) 2020 - 2021 sh-edraft.de :copyright: (c) 2020 - 2022 sh-edraft.de
:license: MIT, see LICENSE for more details. :license: MIT, see LICENSE for more details.
""" """
@ -14,8 +14,8 @@ sh-edraft Common Python library
__title__ = 'cpl_core.application' __title__ = 'cpl_core.application'
__author__ = 'Sven Heidemann' __author__ = 'Sven Heidemann'
__license__ = 'MIT' __license__ = 'MIT'
__copyright__ = 'Copyright (c) 2020 - 2021 sh-edraft.de' __copyright__ = 'Copyright (c) 2020 - 2022 sh-edraft.de'
__version__ = '2021.11.0.post5' __version__ = '2022.6.1'
from collections import namedtuple from collections import namedtuple
@ -26,4 +26,4 @@ from .application_builder_abc import ApplicationBuilderABC
from .startup_abc import StartupABC from .startup_abc import StartupABC
VersionInfo = namedtuple('VersionInfo', 'major minor micro') VersionInfo = namedtuple('VersionInfo', 'major minor micro')
version_info = VersionInfo(major='2021', minor='11', micro='0.post5') version_info = VersionInfo(major='2022', minor='6', micro='1')

View File

@ -1,12 +1,12 @@
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
""" """
sh_cpl-core sh-edraft Common Python library cpl-core sh-edraft Common Python library
~~~~~~~~~~~~~~~~~~~ ~~~~~~~~~~~~~~~~~~~
sh-edraft Common Python library sh-edraft Common Python library
:copyright: (c) 2020 - 2021 sh-edraft.de :copyright: (c) 2020 - 2022 sh-edraft.de
:license: MIT, see LICENSE for more details. :license: MIT, see LICENSE for more details.
""" """
@ -14,8 +14,8 @@ sh-edraft Common Python library
__title__ = 'cpl_core.configuration' __title__ = 'cpl_core.configuration'
__author__ = 'Sven Heidemann' __author__ = 'Sven Heidemann'
__license__ = 'MIT' __license__ = 'MIT'
__copyright__ = 'Copyright (c) 2020 - 2021 sh-edraft.de' __copyright__ = 'Copyright (c) 2020 - 2022 sh-edraft.de'
__version__ = '2021.11.0.post5' __version__ = '2022.6.1'
from collections import namedtuple from collections import namedtuple
@ -27,4 +27,4 @@ from .configuration_variable_name_enum import ConfigurationVariableNameEnum
from .console_argument import ConsoleArgument from .console_argument import ConsoleArgument
VersionInfo = namedtuple('VersionInfo', 'major minor micro') VersionInfo = namedtuple('VersionInfo', 'major minor micro')
version_info = VersionInfo(major='2021', minor='11', micro='0.post5') version_info = VersionInfo(major='2022', minor='6', micro='1')

View File

@ -1,7 +1,7 @@
import json import json
import os import os
import sys import sys
from collections import Callable from collections.abc import Callable
from typing import Union, Type, Optional from typing import Union, Type, Optional
from cpl_core.configuration.configuration_abc import ConfigurationABC from cpl_core.configuration.configuration_abc import ConfigurationABC
@ -379,7 +379,7 @@ class Configuration(ConfigurationABC):
self._config[key_type] = value self._config[key_type] = value
def get_configuration(self, search_type: Union[str, Type[ConfigurationModelABC]]) -> \ def get_configuration(self, search_type: Union[str, Type[ConfigurationModelABC]]) -> \
Union[str, Callable[ConfigurationModelABC]]: Union[str, ConfigurationModelABC]:
if type(search_type) is str: if type(search_type) is str:
if search_type == ConfigurationVariableNameEnum.environment.value: if search_type == ConfigurationVariableNameEnum.environment.value:
return self._application_environment.environment_name return self._application_environment.environment_name

View File

@ -1,5 +1,5 @@
from abc import abstractmethod, ABC from abc import abstractmethod, ABC
from collections import Callable from collections.abc import Callable
from typing import Type, Union, Optional from typing import Type, Union, Optional
from cpl_core.configuration.console_argument import ConsoleArgument from cpl_core.configuration.console_argument import ConsoleArgument
@ -94,7 +94,7 @@ class ConfigurationABC(ABC):
pass pass
@abstractmethod @abstractmethod
def get_configuration(self, search_type: Union[str, Type[ConfigurationModelABC]]) -> Union[str, Callable[ConfigurationModelABC]]: def get_configuration(self, search_type: Union[str, Type[ConfigurationModelABC]]) -> Union[str, ConfigurationModelABC]:
r"""Returns value from configuration by given type r"""Returns value from configuration by given type
Parameter Parameter
@ -104,6 +104,6 @@ class ConfigurationABC(ABC):
Returns Returns
------- -------
Object of Union[:class:`str`, Callable[:class:`cpl_core.configuration.configuration_model_abc.ConfigurationModelABC`]] Object of Union[:class:`str`, :class:`cpl_core.configuration.configuration_model_abc.ConfigurationModelABC`]
""" """
pass pass

View File

@ -1,12 +1,12 @@
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
""" """
sh_cpl-core sh-edraft Common Python library cpl-core sh-edraft Common Python library
~~~~~~~~~~~~~~~~~~~ ~~~~~~~~~~~~~~~~~~~
sh-edraft Common Python library sh-edraft Common Python library
:copyright: (c) 2020 - 2021 sh-edraft.de :copyright: (c) 2020 - 2022 sh-edraft.de
:license: MIT, see LICENSE for more details. :license: MIT, see LICENSE for more details.
""" """
@ -14,8 +14,8 @@ sh-edraft Common Python library
__title__ = 'cpl_core.console' __title__ = 'cpl_core.console'
__author__ = 'Sven Heidemann' __author__ = 'Sven Heidemann'
__license__ = 'MIT' __license__ = 'MIT'
__copyright__ = 'Copyright (c) 2020 - 2021 sh-edraft.de' __copyright__ = 'Copyright (c) 2020 - 2022 sh-edraft.de'
__version__ = '2021.11.0.post5' __version__ = '2022.6.1'
from collections import namedtuple from collections import namedtuple
@ -27,4 +27,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='2021', minor='11', micro='0.post5') version_info = VersionInfo(major='2022', minor='6', micro='1')

View File

@ -1,7 +1,7 @@
import os import os
import sys import sys
import time import time
from collections import Callable from collections.abc import Callable
from typing import Union, Optional from typing import Union, Optional
from art import text2art from art import text2art

View File

@ -1,4 +1,4 @@
from collections import Callable from collections.abc import Callable
class ConsoleCall: class ConsoleCall:

View File

@ -1,34 +1,34 @@
{ {
"ProjectSettings": { "ProjectSettings": {
"Name": "sh_cpl-core", "Name": "cpl-core",
"Version": { "Version": {
"Major": "2021", "Major": "2022",
"Minor": "11", "Minor": "6",
"Micro": "0.post5" "Micro": "1"
}, },
"Author": "Sven Heidemann", "Author": "Sven Heidemann",
"AuthorEmail": "sven.heidemann@sh-edraft.de", "AuthorEmail": "sven.heidemann@sh-edraft.de",
"Description": "sh-edraft Common Python library", "Description": "sh-edraft Common Python library",
"LongDescription": "sh-edraft Common Python library", "LongDescription": "sh-edraft Common Python library",
"URL": "https://www.sh-edraft.de", "URL": "https://www.sh-edraft.de",
"CopyrightDate": "2020 - 2021", "CopyrightDate": "2020 - 2022",
"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.",
"Dependencies": [ "Dependencies": [
"art==5.4", "art==5.6",
"colorama==0.4.4", "colorama==0.4.4",
"mysql-connector==2.2.9", "mysql-connector==2.2.9",
"psutil==5.9.0", "psutil==5.9.0",
"packaging==21.3", "packaging==21.3",
"pynput==1.7.6", "pynput==1.7.6",
"setuptools==60.5.0", "setuptools==62.1.0",
"tabulate==0.8.9", "tabulate==0.8.9",
"termcolor==1.1.0", "termcolor==1.1.0",
"watchdog==2.1.6", "watchdog==2.1.7",
"wheel==0.37.1" "wheel==0.37.1"
], ],
"PythonVersion": ">=3.8", "PythonVersion": ">=3.10",
"PythonPath": {}, "PythonPath": {},
"Classifiers": [] "Classifiers": []
}, },

View File

@ -1,12 +1,12 @@
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
""" """
sh_cpl-core sh-edraft Common Python library cpl-core sh-edraft Common Python library
~~~~~~~~~~~~~~~~~~~ ~~~~~~~~~~~~~~~~~~~
sh-edraft Common Python library sh-edraft Common Python library
:copyright: (c) 2020 - 2021 sh-edraft.de :copyright: (c) 2020 - 2022 sh-edraft.de
:license: MIT, see LICENSE for more details. :license: MIT, see LICENSE for more details.
""" """
@ -14,8 +14,8 @@ sh-edraft Common Python library
__title__ = 'cpl_core.database' __title__ = 'cpl_core.database'
__author__ = 'Sven Heidemann' __author__ = 'Sven Heidemann'
__license__ = 'MIT' __license__ = 'MIT'
__copyright__ = 'Copyright (c) 2020 - 2021 sh-edraft.de' __copyright__ = 'Copyright (c) 2020 - 2022 sh-edraft.de'
__version__ = '2021.11.0.post5' __version__ = '2022.6.1'
from collections import namedtuple from collections import namedtuple
@ -25,4 +25,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='2021', minor='11', micro='0.post5') version_info = VersionInfo(major='2022', minor='6', micro='1')

View File

@ -1,12 +1,12 @@
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
""" """
sh_cpl-core sh-edraft Common Python library cpl-core sh-edraft Common Python library
~~~~~~~~~~~~~~~~~~~ ~~~~~~~~~~~~~~~~~~~
sh-edraft Common Python library sh-edraft Common Python library
:copyright: (c) 2020 - 2021 sh-edraft.de :copyright: (c) 2020 - 2022 sh-edraft.de
:license: MIT, see LICENSE for more details. :license: MIT, see LICENSE for more details.
""" """
@ -14,8 +14,8 @@ sh-edraft Common Python library
__title__ = 'cpl_core.database.connection' __title__ = 'cpl_core.database.connection'
__author__ = 'Sven Heidemann' __author__ = 'Sven Heidemann'
__license__ = 'MIT' __license__ = 'MIT'
__copyright__ = 'Copyright (c) 2020 - 2021 sh-edraft.de' __copyright__ = 'Copyright (c) 2020 - 2022 sh-edraft.de'
__version__ = '2021.11.0.post5' __version__ = '2022.6.1'
from collections import namedtuple from collections import namedtuple
@ -24,4 +24,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='2021', minor='11', micro='0.post5') version_info = VersionInfo(major='2022', minor='6', micro='1')

View File

@ -1,12 +1,12 @@
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
""" """
sh_cpl-core sh-edraft Common Python library cpl-core sh-edraft Common Python library
~~~~~~~~~~~~~~~~~~~ ~~~~~~~~~~~~~~~~~~~
sh-edraft Common Python library sh-edraft Common Python library
:copyright: (c) 2020 - 2021 sh-edraft.de :copyright: (c) 2020 - 2022 sh-edraft.de
:license: MIT, see LICENSE for more details. :license: MIT, see LICENSE for more details.
""" """
@ -14,8 +14,8 @@ sh-edraft Common Python library
__title__ = 'cpl_core.database.context' __title__ = 'cpl_core.database.context'
__author__ = 'Sven Heidemann' __author__ = 'Sven Heidemann'
__license__ = 'MIT' __license__ = 'MIT'
__copyright__ = 'Copyright (c) 2020 - 2021 sh-edraft.de' __copyright__ = 'Copyright (c) 2020 - 2022 sh-edraft.de'
__version__ = '2021.11.0.post5' __version__ = '2022.6.1'
from collections import namedtuple from collections import namedtuple
@ -24,4 +24,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='2021', minor='11', micro='0.post5') version_info = VersionInfo(major='2022', minor='6', micro='1')

View File

@ -1,12 +1,12 @@
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
""" """
sh_cpl-core sh-edraft Common Python library cpl-core sh-edraft Common Python library
~~~~~~~~~~~~~~~~~~~ ~~~~~~~~~~~~~~~~~~~
sh-edraft Common Python library sh-edraft Common Python library
:copyright: (c) 2020 - 2021 sh-edraft.de :copyright: (c) 2020 - 2022 sh-edraft.de
:license: MIT, see LICENSE for more details. :license: MIT, see LICENSE for more details.
""" """
@ -14,8 +14,8 @@ sh-edraft Common Python library
__title__ = 'cpl_core.dependency_injection' __title__ = 'cpl_core.dependency_injection'
__author__ = 'Sven Heidemann' __author__ = 'Sven Heidemann'
__license__ = 'MIT' __license__ = 'MIT'
__copyright__ = 'Copyright (c) 2020 - 2021 sh-edraft.de' __copyright__ = 'Copyright (c) 2020 - 2022 sh-edraft.de'
__version__ = '2021.11.0.post5' __version__ = '2022.6.1'
from collections import namedtuple from collections import namedtuple
@ -28,4 +28,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='2021', minor='11', micro='0.post5') version_info = VersionInfo(major='2022', minor='6', micro='1')

View File

@ -1,5 +1,5 @@
from abc import abstractmethod, ABC from abc import abstractmethod, ABC
from collections import Callable from collections.abc import Callable
from typing import Type from typing import Type
from cpl_core.database.database_settings import DatabaseSettings from cpl_core.database.database_settings import DatabaseSettings

View File

@ -1,4 +1,3 @@
from collections import Callable
import copy import copy
from inspect import signature, Parameter from inspect import signature, Parameter
from typing import Optional from typing import Optional
@ -96,7 +95,7 @@ class ServiceProvider(ServiceProviderABC):
sb = ScopeBuilder(ServiceProvider(copy.deepcopy(self._service_descriptors), self._configuration, self._database_context)) sb = ScopeBuilder(ServiceProvider(copy.deepcopy(self._service_descriptors), self._configuration, self._database_context))
return sb.build() return sb.build()
def get_service(self, service_type: type) -> Optional[Callable[object]]: def get_service(self, service_type: type) -> Optional[object]:
result = self._find_service(service_type) result = self._find_service(service_type)
if result is None: if result is None:

View File

@ -1,5 +1,4 @@
from abc import abstractmethod, ABC from abc import abstractmethod, ABC
from collections import Callable
from typing import Type, Optional from typing import Type, Optional
from cpl_core.dependency_injection.scope_abc import ScopeABC from cpl_core.dependency_injection.scope_abc import ScopeABC
@ -49,7 +48,7 @@ class ServiceProviderABC(ABC):
pass pass
@abstractmethod @abstractmethod
def get_service(self, instance_type: Type) -> Optional[Callable[object]]: def get_service(self, instance_type: Type) -> Optional[object]:
r"""Returns instance of given type r"""Returns instance of given type
Parameter Parameter

View File

@ -1,12 +1,12 @@
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
""" """
sh_cpl-core sh-edraft Common Python library cpl-core sh-edraft Common Python library
~~~~~~~~~~~~~~~~~~~ ~~~~~~~~~~~~~~~~~~~
sh-edraft Common Python library sh-edraft Common Python library
:copyright: (c) 2020 - 2021 sh-edraft.de :copyright: (c) 2020 - 2022 sh-edraft.de
:license: MIT, see LICENSE for more details. :license: MIT, see LICENSE for more details.
""" """
@ -14,8 +14,8 @@ sh-edraft Common Python library
__title__ = 'cpl_core.environment' __title__ = 'cpl_core.environment'
__author__ = 'Sven Heidemann' __author__ = 'Sven Heidemann'
__license__ = 'MIT' __license__ = 'MIT'
__copyright__ = 'Copyright (c) 2020 - 2021 sh-edraft.de' __copyright__ = 'Copyright (c) 2020 - 2022 sh-edraft.de'
__version__ = '2021.11.0.post5' __version__ = '2022.6.1'
from collections import namedtuple from collections import namedtuple
@ -25,4 +25,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='2021', minor='11', micro='0.post5') version_info = VersionInfo(major='2022', minor='6', micro='1')

View File

@ -1,12 +1,12 @@
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
""" """
sh_cpl-core sh-edraft Common Python library cpl-core sh-edraft Common Python library
~~~~~~~~~~~~~~~~~~~ ~~~~~~~~~~~~~~~~~~~
sh-edraft Common Python library sh-edraft Common Python library
:copyright: (c) 2020 - 2021 sh-edraft.de :copyright: (c) 2020 - 2022 sh-edraft.de
:license: MIT, see LICENSE for more details. :license: MIT, see LICENSE for more details.
""" """
@ -14,8 +14,8 @@ sh-edraft Common Python library
__title__ = 'cpl_core.logging' __title__ = 'cpl_core.logging'
__author__ = 'Sven Heidemann' __author__ = 'Sven Heidemann'
__license__ = 'MIT' __license__ = 'MIT'
__copyright__ = 'Copyright (c) 2020 - 2021 sh-edraft.de' __copyright__ = 'Copyright (c) 2020 - 2022 sh-edraft.de'
__version__ = '2021.11.0.post5' __version__ = '2022.6.1'
from collections import namedtuple from collections import namedtuple
@ -27,4 +27,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='2021', minor='11', micro='0.post5') version_info = VersionInfo(major='2022', minor='6', micro='1')

View File

@ -1,12 +1,12 @@
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
""" """
sh_cpl-core sh-edraft Common Python library cpl-core sh-edraft Common Python library
~~~~~~~~~~~~~~~~~~~ ~~~~~~~~~~~~~~~~~~~
sh-edraft Common Python library sh-edraft Common Python library
:copyright: (c) 2020 - 2021 sh-edraft.de :copyright: (c) 2020 - 2022 sh-edraft.de
:license: MIT, see LICENSE for more details. :license: MIT, see LICENSE for more details.
""" """
@ -14,8 +14,8 @@ sh-edraft Common Python library
__title__ = 'cpl_core.mailing' __title__ = 'cpl_core.mailing'
__author__ = 'Sven Heidemann' __author__ = 'Sven Heidemann'
__license__ = 'MIT' __license__ = 'MIT'
__copyright__ = 'Copyright (c) 2020 - 2021 sh-edraft.de' __copyright__ = 'Copyright (c) 2020 - 2022 sh-edraft.de'
__version__ = '2021.11.0.post5' __version__ = '2022.6.1'
from collections import namedtuple from collections import namedtuple
@ -27,4 +27,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='2021', minor='11', micro='0.post5') version_info = VersionInfo(major='2022', minor='6', micro='1')

View File

@ -1,12 +1,12 @@
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
""" """
sh_cpl-core sh-edraft Common Python library cpl-core sh-edraft Common Python library
~~~~~~~~~~~~~~~~~~~ ~~~~~~~~~~~~~~~~~~~
sh-edraft Common Python library sh-edraft Common Python library
:copyright: (c) 2020 - 2021 sh-edraft.de :copyright: (c) 2020 - 2022 sh-edraft.de
:license: MIT, see LICENSE for more details. :license: MIT, see LICENSE for more details.
""" """
@ -14,8 +14,8 @@ sh-edraft Common Python library
__title__ = 'cpl_core.time' __title__ = 'cpl_core.time'
__author__ = 'Sven Heidemann' __author__ = 'Sven Heidemann'
__license__ = 'MIT' __license__ = 'MIT'
__copyright__ = 'Copyright (c) 2020 - 2021 sh-edraft.de' __copyright__ = 'Copyright (c) 2020 - 2022 sh-edraft.de'
__version__ = '2021.11.0.post5' __version__ = '2022.6.1'
from collections import namedtuple from collections import namedtuple
@ -24,4 +24,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='2021', minor='11', micro='0.post5') version_info = VersionInfo(major='2022', minor='6', micro='1')

View File

@ -1,12 +1,12 @@
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
""" """
sh_cpl-core sh-edraft Common Python library cpl-core sh-edraft Common Python library
~~~~~~~~~~~~~~~~~~~ ~~~~~~~~~~~~~~~~~~~
sh-edraft Common Python library sh-edraft Common Python library
:copyright: (c) 2020 - 2021 sh-edraft.de :copyright: (c) 2020 - 2022 sh-edraft.de
:license: MIT, see LICENSE for more details. :license: MIT, see LICENSE for more details.
""" """
@ -14,8 +14,8 @@ sh-edraft Common Python library
__title__ = 'cpl_core.utils' __title__ = 'cpl_core.utils'
__author__ = 'Sven Heidemann' __author__ = 'Sven Heidemann'
__license__ = 'MIT' __license__ = 'MIT'
__copyright__ = 'Copyright (c) 2020 - 2021 sh-edraft.de' __copyright__ = 'Copyright (c) 2020 - 2022 sh-edraft.de'
__version__ = '2021.11.0.post5' __version__ = '2022.6.1'
from collections import namedtuple from collections import namedtuple
@ -25,4 +25,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='2021', minor='11', micro='0.post5') version_info = VersionInfo(major='2022', minor='6', micro='1')

View File

@ -1,12 +1,12 @@
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
""" """
sh_cpl-query sh-edraft Common Python library Query cpl-query sh-edraft Common Python library Query
~~~~~~~~~~~~~~~~~~~ ~~~~~~~~~~~~~~~~~~~
sh-edraft Common Python library Python integrated Queries sh-edraft Common Python library Python integrated Queries
:copyright: (c) 2020 - 2021 sh-edraft.de :copyright: (c) 2020 - 2022 sh-edraft.de
:license: MIT, see LICENSE for more details. :license: MIT, see LICENSE for more details.
""" """
@ -14,12 +14,12 @@ sh-edraft Common Python library Python integrated Queries
__title__ = 'cpl_query' __title__ = 'cpl_query'
__author__ = 'Sven Heidemann' __author__ = 'Sven Heidemann'
__license__ = 'MIT' __license__ = 'MIT'
__copyright__ = 'Copyright (c) 2020 - 2021 sh-edraft.de' __copyright__ = 'Copyright (c) 2020 - 2022 sh-edraft.de'
__version__ = '2021.11.0.post3' __version__ = '2022.6.1'
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='2021', minor='11', micro='0.post3') version_info = VersionInfo(major='2022', minor='6', micro='1')

View File

@ -1,12 +1,12 @@
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
""" """
sh_cpl-query sh-edraft Common Python library Query cpl-query sh-edraft Common Python library Query
~~~~~~~~~~~~~~~~~~~ ~~~~~~~~~~~~~~~~~~~
sh-edraft Common Python library Python integrated Queries sh-edraft Common Python library Python integrated Queries
:copyright: (c) 2020 - 2021 sh-edraft.de :copyright: (c) 2020 - 2022 sh-edraft.de
:license: MIT, see LICENSE for more details. :license: MIT, see LICENSE for more details.
""" """
@ -14,12 +14,12 @@ sh-edraft Common Python library Python integrated Queries
__title__ = 'cpl_query._query' __title__ = 'cpl_query._query'
__author__ = 'Sven Heidemann' __author__ = 'Sven Heidemann'
__license__ = 'MIT' __license__ = 'MIT'
__copyright__ = 'Copyright (c) 2020 - 2021 sh-edraft.de' __copyright__ = 'Copyright (c) 2020 - 2022 sh-edraft.de'
__version__ = '2021.11.0.post3' __version__ = '2022.6.1'
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='2021', minor='11', micro='0.post3') version_info = VersionInfo(major='2022', minor='6', micro='1')

View File

@ -1,4 +1,4 @@
from collections import Callable from collections.abc import Callable
from cpl_query._query.where import where_query from cpl_query._query.where import where_query
from cpl_query.exceptions import ExceptionArgument, ArgumentNoneException from cpl_query.exceptions import ExceptionArgument, ArgumentNoneException

View File

@ -1,4 +1,4 @@
from collections import Callable from collections.abc import Callable
from cpl_query._query.where import where_query from cpl_query._query.where import where_query
from cpl_query.exceptions import ArgumentNoneException, ExceptionArgument from cpl_query.exceptions import ArgumentNoneException, ExceptionArgument

View File

@ -1,4 +1,4 @@
from collections import Callable from collections.abc import Callable
from cpl_query._query.where import where_query from cpl_query._query.where import where_query
from cpl_query.exceptions import ArgumentNoneException, ExceptionArgument from cpl_query.exceptions import ArgumentNoneException, ExceptionArgument

View File

@ -1,4 +1,4 @@
from collections import Callable from collections.abc import Callable
from cpl_query.exceptions import ArgumentNoneException, ExceptionArgument from cpl_query.exceptions import ArgumentNoneException, ExceptionArgument
from cpl_query.extension.iterable_abc import IterableABC from cpl_query.extension.iterable_abc import IterableABC

View File

@ -1,4 +1,4 @@
from collections import Callable from collections.abc import Callable
from cpl_query.exceptions import ExceptionArgument, ArgumentNoneException from cpl_query.exceptions import ExceptionArgument, ArgumentNoneException
from cpl_query.extension.iterable_abc import IterableABC from cpl_query.extension.iterable_abc import IterableABC

View File

@ -1,4 +1,4 @@
from collections import Callable from collections.abc import Callable
from typing import Union from typing import Union
from cpl_query._helper import is_number from cpl_query._helper import is_number

View File

@ -1,4 +1,4 @@
from collections import Callable from collections.abc import Callable
from cpl_query.exceptions import ExceptionArgument, ArgumentNoneException from cpl_query.exceptions import ExceptionArgument, ArgumentNoneException
from cpl_query.extension.iterable_abc import IterableABC from cpl_query.extension.iterable_abc import IterableABC

View File

@ -1,4 +1,4 @@
from collections import Callable from collections.abc import Callable
from typing import Union from typing import Union
from cpl_query._helper import is_number from cpl_query._helper import is_number

View File

@ -1,4 +1,4 @@
from collections import Callable from collections.abc import Callable
from cpl_query.exceptions import ArgumentNoneException, ExceptionArgument from cpl_query.exceptions import ArgumentNoneException, ExceptionArgument
from cpl_query.extension.iterable_abc import IterableABC from cpl_query.extension.iterable_abc import IterableABC

View File

@ -1,24 +1,24 @@
{ {
"ProjectSettings": { "ProjectSettings": {
"Name": "sh_cpl-query", "Name": "cpl-query",
"Version": { "Version": {
"Major": "2021", "Major": "2022",
"Minor": "11", "Minor": "6",
"Micro": "0.post3" "Micro": "1"
}, },
"Author": "Sven Heidemann", "Author": "Sven Heidemann",
"AuthorEmail": "sven.heidemann@sh-edraft.de", "AuthorEmail": "sven.heidemann@sh-edraft.de",
"Description": "sh-edraft Common Python library Query", "Description": "sh-edraft Common Python library Query",
"LongDescription": "sh-edraft Common Python library Python integrated Queries", "LongDescription": "sh-edraft Common Python library Python integrated Queries",
"URL": "https://www.sh-edraft.de", "URL": "https://www.sh-edraft.de",
"CopyrightDate": "2020 - 2021", "CopyrightDate": "2020 - 2022",
"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.",
"Dependencies": [ "Dependencies": [
"sh_cpl-core>=2021.11.0.post1" "cpl-core>=2022.6.1"
], ],
"PythonVersion": ">=3.8", "PythonVersion": ">=3.10",
"PythonPath": {}, "PythonPath": {},
"Classifiers": [] "Classifiers": []
}, },

View File

@ -1,12 +1,12 @@
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
""" """
sh_cpl-query sh-edraft Common Python library Query cpl-query sh-edraft Common Python library Query
~~~~~~~~~~~~~~~~~~~ ~~~~~~~~~~~~~~~~~~~
sh-edraft Common Python library Python integrated Queries sh-edraft Common Python library Python integrated Queries
:copyright: (c) 2020 - 2021 sh-edraft.de :copyright: (c) 2020 - 2022 sh-edraft.de
:license: MIT, see LICENSE for more details. :license: MIT, see LICENSE for more details.
""" """
@ -14,8 +14,8 @@ sh-edraft Common Python library Python integrated Queries
__title__ = 'cpl_query.extension' __title__ = 'cpl_query.extension'
__author__ = 'Sven Heidemann' __author__ = 'Sven Heidemann'
__license__ = 'MIT' __license__ = 'MIT'
__copyright__ = 'Copyright (c) 2020 - 2021 sh-edraft.de' __copyright__ = 'Copyright (c) 2020 - 2022 sh-edraft.de'
__version__ = '2021.11.0.post3' __version__ = '2022.6.1'
from collections import namedtuple from collections import namedtuple
@ -27,4 +27,4 @@ from .ordered_iterable_abc import OrderedIterableABC
from .ordered_iterable import OrderedIterable from .ordered_iterable import OrderedIterable
VersionInfo = namedtuple('VersionInfo', 'major minor micro') VersionInfo = namedtuple('VersionInfo', 'major minor micro')
version_info = VersionInfo(major='2021', minor='11', micro='0.post3') version_info = VersionInfo(major='2022', minor='6', micro='1')

View File

@ -1,4 +1,4 @@
from collections import Callable from collections.abc import Callable
from cpl_query._query.order_by import then_by_descending_query, then_by_query from cpl_query._query.order_by import then_by_descending_query, then_by_query
from cpl_query.extension.iterable import Iterable from cpl_query.extension.iterable import Iterable

View File

@ -1,5 +1,5 @@
from abc import abstractmethod from abc import abstractmethod
from collections import Callable from collections.abc import Callable
from cpl_query.extension.iterable_abc import IterableABC from cpl_query.extension.iterable_abc import IterableABC