cpl new console my-app
@@ -159,7 +159,7 @@
Create initial library
-You develop apps and packages in the context of an CPL project which is defined in an cpl_core.json.
+You develop apps and packages in the context of an CPL project which is defined in an cpl.core.json.
Run the CLI command cpl new library and provide the name my-lib, as shown here:
cpl new library my-lib
diff --git a/docs/build/html/tutorials.appsettings.html b/docs/build/html/tutorials.appsettings.html
index dabce50c..46b5c867 100644
--- a/docs/build/html/tutorials.appsettings.html
+++ b/docs/build/html/tutorials.appsettings.html
@@ -56,7 +56,7 @@
Handle console arguments
-
Use cpl_core.console.Console
+
Use cpl.core.console.Console
Use builtin logger
Send mails
Using cpl g & cpl n templating
@@ -67,9 +67,9 @@
Contributing to CPL
Deprecated
CLI reference
-
API reference
+
API reference
Discord Reference
-
Query reference
+
Query reference
Translation reference
diff --git a/docs/build/html/tutorials.console-arguments.html b/docs/build/html/tutorials.console-arguments.html
index 6aa8d6d9..547bf37a 100644
--- a/docs/build/html/tutorials.console-arguments.html
+++ b/docs/build/html/tutorials.console-arguments.html
@@ -19,7 +19,7 @@
-
+
@@ -56,7 +56,7 @@
Coming soon
-
Use cpl_core.console.Console
+
Use cpl.core.console.Console
Use builtin logger
Send mails
Using cpl g & cpl n templating
@@ -67,9 +67,9 @@
Contributing to CPL
Deprecated
CLI reference
-
API reference
+
API reference
Discord Reference
-
Query reference
+
Query reference
Translation reference
@@ -111,7 +111,7 @@
diff --git a/docs/build/html/tutorials.console.html b/docs/build/html/tutorials.console.html
index 2105607e..64312f88 100644
--- a/docs/build/html/tutorials.console.html
+++ b/docs/build/html/tutorials.console.html
@@ -4,7 +4,7 @@
- Use cpl_core.console.Console — Common Python Library documentation
+ Use cpl.core.console.Console — Common Python Library documentation
[pip-url]: https://pip.sh-edraft.de
diff --git a/docs/source/setup.md b/docs/source/setup.md
index 1a953c69..5a4ed9a2 100644
--- a/docs/source/setup.md
+++ b/docs/source/setup.md
@@ -50,7 +50,7 @@ pip install cpl-query --extra-index-url https://pip.sh-edraft.de
## Create initial console app
-You develop apps and packages in the context of an CPL project which is defined in an cpl_core.json.
+You develop apps and packages in the context of an CPL project which is defined in an cpl.core.json.
1. Run the CLI command ```cpl new console``` and provide the name my-app, as shown here:
@@ -64,7 +64,7 @@ The CLI create a new workspace and a simple 'Hello World' app, ready to run.
## Create initial library
-You develop apps and packages in the context of an CPL project which is defined in an cpl_core.json.
+You develop apps and packages in the context of an CPL project which is defined in an cpl.core.json.
1. Run the CLI command ```cpl new library``` and provide the name my-lib, as shown here:
diff --git a/docs/source/tutorials.console.md b/docs/source/tutorials.console.md
index fcbaaba1..fcc36296 100644
--- a/docs/source/tutorials.console.md
+++ b/docs/source/tutorials.console.md
@@ -1,3 +1,3 @@
-# Use cpl_core.console.Console
+# Use cpl.core.console.Console
## Coming soon
\ No newline at end of file
diff --git a/docs/source/tutorials.templating.md b/docs/source/tutorials.templating.md
index 4530b17c..faab43e5 100644
--- a/docs/source/tutorials.templating.md
+++ b/docs/source/tutorials.templating.md
@@ -76,7 +76,7 @@ Here the template ```project_console.py``` defines how a console project has to
```python
from cpl_cli.abc.project_type_abc import ProjectTypeABC
from cpl_cli.configuration import WorkspaceSettings
-from cpl_core.utils import String
+from cpl.core.utils import String
class Console(ProjectTypeABC):
@@ -142,10 +142,10 @@ class ProjectFileStartup(CodeFileTemplateABC):
import textwrap
return textwrap.dedent("""\
- from cpl_core.application import StartupABC
- from cpl_core.configuration import ConfigurationABC
- from cpl_core.dependency_injection import ServiceProviderABC, ServiceCollectionABC
- from cpl_core.environment import ApplicationEnvironment
+ from cpl.core.application import StartupABC
+ from cpl.core.configuration import ConfigurationABC
+ from cpl.core.dependency_injection import ServiceProviderABC, ServiceCollectionABC
+ from cpl.core.environment import ApplicationEnvironment
class Startup(StartupABC):
diff --git a/src/cpl_core/__init__.py b/src/cpl-core/cpl/core/__init__.py
similarity index 100%
rename from src/cpl_core/__init__.py
rename to src/cpl-core/cpl/core/__init__.py
diff --git a/src/cpl_core/application/__init__.py b/src/cpl-core/cpl/core/application/__init__.py
similarity index 100%
rename from src/cpl_core/application/__init__.py
rename to src/cpl-core/cpl/core/application/__init__.py
diff --git a/src/cpl_core/application/application_abc.py b/src/cpl-core/cpl/core/application/application_abc.py
similarity index 73%
rename from src/cpl_core/application/application_abc.py
rename to src/cpl-core/cpl/core/application/application_abc.py
index 3f814e46..087d8b48 100644
--- a/src/cpl_core/application/application_abc.py
+++ b/src/cpl-core/cpl/core/application/application_abc.py
@@ -1,19 +1,19 @@
from abc import ABC, abstractmethod
from typing import Optional
-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.application_environment_abc 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.application_environment_abc import ApplicationEnvironmentABC
class ApplicationABC(ABC):
r"""ABC for the Application class
Parameters:
- config: :class:`cpl_core.configuration.configuration_abc.ConfigurationABC`
+ config: :class:`cpl.core.configuration.configuration_abc.ConfigurationABC`
Contains object loaded from appsettings
- services: :class:`cpl_core.dependency_injection.service_provider_abc.ServiceProviderABC`
+ services: :class:`cpl.core.dependency_injection.service_provider_abc.ServiceProviderABC`
Contains instances of prepared objects
"""
@@ -49,12 +49,12 @@ class ApplicationABC(ABC):
def configure(self):
r"""Configure the application
- Called by :class:`cpl_core.application.application_abc.ApplicationABC.run`
+ Called by :class:`cpl.core.application.application_abc.ApplicationABC.run`
"""
@abstractmethod
def main(self):
r"""Custom entry point
- Called by :class:`cpl_core.application.application_abc.ApplicationABC.run`
+ Called by :class:`cpl.core.application.application_abc.ApplicationABC.run`
"""
diff --git a/src/cpl_core/application/application_builder.py b/src/cpl-core/cpl/core/application/application_builder.py
similarity index 81%
rename from src/cpl_core/application/application_builder.py
rename to src/cpl-core/cpl/core/application/application_builder.py
index 57c1e57e..4b9abbbc 100644
--- a/src/cpl_core/application/application_builder.py
+++ b/src/cpl-core/cpl/core/application/application_builder.py
@@ -1,19 +1,19 @@
from typing import Type, Optional, Callable, Union
-from cpl_core.application.application_abc import ApplicationABC
-from cpl_core.application.application_builder_abc import ApplicationBuilderABC
-from cpl_core.application.application_extension_abc import ApplicationExtensionABC
-from cpl_core.application.startup_abc import StartupABC
-from cpl_core.application.startup_extension_abc import StartupExtensionABC
-from cpl_core.configuration.configuration import Configuration
-from cpl_core.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.application_extension_abc import ApplicationExtensionABC
+from cpl.core.application.startup_abc import StartupABC
+from cpl.core.application.startup_extension_abc import StartupExtensionABC
+from cpl.core.configuration.configuration import Configuration
+from cpl.core.dependency_injection.service_collection import ServiceCollection
class ApplicationBuilder(ApplicationBuilderABC):
- r"""This is class is used to build an object of :class:`cpl_core.application.application_abc.ApplicationABC`
+ r"""This is class is used to build an object of :class:`cpl.core.application.application_abc.ApplicationABC`
Parameter:
- app: Type[:class:`cpl_core.application.application_abc.ApplicationABC`]
+ app: Type[:class:`cpl.core.application.application_abc.ApplicationABC`]
Application to build
"""
diff --git a/src/cpl_core/application/application_builder_abc.py b/src/cpl-core/cpl/core/application/application_builder_abc.py
similarity index 68%
rename from src/cpl_core/application/application_builder_abc.py
rename to src/cpl-core/cpl/core/application/application_builder_abc.py
index 7fca01f6..830def93 100644
--- a/src/cpl_core/application/application_builder_abc.py
+++ b/src/cpl-core/cpl/core/application/application_builder_abc.py
@@ -1,12 +1,12 @@
from abc import ABC, abstractmethod
from typing import Type
-from cpl_core.application.application_abc import ApplicationABC
-from cpl_core.application.startup_abc import StartupABC
+from cpl.core.application.application_abc import ApplicationABC
+from cpl.core.application.startup_abc import StartupABC
class ApplicationBuilderABC(ABC):
- r"""ABC for the :class:`cpl_core.application.application_builder.ApplicationBuilder`"""
+ r"""ABC for the :class:`cpl.core.application.application_builder.ApplicationBuilder`"""
@abstractmethod
def __init__(self, *args):
@@ -17,7 +17,7 @@ class ApplicationBuilderABC(ABC):
r"""Sets the custom startup class to use
Parameter:
- startup: Type[:class:`cpl_core.application.startup_abc.StartupABC`]
+ startup: Type[:class:`cpl.core.application.startup_abc.StartupABC`]
Startup class to use
"""
@@ -26,7 +26,7 @@ class ApplicationBuilderABC(ABC):
r"""Sets the custom startup class to use async
Parameter:
- startup: Type[:class:`cpl_core.application.startup_abc.StartupABC`]
+ startup: Type[:class:`cpl.core.application.startup_abc.StartupABC`]
Startup class to use
"""
@@ -35,7 +35,7 @@ class ApplicationBuilderABC(ABC):
r"""Creates custom application object
Returns:
- Object of :class:`cpl_core.application.application_abc.ApplicationABC`
+ Object of :class:`cpl.core.application.application_abc.ApplicationABC`
"""
@abstractmethod
@@ -43,5 +43,5 @@ class ApplicationBuilderABC(ABC):
r"""Creates custom application object async
Returns:
- Object of :class:`cpl_core.application.application_abc.ApplicationABC`
+ Object of :class:`cpl.core.application.application_abc.ApplicationABC`
"""
diff --git a/src/cpl_core/application/application_extension_abc.py b/src/cpl-core/cpl/core/application/application_extension_abc.py
similarity index 75%
rename from src/cpl_core/application/application_extension_abc.py
rename to src/cpl-core/cpl/core/application/application_extension_abc.py
index 8b35f575..293886c8 100644
--- a/src/cpl_core/application/application_extension_abc.py
+++ b/src/cpl-core/cpl/core/application/application_extension_abc.py
@@ -1,7 +1,7 @@
from abc import ABC, abstractmethod
-from cpl_core.configuration import ConfigurationABC
-from cpl_core.dependency_injection import ServiceProviderABC
+from cpl.core.configuration import ConfigurationABC
+from cpl.core.dependency_injection import ServiceProviderABC
class ApplicationExtensionABC(ABC):
diff --git a/src/cpl_core/application/startup_abc.py b/src/cpl-core/cpl/core/application/startup_abc.py
similarity index 56%
rename from src/cpl_core/application/startup_abc.py
rename to src/cpl-core/cpl/core/application/startup_abc.py
index 706221f2..63c7dbe4 100644
--- a/src/cpl_core/application/startup_abc.py
+++ b/src/cpl-core/cpl/core/application/startup_abc.py
@@ -1,9 +1,9 @@
from abc import ABC, abstractmethod
-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.environment.application_environment_abc import ApplicationEnvironmentABC
+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.environment.application_environment_abc import ApplicationEnvironmentABC
class StartupABC(ABC):
@@ -18,11 +18,11 @@ class StartupABC(ABC):
r"""Creates configuration of application
Parameter:
- config: :class:`cpl_core.configuration.configuration_abc.ConfigurationABC`
- env: :class:`cpl_core.environment.application_environment_abc`
+ config: :class:`cpl.core.configuration.configuration_abc.ConfigurationABC`
+ env: :class:`cpl.core.environment.application_environment_abc`
Returns:
- Object of :class:`cpl_core.configuration.configuration_abc.ConfigurationABC`
+ Object of :class:`cpl.core.configuration.configuration_abc.ConfigurationABC`
"""
@abstractmethod
@@ -30,9 +30,9 @@ class StartupABC(ABC):
r"""Creates service provider
Parameter:
- services: :class:`cpl_core.dependency_injection.service_collection_abc`
- env: :class:`cpl_core.environment.application_environment_abc`
+ services: :class:`cpl.core.dependency_injection.service_collection_abc`
+ env: :class:`cpl.core.environment.application_environment_abc`
Returns:
- Object of :class:`cpl_core.dependency_injection.service_provider_abc.ServiceProviderABC`
+ Object of :class:`cpl.core.dependency_injection.service_provider_abc.ServiceProviderABC`
"""
diff --git a/src/cpl_core/application/startup_extension_abc.py b/src/cpl-core/cpl/core/application/startup_extension_abc.py
similarity index 60%
rename from src/cpl_core/application/startup_extension_abc.py
rename to src/cpl-core/cpl/core/application/startup_extension_abc.py
index e8a22337..08760228 100644
--- a/src/cpl_core/application/startup_extension_abc.py
+++ b/src/cpl-core/cpl/core/application/startup_extension_abc.py
@@ -1,8 +1,8 @@
from abc import ABC, abstractmethod
-from cpl_core.configuration.configuration_abc import ConfigurationABC
-from cpl_core.dependency_injection.service_collection_abc import ServiceCollectionABC
-from cpl_core.environment.application_environment_abc import ApplicationEnvironmentABC
+from cpl.core.configuration.configuration_abc import ConfigurationABC
+from cpl.core.dependency_injection.service_collection_abc import ServiceCollectionABC
+from cpl.core.environment.application_environment_abc import ApplicationEnvironmentABC
class StartupExtensionABC(ABC):
@@ -17,8 +17,8 @@ class StartupExtensionABC(ABC):
r"""Creates configuration of application
Parameter:
- config: :class:`cpl_core.configuration.configuration_abc.ConfigurationABC`
- env: :class:`cpl_core.environment.application_environment_abc`
+ config: :class:`cpl.core.configuration.configuration_abc.ConfigurationABC`
+ env: :class:`cpl.core.environment.application_environment_abc`
"""
@abstractmethod
@@ -26,6 +26,6 @@ class StartupExtensionABC(ABC):
r"""Creates service provider
Parameter:
- services: :class:`cpl_core.dependency_injection.service_collection_abc`
- env: :class:`cpl_core.environment.application_environment_abc`
+ services: :class:`cpl.core.dependency_injection.service_collection_abc`
+ env: :class:`cpl.core.environment.application_environment_abc`
"""
diff --git a/src/cpl_core/configuration/__init__.py b/src/cpl-core/cpl/core/configuration/__init__.py
similarity index 100%
rename from src/cpl_core/configuration/__init__.py
rename to src/cpl-core/cpl/core/configuration/__init__.py
diff --git a/src/cpl_core/configuration/argument_abc.py b/src/cpl-core/cpl/core/configuration/argument_abc.py
similarity index 87%
rename from src/cpl_core/configuration/argument_abc.py
rename to src/cpl-core/cpl/core/configuration/argument_abc.py
index 51a84c88..588ff97b 100644
--- a/src/cpl_core/configuration/argument_abc.py
+++ b/src/cpl-core/cpl/core/configuration/argument_abc.py
@@ -1,6 +1,6 @@
from abc import ABC, abstractmethod
-from cpl_core.configuration.argument_type_enum import ArgumentTypeEnum
+from cpl.core.configuration.argument_type_enum import ArgumentTypeEnum
class ArgumentABC(ABC):
@@ -19,7 +19,7 @@ class ArgumentABC(ABC):
token: :class:`str`
name: :class:`str`
aliases: list[:class:`str`]
- console_arguments: List[:class:`cpl_core.configuration.console_argument.ConsoleArgument`]
+ console_arguments: List[:class:`cpl.core.configuration.console_argument.ConsoleArgument`]
"""
self._token = token
self._name = name
@@ -55,9 +55,9 @@ class ArgumentABC(ABC):
Specifies the specific type of the argument
Returns:
- self :class:`cpl_core.configuration.console_argument.ConsoleArgument` not created argument!
+ self :class:`cpl.core.configuration.console_argument.ConsoleArgument` not created argument!
"""
- from cpl_core.configuration.argument_builder import ArgumentBuilder
+ from cpl.core.configuration.argument_builder import ArgumentBuilder
argument = ArgumentBuilder.build_argument(arg_type, *args, *kwargs)
self._console_arguments.append(argument)
diff --git a/src/cpl_core/configuration/argument_builder.py b/src/cpl-core/cpl/core/configuration/argument_builder.py
similarity index 74%
rename from src/cpl_core/configuration/argument_builder.py
rename to src/cpl-core/cpl/core/configuration/argument_builder.py
index bbb06afc..67b72d13 100644
--- a/src/cpl_core/configuration/argument_builder.py
+++ b/src/cpl-core/cpl/core/configuration/argument_builder.py
@@ -1,10 +1,10 @@
from typing import Union
-from cpl_core.configuration.argument_type_enum import ArgumentTypeEnum
-from cpl_core.configuration.executable_argument import ExecutableArgument
-from cpl_core.configuration.flag_argument import FlagArgument
-from cpl_core.configuration.variable_argument import VariableArgument
-from cpl_core.console import Console
+from cpl.core.configuration.argument_type_enum import ArgumentTypeEnum
+from cpl.core.configuration.executable_argument import ExecutableArgument
+from cpl.core.configuration.flag_argument import FlagArgument
+from cpl.core.configuration.variable_argument import VariableArgument
+from cpl.core.console import Console
class ArgumentBuilder:
diff --git a/src/cpl_core/configuration/argument_executable_abc.py b/src/cpl-core/cpl/core/configuration/argument_executable_abc.py
similarity index 100%
rename from src/cpl_core/configuration/argument_executable_abc.py
rename to src/cpl-core/cpl/core/configuration/argument_executable_abc.py
diff --git a/src/cpl_core/configuration/argument_type_enum.py b/src/cpl-core/cpl/core/configuration/argument_type_enum.py
similarity index 100%
rename from src/cpl_core/configuration/argument_type_enum.py
rename to src/cpl-core/cpl/core/configuration/argument_type_enum.py
diff --git a/src/cpl_core/configuration/configuration.py b/src/cpl-core/cpl/core/configuration/configuration.py
similarity index 93%
rename from src/cpl_core/configuration/configuration.py
rename to src/cpl-core/cpl/core/configuration/configuration.py
index 9911380a..8f835369 100644
--- a/src/cpl_core/configuration/configuration.py
+++ b/src/cpl-core/cpl/core/configuration/configuration.py
@@ -5,25 +5,25 @@ import traceback
from collections.abc import Callable
from typing import Union, Optional
-from cpl_core.configuration.argument_abc import ArgumentABC
-from cpl_core.configuration.argument_builder import ArgumentBuilder
-from cpl_core.configuration.argument_type_enum import ArgumentTypeEnum
-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 (
+from cpl.core.configuration.argument_abc import ArgumentABC
+from cpl.core.configuration.argument_builder import ArgumentBuilder
+from cpl.core.configuration.argument_type_enum import ArgumentTypeEnum
+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.executable_argument import ExecutableArgument
-from cpl_core.configuration.flag_argument import FlagArgument
-from cpl_core.configuration.variable_argument import VariableArgument
-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_core.environment.application_environment import ApplicationEnvironment
-from cpl_core.environment.application_environment_abc import ApplicationEnvironmentABC
-from cpl_core.environment.environment_name_enum import EnvironmentNameEnum
-from cpl_core.type import T, R
-from cpl_core.utils.json_processor import JSONProcessor
+from cpl.core.configuration.executable_argument import ExecutableArgument
+from cpl.core.configuration.flag_argument import FlagArgument
+from cpl.core.configuration.variable_argument import VariableArgument
+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.core.environment.application_environment import ApplicationEnvironment
+from cpl.core.environment.application_environment_abc import ApplicationEnvironmentABC
+from cpl.core.environment.environment_name_enum import EnvironmentNameEnum
+from cpl.core.type import T, R
+from cpl.core.utils.json_processor import JSONProcessor
class Configuration(ConfigurationABC):
diff --git a/src/cpl_core/configuration/configuration_abc.py b/src/cpl-core/cpl/core/configuration/configuration_abc.py
similarity index 85%
rename from src/cpl_core/configuration/configuration_abc.py
rename to src/cpl-core/cpl/core/configuration/configuration_abc.py
index 1a537d27..15dcd8e7 100644
--- a/src/cpl_core/configuration/configuration_abc.py
+++ b/src/cpl-core/cpl/core/configuration/configuration_abc.py
@@ -2,16 +2,16 @@ from abc import abstractmethod, ABC
from collections.abc import Callable
from typing import Optional
-from cpl_core.configuration.argument_abc import ArgumentABC
-from cpl_core.configuration.argument_type_enum import ArgumentTypeEnum
-from cpl_core.environment.application_environment_abc import ApplicationEnvironmentABC
-from cpl_core.type import T, R
+from cpl.core.configuration.argument_abc import ArgumentABC
+from cpl.core.configuration.argument_type_enum import ArgumentTypeEnum
+from cpl.core.environment.application_environment_abc import ApplicationEnvironmentABC
+from cpl.core.type import T, R
class ConfigurationABC(ABC):
@abstractmethod
def __init__(self):
- r"""ABC for the :class:`cpl_core.configuration.configuration.Configuration`"""
+ r"""ABC for the :class:`cpl.core.configuration.configuration.Configuration`"""
@property
@abstractmethod
@@ -52,7 +52,7 @@ class ConfigurationABC(ABC):
r"""Adds console argument to known console arguments
Parameter:
- argument: :class:`cpl_core.configuration.console_argument.ConsoleArgumentABC`
+ argument: :class:`cpl.core.configuration.console_argument.ConsoleArgumentABC`
Specifies the console argument
"""
@@ -76,7 +76,7 @@ class ConfigurationABC(ABC):
r"""Add configuration object
Parameter:
- key_type: :class:`cpl_core.type.T`
+ key_type: :class:`cpl.core.type.T`
Type of the value
value: any
Object of the value
@@ -99,11 +99,11 @@ class ConfigurationABC(ABC):
Specifies were the value begins
is_value_token_optional :class:`bool`
Specifies if values are optional
- runnable: :class:`cpl_core.configuration.console_argument.ConsoleArgumentABC`
+ runnable: :class:`cpl.core.configuration.console_argument.ConsoleArgumentABC`
Specifies class to run when called if value is not None
Returns:
- Object of :class:`cpl_core.configuration.console_argument.ConsoleArgumentABC`
+ Object of :class:`cpl.core.configuration.console_argument.ConsoleArgumentABC`
"""
@abstractmethod
@@ -120,11 +120,11 @@ class ConfigurationABC(ABC):
r"""Returns value from configuration by given type
Parameter:
- search_type: :class:`cpl_core.type.T`
+ search_type: :class:`cpl.core.type.T`
Type to search for
Returns:
- Object of Union[:class:`str`, :class:`cpl_core.configuration.configuration_model_abc.ConfigurationModelABC`]
+ Object of Union[:class:`str`, :class:`cpl.core.configuration.configuration_model_abc.ConfigurationModelABC`]
"""
@abstractmethod
diff --git a/src/cpl_core/configuration/configuration_model_abc.py b/src/cpl-core/cpl/core/configuration/configuration_model_abc.py
similarity index 100%
rename from src/cpl_core/configuration/configuration_model_abc.py
rename to src/cpl-core/cpl/core/configuration/configuration_model_abc.py
diff --git a/src/cpl_core/configuration/configuration_variable_name_enum.py b/src/cpl-core/cpl/core/configuration/configuration_variable_name_enum.py
similarity index 100%
rename from src/cpl_core/configuration/configuration_variable_name_enum.py
rename to src/cpl-core/cpl/core/configuration/configuration_variable_name_enum.py
diff --git a/src/cpl_core/configuration/executable_argument.py b/src/cpl-core/cpl/core/configuration/executable_argument.py
similarity index 85%
rename from src/cpl_core/configuration/executable_argument.py
rename to src/cpl-core/cpl/core/configuration/executable_argument.py
index 75a0b206..524fc7ec 100644
--- a/src/cpl_core/configuration/executable_argument.py
+++ b/src/cpl-core/cpl/core/configuration/executable_argument.py
@@ -1,8 +1,8 @@
from typing import Type, Optional
-from cpl_core.configuration.argument_executable_abc import ArgumentExecutableABC
-from cpl_core.configuration.argument_abc import ArgumentABC
-from cpl_core.configuration.validator_abc import ValidatorABC
+from cpl.core.configuration.argument_executable_abc import ArgumentExecutableABC
+from cpl.core.configuration.argument_abc import ArgumentABC
+from cpl.core.configuration.validator_abc import ValidatorABC
class ExecutableArgument(ArgumentABC):
diff --git a/src/cpl_core/configuration/flag_argument.py b/src/cpl-core/cpl/core/configuration/flag_argument.py
similarity index 85%
rename from src/cpl_core/configuration/flag_argument.py
rename to src/cpl-core/cpl/core/configuration/flag_argument.py
index 55e974c6..a5d89f85 100644
--- a/src/cpl_core/configuration/flag_argument.py
+++ b/src/cpl-core/cpl/core/configuration/flag_argument.py
@@ -1,4 +1,4 @@
-from cpl_core.configuration.argument_abc import ArgumentABC
+from cpl.core.configuration.argument_abc import ArgumentABC
class FlagArgument(ArgumentABC):
diff --git a/src/cpl_core/configuration/validator_abc.py b/src/cpl-core/cpl/core/configuration/validator_abc.py
similarity index 100%
rename from src/cpl_core/configuration/validator_abc.py
rename to src/cpl-core/cpl/core/configuration/validator_abc.py
diff --git a/src/cpl_core/configuration/variable_argument.py b/src/cpl-core/cpl/core/configuration/variable_argument.py
similarity index 91%
rename from src/cpl_core/configuration/variable_argument.py
rename to src/cpl-core/cpl/core/configuration/variable_argument.py
index 6c86f265..104e2166 100644
--- a/src/cpl_core/configuration/variable_argument.py
+++ b/src/cpl-core/cpl/core/configuration/variable_argument.py
@@ -1,4 +1,4 @@
-from cpl_core.configuration.argument_abc import ArgumentABC
+from cpl.core.configuration.argument_abc import ArgumentABC
class VariableArgument(ArgumentABC):
diff --git a/src/cpl_core/console/__init__.py b/src/cpl-core/cpl/core/console/__init__.py
similarity index 100%
rename from src/cpl_core/console/__init__.py
rename to src/cpl-core/cpl/core/console/__init__.py
diff --git a/src/cpl_core/console/background_color_enum.py b/src/cpl-core/cpl/core/console/background_color_enum.py
similarity index 100%
rename from src/cpl_core/console/background_color_enum.py
rename to src/cpl-core/cpl/core/console/background_color_enum.py
diff --git a/src/cpl_core/console/console.py b/src/cpl-core/cpl/core/console/console.py
similarity index 94%
rename from src/cpl_core/console/console.py
rename to src/cpl-core/cpl/core/console/console.py
index 6226a685..e8497aff 100644
--- a/src/cpl_core/console/console.py
+++ b/src/cpl-core/cpl/core/console/console.py
@@ -9,10 +9,10 @@ import colorama
from tabulate import tabulate
from termcolor import colored
-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
+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:
@@ -62,7 +62,7 @@ class Console:
r"""Sets the background color
Parameter:
- color: Union[:class:`cpl_core.console.background_color_enum.BackgroundColorEnum`, :class:`str`]
+ color: Union[:class:`cpl.core.console.background_color_enum.BackgroundColorEnum`, :class:`str`]
Background color of the console
"""
if type(color) is str:
@@ -75,7 +75,7 @@ class Console:
r"""Sets the foreground color
Parameter:
- color: Union[:class:`cpl_core.console.background_color_enum.BackgroundColorEnum`, :class:`str`]
+ color: Union[:class:`cpl.core.console.background_color_enum.BackgroundColorEnum`, :class:`str`]
Foreground color of the console
"""
if type(color) is str:
@@ -366,17 +366,17 @@ class Console:
Message or header of the selection
options: List[:class:`str`]
Selectable options
- header_foreground_color: Union[:class:`str`, :class:`cpl_core.console.foreground_color_enum.ForegroundColorEnum`]
+ header_foreground_color: Union[:class:`str`, :class:`cpl.core.console.foreground_color_enum.ForegroundColorEnum`]
Foreground color of the header
- header_background_color: Union[:class:`str`, :class:`cpl_core.console.background_color_enum.BackgroundColorEnum`]
+ header_background_color: Union[:class:`str`, :class:`cpl.core.console.background_color_enum.BackgroundColorEnum`]
Background color of the header
- option_foreground_color: Union[:class:`str`, :class:`cpl_core.console.foreground_color_enum.ForegroundColorEnum`]
+ option_foreground_color: Union[:class:`str`, :class:`cpl.core.console.foreground_color_enum.ForegroundColorEnum`]
Foreground color of the options
- option_background_color: Union[:class:`str`, :class:`cpl_core.console.background_color_enum.BackgroundColorEnum`]
+ option_background_color: Union[:class:`str`, :class:`cpl.core.console.background_color_enum.BackgroundColorEnum`]
Background color of the options
- cursor_foreground_color: Union[:class:`str`, :class:`cpl_core.console.foreground_color_enum.ForegroundColorEnum`]
+ cursor_foreground_color: Union[:class:`str`, :class:`cpl.core.console.foreground_color_enum.ForegroundColorEnum`]
Foreground color of the cursor
- cursor_background_color: Union[:class:`str`, :class:`cpl_core.console.background_color_enum.BackgroundColorEnum`]
+ cursor_background_color: Union[:class:`str`, :class:`cpl.core.console.background_color_enum.BackgroundColorEnum`]
Background color of the cursor
Returns:
@@ -430,13 +430,13 @@ class Console:
Function to call
args: :class:`list`
Arguments of the function
- text_foreground_color: Union[:class:`str`, :class:`cpl_core.console.foreground_color_enum.ForegroundColorEnum`]
+ text_foreground_color: Union[:class:`str`, :class:`cpl.core.console.foreground_color_enum.ForegroundColorEnum`]
Foreground color of the text
- spinner_foreground_color: Union[:class:`str`, :class:`cpl_core.console.foreground_color_enum.ForegroundColorEnum`]
+ spinner_foreground_color: Union[:class:`str`, :class:`cpl.core.console.foreground_color_enum.ForegroundColorEnum`]
Foreground color of the spinner
- text_background_color: Union[:class:`str`, :class:`cpl_core.console.background_color_enum.BackgroundColorEnum`]
+ text_background_color: Union[:class:`str`, :class:`cpl.core.console.background_color_enum.BackgroundColorEnum`]
Background color of the text
- spinner_background_color: Union[:class:`str`, :class:`cpl_core.console.background_color_enum.BackgroundColorEnum`]
+ spinner_background_color: Union[:class:`str`, :class:`cpl.core.console.background_color_enum.BackgroundColorEnum`]
Background color of the spinner
kwargs: :class:`dict`
Keyword arguments of the call
diff --git a/src/cpl_core/console/console_call.py b/src/cpl-core/cpl/core/console/console_call.py
similarity index 100%
rename from src/cpl_core/console/console_call.py
rename to src/cpl-core/cpl/core/console/console_call.py
diff --git a/src/cpl_core/console/foreground_color_enum.py b/src/cpl-core/cpl/core/console/foreground_color_enum.py
similarity index 100%
rename from src/cpl_core/console/foreground_color_enum.py
rename to src/cpl-core/cpl/core/console/foreground_color_enum.py
diff --git a/src/cpl_core/console/spinner_thread.py b/src/cpl-core/cpl/core/console/spinner_thread.py
similarity index 91%
rename from src/cpl_core/console/spinner_thread.py
rename to src/cpl-core/cpl/core/console/spinner_thread.py
index 131cd28a..21c10754 100644
--- a/src/cpl_core/console/spinner_thread.py
+++ b/src/cpl-core/cpl/core/console/spinner_thread.py
@@ -5,8 +5,8 @@ import time
from termcolor import colored
-from cpl_core.console.background_color_enum import BackgroundColorEnum
-from cpl_core.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):
@@ -15,9 +15,9 @@ class SpinnerThread(threading.Thread):
Parameter:
msg_len: :class:`int`
Length of the message
- foreground_color: :class:`cpl_core.console.foreground_color.ForegroundColorEnum`
+ foreground_color: :class:`cpl.core.console.foreground_color.ForegroundColorEnum`
Foreground color of the spinner
- background_color: :class:`cpl_core.console.background_color.BackgroundColorEnum`
+ background_color: :class:`cpl.core.console.background_color.BackgroundColorEnum`
Background color of the spinner
"""
diff --git a/src/cpl_core/database/__init__.py b/src/cpl-core/cpl/core/database/__init__.py
similarity index 100%
rename from src/cpl_core/database/__init__.py
rename to src/cpl-core/cpl/core/database/__init__.py
diff --git a/src/cpl_core/database/connection/__init__.py b/src/cpl-core/cpl/core/database/connection/__init__.py
similarity index 100%
rename from src/cpl_core/database/connection/__init__.py
rename to src/cpl-core/cpl/core/database/connection/__init__.py
diff --git a/src/cpl_core/database/connection/database_connection.py b/src/cpl-core/cpl/core/database/connection/database_connection.py
similarity index 90%
rename from src/cpl_core/database/connection/database_connection.py
rename to src/cpl-core/cpl/core/database/connection/database_connection.py
index a814fd0a..3967dc0a 100644
--- a/src/cpl_core/database/connection/database_connection.py
+++ b/src/cpl-core/cpl/core/database/connection/database_connection.py
@@ -4,9 +4,9 @@ import mysql.connector as sql
from mysql.connector.abstracts import MySQLConnectionAbstract
from mysql.connector.cursor import MySQLCursorBuffered
-from cpl_core.database.connection.database_connection_abc import DatabaseConnectionABC
-from cpl_core.database.database_settings import DatabaseSettings
-from cpl_core.utils.credential_manager import CredentialManager
+from cpl.core.database.connection.database_connection_abc import DatabaseConnectionABC
+from cpl.core.database.database_settings import DatabaseSettings
+from cpl.core.utils.credential_manager import CredentialManager
class DatabaseConnection(DatabaseConnectionABC):
diff --git a/src/cpl_core/database/connection/database_connection_abc.py b/src/cpl-core/cpl/core/database/connection/database_connection_abc.py
similarity index 86%
rename from src/cpl_core/database/connection/database_connection_abc.py
rename to src/cpl-core/cpl/core/database/connection/database_connection_abc.py
index 4ebfcb57..5084e33e 100644
--- a/src/cpl_core/database/connection/database_connection_abc.py
+++ b/src/cpl-core/cpl/core/database/connection/database_connection_abc.py
@@ -1,12 +1,12 @@
from abc import ABC, abstractmethod
-from cpl_core.database.database_settings import DatabaseSettings
+from cpl.core.database.database_settings import DatabaseSettings
from mysql.connector.abstracts import MySQLConnectionAbstract
from mysql.connector.cursor import MySQLCursorBuffered
class DatabaseConnectionABC(ABC):
- r"""ABC for the :class:`cpl_core.database.connection.database_connection.DatabaseConnection`"""
+ r"""ABC for the :class:`cpl.core.database.connection.database_connection.DatabaseConnection`"""
@abstractmethod
def __init__(self):
diff --git a/src/cpl_core/database/context/__init__.py b/src/cpl-core/cpl/core/database/context/__init__.py
similarity index 100%
rename from src/cpl_core/database/context/__init__.py
rename to src/cpl-core/cpl/core/database/context/__init__.py
diff --git a/src/cpl_core/database/context/database_context.py b/src/cpl-core/cpl/core/database/context/database_context.py
similarity index 81%
rename from src/cpl_core/database/context/database_context.py
rename to src/cpl-core/cpl/core/database/context/database_context.py
index b557757d..03d5d2b9 100644
--- a/src/cpl_core/database/context/database_context.py
+++ b/src/cpl-core/cpl/core/database/context/database_context.py
@@ -1,10 +1,10 @@
from typing import Optional
-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.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 mysql.connector.cursor import MySQLCursorBuffered
@@ -12,7 +12,7 @@ class DatabaseContext(DatabaseContextABC):
r"""Representation of the database context
Parameter:
- database_settings: :class:`cpl_core.database.database_settings.DatabaseSettings`
+ database_settings: :class:`cpl.core.database.database_settings.DatabaseSettings`
"""
def __init__(self):
diff --git a/src/cpl_core/database/context/database_context_abc.py b/src/cpl-core/cpl/core/database/context/database_context_abc.py
similarity index 81%
rename from src/cpl_core/database/context/database_context_abc.py
rename to src/cpl-core/cpl/core/database/context/database_context_abc.py
index 6ab03ff4..21d4996c 100644
--- a/src/cpl_core/database/context/database_context_abc.py
+++ b/src/cpl-core/cpl/core/database/context/database_context_abc.py
@@ -1,11 +1,11 @@
from abc import ABC, abstractmethod
-from cpl_core.database.database_settings import DatabaseSettings
+from cpl.core.database.database_settings import DatabaseSettings
from mysql.connector.cursor import MySQLCursorBuffered
class DatabaseContextABC(ABC):
- r"""ABC for the :class:`cpl_core.database.context.database_context.DatabaseContext`"""
+ r"""ABC for the :class:`cpl.core.database.context.database_context.DatabaseContext`"""
@abstractmethod
def __init__(self, *args):
@@ -21,7 +21,7 @@ class DatabaseContextABC(ABC):
r"""Connects to a database by connection settings
Parameter:
- database_settings :class:`cpl_core.database.database_settings.DatabaseSettings`
+ database_settings :class:`cpl.core.database.database_settings.DatabaseSettings`
"""
@abstractmethod
diff --git a/src/cpl_core/database/database_settings.py b/src/cpl-core/cpl/core/database/database_settings.py
similarity index 96%
rename from src/cpl_core/database/database_settings.py
rename to src/cpl-core/cpl/core/database/database_settings.py
index 80572018..cdae643b 100644
--- a/src/cpl_core/database/database_settings.py
+++ b/src/cpl-core/cpl/core/database/database_settings.py
@@ -1,6 +1,6 @@
from typing import Optional
-from cpl_core.configuration.configuration_model_abc import ConfigurationModelABC
+from cpl.core.configuration.configuration_model_abc import ConfigurationModelABC
class DatabaseSettings(ConfigurationModelABC):
diff --git a/src/cpl_core/database/database_settings_name_enum.py b/src/cpl-core/cpl/core/database/database_settings_name_enum.py
similarity index 100%
rename from src/cpl_core/database/database_settings_name_enum.py
rename to src/cpl-core/cpl/core/database/database_settings_name_enum.py
diff --git a/src/cpl_core/database/table_abc.py b/src/cpl-core/cpl/core/database/table_abc.py
similarity index 100%
rename from src/cpl_core/database/table_abc.py
rename to src/cpl-core/cpl/core/database/table_abc.py
diff --git a/src/cpl_core/dependency_injection/__init__.py b/src/cpl-core/cpl/core/dependency_injection/__init__.py
similarity index 100%
rename from src/cpl_core/dependency_injection/__init__.py
rename to src/cpl-core/cpl/core/dependency_injection/__init__.py
diff --git a/src/cpl_core/dependency_injection/scope.py b/src/cpl-core/cpl/core/dependency_injection/scope.py
similarity index 80%
rename from src/cpl_core/dependency_injection/scope.py
rename to src/cpl-core/cpl/core/dependency_injection/scope.py
index ca571fb2..fc41f954 100644
--- a/src/cpl_core/dependency_injection/scope.py
+++ b/src/cpl-core/cpl/core/dependency_injection/scope.py
@@ -1,5 +1,5 @@
-from cpl_core.dependency_injection.scope_abc import ScopeABC
-from cpl_core.dependency_injection.service_provider_abc import ServiceProviderABC
+from cpl.core.dependency_injection.scope_abc import ScopeABC
+from cpl.core.dependency_injection.service_provider_abc import ServiceProviderABC
class Scope(ScopeABC):
diff --git a/src/cpl_core/dependency_injection/scope_abc.py b/src/cpl-core/cpl/core/dependency_injection/scope_abc.py
similarity index 75%
rename from src/cpl_core/dependency_injection/scope_abc.py
rename to src/cpl-core/cpl/core/dependency_injection/scope_abc.py
index 6e48e0c5..bbe99e79 100644
--- a/src/cpl_core/dependency_injection/scope_abc.py
+++ b/src/cpl-core/cpl/core/dependency_injection/scope_abc.py
@@ -2,7 +2,7 @@ from abc import ABC, abstractmethod
class ScopeABC(ABC):
- r"""ABC for the class :class:`cpl_core.dependency_injection.scope.Scope`"""
+ r"""ABC for the class :class:`cpl.core.dependency_injection.scope.Scope`"""
def __init__(self):
pass
@@ -13,7 +13,7 @@ class ScopeABC(ABC):
r"""Returns to service provider of scope
Returns:
- Object of type :class:`cpl_core.dependency_injection.service_provider_abc.ServiceProviderABC`
+ Object of type :class:`cpl.core.dependency_injection.service_provider_abc.ServiceProviderABC`
"""
@abstractmethod
diff --git a/src/cpl_core/dependency_injection/scope_builder.py b/src/cpl-core/cpl/core/dependency_injection/scope_builder.py
similarity index 51%
rename from src/cpl_core/dependency_injection/scope_builder.py
rename to src/cpl-core/cpl/core/dependency_injection/scope_builder.py
index 4e949205..0730629f 100644
--- a/src/cpl_core/dependency_injection/scope_builder.py
+++ b/src/cpl-core/cpl/core/dependency_injection/scope_builder.py
@@ -1,10 +1,10 @@
-from cpl_core.dependency_injection.scope import Scope
-from cpl_core.dependency_injection.scope_abc import ScopeABC
-from cpl_core.dependency_injection.service_provider_abc import ServiceProviderABC
+from cpl.core.dependency_injection.scope import Scope
+from cpl.core.dependency_injection.scope_abc import ScopeABC
+from cpl.core.dependency_injection.service_provider_abc import ServiceProviderABC
class ScopeBuilder:
- r"""Class to build :class:`cpl_core.dependency_injection.scope.Scope`"""
+ r"""Class to build :class:`cpl.core.dependency_injection.scope.Scope`"""
def __init__(self, service_provider: ServiceProviderABC) -> None:
self._service_provider = service_provider
@@ -13,6 +13,6 @@ class ScopeBuilder:
r"""Returns scope
Returns:
- Object of type :class:`cpl_core.dependency_injection.scope.Scope`
+ Object of type :class:`cpl.core.dependency_injection.scope.Scope`
"""
return Scope(self._service_provider)
diff --git a/src/cpl_core/dependency_injection/service_collection.py b/src/cpl-core/cpl/core/dependency_injection/service_collection.py
similarity index 80%
rename from src/cpl_core/dependency_injection/service_collection.py
rename to src/cpl-core/cpl/core/dependency_injection/service_collection.py
index 7acd7e4b..9959b01e 100644
--- a/src/cpl_core/dependency_injection/service_collection.py
+++ b/src/cpl-core/cpl/core/dependency_injection/service_collection.py
@@ -1,17 +1,17 @@
from typing import Union, Type, Callable, Optional
-from cpl_core.configuration.configuration_abc import ConfigurationABC
-from cpl_core.database.context.database_context_abc import DatabaseContextABC
-from cpl_core.database.database_settings import DatabaseSettings
-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.dependency_injection.service_provider_abc import ServiceProviderABC
-from cpl_core.log.logger_abc import LoggerABC
-from cpl_core.log.logger_service import Logger
-from cpl_core.pipes.pipe_abc import PipeABC
-from cpl_core.type import T
+from cpl.core.configuration.configuration_abc import ConfigurationABC
+from cpl.core.database.context.database_context_abc import DatabaseContextABC
+from cpl.core.database.database_settings import DatabaseSettings
+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.dependency_injection.service_provider_abc import ServiceProviderABC
+from cpl.core.log.logger_abc import LoggerABC
+from cpl.core.log.logger_service import Logger
+from cpl.core.pipes.pipe_abc import PipeABC
+from cpl.core.type import T
class ServiceCollection(ServiceCollectionABC):
diff --git a/src/cpl_core/dependency_injection/service_collection_abc.py b/src/cpl-core/cpl/core/dependency_injection/service_collection_abc.py
similarity index 79%
rename from src/cpl_core/dependency_injection/service_collection_abc.py
rename to src/cpl-core/cpl/core/dependency_injection/service_collection_abc.py
index 034f19c0..b89d0712 100644
--- a/src/cpl_core/dependency_injection/service_collection_abc.py
+++ b/src/cpl-core/cpl/core/dependency_injection/service_collection_abc.py
@@ -1,14 +1,14 @@
from abc import abstractmethod, ABC
from typing import Type
-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.type import T
+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.type import T
class ServiceCollectionABC(ABC):
- r"""ABC for the class :class:`cpl_core.dependency_injection.service_collection.ServiceCollection`"""
+ r"""ABC for the class :class:`cpl.core.dependency_injection.service_collection.ServiceCollection`"""
@abstractmethod
def __init__(self):
@@ -19,7 +19,7 @@ class ServiceCollectionABC(ABC):
r"""Adds database context
Parameter:
- db_context: Type[:class:`cpl_core.database.context.database_context_abc.DatabaseContextABC`]
+ db_context: Type[:class:`cpl.core.database.context.database_context_abc.DatabaseContextABC`]
Database context
"""
@@ -50,7 +50,7 @@ class ServiceCollectionABC(ABC):
Object of the service
Returns:
- self: :class:`cpl_core.dependency_injection.service_collection_abc.ServiceCollectionABC`
+ self: :class:`cpl.core.dependency_injection.service_collection_abc.ServiceCollectionABC`
"""
@abstractmethod
@@ -64,7 +64,7 @@ class ServiceCollectionABC(ABC):
Object of the service
Returns:
- self: :class:`cpl_core.dependency_injection.service_collection_abc.ServiceCollectionABC`
+ self: :class:`cpl.core.dependency_injection.service_collection_abc.ServiceCollectionABC`
"""
@abstractmethod
@@ -78,7 +78,7 @@ class ServiceCollectionABC(ABC):
Object of the service
Returns:
- self: :class:`cpl_core.dependency_injection.service_collection_abc.ServiceCollectionABC`
+ self: :class:`cpl.core.dependency_injection.service_collection_abc.ServiceCollectionABC`
"""
@abstractmethod
@@ -86,5 +86,5 @@ class ServiceCollectionABC(ABC):
r"""Creates instance of the service provider
Returns:
- Object of type :class:`cpl_core.dependency_injection.service_provider_abc.ServiceProviderABC`
+ Object of type :class:`cpl.core.dependency_injection.service_provider_abc.ServiceProviderABC`
"""
diff --git a/src/cpl_core/dependency_injection/service_descriptor.py b/src/cpl-core/cpl/core/dependency_injection/service_descriptor.py
similarity index 91%
rename from src/cpl_core/dependency_injection/service_descriptor.py
rename to src/cpl-core/cpl/core/dependency_injection/service_descriptor.py
index dc5a6993..3f1b58fd 100644
--- a/src/cpl_core/dependency_injection/service_descriptor.py
+++ b/src/cpl-core/cpl/core/dependency_injection/service_descriptor.py
@@ -1,6 +1,6 @@
from typing import Union, Optional
-from cpl_core.dependency_injection.service_lifetime_enum import ServiceLifetimeEnum
+from cpl.core.dependency_injection.service_lifetime_enum import ServiceLifetimeEnum
class ServiceDescriptor:
@@ -9,7 +9,7 @@ class ServiceDescriptor:
Parameter:
implementation: Union[:class:`type`, Optional[:class:`object`]]
Object or type of service
- lifetime: :class:`cpl_core.dependency_injection.service_lifetime_enum.ServiceLifetimeEnum`
+ lifetime: :class:`cpl.core.dependency_injection.service_lifetime_enum.ServiceLifetimeEnum`
Lifetime of the service
"""
diff --git a/src/cpl_core/dependency_injection/service_lifetime_enum.py b/src/cpl-core/cpl/core/dependency_injection/service_lifetime_enum.py
similarity index 100%
rename from src/cpl_core/dependency_injection/service_lifetime_enum.py
rename to src/cpl-core/cpl/core/dependency_injection/service_lifetime_enum.py
diff --git a/src/cpl_core/dependency_injection/service_provider.py b/src/cpl-core/cpl/core/dependency_injection/service_provider.py
similarity index 88%
rename from src/cpl_core/dependency_injection/service_provider.py
rename to src/cpl-core/cpl/core/dependency_injection/service_provider.py
index 164012ba..f57eb2a4 100644
--- a/src/cpl_core/dependency_injection/service_provider.py
+++ b/src/cpl-core/cpl/core/dependency_injection/service_provider.py
@@ -3,16 +3,16 @@ import typing
from inspect import signature, Parameter, Signature
from typing import Optional
-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.scope_abc import ScopeABC
-from cpl_core.dependency_injection.scope_builder import ScopeBuilder
-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_abc import ServiceProviderABC
-from cpl_core.environment.application_environment_abc import ApplicationEnvironmentABC
-from cpl_core.type import T, R
+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.scope_abc import ScopeABC
+from cpl.core.dependency_injection.scope_builder import ScopeBuilder
+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_abc import ServiceProviderABC
+from cpl.core.environment.application_environment_abc import ApplicationEnvironmentABC
+from cpl.core.type import T, R
class ServiceProvider(ServiceProviderABC):
@@ -20,11 +20,11 @@ class ServiceProvider(ServiceProviderABC):
Parameter
---------
- service_descriptors: list[:class:`cpl_core.dependency_injection.service_descriptor.ServiceDescriptor`]
+ service_descriptors: list[:class:`cpl.core.dependency_injection.service_descriptor.ServiceDescriptor`]
Descriptor of the service
- config: :class:`cpl_core.configuration.configuration_abc.ConfigurationABC`
+ config: :class:`cpl.core.configuration.configuration_abc.ConfigurationABC`
CPL Configuration
- db_context: Optional[:class:`cpl_core.database.context.database_context_abc.DatabaseContextABC`]
+ db_context: Optional[:class:`cpl.core.database.context.database_context_abc.DatabaseContextABC`]
Database representation
"""
diff --git a/src/cpl_core/dependency_injection/service_provider_abc.py b/src/cpl-core/cpl/core/dependency_injection/service_provider_abc.py
similarity index 82%
rename from src/cpl_core/dependency_injection/service_provider_abc.py
rename to src/cpl-core/cpl/core/dependency_injection/service_provider_abc.py
index f22329fb..96d09638 100644
--- a/src/cpl_core/dependency_injection/service_provider_abc.py
+++ b/src/cpl-core/cpl/core/dependency_injection/service_provider_abc.py
@@ -3,12 +3,12 @@ from abc import abstractmethod, ABC
from inspect import Signature, signature
from typing import Optional
-from cpl_core.dependency_injection.scope_abc import ScopeABC
-from cpl_core.type import T, R
+from cpl.core.dependency_injection.scope_abc import ScopeABC
+from cpl.core.type import T, R
class ServiceProviderABC(ABC):
- r"""ABC for the class :class:`cpl_core.dependency_injection.service_provider.ServiceProvider`"""
+ r"""ABC for the class :class:`cpl.core.dependency_injection.service_provider.ServiceProvider`"""
_provider: Optional["ServiceProviderABC"] = None
@@ -44,7 +44,7 @@ class ServiceProviderABC(ABC):
Parameter
---------
- Object of type :class:`cpl_core.dependency_injection.scope_abc.ScopeABC`
+ Object of type :class:`cpl.core.dependency_injection.scope_abc.ScopeABC`
Service scope
"""
@@ -54,7 +54,7 @@ class ServiceProviderABC(ABC):
Returns
-------
- Object of type :class:`cpl_core.dependency_injection.scope_abc.ScopeABC`
+ Object of type :class:`cpl.core.dependency_injection.scope_abc.ScopeABC`
"""
@abstractmethod
@@ -63,12 +63,12 @@ class ServiceProviderABC(ABC):
Parameter
---------
- instance_type: :class:`cpl_core.type.T`
+ instance_type: :class:`cpl.core.type.T`
The type of the searched instance
Returns
-------
- Object of type Optional[:class:`cpl_core.type.T`]
+ Object of type Optional[:class:`cpl.core.type.T`]
"""
@abstractmethod
@@ -77,12 +77,12 @@ class ServiceProviderABC(ABC):
Parameter
---------
- service_type: :class:`cpl_core.type.T`
+ service_type: :class:`cpl.core.type.T`
The type of the searched instance
Returns
-------
- Object of type list[Optional[:class:`cpl_core.type.T`]
+ Object of type list[Optional[:class:`cpl.core.type.T`]
"""
@classmethod
diff --git a/src/cpl_core/environment/__init__.py b/src/cpl-core/cpl/core/environment/__init__.py
similarity index 100%
rename from src/cpl_core/environment/__init__.py
rename to src/cpl-core/cpl/core/environment/__init__.py
diff --git a/src/cpl_core/environment/application_environment.py b/src/cpl-core/cpl/core/environment/application_environment.py
similarity index 93%
rename from src/cpl_core/environment/application_environment.py
rename to src/cpl-core/cpl/core/environment/application_environment.py
index bd3f0c0c..2f063efd 100644
--- a/src/cpl_core/environment/application_environment.py
+++ b/src/cpl-core/cpl/core/environment/application_environment.py
@@ -3,15 +3,15 @@ from datetime import datetime
from socket import gethostname
from typing import Optional
-from cpl_core.environment.application_environment_abc import ApplicationEnvironmentABC
-from cpl_core.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):
r"""Represents environment of the application
Parameter:
- name: :class:`cpl_core.environment.environment_name_enum.EnvironmentNameEnum`
+ name: :class:`cpl.core.environment.environment_name_enum.EnvironmentNameEnum`
"""
def __init__(self, name: EnvironmentNameEnum = EnvironmentNameEnum.production):
diff --git a/src/cpl_core/environment/application_environment_abc.py b/src/cpl-core/cpl/core/environment/application_environment_abc.py
similarity index 96%
rename from src/cpl_core/environment/application_environment_abc.py
rename to src/cpl-core/cpl/core/environment/application_environment_abc.py
index 963848f3..eb1abcdd 100644
--- a/src/cpl_core/environment/application_environment_abc.py
+++ b/src/cpl-core/cpl/core/environment/application_environment_abc.py
@@ -3,7 +3,7 @@ from datetime import datetime
class ApplicationEnvironmentABC(ABC):
- r"""ABC of the class :class:`cpl_core.environment.application_environment.ApplicationEnvironment`"""
+ r"""ABC of the class :class:`cpl.core.environment.application_environment.ApplicationEnvironment`"""
@abstractmethod
def __init__(self):
diff --git a/src/cpl_core/environment/environment_name_enum.py b/src/cpl-core/cpl/core/environment/environment_name_enum.py
similarity index 100%
rename from src/cpl_core/environment/environment_name_enum.py
rename to src/cpl-core/cpl/core/environment/environment_name_enum.py
diff --git a/src/cpl_core/log/__init__.py b/src/cpl-core/cpl/core/log/__init__.py
similarity index 100%
rename from src/cpl_core/log/__init__.py
rename to src/cpl-core/cpl/core/log/__init__.py
diff --git a/src/cpl_core/log/logger_abc.py b/src/cpl-core/cpl/core/log/logger_abc.py
similarity index 97%
rename from src/cpl_core/log/logger_abc.py
rename to src/cpl-core/cpl/core/log/logger_abc.py
index dd2e94f3..6092df2c 100644
--- a/src/cpl_core/log/logger_abc.py
+++ b/src/cpl-core/cpl/core/log/logger_abc.py
@@ -2,7 +2,7 @@ from abc import abstractmethod, ABC
class LoggerABC(ABC):
- r"""ABC for :class:`cpl_core.log.logger_service.Logger`"""
+ r"""ABC for :class:`cpl.core.log.logger_service.Logger`"""
@abstractmethod
def __init__(self):
diff --git a/src/cpl_core/log/logger_service.py b/src/cpl-core/cpl/core/log/logger_service.py
similarity index 93%
rename from src/cpl_core/log/logger_service.py
rename to src/cpl-core/cpl/core/log/logger_service.py
index 1bbc34ca..a7703fa8 100644
--- a/src/cpl_core/log/logger_service.py
+++ b/src/cpl-core/cpl/core/log/logger_service.py
@@ -4,25 +4,25 @@ import sys
import traceback
from string import Template
-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.environment.application_environment_abc import ApplicationEnvironmentABC
-from cpl_core.log.logger_abc import LoggerABC
-from cpl_core.log.logging_level_enum import LoggingLevelEnum
-from cpl_core.log.logging_settings import LoggingSettings
-from cpl_core.time.time_format_settings import TimeFormatSettings
+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.environment.application_environment_abc import ApplicationEnvironmentABC
+from cpl.core.log.logger_abc import LoggerABC
+from cpl.core.log.logging_level_enum import LoggingLevelEnum
+from cpl.core.log.logging_settings import LoggingSettings
+from cpl.core.time.time_format_settings import TimeFormatSettings
class Logger(LoggerABC):
r"""Service for logging
Parameter:
- logging_settings: :class:`cpl_core.log.logging_settings.LoggingSettings`
+ logging_settings: :class:`cpl.core.log.logging_settings.LoggingSettings`
Settings for the logger
- time_format: :class:`cpl_core.time.time_format_settings.TimeFormatSettings`
+ time_format: :class:`cpl.core.time.time_format_settings.TimeFormatSettings`
Time format settings
- env: :class:`cpl_core.environment.application_environment_abc.ApplicationEnvironmentABC`
+ env: :class:`cpl.core.environment.application_environment_abc.ApplicationEnvironmentABC`
Environment of the application
"""
@@ -138,7 +138,7 @@ class Logger(LoggerABC):
Parameter:
name: :class:`str`
Name of the message
- level: :class:`cpl_core.log.logging_level_enum.LoggingLevelEnum`
+ level: :class:`cpl.core.log.logging_level_enum.LoggingLevelEnum`
Logging level
message: :class:`str`
Log message
diff --git a/src/cpl_core/log/logging_level_enum.py b/src/cpl-core/cpl/core/log/logging_level_enum.py
similarity index 100%
rename from src/cpl_core/log/logging_level_enum.py
rename to src/cpl-core/cpl/core/log/logging_level_enum.py
diff --git a/src/cpl_core/log/logging_settings.py b/src/cpl-core/cpl/core/log/logging_settings.py
similarity index 91%
rename from src/cpl_core/log/logging_settings.py
rename to src/cpl-core/cpl/core/log/logging_settings.py
index b5ffb1fb..a239c638 100644
--- a/src/cpl_core/log/logging_settings.py
+++ b/src/cpl-core/cpl/core/log/logging_settings.py
@@ -1,7 +1,7 @@
from typing import Optional
-from cpl_core.configuration.configuration_model_abc import ConfigurationModelABC
-from cpl_core.log.logging_level_enum import LoggingLevelEnum
+from cpl.core.configuration.configuration_model_abc import ConfigurationModelABC
+from cpl.core.log.logging_level_enum import LoggingLevelEnum
class LoggingSettings(ConfigurationModelABC):
diff --git a/src/cpl_core/log/logging_settings_name_enum.py b/src/cpl-core/cpl/core/log/logging_settings_name_enum.py
similarity index 100%
rename from src/cpl_core/log/logging_settings_name_enum.py
rename to src/cpl-core/cpl/core/log/logging_settings_name_enum.py
diff --git a/src/cpl_core/mailing/__init__.py b/src/cpl-core/cpl/core/mailing/__init__.py
similarity index 100%
rename from src/cpl_core/mailing/__init__.py
rename to src/cpl-core/cpl/core/mailing/__init__.py
diff --git a/src/cpl_core/pipes/__init__.py b/src/cpl-core/cpl/core/pipes/__init__.py
similarity index 100%
rename from src/cpl_core/pipes/__init__.py
rename to src/cpl-core/cpl/core/pipes/__init__.py
diff --git a/src/cpl_core/pipes/bool_pipe.py b/src/cpl-core/cpl/core/pipes/bool_pipe.py
similarity index 77%
rename from src/cpl_core/pipes/bool_pipe.py
rename to src/cpl-core/cpl/core/pipes/bool_pipe.py
index 158f5ff3..cd1bd6b9 100644
--- a/src/cpl_core/pipes/bool_pipe.py
+++ b/src/cpl-core/cpl/core/pipes/bool_pipe.py
@@ -1,4 +1,4 @@
-from cpl_core.pipes.pipe_abc import PipeABC
+from cpl.core.pipes.pipe_abc import PipeABC
class BoolPipe(PipeABC):
diff --git a/src/cpl_core/pipes/ip_address_pipe.py b/src/cpl-core/cpl/core/pipes/ip_address_pipe.py
similarity index 92%
rename from src/cpl_core/pipes/ip_address_pipe.py
rename to src/cpl-core/cpl/core/pipes/ip_address_pipe.py
index 71e5c0b4..c01d79c9 100644
--- a/src/cpl_core/pipes/ip_address_pipe.py
+++ b/src/cpl-core/cpl/core/pipes/ip_address_pipe.py
@@ -1,4 +1,4 @@
-from cpl_core.pipes.pipe_abc import PipeABC
+from cpl.core.pipes.pipe_abc import PipeABC
class IPAddressPipe(PipeABC):
diff --git a/src/cpl_core/pipes/pipe_abc.py b/src/cpl-core/cpl/core/pipes/pipe_abc.py
similarity index 100%
rename from src/cpl_core/pipes/pipe_abc.py
rename to src/cpl-core/cpl/core/pipes/pipe_abc.py
diff --git a/src/cpl_core/pipes/version_pipe.py b/src/cpl-core/cpl/core/pipes/version_pipe.py
similarity index 92%
rename from src/cpl_core/pipes/version_pipe.py
rename to src/cpl-core/cpl/core/pipes/version_pipe.py
index c6031578..10545559 100644
--- a/src/cpl_core/pipes/version_pipe.py
+++ b/src/cpl-core/cpl/core/pipes/version_pipe.py
@@ -1,5 +1,5 @@
from cpl_cli.configuration import VersionSettingsNameEnum
-from cpl_core.pipes.pipe_abc import PipeABC
+from cpl.core.pipes.pipe_abc import PipeABC
class VersionPipe(PipeABC):
diff --git a/src/cpl_core/time/__init__.py b/src/cpl-core/cpl/core/time/__init__.py
similarity index 100%
rename from src/cpl_core/time/__init__.py
rename to src/cpl-core/cpl/core/time/__init__.py
diff --git a/src/cpl_core/time/time_format_settings.py b/src/cpl-core/cpl/core/time/time_format_settings.py
similarity index 95%
rename from src/cpl_core/time/time_format_settings.py
rename to src/cpl-core/cpl/core/time/time_format_settings.py
index 342825f4..7c9cded0 100644
--- a/src/cpl_core/time/time_format_settings.py
+++ b/src/cpl-core/cpl/core/time/time_format_settings.py
@@ -1,6 +1,6 @@
from typing import Optional
-from cpl_core.configuration.configuration_model_abc import ConfigurationModelABC
+from cpl.core.configuration.configuration_model_abc import ConfigurationModelABC
class TimeFormatSettings(ConfigurationModelABC):
diff --git a/src/cpl_core/time/time_format_settings_names_enum.py b/src/cpl-core/cpl/core/time/time_format_settings_names_enum.py
similarity index 100%
rename from src/cpl_core/time/time_format_settings_names_enum.py
rename to src/cpl-core/cpl/core/time/time_format_settings_names_enum.py
diff --git a/src/cpl_core/type.py b/src/cpl-core/cpl/core/type.py
similarity index 100%
rename from src/cpl_core/type.py
rename to src/cpl-core/cpl/core/type.py
diff --git a/src/cpl_core/utils/__init__.py b/src/cpl-core/cpl/core/utils/__init__.py
similarity index 100%
rename from src/cpl_core/utils/__init__.py
rename to src/cpl-core/cpl/core/utils/__init__.py
diff --git a/src/cpl_core/utils/credential_manager.py b/src/cpl-core/cpl/core/utils/credential_manager.py
similarity index 100%
rename from src/cpl_core/utils/credential_manager.py
rename to src/cpl-core/cpl/core/utils/credential_manager.py
diff --git a/src/cpl_core/utils/json_processor.py b/src/cpl-core/cpl/core/utils/json_processor.py
similarity index 98%
rename from src/cpl_core/utils/json_processor.py
rename to src/cpl-core/cpl/core/utils/json_processor.py
index a01245a0..d4c45474 100644
--- a/src/cpl_core/utils/json_processor.py
+++ b/src/cpl-core/cpl/core/utils/json_processor.py
@@ -1,7 +1,7 @@
import enum
from inspect import signature, Parameter
-from cpl_core.utils import String
+from cpl.core.utils import String
class JSONProcessor:
diff --git a/src/cpl_core/utils/pip.py b/src/cpl-core/cpl/core/utils/pip.py
similarity index 100%
rename from src/cpl_core/utils/pip.py
rename to src/cpl-core/cpl/core/utils/pip.py
diff --git a/src/cpl_core/utils/string.py b/src/cpl-core/cpl/core/utils/string.py
similarity index 100%
rename from src/cpl_core/utils/string.py
rename to src/cpl-core/cpl/core/utils/string.py
diff --git a/src/cpl_core/pyproject.toml b/src/cpl-core/pyproject.toml
similarity index 78%
rename from src/cpl_core/pyproject.toml
rename to src/cpl-core/pyproject.toml
index fdac6710..e4002aa8 100644
--- a/src/cpl_core/pyproject.toml
+++ b/src/cpl-core/pyproject.toml
@@ -8,7 +8,7 @@ version = "2024.7.0"
description = "CPL core"
readme = "CPL core package"
requires-python = ">=3.12"
-license = { text = "MIT" }
+license = "MIT"
authors = [
{ name = "Sven Heidemann", email = "sven.heidemann@sh-edraft.de" }
]
@@ -19,18 +19,9 @@ dynamic = ["dependencies", "optional-dependencies"]
[project.urls]
Homepage = "https://www.sh-edraft.de"
-[tool.setuptools]
-package-dir = { "" = "." }
-include-package-data = true
-
[tool.setuptools.packages.find]
where = ["."]
-include = ["cpl_core*"]
-exclude = [
- "__pycache__",
- "logs",
- "tests",
-]
+include = ["cpl*"]
[tool.setuptools.dynamic]
dependencies = { file = ["requirements.txt"] }
diff --git a/src/cpl_core/requirements.dev.txt b/src/cpl-core/requirements.dev.txt
similarity index 100%
rename from src/cpl_core/requirements.dev.txt
rename to src/cpl-core/requirements.dev.txt
diff --git a/src/cpl_core/requirements.txt b/src/cpl-core/requirements.txt
similarity index 100%
rename from src/cpl_core/requirements.txt
rename to src/cpl-core/requirements.txt
diff --git a/src/cpl-mail/cpl/mail/__init__.py b/src/cpl-mail/cpl/mail/__init__.py
new file mode 100644
index 00000000..4e4ed614
--- /dev/null
+++ b/src/cpl-mail/cpl/mail/__init__.py
@@ -0,0 +1,5 @@
+from .email_model import EMail
+from .email_client_service import EMailClient
+from .abc.email_client_abc import EMailClientABC
+from .email_client_settings import EMailClientSettings
+from .email_client_settings_name_enum import EMailClientSettingsNameEnum
\ No newline at end of file
diff --git a/src/cpl_mail/__init__.py b/src/cpl-mail/cpl/mail/abc/__init__.py
similarity index 100%
rename from src/cpl_mail/__init__.py
rename to src/cpl-mail/cpl/mail/abc/__init__.py
diff --git a/src/cpl_mail/abc/email_client_abc.py b/src/cpl-mail/cpl/mail/abc/email_client_abc.py
similarity index 71%
rename from src/cpl_mail/abc/email_client_abc.py
rename to src/cpl-mail/cpl/mail/abc/email_client_abc.py
index 86b5fb37..29297289 100644
--- a/src/cpl_mail/abc/email_client_abc.py
+++ b/src/cpl-mail/cpl/mail/abc/email_client_abc.py
@@ -1,10 +1,10 @@
from abc import abstractmethod, ABC
-from cpl_mail.email_model import EMail
+from cpl.mail.email_model import EMail
class EMailClientABC(ABC):
- """ABC of :class:`cpl_mail.email_client_service.EMailClient`"""
+ """ABC of :class:`cpl.mail.email_client_service.EMailClient`"""
@abstractmethod
def __init__(self):
@@ -19,6 +19,6 @@ class EMailClientABC(ABC):
r"""Sends email
Parameter:
- email: :class:`cpl_mail.email.EMail`
+ email: :class:`cpl.mail.email.EMail`
Object of the E-Mail to send
"""
diff --git a/src/cpl_mail/email_client_service.py b/src/cpl-mail/cpl/mail/email_client_service.py
similarity index 86%
rename from src/cpl_mail/email_client_service.py
rename to src/cpl-mail/cpl/mail/email_client_service.py
index a778ea12..51c4faca 100644
--- a/src/cpl_mail/email_client_service.py
+++ b/src/cpl-mail/cpl/mail/email_client_service.py
@@ -2,23 +2,23 @@ import ssl
from smtplib import SMTP
from typing import Optional
-from cpl_core.environment.application_environment_abc import ApplicationEnvironmentABC
-from cpl_core.log.logger_abc import LoggerABC
-from cpl_core.utils.credential_manager import CredentialManager
-from cpl_mail.abc.email_client_abc import EMailClientABC
-from cpl_mail.email_model import EMail
-from cpl_mail.email_client_settings import EMailClientSettings
+from cpl.core.environment.application_environment_abc import ApplicationEnvironmentABC
+from cpl.core.log.logger_abc import LoggerABC
+from cpl.core.utils.credential_manager import CredentialManager
+from cpl.mail.abc.email_client_abc import EMailClientABC
+from cpl.mail.email_model import EMail
+from cpl.mail.email_client_settings import EMailClientSettings
class EMailClient(EMailClientABC):
r"""Service to send emails
Parameter:
- environment: :class:`cpl_core.environment.application_environment_abc.ApplicationEnvironmentABC`
+ environment: :class:`cpl.core.environment.application_environment_abc.ApplicationEnvironmentABC`
Environment of the application
- logger: :class:`cpl_core.log.logger_abc.LoggerABC`
+ logger: :class:`cpl.core.log.logger_abc.LoggerABC`
The logger to use
- mail_settings: :class:`cpl_mail.email_client_settings.EMailClientSettings`
+ mail_settings: :class:`cpl.mail.email_client_settings.EMailClientSettings`
Settings for mailing
"""
diff --git a/src/cpl_mail/email_client_settings.py b/src/cpl-mail/cpl/mail/email_client_settings.py
similarity index 94%
rename from src/cpl_mail/email_client_settings.py
rename to src/cpl-mail/cpl/mail/email_client_settings.py
index bac1b98f..cdf34c5a 100644
--- a/src/cpl_mail/email_client_settings.py
+++ b/src/cpl-mail/cpl/mail/email_client_settings.py
@@ -1,4 +1,4 @@
-from cpl_core.configuration.configuration_model_abc import ConfigurationModelABC
+from cpl.core.configuration.configuration_model_abc import ConfigurationModelABC
class EMailClientSettings(ConfigurationModelABC):
diff --git a/src/cpl_mail/email_client_settings_name_enum.py b/src/cpl-mail/cpl/mail/email_client_settings_name_enum.py
similarity index 100%
rename from src/cpl_mail/email_client_settings_name_enum.py
rename to src/cpl-mail/cpl/mail/email_client_settings_name_enum.py
diff --git a/src/cpl_mail/email_model.py b/src/cpl-mail/cpl/mail/email_model.py
similarity index 100%
rename from src/cpl_mail/email_model.py
rename to src/cpl-mail/cpl/mail/email_model.py
diff --git a/src/cpl_mail/pyproject.toml b/src/cpl-mail/pyproject.toml
similarity index 81%
rename from src/cpl_mail/pyproject.toml
rename to src/cpl-mail/pyproject.toml
index b7df4803..fb54b760 100644
--- a/src/cpl_mail/pyproject.toml
+++ b/src/cpl-mail/pyproject.toml
@@ -19,18 +19,9 @@ dynamic = ["dependencies", "optional-dependencies"]
[project.urls]
Homepage = "https://www.sh-edraft.de"
-[tool.setuptools]
-package-dir = { "" = "." }
-include-package-data = true
-
[tool.setuptools.packages.find]
where = ["."]
-include = ["cpl_mail*"]
-exclude = [
- "__pycache__",
- "logs",
- "tests",
-]
+include = ["cpl*"]
[tool.setuptools.dynamic]
dependencies = { file = ["requirements.txt"] }
diff --git a/src/cpl_mail/requirements.dev.txt b/src/cpl-mail/requirements.dev.txt
similarity index 100%
rename from src/cpl_mail/requirements.dev.txt
rename to src/cpl-mail/requirements.dev.txt
diff --git a/src/cpl_mail/requirements.txt b/src/cpl-mail/requirements.txt
similarity index 100%
rename from src/cpl_mail/requirements.txt
rename to src/cpl-mail/requirements.txt
diff --git a/src/cpl_query/__init__.py b/src/cpl-query/cpl/query/__init__.py
similarity index 100%
rename from src/cpl_query/__init__.py
rename to src/cpl-query/cpl/query/__init__.py
diff --git a/src/cpl_query/_helper.py b/src/cpl-query/cpl/query/_helper.py
similarity index 100%
rename from src/cpl_query/_helper.py
rename to src/cpl-query/cpl/query/_helper.py
diff --git a/src/cpl_query/base/__init__.py b/src/cpl-query/cpl/query/base/__init__.py
similarity index 100%
rename from src/cpl_query/base/__init__.py
rename to src/cpl-query/cpl/query/base/__init__.py
index cd7502e7..97de7598 100644
--- a/src/cpl_query/base/__init__.py
+++ b/src/cpl-query/cpl/query/base/__init__.py
@@ -1,5 +1,5 @@
from .default_lambda import default_lambda
from .ordered_queryable import OrderedQueryable
+from .sequence import Sequence
from .ordered_queryable_abc import OrderedQueryableABC
from .queryable_abc import QueryableABC
-from .sequence import Sequence
diff --git a/src/cpl_query/base/default_lambda.py b/src/cpl-query/cpl/query/base/default_lambda.py
similarity index 100%
rename from src/cpl_query/base/default_lambda.py
rename to src/cpl-query/cpl/query/base/default_lambda.py
diff --git a/src/cpl_query/base/ordered_queryable.py b/src/cpl-query/cpl/query/base/ordered_queryable.py
similarity index 75%
rename from src/cpl_query/base/ordered_queryable.py
rename to src/cpl-query/cpl/query/base/ordered_queryable.py
index 9f0f7b56..5788e0e8 100644
--- a/src/cpl_query/base/ordered_queryable.py
+++ b/src/cpl-query/cpl/query/base/ordered_queryable.py
@@ -1,14 +1,13 @@
from collections.abc import Callable
-from cpl_query.base.queryable_abc import QueryableABC
-from cpl_query.base.ordered_queryable_abc import OrderedQueryableABC
-from cpl_query.exceptions import ArgumentNoneException, ExceptionArgument
+from cpl.query.base.ordered_queryable_abc import OrderedQueryableABC
+from cpl.query.exceptions import ArgumentNoneException, ExceptionArgument
class OrderedQueryable(OrderedQueryableABC):
- r"""Implementation of :class: `cpl_query.base.ordered_queryable_abc.OrderedQueryableABC`"""
+ r"""Implementation of :class: `cpl.query.base.ordered_queryable_abc.OrderedQueryableABC`"""
- def __init__(self, _t: type, _values: QueryableABC = None, _func: Callable = None):
+ def __init__(self, _t: type, _values: OrderedQueryableABC = None, _func: Callable = None):
OrderedQueryableABC.__init__(self, _t, _values, _func)
def then_by(self, _func: Callable) -> OrderedQueryableABC:
diff --git a/src/cpl_query/base/ordered_queryable_abc.py b/src/cpl-query/cpl/query/base/ordered_queryable_abc.py
similarity index 83%
rename from src/cpl_query/base/ordered_queryable_abc.py
rename to src/cpl-query/cpl/query/base/ordered_queryable_abc.py
index d6ebadc0..a11d9796 100644
--- a/src/cpl_query/base/ordered_queryable_abc.py
+++ b/src/cpl-query/cpl/query/base/ordered_queryable_abc.py
@@ -4,7 +4,7 @@ from abc import abstractmethod
from collections.abc import Callable
from typing import Iterable
-from cpl_query.base.queryable_abc import QueryableABC
+from cpl.query.base.queryable_abc import QueryableABC
class OrderedQueryableABC(QueryableABC):
@@ -23,7 +23,7 @@ class OrderedQueryableABC(QueryableABC):
func: :class:`Callable`
Returns:
- list of :class:`cpl_query.base.ordered_queryable_abc.OrderedQueryableABC`
+ list of :class:`cpl.query.base.ordered_queryable_abc.OrderedQueryableABC`
"""
@abstractmethod
@@ -34,5 +34,5 @@ class OrderedQueryableABC(QueryableABC):
func: :class:`Callable`
Returns:
- list of :class:`cpl_query.base.ordered_queryable_abc.OrderedQueryableABC`
+ list of :class:`cpl.query.base.ordered_queryable_abc.OrderedQueryableABC`
"""
diff --git a/src/cpl_query/base/queryable_abc.py b/src/cpl-query/cpl/query/base/queryable_abc.py
similarity index 91%
rename from src/cpl_query/base/queryable_abc.py
rename to src/cpl-query/cpl/query/base/queryable_abc.py
index 9a123a03..aff56af9 100644
--- a/src/cpl_query/base/queryable_abc.py
+++ b/src/cpl-query/cpl/query/base/queryable_abc.py
@@ -1,14 +1,11 @@
from __future__ import annotations
-from typing import Optional, Callable, Union, Iterable, Any, TYPE_CHECKING
+from typing import Optional, Callable, Union, Iterable, Any
-from cpl_query._helper import is_number
-from cpl_query.base import default_lambda
-
-if TYPE_CHECKING:
- from cpl_query.base.ordered_queryable_abc import OrderedQueryableABC
-from cpl_query.base.sequence import Sequence
-from cpl_query.exceptions import (
+from cpl.query._helper import is_number
+from cpl.query.base import default_lambda
+from cpl.query.base.sequence import Sequence
+from cpl.query.exceptions import (
InvalidTypeException,
ArgumentNoneException,
ExceptionArgument,
@@ -115,7 +112,7 @@ class QueryableABC(Sequence):
Returns
-------
- :class: `cpl_query.base.queryable_abc.QueryableABC`
+ :class: `cpl.query.base.queryable_abc.QueryableABC`
"""
if _func is None:
_func = default_lambda
@@ -317,7 +314,7 @@ class QueryableABC(Sequence):
return _func(min(self, key=_func))
- def order_by(self, _func: Callable = None) -> OrderedQueryableABC:
+ def order_by(self, _func: Callable = None) -> "OrderedQueryableABC":
r"""Sorts elements by function in ascending order
Parameter
@@ -327,12 +324,12 @@ class QueryableABC(Sequence):
Returns
-------
- :class: `cpl_query.base.ordered_queryable_abc.OrderedQueryableABC`
+ :class: `cpl.query.base.ordered_queryable_abc.OrderedQueryableABC`
"""
if _func is None:
_func = default_lambda
- from cpl_query.base.ordered_queryable import OrderedQueryable
+ from cpl.query.base.ordered_queryable import OrderedQueryable
return OrderedQueryable(self.type, sorted(self, key=_func), _func)
@@ -346,12 +343,12 @@ class QueryableABC(Sequence):
Returns
-------
- :class: `cpl_query.base.ordered_queryable_abc.OrderedQueryableABC`
+ :class: `cpl.query.base.ordered_queryable_abc.OrderedQueryableABC`
"""
if _func is None:
_func = default_lambda
- from cpl_query.base.ordered_queryable import OrderedQueryable
+ from cpl.query.base.ordered_queryable import OrderedQueryable
return OrderedQueryable(self.type, sorted(self, key=_func, reverse=True), _func)
@@ -360,7 +357,7 @@ class QueryableABC(Sequence):
Returns
-------
- :class: `cpl_query.base.queryable_abc.QueryableABC`
+ :class: `cpl.query.base.queryable_abc.QueryableABC`
"""
return type(self)(self._type, reversed(self._values))
@@ -369,7 +366,7 @@ class QueryableABC(Sequence):
Returns
-------
- :class: `cpl_query.base.queryable_abc.QueryableABC`
+ :class: `cpl.query.base.queryable_abc.QueryableABC`
"""
if _func is None:
_func = default_lambda
@@ -384,7 +381,7 @@ class QueryableABC(Sequence):
Returns
-------
- :class: `cpl_query.base.queryable_abc.QueryableABC`
+ :class: `cpl.query.base.queryable_abc.QueryableABC`
"""
# The line below is pain. I don't understand anything of it...
# written on 09.11.2022 by Sven Heidemann
@@ -433,7 +430,7 @@ class QueryableABC(Sequence):
Returns
-------
- :class: `cpl_query.base.queryable_abc.QueryableABC`
+ :class: `cpl.query.base.queryable_abc.QueryableABC`
"""
if _index is None:
raise ArgumentNoneException(ExceptionArgument.index)
@@ -450,7 +447,7 @@ class QueryableABC(Sequence):
Returns
-------
- :class: `cpl_query.base.queryable_abc.QueryableABC`
+ :class: `cpl.query.base.queryable_abc.QueryableABC`
"""
if _index is None:
raise ArgumentNoneException(ExceptionArgument.index)
@@ -493,7 +490,7 @@ class QueryableABC(Sequence):
Returns
-------
- :class: `cpl_query.base.queryable_abc.QueryableABC`
+ :class: `cpl.query.base.queryable_abc.QueryableABC`
"""
groups = []
group = []
@@ -525,7 +522,7 @@ class QueryableABC(Sequence):
Returns
-------
- :class: `cpl_query.base.queryable_abc.QueryableABC`
+ :class: `cpl.query.base.queryable_abc.QueryableABC`
"""
if _index is None:
raise ArgumentNoneException(ExceptionArgument.index)
@@ -542,7 +539,7 @@ class QueryableABC(Sequence):
Returns
-------
- :class: `cpl_query.base.queryable_abc.QueryableABC`
+ :class: `cpl.query.base.queryable_abc.QueryableABC`
"""
index = self.count() - _index
@@ -561,7 +558,7 @@ class QueryableABC(Sequence):
Returns
-------
- :class: `cpl_query.base.queryable_abc.QueryableABC`
+ :class: `cpl.query.base.queryable_abc.QueryableABC`
"""
if _func is None:
raise ArgumentNoneException(ExceptionArgument.func)
diff --git a/src/cpl_query/base/sequence.py b/src/cpl-query/cpl/query/base/sequence.py
similarity index 91%
rename from src/cpl_query/base/sequence.py
rename to src/cpl-query/cpl/query/base/sequence.py
index 22ea0f34..5eb349b5 100644
--- a/src/cpl_query/base/sequence.py
+++ b/src/cpl-query/cpl/query/base/sequence.py
@@ -5,6 +5,10 @@ from typing import Iterable
class Sequence(ABC):
@abstractmethod
def __init__(self, t: type, values: Iterable = None):
+ assert t is not None
+ assert isinstance(t, type) or t == any
+ assert values is None or isinstance(values, Iterable)
+
if values is None:
values = []
@@ -48,7 +52,7 @@ class Sequence(ABC):
raise Exception(f"Unexpected type: {type(__object)}\nExpected type: {self._type}")
def to_list(self) -> list:
- r"""Converts :class: `cpl_query.base.sequence_abc.SequenceABC` to :class: `list`
+ r"""Converts :class: `cpl.query.base.sequence_abc.SequenceABC` to :class: `list`
Returns:
:class: `list`
diff --git a/src/cpl_query/enumerable/__init__.py b/src/cpl-query/cpl/query/enumerable/__init__.py
similarity index 100%
rename from src/cpl_query/enumerable/__init__.py
rename to src/cpl-query/cpl/query/enumerable/__init__.py
diff --git a/src/cpl_query/enumerable/enumerable.py b/src/cpl-query/cpl/query/enumerable/enumerable.py
similarity index 63%
rename from src/cpl_query/enumerable/enumerable.py
rename to src/cpl-query/cpl/query/enumerable/enumerable.py
index 9c91d593..f1e795ef 100644
--- a/src/cpl_query/enumerable/enumerable.py
+++ b/src/cpl-query/cpl/query/enumerable/enumerable.py
@@ -1,4 +1,4 @@
-from cpl_query.enumerable.enumerable_abc import EnumerableABC
+from cpl.query.enumerable.enumerable_abc import EnumerableABC
def _default_lambda(x: object):
@@ -6,7 +6,7 @@ def _default_lambda(x: object):
class Enumerable(EnumerableABC):
- r"""Implementation of :class: `cpl_query.enumerable.enumerable_abc.EnumerableABC`"""
+ r"""Implementation of :class: `cpl.query.enumerable.enumerable_abc.EnumerableABC`"""
def __init__(self, t: type = None, values: list = None):
EnumerableABC.__init__(self, t, values)
diff --git a/src/cpl_query/enumerable/enumerable_abc.py b/src/cpl-query/cpl/query/enumerable/enumerable_abc.py
similarity index 55%
rename from src/cpl_query/enumerable/enumerable_abc.py
rename to src/cpl-query/cpl/query/enumerable/enumerable_abc.py
index b1c4960b..33410ba2 100644
--- a/src/cpl_query/enumerable/enumerable_abc.py
+++ b/src/cpl-query/cpl/query/enumerable/enumerable_abc.py
@@ -1,6 +1,6 @@
from abc import abstractmethod
-from cpl_query.base.queryable_abc import QueryableABC
+from cpl.query.base.queryable_abc import QueryableABC
class EnumerableABC(QueryableABC):
@@ -11,11 +11,11 @@ class EnumerableABC(QueryableABC):
QueryableABC.__init__(self, t, values)
def to_iterable(self) -> "IterableABC":
- r"""Converts :class: `cpl_query.enumerable.enumerable_abc.EnumerableABC` to :class: `cpl_query.iterable.iterable_abc.IterableABC`
+ r"""Converts :class: `cpl.query.enumerable.enumerable_abc.EnumerableABC` to :class: `cpl.query.iterable.iterable_abc.IterableABC`
Returns:
- :class: `cpl_query.iterable.iterable_abc.IterableABC`
+ :class: `cpl.query.iterable.iterable_abc.IterableABC`
"""
- from cpl_query.iterable.iterable import Iterable
+ from cpl.query.iterable.iterable import Iterable
return Iterable(self._type, self.to_list())
diff --git a/src/cpl_query/exceptions.py b/src/cpl-query/cpl/query/exceptions.py
similarity index 100%
rename from src/cpl_query/exceptions.py
rename to src/cpl-query/cpl/query/exceptions.py
diff --git a/src/cpl_query/extension/__init__.py b/src/cpl-query/cpl/query/extension/__init__.py
similarity index 100%
rename from src/cpl_query/extension/__init__.py
rename to src/cpl-query/cpl/query/extension/__init__.py
diff --git a/src/cpl-query/cpl/query/extension/list.py b/src/cpl-query/cpl/query/extension/list.py
new file mode 100644
index 00000000..d2202831
--- /dev/null
+++ b/src/cpl-query/cpl/query/extension/list.py
@@ -0,0 +1,36 @@
+from cpl.query.enumerable.enumerable_abc import EnumerableABC
+from cpl.query.iterable.iterable import Iterable
+
+
+class List(Iterable):
+ r"""Implementation of :class: `cpl.query.extension.iterable.Iterable`"""
+
+ def __init__(self, t: type = None, values: Iterable = None):
+ Iterable.__init__(self, t, values)
+
+ def __getitem__(self, *args):
+ return self._values.__getitem__(*args)
+
+ def __setitem__(self, *args):
+ self._values.__setitem__(*args)
+
+ def __delitem__(self, *args):
+ self._values.__delitem__(*args)
+
+ def to_enumerable(self) -> EnumerableABC:
+ r"""Converts :class: `cpl.query.iterable.iterable_abc.IterableABC` to :class: `cpl.query.enumerable.enumerable_abc.EnumerableABC`
+
+ Returns:
+ :class: `cpl.query.enumerable.enumerable_abc.EnumerableABC`
+ """
+ from cpl.query.enumerable.enumerable import Enumerable
+
+ return Enumerable(self._type, self.to_list())
+
+ def to_iterable(self) -> Iterable:
+ r"""Converts :class: `cpl.query.enumerable.enumerable_abc.EnumerableABC` to :class: `cpl.query.iterable.iterable_abc.IterableABC`
+
+ Returns:
+ :class: `cpl.query.iterable.iterable_abc.IterableABC`
+ """
+ return Iterable(self._type, self.to_list())
diff --git a/src/cpl_query/iterable/__init__.py b/src/cpl-query/cpl/query/iterable/__init__.py
similarity index 100%
rename from src/cpl_query/iterable/__init__.py
rename to src/cpl-query/cpl/query/iterable/__init__.py
diff --git a/src/cpl_query/iterable/iterable.py b/src/cpl-query/cpl/query/iterable/iterable.py
similarity index 64%
rename from src/cpl_query/iterable/iterable.py
rename to src/cpl-query/cpl/query/iterable/iterable.py
index e58666bd..3a3292af 100644
--- a/src/cpl_query/iterable/iterable.py
+++ b/src/cpl-query/cpl/query/iterable/iterable.py
@@ -1,10 +1,6 @@
from typing import Iterable as TIterable
-from cpl_query.iterable.iterable_abc import IterableABC
-
-
-def _default_lambda(x: object):
- return x
+from cpl.query.iterable.iterable_abc import IterableABC
class Iterable(IterableABC):
diff --git a/src/cpl_query/iterable/iterable_abc.py b/src/cpl-query/cpl/query/iterable/iterable_abc.py
similarity index 80%
rename from src/cpl_query/iterable/iterable_abc.py
rename to src/cpl-query/cpl/query/iterable/iterable_abc.py
index e8bacf27..d2316fdf 100644
--- a/src/cpl_query/iterable/iterable_abc.py
+++ b/src/cpl-query/cpl/query/iterable/iterable_abc.py
@@ -1,7 +1,7 @@
from abc import abstractmethod
from typing import Iterable
-from cpl_query.base.queryable_abc import QueryableABC
+from cpl.query.base.queryable_abc import QueryableABC
class IterableABC(QueryableABC):
@@ -31,7 +31,7 @@ class IterableABC(QueryableABC):
r"""Adds elements of given list to list
Parameter:
- __iterable: :class: `cpl_query.extension.iterable.Iterable`
+ __iterable: :class: `cpl.query.extension.iterable.Iterable`
index
"""
for value in __iterable:
@@ -61,11 +61,11 @@ class IterableABC(QueryableABC):
self._values.pop(_index)
def to_enumerable(self) -> "EnumerableABC":
- r"""Converts :class: `cpl_query.iterable.iterable_abc.IterableABC` to :class: `cpl_query.enumerable.enumerable_abc.EnumerableABC`
+ r"""Converts :class: `cpl.query.iterable.iterable_abc.IterableABC` to :class: `cpl.query.enumerable.enumerable_abc.EnumerableABC`
Returns:
- :class: `cpl_query.enumerable.enumerable_abc.EnumerableABC`
+ :class: `cpl.query.enumerable.enumerable_abc.EnumerableABC`
"""
- from cpl_query.enumerable.enumerable import Enumerable
+ from cpl.query.enumerable.enumerable import Enumerable
return Enumerable(self._type, self.to_list())
diff --git a/src/cpl_query/pyproject.toml b/src/cpl-query/pyproject.toml
similarity index 81%
rename from src/cpl_query/pyproject.toml
rename to src/cpl-query/pyproject.toml
index cab11812..779c7873 100644
--- a/src/cpl_query/pyproject.toml
+++ b/src/cpl-query/pyproject.toml
@@ -19,20 +19,12 @@ dynamic = ["dependencies", "optional-dependencies"]
[project.urls]
Homepage = "https://www.sh-edraft.de"
-[tool.setuptools]
-package-dir = { "" = "." }
-include-package-data = true
-
[tool.setuptools.packages.find]
where = ["."]
-include = ["cpl_query*"]
-exclude = [
- "__pycache__",
- "logs",
- "tests",
-]
+include = ["cpl*"]
[tool.setuptools.dynamic]
dependencies = { file = ["requirements.txt"] }
optional-dependencies.dev = { file = ["requirements.dev.txt"] }
+
diff --git a/src/cpl_query/requirements.dev.txt b/src/cpl-query/requirements.dev.txt
similarity index 100%
rename from src/cpl_query/requirements.dev.txt
rename to src/cpl-query/requirements.dev.txt
diff --git a/src/cpl_query/requirements.txt b/src/cpl-query/requirements.txt
similarity index 100%
rename from src/cpl_query/requirements.txt
rename to src/cpl-query/requirements.txt
diff --git a/src/cpl_translation/__init__.py b/src/cpl-translation/cpl/translation/__init__.py
similarity index 83%
rename from src/cpl_translation/__init__.py
rename to src/cpl-translation/cpl/translation/__init__.py
index bb61b231..b3e4670a 100644
--- a/src/cpl_translation/__init__.py
+++ b/src/cpl-translation/cpl/translation/__init__.py
@@ -5,8 +5,8 @@ from .translation_settings import TranslationSettings
def add_translation(self):
- from cpl_core.console import Console
- from cpl_core.pipes import PipeABC
+ from cpl.core.console import Console
+ from cpl.core.pipes import PipeABC
from cpl_translation.translate_pipe import TranslatePipe
from cpl_translation.translation_service import TranslationService
from cpl_translation.translation_service_abc import TranslationServiceABC
@@ -19,7 +19,7 @@ def add_translation(self):
def init():
- from cpl_core.dependency_injection import ServiceCollection
+ from cpl.core.dependency_injection import ServiceCollection
ServiceCollection.add_translation = add_translation
diff --git a/src/cpl_translation/translate_pipe.py b/src/cpl-translation/cpl/translation/translate_pipe.py
similarity index 83%
rename from src/cpl_translation/translate_pipe.py
rename to src/cpl-translation/cpl/translation/translate_pipe.py
index 91f0c631..f0de4bae 100644
--- a/src/cpl_translation/translate_pipe.py
+++ b/src/cpl-translation/cpl/translation/translate_pipe.py
@@ -1,5 +1,5 @@
-from cpl_core.console import Console
-from cpl_core.pipes.pipe_abc import PipeABC
+from cpl.core.console import Console
+from cpl.core.pipes.pipe_abc import PipeABC
from cpl_translation.translation_service_abc import TranslationServiceABC
diff --git a/src/cpl_translation/translation_service.py b/src/cpl-translation/cpl/translation/translation_service.py
similarity index 100%
rename from src/cpl_translation/translation_service.py
rename to src/cpl-translation/cpl/translation/translation_service.py
diff --git a/src/cpl_translation/translation_service_abc.py b/src/cpl-translation/cpl/translation/translation_service_abc.py
similarity index 100%
rename from src/cpl_translation/translation_service_abc.py
rename to src/cpl-translation/cpl/translation/translation_service_abc.py
diff --git a/src/cpl_translation/translation_settings.py b/src/cpl-translation/cpl/translation/translation_settings.py
similarity index 88%
rename from src/cpl_translation/translation_settings.py
rename to src/cpl-translation/cpl/translation/translation_settings.py
index 2549cc3d..c79af880 100644
--- a/src/cpl_translation/translation_settings.py
+++ b/src/cpl-translation/cpl/translation/translation_settings.py
@@ -1,4 +1,4 @@
-from cpl_core.configuration.configuration_model_abc import ConfigurationModelABC
+from cpl.core.configuration.configuration_model_abc import ConfigurationModelABC
class TranslationSettings(ConfigurationModelABC):
diff --git a/src/cpl_translation/pyproject.toml b/src/cpl-translation/pyproject.toml
similarity index 81%
rename from src/cpl_translation/pyproject.toml
rename to src/cpl-translation/pyproject.toml
index d15efdda..de9d0250 100644
--- a/src/cpl_translation/pyproject.toml
+++ b/src/cpl-translation/pyproject.toml
@@ -19,20 +19,12 @@ dynamic = ["dependencies", "optional-dependencies"]
[project.urls]
Homepage = "https://www.sh-edraft.de"
-[tool.setuptools]
-package-dir = { "" = "." }
-include-package-data = true
-
[tool.setuptools.packages.find]
where = ["."]
-include = ["cpl_translation*"]
-exclude = [
- "__pycache__",
- "logs",
- "tests",
-]
+include = ["cpl*"]
[tool.setuptools.dynamic]
dependencies = { file = ["requirements.txt"] }
optional-dependencies.dev = { file = ["requirements.dev.txt"] }
+
diff --git a/src/cpl_translation/requirements.dev.txt b/src/cpl-translation/requirements.dev.txt
similarity index 100%
rename from src/cpl_translation/requirements.dev.txt
rename to src/cpl-translation/requirements.dev.txt
diff --git a/src/cpl_translation/requirements.txt b/src/cpl-translation/requirements.txt
similarity index 100%
rename from src/cpl_translation/requirements.txt
rename to src/cpl-translation/requirements.txt
diff --git a/src/cpl_mail/abc/__init__.py b/src/cpl_mail/abc/__init__.py
deleted file mode 100644
index e69de29b..00000000
diff --git a/src/cpl_query/extension/list.py b/src/cpl_query/extension/list.py
deleted file mode 100644
index 3fdcbddf..00000000
--- a/src/cpl_query/extension/list.py
+++ /dev/null
@@ -1,37 +0,0 @@
-from cpl_query.iterable.iterable import Iterable
-
-
-class List(Iterable):
- r"""Implementation of :class: `cpl_query.extension.iterable.Iterable`"""
-
- def __init__(self, t: type = None, values: Iterable = None):
- Iterable.__init__(self, t, values)
-
- def __getitem__(self, *args):
- return self._values.__getitem__(*args)
-
- def __setitem__(self, *args):
- self._values.__setitem__(*args)
-
- def __delitem__(self, *args):
- self._values.__delitem__(*args)
-
- def to_enumerable(self) -> "EnumerableABC":
- r"""Converts :class: `cpl_query.iterable.iterable_abc.IterableABC` to :class: `cpl_query.enumerable.enumerable_abc.EnumerableABC`
-
- Returns:
- :class: `cpl_query.enumerable.enumerable_abc.EnumerableABC`
- """
- from cpl_query.enumerable.enumerable import Enumerable
-
- return Enumerable(self._type, self.to_list())
-
- def to_iterable(self) -> "IterableABC":
- r"""Converts :class: `cpl_query.enumerable.enumerable_abc.EnumerableABC` to :class: `cpl_query.iterable.iterable_abc.IterableABC`
-
- Returns:
- :class: `cpl_query.iterable.iterable_abc.IterableABC`
- """
- from cpl_query.iterable.iterable import Iterable
-
- return Iterable(self._type, self.to_list())
diff --git a/tests/custom/async/src/async/application.py b/tests/custom/async/src/async/application.py
index b8831dd6..58f07ce5 100644
--- a/tests/custom/async/src/async/application.py
+++ b/tests/custom/async/src/async/application.py
@@ -1,7 +1,7 @@
-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.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/tests/custom/async/src/async/main.py b/tests/custom/async/src/async/main.py
index 9fad2348..8ff8e5fc 100644
--- a/tests/custom/async/src/async/main.py
+++ b/tests/custom/async/src/async/main.py
@@ -1,5 +1,5 @@
import asyncio
-from cpl_core.application import ApplicationBuilder
+from cpl.core.application import ApplicationBuilder
from application import Application
from startup import Startup
diff --git a/tests/custom/async/src/async/startup.py b/tests/custom/async/src/async/startup.py
index 54e2bf28..2eb97752 100644
--- a/tests/custom/async/src/async/startup.py
+++ b/tests/custom/async/src/async/startup.py
@@ -1,7 +1,7 @@
-from cpl_core.application import StartupABC
-from cpl_core.configuration import ConfigurationABC
-from cpl_core.dependency_injection import ServiceProviderABC, ServiceCollectionABC
-from cpl_core.environment import ApplicationEnvironment
+from cpl.core.application import StartupABC
+from cpl.core.configuration import ConfigurationABC
+from cpl.core.dependency_injection import ServiceProviderABC, ServiceCollectionABC
+from cpl.core.environment import ApplicationEnvironment
class Startup(StartupABC):
diff --git a/tests/custom/console/main.py b/tests/custom/console/main.py
index 1d4d9c07..8007b98b 100644
--- a/tests/custom/console/main.py
+++ b/tests/custom/console/main.py
@@ -1,5 +1,5 @@
import time
-from cpl_core.console import Console, ForegroundColorEnum
+from cpl.core.console import Console, ForegroundColorEnum
def test_spinner():
diff --git a/tests/custom/database/src/application.py b/tests/custom/database/src/application.py
index 4302ab6f..040bcd08 100644
--- a/tests/custom/database/src/application.py
+++ b/tests/custom/database/src/application.py
@@ -1,10 +1,10 @@
from typing import Optional
-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.log 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.log import LoggerABC
from model.user_repo_abc import UserRepoABC
from model.user_repo import UserRepo
diff --git a/tests/custom/database/src/main.py b/tests/custom/database/src/main.py
index 76de0f16..2097002b 100644
--- a/tests/custom/database/src/main.py
+++ b/tests/custom/database/src/main.py
@@ -1,4 +1,4 @@
-from cpl_core.application import ApplicationBuilder
+from cpl.core.application import ApplicationBuilder
from application import Application
from startup import Startup
diff --git a/tests/custom/database/src/model/city_model.py b/tests/custom/database/src/model/city_model.py
index 3616f7e1..c67d3d31 100644
--- a/tests/custom/database/src/model/city_model.py
+++ b/tests/custom/database/src/model/city_model.py
@@ -1,4 +1,4 @@
-from cpl_core.database import TableABC
+from cpl.core.database import TableABC
class CityModel(TableABC):
diff --git a/tests/custom/database/src/model/db_context.py b/tests/custom/database/src/model/db_context.py
index 73a28eb7..6f947c07 100644
--- a/tests/custom/database/src/model/db_context.py
+++ b/tests/custom/database/src/model/db_context.py
@@ -1,5 +1,5 @@
-from cpl_core.database import DatabaseSettings
-from cpl_core.database.context import DatabaseContext
+from cpl.core.database import DatabaseSettings
+from cpl.core.database.context import DatabaseContext
class DBContext(DatabaseContext):
diff --git a/tests/custom/database/src/model/user_model.py b/tests/custom/database/src/model/user_model.py
index 3c28542d..eecd97de 100644
--- a/tests/custom/database/src/model/user_model.py
+++ b/tests/custom/database/src/model/user_model.py
@@ -1,4 +1,4 @@
-from cpl_core.database import TableABC
+from cpl.core.database import TableABC
from .city_model import CityModel
diff --git a/tests/custom/database/src/model/user_repo.py b/tests/custom/database/src/model/user_repo.py
index 8a05a0cd..6b8345b7 100644
--- a/tests/custom/database/src/model/user_repo.py
+++ b/tests/custom/database/src/model/user_repo.py
@@ -1,5 +1,5 @@
-from cpl_core.console import Console
-from cpl_core.database.context import DatabaseContextABC
+from cpl.core.console import Console
+from cpl.core.database.context import DatabaseContextABC
from .city_model import CityModel
from .user_model import UserModel
diff --git a/tests/custom/database/src/startup.py b/tests/custom/database/src/startup.py
index 32003ea0..0f613e1d 100644
--- a/tests/custom/database/src/startup.py
+++ b/tests/custom/database/src/startup.py
@@ -1,9 +1,9 @@
-from cpl_core.application import StartupABC
-from cpl_core.configuration import ConfigurationABC
-from cpl_core.database import DatabaseSettings
-from cpl_core.dependency_injection import ServiceCollectionABC, ServiceProviderABC
-from cpl_core.environment import ApplicationEnvironmentABC
-from cpl_core.log import Logger, LoggerABC
+from cpl.core.application import StartupABC
+from cpl.core.configuration import ConfigurationABC
+from cpl.core.database import DatabaseSettings
+from cpl.core.dependency_injection import ServiceCollectionABC, ServiceProviderABC
+from cpl.core.environment import ApplicationEnvironmentABC
+from cpl.core.log import Logger, LoggerABC
from model.db_context import DBContext
from model.user_repo import UserRepo
diff --git a/tests/custom/di/src/di/application.py b/tests/custom/di/src/di/application.py
index b30a2281..3dba5b4a 100644
--- a/tests/custom/di/src/di/application.py
+++ b/tests/custom/di/src/di/application.py
@@ -1,8 +1,8 @@
-from cpl_core.application import ApplicationABC
-from cpl_core.configuration import ConfigurationABC
-from cpl_core.console.console import Console
-from cpl_core.dependency_injection import ServiceProviderABC
-from cpl_core.dependency_injection.scope import Scope
+from cpl.core.application import ApplicationABC
+from cpl.core.configuration import ConfigurationABC
+from cpl.core.console.console import Console
+from cpl.core.dependency_injection import ServiceProviderABC
+from cpl.core.dependency_injection.scope import Scope
from di.static_test import StaticTest
from di.test_abc import TestABC
from di.test_service import TestService
diff --git a/tests/custom/di/src/di/di_tester_service.py b/tests/custom/di/src/di/di_tester_service.py
index cfb60ea8..d598f44d 100644
--- a/tests/custom/di/src/di/di_tester_service.py
+++ b/tests/custom/di/src/di/di_tester_service.py
@@ -1,4 +1,4 @@
-from cpl_core.console.console import Console
+from cpl.core.console.console import Console
from di.test_service import TestService
diff --git a/tests/custom/di/src/di/main.py b/tests/custom/di/src/di/main.py
index 762040ed..4eb01d4a 100644
--- a/tests/custom/di/src/di/main.py
+++ b/tests/custom/di/src/di/main.py
@@ -1,4 +1,4 @@
-from cpl_core.application import ApplicationBuilder
+from cpl.core.application import ApplicationBuilder
from di.application import Application
from di.startup import Startup
diff --git a/tests/custom/di/src/di/startup.py b/tests/custom/di/src/di/startup.py
index a6ca0b23..b9118a5f 100644
--- a/tests/custom/di/src/di/startup.py
+++ b/tests/custom/di/src/di/startup.py
@@ -1,7 +1,7 @@
-from cpl_core.application import StartupABC
-from cpl_core.configuration import ConfigurationABC
-from cpl_core.dependency_injection import ServiceProviderABC, ServiceCollectionABC
-from cpl_core.environment import ApplicationEnvironment
+from cpl.core.application import StartupABC
+from cpl.core.configuration import ConfigurationABC
+from cpl.core.dependency_injection import ServiceProviderABC, ServiceCollectionABC
+from cpl.core.environment import ApplicationEnvironment
from di.test1_service import Test1Service
from di.test2_service import Test2Service
from di.test_abc import TestABC
diff --git a/tests/custom/di/src/di/static_test.py b/tests/custom/di/src/di/static_test.py
index 53154ab7..b90b4933 100644
--- a/tests/custom/di/src/di/static_test.py
+++ b/tests/custom/di/src/di/static_test.py
@@ -1,5 +1,5 @@
-from cpl_core.configuration import ConfigurationABC
-from cpl_core.dependency_injection import ServiceProvider, ServiceProviderABC
+from cpl.core.configuration import ConfigurationABC
+from cpl.core.dependency_injection import ServiceProvider, ServiceProviderABC
from di.test_service import TestService
diff --git a/tests/custom/di/src/di/test1_service.py b/tests/custom/di/src/di/test1_service.py
index b768d2e3..2080696f 100644
--- a/tests/custom/di/src/di/test1_service.py
+++ b/tests/custom/di/src/di/test1_service.py
@@ -1,6 +1,6 @@
import string
-from cpl_core.console.console import Console
-from cpl_core.utils.string import String
+from cpl.core.console.console import Console
+from cpl.core.utils.string import String
from di.test_abc import TestABC
diff --git a/tests/custom/di/src/di/test2_service.py b/tests/custom/di/src/di/test2_service.py
index d1b0c50b..62c756c2 100644
--- a/tests/custom/di/src/di/test2_service.py
+++ b/tests/custom/di/src/di/test2_service.py
@@ -1,6 +1,6 @@
import string
-from cpl_core.console.console import Console
-from cpl_core.utils.string import String
+from cpl.core.console.console import Console
+from cpl.core.utils.string import String
from di.test_abc import TestABC
diff --git a/tests/custom/di/src/di/test_service.py b/tests/custom/di/src/di/test_service.py
index 2c588536..cecf0b2c 100644
--- a/tests/custom/di/src/di/test_service.py
+++ b/tests/custom/di/src/di/test_service.py
@@ -1,7 +1,7 @@
import string
-from cpl_core.console.console import Console
-from cpl_core.utils.string import String
+from cpl.core.console.console import Console
+from cpl.core.utils.string import String
class TestService:
diff --git a/tests/custom/di/src/di/tester.py b/tests/custom/di/src/di/tester.py
index a0d5200e..a05914cb 100644
--- a/tests/custom/di/src/di/tester.py
+++ b/tests/custom/di/src/di/tester.py
@@ -1,4 +1,4 @@
-from cpl_core.console.console import Console
+from cpl.core.console.console import Console
from di.test_abc import TestABC
diff --git a/tests/custom/discord/LICENSE b/tests/custom/discord/LICENSE
deleted file mode 100644
index e69de29b..00000000
diff --git a/tests/custom/discord/README.md b/tests/custom/discord/README.md
deleted file mode 100644
index e69de29b..00000000
diff --git a/tests/custom/discord/cpl-workspace.json b/tests/custom/discord/cpl-workspace.json
deleted file mode 100644
index 02de1c64..00000000
--- a/tests/custom/discord/cpl-workspace.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
- "WorkspaceSettings": {
- "DefaultProject": "discord-bot",
- "Projects": {
- "discord-bot": "src/discord_bot/discord-bot.json",
- "hello-world": "src/modules/hello_world/hello-world.json"
- },
- "Scripts": {}
- }
-}
\ No newline at end of file
diff --git a/tests/custom/discord/dockerfile b/tests/custom/discord/dockerfile
deleted file mode 100644
index 6384a994..00000000
--- a/tests/custom/discord/dockerfile
+++ /dev/null
@@ -1,15 +0,0 @@
-# syntax=docker/dockerfile:1
-FROM python:3.10
-
-WORKDIR /app
-COPY . .
-
-RUN pip install cpl-cli --extra-index-url https://pip.sh-edraft.de
-RUN pip install cpl-discord --extra-index-url https://pip.sh-edraft.de
-RUN pip install cpl-query --extra-index-url https://pip.sh-edraft.de
-RUN pip install cpl-translation --extra-index-url https://pip.sh-edraft.de
-
-ENV DISCORD_TOKEN=""
-ENV DISCORD_PREFIX=""
-
-CMD [ "cpl", "run"]
diff --git a/tests/custom/discord/src/discord_bot/__init__.py b/tests/custom/discord/src/discord_bot/__init__.py
deleted file mode 100644
index 8b137891..00000000
--- a/tests/custom/discord/src/discord_bot/__init__.py
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/tests/custom/discord/src/discord_bot/application.py b/tests/custom/discord/src/discord_bot/application.py
deleted file mode 100644
index 33d9648a..00000000
--- a/tests/custom/discord/src/discord_bot/application.py
+++ /dev/null
@@ -1,39 +0,0 @@
-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.log import LoggerABC
-from cpl_discord.application.discord_bot_application_abc import DiscordBotApplicationABC
-from cpl_discord.configuration.discord_bot_settings import DiscordBotSettings
-from cpl_discord.service.discord_bot_service import DiscordBotService
-from cpl_discord.service.discord_bot_service_abc import DiscordBotServiceABC
-
-
-class Application(DiscordBotApplicationABC):
- def __init__(self, config: ConfigurationABC, services: ServiceProviderABC):
- ApplicationABC.__init__(self, config, services)
-
- self._bot: DiscordBotServiceABC = services.get_service(DiscordBotServiceABC)
- self._logger: LoggerABC = services.get_service(LoggerABC)
- self._bot_settings: DiscordBotSettings = config.get_configuration(DiscordBotSettings)
-
- async def configure(self):
- pass
-
- async def main(self):
- try:
- self._logger.debug(__name__, f"Starting...\n")
- self._logger.trace(__name__, f"Try to start {DiscordBotService.__name__}")
- await self._bot.start_async()
- except Exception as e:
- self._logger.error(__name__, "Start failed", e)
-
- async def stop_async(self):
- try:
- self._logger.trace(__name__, f"Try to stop {DiscordBotService.__name__}")
- await self._bot.close()
- self._logger.trace(__name__, f"Stopped {DiscordBotService.__name__}")
- except Exception as e:
- self._logger.error(__name__, "stop failed", e)
-
- Console.write_line()
diff --git a/tests/custom/discord/src/discord_bot/appsettings.json b/tests/custom/discord/src/discord_bot/appsettings.json
deleted file mode 100644
index 5e211c01..00000000
--- a/tests/custom/discord/src/discord_bot/appsettings.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
- "TimeFormatSettings": {
- "DateFormat": "%Y-%m-%d",
- "TimeFormat": "%H:%M:%S",
- "DateTimeFormat": "%Y-%m-%d %H:%M:%S.%f",
- "DateTimeLogFormat": "%Y-%m-%d_%H-%M-%S"
- },
- "LoggingSettings": {
- "Path": "logs/",
- "Filename": "log_dev.log",
- "ConsoleLogLevel": "TRACE",
- "FileLogLevel": "TRACE"
- },
- "DiscordBotSettings": {
- "Token": "",
- "Prefix": "!cd "
- }
-}
\ No newline at end of file
diff --git a/tests/custom/discord/src/discord_bot/discord-bot.json b/tests/custom/discord/src/discord_bot/discord-bot.json
deleted file mode 100644
index 4a1b4bb2..00000000
--- a/tests/custom/discord/src/discord_bot/discord-bot.json
+++ /dev/null
@@ -1,46 +0,0 @@
-{
- "ProjectSettings": {
- "Name": "discord-bot",
- "Version": {
- "Major": "0",
- "Minor": "0",
- "Micro": "0"
- },
- "Author": "",
- "AuthorEmail": "",
- "Description": "",
- "LongDescription": "",
- "URL": "",
- "CopyrightDate": "",
- "CopyrightName": "",
- "LicenseName": "",
- "LicenseDescription": "",
- "Dependencies": [
- "cpl-core==2022.12.0"
- ],
- "DevDependencies": [
- "cpl-cli==2022.12.0"
- ],
- "PythonVersion": ">=3.10.4",
- "PythonPath": {},
- "Classifiers": []
- },
- "BuildSettings": {
- "ProjectType": "console",
- "SourcePath": "",
- "OutputPath": "../../dist",
- "Main": "discord.main",
- "EntryPoint": "discord",
- "IncludePackageData": false,
- "Included": [],
- "Excluded": [
- "*/__pycache__",
- "*/logs",
- "*/tests"
- ],
- "PackageData": {},
- "ProjectReferences": [
- "../modules/hello_world/hello-world.json"
- ]
- }
-}
\ No newline at end of file
diff --git a/tests/custom/discord/src/discord_bot/main.py b/tests/custom/discord/src/discord_bot/main.py
deleted file mode 100644
index dd994d9a..00000000
--- a/tests/custom/discord/src/discord_bot/main.py
+++ /dev/null
@@ -1,29 +0,0 @@
-import asyncio
-from typing import Optional
-
-from cpl_core.application import ApplicationBuilder, ApplicationABC
-
-from discord_bot.application import Application
-from discord_bot.startup import Startup
-
-
-class Program:
- def __init__(self):
- self._app: Optional[Application] = None
-
- async def main(self):
- app_builder = ApplicationBuilder(Application)
- app_builder.use_startup(Startup)
- self._app: ApplicationABC = await app_builder.build_async()
- await self._app.run_async()
-
- async def stop(self):
- await self._app.stop_async()
-
-
-if __name__ == "__main__":
- program = Program()
- try:
- asyncio.run(program.main())
- except KeyboardInterrupt:
- asyncio.run(program.stop())
diff --git a/tests/custom/discord/src/discord_bot/startup.py b/tests/custom/discord/src/discord_bot/startup.py
deleted file mode 100644
index da90795b..00000000
--- a/tests/custom/discord/src/discord_bot/startup.py
+++ /dev/null
@@ -1,38 +0,0 @@
-from cpl_core.application import StartupABC
-from cpl_core.configuration import ConfigurationABC
-from cpl_core.console import Console
-from cpl_core.dependency_injection import ServiceProviderABC, ServiceCollectionABC
-from cpl_core.environment import ApplicationEnvironment
-from cpl_discord import get_discord_collection
-from cpl_discord.discord_event_types_enum import DiscordEventTypesEnum
-from modules.hello_world.on_ready_event import OnReadyEvent
-from modules.hello_world.on_ready_test_event import OnReadyTestEvent
-from modules.hello_world.ping_command import PingCommand
-from modules.hello_world.purge_command import PurgeCommand
-
-
-class Startup(StartupABC):
- def __init__(self):
- StartupABC.__init__(self)
-
- def configure_configuration(
- self, configuration: ConfigurationABC, environment: ApplicationEnvironment
- ) -> ConfigurationABC:
- configuration.add_json_file("appsettings.json", optional=False)
- configuration.add_environment_variables("CPL_")
- configuration.add_environment_variables("DISCORD_")
-
- return configuration
-
- def configure_services(
- self, services: ServiceCollectionABC, environment: ApplicationEnvironment
- ) -> ServiceProviderABC:
- services.add_logging()
- services.add_discord()
- dc_collection = get_discord_collection(services)
- dc_collection.add_event(DiscordEventTypesEnum.on_ready.value, OnReadyEvent)
- dc_collection.add_event(DiscordEventTypesEnum.on_ready.value, OnReadyTestEvent)
- dc_collection.add_command(PingCommand)
- dc_collection.add_command(PurgeCommand)
-
- return services.build_service_provider()
diff --git a/tests/custom/discord/src/modules/__init__.py b/tests/custom/discord/src/modules/__init__.py
deleted file mode 100644
index e69de29b..00000000
diff --git a/tests/custom/discord/src/modules/hello_world/__init__.py b/tests/custom/discord/src/modules/hello_world/__init__.py
deleted file mode 100644
index 8b137891..00000000
--- a/tests/custom/discord/src/modules/hello_world/__init__.py
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/tests/custom/discord/src/modules/hello_world/hello-world.json b/tests/custom/discord/src/modules/hello_world/hello-world.json
deleted file mode 100644
index 459a531b..00000000
--- a/tests/custom/discord/src/modules/hello_world/hello-world.json
+++ /dev/null
@@ -1,44 +0,0 @@
-{
- "ProjectSettings": {
- "Name": "hello-world",
- "Version": {
- "Major": "0",
- "Minor": "0",
- "Micro": "0"
- },
- "Author": "",
- "AuthorEmail": "",
- "Description": "",
- "LongDescription": "",
- "URL": "",
- "CopyrightDate": "",
- "CopyrightName": "",
- "LicenseName": "",
- "LicenseDescription": "",
- "Dependencies": [
- "cpl-core==2022.12.0"
- ],
- "DevDependencies": [
- "cpl-cli==2022.12.0"
- ],
- "PythonVersion": ">=3.10.4",
- "PythonPath": {},
- "Classifiers": []
- },
- "BuildSettings": {
- "ProjectType": "library",
- "SourcePath": "",
- "OutputPath": "../../dist",
- "Main": "",
- "EntryPoint": "",
- "IncludePackageData": false,
- "Included": [],
- "Excluded": [
- "*/__pycache__",
- "*/logs",
- "*/tests"
- ],
- "PackageData": {},
- "ProjectReferences": []
- }
-}
\ No newline at end of file
diff --git a/tests/custom/discord/src/modules/hello_world/on_ready_event.py b/tests/custom/discord/src/modules/hello_world/on_ready_event.py
deleted file mode 100644
index c8f65c59..00000000
--- a/tests/custom/discord/src/modules/hello_world/on_ready_event.py
+++ /dev/null
@@ -1,38 +0,0 @@
-import discord
-
-from cpl_core.log import LoggerABC
-from cpl_discord.events.on_ready_abc import OnReadyABC
-from cpl_discord.service.discord_bot_service_abc import DiscordBotServiceABC
-
-
-class OnReadyEvent(OnReadyABC):
- def __init__(self, logger: LoggerABC, bot: DiscordBotServiceABC):
- OnReadyABC.__init__(self)
- self._logger = logger
- self._bot = bot
-
- def _log(self, _t: str, _o: object, _type: type = None):
- self._logger.debug(__name__, f"{_t} {_o} {_type}")
-
- async def on_ready(self):
- self._logger.info(__name__, "Hello World")
- for g in self._bot.guilds:
- self._log("-Guild", g, type(g))
- for r in g.roles:
- self._log("--Role", r, type(r))
- for rm in r.members:
- self._log("---Rolemember", rm, type(rm))
-
- for m in g.members:
- self._log("--Member", m, type(m))
- for mr in m.roles:
- self._log("--Memberole", mr, type(mr))
- for rm in mr.members:
- self._log("---Rolemember", rm, type(rm))
-
- select = self._bot.guilds.select(lambda guild: (guild.name, guild.id))
- self._logger.warn(__name__, f"Does cpl.query select work? {select}")
- select_many = (
- self._bot.guilds.select_many(lambda guild: guild.roles).where(lambda role: role.name == "Tester").first()
- )
- self._logger.warn(__name__, f"Does cpl.query select_many work? {select_many}")
diff --git a/tests/custom/discord/src/modules/hello_world/on_ready_test_event.py b/tests/custom/discord/src/modules/hello_world/on_ready_test_event.py
deleted file mode 100644
index f6cce07a..00000000
--- a/tests/custom/discord/src/modules/hello_world/on_ready_test_event.py
+++ /dev/null
@@ -1,11 +0,0 @@
-from cpl_core.log import LoggerABC
-from cpl_discord.events.on_ready_abc import OnReadyABC
-
-
-class OnReadyTestEvent(OnReadyABC):
- def __init__(self, logger: LoggerABC):
- OnReadyABC.__init__(self)
- self._logger = logger
-
- async def on_ready(self):
- self._logger.info(__name__, "Test second on ready")
diff --git a/tests/custom/discord/src/modules/hello_world/ping_command.py b/tests/custom/discord/src/modules/hello_world/ping_command.py
deleted file mode 100644
index 1d1d681d..00000000
--- a/tests/custom/discord/src/modules/hello_world/ping_command.py
+++ /dev/null
@@ -1,27 +0,0 @@
-from discord.ext import commands
-from discord.ext.commands import Context
-
-from cpl_core.log import LoggerABC
-from cpl_discord.command.discord_command_abc import DiscordCommandABC
-from cpl_discord.service.discord_bot_service_abc import DiscordBotServiceABC
-
-
-class PingCommand(DiscordCommandABC):
- def __init__(
- self,
- logger: LoggerABC,
- bot: DiscordBotServiceABC,
- ):
- DiscordCommandABC.__init__(self)
-
- self._logger = logger
- self._bot = bot
-
- self._logger.trace(__name__, f"Loaded command service: {type(self).__name__}")
-
- @commands.hybrid_command()
- async def ping(self, ctx: Context):
- self._logger.debug(__name__, f"Received command ping {ctx}")
- self._logger.info(__name__, f"Bot name {self._bot.user.name}")
- self._logger.trace(__name__, f"Finished ping command")
- await ctx.send("Pong")
diff --git a/tests/custom/discord/src/modules/hello_world/purge_command.py b/tests/custom/discord/src/modules/hello_world/purge_command.py
deleted file mode 100644
index 3c81e9fb..00000000
--- a/tests/custom/discord/src/modules/hello_world/purge_command.py
+++ /dev/null
@@ -1,30 +0,0 @@
-from discord.ext import commands
-from discord.ext.commands import Context
-
-from cpl_core.log import LoggerABC
-from cpl_discord.command.discord_command_abc import DiscordCommandABC
-from cpl_discord.service.discord_bot_service_abc import DiscordBotServiceABC
-
-
-class PurgeCommand(DiscordCommandABC):
- def __init__(
- self,
- logger: LoggerABC,
- bot: DiscordBotServiceABC,
- ):
- DiscordCommandABC.__init__(self)
-
- self._logger = logger
- self._bot = bot
-
- self._logger.trace(__name__, f"Loaded command service: {type(self).__name__}")
-
- @commands.hybrid_command()
- async def purge(self, ctx: Context):
- self._logger.debug(__name__, f"Received command ping {ctx}")
- self._logger.info(__name__, f"Bot name {self._bot.user.name}")
- self._logger.trace(__name__, f"Finished ping command")
- await ctx.channel.purge()
- if ctx.interaction is None:
- return
- await ctx.interaction.response.send_message("Purged this channel xD")
diff --git a/tests/custom/discord/src/tests/__init__.py b/tests/custom/discord/src/tests/__init__.py
deleted file mode 100644
index e69de29b..00000000
diff --git a/tests/custom/general/src/general/application.py b/tests/custom/general/src/general/application.py
index f1d9cc7b..d462ab5a 100644
--- a/tests/custom/general/src/general/application.py
+++ b/tests/custom/general/src/general/application.py
@@ -1,15 +1,16 @@
import time
from typing import Optional
-from cpl_core.application.application_abc import ApplicationABC
-from cpl_core.configuration import ConfigurationABC
-from cpl_core.console import Console
-from cpl_core.dependency_injection import ServiceProviderABC
-from cpl_core.log import LoggerABC
-from cpl_mail import EMailClientABC, EMail
-from cpl_core.pipes import IPAddressPipe
+from cpl.core.application.application_abc import ApplicationABC
+from cpl.core.configuration import ConfigurationABC
+from cpl.core.console import Console
+from cpl.core.dependency_injection import ServiceProviderABC
+from cpl.core.log import LoggerABC
+from cpl.core.pipes import IPAddressPipe
+from cpl.mail import EMail, EMailClientABC
from test_settings import TestSettings
from test_service import TestService
+from cpl.query.extension.list import List
class Application(ApplicationABC):
@@ -45,6 +46,7 @@ class Application(ApplicationABC):
self._logger.debug(__name__, f"Host: {self._configuration.environment.host_name}")
self._logger.debug(__name__, f"Environment: {self._configuration.environment.environment_name}")
self._logger.debug(__name__, f"Customer: {self._configuration.environment.customer}")
+ Console.write_line(List(int, range(0, 10)).select(lambda x: f"x={x}").to_list())
Console.spinner("Test", self._wait, 2, spinner_foreground_color="red")
test: TestService = self._services.get_service(TestService)
ip_pipe: IPAddressPipe = self._services.get_service(IPAddressPipe)
diff --git a/tests/custom/general/src/general/arguments/generate_argument.py b/tests/custom/general/src/general/arguments/generate_argument.py
index 2e23d017..c0e65a00 100644
--- a/tests/custom/general/src/general/arguments/generate_argument.py
+++ b/tests/custom/general/src/general/arguments/generate_argument.py
@@ -1,6 +1,6 @@
-from cpl_core.configuration import ConfigurationABC, ArgumentExecutableABC
-from cpl_core.console import Console
-from cpl_core.environment import ApplicationEnvironmentABC
+from cpl.core.configuration import ConfigurationABC, ArgumentExecutableABC
+from cpl.core.console import Console
+from cpl.core.environment import ApplicationEnvironmentABC
class GenerateArgument(ArgumentExecutableABC):
diff --git a/tests/custom/general/src/general/arguments/install_argument.py b/tests/custom/general/src/general/arguments/install_argument.py
index 5fc13c5a..15a36590 100644
--- a/tests/custom/general/src/general/arguments/install_argument.py
+++ b/tests/custom/general/src/general/arguments/install_argument.py
@@ -1,5 +1,5 @@
-from cpl_core.configuration import ArgumentExecutableABC
-from cpl_core.console import Console
+from cpl.core.configuration import ArgumentExecutableABC
+from cpl.core.console import Console
class InstallArgument(ArgumentExecutableABC):
diff --git a/tests/custom/general/src/general/main.py b/tests/custom/general/src/general/main.py
index 5426023b..a6ec4669 100644
--- a/tests/custom/general/src/general/main.py
+++ b/tests/custom/general/src/general/main.py
@@ -1,5 +1,5 @@
from application import Application
-from cpl_core.application import ApplicationBuilder
+from cpl.core.application import ApplicationBuilder
from test_extension import TestExtension
from startup import Startup
from test_startup_extension import TestStartupExtension
diff --git a/tests/custom/general/src/general/parameter_startup.py b/tests/custom/general/src/general/parameter_startup.py
index ddda6469..f17ea27e 100644
--- a/tests/custom/general/src/general/parameter_startup.py
+++ b/tests/custom/general/src/general/parameter_startup.py
@@ -1,9 +1,9 @@
from arguments.generate_argument import GenerateArgument
from arguments.install_argument import InstallArgument
-from cpl_core.application import StartupExtensionABC
-from cpl_core.configuration import ConfigurationABC, ArgumentTypeEnum
-from cpl_core.dependency_injection import ServiceCollectionABC
-from cpl_core.environment import ApplicationEnvironmentABC
+from cpl.core.application import StartupExtensionABC
+from cpl.core.configuration import ConfigurationABC, ArgumentTypeEnum
+from cpl.core.dependency_injection import ServiceCollectionABC
+from cpl.core.environment import ApplicationEnvironmentABC
class ParameterStartup(StartupExtensionABC):
diff --git a/tests/custom/general/src/general/startup.py b/tests/custom/general/src/general/startup.py
index 2236e459..89b11dce 100644
--- a/tests/custom/general/src/general/startup.py
+++ b/tests/custom/general/src/general/startup.py
@@ -1,10 +1,10 @@
-from cpl_core.application import StartupABC
-from cpl_core.configuration import ConfigurationABC
-from cpl_core.dependency_injection import ServiceCollectionABC, ServiceProviderABC
-from cpl_core.environment import ApplicationEnvironmentABC
-from cpl_core.log import Logger, LoggerABC
-from cpl_mail import EMailClient, EMailClientABC
-from cpl_core.pipes import IPAddressPipe
+from cpl.core.application import StartupABC
+from cpl.core.configuration import ConfigurationABC
+from cpl.core.dependency_injection import ServiceCollectionABC, ServiceProviderABC
+from cpl.core.environment import ApplicationEnvironmentABC
+from cpl.core.log import Logger, LoggerABC
+from cpl.mail import EMailClient, EMailClientABC
+from cpl.core.pipes import IPAddressPipe
from test_service import TestService
diff --git a/tests/custom/general/src/general/test_extension.py b/tests/custom/general/src/general/test_extension.py
index 48f783b6..2f9cac49 100644
--- a/tests/custom/general/src/general/test_extension.py
+++ b/tests/custom/general/src/general/test_extension.py
@@ -1,7 +1,7 @@
-from cpl_core.application import ApplicationExtensionABC
-from cpl_core.configuration import ConfigurationABC
-from cpl_core.console import Console
-from cpl_core.dependency_injection import ServiceProviderABC
+from cpl.core.application import ApplicationExtensionABC
+from cpl.core.configuration import ConfigurationABC
+from cpl.core.console import Console
+from cpl.core.dependency_injection import ServiceProviderABC
class TestExtension(ApplicationExtensionABC):
diff --git a/tests/custom/general/src/general/test_service.py b/tests/custom/general/src/general/test_service.py
index 4933a7d0..6f1ce259 100644
--- a/tests/custom/general/src/general/test_service.py
+++ b/tests/custom/general/src/general/test_service.py
@@ -1,6 +1,6 @@
-from cpl_core.console.console import Console
-from cpl_core.dependency_injection import ServiceProviderABC
-from cpl_core.pipes.ip_address_pipe import IPAddressPipe
+from cpl.core.console.console import Console
+from cpl.core.dependency_injection import ServiceProviderABC
+from cpl.core.pipes.ip_address_pipe import IPAddressPipe
class TestService:
diff --git a/tests/custom/general/src/general/test_settings.py b/tests/custom/general/src/general/test_settings.py
index a4090edd..a83bf7c8 100644
--- a/tests/custom/general/src/general/test_settings.py
+++ b/tests/custom/general/src/general/test_settings.py
@@ -1,4 +1,4 @@
-from cpl_core.configuration import ConfigurationModelABC
+from cpl.core.configuration import ConfigurationModelABC
class TestSettings(ConfigurationModelABC):
diff --git a/tests/custom/general/src/general/test_startup_extension.py b/tests/custom/general/src/general/test_startup_extension.py
index 036cb77b..cd754313 100644
--- a/tests/custom/general/src/general/test_startup_extension.py
+++ b/tests/custom/general/src/general/test_startup_extension.py
@@ -1,8 +1,8 @@
-from cpl_core.application import StartupExtensionABC
-from cpl_core.configuration import ConfigurationABC
-from cpl_core.console import Console
-from cpl_core.dependency_injection import ServiceCollectionABC
-from cpl_core.environment import ApplicationEnvironmentABC
+from cpl.core.application import StartupExtensionABC
+from cpl.core.configuration import ConfigurationABC
+from cpl.core.console import Console
+from cpl.core.dependency_injection import ServiceCollectionABC
+from cpl.core.environment import ApplicationEnvironmentABC
class TestStartupExtension(StartupExtensionABC):
diff --git a/tests/custom/translation/src/translation/application.py b/tests/custom/translation/src/translation/application.py
index 96a1b2e4..8fb67570 100644
--- a/tests/custom/translation/src/translation/application.py
+++ b/tests/custom/translation/src/translation/application.py
@@ -1,7 +1,7 @@
-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.application import ApplicationABC
+from cpl.core.configuration import ConfigurationABC
+from cpl.core.console import Console
+from cpl.core.dependency_injection import ServiceProviderABC
from cpl_translation.translate_pipe import TranslatePipe
from cpl_translation.translation_service_abc import TranslationServiceABC
from cpl_translation.translation_settings import TranslationSettings
diff --git a/tests/custom/translation/src/translation/main.py b/tests/custom/translation/src/translation/main.py
index 661997cf..7b8731b6 100644
--- a/tests/custom/translation/src/translation/main.py
+++ b/tests/custom/translation/src/translation/main.py
@@ -1,4 +1,4 @@
-from cpl_core.application import ApplicationBuilder
+from cpl.core.application import ApplicationBuilder
from translation.application import Application
from translation.startup import Startup
diff --git a/tests/custom/translation/src/translation/startup.py b/tests/custom/translation/src/translation/startup.py
index 0130cbcd..328f969d 100644
--- a/tests/custom/translation/src/translation/startup.py
+++ b/tests/custom/translation/src/translation/startup.py
@@ -1,7 +1,7 @@
-from cpl_core.application import StartupABC
-from cpl_core.configuration import ConfigurationABC
-from cpl_core.dependency_injection import ServiceProviderABC, ServiceCollectionABC
-from cpl_core.environment import ApplicationEnvironment
+from cpl.core.application import StartupABC
+from cpl.core.configuration import ConfigurationABC
+from cpl.core.dependency_injection import ServiceProviderABC, ServiceCollectionABC
+from cpl.core.environment import ApplicationEnvironment
class Startup(StartupABC):
diff --git a/tests/generated/simple-app/src/application.py b/tests/generated/simple-app/src/application.py
index ccfe56a3..27b56845 100644
--- a/tests/generated/simple-app/src/application.py
+++ b/tests/generated/simple-app/src/application.py
@@ -1,7 +1,7 @@
-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.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/tests/generated/simple-app/src/main.py b/tests/generated/simple-app/src/main.py
index a1158cd1..6a3c180e 100644
--- a/tests/generated/simple-app/src/main.py
+++ b/tests/generated/simple-app/src/main.py
@@ -1,4 +1,4 @@
-from cpl_core.application import ApplicationBuilder
+from cpl.core.application import ApplicationBuilder
from application import Application
diff --git a/tests/generated/simple-app/src/simple_app/application.py b/tests/generated/simple-app/src/simple_app/application.py
index ccfe56a3..27b56845 100644
--- a/tests/generated/simple-app/src/simple_app/application.py
+++ b/tests/generated/simple-app/src/simple_app/application.py
@@ -1,7 +1,7 @@
-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.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/tests/generated/simple-app/src/simple_app/main.py b/tests/generated/simple-app/src/simple_app/main.py
index 7d22bc5d..5f4775d6 100644
--- a/tests/generated/simple-app/src/simple_app/main.py
+++ b/tests/generated/simple-app/src/simple_app/main.py
@@ -1,4 +1,4 @@
-from cpl_core.application import ApplicationBuilder
+from cpl.core.application import ApplicationBuilder
from simple_app.application import Application
diff --git a/tests/generated/simple-console/src/main.py b/tests/generated/simple-console/src/main.py
index e5359a47..894b0e20 100644
--- a/tests/generated/simple-console/src/main.py
+++ b/tests/generated/simple-console/src/main.py
@@ -1,4 +1,4 @@
-from cpl_core.console import Console
+from cpl.core.console import Console
def main():
diff --git a/tests/generated/simple-console/src/simple_console/main.py b/tests/generated/simple-console/src/simple_console/main.py
index e5359a47..894b0e20 100644
--- a/tests/generated/simple-console/src/simple_console/main.py
+++ b/tests/generated/simple-console/src/simple_console/main.py
@@ -1,4 +1,4 @@
-from cpl_core.console import Console
+from cpl.core.console import Console
def main():
diff --git a/tests/generated/simple-di/src/main.py b/tests/generated/simple-di/src/main.py
index 9f3cfc98..a54b90aa 100644
--- a/tests/generated/simple-di/src/main.py
+++ b/tests/generated/simple-di/src/main.py
@@ -1,6 +1,6 @@
-from cpl_core.configuration import Configuration, ConfigurationABC
-from cpl_core.console import Console
-from cpl_core.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/tests/generated/simple-di/src/simple_di/main.py b/tests/generated/simple-di/src/simple_di/main.py
index 9f3cfc98..a54b90aa 100644
--- a/tests/generated/simple-di/src/simple_di/main.py
+++ b/tests/generated/simple-di/src/simple_di/main.py
@@ -1,6 +1,6 @@
-from cpl_core.configuration import Configuration, ConfigurationABC
-from cpl_core.console import Console
-from cpl_core.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/tests/generated/simple-startup-app/src/simple_startup_app/application.py b/tests/generated/simple-startup-app/src/simple_startup_app/application.py
index ccfe56a3..27b56845 100644
--- a/tests/generated/simple-startup-app/src/simple_startup_app/application.py
+++ b/tests/generated/simple-startup-app/src/simple_startup_app/application.py
@@ -1,7 +1,7 @@
-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.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/tests/generated/simple-startup-app/src/simple_startup_app/main.py b/tests/generated/simple-startup-app/src/simple_startup_app/main.py
index d51ee813..f5747121 100644
--- a/tests/generated/simple-startup-app/src/simple_startup_app/main.py
+++ b/tests/generated/simple-startup-app/src/simple_startup_app/main.py
@@ -1,4 +1,4 @@
-from cpl_core.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/tests/generated/simple-startup-app/src/simple_startup_app/startup.py b/tests/generated/simple-startup-app/src/simple_startup_app/startup.py
index d65707fa..cd2c48a8 100644
--- a/tests/generated/simple-startup-app/src/simple_startup_app/startup.py
+++ b/tests/generated/simple-startup-app/src/simple_startup_app/startup.py
@@ -1,6 +1,6 @@
-from cpl_core.application import StartupABC
-from cpl_core.configuration import ConfigurationABC
-from cpl_core.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/tests/generated/startup-app/src/application.py b/tests/generated/startup-app/src/application.py
index ccfe56a3..27b56845 100644
--- a/tests/generated/startup-app/src/application.py
+++ b/tests/generated/startup-app/src/application.py
@@ -1,7 +1,7 @@
-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.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/tests/generated/startup-app/src/main.py b/tests/generated/startup-app/src/main.py
index 76de0f16..2097002b 100644
--- a/tests/generated/startup-app/src/main.py
+++ b/tests/generated/startup-app/src/main.py
@@ -1,4 +1,4 @@
-from cpl_core.application import ApplicationBuilder
+from cpl.core.application import ApplicationBuilder
from application import Application
from startup import Startup
diff --git a/tests/generated/startup-app/src/startup.py b/tests/generated/startup-app/src/startup.py
index d65707fa..cd2c48a8 100644
--- a/tests/generated/startup-app/src/startup.py
+++ b/tests/generated/startup-app/src/startup.py
@@ -1,6 +1,6 @@
-from cpl_core.application import StartupABC
-from cpl_core.configuration import ConfigurationABC
-from cpl_core.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/tools/set_pip_urls/application.py b/tools/set_pip_urls/application.py
index 5165965f..ff2c8a02 100644
--- a/tools/set_pip_urls/application.py
+++ b/tools/set_pip_urls/application.py
@@ -3,12 +3,12 @@ import os
import sys
from typing import Optional
-from cpl_core.environment import EnvironmentNameEnum
+from cpl.core.environment import EnvironmentNameEnum
-from cpl_core.application import ApplicationABC
-from cpl_core.configuration import ConfigurationABC
-from cpl_core.console import Console
-from cpl_core.dependency_injection import ServiceProviderABC
+from cpl.core.application import ApplicationABC
+from cpl.core.configuration import ConfigurationABC
+from cpl.core.console import Console
+from cpl.core.dependency_injection import ServiceProviderABC
from set_pip_urls.pip_settings import PIPSettings
diff --git a/tools/set_pip_urls/main.py b/tools/set_pip_urls/main.py
index 15fb7659..63410b99 100644
--- a/tools/set_pip_urls/main.py
+++ b/tools/set_pip_urls/main.py
@@ -1,4 +1,4 @@
-from cpl_core.application import ApplicationBuilder
+from cpl.core.application import ApplicationBuilder
from set_pip_urls.application import Application
from set_pip_urls.startup import Startup
diff --git a/tools/set_pip_urls/pip_settings.py b/tools/set_pip_urls/pip_settings.py
index 233abc4d..eebcf531 100644
--- a/tools/set_pip_urls/pip_settings.py
+++ b/tools/set_pip_urls/pip_settings.py
@@ -1,4 +1,4 @@
-from cpl_core.configuration.configuration_model_abc import ConfigurationModelABC
+from cpl.core.configuration.configuration_model_abc import ConfigurationModelABC
class PIPSettings(ConfigurationModelABC):
diff --git a/tools/set_pip_urls/startup.py b/tools/set_pip_urls/startup.py
index 470e8dab..33c5b7a7 100644
--- a/tools/set_pip_urls/startup.py
+++ b/tools/set_pip_urls/startup.py
@@ -1,7 +1,7 @@
-from cpl_core.application import StartupABC
-from cpl_core.configuration import ConfigurationABC
-from cpl_core.dependency_injection import ServiceProviderABC, ServiceCollectionABC
-from cpl_core.environment import ApplicationEnvironment
+from cpl.core.application import StartupABC
+from cpl.core.configuration import ConfigurationABC
+from cpl.core.dependency_injection import ServiceProviderABC, ServiceCollectionABC
+from cpl.core.environment import ApplicationEnvironment
class Startup(StartupABC):
diff --git a/tools/set_version/application.py b/tools/set_version/application.py
index 91bab130..1be33a03 100644
--- a/tools/set_version/application.py
+++ b/tools/set_version/application.py
@@ -2,15 +2,15 @@ import os
import traceback
from cpl_cli.configuration import ProjectSettings
-from cpl_core.utils import String
+from cpl.core.utils import String
from cpl_cli.configuration.version_settings_name_enum import VersionSettingsNameEnum
from cpl_cli.configuration.workspace_settings import WorkspaceSettings
-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.pipes.version_pipe import VersionPipe
+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.pipes.version_pipe import VersionPipe
from set_version.git_service import GitService
from set_version.version_setter_service import VersionSetterService
diff --git a/tools/set_version/git_service.py b/tools/set_version/git_service.py
index 3e942914..dd82171f 100644
--- a/tools/set_version/git_service.py
+++ b/tools/set_version/git_service.py
@@ -1,6 +1,6 @@
import os
-from cpl_core.environment import ApplicationEnvironmentABC
+from cpl.core.environment import ApplicationEnvironmentABC
from git import Repo
diff --git a/tools/set_version/main.py b/tools/set_version/main.py
index dfbecfda..a33c9969 100644
--- a/tools/set_version/main.py
+++ b/tools/set_version/main.py
@@ -1,4 +1,4 @@
-from cpl_core.application import ApplicationBuilder
+from cpl.core.application import ApplicationBuilder
from set_version.application import Application
from set_version.startup import Startup
diff --git a/tools/set_version/startup.py b/tools/set_version/startup.py
index ce7fb47f..41720a71 100644
--- a/tools/set_version/startup.py
+++ b/tools/set_version/startup.py
@@ -1,11 +1,11 @@
import os
from cpl_cli.configuration import WorkspaceSettings
-from cpl_core.application import StartupABC
-from cpl_core.configuration import ConfigurationABC
-from cpl_core.dependency_injection import ServiceProviderABC, ServiceCollectionABC
-from cpl_core.environment import ApplicationEnvironment
-from cpl_core.pipes.version_pipe import VersionPipe
+from cpl.core.application import StartupABC
+from cpl.core.configuration import ConfigurationABC
+from cpl.core.dependency_injection import ServiceProviderABC, ServiceCollectionABC
+from cpl.core.environment import ApplicationEnvironment
+from cpl.core.pipes.version_pipe import VersionPipe
from set_version.git_service import GitService
from set_version.version_setter_service import VersionSetterService
diff --git a/tools/set_version/version_setter_service.py b/tools/set_version/version_setter_service.py
index e1dfcf8a..edb086cf 100644
--- a/tools/set_version/version_setter_service.py
+++ b/tools/set_version/version_setter_service.py
@@ -2,8 +2,8 @@ import json
import os
from string import ascii_letters
-from cpl_core.environment import ApplicationEnvironmentABC
-from cpl_core.utils import String
+from cpl.core.environment import ApplicationEnvironmentABC
+from cpl.core.utils import String
class VersionSetterService:
diff --git a/unittests/unittests/application.py b/unittests/unittests/application.py
index 932fb34b..f2223343 100644
--- a/unittests/unittests/application.py
+++ b/unittests/unittests/application.py
@@ -1,8 +1,8 @@
import unittest
-from cpl_core.application import ApplicationABC
-from cpl_core.configuration import ConfigurationABC
-from cpl_core.dependency_injection import ServiceProviderABC
+from cpl.core.application import ApplicationABC
+from cpl.core.configuration import ConfigurationABC
+from cpl.core.dependency_injection import ServiceProviderABC
from unittests_cli.cli_test_suite import CLITestSuite
from unittests_core.core_test_suite import CoreTestSuite
from unittests_query.query_test_suite import QueryTestSuite
diff --git a/unittests/unittests/main.py b/unittests/unittests/main.py
index f9b59e72..c7bad62c 100644
--- a/unittests/unittests/main.py
+++ b/unittests/unittests/main.py
@@ -1,4 +1,4 @@
-from cpl_core.application import ApplicationBuilder
+from cpl.core.application import ApplicationBuilder
from unittests.application import Application
diff --git a/unittests/unittests_cli/add_test_case.py b/unittests/unittests_cli/add_test_case.py
index bfc2243d..2892bec1 100644
--- a/unittests/unittests_cli/add_test_case.py
+++ b/unittests/unittests_cli/add_test_case.py
@@ -1,7 +1,7 @@
import json
import os
-from cpl_core.utils import String
+from cpl.core.utils import String
from unittests_cli.abc.command_test_case import CommandTestCase
from unittests_cli.constants import PLAYGROUND_PATH
from unittests_shared.cli_commands import CLICommands
diff --git a/unittests/unittests_cli/build_test_case.py b/unittests/unittests_cli/build_test_case.py
index 6da264f5..6e97bbbd 100644
--- a/unittests/unittests_cli/build_test_case.py
+++ b/unittests/unittests_cli/build_test_case.py
@@ -3,7 +3,7 @@ import json
import os
import shutil
-from cpl_core.utils import String
+from cpl.core.utils import String
from unittests_cli.abc.command_test_case import CommandTestCase
from unittests_cli.constants import PLAYGROUND_PATH
from unittests_shared.cli_commands import CLICommands
diff --git a/unittests/unittests_cli/generate_test_case.py b/unittests/unittests_cli/generate_test_case.py
index ac2a2c21..3bc132d7 100644
--- a/unittests/unittests_cli/generate_test_case.py
+++ b/unittests/unittests_cli/generate_test_case.py
@@ -1,6 +1,6 @@
import os.path
-from cpl_core.utils import String
+from cpl.core.utils import String
from unittests_cli.abc.command_test_case import CommandTestCase
from unittests_cli.constants import PLAYGROUND_PATH
from unittests_shared.cli_commands import CLICommands
diff --git a/unittests/unittests_cli/install_test_case.py b/unittests/unittests_cli/install_test_case.py
index b7adabdd..e9498147 100644
--- a/unittests/unittests_cli/install_test_case.py
+++ b/unittests/unittests_cli/install_test_case.py
@@ -5,7 +5,7 @@ import subprocess
import sys
import unittest
-from cpl_core.utils import String
+from cpl.core.utils import String
from unittests_cli.abc.command_test_case import CommandTestCase
from unittests_cli.constants import PLAYGROUND_PATH
from unittests_shared.cli_commands import CLICommands
diff --git a/unittests/unittests_cli/new_test_case.py b/unittests/unittests_cli/new_test_case.py
index 758d0b81..622cf5c5 100644
--- a/unittests/unittests_cli/new_test_case.py
+++ b/unittests/unittests_cli/new_test_case.py
@@ -2,7 +2,7 @@ import json
import os
import unittest
-from cpl_core.utils import String
+from cpl.core.utils import String
from unittests_cli.abc.command_test_case import CommandTestCase
from unittests_cli.constants import PLAYGROUND_PATH
from unittests_shared.cli_commands import CLICommands
diff --git a/unittests/unittests_cli/publish_test_case.py b/unittests/unittests_cli/publish_test_case.py
index f4a5a851..1e93ef86 100644
--- a/unittests/unittests_cli/publish_test_case.py
+++ b/unittests/unittests_cli/publish_test_case.py
@@ -3,7 +3,7 @@ import json
import os
import shutil
-from cpl_core.utils import String
+from cpl.core.utils import String
from unittests_cli.abc.command_test_case import CommandTestCase
from unittests_cli.constants import PLAYGROUND_PATH
from unittests_shared.cli_commands import CLICommands
diff --git a/unittests/unittests_cli/remove_test_case.py b/unittests/unittests_cli/remove_test_case.py
index 50ed3a52..16729537 100644
--- a/unittests/unittests_cli/remove_test_case.py
+++ b/unittests/unittests_cli/remove_test_case.py
@@ -2,7 +2,7 @@ import json
import os
import unittest
-from cpl_core.utils import String
+from cpl.core.utils import String
from unittests_cli.abc.command_test_case import CommandTestCase
from unittests_cli.constants import PLAYGROUND_PATH
from unittests_shared.cli_commands import CLICommands
diff --git a/unittests/unittests_cli/run_test_case.py b/unittests/unittests_cli/run_test_case.py
index 7704548d..ed87b02a 100644
--- a/unittests/unittests_cli/run_test_case.py
+++ b/unittests/unittests_cli/run_test_case.py
@@ -3,7 +3,7 @@ import os
import shutil
import unittest
-from cpl_core.utils import String
+from cpl.core.utils import String
from unittests_cli.abc.command_test_case import CommandTestCase
from unittests_cli.constants import PLAYGROUND_PATH
from unittests_shared.cli_commands import CLICommands
diff --git a/unittests/unittests_cli/start_test_case.py b/unittests/unittests_cli/start_test_case.py
index 3178bf42..f83cb1cf 100644
--- a/unittests/unittests_cli/start_test_case.py
+++ b/unittests/unittests_cli/start_test_case.py
@@ -4,7 +4,7 @@ import shutil
import time
import unittest
-from cpl_core.utils import String
+from cpl.core.utils import String
from unittests_cli.abc.command_test_case import CommandTestCase
from unittests_cli.constants import PLAYGROUND_PATH
from unittests_cli.threads.start_test_thread import StartTestThread
diff --git a/unittests/unittests_cli/uninstall_test_case.py b/unittests/unittests_cli/uninstall_test_case.py
index 542faecd..7706e4ce 100644
--- a/unittests/unittests_cli/uninstall_test_case.py
+++ b/unittests/unittests_cli/uninstall_test_case.py
@@ -5,7 +5,7 @@ import subprocess
import sys
import unittest
-from cpl_core.utils import String
+from cpl.core.utils import String
from unittests_cli.abc.command_test_case import CommandTestCase
from unittests_cli.constants import PLAYGROUND_PATH
from unittests_shared.cli_commands import CLICommands
diff --git a/unittests/unittests_cli/update_test_case.py b/unittests/unittests_cli/update_test_case.py
index eb55ee57..6c563cd5 100644
--- a/unittests/unittests_cli/update_test_case.py
+++ b/unittests/unittests_cli/update_test_case.py
@@ -5,7 +5,7 @@ import subprocess
import sys
import unittest
-from cpl_core.utils import String
+from cpl.core.utils import String
from unittests_cli.abc.command_test_case import CommandTestCase
from unittests_cli.constants import PLAYGROUND_PATH
from unittests_shared.cli_commands import CLICommands
diff --git a/unittests/unittests_cli/version_test_case.py b/unittests/unittests_cli/version_test_case.py
index 868c6b6d..668dd7d8 100644
--- a/unittests/unittests_cli/version_test_case.py
+++ b/unittests/unittests_cli/version_test_case.py
@@ -9,7 +9,7 @@ from art import text2art
from tabulate import tabulate
import cpl_cli
-from cpl_core.console import ForegroundColorEnum
+from cpl.core.console import ForegroundColorEnum
from termcolor import colored
from unittests_cli.abc.command_test_case import CommandTestCase
diff --git a/unittests/unittests_core/configuration/configuration_test_case.py b/unittests/unittests_core/configuration/configuration_test_case.py
index 4dee9a8d..9f7e26c7 100644
--- a/unittests/unittests_core/configuration/configuration_test_case.py
+++ b/unittests/unittests_core/configuration/configuration_test_case.py
@@ -3,10 +3,10 @@ import sys
import unittest
from unittest.mock import Mock, MagicMock
-from cpl_core.configuration import Configuration, ArgumentTypeEnum
-from cpl_core.database import DatabaseSettings
-from cpl_core.dependency_injection import ServiceProvider, ServiceCollection
-from cpl_mail import EMailClientSettings
+from cpl.core.configuration import Configuration, ArgumentTypeEnum
+from cpl.core.database import DatabaseSettings
+from cpl.core.dependency_injection import ServiceProvider, ServiceCollection
+from cpl.mail import EMailClientSettings
class ConfigurationTestCase(unittest.TestCase):
diff --git a/unittests/unittests_core/configuration/console_arguments_test_case.py b/unittests/unittests_core/configuration/console_arguments_test_case.py
index c5b67925..d8e47cf8 100644
--- a/unittests/unittests_core/configuration/console_arguments_test_case.py
+++ b/unittests/unittests_core/configuration/console_arguments_test_case.py
@@ -2,8 +2,8 @@ import sys
import unittest
from unittest.mock import Mock, MagicMock
-from cpl_core.configuration import Configuration, ArgumentTypeEnum
-from cpl_core.dependency_injection import ServiceCollection
+from cpl.core.configuration import Configuration, ArgumentTypeEnum
+from cpl.core.dependency_injection import ServiceCollection
class ConsoleArgumentsTestCase(unittest.TestCase):
diff --git a/unittests/unittests_core/configuration/environment_test_case.py b/unittests/unittests_core/configuration/environment_test_case.py
index 5c1a4aed..a7a9ed84 100644
--- a/unittests/unittests_core/configuration/environment_test_case.py
+++ b/unittests/unittests_core/configuration/environment_test_case.py
@@ -2,9 +2,9 @@ import os
import unittest
from _socket import gethostname
-from cpl_core.configuration import Configuration
-from cpl_core.environment import ApplicationEnvironment, ApplicationEnvironmentABC
-from cpl_core.environment import application_environment
+from cpl.core.configuration import Configuration
+from cpl.core.environment import ApplicationEnvironment, ApplicationEnvironmentABC
+from cpl.core.environment import application_environment
class EnvironmentTestCase(unittest.TestCase):
diff --git a/unittests/unittests_core/di/service_collection_test_case.py b/unittests/unittests_core/di/service_collection_test_case.py
index ba41797f..0c1ae51f 100644
--- a/unittests/unittests_core/di/service_collection_test_case.py
+++ b/unittests/unittests_core/di/service_collection_test_case.py
@@ -1,8 +1,8 @@
import unittest
from unittest.mock import Mock
-from cpl_core.configuration import Configuration
-from cpl_core.dependency_injection import ServiceCollection, ServiceLifetimeEnum, ServiceProviderABC
+from cpl.core.configuration import Configuration
+from cpl.core.dependency_injection import ServiceCollection, ServiceLifetimeEnum, ServiceProviderABC
class ServiceCollectionTestCase(unittest.TestCase):
diff --git a/unittests/unittests_core/di/service_provider_test_case.py b/unittests/unittests_core/di/service_provider_test_case.py
index b191434d..44bf2e41 100644
--- a/unittests/unittests_core/di/service_provider_test_case.py
+++ b/unittests/unittests_core/di/service_provider_test_case.py
@@ -1,7 +1,7 @@
import unittest
-from cpl_core.configuration import Configuration
-from cpl_core.dependency_injection import ServiceCollection, ServiceProviderABC
+from cpl.core.configuration import Configuration
+from cpl.core.dependency_injection import ServiceCollection, ServiceProviderABC
class ServiceCount:
diff --git a/unittests/unittests_core/pipes/bool_pipe_test_case.py b/unittests/unittests_core/pipes/bool_pipe_test_case.py
index 99af412b..decf88a7 100644
--- a/unittests/unittests_core/pipes/bool_pipe_test_case.py
+++ b/unittests/unittests_core/pipes/bool_pipe_test_case.py
@@ -1,6 +1,6 @@
import unittest
-from cpl_core.pipes import BoolPipe
+from cpl.core.pipes import BoolPipe
class BoolPipeTestCase(unittest.TestCase):
diff --git a/unittests/unittests_core/pipes/ip_address_pipe_test_case.py b/unittests/unittests_core/pipes/ip_address_pipe_test_case.py
index 218bdb6a..e4b0d878 100644
--- a/unittests/unittests_core/pipes/ip_address_pipe_test_case.py
+++ b/unittests/unittests_core/pipes/ip_address_pipe_test_case.py
@@ -1,6 +1,6 @@
import unittest
-from cpl_core.pipes import IPAddressPipe
+from cpl.core.pipes import IPAddressPipe
class IPAddressTestCase(unittest.TestCase):
diff --git a/unittests/unittests_core/pipes/version_pipe_test_case.py b/unittests/unittests_core/pipes/version_pipe_test_case.py
index 2df20d76..c122ce9f 100644
--- a/unittests/unittests_core/pipes/version_pipe_test_case.py
+++ b/unittests/unittests_core/pipes/version_pipe_test_case.py
@@ -1,6 +1,6 @@
import unittest
-from cpl_core.pipes.version_pipe import VersionPipe
+from cpl.core.pipes.version_pipe import VersionPipe
class VersionPipeTestCase(unittest.TestCase):
diff --git a/unittests/unittests_core/utils/credential_manager_test_case.py b/unittests/unittests_core/utils/credential_manager_test_case.py
index c602dfa1..00d6a61f 100644
--- a/unittests/unittests_core/utils/credential_manager_test_case.py
+++ b/unittests/unittests_core/utils/credential_manager_test_case.py
@@ -1,6 +1,6 @@
import unittest
-from cpl_core.utils import CredentialManager
+from cpl.core.utils import CredentialManager
class CredentialManagerTestCase(unittest.TestCase):
diff --git a/unittests/unittests_core/utils/json_processor_test_case.py b/unittests/unittests_core/utils/json_processor_test_case.py
index 2772c966..fc77b812 100644
--- a/unittests/unittests_core/utils/json_processor_test_case.py
+++ b/unittests/unittests_core/utils/json_processor_test_case.py
@@ -1,6 +1,6 @@
import unittest
-from cpl_core.utils.json_processor import JSONProcessor
+from cpl.core.utils.json_processor import JSONProcessor
class SubTestClass:
diff --git a/unittests/unittests_core/utils/string_test_case.py b/unittests/unittests_core/utils/string_test_case.py
index cc826567..37707be1 100644
--- a/unittests/unittests_core/utils/string_test_case.py
+++ b/unittests/unittests_core/utils/string_test_case.py
@@ -1,7 +1,7 @@
import string
import unittest
-from cpl_core.utils import String
+from cpl.core.utils import String
class StringTestCase(unittest.TestCase):
diff --git a/unittests/unittests_query/enumerable_query_test_case.py b/unittests/unittests_query/enumerable_query_test_case.py
index 59352bf1..837ae678 100644
--- a/unittests/unittests_query/enumerable_query_test_case.py
+++ b/unittests/unittests_query/enumerable_query_test_case.py
@@ -2,9 +2,9 @@ import string
import unittest
from random import randint
-from cpl_core.utils import String
-from cpl_query.enumerable.enumerable import Enumerable
-from cpl_query.exceptions import InvalidTypeException, ArgumentNoneException, IndexOutOfRangeException
+from cpl.core.utils import String
+from cpl.query.enumerable.enumerable import Enumerable
+from cpl.query.exceptions import InvalidTypeException, ArgumentNoneException, IndexOutOfRangeException
from unittests_query.models import User, Address
diff --git a/unittests/unittests_query/enumerable_test_case.py b/unittests/unittests_query/enumerable_test_case.py
index bff17ee5..9ff57607 100644
--- a/unittests/unittests_query/enumerable_test_case.py
+++ b/unittests/unittests_query/enumerable_test_case.py
@@ -1,6 +1,6 @@
import unittest
-from cpl_query.enumerable.enumerable import Enumerable
+from cpl.query.enumerable.enumerable import Enumerable
class EnumerableTestCase(unittest.TestCase):
diff --git a/unittests/unittests_query/iterable_query_test_case.py b/unittests/unittests_query/iterable_query_test_case.py
index 3592d4f1..fccf9468 100644
--- a/unittests/unittests_query/iterable_query_test_case.py
+++ b/unittests/unittests_query/iterable_query_test_case.py
@@ -2,10 +2,10 @@ import string
import unittest
from random import randint
-from cpl_core.utils import String
-from cpl_query.exceptions import InvalidTypeException, ArgumentNoneException
-from cpl_query.extension.list import List
-from cpl_query.iterable import Iterable
+from cpl.core.utils import String
+from cpl.query.exceptions import InvalidTypeException, ArgumentNoneException
+from cpl.query.extension.list import List
+from cpl.query.iterable import Iterable
from unittests_query.models import User, Address
diff --git a/unittests/unittests_query/iterable_test_case.py b/unittests/unittests_query/iterable_test_case.py
index a1f55d43..c0c4bc59 100644
--- a/unittests/unittests_query/iterable_test_case.py
+++ b/unittests/unittests_query/iterable_test_case.py
@@ -1,6 +1,6 @@
import unittest
-from cpl_query.extension.list import List
+from cpl.query.extension.list import List
class IterableTestCase(unittest.TestCase):
diff --git a/unittests/unittests_query/performance_test_case.py b/unittests/unittests_query/performance_test_case.py
index 98128ac1..b8f52a3a 100644
--- a/unittests/unittests_query/performance_test_case.py
+++ b/unittests/unittests_query/performance_test_case.py
@@ -2,8 +2,8 @@ import sys
import timeit
import unittest
-from cpl_query.enumerable import Enumerable
-from cpl_query.iterable import Iterable
+from cpl.query.enumerable import Enumerable
+from cpl.query.iterable import Iterable
VALUES = 10000
COUNT = 50
diff --git a/unittests/unittests_query/sequence_test_case.py b/unittests/unittests_query/sequence_test_case.py
index a4da3c08..f922497c 100644
--- a/unittests/unittests_query/sequence_test_case.py
+++ b/unittests/unittests_query/sequence_test_case.py
@@ -1,8 +1,8 @@
import unittest
-from cpl_query.enumerable import Enumerable
-from cpl_query.extension.list import List
-from cpl_query.iterable import Iterable
+from cpl.query.enumerable import Enumerable
+from cpl.query.extension.list import List
+from cpl.query.iterable import Iterable
class SequenceTestCase(unittest.TestCase):