Merge pull request '2022.6.16 - Build-Tools' (#83) from 2022.6.16 into 2022.6

Reviewed-on: #83
Closes #82

cpl-workspace.json

@@ -5,7 +5,8 @@
       "cpl-core": "src/cpl_core/cpl-core.json",
       "cpl-cli": "src/cpl_cli/cpl-cli.json",
       "cpl-query": "src/cpl_query/cpl-query.json",
-      "set-version": "tools/set_version/set-version.json"
+      "set-version": "tools/set_version/set-version.json",
+      "set-pip-urls": "tools/set_pip_urls/set-pip-urls.json"
     },
     "Scripts": {
       "hello-world": "echo 'Hello World'",
@@ -13,20 +14,24 @@
       "sv": "cpl set-version",
       "set-version": "cpl run set-version $ARGS; echo '';",
 
+      "spu": "cpl set-pip-urls",
+      "set-pip-urls": "cpl run set-pip-urls $ARGS; echo '';",
+
       "docs-build": "echo 'Build Documentation'; cd docs/; sphinx-apidoc -o source/ ../src/cpl_core; sphinx-apidoc -o source/ ../src/cpl_query; make clean; make html; rm source/cpl_query.tests.rst;",
       "db": "cpl build-docs",
       "docs-open": "xdg-open $PWD/docs/build/html/index.html &",
       "do": "cpl docs-open",
 
-      "pre-build-all": "cpl sv $ARGS",
+      "pre-build-all": "cpl sv $ARGS; cpl spu $ARGS;",
-      "build-all": "cpl build-cli; cpl build-core; cpl build-query; cpl build-set-version",
+      "build-all": "cpl build-cli; cpl build-core; cpl build-query; cpl build-set-pip-urls; cpl build-set-version",
       "ba": "cpl build-all $ARGS",
       "build-cli": "echo 'Build cpl-cli'; cd ./src/cpl_cli; cpl build; cd ../../;",
       "build-core": "echo 'Build cpl-core'; cd ./src/cpl_core; cpl build; cd ../../;",
       "build-query": "echo 'Build cpl-query'; cd ./src/cpl_query; cpl build; cd ../../;",
+      "build-set-pip-urls": "echo 'Build set-pip-urls'; cd ./tools/set_pip_urls; cpl build; cd ../../;",
       "build-set-version": "echo 'Build set-version'; cd ./tools/set_version; cpl build; cd ../../;",
 
-      "pre-publish-all": "cpl sv $ARGS",
+      "pre-publish-all": "cpl sv $ARGS; cpl spu $ARGS;",
       "publish-all": "cpl publish-cli; cpl publish-core; cpl publish-query;",
       "pa": "cpl build-all $ARGS",
       "publish-cli": "echo 'Publish cpl-cli'; cd ./src/cpl_cli; cpl publish; cd ../../;",
@@ -52,21 +57,21 @@
       "upload-dev-query": "echo 'DEV Upload cpl_query'; cpl upl-dev-query;",
       "upl-dev-query": "twine upload -r pip-dev.sh-edraft.de dist/cpl-query/publish/setup/*",
 
-      "pre-deploy-prod": "cpl sv $ARGS",
+      "pre-deploy-prod": "cpl sv $ARGS; cpl spu --environment=production;",
       "deploy-prod": "cpl deploy-prod-cli; cpl deploy-prod-core; cpl deploy-prod-query;",
       "dp": "cpl deploy-prod $ARGS",
       "deploy-prod-cli": "cpl publish-cli; cpl upload-prod-cli",
       "deploy-prod-core": "cpl publish-core; cpl upload-prod-core",
       "deploy-prod-query": "cpl publish-query; cpl upload-prod-query",
 
-      "pre-deploy-exp": "cpl sv $ARGS",
+      "pre-deploy-exp": "cpl sv $ARGS; cpl spu --environment=staging;",
       "deploy-exp": "cpl deploy-exp-cli; cpl deploy-exp-core; cpl deploy-exp-query;",
       "de": "cpl deploy-exp $ARGS",
       "deploy-exp-cli": "cpl publish-cli; cpl upload-exp-cli",
       "deploy-exp-core": "cpl publish-core; cpl upload-exp-core",
       "deploy-exp-query": "cpl publish-query; cpl upload-exp-query",
 
-      "pre-deploy-dev": "cpl sv $ARGS",
+      "pre-deploy-dev": "cpl sv $ARGS; cpl spu --environment=development;",
       "deploy-dev": "cpl deploy-dev-cli; cpl deploy-dev-core; cpl deploy-dev-query;",
       "dd": "cpl deploy-dev $ARGS",
       "deploy-dev-cli": "cpl publish-cli; cpl upload-dev-cli",

src/cpl_cli/__init__.py

@@ -15,7 +15,7 @@ __title__ = 'cpl_cli'
 __author__ = 'Sven Heidemann'
 __license__ = 'MIT'
 __copyright__ = 'Copyright (c) 2020 - 2022 sh-edraft.de'
-__version__ = '2022.6.15.dev6'
+__version__ = '2022.6.16.dev2'
 
 from collections import namedtuple
 
@@ -27,4 +27,4 @@ from .main import main
 from .startup import Startup
 
 VersionInfo = namedtuple('VersionInfo', 'major minor micro')
-version_info = VersionInfo(major='2022', minor='6', micro='15.dev6')
+version_info = VersionInfo(major='2022', minor='6', micro='16.dev2')

src/cpl_cli/_templates/__init__.py

@@ -15,11 +15,11 @@ __title__ = 'cpl_cli._templates'
 __author__ = 'Sven Heidemann'
 __license__ = 'MIT'
 __copyright__ = 'Copyright (c) 2020 - 2022 sh-edraft.de'
-__version__ = '2022.6.15.dev6'
+__version__ = '2022.6.16.dev2'
 
 from collections import namedtuple
 
 # imports:
 
 VersionInfo = namedtuple('VersionInfo', 'major minor micro')
-version_info = VersionInfo(major='2022', minor='6', micro='15.dev6')
+version_info = VersionInfo(major='2022', minor='6', micro='16.dev2')

src/cpl_cli/_templates/build/__init__.py

@@ -15,11 +15,11 @@ __title__ = 'cpl_cli._templates.build'
 __author__ = 'Sven Heidemann'
 __license__ = 'MIT'
 __copyright__ = 'Copyright (c) 2020 - 2022 sh-edraft.de'
-__version__ = '2022.6.15.dev6'
+__version__ = '2022.6.16.dev2'
 
 from collections import namedtuple
 
 # imports:
 
 VersionInfo = namedtuple('VersionInfo', 'major minor micro')
-version_info = VersionInfo(major='2022', minor='6', micro='15.dev6')
+version_info = VersionInfo(major='2022', minor='6', micro='16.dev2')

src/cpl_cli/_templates/generate/__init__.py

@@ -15,11 +15,11 @@ __title__ = 'cpl_cli._templates.generate'
 __author__ = 'Sven Heidemann'
 __license__ = 'MIT'
 __copyright__ = 'Copyright (c) 2020 - 2022 sh-edraft.de'
-__version__ = '2022.6.15.dev6'
+__version__ = '2022.6.16.dev2'
 
 from collections import namedtuple
 
 # imports:
 
 VersionInfo = namedtuple('VersionInfo', 'major minor micro')
-version_info = VersionInfo(major='2022', minor='6', micro='15.dev6')
+version_info = VersionInfo(major='2022', minor='6', micro='16.dev2')

src/cpl_cli/_templates/new/__init__.py

@@ -15,11 +15,11 @@ __title__ = 'cpl_cli._templates.new'
 __author__ = 'Sven Heidemann'
 __license__ = 'MIT'
 __copyright__ = 'Copyright (c) 2020 - 2022 sh-edraft.de'
-__version__ = '2022.6.15.dev6'
+__version__ = '2022.6.16.dev2'
 
 from collections import namedtuple
 
 # imports:
 
 VersionInfo = namedtuple('VersionInfo', 'major minor micro')
-version_info = VersionInfo(major='2022', minor='6', micro='15.dev6')
+version_info = VersionInfo(major='2022', minor='6', micro='16.dev2')

src/cpl_cli/_templates/new/console/__init__.py

@@ -15,11 +15,11 @@ __title__ = 'cpl_cli._templates.new.console'
 __author__ = 'Sven Heidemann'
 __license__ = 'MIT'
 __copyright__ = 'Copyright (c) 2020 - 2022 sh-edraft.de'
-__version__ = '2022.6.15.dev6'
+__version__ = '2022.6.16.dev2'
 
 from collections import namedtuple
 
 # imports:
 
 VersionInfo = namedtuple('VersionInfo', 'major minor micro')
-version_info = VersionInfo(major='2022', minor='6', micro='15.dev6')
+version_info = VersionInfo(major='2022', minor='6', micro='16.dev2')

src/cpl_cli/_templates/new/console/source/__init__.py

@@ -15,11 +15,11 @@ __title__ = 'cpl_cli._templates.new.console.source'
 __author__ = 'Sven Heidemann'
 __license__ = 'MIT'
 __copyright__ = 'Copyright (c) 2020 - 2022 sh-edraft.de'
-__version__ = '2022.6.15.dev6'
+__version__ = '2022.6.16.dev2'
 
 from collections import namedtuple
 
 # imports:
 
 VersionInfo = namedtuple('VersionInfo', 'major minor micro')
-version_info = VersionInfo(major='2022', minor='6', micro='15.dev6')
+version_info = VersionInfo(major='2022', minor='6', micro='16.dev2')

src/cpl_cli/_templates/new/console/source/name/__init__.py

@@ -15,11 +15,11 @@ __title__ = 'cpl_cli._templates.new.console.source.name'
 __author__ = 'Sven Heidemann'
 __license__ = 'MIT'
 __copyright__ = 'Copyright (c) 2020 - 2022 sh-edraft.de'
-__version__ = '2022.6.15.dev6'
+__version__ = '2022.6.16.dev2'
 
 from collections import namedtuple
 
 # imports:
 
 VersionInfo = namedtuple('VersionInfo', 'major minor micro')
-version_info = VersionInfo(major='2022', minor='6', micro='15.dev6')
+version_info = VersionInfo(major='2022', minor='6', micro='16.dev2')

src/cpl_cli/_templates/new/console/source/tests/__init__.py

@@ -15,11 +15,11 @@ __title__ = 'cpl_cli._templates.new.console.source.tests'
 __author__ = 'Sven Heidemann'
 __license__ = 'MIT'
 __copyright__ = 'Copyright (c) 2020 - 2022 sh-edraft.de'
-__version__ = '2022.6.15.dev6'
+__version__ = '2022.6.16.dev2'
 
 from collections import namedtuple
 
 # imports:
 
 VersionInfo = namedtuple('VersionInfo', 'major minor micro')
-version_info = VersionInfo(major='2022', minor='6', micro='15.dev6')
+version_info = VersionInfo(major='2022', minor='6', micro='16.dev2')

src/cpl_cli/_templates/new/library/__init__.py

@@ -15,11 +15,11 @@ __title__ = 'cpl_cli._templates.new.library'
 __author__ = 'Sven Heidemann'
 __license__ = 'MIT'
 __copyright__ = 'Copyright (c) 2020 - 2022 sh-edraft.de'
-__version__ = '2022.6.15.dev6'
+__version__ = '2022.6.16.dev2'
 
 from collections import namedtuple
 
 # imports:
 
 VersionInfo = namedtuple('VersionInfo', 'major minor micro')
-version_info = VersionInfo(major='2022', minor='6', micro='15.dev6')
+version_info = VersionInfo(major='2022', minor='6', micro='16.dev2')

src/cpl_cli/_templates/new/library/source/__init__.py

@@ -15,11 +15,11 @@ __title__ = 'cpl_cli._templates.new.library.source'
 __author__ = 'Sven Heidemann'
 __license__ = 'MIT'
 __copyright__ = 'Copyright (c) 2020 - 2022 sh-edraft.de'
-__version__ = '2022.6.15.dev6'
+__version__ = '2022.6.16.dev2'
 
 from collections import namedtuple
 
 # imports:
 
 VersionInfo = namedtuple('VersionInfo', 'major minor micro')
-version_info = VersionInfo(major='2022', minor='6', micro='15.dev6')
+version_info = VersionInfo(major='2022', minor='6', micro='16.dev2')

src/cpl_cli/_templates/new/library/source/name/__init__.py

@@ -15,11 +15,11 @@ __title__ = 'cpl_cli._templates.new.library.source.name'
 __author__ = 'Sven Heidemann'
 __license__ = 'MIT'
 __copyright__ = 'Copyright (c) 2020 - 2022 sh-edraft.de'
-__version__ = '2022.6.15.dev6'
+__version__ = '2022.6.16.dev2'
 
 from collections import namedtuple
 
 # imports:
 
 VersionInfo = namedtuple('VersionInfo', 'major minor micro')
-version_info = VersionInfo(major='2022', minor='6', micro='15.dev6')
+version_info = VersionInfo(major='2022', minor='6', micro='16.dev2')

src/cpl_cli/_templates/new/library/source/tests/__init__.py

@@ -15,11 +15,11 @@ __title__ = 'cpl_cli._templates.new.library.source.tests'
 __author__ = 'Sven Heidemann'
 __license__ = 'MIT'
 __copyright__ = 'Copyright (c) 2020 - 2022 sh-edraft.de'
-__version__ = '2022.6.15.dev6'
+__version__ = '2022.6.16.dev2'
 
 from collections import namedtuple
 
 # imports:
 
 VersionInfo = namedtuple('VersionInfo', 'major minor micro')
-version_info = VersionInfo(major='2022', minor='6', micro='15.dev6')
+version_info = VersionInfo(major='2022', minor='6', micro='16.dev2')

src/cpl_cli/_templates/publish/__init__.py

@@ -15,11 +15,11 @@ __title__ = 'cpl_cli._templates.publish'
 __author__ = 'Sven Heidemann'
 __license__ = 'MIT'
 __copyright__ = 'Copyright (c) 2020 - 2022 sh-edraft.de'
-__version__ = '2022.6.15.dev6'
+__version__ = '2022.6.16.dev2'
 
 from collections import namedtuple
 
 # imports:
 
 VersionInfo = namedtuple('VersionInfo', 'major minor micro')
-version_info = VersionInfo(major='2022', minor='6', micro='15.dev6')
+version_info = VersionInfo(major='2022', minor='6', micro='16.dev2')

src/cpl_cli/command/__init__.py

@@ -15,7 +15,7 @@ __title__ = 'cpl_cli.command'
 __author__ = 'Sven Heidemann'
 __license__ = 'MIT'
 __copyright__ = 'Copyright (c) 2020 - 2022 sh-edraft.de'
-__version__ = '2022.6.15.dev6'
+__version__ = '2022.6.16.dev2'
 
 from collections import namedtuple
 
@@ -28,4 +28,4 @@ from .publish_service import PublishService
 from .version_service import VersionService
 
 VersionInfo = namedtuple('VersionInfo', 'major minor micro')
-version_info = VersionInfo(major='2022', minor='6', micro='15.dev6')
+version_info = VersionInfo(major='2022', minor='6', micro='16.dev2')

src/cpl_cli/configuration/__init__.py

@@ -15,7 +15,7 @@ __title__ = 'cpl_cli.configuration'
 __author__ = 'Sven Heidemann'
 __license__ = 'MIT'
 __copyright__ = 'Copyright (c) 2020 - 2022 sh-edraft.de'
-__version__ = '2022.6.15.dev6'
+__version__ = '2022.6.16.dev2'
 
 from collections import namedtuple
 
@@ -30,4 +30,4 @@ from .workspace_settings import WorkspaceSettings
 from .workspace_settings_name_enum import WorkspaceSettingsNameEnum
 
 VersionInfo = namedtuple('VersionInfo', 'major minor micro')
-version_info = VersionInfo(major='2022', minor='6', micro='15.dev6')
+version_info = VersionInfo(major='2022', minor='6', micro='16.dev2')

src/cpl_cli/cpl-cli.json

@@ -4,7 +4,7 @@
     "Version": {
       "Major": "2022",
       "Minor": "6",
-      "Micro": "15.dev6"
+      "Micro": "16.dev2"
     },
     "Author": "Sven Heidemann",
     "AuthorEmail": "sven.heidemann@sh-edraft.de",
@@ -16,7 +16,7 @@
     "LicenseName": "MIT",
     "LicenseDescription": "MIT, see LICENSE for more details.",
     "Dependencies": [
-      "cpl-core>=2022.6.15.dev6"
+      "cpl-core>=2022.6.16.dev2"
     ],
     "PythonVersion": ">=3.10",
     "PythonPath": {},

src/cpl_cli/live_server/__init__.py

@@ -15,11 +15,11 @@ __title__ = 'cpl_cli.live_server'
 __author__ = 'Sven Heidemann'
 __license__ = 'MIT'
 __copyright__ = 'Copyright (c) 2020 - 2022 sh-edraft.de'
-__version__ = '2022.6.15.dev6'
+__version__ = '2022.6.16.dev2'
 
 from collections import namedtuple
 
 # imports:
 
 VersionInfo = namedtuple('VersionInfo', 'major minor micro')
-version_info = VersionInfo(major='2022', minor='6', micro='15.dev6')
+version_info = VersionInfo(major='2022', minor='6', micro='16.dev2')

src/cpl_cli/publish/__init__.py

@@ -15,7 +15,7 @@ __title__ = 'cpl_cli.publish'
 __author__ = 'Sven Heidemann'
 __license__ = 'MIT'
 __copyright__ = 'Copyright (c) 2020 - 2022 sh-edraft.de'
-__version__ = '2022.6.15.dev6'
+__version__ = '2022.6.16.dev2'
 
 from collections import namedtuple
 
@@ -24,4 +24,4 @@ from .publisher_abc import PublisherABC
 from .publisher_service import PublisherService
 
 VersionInfo = namedtuple('VersionInfo', 'major minor micro')
-version_info = VersionInfo(major='2022', minor='6', micro='15.dev6')
+version_info = VersionInfo(major='2022', minor='6', micro='16.dev2')

src/cpl_cli/source_creator/__init__.py

@@ -15,11 +15,11 @@ __title__ = 'cpl_cli.source_creator'
 __author__ = 'Sven Heidemann'
 __license__ = 'MIT'
 __copyright__ = 'Copyright (c) 2020 - 2022 sh-edraft.de'
-__version__ = '2022.6.15.dev6'
+__version__ = '2022.6.16.dev2'
 
 from collections import namedtuple
 
 # imports:
 
 VersionInfo = namedtuple('VersionInfo', 'major minor micro')
-version_info = VersionInfo(major='2022', minor='6', micro='15.dev6')
+version_info = VersionInfo(major='2022', minor='6', micro='16.dev2')

src/cpl_cli/validators/__init__.py

@@ -15,11 +15,11 @@ __title__ = 'cpl_cli.validators'
 __author__ = 'Sven Heidemann'
 __license__ = 'MIT'
 __copyright__ = 'Copyright (c) 2020 - 2022 sh-edraft.de'
-__version__ = '2022.6.15.dev6'
+__version__ = '2022.6.16.dev2'
 
 from collections import namedtuple
 
 # imports:
 
 VersionInfo = namedtuple('VersionInfo', 'major minor micro')
-version_info = VersionInfo(major='2022', minor='6', micro='15.dev6')
+version_info = VersionInfo(major='2022', minor='6', micro='16.dev2')

src/cpl_core/__init__.py

@@ -15,11 +15,11 @@ __title__ = 'cpl_core'
 __author__ = 'Sven Heidemann'
 __license__ = 'MIT'
 __copyright__ = 'Copyright (c) 2020 - 2022 sh-edraft.de'
-__version__ = '2022.6.15.dev6'
+__version__ = '2022.6.16.dev2'
 
 from collections import namedtuple
 
 # imports:
 
 VersionInfo = namedtuple('VersionInfo', 'major minor micro')
-version_info = VersionInfo(major='2022', minor='6', micro='15.dev6')
+version_info = VersionInfo(major='2022', minor='6', micro='16.dev2')

src/cpl_core/application/__init__.py

@@ -15,7 +15,7 @@ __title__ = 'cpl_core.application'
 __author__ = 'Sven Heidemann'
 __license__ = 'MIT'
 __copyright__ = 'Copyright (c) 2020 - 2022 sh-edraft.de'
-__version__ = '2022.6.15.dev6'
+__version__ = '2022.6.16.dev2'
 
 from collections import namedtuple
 
@@ -28,4 +28,4 @@ from .startup_abc import StartupABC
 from .startup_extension_abc import StartupExtensionABC
 
 VersionInfo = namedtuple('VersionInfo', 'major minor micro')
-version_info = VersionInfo(major='2022', minor='6', micro='15.dev6')
+version_info = VersionInfo(major='2022', minor='6', micro='16.dev2')

src/cpl_core/configuration/__init__.py

@@ -15,7 +15,7 @@ __title__ = 'cpl_core.configuration'
 __author__ = 'Sven Heidemann'
 __license__ = 'MIT'
 __copyright__ = 'Copyright (c) 2020 - 2022 sh-edraft.de'
-__version__ = '2022.6.15.dev6'
+__version__ = '2022.6.16.dev2'
 
 from collections import namedtuple
 
@@ -34,4 +34,4 @@ from .validator_abc import ValidatorABC
 from .variable_argument import VariableArgument
 
 VersionInfo = namedtuple('VersionInfo', 'major minor micro')
-version_info = VersionInfo(major='2022', minor='6', micro='15.dev6')
+version_info = VersionInfo(major='2022', minor='6', micro='16.dev2')

src/cpl_core/console/__init__.py

@@ -15,7 +15,7 @@ __title__ = 'cpl_core.console'
 __author__ = 'Sven Heidemann'
 __license__ = 'MIT'
 __copyright__ = 'Copyright (c) 2020 - 2022 sh-edraft.de'
-__version__ = '2022.6.15.dev6'
+__version__ = '2022.6.16.dev2'
 
 from collections import namedtuple
 
@@ -27,4 +27,4 @@ from .foreground_color_enum import ForegroundColorEnum
 from .spinner_thread import SpinnerThread
 
 VersionInfo = namedtuple('VersionInfo', 'major minor micro')
-version_info = VersionInfo(major='2022', minor='6', micro='15.dev6')
+version_info = VersionInfo(major='2022', minor='6', micro='16.dev2')

src/cpl_core/cpl-core.json

@@ -4,7 +4,7 @@
     "Version": {
       "Major": "2022",
       "Minor": "6",
-      "Micro": "15.dev6"
+      "Micro": "16.dev2"
     },
     "Author": "Sven Heidemann",
     "AuthorEmail": "sven.heidemann@sh-edraft.de",

src/cpl_core/database/__init__.py

@@ -15,7 +15,7 @@ __title__ = 'cpl_core.database'
 __author__ = 'Sven Heidemann'
 __license__ = 'MIT'
 __copyright__ = 'Copyright (c) 2020 - 2022 sh-edraft.de'
-__version__ = '2022.6.15.dev6'
+__version__ = '2022.6.16.dev2'
 
 from collections import namedtuple
 
@@ -25,4 +25,4 @@ from .database_settings import DatabaseSettings
 from .table_abc import TableABC
 
 VersionInfo = namedtuple('VersionInfo', 'major minor micro')
-version_info = VersionInfo(major='2022', minor='6', micro='15.dev6')
+version_info = VersionInfo(major='2022', minor='6', micro='16.dev2')

src/cpl_core/database/connection/__init__.py

@@ -15,7 +15,7 @@ __title__ = 'cpl_core.database.connection'
 __author__ = 'Sven Heidemann'
 __license__ = 'MIT'
 __copyright__ = 'Copyright (c) 2020 - 2022 sh-edraft.de'
-__version__ = '2022.6.15.dev6'
+__version__ = '2022.6.16.dev2'
 
 from collections import namedtuple
 
@@ -24,4 +24,4 @@ from .database_connection import DatabaseConnection
 from .database_connection_abc import DatabaseConnectionABC
 
 VersionInfo = namedtuple('VersionInfo', 'major minor micro')
-version_info = VersionInfo(major='2022', minor='6', micro='15.dev6')
+version_info = VersionInfo(major='2022', minor='6', micro='16.dev2')

src/cpl_core/database/context/__init__.py

@@ -15,7 +15,7 @@ __title__ = 'cpl_core.database.context'
 __author__ = 'Sven Heidemann'
 __license__ = 'MIT'
 __copyright__ = 'Copyright (c) 2020 - 2022 sh-edraft.de'
-__version__ = '2022.6.15.dev6'
+__version__ = '2022.6.16.dev2'
 
 from collections import namedtuple
 
@@ -24,4 +24,4 @@ from .database_context import DatabaseContext
 from .database_context_abc import DatabaseContextABC
 
 VersionInfo = namedtuple('VersionInfo', 'major minor micro')
-version_info = VersionInfo(major='2022', minor='6', micro='15.dev6')
+version_info = VersionInfo(major='2022', minor='6', micro='16.dev2')

src/cpl_core/dependency_injection/__init__.py

@@ -15,7 +15,7 @@ __title__ = 'cpl_core.dependency_injection'
 __author__ = 'Sven Heidemann'
 __license__ = 'MIT'
 __copyright__ = 'Copyright (c) 2020 - 2022 sh-edraft.de'
-__version__ = '2022.6.15.dev6'
+__version__ = '2022.6.16.dev2'
 
 from collections import namedtuple
 
@@ -30,4 +30,4 @@ from .service_provider import ServiceProvider
 from .service_provider_abc import ServiceProviderABC
 
 VersionInfo = namedtuple('VersionInfo', 'major minor micro')
-version_info = VersionInfo(major='2022', minor='6', micro='15.dev6')
+version_info = VersionInfo(major='2022', minor='6', micro='16.dev2')

src/cpl_core/environment/__init__.py

@@ -15,7 +15,7 @@ __title__ = 'cpl_core.environment'
 __author__ = 'Sven Heidemann'
 __license__ = 'MIT'
 __copyright__ = 'Copyright (c) 2020 - 2022 sh-edraft.de'
-__version__ = '2022.6.15.dev6'
+__version__ = '2022.6.16.dev2'
 
 from collections import namedtuple
 
@@ -25,4 +25,4 @@ from .environment_name_enum import EnvironmentNameEnum
 from .application_environment import ApplicationEnvironment
 
 VersionInfo = namedtuple('VersionInfo', 'major minor micro')
-version_info = VersionInfo(major='2022', minor='6', micro='15.dev6')
+version_info = VersionInfo(major='2022', minor='6', micro='16.dev2')

src/cpl_core/logging/__init__.py

@@ -15,7 +15,7 @@ __title__ = 'cpl_core.logging'
 __author__ = 'Sven Heidemann'
 __license__ = 'MIT'
 __copyright__ = 'Copyright (c) 2020 - 2022 sh-edraft.de'
-__version__ = '2022.6.15.dev6'
+__version__ = '2022.6.16.dev2'
 
 from collections import namedtuple
 
@@ -27,4 +27,4 @@ from .logging_settings import LoggingSettings
 from .logging_settings_name_enum import LoggingSettingsNameEnum
 
 VersionInfo = namedtuple('VersionInfo', 'major minor micro')
-version_info = VersionInfo(major='2022', minor='6', micro='15.dev6')
+version_info = VersionInfo(major='2022', minor='6', micro='16.dev2')

src/cpl_core/mailing/__init__.py

@@ -15,7 +15,7 @@ __title__ = 'cpl_core.mailing'
 __author__ = 'Sven Heidemann'
 __license__ = 'MIT'
 __copyright__ = 'Copyright (c) 2020 - 2022 sh-edraft.de'
-__version__ = '2022.6.15.dev6'
+__version__ = '2022.6.16.dev2'
 
 from collections import namedtuple
 
@@ -27,4 +27,4 @@ from .email_client_settings import EMailClientSettings
 from .email_client_settings_name_enum import EMailClientSettingsNameEnum
 
 VersionInfo = namedtuple('VersionInfo', 'major minor micro')
-version_info = VersionInfo(major='2022', minor='6', micro='15.dev6')
+version_info = VersionInfo(major='2022', minor='6', micro='16.dev2')

src/cpl_core/pipes/__init__.py

@@ -15,7 +15,7 @@ __title__ = 'cpl_core.pipes'
 __author__ = 'Sven Heidemann'
 __license__ = 'MIT'
 __copyright__ = 'Copyright (c) 2020 - 2022 sh-edraft.de'
-__version__ = '2022.6.15.dev6'
+__version__ = '2022.6.16.dev2'
 
 from collections import namedtuple
 
@@ -29,4 +29,4 @@ from .to_camel_case_pipe import ToCamelCasePipe
 from .to_snake_case_pipe import ToSnakeCasePipe
 
 VersionInfo = namedtuple('VersionInfo', 'major minor micro')
-version_info = VersionInfo(major='2022', minor='6', micro='15.dev6')
+version_info = VersionInfo(major='2022', minor='6', micro='16.dev2')

src/cpl_core/time/__init__.py

@@ -15,7 +15,7 @@ __title__ = 'cpl_core.time'
 __author__ = 'Sven Heidemann'
 __license__ = 'MIT'
 __copyright__ = 'Copyright (c) 2020 - 2022 sh-edraft.de'
-__version__ = '2022.6.15.dev6'
+__version__ = '2022.6.16.dev2'
 
 from collections import namedtuple
 
@@ -24,4 +24,4 @@ from .time_format_settings import TimeFormatSettings
 from .time_format_settings_names_enum import TimeFormatSettingsNamesEnum
 
 VersionInfo = namedtuple('VersionInfo', 'major minor micro')
-version_info = VersionInfo(major='2022', minor='6', micro='15.dev6')
+version_info = VersionInfo(major='2022', minor='6', micro='16.dev2')

src/cpl_core/utils/__init__.py

@@ -15,7 +15,7 @@ __title__ = 'cpl_core.utils'
 __author__ = 'Sven Heidemann'
 __license__ = 'MIT'
 __copyright__ = 'Copyright (c) 2020 - 2022 sh-edraft.de'
-__version__ = '2022.6.15.dev6'
+__version__ = '2022.6.16.dev2'
 
 from collections import namedtuple
 
@@ -25,4 +25,4 @@ from .string import String
 from .pip import Pip
 
 VersionInfo = namedtuple('VersionInfo', 'major minor micro')
-version_info = VersionInfo(major='2022', minor='6', micro='15.dev6')
+version_info = VersionInfo(major='2022', minor='6', micro='16.dev2')

src/cpl_query/__init__.py

@@ -6,7 +6,7 @@ cpl-query sh-edraft Common Python library Query
 
 sh-edraft Common Python library Python integrated Queries
 
-:copyright: (c) 2020 - 2022 sh-edraft.de
+:copyright: (c) 2021 - 2022 sh-edraft.de
 :license: MIT, see LICENSE for more details.
 
 """
@@ -14,12 +14,12 @@ sh-edraft Common Python library Python integrated Queries
 __title__ = 'cpl_query'
 __author__ = 'Sven Heidemann'
 __license__ = 'MIT'
-__copyright__ = 'Copyright (c) 2020 - 2022 sh-edraft.de'
+__copyright__ = 'Copyright (c) 2021 - 2022 sh-edraft.de'
-__version__ = '2022.6.15.dev6'
+__version__ = '2022.6.16.dev2'
 
 from collections import namedtuple
 
 # imports: 
 
 VersionInfo = namedtuple('VersionInfo', 'major minor micro')
-version_info = VersionInfo(major='2022', minor='6', micro='15.dev6')
+version_info = VersionInfo(major='2022', minor='6', micro='16.dev2')

src/cpl_query/_query/__init__.py

@@ -6,7 +6,7 @@ cpl-query sh-edraft Common Python library Query
 
 sh-edraft Common Python library Python integrated Queries
 
-:copyright: (c) 2020 - 2022 sh-edraft.de
+:copyright: (c) 2021 - 2022 sh-edraft.de
 :license: MIT, see LICENSE for more details.
 
 """
@@ -14,12 +14,12 @@ sh-edraft Common Python library Python integrated Queries
 __title__ = 'cpl_query._query'
 __author__ = 'Sven Heidemann'
 __license__ = 'MIT'
-__copyright__ = 'Copyright (c) 2020 - 2022 sh-edraft.de'
+__copyright__ = 'Copyright (c) 2021 - 2022 sh-edraft.de'
-__version__ = '2022.6.15.dev6'
+__version__ = '2022.6.16.dev2'
 
 from collections import namedtuple
 
 # imports:
 
 VersionInfo = namedtuple('VersionInfo', 'major minor micro')
-version_info = VersionInfo(major='2022', minor='6', micro='15.dev6')
+version_info = VersionInfo(major='2022', minor='6', micro='16.dev2')

src/cpl_query/cpl-query.json

@@ -4,19 +4,19 @@
     "Version": {
       "Major": "2022",
       "Minor": "6",
-      "Micro": "15.dev6"
+      "Micro": "16.dev2"
     },
     "Author": "Sven Heidemann",
     "AuthorEmail": "sven.heidemann@sh-edraft.de",
     "Description": "sh-edraft Common Python library Query",
     "LongDescription": "sh-edraft Common Python library Python integrated Queries",
     "URL": "https://www.sh-edraft.de",
-    "CopyrightDate": "2020 - 2022",
+    "CopyrightDate": "2021 - 2022",
     "CopyrightName": "sh-edraft.de",
     "LicenseName": "MIT",
     "LicenseDescription": "MIT, see LICENSE for more details.",
     "Dependencies": [
-      "cpl-core>=2022.6.15.dev6"
+      "cpl-core>=2022.6.16.dev2"
     ],
     "PythonVersion": ">=3.10",
     "PythonPath": {},

src/cpl_query/extension/__init__.py

@@ -6,7 +6,7 @@ cpl-query sh-edraft Common Python library Query
 
 sh-edraft Common Python library Python integrated Queries
 
-:copyright: (c) 2020 - 2022 sh-edraft.de
+:copyright: (c) 2021 - 2022 sh-edraft.de
 :license: MIT, see LICENSE for more details.
 
 """
@@ -14,8 +14,8 @@ sh-edraft Common Python library Python integrated Queries
 __title__ = 'cpl_query.extension'
 __author__ = 'Sven Heidemann'
 __license__ = 'MIT'
-__copyright__ = 'Copyright (c) 2020 - 2022 sh-edraft.de'
+__copyright__ = 'Copyright (c) 2021 - 2022 sh-edraft.de'
-__version__ = '2022.6.15.dev6'
+__version__ = '2022.6.16.dev2'
 
 from collections import namedtuple
 
@@ -27,4 +27,4 @@ from .ordered_iterable_abc import OrderedIterableABC
 from .ordered_iterable import OrderedIterable
 
 VersionInfo = namedtuple('VersionInfo', 'major minor micro')
-version_info = VersionInfo(major='2022', minor='6', micro='15.dev6')
+version_info = VersionInfo(major='2022', minor='6', micro='16.dev2')

tools/set_pip_urls/__init__.py

@@ -0,0 +1,25 @@
+# -*- coding: utf-8 -*-
+
+"""
+set-pip-urls CPL internal tool to set pip URL for CLI by environment
+~~~~~~~~~~~~~~~~~~~
+
+CPL internal tool to set pip URL for CLI by environment
+
+:copyright: (c) 2022 sh-edraft.de
+:license: MIT, see LICENSE for more details.
+
+"""
+
+__title__ = 'set_pip_urls'
+__author__ = 'Sven Heidemann'
+__license__ = 'MIT'
+__copyright__ = 'Copyright (c) 2022 sh-edraft.de'
+__version__ = '2022.6.0'
+
+from collections import namedtuple
+
+# imports: 
+
+VersionInfo = namedtuple('VersionInfo', 'major minor micro')
+version_info = VersionInfo(major='2022', minor='6', micro='0')

tools/set_pip_urls/application.py

@@ -0,0 +1,48 @@
+import json
+import os
+import sys
+from typing import Optional
+
+from cpl_core.environment import EnvironmentNameEnum
+
+from cpl_core.application import ApplicationABC
+from cpl_core.configuration import ConfigurationABC
+from cpl_core.console import Console
+from cpl_core.dependency_injection import ServiceProviderABC
+from set_pip_urls.pip_settings import PIPSettings
+
+
+class Application(ApplicationABC):
+
+    def __init__(self, config: ConfigurationABC, services: ServiceProviderABC):
+        ApplicationABC.__init__(self, config, services)
+
+        self._pip_settings: Optional[PIPSettings] = config.get_configuration(PIPSettings)
+
+    def configure(self):
+        self._configuration.parse_console_arguments(self._services)
+
+    def main(self):
+        if self._pip_settings is None:
+            Console.error('appsettings.json not found')
+            sys.exit()
+
+        url = None
+        match self._environment.environment_name:
+            case EnvironmentNameEnum.production.value:
+                url = self._pip_settings.production
+            case EnvironmentNameEnum.staging.value:
+                url = self._pip_settings.staging
+            case EnvironmentNameEnum.development.value:
+                url = self._pip_settings.development
+
+        cli_json = {
+            "CLI": {
+                "PipPath": url
+            }
+        }
+        file = os.path.abspath(os.path.join(self._environment.working_directory, '../../src/cpl_cli', 'appsettings.json'))
+        Console.write_line(f'Writing PipPath: {url} to {file}')
+        with open(file, 'w') as f:
+            f.write(json.dumps(cli_json, indent=2))
+            f.close()

tools/set_pip_urls/appsettings.json

@@ -0,0 +1,7 @@
+{
+  "PIPSettings": {
+    "production": "https://pip.sh-edraft.de",
+    "staging": "https://pip-exp.sh-edraft.de",
+    "development": "https://pip-dev.sh-edraft.de"
+  }
+}

tools/set_pip_urls/main.py

@@ -0,0 +1,14 @@
+from cpl_core.application import ApplicationBuilder
+
+from set_pip_urls.application import Application
+from set_pip_urls.startup import Startup
+
+
+def main():
+    app_builder = ApplicationBuilder(Application)
+    app_builder.use_startup(Startup)
+    app_builder.build().run()
+
+
+if __name__ == '__main__':
+    main()

tools/set_pip_urls/pip_settings.py

@@ -0,0 +1,37 @@
+import traceback
+
+from cpl_core.environment.environment_name_enum import EnvironmentNameEnum
+
+from cpl_core.configuration.configuration_model_abc import ConfigurationModelABC
+from cpl_core.console import Console
+
+
+class PIPSettings(ConfigurationModelABC):
+
+    def __init__(self):
+        ConfigurationModelABC.__init__(self)
+
+        self._production = ''
+        self._staging = ''
+        self._development = ''
+
+    @property
+    def production(self):
+        return self._production
+
+    @property
+    def staging(self):
+        return self._staging
+
+    @property
+    def development(self):
+        return self._development
+
+    def from_dict(self, settings: dict):
+        try:
+            self._production = settings[EnvironmentNameEnum.production.value]
+            self._staging = settings[EnvironmentNameEnum.staging.value]
+            self._development = settings[EnvironmentNameEnum.development.value]
+        except Exception as e:
+            Console.error(f'[ ERROR ] [ {__name__} ]: Reading error in {self.__name__} settings')
+            Console.error(f'[ EXCEPTION ] [ {__name__} ]: {e} -> {traceback.format_exc()}')

tools/set_pip_urls/set-pip-urls.json

@@ -0,0 +1,41 @@
+{
+  "ProjectSettings": {
+    "Name": "set-pip-urls",
+    "Version": {
+      "Major": "2022",
+      "Minor": "6",
+      "Micro": "0"
+    },
+    "Author": "Sven Heidemann",
+    "AuthorEmail": "sven.heidemann@sh-edraft.de",
+    "Description": "CPL internal tool to set pip URL for CLI by environment",
+    "LongDescription": "CPL internal tool to set pip URL for CLI by environment",
+    "URL": "https://www.sh-edraft.de",
+    "CopyrightDate": "2022",
+    "CopyrightName": "sh-edraft.de",
+    "LicenseName": "MIT",
+    "LicenseDescription": "MIT, see LICENSE for more details.",
+    "Dependencies": [
+      "cpl-core>=2022.6.16.dev2"
+    ],
+    "PythonVersion": ">=3.10.4",
+    "PythonPath": {},
+    "Classifiers": []
+  },
+  "BuildSettings": {
+    "ProjectType": "console",
+    "SourcePath": "",
+    "OutputPath": "../../dist",
+    "Main": "set_pip_url.main",
+    "EntryPoint": "set-pip-url",
+    "IncludePackageData": false,
+    "Included": [],
+    "Excluded": [
+      "*/__pycache__",
+      "*/logs",
+      "*/tests"
+    ],
+    "PackageData": {},
+    "ProjectReferences": []
+  }
+}

tools/set_pip_urls/startup.py

@@ -0,0 +1,18 @@
+from cpl_core.application import StartupABC
+from cpl_core.configuration import ConfigurationABC
+from cpl_core.dependency_injection import ServiceProviderABC, ServiceCollectionABC
+from cpl_core.environment import ApplicationEnvironment
+
+
+class Startup(StartupABC):
+
+    def __init__(self):
+        StartupABC.__init__(self)
+
+    def configure_configuration(self, configuration: ConfigurationABC, environment: ApplicationEnvironment) -> ConfigurationABC:
+        configuration.add_environment_variables('CPL_')
+        configuration.add_json_file('appsettings.json', optional=False, output=False)
+        return configuration
+
+    def configure_services(self, services: ServiceCollectionABC, environment: ApplicationEnvironment) -> ServiceProviderABC:
+        return services.build_service_provider()

tools/set_version/__init__.py

@@ -6,7 +6,7 @@ set-version CPL internal tool to set version from branch name
 
 CPL internal tool to set version from branch name
 
-:copyright: (c) 2020 - 2022 sh-edraft.de
+:copyright: (c) 2022 sh-edraft.de
 :license: MIT, see LICENSE for more details.
 
 """
@@ -14,12 +14,12 @@ CPL internal tool to set version from branch name
 __title__ = 'set_version'
 __author__ = 'Sven Heidemann'
 __license__ = 'MIT'
-__copyright__ = 'Copyright (c) 2020 - 2022 sh-edraft.de'
+__copyright__ = 'Copyright (c) 2022 sh-edraft.de'
-__version__ = '2022.6'
+__version__ = '2022.6.0'
 
 from collections import namedtuple
 
 # imports: 
 
 VersionInfo = namedtuple('VersionInfo', 'major minor micro')
-version_info = VersionInfo(major='2022', minor='6', micro='None')
+version_info = VersionInfo(major='2022', minor='6', micro='0')

tools/set_version/set-version.json

@@ -4,19 +4,19 @@
     "Version": {
       "Major": "2022",
       "Minor": "6",
-      "Micro": ""
+      "Micro": "0"
     },
     "Author": "Sven Heidemann",
     "AuthorEmail": "sven.heidemann@sh-edraft.de",
     "Description": "CPL internal tool to set version from branch name",
     "LongDescription": "CPL internal tool to set version from branch name",
     "URL": "https://www.sh-edraft.de",
-    "CopyrightDate": "2020 - 2022",
+    "CopyrightDate": "2022",
     "CopyrightName": "sh-edraft.de",
     "LicenseName": "MIT",
     "LicenseDescription": "MIT, see LICENSE for more details.",
     "Dependencies": [
-      "cpl-core>=2022.6.15.dev6"
+      "cpl-core>=2022.6.16.dev2"
     ],
     "PythonVersion": ">=3.10.4",
     "PythonPath": {},