Updated ci

src/cpl_core/dependency_injection/service_collection.py

@@ -8,8 +8,8 @@ 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.logging.logger_abc import LoggerABC
-from cpl_core.logging.logger_service import Logger
+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
 

src/cpl_core/log/logger_abc.py

@@ -2,7 +2,7 @@ from abc import abstractmethod, ABC
 
 
 class LoggerABC(ABC):
-    r"""ABC for :class:`cpl_core.logging.logger_service.Logger`"""
+    r"""ABC for :class:`cpl_core.log.logger_service.Logger`"""
 
     @abstractmethod
     def __init__(self):

src/cpl_core/log/logger_service.py

@@ -8,9 +8,9 @@ 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.logging.logger_abc import LoggerABC
-from cpl_core.logging.logging_level_enum import LoggingLevelEnum
-from cpl_core.logging.logging_settings import LoggingSettings
+from cpl_core.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
 
 
@@ -18,7 +18,7 @@ class Logger(LoggerABC):
     r"""Service for logging
 
     Parameter:
-        logging_settings: :class:`cpl_core.logging.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 settings
@@ -138,7 +138,7 @@ class Logger(LoggerABC):
         Parameter:
             name: :class:`str`
                 Name of the message
-            level: :class:`cpl_core.logging.logging_level_enum.LoggingLevelEnum`
+            level: :class:`cpl_core.log.logging_level_enum.LoggingLevelEnum`
                 Logging level
             message: :class:`str`
                 Log message

src/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.logging.logging_level_enum import LoggingLevelEnum
+from cpl_core.log.logging_level_enum import LoggingLevelEnum
 
 
 class LoggingSettings(ConfigurationModelABC):

src/cpl_core/mailing/email_client_service.py

@@ -3,7 +3,7 @@ from smtplib import SMTP
 from typing import Optional
 
 from cpl_core.environment.application_environment_abc import ApplicationEnvironmentABC
-from cpl_core.logging.logger_abc import LoggerABC
+from cpl_core.log.logger_abc import LoggerABC
 from cpl_core.mailing.email import EMail
 from cpl_core.mailing.email_client_abc import EMailClientABC
 from cpl_core.mailing.email_client_settings import EMailClientSettings
@@ -16,7 +16,7 @@ class EMailClient(EMailClientABC):
     Parameter:
         environment: :class:`cpl_core.environment.application_environment_abc.ApplicationEnvironmentABC`
             Environment of the application
-        logger: :class:`cpl_core.logging.logger_abc.LoggerABC`
+        logger: :class:`cpl_core.log.logger_abc.LoggerABC`
             The logger to use
         mail_settings: :class:`cpl_core.mailing.email_client_settings.EMailClientSettings`
             Settings for mailing

src/cpl_core/pyproject.toml

@@ -6,7 +6,7 @@ build-backend = "setuptools.build_meta"
 name = "cpl-core"
 version = "2024.7.0"
 description = "CPL core"
-readme = { text = "CPL core package" }
+readme = "CPL core package"
 requires-python = ">=3.12"
 license = { text = "MIT" }
 authors = [
@@ -19,22 +19,20 @@ 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",
+]
+
 [tool.setuptools.dynamic]
 dependencies = { file = ["requirements.txt"] }
 optional-dependencies.dev = { file = ["requirements.dev.txt"] }
 
-[tool.setuptools]
-packages = ["cpl_core"]
-include-package-data = true
-
-[tool.setuptools.packages.find]
-include = ["*"]
-exclude = [
-    "*/__pycache__",
-    "*/logs",
-    "*/tests",
-]
-
-[tool.setuptools.package-data]
-cpl_core = [".cpl/*.py"]
-"" = ["templates/**"]

src/cpl_query/pyproject.toml

@@ -19,18 +19,20 @@ 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",
+]
+
 [tool.setuptools.dynamic]
 dependencies = { file = ["requirements.txt"] }
 optional-dependencies.dev = { file = ["requirements.dev.txt"] }
 
-[tool.setuptools]
-packages = ["cpl_query"]
-include-package-data = true
-
-[tool.setuptools.packages.find]
-include = ["*"]
-exclude = [
-    "*/__pycache__",
-    "*/logs",
-    "*/tests",
-]