diff --git a/cpl.json b/cpl.json index 472adacf..88420940 100644 --- a/cpl.json +++ b/cpl.json @@ -4,7 +4,7 @@ "Version": { "Major": "2021", "Minor": "04", - "Micro": "01-7" + "Micro": "01-8" }, "Author": "Sven Heidemann", "AuthorEmail": "sven.heidemann@sh-edraft.de", @@ -45,6 +45,10 @@ "*/logs", "*/tests" ], - "PackageData": {} + "PackageData": { + "cpl_cli": [ + "*.json" + ] + } } } \ No newline at end of file diff --git a/src/cpl/__init__.py b/src/cpl/__init__.py index 237cee2d..06b306c3 100644 --- a/src/cpl/__init__.py +++ b/src/cpl/__init__.py @@ -15,11 +15,11 @@ __title__ = 'sh_cpl.cpl' __author__ = 'Sven Heidemann' __license__ = 'MIT' __copyright__ = 'Copyright (c) 2020 - 2021 sh-edraft.de' -__version__ = '2021.4.1.post7' +__version__ = '2021.4.1.post8' from collections import namedtuple # imports: VersionInfo = namedtuple('VersionInfo', 'major minor micro') -version_info = VersionInfo(major='2021', minor='04', micro='01-7') +version_info = VersionInfo(major='2021', minor='04', micro='01-8') diff --git a/src/cpl/application/__init__.py b/src/cpl/application/__init__.py index 783ad4b5..bdd548a6 100644 --- a/src/cpl/application/__init__.py +++ b/src/cpl/application/__init__.py @@ -15,7 +15,7 @@ __title__ = 'cpl.application' __author__ = 'Sven Heidemann' __license__ = 'MIT' __copyright__ = 'Copyright (c) 2020 - 2021 sh-edraft.de' -__version__ = '2021.4.1.post7' +__version__ = '2021.4.1.post8' from collections import namedtuple @@ -28,4 +28,4 @@ from .application_runtime_abc import ApplicationRuntimeABC from .startup_abc import StartupABC VersionInfo = namedtuple('VersionInfo', 'major minor micro') -version_info = VersionInfo(major='2021', minor='04', micro='01-7') +version_info = VersionInfo(major='2021', minor='04', micro='01-8') diff --git a/src/cpl/configuration/__init__.py b/src/cpl/configuration/__init__.py index 6456b388..006f9b60 100644 --- a/src/cpl/configuration/__init__.py +++ b/src/cpl/configuration/__init__.py @@ -15,7 +15,7 @@ __title__ = 'cpl.configuration' __author__ = 'Sven Heidemann' __license__ = 'MIT' __copyright__ = 'Copyright (c) 2020 - 2021 sh-edraft.de' -__version__ = '2021.4.1.post7' +__version__ = '2021.4.1.post8' from collections import namedtuple @@ -27,4 +27,4 @@ from .configuration_variable_name_enum import ConfigurationVariableNameEnum from .console_argument import ConsoleArgument VersionInfo = namedtuple('VersionInfo', 'major minor micro') -version_info = VersionInfo(major='2021', minor='04', micro='01-7') +version_info = VersionInfo(major='2021', minor='04', micro='01-8') diff --git a/src/cpl/configuration/configuration.py b/src/cpl/configuration/configuration.py index e1e0175b..e8ce538d 100644 --- a/src/cpl/configuration/configuration.py +++ b/src/cpl/configuration/configuration.py @@ -23,7 +23,7 @@ class Configuration(ConfigurationABC): """ ConfigurationABC.__init__(self) - self._hosting_environment = ApplicationEnvironment() + self._application_environment = ApplicationEnvironment() self._config: dict[Union[type, str], Union[ConfigurationModelABC, str]] = {} self._argument_types: list[ConsoleArgument] = [] @@ -35,7 +35,7 @@ class Configuration(ConfigurationABC): @property def environment(self) -> ApplicationEnvironmentABC: - return self._hosting_environment + return self._application_environment @property def additional_arguments(self) -> list[str]: @@ -93,13 +93,13 @@ class Configuration(ConfigurationABC): :return: """ if name == ConfigurationVariableNameEnum.environment.value: - self._hosting_environment.environment_name = EnvironmentNameEnum(value) + self._application_environment.environment_name = EnvironmentNameEnum(value) elif name == ConfigurationVariableNameEnum.name.value: - self._hosting_environment.application_name = value + self._application_environment.application_name = value elif name == ConfigurationVariableNameEnum.customer.value: - self._hosting_environment.customer = value + self._application_environment.customer = value else: self._config[name] = value @@ -284,14 +284,18 @@ class Configuration(ConfigurationABC): exit() - def add_json_file(self, name: str, optional: bool = None, output: bool = True): - if self._hosting_environment.content_root_path.endswith('/') and not name.startswith('/'): - file_path = f'{self._hosting_environment.content_root_path}{name}' + def add_json_file(self, name: str, optional: bool = None, output: bool = True, path: str = None): + path_root = self._application_environment.content_root_path + if path is not None: + path_root = path + + if str(path_root).endswith('/') and not name.startswith('/'): + file_path = f'{path_root}{name}' else: - file_path = f'{self._hosting_environment.content_root_path}/{name}' + file_path = f'{path_root}/{name}' if not os.path.isfile(file_path): - if not optional: + if optional is not True: if output: self._print_error(__name__, f'File not found: {file_path}') @@ -337,13 +341,13 @@ class Configuration(ConfigurationABC): str, Callable[ConfigurationModelABC]]: if type(search_type) is str: if search_type == ConfigurationVariableNameEnum.environment.value: - return self._hosting_environment.environment_name + return self._application_environment.environment_name elif search_type == ConfigurationVariableNameEnum.name.value: - return self._hosting_environment.application_name + return self._application_environment.application_name elif search_type == ConfigurationVariableNameEnum.customer.value: - return self._hosting_environment.customer + return self._application_environment.customer if search_type not in self._config: return None diff --git a/src/cpl/console/__init__.py b/src/cpl/console/__init__.py index fcce8e26..e5e165cd 100644 --- a/src/cpl/console/__init__.py +++ b/src/cpl/console/__init__.py @@ -15,7 +15,7 @@ __title__ = 'cpl.console' __author__ = 'Sven Heidemann' __license__ = 'MIT' __copyright__ = 'Copyright (c) 2020 - 2021 sh-edraft.de' -__version__ = '2021.4.1.post7' +__version__ = '2021.4.1.post8' 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='2021', minor='04', micro='01-7') +version_info = VersionInfo(major='2021', minor='04', micro='01-8') diff --git a/src/cpl/database/__init__.py b/src/cpl/database/__init__.py index e7ece485..0fcb7c96 100644 --- a/src/cpl/database/__init__.py +++ b/src/cpl/database/__init__.py @@ -15,7 +15,7 @@ __title__ = 'cpl.database' __author__ = 'Sven Heidemann' __license__ = 'MIT' __copyright__ = 'Copyright (c) 2020 - 2021 sh-edraft.de' -__version__ = '2021.4.1.post7' +__version__ = '2021.4.1.post8' from collections import namedtuple @@ -25,4 +25,4 @@ from .database_settings import DatabaseSettings from .database_settings_name_enum import DatabaseSettingsNameEnum VersionInfo = namedtuple('VersionInfo', 'major minor micro') -version_info = VersionInfo(major='2021', minor='04', micro='01-7') +version_info = VersionInfo(major='2021', minor='04', micro='01-8') diff --git a/src/cpl/database/connection/__init__.py b/src/cpl/database/connection/__init__.py index e6c384b4..3e1e7793 100644 --- a/src/cpl/database/connection/__init__.py +++ b/src/cpl/database/connection/__init__.py @@ -15,7 +15,7 @@ __title__ = 'cpl.database.connection' __author__ = 'Sven Heidemann' __license__ = 'MIT' __copyright__ = 'Copyright (c) 2020 - 2021 sh-edraft.de' -__version__ = '2021.4.1.post7' +__version__ = '2021.4.1.post8' 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='2021', minor='04', micro='01-7') +version_info = VersionInfo(major='2021', minor='04', micro='01-8') diff --git a/src/cpl/database/context/__init__.py b/src/cpl/database/context/__init__.py index 8bb766de..29897b45 100644 --- a/src/cpl/database/context/__init__.py +++ b/src/cpl/database/context/__init__.py @@ -15,7 +15,7 @@ __title__ = 'cpl.database.context' __author__ = 'Sven Heidemann' __license__ = 'MIT' __copyright__ = 'Copyright (c) 2020 - 2021 sh-edraft.de' -__version__ = '2021.4.1.post7' +__version__ = '2021.4.1.post8' 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='2021', minor='04', micro='01-7') +version_info = VersionInfo(major='2021', minor='04', micro='01-8') diff --git a/src/cpl/dependency_injection/__init__.py b/src/cpl/dependency_injection/__init__.py index 1f46ed97..3e958346 100644 --- a/src/cpl/dependency_injection/__init__.py +++ b/src/cpl/dependency_injection/__init__.py @@ -15,7 +15,7 @@ __title__ = 'cpl.dependency_injection' __author__ = 'Sven Heidemann' __license__ = 'MIT' __copyright__ = 'Copyright (c) 2020 - 2021 sh-edraft.de' -__version__ = '2021.4.1.post7' +__version__ = '2021.4.1.post8' from collections import namedtuple @@ -25,4 +25,4 @@ from .service_provider import ServiceProvider from .service_provider_abc import ServiceProviderABC VersionInfo = namedtuple('VersionInfo', 'major minor micro') -version_info = VersionInfo(major='2021', minor='04', micro='01-7') +version_info = VersionInfo(major='2021', minor='04', micro='01-8') diff --git a/src/cpl/environment/__init__.py b/src/cpl/environment/__init__.py index 8300ad1a..eea5e0c2 100644 --- a/src/cpl/environment/__init__.py +++ b/src/cpl/environment/__init__.py @@ -15,7 +15,7 @@ __title__ = 'cpl.environment' __author__ = 'Sven Heidemann' __license__ = 'MIT' __copyright__ = 'Copyright (c) 2020 - 2021 sh-edraft.de' -__version__ = '2021.4.1.post7' +__version__ = '2021.4.1.post8' 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='2021', minor='04', micro='01-7') +version_info = VersionInfo(major='2021', minor='04', micro='01-8') diff --git a/src/cpl/logging/__init__.py b/src/cpl/logging/__init__.py index 59c18f88..42357acf 100644 --- a/src/cpl/logging/__init__.py +++ b/src/cpl/logging/__init__.py @@ -15,7 +15,7 @@ __title__ = 'cpl.logging' __author__ = 'Sven Heidemann' __license__ = 'MIT' __copyright__ = 'Copyright (c) 2020 - 2021 sh-edraft.de' -__version__ = '2021.4.1.post7' +__version__ = '2021.4.1.post8' 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='2021', minor='04', micro='01-7') +version_info = VersionInfo(major='2021', minor='04', micro='01-8') diff --git a/src/cpl/mailing/__init__.py b/src/cpl/mailing/__init__.py index 6291f080..cde2aa85 100644 --- a/src/cpl/mailing/__init__.py +++ b/src/cpl/mailing/__init__.py @@ -15,7 +15,7 @@ __title__ = 'cpl.mailing' __author__ = 'Sven Heidemann' __license__ = 'MIT' __copyright__ = 'Copyright (c) 2020 - 2021 sh-edraft.de' -__version__ = '2021.4.1.post7' +__version__ = '2021.4.1.post8' 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='2021', minor='04', micro='01-7') +version_info = VersionInfo(major='2021', minor='04', micro='01-8') diff --git a/src/cpl/time/__init__.py b/src/cpl/time/__init__.py index 9d4c6b08..7d9d1894 100644 --- a/src/cpl/time/__init__.py +++ b/src/cpl/time/__init__.py @@ -15,7 +15,7 @@ __title__ = 'cpl.time' __author__ = 'Sven Heidemann' __license__ = 'MIT' __copyright__ = 'Copyright (c) 2020 - 2021 sh-edraft.de' -__version__ = '2021.4.1.post7' +__version__ = '2021.4.1.post8' 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='2021', minor='04', micro='01-7') +version_info = VersionInfo(major='2021', minor='04', micro='01-8') diff --git a/src/cpl/utils/__init__.py b/src/cpl/utils/__init__.py index 3822702c..c9605ffc 100644 --- a/src/cpl/utils/__init__.py +++ b/src/cpl/utils/__init__.py @@ -15,7 +15,7 @@ __title__ = 'cpl.utils' __author__ = 'Sven Heidemann' __license__ = 'MIT' __copyright__ = 'Copyright (c) 2020 - 2021 sh-edraft.de' -__version__ = '2021.4.1.post7' +__version__ = '2021.4.1.post8' 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='2021', minor='04', micro='01-7') +version_info = VersionInfo(major='2021', minor='04', micro='01-8') diff --git a/src/cpl_cli/__init__.py b/src/cpl_cli/__init__.py index 7b7ff09f..62f88bd5 100644 --- a/src/cpl_cli/__init__.py +++ b/src/cpl_cli/__init__.py @@ -15,7 +15,7 @@ __title__ = 'sh_cpl.cpl_cli' __author__ = 'Sven Heidemann' __license__ = 'MIT' __copyright__ = 'Copyright (c) 2020 - 2021 sh-edraft.de' -__version__ = '2021.4.1.post7' +__version__ = '2021.4.1.post8' from collections import namedtuple @@ -29,4 +29,4 @@ from .main import main from .startup import Startup VersionInfo = namedtuple('VersionInfo', 'major minor micro') -version_info = VersionInfo(major='2021', minor='04', micro='01-7') +version_info = VersionInfo(major='2021', minor='04', micro='01-8') diff --git a/src/cpl_cli/appsettings.json b/src/cpl_cli/appsettings.json new file mode 100644 index 00000000..eb80fe1d --- /dev/null +++ b/src/cpl_cli/appsettings.json @@ -0,0 +1,5 @@ +{ + "CLI": { + "PipPath": "https://pip-dev.sh-edraft.de" + } +} \ No newline at end of file diff --git a/src/cpl_cli/cli_settings.py b/src/cpl_cli/cli_settings.py new file mode 100644 index 00000000..9a1f3c45 --- /dev/null +++ b/src/cpl_cli/cli_settings.py @@ -0,0 +1,25 @@ +import traceback +from typing import Optional + +from cpl.configuration.configuration_model_abc import ConfigurationModelABC +from cpl.console import Console +from cpl_cli.cli_settings_name_enum import CLISettingsNameEnum + + +class CLISettings(ConfigurationModelABC): + + def __init__(self): + ConfigurationModelABC.__init__(self) + + self._pip_path: Optional[str] = None + + @property + def pip_path(self) -> str: + return self._pip_path + + def from_dict(self, settings: dict): + try: + self._pip_path = settings[CLISettingsNameEnum.pip_path.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()}') diff --git a/src/cpl_cli/cli_settings_name_enum.py b/src/cpl_cli/cli_settings_name_enum.py new file mode 100644 index 00000000..f7dc8889 --- /dev/null +++ b/src/cpl_cli/cli_settings_name_enum.py @@ -0,0 +1,6 @@ +from enum import Enum + + +class CLISettingsNameEnum(Enum): + + pip_path = 'PipPath' diff --git a/src/cpl_cli/command/__init__.py b/src/cpl_cli/command/__init__.py index 572d7acd..5f9d217e 100644 --- a/src/cpl_cli/command/__init__.py +++ b/src/cpl_cli/command/__init__.py @@ -15,7 +15,7 @@ __title__ = 'cpl_cli.command' __author__ = 'Sven Heidemann' __license__ = 'MIT' __copyright__ = 'Copyright (c) 2020 - 2021 sh-edraft.de' -__version__ = '2021.4.1.post7' +__version__ = '2021.4.1.post8' 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='2021', minor='04', micro='01-7') +version_info = VersionInfo(major='2021', minor='04', micro='01-8') diff --git a/src/cpl_cli/command/install_service.py b/src/cpl_cli/command/install_service.py index f0e18ba7..de041024 100644 --- a/src/cpl_cli/command/install_service.py +++ b/src/cpl_cli/command/install_service.py @@ -9,6 +9,7 @@ from cpl.configuration import ConfigurationABC from cpl.console.console import Console from cpl.console.foreground_color_enum import ForegroundColorEnum from cpl.utils.pip import Pip +from cpl_cli.cli_settings import CLISettings from cpl_cli.command_abc import CommandABC from cpl_cli.configuration import ProjectSettingsNameEnum, VersionSettingsNameEnum, BuildSettingsNameEnum from cpl_cli.configuration.build_settings import BuildSettings @@ -18,7 +19,7 @@ from cpl_cli.error import Error class InstallService(CommandABC): - def __init__(self, runtime: ApplicationRuntimeABC, configuration: ConfigurationABC): + def __init__(self, runtime: ApplicationRuntimeABC, configuration: ConfigurationABC, cli_settings: CLISettings): """ Service for the CLI command install :param runtime: @@ -28,6 +29,7 @@ class InstallService(CommandABC): self._runtime = runtime self._config = configuration + self._cli_settings = cli_settings def _install_project(self): """ @@ -50,7 +52,7 @@ class InstallService(CommandABC): Console.spinner( f'Installing: {dependency}', Pip.install, dependency, - source='https://pip.sh-edraft.de' if 'sh_cpl' in dependency else None, + source=self._cli_settings.pip_path if 'sh_cpl' in dependency else None, stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL, text_foreground_color=ForegroundColorEnum.green, @@ -150,7 +152,7 @@ class InstallService(CommandABC): Console.spinner( f'Installing: {package}', Pip.install, package, - source='https://pip.sh-edraft.de' if 'sh_cpl' in package else None, + source=self._cli_settings.pip_path if 'sh_cpl' in package else None, stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL, text_foreground_color=ForegroundColorEnum.green, diff --git a/src/cpl_cli/command/update_service.py b/src/cpl_cli/command/update_service.py index 419c36a7..8a804864 100644 --- a/src/cpl_cli/command/update_service.py +++ b/src/cpl_cli/command/update_service.py @@ -6,13 +6,14 @@ from cpl.application import ApplicationRuntimeABC from cpl.console import ForegroundColorEnum from cpl.console.console import Console from cpl.utils.pip import Pip +from cpl_cli.cli_settings import CLISettings from cpl_cli.command_abc import CommandABC from cpl_cli.configuration.project_settings import ProjectSettings class UpdateService(CommandABC): - def __init__(self, runtime: ApplicationRuntimeABC, project_settings: ProjectSettings): + def __init__(self, runtime: ApplicationRuntimeABC, project_settings: ProjectSettings, cli_settings: CLISettings): """ Service for the CLI command update :param runtime: @@ -22,6 +23,7 @@ class UpdateService(CommandABC): self._runtime = runtime self._project_settings = project_settings + self._cli_settings = cli_settings def _update_project_dependencies(self): """ @@ -38,7 +40,7 @@ class UpdateService(CommandABC): '--upgrade', '--upgrade-strategy', 'eager', - source='https://pip.sh-edraft.de' if 'sh_cpl' in name else None, + source=self._cli_settings.pip_path if 'sh_cpl' in name else None, stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL ) diff --git a/src/cpl_cli/configuration/__init__.py b/src/cpl_cli/configuration/__init__.py index c6d6ce9c..6a6afc74 100644 --- a/src/cpl_cli/configuration/__init__.py +++ b/src/cpl_cli/configuration/__init__.py @@ -15,7 +15,7 @@ __title__ = 'cpl_cli.configuration' __author__ = 'Sven Heidemann' __license__ = 'MIT' __copyright__ = 'Copyright (c) 2020 - 2021 sh-edraft.de' -__version__ = '2021.4.1.post7' +__version__ = '2021.4.1.post8' from collections import namedtuple @@ -28,4 +28,4 @@ from .version_settings import VersionSettings from .version_settings_name_enum import VersionSettingsNameEnum VersionInfo = namedtuple('VersionInfo', 'major minor micro') -version_info = VersionInfo(major='2021', minor='04', micro='01-7') +version_info = VersionInfo(major='2021', minor='04', micro='01-8') diff --git a/src/cpl_cli/live_server/__init__.py b/src/cpl_cli/live_server/__init__.py index 0740f04a..400d5f09 100644 --- a/src/cpl_cli/live_server/__init__.py +++ b/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 - 2021 sh-edraft.de' -__version__ = '2021.4.1.post7' +__version__ = '2021.4.1.post8' from collections import namedtuple # imports: VersionInfo = namedtuple('VersionInfo', 'major minor micro') -version_info = VersionInfo(major='2021', minor='04', micro='01-7') +version_info = VersionInfo(major='2021', minor='04', micro='01-8') diff --git a/src/cpl_cli/publish/__init__.py b/src/cpl_cli/publish/__init__.py index c81ffc89..fd98c2b8 100644 --- a/src/cpl_cli/publish/__init__.py +++ b/src/cpl_cli/publish/__init__.py @@ -15,7 +15,7 @@ __title__ = 'cpl_cli.publish' __author__ = 'Sven Heidemann' __license__ = 'MIT' __copyright__ = 'Copyright (c) 2020 - 2021 sh-edraft.de' -__version__ = '2021.4.1.post7' +__version__ = '2021.4.1.post8' 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='2021', minor='04', micro='01-7') +version_info = VersionInfo(major='2021', minor='04', micro='01-8') diff --git a/src/cpl_cli/startup.py b/src/cpl_cli/startup.py index 5661e813..b7dc8e7c 100644 --- a/src/cpl_cli/startup.py +++ b/src/cpl_cli/startup.py @@ -47,6 +47,8 @@ class Startup(StartupABC): self._configuration.add_environment_variables('PYTHON_') self._configuration.add_environment_variables('CPL_') self._configuration.add_json_file('cpl.json', optional=True, output=False) + self._configuration.add_json_file('appsettings.json', path=self._app_host.application_runtime.runtime_directory, + optional=False, output=False) self._configuration.add_console_argument(ConsoleArgument('', 'build', ['b', 'B'], '')) self._configuration.add_console_argument(ConsoleArgument('', 'generate', ['g', 'G'], '', console_arguments=[ ConsoleArgument('', 'abc', ['a', 'A'], ' '), diff --git a/src/cpl_cli/templates/__init__.py b/src/cpl_cli/templates/__init__.py index 0af944eb..e5cac886 100644 --- a/src/cpl_cli/templates/__init__.py +++ b/src/cpl_cli/templates/__init__.py @@ -15,11 +15,11 @@ __title__ = 'cpl_cli.templates' __author__ = 'Sven Heidemann' __license__ = 'MIT' __copyright__ = 'Copyright (c) 2020 - 2021 sh-edraft.de' -__version__ = '2021.4.1.post7' +__version__ = '2021.4.1.post8' from collections import namedtuple # imports: VersionInfo = namedtuple('VersionInfo', 'major minor micro') -version_info = VersionInfo(major='2021', minor='04', micro='01-7') +version_info = VersionInfo(major='2021', minor='04', micro='01-8') diff --git a/src/cpl_cli/templates/build/__init__.py b/src/cpl_cli/templates/build/__init__.py index a9eb3fa1..d8689dc8 100644 --- a/src/cpl_cli/templates/build/__init__.py +++ b/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 - 2021 sh-edraft.de' -__version__ = '2021.4.1.post7' +__version__ = '2021.4.1.post8' from collections import namedtuple # imports: VersionInfo = namedtuple('VersionInfo', 'major minor micro') -version_info = VersionInfo(major='2021', minor='04', micro='01-7') +version_info = VersionInfo(major='2021', minor='04', micro='01-8') diff --git a/src/cpl_cli/templates/generate/__init__.py b/src/cpl_cli/templates/generate/__init__.py index e0f8cbf8..bb62d502 100644 --- a/src/cpl_cli/templates/generate/__init__.py +++ b/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 - 2021 sh-edraft.de' -__version__ = '2021.4.1.post7' +__version__ = '2021.4.1.post8' from collections import namedtuple # imports: VersionInfo = namedtuple('VersionInfo', 'major minor micro') -version_info = VersionInfo(major='2021', minor='04', micro='01-7') +version_info = VersionInfo(major='2021', minor='04', micro='01-8') diff --git a/src/cpl_cli/templates/new/__init__.py b/src/cpl_cli/templates/new/__init__.py index 41319c9d..9fe3625f 100644 --- a/src/cpl_cli/templates/new/__init__.py +++ b/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 - 2021 sh-edraft.de' -__version__ = '2021.4.1.post7' +__version__ = '2021.4.1.post8' from collections import namedtuple # imports: VersionInfo = namedtuple('VersionInfo', 'major minor micro') -version_info = VersionInfo(major='2021', minor='04', micro='01-7') +version_info = VersionInfo(major='2021', minor='04', micro='01-8') diff --git a/src/cpl_cli/templates/new/console/__init__.py b/src/cpl_cli/templates/new/console/__init__.py index 23bc458c..ecd34aff 100644 --- a/src/cpl_cli/templates/new/console/__init__.py +++ b/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 - 2021 sh-edraft.de' -__version__ = '2021.4.1.post7' +__version__ = '2021.4.1.post8' from collections import namedtuple # imports: VersionInfo = namedtuple('VersionInfo', 'major minor micro') -version_info = VersionInfo(major='2021', minor='04', micro='01-7') +version_info = VersionInfo(major='2021', minor='04', micro='01-8') diff --git a/src/cpl_cli/templates/new/console/src/__init__.py b/src/cpl_cli/templates/new/console/src/__init__.py index 05634d82..28c4e324 100644 --- a/src/cpl_cli/templates/new/console/src/__init__.py +++ b/src/cpl_cli/templates/new/console/src/__init__.py @@ -15,11 +15,11 @@ __title__ = 'cpl_cli.templates.new.console.src' __author__ = 'Sven Heidemann' __license__ = 'MIT' __copyright__ = 'Copyright (c) 2020 - 2021 sh-edraft.de' -__version__ = '2021.4.1.post7' +__version__ = '2021.4.1.post8' from collections import namedtuple # imports: VersionInfo = namedtuple('VersionInfo', 'major minor micro') -version_info = VersionInfo(major='2021', minor='04', micro='01-7') +version_info = VersionInfo(major='2021', minor='04', micro='01-8') diff --git a/src/cpl_cli/templates/new/console/src/tests/__init__.py b/src/cpl_cli/templates/new/console/src/tests/__init__.py index b25d6ad9..caafc8ba 100644 --- a/src/cpl_cli/templates/new/console/src/tests/__init__.py +++ b/src/cpl_cli/templates/new/console/src/tests/__init__.py @@ -15,11 +15,11 @@ __title__ = 'cpl_cli.templates.new.console.src.tests' __author__ = 'Sven Heidemann' __license__ = 'MIT' __copyright__ = 'Copyright (c) 2020 - 2021 sh-edraft.de' -__version__ = '2021.4.1.post7' +__version__ = '2021.4.1.post8' from collections import namedtuple # imports: VersionInfo = namedtuple('VersionInfo', 'major minor micro') -version_info = VersionInfo(major='2021', minor='04', micro='01-7') +version_info = VersionInfo(major='2021', minor='04', micro='01-8') diff --git a/src/cpl_cli/templates/publish/__init__.py b/src/cpl_cli/templates/publish/__init__.py index 4c6f06ca..3b7e6f56 100644 --- a/src/cpl_cli/templates/publish/__init__.py +++ b/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 - 2021 sh-edraft.de' -__version__ = '2021.4.1.post7' +__version__ = '2021.4.1.post8' from collections import namedtuple # imports: VersionInfo = namedtuple('VersionInfo', 'major minor micro') -version_info = VersionInfo(major='2021', minor='04', micro='01-7') +version_info = VersionInfo(major='2021', minor='04', micro='01-8') diff --git a/src/tests/custom/general/cpl.json b/src/tests/custom/general/cpl.json index 83d5c6fc..c8ea8b90 100644 --- a/src/tests/custom/general/cpl.json +++ b/src/tests/custom/general/cpl.json @@ -16,7 +16,7 @@ "LicenseName": "MIT", "LicenseDescription": "MIT, see LICENSE for more details.", "Dependencies": [ - "sh_cpl==2021.4.1.post1" + "sh_cpl==2021.4.1.post7" ], "PythonVersion": ">=3.8", "PythonPath": "../../../../cpl-env/bin/python3.9",