From cac80657df22fbaaa8b62246b3af10b3bd7d1131 Mon Sep 17 00:00:00 2001 From: Sven Heidemann Date: Thu, 5 Aug 2021 14:21:42 +0200 Subject: [PATCH] Renamed cpl to cpl_core --- docs/build/html/_sources/quickstart.md.txt | 4 ++-- docs/source/quickstart.md | 4 ++-- .../_templates/generate/abc_template.py | 2 +- .../_templates/generate/class_template.py | 2 +- .../generate/configmodel_template.py | 6 ++--- .../_templates/generate/enum_template.py | 2 +- .../_templates/generate/init_template.py | 2 +- .../_templates/generate/service_template.py | 2 +- .../_templates/generate/thread_template.py | 2 +- .../new/console/source/name/application.py | 8 +++---- .../new/console/source/name/main.py | 14 ++++++------ .../new/console/source/name/startup.py | 6 ++--- .../new/library/source/name/application.py | 8 +++---- .../new/library/source/name/main.py | 12 +++++----- .../new/library/source/name/startup.py | 6 ++--- src/cpl_cli/cli.py | 10 ++++----- src/cpl_cli/cli_settings.py | 4 ++-- src/cpl_cli/command/add_service.py | 6 ++--- src/cpl_cli/command/custom_script_service.py | 4 ++-- src/cpl_cli/command/generate_service.py | 8 +++---- src/cpl_cli/command/help_service.py | 6 ++--- src/cpl_cli/command/install_service.py | 10 ++++----- src/cpl_cli/command/new_service.py | 12 +++++----- src/cpl_cli/command/remove_service.py | 8 +++---- src/cpl_cli/command/uninstall_service.py | 10 ++++----- src/cpl_cli/command/update_service.py | 10 ++++----- src/cpl_cli/command/version_service.py | 8 +++---- src/cpl_cli/command_handler_service.py | 8 +++---- src/cpl_cli/configuration/build_settings.py | 6 ++--- src/cpl_cli/configuration/project_settings.py | 6 ++--- src/cpl_cli/configuration/version_settings.py | 2 +- .../configuration/workspace_settings.py | 4 ++-- src/cpl_cli/error.py | 4 ++-- .../live_server/live_server_service.py | 4 ++-- src/cpl_cli/live_server/live_server_thread.py | 6 ++--- src/cpl_cli/main.py | 2 +- src/cpl_cli/publish/publisher_service.py | 8 +++---- src/cpl_cli/source_creator/console_builder.py | 6 ++--- src/cpl_cli/source_creator/library_builder.py | 6 ++--- src/cpl_cli/startup.py | 10 ++++----- src/cpl_core/application/application_abc.py | 8 +++---- .../application/application_builder.py | 10 ++++----- .../application/application_builder_abc.py | 4 ++-- src/cpl_core/application/startup_abc.py | 4 ++-- src/cpl_core/configuration/configuration.py | 18 +++++++-------- .../configuration/configuration_abc.py | 6 ++--- src/cpl_core/console/console.py | 8 +++---- src/cpl_core/console/spinner_thread.py | 4 ++-- .../connection/database_connection.py | 8 +++---- .../database/context/database_context.py | 14 ++++++------ src/cpl_core/database/database_settings.py | 8 +++---- .../service_collection.py | 22 +++++++++---------- .../service_collection_abc.py | 6 ++--- .../service_descriptor.py | 2 +- .../dependency_injection/service_provider.py | 14 ++++++------ .../environment/application_environment.py | 4 ++-- src/cpl_core/logging/logger_service.py | 14 ++++++------ src/cpl_core/logging/logging_settings.py | 10 ++++----- src/cpl_core/mailing/email_client_abc.py | 2 +- src/cpl_core/mailing/email_client_service.py | 12 +++++----- src/cpl_core/mailing/email_client_settings.py | 6 ++--- src/cpl_core/time/time_format_settings.py | 8 +++---- src/cpl_query/tests/query_test.py | 2 +- src/tests/custom/console/main.py | 2 +- src/tests/custom/database/src/application.py | 10 ++++----- src/tests/custom/database/src/main.py | 2 +- .../custom/database/src/model/city_model.py | 2 +- .../custom/database/src/model/db_context.py | 4 ++-- .../custom/database/src/model/user_model.py | 2 +- .../custom/database/src/model/user_repo.py | 2 +- src/tests/custom/database/src/startup.py | 10 ++++----- .../custom/general/src/general/application.py | 14 ++++++------ src/tests/custom/general/src/general/main.py | 2 +- .../custom/general/src/general/startup.py | 16 +++++++------- .../general/src/general/test_service.py | 4 ++-- .../generated/simple-app/src/application.py | 8 +++---- src/tests/generated/simple-app/src/main.py | 2 +- .../simple-app/src/simple_app/application.py | 8 +++---- .../simple-app/src/simple_app/main.py | 2 +- .../generated/simple-console/src/main.py | 2 +- .../simple-console/src/simple_console/main.py | 2 +- src/tests/generated/simple-di/src/main.py | 6 ++--- .../generated/simple-di/src/simple_di/main.py | 6 ++--- .../src/simple_startup_app/application.py | 8 +++---- .../src/simple_startup_app/main.py | 2 +- .../src/simple_startup_app/startup.py | 6 ++--- .../generated/startup-app/src/application.py | 8 +++---- src/tests/generated/startup-app/src/main.py | 2 +- .../generated/startup-app/src/startup.py | 6 ++--- 89 files changed, 290 insertions(+), 290 deletions(-) diff --git a/docs/build/html/_sources/quickstart.md.txt b/docs/build/html/_sources/quickstart.md.txt index 0b75384e..42a88449 100644 --- a/docs/build/html/_sources/quickstart.md.txt +++ b/docs/build/html/_sources/quickstart.md.txt @@ -83,7 +83,7 @@ To create the sample project to the following: 3. Add ```Console.select``` as follows: ```py - from cpl.console import Console + from cpl_core.console import Console def main(): @@ -156,7 +156,7 @@ To create the sample project to the following: import random import string - from cpl.console import Console + from cpl_core.console import Console def generate_password(letters: str, length: int) -> str: diff --git a/docs/source/quickstart.md b/docs/source/quickstart.md index 0b75384e..42a88449 100644 --- a/docs/source/quickstart.md +++ b/docs/source/quickstart.md @@ -83,7 +83,7 @@ To create the sample project to the following: 3. Add ```Console.select``` as follows: ```py - from cpl.console import Console + from cpl_core.console import Console def main(): @@ -156,7 +156,7 @@ To create the sample project to the following: import random import string - from cpl.console import Console + from cpl_core.console import Console def generate_password(letters: str, length: int) -> str: diff --git a/src/cpl_cli/_templates/generate/abc_template.py b/src/cpl_cli/_templates/generate/abc_template.py index b624c3b4..4e6d645d 100644 --- a/src/cpl_cli/_templates/generate/abc_template.py +++ b/src/cpl_cli/_templates/generate/abc_template.py @@ -1,7 +1,7 @@ import textwrap from string import Template -from cpl.utils.string import String +from cpl_core.utils.string import String from cpl_cli._templates.template_file_abc import TemplateFileABC diff --git a/src/cpl_cli/_templates/generate/class_template.py b/src/cpl_cli/_templates/generate/class_template.py index f923ce19..6d01d659 100644 --- a/src/cpl_cli/_templates/generate/class_template.py +++ b/src/cpl_cli/_templates/generate/class_template.py @@ -1,7 +1,7 @@ import textwrap from string import Template -from cpl.utils.string import String +from cpl_core.utils.string import String from cpl_cli._templates.template_file_abc import TemplateFileABC diff --git a/src/cpl_cli/_templates/generate/configmodel_template.py b/src/cpl_cli/_templates/generate/configmodel_template.py index 482cec8f..b695d044 100644 --- a/src/cpl_cli/_templates/generate/configmodel_template.py +++ b/src/cpl_cli/_templates/generate/configmodel_template.py @@ -1,7 +1,7 @@ import textwrap from string import Template -from cpl.utils.string import String +from cpl_core.utils.string import String from cpl_cli._templates.template_file_abc import TemplateFileABC @@ -16,8 +16,8 @@ class ConfigModelTemplate(TemplateFileABC): self._value = textwrap.dedent("""\ import traceback - from cpl.configuration.configuration_model_abc import ConfigurationModelABC - from cpl.console import Console + from cpl_core.configuration.configuration_model_abc import ConfigurationModelABC + from cpl_core.console import Console class $Name(ConfigurationModelABC): diff --git a/src/cpl_cli/_templates/generate/enum_template.py b/src/cpl_cli/_templates/generate/enum_template.py index 2acbf588..9b0689cb 100644 --- a/src/cpl_cli/_templates/generate/enum_template.py +++ b/src/cpl_cli/_templates/generate/enum_template.py @@ -1,7 +1,7 @@ import textwrap from string import Template -from cpl.utils.string import String +from cpl_core.utils.string import String from cpl_cli._templates.template_file_abc import TemplateFileABC diff --git a/src/cpl_cli/_templates/generate/init_template.py b/src/cpl_cli/_templates/generate/init_template.py index 39cf238a..316d9fa2 100644 --- a/src/cpl_cli/_templates/generate/init_template.py +++ b/src/cpl_cli/_templates/generate/init_template.py @@ -1,7 +1,7 @@ import textwrap from string import Template -from cpl.utils.string import String +from cpl_core.utils.string import String from cpl_cli._templates.template_file_abc import TemplateFileABC diff --git a/src/cpl_cli/_templates/generate/service_template.py b/src/cpl_cli/_templates/generate/service_template.py index 02fefa87..0e762685 100644 --- a/src/cpl_cli/_templates/generate/service_template.py +++ b/src/cpl_cli/_templates/generate/service_template.py @@ -1,7 +1,7 @@ import textwrap from string import Template -from cpl.utils.string import String +from cpl_core.utils.string import String from cpl_cli._templates.template_file_abc import TemplateFileABC diff --git a/src/cpl_cli/_templates/generate/thread_template.py b/src/cpl_cli/_templates/generate/thread_template.py index f6876e20..c8bd641e 100644 --- a/src/cpl_cli/_templates/generate/thread_template.py +++ b/src/cpl_cli/_templates/generate/thread_template.py @@ -1,7 +1,7 @@ import textwrap from string import Template -from cpl.utils.string import String +from cpl_core.utils.string import String from cpl_cli._templates.template_file_abc import TemplateFileABC diff --git a/src/cpl_cli/_templates/new/console/source/name/application.py b/src/cpl_cli/_templates/new/console/source/name/application.py index 934f0522..8230d308 100644 --- a/src/cpl_cli/_templates/new/console/source/name/application.py +++ b/src/cpl_cli/_templates/new/console/source/name/application.py @@ -11,10 +11,10 @@ class ApplicationTemplate(TemplateFileABC): self._name = 'application.py' self._path = path self._value = textwrap.dedent("""\ - from cpl.application import ApplicationABC - from cpl.configuration import ConfigurationABC - from cpl.console import Console - from cpl.dependency_injection import ServiceProviderABC + 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 class Application(ApplicationABC): diff --git a/src/cpl_cli/_templates/new/console/source/name/main.py b/src/cpl_cli/_templates/new/console/source/name/main.py index 861258a1..76734058 100644 --- a/src/cpl_cli/_templates/new/console/source/name/main.py +++ b/src/cpl_cli/_templates/new/console/source/name/main.py @@ -1,6 +1,6 @@ import textwrap -from cpl.utils.string import String +from cpl_core.utils.string import String from cpl_cli._templates.template_file_abc import TemplateFileABC @@ -16,7 +16,7 @@ class MainWithApplicationHostAndStartupTemplate(TemplateFileABC): import_pkg = f'{name}.' self._value = textwrap.dedent(f"""\ - from cpl.application import ApplicationBuilder + from cpl_core.application import ApplicationBuilder from {import_pkg}application import Application from {import_pkg}startup import Startup @@ -57,7 +57,7 @@ class MainWithApplicationBaseTemplate(TemplateFileABC): import_pkg = f'{name}.' self._value = textwrap.dedent(f"""\ - from cpl.application import ApplicationBuilder + from cpl_core.application import ApplicationBuilder from {import_pkg}application import Application @@ -96,7 +96,7 @@ class MainWithoutApplicationBaseTemplate(TemplateFileABC): import_pkg = f'{name}.' self._value = textwrap.dedent("""\ - from cpl.console import Console + from cpl_core.console import Console def main(): @@ -132,9 +132,9 @@ class MainWithDependencyInjection(TemplateFileABC): import_pkg = f'{name}.' self._value = textwrap.dedent("""\ - from cpl.configuration import Configuration, ConfigurationABC - from cpl.console import Console - from cpl.dependency_injection import ServiceCollection, ServiceProviderABC + from cpl_core.configuration import Configuration, ConfigurationABC + from cpl_core.console import Console + from cpl_core.dependency_injection import ServiceCollection, ServiceProviderABC def configure_configuration() -> ConfigurationABC: diff --git a/src/cpl_cli/_templates/new/console/source/name/startup.py b/src/cpl_cli/_templates/new/console/source/name/startup.py index 6e68b355..9511ac40 100644 --- a/src/cpl_cli/_templates/new/console/source/name/startup.py +++ b/src/cpl_cli/_templates/new/console/source/name/startup.py @@ -11,9 +11,9 @@ class StartupTemplate(TemplateFileABC): self._name = 'startup.py' self._path = path self._value = textwrap.dedent("""\ - from cpl.application import StartupABC - from cpl.configuration import ConfigurationABC - from cpl.dependency_injection import ServiceProviderABC, ServiceCollectionABC + from cpl_core.application import StartupABC + from cpl_core.configuration import ConfigurationABC + from cpl_core.dependency_injection import ServiceProviderABC, ServiceCollectionABC class Startup(StartupABC): diff --git a/src/cpl_cli/_templates/new/library/source/name/application.py b/src/cpl_cli/_templates/new/library/source/name/application.py index 934f0522..8230d308 100644 --- a/src/cpl_cli/_templates/new/library/source/name/application.py +++ b/src/cpl_cli/_templates/new/library/source/name/application.py @@ -11,10 +11,10 @@ class ApplicationTemplate(TemplateFileABC): self._name = 'application.py' self._path = path self._value = textwrap.dedent("""\ - from cpl.application import ApplicationABC - from cpl.configuration import ConfigurationABC - from cpl.console import Console - from cpl.dependency_injection import ServiceProviderABC + 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 class Application(ApplicationABC): diff --git a/src/cpl_cli/_templates/new/library/source/name/main.py b/src/cpl_cli/_templates/new/library/source/name/main.py index 5d43bf3a..a486428b 100644 --- a/src/cpl_cli/_templates/new/library/source/name/main.py +++ b/src/cpl_cli/_templates/new/library/source/name/main.py @@ -16,7 +16,7 @@ class MainWithApplicationHostAndStartupTemplate(TemplateFileABC): import_pkg = '' self._value = textwrap.dedent(f"""\ - from cpl.application import ApplicationBuilder + from cpl_core.application import ApplicationBuilder from {import_pkg}application import Application from {import_pkg}startup import Startup @@ -58,7 +58,7 @@ class MainWithApplicationBaseTemplate(TemplateFileABC): import_pkg = '' self._value = textwrap.dedent(f"""\ - from cpl.application import ApplicationBuilder + from cpl_core.application import ApplicationBuilder from {import_pkg}application import Application @@ -94,7 +94,7 @@ class MainWithoutApplicationBaseTemplate(TemplateFileABC): self._path = path self._value = textwrap.dedent("""\ - from cpl.console import Console + from cpl_core.console import Console def main(): @@ -127,9 +127,9 @@ class MainWithDependencyInjection(TemplateFileABC): self._path = path self._value = textwrap.dedent("""\ - from cpl.configuration import Configuration, ConfigurationABC - from cpl.console import Console - from cpl.dependency_injection import ServiceCollection, ServiceProviderABC + from cpl_core.configuration import Configuration, ConfigurationABC + from cpl_core.console import Console + from cpl_core.dependency_injection import ServiceCollection, ServiceProviderABC def configure_configuration() -> ConfigurationABC: diff --git a/src/cpl_cli/_templates/new/library/source/name/startup.py b/src/cpl_cli/_templates/new/library/source/name/startup.py index 6e68b355..9511ac40 100644 --- a/src/cpl_cli/_templates/new/library/source/name/startup.py +++ b/src/cpl_cli/_templates/new/library/source/name/startup.py @@ -11,9 +11,9 @@ class StartupTemplate(TemplateFileABC): self._name = 'startup.py' self._path = path self._value = textwrap.dedent("""\ - from cpl.application import StartupABC - from cpl.configuration import ConfigurationABC - from cpl.dependency_injection import ServiceProviderABC, ServiceCollectionABC + from cpl_core.application import StartupABC + from cpl_core.configuration import ConfigurationABC + from cpl_core.dependency_injection import ServiceProviderABC, ServiceCollectionABC class Startup(StartupABC): diff --git a/src/cpl_cli/cli.py b/src/cpl_cli/cli.py index 0ffc20c3..278ff989 100644 --- a/src/cpl_cli/cli.py +++ b/src/cpl_cli/cli.py @@ -1,11 +1,11 @@ import os from typing import Optional -from cpl.application.application_abc import ApplicationABC -from cpl.configuration.console_argument import ConsoleArgument -from cpl.configuration.configuration_abc import ConfigurationABC -from cpl.console.console import Console -from cpl.dependency_injection import ServiceProviderABC +from cpl_core.application.application_abc import ApplicationABC +from cpl_core.configuration.console_argument import ConsoleArgument +from cpl_core.configuration.configuration_abc import ConfigurationABC +from cpl_core.console.console import Console +from cpl_core.dependency_injection import ServiceProviderABC from cpl_cli.command.add_service import AddService from cpl_cli.command.build_service import BuildService from cpl_cli.command.custom_script_service import CustomScriptService diff --git a/src/cpl_cli/cli_settings.py b/src/cpl_cli/cli_settings.py index 2adb1228..3c38a181 100644 --- a/src/cpl_cli/cli_settings.py +++ b/src/cpl_cli/cli_settings.py @@ -1,8 +1,8 @@ import traceback from typing import Optional -from cpl.configuration.configuration_model_abc import ConfigurationModelABC -from cpl.console.console import Console +from cpl_core.configuration.configuration_model_abc import ConfigurationModelABC +from cpl_core.console.console import Console from cpl_cli.cli_settings_name_enum import CLISettingsNameEnum diff --git a/src/cpl_cli/command/add_service.py b/src/cpl_cli/command/add_service.py index 30d2dd17..c4bd21f9 100644 --- a/src/cpl_cli/command/add_service.py +++ b/src/cpl_cli/command/add_service.py @@ -3,9 +3,9 @@ import os import textwrap from typing import Optional -from cpl.configuration.configuration_abc import ConfigurationABC -from cpl.console.console import Console -from cpl.console.foreground_color_enum import ForegroundColorEnum +from cpl_core.configuration.configuration_abc import ConfigurationABC +from cpl_core.console.console import Console +from cpl_core.console.foreground_color_enum import ForegroundColorEnum from cpl_cli.command_abc import CommandABC from cpl_cli.configuration.build_settings import BuildSettings from cpl_cli.configuration.project_settings import ProjectSettings diff --git a/src/cpl_cli/command/custom_script_service.py b/src/cpl_cli/command/custom_script_service.py index c03f6368..87e1a7f9 100644 --- a/src/cpl_cli/command/custom_script_service.py +++ b/src/cpl_cli/command/custom_script_service.py @@ -2,8 +2,8 @@ import os import subprocess import sys -from cpl.configuration.configuration_abc import ConfigurationABC -from cpl.console.console import Console +from cpl_core.configuration.configuration_abc import ConfigurationABC +from cpl_core.console.console import Console from cpl_cli.command_abc import CommandABC from cpl_cli.configuration.workspace_settings import WorkspaceSettings diff --git a/src/cpl_cli/command/generate_service.py b/src/cpl_cli/command/generate_service.py index 9ad04172..cc5e6583 100644 --- a/src/cpl_cli/command/generate_service.py +++ b/src/cpl_cli/command/generate_service.py @@ -2,10 +2,10 @@ import os import textwrap from collections import Callable -from cpl.configuration.configuration_abc import ConfigurationABC -from cpl.console.foreground_color_enum import ForegroundColorEnum -from cpl.console.console import Console -from cpl.utils.string import String +from cpl_core.configuration.configuration_abc import ConfigurationABC +from cpl_core.console.foreground_color_enum import ForegroundColorEnum +from cpl_core.console.console import Console +from cpl_core.utils.string import String from cpl_cli.command_abc import CommandABC from cpl_cli._templates.generate.init_template import InitTemplate from cpl_cli._templates.generate.abc_template import ABCTemplate diff --git a/src/cpl_cli/command/help_service.py b/src/cpl_cli/command/help_service.py index 50e98921..0d857ed8 100644 --- a/src/cpl_cli/command/help_service.py +++ b/src/cpl_cli/command/help_service.py @@ -1,9 +1,9 @@ import textwrap from typing import Optional -from cpl.console.console import Console -from cpl.console.foreground_color_enum import ForegroundColorEnum -from cpl.dependency_injection.service_provider_abc import ServiceProviderABC +from cpl_core.console.console import Console +from cpl_core.console.foreground_color_enum import ForegroundColorEnum +from cpl_core.dependency_injection.service_provider_abc import ServiceProviderABC from cpl_cli.command_handler_service import CommandHandler from cpl_cli.command_abc import CommandABC diff --git a/src/cpl_cli/command/install_service.py b/src/cpl_cli/command/install_service.py index 7f733e2f..61d2e989 100644 --- a/src/cpl_cli/command/install_service.py +++ b/src/cpl_cli/command/install_service.py @@ -5,11 +5,11 @@ import textwrap from packaging import version -from cpl.configuration.configuration_abc import ConfigurationABC -from cpl.console.console import Console -from cpl.console.foreground_color_enum import ForegroundColorEnum -from cpl.environment.application_environment_abc import ApplicationEnvironmentABC -from cpl.utils.pip import Pip +from cpl_core.configuration.configuration_abc import ConfigurationABC +from cpl_core.console.console import Console +from cpl_core.console.foreground_color_enum import ForegroundColorEnum +from cpl_core.environment.application_environment_abc import ApplicationEnvironmentABC +from cpl_core.utils.pip import Pip from cpl_cli.cli_settings import CLISettings from cpl_cli.command_abc import CommandABC from cpl_cli.configuration.build_settings import BuildSettings diff --git a/src/cpl_cli/command/new_service.py b/src/cpl_cli/command/new_service.py index ef1dec22..ccc4acbb 100644 --- a/src/cpl_cli/command/new_service.py +++ b/src/cpl_cli/command/new_service.py @@ -5,12 +5,12 @@ from typing import Optional from packaging import version -import cpl +import cpl_core -from cpl.configuration.configuration_abc import ConfigurationABC -from cpl.console.foreground_color_enum import ForegroundColorEnum -from cpl.console.console import Console -from cpl.utils.string import String +from cpl_core.configuration.configuration_abc import ConfigurationABC +from cpl_core.console.foreground_color_enum import ForegroundColorEnum +from cpl_core.console.console import Console +from cpl_core.utils.string import String from cpl_cli.command_abc import CommandABC from cpl_cli.configuration.build_settings import BuildSettings from cpl_cli.configuration.build_settings_name_enum import BuildSettingsNameEnum @@ -96,7 +96,7 @@ class NewService(CommandABC): ProjectSettingsNameEnum.license_name.value: '', ProjectSettingsNameEnum.license_description.value: '', ProjectSettingsNameEnum.dependencies.value: [ - f'sh_cpl>={version.parse(cpl.__version__)}' + f'sh_cpl>={version.parse(cpl_core.__version__)}' ], ProjectSettingsNameEnum.python_version.value: f'>={sys.version.split(" ")[0]}', ProjectSettingsNameEnum.python_path.value: { diff --git a/src/cpl_cli/command/remove_service.py b/src/cpl_cli/command/remove_service.py index d826d907..701a43fe 100644 --- a/src/cpl_cli/command/remove_service.py +++ b/src/cpl_cli/command/remove_service.py @@ -3,10 +3,10 @@ import shutil import json import textwrap -from cpl.configuration.configuration_abc import ConfigurationABC -from cpl.console.console import Console -from cpl.console.foreground_color_enum import ForegroundColorEnum -from cpl.environment.application_environment_abc import ApplicationEnvironmentABC +from cpl_core.configuration.configuration_abc import ConfigurationABC +from cpl_core.console.console import Console +from cpl_core.console.foreground_color_enum import ForegroundColorEnum +from cpl_core.environment.application_environment_abc import ApplicationEnvironmentABC from cpl_cli.command_abc import CommandABC from cpl_cli.configuration import WorkspaceSettings, WorkspaceSettingsNameEnum diff --git a/src/cpl_cli/command/uninstall_service.py b/src/cpl_cli/command/uninstall_service.py index 4c9944c6..d9d1b0e7 100644 --- a/src/cpl_cli/command/uninstall_service.py +++ b/src/cpl_cli/command/uninstall_service.py @@ -3,11 +3,11 @@ import os import subprocess import textwrap -from cpl.configuration.configuration_abc import ConfigurationABC -from cpl.console.console import Console -from cpl.console.foreground_color_enum import ForegroundColorEnum -from cpl.environment.application_environment_abc import ApplicationEnvironmentABC -from cpl.utils.pip import Pip +from cpl_core.configuration.configuration_abc import ConfigurationABC +from cpl_core.console.console import Console +from cpl_core.console.foreground_color_enum import ForegroundColorEnum +from cpl_core.environment.application_environment_abc import ApplicationEnvironmentABC +from cpl_core.utils.pip import Pip from cpl_cli.command_abc import CommandABC from cpl_cli.configuration.build_settings import BuildSettings from cpl_cli.configuration.project_settings import ProjectSettings diff --git a/src/cpl_cli/command/update_service.py b/src/cpl_cli/command/update_service.py index 5cfb52de..412956e5 100644 --- a/src/cpl_cli/command/update_service.py +++ b/src/cpl_cli/command/update_service.py @@ -3,11 +3,11 @@ import os import subprocess import textwrap -from cpl.configuration.configuration_abc import ConfigurationABC -from cpl.console.console import Console -from cpl.console.foreground_color_enum import ForegroundColorEnum -from cpl.environment.application_environment_abc import ApplicationEnvironmentABC -from cpl.utils.pip import Pip +from cpl_core.configuration.configuration_abc import ConfigurationABC +from cpl_core.console.console import Console +from cpl_core.console.foreground_color_enum import ForegroundColorEnum +from cpl_core.environment.application_environment_abc import ApplicationEnvironmentABC +from cpl_core.utils.pip import Pip from cpl_cli.cli_settings import CLISettings from cpl_cli.command_abc import CommandABC from cpl_cli.configuration import BuildSettings diff --git a/src/cpl_cli/command/version_service.py b/src/cpl_cli/command/version_service.py index 5afadbd2..f49ac540 100644 --- a/src/cpl_cli/command/version_service.py +++ b/src/cpl_cli/command/version_service.py @@ -4,10 +4,10 @@ import platform import pkg_resources import textwrap -import cpl import cpl_cli -from cpl.console.console import Console -from cpl.console.foreground_color_enum import ForegroundColorEnum +import cpl_core +from cpl_core.console.console import Console +from cpl_core.console.foreground_color_enum import ForegroundColorEnum from cpl_cli.command_abc import CommandABC @@ -46,7 +46,7 @@ class VersionService(CommandABC): Console.write_line('\nCPL packages:') packages = [] - for importer, modname, is_pkg in pkgutil.iter_modules(cpl.__path__): + for importer, modname, is_pkg in pkgutil.iter_modules(cpl_core.__path__): module = importer.find_module(modname).load_module(modname) if '__version__' in dir(module): packages.append([f'{modname}', module.__version__]) diff --git a/src/cpl_cli/command_handler_service.py b/src/cpl_cli/command_handler_service.py index 128e796c..e1d86879 100644 --- a/src/cpl_cli/command_handler_service.py +++ b/src/cpl_cli/command_handler_service.py @@ -2,10 +2,10 @@ import os from abc import ABC from typing import Optional -from cpl.configuration.configuration_abc import ConfigurationABC -from cpl.console.console import Console -from cpl.dependency_injection.service_provider_abc import ServiceProviderABC -from cpl.utils.string import String +from cpl_core.configuration.configuration_abc import ConfigurationABC +from cpl_core.console.console import Console +from cpl_core.dependency_injection.service_provider_abc import ServiceProviderABC +from cpl_core.utils.string import String from cpl_cli.command.custom_script_service import CustomScriptService from cpl_cli.configuration.workspace_settings import WorkspaceSettings from cpl_cli.error import Error diff --git a/src/cpl_cli/configuration/build_settings.py b/src/cpl_cli/configuration/build_settings.py index 37e3662a..1909469a 100644 --- a/src/cpl_cli/configuration/build_settings.py +++ b/src/cpl_cli/configuration/build_settings.py @@ -2,9 +2,9 @@ import sys import traceback from typing import Optional -from cpl.configuration.configuration_model_abc import ConfigurationModelABC -from cpl.console.console import Console -from cpl.console.foreground_color_enum import ForegroundColorEnum +from cpl_core.configuration.configuration_model_abc import ConfigurationModelABC +from cpl_core.console.console import Console +from cpl_core.console.foreground_color_enum import ForegroundColorEnum from cpl_cli.configuration.build_settings_name_enum import BuildSettingsNameEnum from cpl_cli.configuration.project_type_enum import ProjectTypeEnum diff --git a/src/cpl_cli/configuration/project_settings.py b/src/cpl_cli/configuration/project_settings.py index 3f8f0fcc..c73bde40 100644 --- a/src/cpl_cli/configuration/project_settings.py +++ b/src/cpl_cli/configuration/project_settings.py @@ -3,9 +3,9 @@ import sys import traceback from typing import Optional -from cpl.configuration.configuration_model_abc import ConfigurationModelABC -from cpl.console.console import Console -from cpl.console.foreground_color_enum import ForegroundColorEnum +from cpl_core.configuration.configuration_model_abc import ConfigurationModelABC +from cpl_core.console.console import Console +from cpl_core.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 diff --git a/src/cpl_cli/configuration/version_settings.py b/src/cpl_cli/configuration/version_settings.py index 86fac84c..ef1af9b6 100644 --- a/src/cpl_cli/configuration/version_settings.py +++ b/src/cpl_cli/configuration/version_settings.py @@ -1,6 +1,6 @@ from typing import Optional -from cpl.configuration.configuration_model_abc import ConfigurationModelABC +from cpl_core.configuration.configuration_model_abc import ConfigurationModelABC from cpl_cli.configuration.version_settings_name_enum import VersionSettingsNameEnum diff --git a/src/cpl_cli/configuration/workspace_settings.py b/src/cpl_cli/configuration/workspace_settings.py index 4d51736a..a0b12b8f 100644 --- a/src/cpl_cli/configuration/workspace_settings.py +++ b/src/cpl_cli/configuration/workspace_settings.py @@ -1,8 +1,8 @@ import traceback from typing import Optional -from cpl.configuration.configuration_model_abc import ConfigurationModelABC -from cpl.console import Console +from cpl_core.configuration.configuration_model_abc import ConfigurationModelABC +from cpl_core.console import Console from cpl_cli.configuration.workspace_settings_name_enum import WorkspaceSettingsNameEnum diff --git a/src/cpl_cli/error.py b/src/cpl_cli/error.py index e4bd7225..e2509903 100644 --- a/src/cpl_cli/error.py +++ b/src/cpl_cli/error.py @@ -1,5 +1,5 @@ -from cpl.console.foreground_color_enum import ForegroundColorEnum -from cpl.console.console import Console +from cpl_core.console.foreground_color_enum import ForegroundColorEnum +from cpl_core.console.console import Console class Error: diff --git a/src/cpl_cli/live_server/live_server_service.py b/src/cpl_cli/live_server/live_server_service.py index d837f4e3..7b411dfb 100644 --- a/src/cpl_cli/live_server/live_server_service.py +++ b/src/cpl_cli/live_server/live_server_service.py @@ -6,8 +6,8 @@ import psutil as psutil from watchdog.events import FileSystemEventHandler from watchdog.observers import Observer -from cpl.console.console import Console -from cpl.environment.application_environment_abc import ApplicationEnvironmentABC +from cpl_core.console.console import Console +from cpl_core.environment.application_environment_abc import ApplicationEnvironmentABC from cpl_cli.configuration.build_settings import BuildSettings from cpl_cli.configuration.project_settings import ProjectSettings from cpl_cli.live_server.live_server_thread import LiveServerThread diff --git a/src/cpl_cli/live_server/live_server_thread.py b/src/cpl_cli/live_server/live_server_thread.py index 69af050b..ed91165d 100644 --- a/src/cpl_cli/live_server/live_server_thread.py +++ b/src/cpl_cli/live_server/live_server_thread.py @@ -4,9 +4,9 @@ import sys import threading from datetime import datetime -from cpl.console.console import Console -from cpl.console.foreground_color_enum import ForegroundColorEnum -from cpl.environment.application_environment_abc import ApplicationEnvironmentABC +from cpl_core.console.console import Console +from cpl_core.console.foreground_color_enum import ForegroundColorEnum +from cpl_core.environment.application_environment_abc import ApplicationEnvironmentABC from cpl_cli.configuration import BuildSettings diff --git a/src/cpl_cli/main.py b/src/cpl_cli/main.py index 71024452..b96f89b6 100644 --- a/src/cpl_cli/main.py +++ b/src/cpl_cli/main.py @@ -1,4 +1,4 @@ -from cpl.application.application_builder import ApplicationBuilder +from cpl_core.application.application_builder import ApplicationBuilder from cpl_cli.cli import CLI from cpl_cli.startup import Startup diff --git a/src/cpl_cli/publish/publisher_service.py b/src/cpl_cli/publish/publisher_service.py index 79b46af6..e8bd46ef 100644 --- a/src/cpl_cli/publish/publisher_service.py +++ b/src/cpl_cli/publish/publisher_service.py @@ -7,10 +7,10 @@ import setuptools from packaging import version from setuptools import sandbox -from cpl.configuration.configuration_abc import ConfigurationABC -from cpl.console.foreground_color_enum import ForegroundColorEnum -from cpl.console.console import Console -from cpl.environment.application_environment_abc import ApplicationEnvironmentABC +from cpl_core.configuration.configuration_abc import ConfigurationABC +from cpl_core.console.foreground_color_enum import ForegroundColorEnum +from cpl_core.console.console import Console +from cpl_core.environment.application_environment_abc import ApplicationEnvironmentABC from cpl_cli.configuration.build_settings import BuildSettings from cpl_cli.configuration.project_settings import ProjectSettings from cpl_cli.publish.publisher_abc import PublisherABC diff --git a/src/cpl_cli/source_creator/console_builder.py b/src/cpl_cli/source_creator/console_builder.py index a48d0d0b..e6ee287e 100644 --- a/src/cpl_cli/source_creator/console_builder.py +++ b/src/cpl_cli/source_creator/console_builder.py @@ -2,9 +2,9 @@ import json import os from typing import Optional -from cpl.console.foreground_color_enum import ForegroundColorEnum -from cpl.console.console import Console -from cpl.utils.string import String +from cpl_core.console.foreground_color_enum import ForegroundColorEnum +from cpl_core.console.console import Console +from cpl_core.utils.string import String from cpl_cli.configuration.workspace_settings import WorkspaceSettings from cpl_cli.configuration.workspace_settings_name_enum import WorkspaceSettingsNameEnum from cpl_cli.source_creator.template_builder import TemplateBuilder diff --git a/src/cpl_cli/source_creator/library_builder.py b/src/cpl_cli/source_creator/library_builder.py index 78f18908..80e83bb1 100644 --- a/src/cpl_cli/source_creator/library_builder.py +++ b/src/cpl_cli/source_creator/library_builder.py @@ -2,9 +2,9 @@ import json import os from typing import Optional -from cpl.console.foreground_color_enum import ForegroundColorEnum -from cpl.console.console import Console -from cpl.utils.string import String +from cpl_core.console.foreground_color_enum import ForegroundColorEnum +from cpl_core.console.console import Console +from cpl_core.utils.string import String from cpl_cli.configuration.workspace_settings import WorkspaceSettings from cpl_cli.configuration.workspace_settings_name_enum import WorkspaceSettingsNameEnum from cpl_cli.source_creator.template_builder import TemplateBuilder diff --git a/src/cpl_cli/startup.py b/src/cpl_cli/startup.py index 56a70e04..07ff0fa9 100644 --- a/src/cpl_cli/startup.py +++ b/src/cpl_cli/startup.py @@ -1,11 +1,11 @@ import os from typing import Optional -from cpl.application.startup_abc import StartupABC -from cpl.configuration.console_argument import ConsoleArgument -from cpl.configuration.configuration_abc import ConfigurationABC -from cpl.dependency_injection.service_collection_abc import ServiceCollectionABC -from cpl.dependency_injection.service_provider_abc import ServiceProviderABC +from cpl_core.application.startup_abc import StartupABC +from cpl_core.configuration.console_argument import ConsoleArgument +from cpl_core.configuration.configuration_abc import ConfigurationABC +from cpl_core.dependency_injection.service_collection_abc import ServiceCollectionABC +from cpl_core.dependency_injection.service_provider_abc import ServiceProviderABC from cpl_cli.command.add_service import AddService from cpl_cli.command.build_service import BuildService from cpl_cli.command.custom_script_service import CustomScriptService diff --git a/src/cpl_core/application/application_abc.py b/src/cpl_core/application/application_abc.py index b7b303bd..e3215594 100644 --- a/src/cpl_core/application/application_abc.py +++ b/src/cpl_core/application/application_abc.py @@ -1,10 +1,10 @@ from abc import ABC, abstractmethod from typing import Optional -from cpl.configuration.configuration_abc import ConfigurationABC -from cpl.console.console import Console -from cpl.dependency_injection.service_provider_abc import ServiceProviderABC -from cpl.environment import ApplicationEnvironmentABC +from cpl_core.configuration.configuration_abc import ConfigurationABC +from cpl_core.console.console import Console +from cpl_core.dependency_injection.service_provider_abc import ServiceProviderABC +from cpl_core.environment import ApplicationEnvironmentABC class ApplicationABC(ABC): diff --git a/src/cpl_core/application/application_builder.py b/src/cpl_core/application/application_builder.py index e16b2573..417b1256 100644 --- a/src/cpl_core/application/application_builder.py +++ b/src/cpl_core/application/application_builder.py @@ -1,10 +1,10 @@ from typing import Type, Optional -from cpl.application.application_abc import ApplicationABC -from cpl.application.application_builder_abc import ApplicationBuilderABC -from cpl.application.startup_abc import StartupABC -from cpl.configuration.configuration import Configuration -from cpl.dependency_injection.service_collection import ServiceCollection +from cpl_core.application.application_abc import ApplicationABC +from cpl_core.application.application_builder_abc import ApplicationBuilderABC +from cpl_core.application.startup_abc import StartupABC +from cpl_core.configuration.configuration import Configuration +from cpl_core.dependency_injection.service_collection import ServiceCollection class ApplicationBuilder(ApplicationBuilderABC): diff --git a/src/cpl_core/application/application_builder_abc.py b/src/cpl_core/application/application_builder_abc.py index 13c0e2d3..44c68fd7 100644 --- a/src/cpl_core/application/application_builder_abc.py +++ b/src/cpl_core/application/application_builder_abc.py @@ -1,8 +1,8 @@ from abc import ABC, abstractmethod from typing import Type -from cpl.application.application_abc import ApplicationABC -from cpl.application.startup_abc import StartupABC +from cpl_core.application.application_abc import ApplicationABC +from cpl_core.application.startup_abc import StartupABC class ApplicationBuilderABC(ABC): diff --git a/src/cpl_core/application/startup_abc.py b/src/cpl_core/application/startup_abc.py index b550854d..fd48b644 100644 --- a/src/cpl_core/application/startup_abc.py +++ b/src/cpl_core/application/startup_abc.py @@ -1,7 +1,7 @@ from abc import ABC, abstractmethod -from cpl.configuration.configuration_abc import ConfigurationABC -from cpl.dependency_injection.service_provider_abc import ServiceProviderABC +from cpl_core.configuration.configuration_abc import ConfigurationABC +from cpl_core.dependency_injection.service_provider_abc import ServiceProviderABC class StartupABC(ABC): diff --git a/src/cpl_core/configuration/configuration.py b/src/cpl_core/configuration/configuration.py index 68e671a6..605c6bcc 100644 --- a/src/cpl_core/configuration/configuration.py +++ b/src/cpl_core/configuration/configuration.py @@ -4,15 +4,15 @@ import sys from collections import Callable from typing import Union, Type, Optional -from cpl.configuration.configuration_abc import ConfigurationABC -from cpl.configuration.configuration_model_abc import ConfigurationModelABC -from cpl.configuration.configuration_variable_name_enum import ConfigurationVariableNameEnum -from cpl.configuration.console_argument import ConsoleArgument -from cpl.console.console import Console -from cpl.console.foreground_color_enum import ForegroundColorEnum -from cpl.environment.application_environment import ApplicationEnvironment -from cpl.environment.application_environment_abc import ApplicationEnvironmentABC -from cpl.environment.environment_name_enum import EnvironmentNameEnum +from cpl_core.configuration.configuration_abc import ConfigurationABC +from cpl_core.configuration.configuration_model_abc import ConfigurationModelABC +from cpl_core.configuration.configuration_variable_name_enum import ConfigurationVariableNameEnum +from cpl_core.configuration.console_argument import ConsoleArgument +from cpl_core.console.console import Console +from cpl_core.console.foreground_color_enum import ForegroundColorEnum +from cpl_core.environment.application_environment import ApplicationEnvironment +from cpl_core.environment.application_environment_abc import ApplicationEnvironmentABC +from cpl_core.environment.environment_name_enum import EnvironmentNameEnum class Configuration(ConfigurationABC): diff --git a/src/cpl_core/configuration/configuration_abc.py b/src/cpl_core/configuration/configuration_abc.py index 61498d70..9bade832 100644 --- a/src/cpl_core/configuration/configuration_abc.py +++ b/src/cpl_core/configuration/configuration_abc.py @@ -2,9 +2,9 @@ from abc import abstractmethod, ABC from collections import Callable from typing import Type, Union, Optional -from cpl.configuration.console_argument import ConsoleArgument -from cpl.configuration.configuration_model_abc import ConfigurationModelABC -from cpl.environment.application_environment_abc import ApplicationEnvironmentABC +from cpl_core.configuration.console_argument import ConsoleArgument +from cpl_core.configuration.configuration_model_abc import ConfigurationModelABC +from cpl_core.environment.application_environment_abc import ApplicationEnvironmentABC class ConfigurationABC(ABC): diff --git a/src/cpl_core/console/console.py b/src/cpl_core/console/console.py index 66140873..aff76a8b 100644 --- a/src/cpl_core/console/console.py +++ b/src/cpl_core/console/console.py @@ -11,10 +11,10 @@ from pynput.keyboard import Key from tabulate import tabulate from termcolor import colored -from cpl.console.background_color_enum import BackgroundColorEnum -from cpl.console.console_call import ConsoleCall -from cpl.console.foreground_color_enum import ForegroundColorEnum -from cpl.console.spinner_thread import SpinnerThread +from cpl_core.console.background_color_enum import BackgroundColorEnum +from cpl_core.console.console_call import ConsoleCall +from cpl_core.console.foreground_color_enum import ForegroundColorEnum +from cpl_core.console.spinner_thread import SpinnerThread class Console: diff --git a/src/cpl_core/console/spinner_thread.py b/src/cpl_core/console/spinner_thread.py index e20b431a..43afcb25 100644 --- a/src/cpl_core/console/spinner_thread.py +++ b/src/cpl_core/console/spinner_thread.py @@ -5,8 +5,8 @@ import time from termcolor import colored -from cpl.console.background_color_enum import BackgroundColorEnum -from cpl.console.foreground_color_enum import ForegroundColorEnum +from cpl_core.console.background_color_enum import BackgroundColorEnum +from cpl_core.console.foreground_color_enum import ForegroundColorEnum class SpinnerThread(threading.Thread): diff --git a/src/cpl_core/database/connection/database_connection.py b/src/cpl_core/database/connection/database_connection.py index 551ce238..d889d240 100644 --- a/src/cpl_core/database/connection/database_connection.py +++ b/src/cpl_core/database/connection/database_connection.py @@ -3,10 +3,10 @@ from typing import Optional from sqlalchemy import engine, create_engine from sqlalchemy.orm import Session, sessionmaker -from cpl.console.console import Console -from cpl.console.foreground_color_enum import ForegroundColorEnum -from cpl.database.connection.database_connection_abc import DatabaseConnectionABC -from cpl.database.database_settings import DatabaseSettings +from cpl_core.console.console import Console +from cpl_core.console.foreground_color_enum import ForegroundColorEnum +from cpl_core.database.connection.database_connection_abc import DatabaseConnectionABC +from cpl_core.database.database_settings import DatabaseSettings class DatabaseConnection(DatabaseConnectionABC): diff --git a/src/cpl_core/database/context/database_context.py b/src/cpl_core/database/context/database_context.py index e331c9e5..922c07e7 100644 --- a/src/cpl_core/database/context/database_context.py +++ b/src/cpl_core/database/context/database_context.py @@ -1,13 +1,13 @@ from sqlalchemy import engine, Table from sqlalchemy.orm import Session -from cpl.console.console import Console -from cpl.console.foreground_color_enum import ForegroundColorEnum -from cpl.database.connection.database_connection import DatabaseConnection -from cpl.database.connection.database_connection_abc import DatabaseConnectionABC -from cpl.database.context.database_context_abc import DatabaseContextABC -from cpl.database.database_settings import DatabaseSettings -from cpl.database.database_model import DatabaseModel +from cpl_core.console.console import Console +from cpl_core.console.foreground_color_enum import ForegroundColorEnum +from cpl_core.database.connection.database_connection import DatabaseConnection +from cpl_core.database.connection.database_connection_abc import DatabaseConnectionABC +from cpl_core.database.context.database_context_abc import DatabaseContextABC +from cpl_core.database.database_settings import DatabaseSettings +from cpl_core.database.database_model import DatabaseModel class DatabaseContext(DatabaseContextABC): diff --git a/src/cpl_core/database/database_settings.py b/src/cpl_core/database/database_settings.py index 08f04b3f..8a561ded 100644 --- a/src/cpl_core/database/database_settings.py +++ b/src/cpl_core/database/database_settings.py @@ -1,10 +1,10 @@ import traceback from typing import Optional -from cpl.configuration.configuration_model_abc import ConfigurationModelABC -from cpl.console.console import Console -from cpl.console.foreground_color_enum import ForegroundColorEnum -from cpl.database.database_settings_name_enum import DatabaseSettingsNameEnum +from cpl_core.configuration.configuration_model_abc import ConfigurationModelABC +from cpl_core.console.console import Console +from cpl_core.console.foreground_color_enum import ForegroundColorEnum +from cpl_core.database.database_settings_name_enum import DatabaseSettingsNameEnum class DatabaseSettings(ConfigurationModelABC): diff --git a/src/cpl_core/dependency_injection/service_collection.py b/src/cpl_core/dependency_injection/service_collection.py index 5b96e1ff..d5837f4b 100644 --- a/src/cpl_core/dependency_injection/service_collection.py +++ b/src/cpl_core/dependency_injection/service_collection.py @@ -1,16 +1,16 @@ from typing import Union, Type, Callable, Optional -from cpl.configuration.configuration_abc import ConfigurationABC -from cpl.database.database_settings import DatabaseSettings -from cpl.database.context.database_context_abc import DatabaseContextABC -from cpl.dependency_injection.service_provider_abc import ServiceProviderABC -from cpl.dependency_injection.service_collection_abc import ServiceCollectionABC -from cpl.dependency_injection.service_descriptor import ServiceDescriptor -from cpl.dependency_injection.service_lifetime_enum import ServiceLifetimeEnum -from cpl.dependency_injection.service_provider import ServiceProvider -from cpl.logging.logger_service import Logger -from cpl.logging.logger_abc import LoggerABC -from cpl.utils.credential_manager import CredentialManager +from cpl_core.configuration.configuration_abc import ConfigurationABC +from cpl_core.database.database_settings import DatabaseSettings +from cpl_core.database.context.database_context_abc import DatabaseContextABC +from cpl_core.dependency_injection.service_provider_abc import ServiceProviderABC +from cpl_core.dependency_injection.service_collection_abc import ServiceCollectionABC +from cpl_core.dependency_injection.service_descriptor import ServiceDescriptor +from cpl_core.dependency_injection.service_lifetime_enum import ServiceLifetimeEnum +from cpl_core.dependency_injection.service_provider import ServiceProvider +from cpl_core.logging.logger_service import Logger +from cpl_core.logging.logger_abc import LoggerABC +from cpl_core.utils.credential_manager import CredentialManager class ServiceCollection(ServiceCollectionABC): diff --git a/src/cpl_core/dependency_injection/service_collection_abc.py b/src/cpl_core/dependency_injection/service_collection_abc.py index 4d119b29..5f05217e 100644 --- a/src/cpl_core/dependency_injection/service_collection_abc.py +++ b/src/cpl_core/dependency_injection/service_collection_abc.py @@ -2,9 +2,9 @@ from abc import abstractmethod, ABC from collections import Callable from typing import Type -from cpl.database.database_settings import DatabaseSettings -from cpl.database.context.database_context_abc import DatabaseContextABC -from cpl.dependency_injection.service_provider_abc import ServiceProviderABC +from cpl_core.database.database_settings import DatabaseSettings +from cpl_core.database.context.database_context_abc import DatabaseContextABC +from cpl_core.dependency_injection.service_provider_abc import ServiceProviderABC class ServiceCollectionABC(ABC): diff --git a/src/cpl_core/dependency_injection/service_descriptor.py b/src/cpl_core/dependency_injection/service_descriptor.py index a0c70e98..01eea5ce 100644 --- a/src/cpl_core/dependency_injection/service_descriptor.py +++ b/src/cpl_core/dependency_injection/service_descriptor.py @@ -1,6 +1,6 @@ from typing import Union, Optional -from cpl.dependency_injection.service_lifetime_enum import ServiceLifetimeEnum +from cpl_core.dependency_injection.service_lifetime_enum import ServiceLifetimeEnum class ServiceDescriptor: diff --git a/src/cpl_core/dependency_injection/service_provider.py b/src/cpl_core/dependency_injection/service_provider.py index c8c333b2..62769b9e 100644 --- a/src/cpl_core/dependency_injection/service_provider.py +++ b/src/cpl_core/dependency_injection/service_provider.py @@ -2,13 +2,13 @@ from collections import Callable from inspect import signature, Parameter from typing import Optional -from cpl.configuration.configuration_abc import ConfigurationABC -from cpl.configuration.configuration_model_abc import ConfigurationModelABC -from cpl.database.context.database_context_abc import DatabaseContextABC -from cpl.dependency_injection.service_provider_abc import ServiceProviderABC -from cpl.dependency_injection.service_descriptor import ServiceDescriptor -from cpl.dependency_injection.service_lifetime_enum import ServiceLifetimeEnum -from cpl.environment.application_environment_abc import ApplicationEnvironmentABC +from cpl_core.configuration.configuration_abc import ConfigurationABC +from cpl_core.configuration.configuration_model_abc import ConfigurationModelABC +from cpl_core.database.context.database_context_abc import DatabaseContextABC +from cpl_core.dependency_injection.service_provider_abc import ServiceProviderABC +from cpl_core.dependency_injection.service_descriptor import ServiceDescriptor +from cpl_core.dependency_injection.service_lifetime_enum import ServiceLifetimeEnum +from cpl_core.environment.application_environment_abc import ApplicationEnvironmentABC class ServiceProvider(ServiceProviderABC): diff --git a/src/cpl_core/environment/application_environment.py b/src/cpl_core/environment/application_environment.py index 8acf1637..1c783fbe 100644 --- a/src/cpl_core/environment/application_environment.py +++ b/src/cpl_core/environment/application_environment.py @@ -3,8 +3,8 @@ from datetime import datetime from socket import gethostname from typing import Optional -from cpl.environment.application_environment_abc import ApplicationEnvironmentABC -from cpl.environment.environment_name_enum import EnvironmentNameEnum +from cpl_core.environment.application_environment_abc import ApplicationEnvironmentABC +from cpl_core.environment.environment_name_enum import EnvironmentNameEnum class ApplicationEnvironment(ApplicationEnvironmentABC): diff --git a/src/cpl_core/logging/logger_service.py b/src/cpl_core/logging/logger_service.py index e4f13e38..6c8d352a 100644 --- a/src/cpl_core/logging/logger_service.py +++ b/src/cpl_core/logging/logger_service.py @@ -3,13 +3,13 @@ import os import traceback from string import Template -from cpl.console.console import Console -from cpl.console.foreground_color_enum import ForegroundColorEnum -from cpl.environment.application_environment_abc import ApplicationEnvironmentABC -from cpl.logging.logger_abc import LoggerABC -from cpl.logging.logging_level_enum import LoggingLevelEnum -from cpl.logging.logging_settings import LoggingSettings -from cpl.time.time_format_settings import TimeFormatSettings +from cpl_core.console.console import Console +from cpl_core.console.foreground_color_enum import ForegroundColorEnum +from cpl_core.environment.application_environment_abc import ApplicationEnvironmentABC +from cpl_core.logging.logger_abc import LoggerABC +from cpl_core.logging.logging_level_enum import LoggingLevelEnum +from cpl_core.logging.logging_settings import LoggingSettings +from cpl_core.time.time_format_settings import TimeFormatSettings class Logger(LoggerABC): diff --git a/src/cpl_core/logging/logging_settings.py b/src/cpl_core/logging/logging_settings.py index 6b7128e1..a9554657 100644 --- a/src/cpl_core/logging/logging_settings.py +++ b/src/cpl_core/logging/logging_settings.py @@ -1,11 +1,11 @@ import traceback from typing import Optional -from cpl.configuration.configuration_model_abc import ConfigurationModelABC -from cpl.console.console import Console -from cpl.console.foreground_color_enum import ForegroundColorEnum -from cpl.logging.logging_level_enum import LoggingLevelEnum -from cpl.logging.logging_settings_name_enum import LoggingSettingsNameEnum +from cpl_core.configuration.configuration_model_abc import ConfigurationModelABC +from cpl_core.console.console import Console +from cpl_core.console.foreground_color_enum import ForegroundColorEnum +from cpl_core.logging.logging_level_enum import LoggingLevelEnum +from cpl_core.logging.logging_settings_name_enum import LoggingSettingsNameEnum class LoggingSettings(ConfigurationModelABC): diff --git a/src/cpl_core/mailing/email_client_abc.py b/src/cpl_core/mailing/email_client_abc.py index dfc80424..9d60e35b 100644 --- a/src/cpl_core/mailing/email_client_abc.py +++ b/src/cpl_core/mailing/email_client_abc.py @@ -1,6 +1,6 @@ from abc import abstractmethod, ABC -from cpl.mailing.email import EMail +from cpl_core.mailing.email import EMail class EMailClientABC(ABC): diff --git a/src/cpl_core/mailing/email_client_service.py b/src/cpl_core/mailing/email_client_service.py index f169fa11..4d45248e 100644 --- a/src/cpl_core/mailing/email_client_service.py +++ b/src/cpl_core/mailing/email_client_service.py @@ -2,12 +2,12 @@ import ssl from smtplib import SMTP from typing import Optional -from cpl.environment.application_environment_abc import ApplicationEnvironmentABC -from cpl.logging.logger_abc import LoggerABC -from cpl.mailing.email import EMail -from cpl.mailing.email_client_abc import EMailClientABC -from cpl.mailing.email_client_settings import EMailClientSettings -from cpl.utils.credential_manager import CredentialManager +from cpl_core.environment.application_environment_abc import ApplicationEnvironmentABC +from cpl_core.logging.logger_abc import LoggerABC +from cpl_core.mailing.email import EMail +from cpl_core.mailing.email_client_abc import EMailClientABC +from cpl_core.mailing.email_client_settings import EMailClientSettings +from cpl_core.utils.credential_manager import CredentialManager class EMailClient(EMailClientABC): diff --git a/src/cpl_core/mailing/email_client_settings.py b/src/cpl_core/mailing/email_client_settings.py index 31b7f151..9d695e47 100644 --- a/src/cpl_core/mailing/email_client_settings.py +++ b/src/cpl_core/mailing/email_client_settings.py @@ -1,8 +1,8 @@ import traceback -from cpl.configuration.configuration_model_abc import ConfigurationModelABC -from cpl.console.console import Console -from cpl.mailing.email_client_settings_name_enum import EMailClientSettingsNameEnum +from cpl_core.configuration.configuration_model_abc import ConfigurationModelABC +from cpl_core.console.console import Console +from cpl_core.mailing.email_client_settings_name_enum import EMailClientSettingsNameEnum class EMailClientSettings(ConfigurationModelABC): diff --git a/src/cpl_core/time/time_format_settings.py b/src/cpl_core/time/time_format_settings.py index f5d0827e..885e8d0b 100644 --- a/src/cpl_core/time/time_format_settings.py +++ b/src/cpl_core/time/time_format_settings.py @@ -1,10 +1,10 @@ import traceback from typing import Optional -from cpl.configuration.configuration_model_abc import ConfigurationModelABC -from cpl.console.console import Console -from cpl.console.foreground_color_enum import ForegroundColorEnum -from cpl.time.time_format_settings_names_enum import TimeFormatSettingsNamesEnum +from cpl_core.configuration.configuration_model_abc import ConfigurationModelABC +from cpl_core.console.console import Console +from cpl_core.console.foreground_color_enum import ForegroundColorEnum +from cpl_core.time.time_format_settings_names_enum import TimeFormatSettingsNamesEnum class TimeFormatSettings(ConfigurationModelABC): diff --git a/src/cpl_query/tests/query_test.py b/src/cpl_query/tests/query_test.py index 9efe8310..9f1e48e2 100644 --- a/src/cpl_query/tests/query_test.py +++ b/src/cpl_query/tests/query_test.py @@ -2,7 +2,7 @@ import string import unittest from random import randint -from cpl.utils import String +from cpl_core.utils import String from cpl_query.exceptions import InvalidTypeException, ArgumentNoneException from cpl_query.extension.list import List from cpl_query.tests.models import User, Address diff --git a/src/tests/custom/console/main.py b/src/tests/custom/console/main.py index 6dfe9a9c..d61cd44c 100644 --- a/src/tests/custom/console/main.py +++ b/src/tests/custom/console/main.py @@ -1,5 +1,5 @@ import time -from cpl.console import Console, ForegroundColorEnum +from cpl_core.console import Console, ForegroundColorEnum def test_spinner(): diff --git a/src/tests/custom/database/src/application.py b/src/tests/custom/database/src/application.py index 4ac5352c..80639750 100644 --- a/src/tests/custom/database/src/application.py +++ b/src/tests/custom/database/src/application.py @@ -1,10 +1,10 @@ from typing import Optional -from cpl.application import ApplicationABC -from cpl.configuration import ConfigurationABC -from cpl.console import Console -from cpl.dependency_injection import ServiceProviderABC -from cpl.logging import LoggerABC +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 cpl_core.logging import LoggerABC from model.user_repo_abc import UserRepoABC from model.user_repo import UserRepo diff --git a/src/tests/custom/database/src/main.py b/src/tests/custom/database/src/main.py index 6e678925..4272c911 100644 --- a/src/tests/custom/database/src/main.py +++ b/src/tests/custom/database/src/main.py @@ -1,4 +1,4 @@ -from cpl.application import ApplicationBuilder +from cpl_core.application import ApplicationBuilder from application import Application from startup import Startup diff --git a/src/tests/custom/database/src/model/city_model.py b/src/tests/custom/database/src/model/city_model.py index 98523169..aba2cf6f 100644 --- a/src/tests/custom/database/src/model/city_model.py +++ b/src/tests/custom/database/src/model/city_model.py @@ -1,6 +1,6 @@ from sqlalchemy import Column, Integer, String -from cpl.database import DatabaseModel +from cpl_core.database import DatabaseModel class CityModel(DatabaseModel): diff --git a/src/tests/custom/database/src/model/db_context.py b/src/tests/custom/database/src/model/db_context.py index 160ed8b4..d3600643 100644 --- a/src/tests/custom/database/src/model/db_context.py +++ b/src/tests/custom/database/src/model/db_context.py @@ -1,5 +1,5 @@ -from cpl.database import DatabaseSettings -from cpl.database.context import DatabaseContext +from cpl_core.database import DatabaseSettings +from cpl_core.database.context import DatabaseContext class DBContext(DatabaseContext): diff --git a/src/tests/custom/database/src/model/user_model.py b/src/tests/custom/database/src/model/user_model.py index bce0ed69..344612e3 100644 --- a/src/tests/custom/database/src/model/user_model.py +++ b/src/tests/custom/database/src/model/user_model.py @@ -1,7 +1,7 @@ from sqlalchemy import Column, Integer, String, ForeignKey from sqlalchemy.orm import relationship -from cpl.database import DatabaseModel +from cpl_core.database import DatabaseModel from .city_model import CityModel diff --git a/src/tests/custom/database/src/model/user_repo.py b/src/tests/custom/database/src/model/user_repo.py index 111605b3..cdd65b22 100644 --- a/src/tests/custom/database/src/model/user_repo.py +++ b/src/tests/custom/database/src/model/user_repo.py @@ -1,4 +1,4 @@ -from cpl.database.context import DatabaseContextABC +from cpl_core.database.context import DatabaseContextABC from .city_model import CityModel from .user_model import UserModel from .user_repo_abc import UserRepoABC diff --git a/src/tests/custom/database/src/startup.py b/src/tests/custom/database/src/startup.py index 27417a3b..9f954fe5 100644 --- a/src/tests/custom/database/src/startup.py +++ b/src/tests/custom/database/src/startup.py @@ -1,8 +1,8 @@ -from cpl.application import StartupABC -from cpl.configuration import ConfigurationABC -from cpl.database import DatabaseSettings -from cpl.dependency_injection import ServiceProviderABC, ServiceCollectionABC -from cpl.logging import LoggerABC, Logger +from cpl_core.application import StartupABC +from cpl_core.configuration import ConfigurationABC +from cpl_core.database import DatabaseSettings +from cpl_core.dependency_injection import ServiceProviderABC, ServiceCollectionABC +from cpl_core.logging import LoggerABC, Logger from model.db_context import DBContext from model.user_repo import UserRepo from model.user_repo_abc import UserRepoABC diff --git a/src/tests/custom/general/src/general/application.py b/src/tests/custom/general/src/general/application.py index 96bcb086..a42536af 100644 --- a/src/tests/custom/general/src/general/application.py +++ b/src/tests/custom/general/src/general/application.py @@ -1,13 +1,13 @@ import time from typing import Optional -from cpl.application.application_abc import ApplicationABC -from cpl.configuration.configuration_abc import ConfigurationABC -from cpl.console.console import Console -from cpl.dependency_injection.service_provider_abc import ServiceProviderABC -from cpl.logging.logger_abc import LoggerABC -from cpl.mailing.email import EMail -from cpl.mailing.email_client_abc import EMailClientABC +from cpl_core.application.application_abc import ApplicationABC +from cpl_core.configuration.configuration_abc import ConfigurationABC +from cpl_core.console.console import Console +from cpl_core.dependency_injection.service_provider_abc import ServiceProviderABC +from cpl_core.logging.logger_abc import LoggerABC +from cpl_core.mailing.email import EMail +from cpl_core.mailing.email_client_abc import EMailClientABC from test_service import TestService diff --git a/src/tests/custom/general/src/general/main.py b/src/tests/custom/general/src/general/main.py index a2e8cbd0..f6515f12 100644 --- a/src/tests/custom/general/src/general/main.py +++ b/src/tests/custom/general/src/general/main.py @@ -1,4 +1,4 @@ -from cpl.application.application_builder import ApplicationBuilder +from cpl_core.application.application_builder import ApplicationBuilder from application import Application from startup import Startup diff --git a/src/tests/custom/general/src/general/startup.py b/src/tests/custom/general/src/general/startup.py index 102ae67b..3314b852 100644 --- a/src/tests/custom/general/src/general/startup.py +++ b/src/tests/custom/general/src/general/startup.py @@ -1,11 +1,11 @@ -from cpl.application.startup_abc import StartupABC -from cpl.configuration.configuration_abc import ConfigurationABC -from cpl.dependency_injection.service_collection_abc import ServiceCollectionABC -from cpl.dependency_injection.service_provider_abc import ServiceProviderABC -from cpl.logging.logger_service import Logger -from cpl.logging.logger_abc import LoggerABC -from cpl.mailing.email_client_service import EMailClient -from cpl.mailing.email_client_abc import EMailClientABC +from cpl_core.application.startup_abc import StartupABC +from cpl_core.configuration.configuration_abc import ConfigurationABC +from cpl_core.dependency_injection.service_collection_abc import ServiceCollectionABC +from cpl_core.dependency_injection.service_provider_abc import ServiceProviderABC +from cpl_core.logging.logger_service import Logger +from cpl_core.logging.logger_abc import LoggerABC +from cpl_core.mailing.email_client_service import EMailClient +from cpl_core.mailing.email_client_abc import EMailClientABC from test_service import TestService diff --git a/src/tests/custom/general/src/general/test_service.py b/src/tests/custom/general/src/general/test_service.py index 376707c1..94600a42 100644 --- a/src/tests/custom/general/src/general/test_service.py +++ b/src/tests/custom/general/src/general/test_service.py @@ -1,7 +1,7 @@ from abc import ABC -from cpl.console.console import Console -from cpl.dependency_injection import ServiceProviderABC +from cpl_core.console.console import Console +from cpl_core.dependency_injection import ServiceProviderABC class TestService(ABC): diff --git a/src/tests/generated/simple-app/src/application.py b/src/tests/generated/simple-app/src/application.py index 0a98353b..34a68c80 100644 --- a/src/tests/generated/simple-app/src/application.py +++ b/src/tests/generated/simple-app/src/application.py @@ -1,7 +1,7 @@ -from cpl.application import ApplicationABC -from cpl.configuration import ConfigurationABC -from cpl.console import Console -from cpl.dependency_injection import ServiceProviderABC +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 class Application(ApplicationABC): diff --git a/src/tests/generated/simple-app/src/main.py b/src/tests/generated/simple-app/src/main.py index 3d3e7eba..8ebd74ef 100644 --- a/src/tests/generated/simple-app/src/main.py +++ b/src/tests/generated/simple-app/src/main.py @@ -1,4 +1,4 @@ -from cpl.application import ApplicationBuilder +from cpl_core.application import ApplicationBuilder from application import Application diff --git a/src/tests/generated/simple-app/src/simple_app/application.py b/src/tests/generated/simple-app/src/simple_app/application.py index 0a98353b..34a68c80 100644 --- a/src/tests/generated/simple-app/src/simple_app/application.py +++ b/src/tests/generated/simple-app/src/simple_app/application.py @@ -1,7 +1,7 @@ -from cpl.application import ApplicationABC -from cpl.configuration import ConfigurationABC -from cpl.console import Console -from cpl.dependency_injection import ServiceProviderABC +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 class Application(ApplicationABC): diff --git a/src/tests/generated/simple-app/src/simple_app/main.py b/src/tests/generated/simple-app/src/simple_app/main.py index c5d29314..a7c8142e 100644 --- a/src/tests/generated/simple-app/src/simple_app/main.py +++ b/src/tests/generated/simple-app/src/simple_app/main.py @@ -1,4 +1,4 @@ -from cpl.application import ApplicationBuilder +from cpl_core.application import ApplicationBuilder from simple_app.application import Application diff --git a/src/tests/generated/simple-console/src/main.py b/src/tests/generated/simple-console/src/main.py index 42e34771..db8266cc 100644 --- a/src/tests/generated/simple-console/src/main.py +++ b/src/tests/generated/simple-console/src/main.py @@ -1,4 +1,4 @@ -from cpl.console import Console +from cpl_core.console import Console def main(): diff --git a/src/tests/generated/simple-console/src/simple_console/main.py b/src/tests/generated/simple-console/src/simple_console/main.py index 42e34771..db8266cc 100644 --- a/src/tests/generated/simple-console/src/simple_console/main.py +++ b/src/tests/generated/simple-console/src/simple_console/main.py @@ -1,4 +1,4 @@ -from cpl.console import Console +from cpl_core.console import Console def main(): diff --git a/src/tests/generated/simple-di/src/main.py b/src/tests/generated/simple-di/src/main.py index a6bd96ec..f716961c 100644 --- a/src/tests/generated/simple-di/src/main.py +++ b/src/tests/generated/simple-di/src/main.py @@ -1,6 +1,6 @@ -from cpl.configuration import Configuration, ConfigurationABC -from cpl.console import Console -from cpl.dependency_injection import ServiceCollection, ServiceProviderABC +from cpl_core.configuration import Configuration, ConfigurationABC +from cpl_core.console import Console +from cpl_core.dependency_injection import ServiceCollection, ServiceProviderABC def configure_configuration() -> ConfigurationABC: diff --git a/src/tests/generated/simple-di/src/simple_di/main.py b/src/tests/generated/simple-di/src/simple_di/main.py index a6bd96ec..f716961c 100644 --- a/src/tests/generated/simple-di/src/simple_di/main.py +++ b/src/tests/generated/simple-di/src/simple_di/main.py @@ -1,6 +1,6 @@ -from cpl.configuration import Configuration, ConfigurationABC -from cpl.console import Console -from cpl.dependency_injection import ServiceCollection, ServiceProviderABC +from cpl_core.configuration import Configuration, ConfigurationABC +from cpl_core.console import Console +from cpl_core.dependency_injection import ServiceCollection, ServiceProviderABC def configure_configuration() -> ConfigurationABC: diff --git a/src/tests/generated/simple-startup-app/src/simple_startup_app/application.py b/src/tests/generated/simple-startup-app/src/simple_startup_app/application.py index 0a98353b..34a68c80 100644 --- a/src/tests/generated/simple-startup-app/src/simple_startup_app/application.py +++ b/src/tests/generated/simple-startup-app/src/simple_startup_app/application.py @@ -1,7 +1,7 @@ -from cpl.application import ApplicationABC -from cpl.configuration import ConfigurationABC -from cpl.console import Console -from cpl.dependency_injection import ServiceProviderABC +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 class Application(ApplicationABC): diff --git a/src/tests/generated/simple-startup-app/src/simple_startup_app/main.py b/src/tests/generated/simple-startup-app/src/simple_startup_app/main.py index 4bbb4aed..78bd9bb1 100644 --- a/src/tests/generated/simple-startup-app/src/simple_startup_app/main.py +++ b/src/tests/generated/simple-startup-app/src/simple_startup_app/main.py @@ -1,4 +1,4 @@ -from cpl.application import ApplicationBuilder +from cpl_core.application import ApplicationBuilder from simple_startup_app.application import Application from simple_startup_app.startup import Startup diff --git a/src/tests/generated/simple-startup-app/src/simple_startup_app/startup.py b/src/tests/generated/simple-startup-app/src/simple_startup_app/startup.py index 8988cf31..c29f3e6b 100644 --- a/src/tests/generated/simple-startup-app/src/simple_startup_app/startup.py +++ b/src/tests/generated/simple-startup-app/src/simple_startup_app/startup.py @@ -1,6 +1,6 @@ -from cpl.application import StartupABC -from cpl.configuration import ConfigurationABC -from cpl.dependency_injection import ServiceProviderABC, ServiceCollectionABC +from cpl_core.application import StartupABC +from cpl_core.configuration import ConfigurationABC +from cpl_core.dependency_injection import ServiceProviderABC, ServiceCollectionABC class Startup(StartupABC): diff --git a/src/tests/generated/startup-app/src/application.py b/src/tests/generated/startup-app/src/application.py index 0a98353b..34a68c80 100644 --- a/src/tests/generated/startup-app/src/application.py +++ b/src/tests/generated/startup-app/src/application.py @@ -1,7 +1,7 @@ -from cpl.application import ApplicationABC -from cpl.configuration import ConfigurationABC -from cpl.console import Console -from cpl.dependency_injection import ServiceProviderABC +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 class Application(ApplicationABC): diff --git a/src/tests/generated/startup-app/src/main.py b/src/tests/generated/startup-app/src/main.py index 6e678925..4272c911 100644 --- a/src/tests/generated/startup-app/src/main.py +++ b/src/tests/generated/startup-app/src/main.py @@ -1,4 +1,4 @@ -from cpl.application import ApplicationBuilder +from cpl_core.application import ApplicationBuilder from application import Application from startup import Startup diff --git a/src/tests/generated/startup-app/src/startup.py b/src/tests/generated/startup-app/src/startup.py index 07f5dece..acf50c86 100644 --- a/src/tests/generated/startup-app/src/startup.py +++ b/src/tests/generated/startup-app/src/startup.py @@ -1,6 +1,6 @@ -from cpl.application import StartupABC -from cpl.configuration import ConfigurationABC -from cpl.dependency_injection import ServiceProviderABC, ServiceCollectionABC +from cpl_core.application import StartupABC +from cpl_core.configuration import ConfigurationABC +from cpl_core.dependency_injection import ServiceProviderABC, ServiceCollectionABC class Startup(StartupABC):