From 4719c324571f8f5a6ffd56ee023e85956fcdb3dd Mon Sep 17 00:00:00 2001 From: edraft Date: Mon, 15 Sep 2025 16:55:57 +0200 Subject: [PATCH] Updated ci --- clean_init.py | 79 ------- .../html/_sources/cpl_core.logging.rst.txt | 12 +- docs/build/html/_sources/cpl_core.rst.txt | 2 +- docs/build/html/cpl_core.application.html | 2 +- docs/build/html/cpl_core.configuration.html | 2 +- docs/build/html/cpl_core.console.html | 2 +- .../html/cpl_core.database.connection.html | 2 +- .../build/html/cpl_core.database.context.html | 2 +- docs/build/html/cpl_core.database.html | 2 +- .../html/cpl_core.dependency_injection.html | 2 +- docs/build/html/cpl_core.environment.html | 6 +- docs/build/html/cpl_core.html | 98 ++++---- docs/build/html/cpl_core.logging.html | 220 +++++++++--------- docs/build/html/cpl_core.mailing.html | 10 +- docs/build/html/cpl_core.pipes.html | 2 +- docs/build/html/cpl_core.time.html | 2 +- docs/build/html/cpl_core.utils.html | 2 +- docs/build/html/cpl_discord.service.html | 4 +- docs/build/html/genindex.html | 114 ++++----- docs/build/html/modules.html | 30 +-- docs/build/html/py-modindex.html | 12 +- docs/build/html/searchindex.js | 2 +- docs/source/cpl_core.logging.rst | 12 +- docs/source/cpl_core.rst | 2 +- .../service_collection.py | 4 +- src/cpl_core/{logging => log}/__init__.py | 0 src/cpl_core/{logging => log}/logger_abc.py | 2 +- .../{logging => log}/logger_service.py | 10 +- .../{logging => log}/logging_level_enum.py | 0 .../{logging => log}/logging_settings.py | 2 +- .../logging_settings_name_enum.py | 0 src/cpl_core/mailing/email_client_service.py | 4 +- src/cpl_core/pyproject.toml | 30 ++- src/cpl_query/pyproject.toml | 24 +- tests/custom/database/src/application.py | 2 +- tests/custom/database/src/startup.py | 2 +- .../discord/src/discord_bot/application.py | 2 +- .../src/modules/hello_world/on_ready_event.py | 2 +- .../hello_world/on_ready_test_event.py | 2 +- .../src/modules/hello_world/ping_command.py | 2 +- .../src/modules/hello_world/purge_command.py | 2 +- .../custom/general/src/general/application.py | 2 +- tests/custom/general/src/general/startup.py | 2 +- 43 files changed, 319 insertions(+), 398 deletions(-) delete mode 100644 clean_init.py rename src/cpl_core/{logging => log}/__init__.py (100%) rename src/cpl_core/{logging => log}/logger_abc.py (96%) rename src/cpl_core/{logging => log}/logger_service.py (97%) rename src/cpl_core/{logging => log}/logging_level_enum.py (100%) rename src/cpl_core/{logging => log}/logging_settings.py (95%) rename src/cpl_core/{logging => log}/logging_settings_name_enum.py (100%) diff --git a/clean_init.py b/clean_init.py deleted file mode 100644 index 66754c90..00000000 --- a/clean_init.py +++ /dev/null @@ -1,79 +0,0 @@ -import os -import re - -def clean_init_files(root_dir='.'): - """ - Durchsucht rekursiv alle __init__.py Dateien und entfernt: - - Einzeilige Kommentare - - Mehrzeilige Kommentare/Docstrings - - Variablen, die mit __ beginnen und enden - - VersionInfo- und version_info-Zuweisungen - """ - # Regex-Pattern für zu entfernende Zeilen - comment_pattern = re.compile(r'^\s*#.*$') - dunder_pattern = re.compile(r'^\s*__\w+__\s*=.*$') - version_pattern = re.compile(r'^\s*(VersionInfo|version_info)\s*=.*$') - - # Zu ignorierende Verzeichnisse - ignore_dirs = ['venv', '.venv', 'env', '.env'] - - # Zähle bearbeitete Dateien - processed_files = 0 - - for dirpath, dirnames, filenames in os.walk(root_dir): - # Ignoriere venv-Verzeichnisse - dirnames[:] = [d for d in dirnames if d not in ignore_dirs] - - for filename in filenames: - if filename == '__init__.py': - file_path = os.path.join(dirpath, filename) - - # Datei lesen - with open(file_path, 'r', encoding='utf-8') as f: - content = f.read() - - # Mehrzeilige Kommentare entfernen - # Entferne Docstrings (''' oder """) - content = re.sub(r'(?:\'\'\'|""")[\s\S]*?(?:\'\'\'|""")', '', content) - - # Verarbeite die Zeilen - lines = content.splitlines() - - # Zu behaltende Zeilen filtern - filtered_lines = [] - for line in lines: - if (not comment_pattern.match(line) and - not dunder_pattern.match(line) and - not version_pattern.match(line)): - filtered_lines.append(line) - - # Leere aufeinanderfolgende Zeilen entfernen - clean_lines = [] - prev_empty = False - for line in filtered_lines: - is_empty = line.strip() == '' - if not (is_empty and prev_empty): - clean_lines.append(line) - prev_empty = is_empty - - # Entferne Leerzeilen am Anfang und Ende - while clean_lines and clean_lines[0].strip() == '': - clean_lines.pop(0) - while clean_lines and clean_lines[-1].strip() == '': - clean_lines.pop() - - # Füge eine Leerzeile am Ende hinzu, wenn die Datei nicht leer ist - if clean_lines: - clean_lines.append('') - - # Schreibe bereinigte Datei zurück - with open(file_path, 'w', encoding='utf-8') as f: - f.write('\n'.join(clean_lines)) - - processed_files += 1 - print(f"Bereinigt: {file_path}") - - print(f"\nAbgeschlossen: {processed_files} __init__.py Dateien bereinigt") - -if __name__ == "__main__": - clean_init_files() \ No newline at end of file diff --git a/docs/build/html/_sources/cpl_core.logging.rst.txt b/docs/build/html/_sources/cpl_core.logging.rst.txt index 6f36754d..9eb1c04f 100644 --- a/docs/build/html/_sources/cpl_core.logging.rst.txt +++ b/docs/build/html/_sources/cpl_core.logging.rst.txt @@ -7,7 +7,7 @@ Submodules cpl\_core.logging.logger\_abc module ------------------------------------ -.. automodule:: cpl_core.logging.logger_abc +.. automodule:: cpl_core.log.logger_abc :members: :undoc-members: :show-inheritance: @@ -15,7 +15,7 @@ cpl\_core.logging.logger\_abc module cpl\_core.logging.logger\_service module ---------------------------------------- -.. automodule:: cpl_core.logging.logger_service +.. automodule:: cpl_core.log.logger_service :members: :undoc-members: :show-inheritance: @@ -23,7 +23,7 @@ cpl\_core.logging.logger\_service module cpl\_core.logging.logging\_level\_enum module --------------------------------------------- -.. automodule:: cpl_core.logging.logging_level_enum +.. automodule:: cpl_core.log.logging_level_enum :members: :undoc-members: :show-inheritance: @@ -31,7 +31,7 @@ cpl\_core.logging.logging\_level\_enum module cpl\_core.logging.logging\_settings module ------------------------------------------ -.. automodule:: cpl_core.logging.logging_settings +.. automodule:: cpl_core.log.logging_settings :members: :undoc-members: :show-inheritance: @@ -39,7 +39,7 @@ cpl\_core.logging.logging\_settings module cpl\_core.logging.logging\_settings\_name\_enum module ------------------------------------------------------ -.. automodule:: cpl_core.logging.logging_settings_name_enum +.. automodule:: cpl_core.log.logging_settings_name_enum :members: :undoc-members: :show-inheritance: @@ -47,7 +47,7 @@ cpl\_core.logging.logging\_settings\_name\_enum module Module contents --------------- -.. automodule:: cpl_core.logging +.. automodule:: cpl_core.log :members: :undoc-members: :show-inheritance: diff --git a/docs/build/html/_sources/cpl_core.rst.txt b/docs/build/html/_sources/cpl_core.rst.txt index f238136a..3a398f14 100644 --- a/docs/build/html/_sources/cpl_core.rst.txt +++ b/docs/build/html/_sources/cpl_core.rst.txt @@ -10,7 +10,7 @@ API reference cpl_core.database cpl_core.dependency_injection cpl_core.environment - cpl_core.logging + cpl_core.log cpl_core.mailing cpl_core.pipes cpl_core.time diff --git a/docs/build/html/cpl_core.application.html b/docs/build/html/cpl_core.application.html index 0e18088f..5742be0b 100644 --- a/docs/build/html/cpl_core.application.html +++ b/docs/build/html/cpl_core.application.html @@ -87,7 +87,7 @@
  • cpl_core.database package
  • cpl_core.dependency_injection package
  • cpl_core.environment package
    • -
  • cpl_core.logging package
    • +
  • cpl_core.log package
  • cpl_core.mailing package
  • cpl_core.pipes package
  • cpl_core.time package
    • diff --git a/docs/build/html/cpl_core.configuration.html b/docs/build/html/cpl_core.configuration.html index a0ca14f8..8da0ea6e 100644 --- a/docs/build/html/cpl_core.configuration.html +++ b/docs/build/html/cpl_core.configuration.html @@ -112,7 +112,7 @@
  • cpl_core.database package
  • cpl_core.dependency_injection package
  • cpl_core.environment package
    • -
  • cpl_core.logging package
    • +
  • cpl_core.log package
  • cpl_core.mailing package
  • cpl_core.pipes package
  • cpl_core.time package
    • diff --git a/docs/build/html/cpl_core.console.html b/docs/build/html/cpl_core.console.html index 5c9bbd8a..467f3d47 100644 --- a/docs/build/html/cpl_core.console.html +++ b/docs/build/html/cpl_core.console.html @@ -83,7 +83,7 @@
  • cpl_core.database package
  • cpl_core.dependency_injection package
  • cpl_core.environment package
    • -
  • cpl_core.logging package
    • +
  • cpl_core.log package
  • cpl_core.mailing package
  • cpl_core.pipes package
  • cpl_core.time package
    • diff --git a/docs/build/html/cpl_core.database.connection.html b/docs/build/html/cpl_core.database.connection.html index 717b961f..4dfe3244 100644 --- a/docs/build/html/cpl_core.database.connection.html +++ b/docs/build/html/cpl_core.database.connection.html @@ -67,7 +67,7 @@
  • cpl_core.dependency_injection package
  • cpl_core.environment package
    • -
  • cpl_core.logging package
    • +
  • cpl_core.log package
  • cpl_core.mailing package
  • cpl_core.pipes package
  • cpl_core.time package
    • diff --git a/docs/build/html/cpl_core.database.context.html b/docs/build/html/cpl_core.database.context.html index 7e1eb9f5..f926c26e 100644 --- a/docs/build/html/cpl_core.database.context.html +++ b/docs/build/html/cpl_core.database.context.html @@ -67,7 +67,7 @@
  • cpl_core.dependency_injection package
  • cpl_core.environment package
    • -
  • cpl_core.logging package
    • +
  • cpl_core.log package
  • cpl_core.mailing package
  • cpl_core.pipes package
  • cpl_core.time package
    • diff --git a/docs/build/html/cpl_core.database.html b/docs/build/html/cpl_core.database.html index 220bb5b1..8ae4fb29 100644 --- a/docs/build/html/cpl_core.database.html +++ b/docs/build/html/cpl_core.database.html @@ -80,7 +80,7 @@
  • cpl_core.dependency_injection package
  • cpl_core.environment package
    • -
  • cpl_core.logging package
    • +
  • cpl_core.log package
  • cpl_core.mailing package
  • cpl_core.pipes package
  • cpl_core.time package
    • diff --git a/docs/build/html/cpl_core.dependency_injection.html b/docs/build/html/cpl_core.dependency_injection.html index f42e21da..cdbc2939 100644 --- a/docs/build/html/cpl_core.dependency_injection.html +++ b/docs/build/html/cpl_core.dependency_injection.html @@ -99,7 +99,7 @@
  • cpl_core.environment package
    • -
  • cpl_core.logging package
    • +
  • cpl_core.log package
  • cpl_core.mailing package
  • cpl_core.pipes package
  • cpl_core.time package
    • diff --git a/docs/build/html/cpl_core.environment.html b/docs/build/html/cpl_core.environment.html index 52ffc65e..5b02d3a5 100644 --- a/docs/build/html/cpl_core.environment.html +++ b/docs/build/html/cpl_core.environment.html @@ -19,7 +19,7 @@ - + @@ -75,7 +75,7 @@ -
  • cpl_core.logging package
    • +
  • cpl_core.log package
  • cpl_core.mailing package
  • cpl_core.pipes package
  • cpl_core.time package
    • @@ -361,7 +361,7 @@