diff --git a/Automation/Scripts/automation_scripts/commands/develop_command.py b/Automation/Scripts/automation_scripts/commands/develop_command.py index 05eb4ba..6d152c1 100644 --- a/Automation/Scripts/automation_scripts/commands/develop_command.py +++ b/Automation/Scripts/automation_scripts/commands/develop_command.py @@ -29,13 +29,14 @@ def run(self, arguments: argparse.Namespace, simulate: bool, **kwargs) -> None: venv_directory = automation_configuration.python_development_configuration.venv_directory python_system_executable = python_helpers.resolve_system_python_executable() python_environment = PythonEnvironment(python_system_executable, venv_directory) + pip_configuration_file_path = "pip.conf" package_collection_for_pip: List[str] = [] for package in automation_configuration.python_development_configuration.package_collection: package_collection_for_pip.append(package.path_to_sources + "[dev]") logger.info("Setting up python virtual environment (Path: %s)", venv_directory) - python_environment.setup_virtual_environment(simulate = simulate) + python_environment.setup_virtual_environment(pip_configuration_file_path, simulate = simulate) python_environment.install_python_packages_for_development(package_collection_for_pip, simulate = simulate) diff --git a/Sources/website/benjaminhamon_developer_website/logging_helpers.py b/Sources/website/benjaminhamon_developer_website/logging_helpers.py deleted file mode 100644 index f7f1c12..0000000 --- a/Sources/website/benjaminhamon_developer_website/logging_helpers.py +++ /dev/null @@ -1,47 +0,0 @@ -import logging -import os -from typing import TextIO - - -all_log_levels = [ "debug", "info", "warning", "error", "critical" ] -date_format_iso = "%Y-%m-%dT%H:%M:%S" - - -def get_level_as_integer(level_as_string: str) -> int: - if level_as_string.lower() == "debug": - return logging.DEBUG - if level_as_string.lower() == "info": - return logging.INFO - if level_as_string.lower() == "warning": - return logging.WARNING - if level_as_string.lower() == "error": - return logging.ERROR - if level_as_string.lower() == "critical": - return logging.CRITICAL - - raise ValueError("Unknown logging level '%s'" % level_as_string) - - -def configure_log_stream(logger: logging.Logger, stream: TextIO, level: str, message_format: str, date_format: str) -> None: - formatter = logging.Formatter(fmt = message_format, datefmt = date_format, style = "{") - - stream_handler = logging.StreamHandler(stream) - stream_handler.setLevel(get_level_as_integer(level)) - stream_handler.formatter = formatter - - logger.addHandler(stream_handler) - - -def configure_log_file( # pylint: disable = too-many-arguments, too-many-positional-arguments - logger: logging.Logger, file_path: str, level: str, message_format: str, date_format: str, mode: str, encoding: str) -> None: - - if os.path.dirname(file_path): - os.makedirs(os.path.dirname(file_path), exist_ok = True) - - formatter = logging.Formatter(fmt = message_format, datefmt = date_format, style = "{") - - file_handler = logging.FileHandler(file_path, mode = mode, encoding = encoding) - file_handler.setLevel(get_level_as_integer(level)) - file_handler.formatter = formatter - - logger.addHandler(file_handler) diff --git a/Sources/website/benjaminhamon_developer_website/run.py b/Sources/website/benjaminhamon_developer_website/run.py index aea0a69..7f8561d 100644 --- a/Sources/website/benjaminhamon_developer_website/run.py +++ b/Sources/website/benjaminhamon_developer_website/run.py @@ -6,8 +6,9 @@ import sys from typing import Optional +from benjaminhamon_standard_extensions.logging import logging_helpers + from benjaminhamon_developer_website import application_factory -from benjaminhamon_developer_website import logging_helpers logger = logging.getLogger("Main") @@ -50,7 +51,7 @@ def create_argument_parser() -> argparse.ArgumentParser: def configure_logging(arguments: argparse.Namespace): message_format = "{asctime} [{levelname}][{name}] {message}" - date_format = "%Y-%m-%dT%H:%M:%S" + date_format = logging_helpers.date_format_iso log_stream_verbosity: str = "info" log_file_path: Optional[str] = None diff --git a/Sources/website/pyproject.toml b/Sources/website/pyproject.toml index 803c7a7..bce3ee1 100644 --- a/Sources/website/pyproject.toml +++ b/Sources/website/pyproject.toml @@ -25,6 +25,7 @@ classifiers = [ ] dependencies = [ + "benjaminhamon-standard-extensions ~= 1.0.1", "Flask ~= 3.1.1", "prometheus-flask-exporter ~= 0.23.2", ]