From c41e3c0d780eb429d0ea70b2aaced34f394870c7 Mon Sep 17 00:00:00 2001 From: Sven Heidemann Date: Sun, 14 Mar 2021 14:47:53 +0100 Subject: [PATCH] Bugfixes --- cpl.json | 2 +- src/cpl/__init__.py | 4 +- src/cpl/application/__init__.py | 4 +- src/cpl/configuration/__init__.py | 4 +- src/cpl/console/__init__.py | 4 +- src/cpl/database/__init__.py | 4 +- src/cpl/database/connection/__init__.py | 4 +- src/cpl/database/context/__init__.py | 4 +- src/cpl/dependency_injection/__init__.py | 4 +- src/cpl/environment/__init__.py | 4 +- src/cpl/logging/__init__.py | 4 +- src/cpl/mailing/__init__.py | 4 +- src/cpl/time/__init__.py | 4 +- src/cpl/utils/__init__.py | 4 +- src/cpl/utils/pip.py | 2 +- src/cpl_cli/__init__.py | 4 +- src/cpl_cli/command/__init__.py | 4 +- src/cpl_cli/command/install_service.py | 39 +++++++++++++++++-- src/cpl_cli/configuration/__init__.py | 4 +- src/cpl_cli/configuration/project_settings.py | 12 ++++-- src/cpl_cli/live_server/__init__.py | 4 +- src/cpl_cli/publish/__init__.py | 4 +- src/cpl_cli/publish/publisher_service.py | 2 +- src/cpl_cli/templates/__init__.py | 4 +- src/cpl_cli/templates/build/__init__.py | 4 +- src/cpl_cli/templates/generate/__init__.py | 4 +- src/cpl_cli/templates/new/__init__.py | 4 +- src/cpl_cli/templates/new/console/__init__.py | 4 +- .../templates/new/console/src/__init__.py | 4 +- .../new/console/src/tests/__init__.py | 4 +- src/cpl_cli/templates/publish/__init__.py | 4 +- src/tests/custom/general/cpl.json | 4 +- 32 files changed, 101 insertions(+), 64 deletions(-) diff --git a/cpl.json b/cpl.json index ff8a2712..64ff763f 100644 --- a/cpl.json +++ b/cpl.json @@ -4,7 +4,7 @@ "Version": { "Major": "2021", "Minor": "04", - "Micro": "01-2" + "Micro": "01" }, "Author": "Sven Heidemann", "AuthorEmail": "sven.heidemann@sh-edraft.de", diff --git a/src/cpl/__init__.py b/src/cpl/__init__.py index f635882f..14434404 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.post2' +__version__ = '2021.4.1' from collections import namedtuple # imports: VersionInfo = namedtuple('VersionInfo', 'major minor micro') -version_info = VersionInfo(major='2021', minor='04', micro='01-2') +version_info = VersionInfo(major='2021', minor='04', micro='01') diff --git a/src/cpl/application/__init__.py b/src/cpl/application/__init__.py index 093d6cce..47efa3d1 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.post2' +__version__ = '2021.4.1' 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-2') +version_info = VersionInfo(major='2021', minor='04', micro='01') diff --git a/src/cpl/configuration/__init__.py b/src/cpl/configuration/__init__.py index dd9641f3..10891b6b 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.post2' +__version__ = '2021.4.1' 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-2') +version_info = VersionInfo(major='2021', minor='04', micro='01') diff --git a/src/cpl/console/__init__.py b/src/cpl/console/__init__.py index 0b52dde4..94c15d47 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.post2' +__version__ = '2021.4.1' 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-2') +version_info = VersionInfo(major='2021', minor='04', micro='01') diff --git a/src/cpl/database/__init__.py b/src/cpl/database/__init__.py index 526eaa3e..05936df9 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.post2' +__version__ = '2021.4.1' 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-2') +version_info = VersionInfo(major='2021', minor='04', micro='01') diff --git a/src/cpl/database/connection/__init__.py b/src/cpl/database/connection/__init__.py index 86b03771..4483ef25 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.post2' +__version__ = '2021.4.1' 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-2') +version_info = VersionInfo(major='2021', minor='04', micro='01') diff --git a/src/cpl/database/context/__init__.py b/src/cpl/database/context/__init__.py index 951013c1..3fd6c861 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.post2' +__version__ = '2021.4.1' 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-2') +version_info = VersionInfo(major='2021', minor='04', micro='01') diff --git a/src/cpl/dependency_injection/__init__.py b/src/cpl/dependency_injection/__init__.py index ce2a7b9f..21a9fdec 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.post2' +__version__ = '2021.4.1' 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-2') +version_info = VersionInfo(major='2021', minor='04', micro='01') diff --git a/src/cpl/environment/__init__.py b/src/cpl/environment/__init__.py index 7772b3fa..9aa7e721 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.post2' +__version__ = '2021.4.1' 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-2') +version_info = VersionInfo(major='2021', minor='04', micro='01') diff --git a/src/cpl/logging/__init__.py b/src/cpl/logging/__init__.py index 228dfc59..55138ef7 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.post2' +__version__ = '2021.4.1' 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-2') +version_info = VersionInfo(major='2021', minor='04', micro='01') diff --git a/src/cpl/mailing/__init__.py b/src/cpl/mailing/__init__.py index 8c3093c9..20b9f09f 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.post2' +__version__ = '2021.4.1' 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-2') +version_info = VersionInfo(major='2021', minor='04', micro='01') diff --git a/src/cpl/time/__init__.py b/src/cpl/time/__init__.py index 08521ee1..ed500655 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.post2' +__version__ = '2021.4.1' 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-2') +version_info = VersionInfo(major='2021', minor='04', micro='01') diff --git a/src/cpl/utils/__init__.py b/src/cpl/utils/__init__.py index 2cb94a22..bb34377f 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.post2' +__version__ = '2021.4.1' 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-2') +version_info = VersionInfo(major='2021', minor='04', micro='01') diff --git a/src/cpl/utils/pip.py b/src/cpl/utils/pip.py index 92f1a728..e2b131e8 100644 --- a/src/cpl/utils/pip.py +++ b/src/cpl/utils/pip.py @@ -55,7 +55,7 @@ class Pip: return subprocess.check_output([cls._executable, "-m", "pip", "list", "--outdated"]) @classmethod - def install(cls, package: str, *args, source: str = None, stdout=None, stderr=None, admin=None): + def install(cls, package: str, *args, source: str = None, stdout=None, stderr=None): pip_args = [cls._executable, "-m", "pip", "install"] for arg in args: diff --git a/src/cpl_cli/__init__.py b/src/cpl_cli/__init__.py index 715a03a5..7b2cabd9 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.post2' +__version__ = '2021.4.1' 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-2') +version_info = VersionInfo(major='2021', minor='04', micro='01') diff --git a/src/cpl_cli/command/__init__.py b/src/cpl_cli/command/__init__.py index d5e20e6b..756630f4 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.post2' +__version__ = '2021.4.1' 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-2') +version_info = VersionInfo(major='2021', minor='04', micro='01') diff --git a/src/cpl_cli/command/install_service.py b/src/cpl_cli/command/install_service.py index 6a556658..413ae535 100644 --- a/src/cpl_cli/command/install_service.py +++ b/src/cpl_cli/command/install_service.py @@ -2,6 +2,8 @@ import json import os import subprocess +from packaging import version + from cpl.application import ApplicationRuntimeABC from cpl.configuration import ConfigurationABC from cpl.console.console import Console @@ -63,7 +65,9 @@ class InstallService(CommandABC): ProjectSettingsNameEnum.license_name.value: project.license_name, ProjectSettingsNameEnum.license_description.value: project.license_description, ProjectSettingsNameEnum.dependencies.value: project.dependencies, - ProjectSettingsNameEnum.python_version.value: project.python_version + ProjectSettingsNameEnum.python_version.value: project.python_version, + ProjectSettingsNameEnum.python_path.value: project.python_path, + ProjectSettingsNameEnum.classifiers.value: project.classifiers } @staticmethod @@ -93,24 +97,51 @@ class InstallService(CommandABC): Error.error('Found invalid dependencies in cpl.json.') return - old_package = Pip.get_package(package) + package_version = '' + name = '' + if '==' in package: + name = package.split('==')[0] + package_version = package.split('==')[1] + to_remove_list = [] for dependency in project.dependencies: + dependency_version = '' + + if '==' in dependency: + dependency_version = dependency.split('==')[1] + + if version.parse(package_version) != version.parse(dependency_version): + to_remove_list.append(dependency) + break + if package in dependency: is_already_in_project = True - if old_package is not None and old_package in project.dependencies or is_already_in_project: - Error.warn(f'Package {old_package} is already installed.') + for to_remove in to_remove_list: + project.dependencies.remove(to_remove) + + local_package = Pip.get_package(package) + if local_package is not None and local_package in project.dependencies: + Error.warn(f'Package {local_package} is already installed.') + return + + elif is_already_in_project: + Error.warn(f'Package {package} is already installed.') return Console.spinner( f'Installing: {package}', Pip.install, package, + source='https://pip.sh-edraft.de' if 'sh_cpl' in package else None, stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL, text_foreground_color=ForegroundColorEnum.green, spinner_foreground_color=ForegroundColorEnum.cyan ) + new_package = Pip.get_package(name) + if new_package is None: + Console.error(f'Installation of package {package} failed') + return if not is_already_in_project: new_package = Pip.get_package(package) diff --git a/src/cpl_cli/configuration/__init__.py b/src/cpl_cli/configuration/__init__.py index 3116d8c4..7a0aa85a 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.post2' +__version__ = '2021.4.1' 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-2') +version_info = VersionInfo(major='2021', minor='04', micro='01') diff --git a/src/cpl_cli/configuration/project_settings.py b/src/cpl_cli/configuration/project_settings.py index 4a3d096a..1cd0d4f9 100644 --- a/src/cpl_cli/configuration/project_settings.py +++ b/src/cpl_cli/configuration/project_settings.py @@ -8,6 +8,7 @@ from cpl.console.console import Console from cpl.console.foreground_color_enum import ForegroundColorEnum from cpl_cli.configuration.version_settings import VersionSettings from cpl_cli.configuration.project_settings_name_enum import ProjectSettingsNameEnum +from cpl_cli.error import Error class ProjectSettings(ConfigurationModelABC): @@ -107,11 +108,16 @@ class ProjectSettings(ConfigurationModelABC): self._dependencies = settings[ProjectSettingsNameEnum.dependencies.value] self._python_version = settings[ProjectSettingsNameEnum.python_version.value] - path = os.path.abspath(settings[ProjectSettingsNameEnum.python_path.value]) - if os.path.isfile(path) or os.path.islink(path): - path = os.path.abspath(path) + if ProjectSettingsNameEnum.python_path.value in settings: + path = os.path.abspath(settings[ProjectSettingsNameEnum.python_path.value]) + if os.path.isfile(path) or os.path.islink(path): + path = os.path.abspath(path) + else: + path = sys.executable + Error.warn(f'{ProjectSettingsNameEnum.python_path.value} not found') else: path = sys.executable + Error.warn(f'{ProjectSettingsNameEnum.python_path.value} not found') self._python_path = path diff --git a/src/cpl_cli/live_server/__init__.py b/src/cpl_cli/live_server/__init__.py index 95fb0adf..35541bfa 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.post2' +__version__ = '2021.4.1' from collections import namedtuple # imports: VersionInfo = namedtuple('VersionInfo', 'major minor micro') -version_info = VersionInfo(major='2021', minor='04', micro='01-2') +version_info = VersionInfo(major='2021', minor='04', micro='01') diff --git a/src/cpl_cli/publish/__init__.py b/src/cpl_cli/publish/__init__.py index c0323c12..0793f6ec 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.post2' +__version__ = '2021.4.1' 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-2') +version_info = VersionInfo(major='2021', minor='04', micro='01') diff --git a/src/cpl_cli/publish/publisher_service.py b/src/cpl_cli/publish/publisher_service.py index 656f769f..f7420e95 100644 --- a/src/cpl_cli/publish/publisher_service.py +++ b/src/cpl_cli/publish/publisher_service.py @@ -317,4 +317,4 @@ class PublisherService(PublisherABC): Console.spinner('Generating setup.py:', self._create_setup, text_foreground_color=ForegroundColorEnum.green, spinner_foreground_color=ForegroundColorEnum.blue) Console.write_line('Running setup.py:\n') self._run_setup() - Console.spinner('Cleaning dist path:', self._clean_dist_files) + Console.spinner('Cleaning dist path:', self._clean_dist_files, text_foreground_color=ForegroundColorEnum.green, spinner_foreground_color=ForegroundColorEnum.blue) diff --git a/src/cpl_cli/templates/__init__.py b/src/cpl_cli/templates/__init__.py index 21b9a9ba..39080a91 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.post2' +__version__ = '2021.4.1' from collections import namedtuple # imports: VersionInfo = namedtuple('VersionInfo', 'major minor micro') -version_info = VersionInfo(major='2021', minor='04', micro='01-2') +version_info = VersionInfo(major='2021', minor='04', micro='01') diff --git a/src/cpl_cli/templates/build/__init__.py b/src/cpl_cli/templates/build/__init__.py index 11ee4828..d4582409 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.post2' +__version__ = '2021.4.1' from collections import namedtuple # imports: VersionInfo = namedtuple('VersionInfo', 'major minor micro') -version_info = VersionInfo(major='2021', minor='04', micro='01-2') +version_info = VersionInfo(major='2021', minor='04', micro='01') diff --git a/src/cpl_cli/templates/generate/__init__.py b/src/cpl_cli/templates/generate/__init__.py index 9ba82914..2d9559ab 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.post2' +__version__ = '2021.4.1' from collections import namedtuple # imports: VersionInfo = namedtuple('VersionInfo', 'major minor micro') -version_info = VersionInfo(major='2021', minor='04', micro='01-2') +version_info = VersionInfo(major='2021', minor='04', micro='01') diff --git a/src/cpl_cli/templates/new/__init__.py b/src/cpl_cli/templates/new/__init__.py index 1c63be6d..6bf0494e 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.post2' +__version__ = '2021.4.1' from collections import namedtuple # imports: VersionInfo = namedtuple('VersionInfo', 'major minor micro') -version_info = VersionInfo(major='2021', minor='04', micro='01-2') +version_info = VersionInfo(major='2021', minor='04', micro='01') diff --git a/src/cpl_cli/templates/new/console/__init__.py b/src/cpl_cli/templates/new/console/__init__.py index 7ea57711..732d272a 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.post2' +__version__ = '2021.4.1' from collections import namedtuple # imports: VersionInfo = namedtuple('VersionInfo', 'major minor micro') -version_info = VersionInfo(major='2021', minor='04', micro='01-2') +version_info = VersionInfo(major='2021', minor='04', micro='01') diff --git a/src/cpl_cli/templates/new/console/src/__init__.py b/src/cpl_cli/templates/new/console/src/__init__.py index 3f5c9121..b79ec50a 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.post2' +__version__ = '2021.4.1' from collections import namedtuple # imports: VersionInfo = namedtuple('VersionInfo', 'major minor micro') -version_info = VersionInfo(major='2021', minor='04', micro='01-2') +version_info = VersionInfo(major='2021', minor='04', micro='01') 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 c2d35636..68d50051 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.post2' +__version__ = '2021.4.1' from collections import namedtuple # imports: VersionInfo = namedtuple('VersionInfo', 'major minor micro') -version_info = VersionInfo(major='2021', minor='04', micro='01-2') +version_info = VersionInfo(major='2021', minor='04', micro='01') diff --git a/src/cpl_cli/templates/publish/__init__.py b/src/cpl_cli/templates/publish/__init__.py index 5e2563fe..4b7559f8 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.post2' +__version__ = '2021.4.1' from collections import namedtuple # imports: VersionInfo = namedtuple('VersionInfo', 'major minor micro') -version_info = VersionInfo(major='2021', minor='04', micro='01-2') +version_info = VersionInfo(major='2021', minor='04', micro='01') diff --git a/src/tests/custom/general/cpl.json b/src/tests/custom/general/cpl.json index 393726a0..21cd45ee 100644 --- a/src/tests/custom/general/cpl.json +++ b/src/tests/custom/general/cpl.json @@ -16,10 +16,10 @@ "LicenseName": "MIT", "LicenseDescription": "MIT, see LICENSE for more details.", "Dependencies": [ - "sh_cpl==2021.4.1.post2" + "sh_cpl==2021.4.1" ], "PythonVersion": ">=3.8", - "PythonPath": "../../../../cpl-env/bin/python3.9", + "PythonPath": "/home/sven/Nextcloud_Sven/Schreibtisch/git_sh-edraft_de/sh_common_py_lib/cpl-env/bin/python3.9", "Classifiers": [] }, "BuildSettings": {