From 5008594c27f06ced5598b3d05abd353025ce0236 Mon Sep 17 00:00:00 2001 From: Sven Heidemann Date: Sun, 14 Mar 2021 11:27:01 +0100 Subject: [PATCH] Bugfixes --- src/cpl/__init__.py | 2 +- src/cpl/application/__init__.py | 2 +- src/cpl/configuration/__init__.py | 2 +- src/cpl/console/__init__.py | 2 +- src/cpl/database/__init__.py | 2 +- src/cpl/database/connection/__init__.py | 2 +- src/cpl/database/context/__init__.py | 2 +- src/cpl/dependency_injection/__init__.py | 2 +- src/cpl/environment/__init__.py | 2 +- src/cpl/logging/__init__.py | 2 +- src/cpl/mailing/__init__.py | 2 +- src/cpl/time/__init__.py | 2 +- src/cpl/utils/__init__.py | 2 +- src/cpl_cli/__init__.py | 2 +- src/cpl_cli/command/__init__.py | 2 +- src/cpl_cli/command/new_service.py | 9 ++++++++- src/cpl_cli/configuration/__init__.py | 2 +- src/cpl_cli/live_server/__init__.py | 2 +- src/cpl_cli/publish/__init__.py | 2 +- src/cpl_cli/publish/publisher_service.py | 6 ++---- src/cpl_cli/templates/__init__.py | 2 +- src/cpl_cli/templates/build/__init__.py | 2 +- src/cpl_cli/templates/generate/__init__.py | 2 +- src/cpl_cli/templates/new/__init__.py | 2 +- src/cpl_cli/templates/new/console/__init__.py | 2 +- src/cpl_cli/templates/new/console/src/__init__.py | 2 +- src/cpl_cli/templates/new/console/src/tests/__init__.py | 2 +- src/cpl_cli/templates/publish/__init__.py | 2 +- 28 files changed, 36 insertions(+), 31 deletions(-) diff --git a/src/cpl/__init__.py b/src/cpl/__init__.py index b8c4d510..14434404 100644 --- a/src/cpl/__init__.py +++ b/src/cpl/__init__.py @@ -15,7 +15,7 @@ __title__ = 'sh_cpl.cpl' __author__ = 'Sven Heidemann' __license__ = 'MIT' __copyright__ = 'Copyright (c) 2020 - 2021 sh-edraft.de' -__version__ = '2021.04.01' +__version__ = '2021.4.1' from collections import namedtuple diff --git a/src/cpl/application/__init__.py b/src/cpl/application/__init__.py index 7c0f3b11..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.04.01' +__version__ = '2021.4.1' from collections import namedtuple diff --git a/src/cpl/configuration/__init__.py b/src/cpl/configuration/__init__.py index 9487946b..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.04.01' +__version__ = '2021.4.1' from collections import namedtuple diff --git a/src/cpl/console/__init__.py b/src/cpl/console/__init__.py index 47bd5470..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.04.01' +__version__ = '2021.4.1' from collections import namedtuple diff --git a/src/cpl/database/__init__.py b/src/cpl/database/__init__.py index 0ec92537..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.04.01' +__version__ = '2021.4.1' from collections import namedtuple diff --git a/src/cpl/database/connection/__init__.py b/src/cpl/database/connection/__init__.py index 54c07240..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.04.01' +__version__ = '2021.4.1' from collections import namedtuple diff --git a/src/cpl/database/context/__init__.py b/src/cpl/database/context/__init__.py index ca3ba079..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.04.01' +__version__ = '2021.4.1' from collections import namedtuple diff --git a/src/cpl/dependency_injection/__init__.py b/src/cpl/dependency_injection/__init__.py index 3b075210..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.04.01' +__version__ = '2021.4.1' from collections import namedtuple diff --git a/src/cpl/environment/__init__.py b/src/cpl/environment/__init__.py index 3c475949..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.04.01' +__version__ = '2021.4.1' from collections import namedtuple diff --git a/src/cpl/logging/__init__.py b/src/cpl/logging/__init__.py index a7b2c0c8..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.04.01' +__version__ = '2021.4.1' from collections import namedtuple diff --git a/src/cpl/mailing/__init__.py b/src/cpl/mailing/__init__.py index 7cbbc605..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.04.01' +__version__ = '2021.4.1' from collections import namedtuple diff --git a/src/cpl/time/__init__.py b/src/cpl/time/__init__.py index a65531ce..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.04.01' +__version__ = '2021.4.1' from collections import namedtuple diff --git a/src/cpl/utils/__init__.py b/src/cpl/utils/__init__.py index 8a679a73..3f4cff15 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.04.01' +__version__ = '2021.4.1' from collections import namedtuple diff --git a/src/cpl_cli/__init__.py b/src/cpl_cli/__init__.py index c149c868..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.04.01' +__version__ = '2021.4.1' from collections import namedtuple diff --git a/src/cpl_cli/command/__init__.py b/src/cpl_cli/command/__init__.py index 4a90e859..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.04.01' +__version__ = '2021.4.1' from collections import namedtuple diff --git a/src/cpl_cli/command/new_service.py b/src/cpl_cli/command/new_service.py index b5547179..c680b2d8 100644 --- a/src/cpl_cli/command/new_service.py +++ b/src/cpl_cli/command/new_service.py @@ -4,6 +4,10 @@ import sys import time from typing import Optional +from packaging import version + +import cpl + from cpl.application.application_runtime_abc import ApplicationRuntimeABC from cpl.configuration.configuration_abc import ConfigurationABC from cpl.console.foreground_color_enum import ForegroundColorEnum @@ -59,7 +63,9 @@ class NewService(CommandABC): ProjectSettingsNameEnum.copyright_name.value: '', ProjectSettingsNameEnum.license_name.value: '', ProjectSettingsNameEnum.license_description.value: '', - ProjectSettingsNameEnum.dependencies.value: [], + ProjectSettingsNameEnum.dependencies.value: [ + f'sh_cpl=={version.parse(cpl.__version__)}' + ], ProjectSettingsNameEnum.python_version.value: f'>={sys.version.split(" ")[0]}' } @@ -163,6 +169,7 @@ class NewService(CommandABC): self._create_project_settings(name) self._create_build_settings() + self._create_project_json() path = self._get_project_path() if path is None: return diff --git a/src/cpl_cli/configuration/__init__.py b/src/cpl_cli/configuration/__init__.py index 00b74d0f..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.04.01' +__version__ = '2021.4.1' from collections import namedtuple diff --git a/src/cpl_cli/live_server/__init__.py b/src/cpl_cli/live_server/__init__.py index 86f650a0..35541bfa 100644 --- a/src/cpl_cli/live_server/__init__.py +++ b/src/cpl_cli/live_server/__init__.py @@ -15,7 +15,7 @@ __title__ = 'cpl_cli.live_server' __author__ = 'Sven Heidemann' __license__ = 'MIT' __copyright__ = 'Copyright (c) 2020 - 2021 sh-edraft.de' -__version__ = '2021.04.01' +__version__ = '2021.4.1' from collections import namedtuple diff --git a/src/cpl_cli/publish/__init__.py b/src/cpl_cli/publish/__init__.py index bbe10172..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.04.01' +__version__ = '2021.4.1' from collections import namedtuple diff --git a/src/cpl_cli/publish/publisher_service.py b/src/cpl_cli/publish/publisher_service.py index a29a510a..8a080850 100644 --- a/src/cpl_cli/publish/publisher_service.py +++ b/src/cpl_cli/publish/publisher_service.py @@ -4,6 +4,7 @@ import shutil from string import Template as stringTemplate import setuptools +from packaging import version from setuptools import sandbox from cpl.application.application_runtime_abc import ApplicationRuntimeABC @@ -107,9 +108,6 @@ class PublisherService(PublisherABC): elif os.path.isfile(rel_path): self._included_files.append(rel_path) - #else: - # Console.error(f'Path not found: {rel_path}') - for r, d, f in os.walk(self._build_settings.source_path): for file in f: relative_path = os.path.relpath(r) @@ -167,7 +165,7 @@ class PublisherService(PublisherABC): LicenseDescription=self._project_settings.license_description, Title=title if title is not None and title != '' else self._project_settings.name, Author=self._project_settings.author, - Version=self._project_settings.version.to_str(), + Version=version.parse(self._project_settings.version.to_str()), Major=self._project_settings.version.major, Minor=self._project_settings.version.minor, Micro=self._project_settings.version.micro, diff --git a/src/cpl_cli/templates/__init__.py b/src/cpl_cli/templates/__init__.py index d0d9b15e..39080a91 100644 --- a/src/cpl_cli/templates/__init__.py +++ b/src/cpl_cli/templates/__init__.py @@ -15,7 +15,7 @@ __title__ = 'cpl_cli.templates' __author__ = 'Sven Heidemann' __license__ = 'MIT' __copyright__ = 'Copyright (c) 2020 - 2021 sh-edraft.de' -__version__ = '2021.04.01' +__version__ = '2021.4.1' from collections import namedtuple diff --git a/src/cpl_cli/templates/build/__init__.py b/src/cpl_cli/templates/build/__init__.py index 2d5e70cf..d4582409 100644 --- a/src/cpl_cli/templates/build/__init__.py +++ b/src/cpl_cli/templates/build/__init__.py @@ -15,7 +15,7 @@ __title__ = 'cpl_cli.templates.build' __author__ = 'Sven Heidemann' __license__ = 'MIT' __copyright__ = 'Copyright (c) 2020 - 2021 sh-edraft.de' -__version__ = '2021.04.01' +__version__ = '2021.4.1' from collections import namedtuple diff --git a/src/cpl_cli/templates/generate/__init__.py b/src/cpl_cli/templates/generate/__init__.py index 9a5b765e..2d9559ab 100644 --- a/src/cpl_cli/templates/generate/__init__.py +++ b/src/cpl_cli/templates/generate/__init__.py @@ -15,7 +15,7 @@ __title__ = 'cpl_cli.templates.generate' __author__ = 'Sven Heidemann' __license__ = 'MIT' __copyright__ = 'Copyright (c) 2020 - 2021 sh-edraft.de' -__version__ = '2021.04.01' +__version__ = '2021.4.1' from collections import namedtuple diff --git a/src/cpl_cli/templates/new/__init__.py b/src/cpl_cli/templates/new/__init__.py index 974185cc..6bf0494e 100644 --- a/src/cpl_cli/templates/new/__init__.py +++ b/src/cpl_cli/templates/new/__init__.py @@ -15,7 +15,7 @@ __title__ = 'cpl_cli.templates.new' __author__ = 'Sven Heidemann' __license__ = 'MIT' __copyright__ = 'Copyright (c) 2020 - 2021 sh-edraft.de' -__version__ = '2021.04.01' +__version__ = '2021.4.1' from collections import namedtuple diff --git a/src/cpl_cli/templates/new/console/__init__.py b/src/cpl_cli/templates/new/console/__init__.py index 7dc696d0..732d272a 100644 --- a/src/cpl_cli/templates/new/console/__init__.py +++ b/src/cpl_cli/templates/new/console/__init__.py @@ -15,7 +15,7 @@ __title__ = 'cpl_cli.templates.new.console' __author__ = 'Sven Heidemann' __license__ = 'MIT' __copyright__ = 'Copyright (c) 2020 - 2021 sh-edraft.de' -__version__ = '2021.04.01' +__version__ = '2021.4.1' from collections import namedtuple diff --git a/src/cpl_cli/templates/new/console/src/__init__.py b/src/cpl_cli/templates/new/console/src/__init__.py index b67e2633..b79ec50a 100644 --- a/src/cpl_cli/templates/new/console/src/__init__.py +++ b/src/cpl_cli/templates/new/console/src/__init__.py @@ -15,7 +15,7 @@ __title__ = 'cpl_cli.templates.new.console.src' __author__ = 'Sven Heidemann' __license__ = 'MIT' __copyright__ = 'Copyright (c) 2020 - 2021 sh-edraft.de' -__version__ = '2021.04.01' +__version__ = '2021.4.1' from collections import namedtuple 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 aaa0a0d1..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,7 +15,7 @@ __title__ = 'cpl_cli.templates.new.console.src.tests' __author__ = 'Sven Heidemann' __license__ = 'MIT' __copyright__ = 'Copyright (c) 2020 - 2021 sh-edraft.de' -__version__ = '2021.04.01' +__version__ = '2021.4.1' from collections import namedtuple diff --git a/src/cpl_cli/templates/publish/__init__.py b/src/cpl_cli/templates/publish/__init__.py index b4657468..4b7559f8 100644 --- a/src/cpl_cli/templates/publish/__init__.py +++ b/src/cpl_cli/templates/publish/__init__.py @@ -15,7 +15,7 @@ __title__ = 'cpl_cli.templates.publish' __author__ = 'Sven Heidemann' __license__ = 'MIT' __copyright__ = 'Copyright (c) 2020 - 2021 sh-edraft.de' -__version__ = '2021.04.01' +__version__ = '2021.4.1' from collections import namedtuple