From 86801263608c0cc9405506c48d3dc86eb7e884f1 Mon Sep 17 00:00:00 2001 From: Eden Zhang Date: Wed, 29 Jan 2025 16:20:41 +0000 Subject: [PATCH] Change list annotation to typing.List --- .../clp_package_utils/scripts/archive_manager.py | 9 +++++---- .../clp_package_utils/scripts/native/archive_manager.py | 6 +++--- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/components/clp-package-utils/clp_package_utils/scripts/archive_manager.py b/components/clp-package-utils/clp_package_utils/scripts/archive_manager.py index f48dc6247..f78c06daa 100644 --- a/components/clp-package-utils/clp_package_utils/scripts/archive_manager.py +++ b/components/clp-package-utils/clp_package_utils/scripts/archive_manager.py @@ -2,6 +2,7 @@ import logging import subprocess import sys +import typing from pathlib import Path from clp_py_utils.clp_config import StorageType @@ -180,17 +181,17 @@ def main(argv): container_clp_config, clp_config, container_name ) - necessary_mounts: list[CLPDockerMounts] = [ + necessary_mounts: typing.List[CLPDockerMounts] = [ mounts.clp_home, mounts.logs_dir, mounts.archives_output_dir, ] - container_start_cmd: list[str] = generate_container_start_cmd( + container_start_cmd: typing.List[str] = generate_container_start_cmd( container_name, necessary_mounts, clp_config.execution_container ) # fmt: off - archive_manager_cmd: list[str] = [ + archive_manager_cmd: typing.List[str] = [ "python3", "-m", "clp_package_utils.scripts.native.archive_manager", "--config", str(generated_config_path_on_container), @@ -220,7 +221,7 @@ def main(argv): else: logger.error(f"Unsupported subcommand: `{subcommand}`.") - cmd: list[str] = container_start_cmd + archive_manager_cmd + cmd: typing.List[str] = container_start_cmd + archive_manager_cmd subprocess.run(cmd, check=True) diff --git a/components/clp-package-utils/clp_package_utils/scripts/native/archive_manager.py b/components/clp-package-utils/clp_package_utils/scripts/native/archive_manager.py index 1d4c5fcc4..4bfc2ab84 100644 --- a/components/clp-package-utils/clp_package_utils/scripts/native/archive_manager.py +++ b/components/clp-package-utils/clp_package_utils/scripts/native/archive_manager.py @@ -2,10 +2,10 @@ import logging import shutil import sys +import typing from abc import ABC, abstractmethod from contextlib import closing from pathlib import Path -from typing import List from clp_py_utils.clp_config import Database from clp_py_utils.sql_adapter import SQL_Adapter @@ -252,7 +252,7 @@ def _find_archives( db_cursor.execute(query, query_params) results = db_cursor.fetchall() - archive_ids: list[str] = [result["id"] for result in results] + archive_ids: typing.List[str] = [result["id"] for result in results] if 0 == len(archive_ids): logger.info("No archives found within specified time range.") return 0 @@ -318,7 +318,7 @@ def _delete_archives( logger.info(delete_handler.get_not_found_message) return 0 - archive_ids: list[str] = [result["id"] for result in results] + archive_ids: typing.List[str] = [result["id"] for result in results] delete_handler.validate_results(archive_ids) ids_list_string: str = ",".join(["%s"] * len(archive_ids))