diff --git a/clockwork_frontend_test/conftest.py b/clockwork_frontend_test/conftest.py index 1ef8bbcb..06d90863 100644 --- a/clockwork_frontend_test/conftest.py +++ b/clockwork_frontend_test/conftest.py @@ -1,2 +1,3 @@ """Import fixture fake data so that we can use it in tests from this module.""" + from test_common.fake_data import fake_data diff --git a/clockwork_frontend_test/test_dashboard.py b/clockwork_frontend_test/test_dashboard.py index 69620e14..d0e63588 100644 --- a/clockwork_frontend_test/test_dashboard.py +++ b/clockwork_frontend_test/test_dashboard.py @@ -28,7 +28,7 @@ job["slurm"]["job_state"].lower(), get_default_display_date(job["slurm"]["submit_time"]), get_default_display_date(job["slurm"]["start_time"]), - get_default_display_date(job["slurm"]["end_time"]) + get_default_display_date(job["slurm"]["end_time"]), # Then, there is the "Links" column: we don't add content yet, # but here is a placeholder for future testing ] diff --git a/clockwork_frontend_test/test_jobs_search.py b/clockwork_frontend_test/test_jobs_search.py index 9150b259..1a7a57e4 100644 --- a/clockwork_frontend_test/test_jobs_search.py +++ b/clockwork_frontend_test/test_jobs_search.py @@ -20,9 +20,11 @@ JOBS_SEARCH_DEFAULT_TABLE.append( [ job["slurm"]["cluster_name"], - job["cw"]["mila_email_username"].replace("@", " @") - if job["cw"]["mila_email_username"] is not None - else "", + ( + job["cw"]["mila_email_username"].replace("@", " @") + if job["cw"]["mila_email_username"] is not None + else "" + ), job["slurm"]["job_id"], ] ) @@ -30,9 +32,11 @@ ALL_JOBS = [ [ job["slurm"]["cluster_name"], - job["cw"]["mila_email_username"].replace("@", " @") - if job["cw"]["mila_email_username"] is not None - else "", + ( + job["cw"]["mila_email_username"].replace("@", " @") + if job["cw"]["mila_email_username"] is not None + else "" + ), job["slurm"]["job_id"], ] for job in sorted_jobs @@ -125,9 +129,11 @@ def test_filter_by_user_only_me(page: Page): expected_results = [ [ job["slurm"]["cluster_name"], - job["cw"]["mila_email_username"].replace("@", " @") - if job["cw"]["mila_email_username"] is not None - else "", + ( + job["cw"]["mila_email_username"].replace("@", " @") + if job["cw"]["mila_email_username"] is not None + else "" + ), job["slurm"]["job_id"], ] for job in sorted_jobs @@ -186,9 +192,11 @@ def test_filter_by_user_other_user(page: Page): expected_results = [ [ job["slurm"]["cluster_name"], - job["cw"]["mila_email_username"].replace("@", " @") - if job["cw"]["mila_email_username"] is not None - else "", + ( + job["cw"]["mila_email_username"].replace("@", " @") + if job["cw"]["mila_email_username"] is not None + else "" + ), job["slurm"]["job_id"], ] for job in sorted_jobs @@ -241,9 +249,11 @@ def test_filter_by_cluster_except_one(page: Page): expected_results = [ [ job["slurm"]["cluster_name"], - job["cw"]["mila_email_username"].replace("@", " @") - if job["cw"]["mila_email_username"] is not None - else "", + ( + job["cw"]["mila_email_username"].replace("@", " @") + if job["cw"]["mila_email_username"] is not None + else "" + ), job["slurm"]["job_id"], ] for job in sorted_jobs @@ -304,9 +314,11 @@ def test_filter_by_cluster_except_two(page: Page): expected_results = [ [ job["slurm"]["cluster_name"], - job["cw"]["mila_email_username"].replace("@", " @") - if job["cw"]["mila_email_username"] is not None - else "", + ( + job["cw"]["mila_email_username"].replace("@", " @") + if job["cw"]["mila_email_username"] is not None + else "" + ), job["slurm"]["job_id"], ] for job in sorted_jobs @@ -366,9 +378,11 @@ def test_filter_by_status_except_one(page: Page): expected_results = [ [ job["slurm"]["cluster_name"], - job["cw"]["mila_email_username"].replace("@", " @") - if job["cw"]["mila_email_username"] is not None - else "", + ( + job["cw"]["mila_email_username"].replace("@", " @") + if job["cw"]["mila_email_username"] is not None + else "" + ), job["slurm"]["job_id"], ] for job in sorted_jobs @@ -429,9 +443,11 @@ def test_filter_by_status_except_two(page: Page): expected_results = [ [ job["slurm"]["cluster_name"], - job["cw"]["mila_email_username"].replace("@", " @") - if job["cw"]["mila_email_username"] is not None - else "", + ( + job["cw"]["mila_email_username"].replace("@", " @") + if job["cw"]["mila_email_username"] is not None + else "" + ), job["slurm"]["job_id"], ] for job in sorted_jobs @@ -499,9 +515,11 @@ def test_multiple_filters(page: Page): expected_results = [ [ job["slurm"]["cluster_name"], - job["cw"]["mila_email_username"].replace("@", " @") - if job["cw"]["mila_email_username"] is not None - else "", + ( + job["cw"]["mila_email_username"].replace("@", " @") + if job["cw"]["mila_email_username"] is not None + else "" + ), job["slurm"]["job_id"], ] for job in sorted_jobs @@ -548,9 +566,11 @@ def test_filter_by_job_array(page: Page): expected_results = [ [ job["slurm"]["cluster_name"], - job["cw"]["mila_email_username"].replace("@", " @") - if job["cw"]["mila_email_username"] is not None - else "", + ( + job["cw"]["mila_email_username"].replace("@", " @") + if job["cw"]["mila_email_username"] is not None + else "" + ), job["slurm"]["job_id"], ] for job in sorted_jobs @@ -600,9 +620,11 @@ def test_filter_by_job_user_props(page: Page): expected_results = [ [ job["slurm"]["cluster_name"], - job["cw"]["mila_email_username"].replace("@", " @") - if job["cw"]["mila_email_username"] is not None - else "", + ( + job["cw"]["mila_email_username"].replace("@", " @") + if job["cw"]["mila_email_username"] is not None + else "" + ), job["slurm"]["job_id"], ] for job in sorted_jobs @@ -680,9 +702,11 @@ def test_special_user_props(page: Page, prop_name: str, title: str): expected_results = [ [ job["slurm"]["cluster_name"], - job["cw"]["mila_email_username"].replace("@", " @") - if job["cw"]["mila_email_username"] is not None - else "", + ( + job["cw"]["mila_email_username"].replace("@", " @") + if job["cw"]["mila_email_username"] is not None + else "" + ), job["slurm"]["job_id"], ] for job in sorted_jobs @@ -732,9 +756,11 @@ def test_jobs_table_sorting_by_cluster(page: Page): expected_content = [ [ job["slurm"]["cluster_name"], - job["cw"]["mila_email_username"].replace("@", " @") - if job["cw"]["mila_email_username"] is not None - else "", + ( + job["cw"]["mila_email_username"].replace("@", " @") + if job["cw"]["mila_email_username"] is not None + else "" + ), job["slurm"]["job_id"], ] for job in sorted( @@ -749,9 +775,11 @@ def test_jobs_table_sorting_by_job_id(page: Page): expected_content = [ [ job["slurm"]["cluster_name"], - job["cw"]["mila_email_username"].replace("@", " @") - if job["cw"]["mila_email_username"] is not None - else "", + ( + job["cw"]["mila_email_username"].replace("@", " @") + if job["cw"]["mila_email_username"] is not None + else "" + ), job["slurm"]["job_id"], ] for job in sorted( @@ -769,9 +797,11 @@ def test_jobs_table_sorting_by_job_id_ascending(page: Page): expected_content = [ [ job["slurm"]["cluster_name"], - job["cw"]["mila_email_username"].replace("@", " @") - if job["cw"]["mila_email_username"] is not None - else "", + ( + job["cw"]["mila_email_username"].replace("@", " @") + if job["cw"]["mila_email_username"] is not None + else "" + ), job["slurm"]["job_id"], ] for job in sorted(fake_data["jobs"], key=lambda j: j["slurm"]["job_id"]) @@ -786,9 +816,11 @@ def test_jobs_table_sorting_by_end_time(page: Page): expected_content = [ [ job["slurm"]["cluster_name"], - job["cw"]["mila_email_username"].replace("@", " @") - if job["cw"]["mila_email_username"] is not None - else "", + ( + job["cw"]["mila_email_username"].replace("@", " @") + if job["cw"]["mila_email_username"] is not None + else "" + ), job["slurm"]["job_id"], ] for job in sorted( diff --git a/clockwork_frontend_test/test_jobs_search_for_student06.py b/clockwork_frontend_test/test_jobs_search_for_student06.py index d34c5bee..03b974e5 100644 --- a/clockwork_frontend_test/test_jobs_search_for_student06.py +++ b/clockwork_frontend_test/test_jobs_search_for_student06.py @@ -26,9 +26,11 @@ MILA_JOBS.append( [ job["slurm"]["cluster_name"], - job["cw"]["mila_email_username"].replace("@", " @") - if job["cw"]["mila_email_username"] is not None - else "", + ( + job["cw"]["mila_email_username"].replace("@", " @") + if job["cw"]["mila_email_username"] is not None + else "" + ), job["slurm"]["job_id"], ] ) @@ -273,9 +275,11 @@ def test_filter_by_status_except_one(page: Page): expected_results = [ [ job["slurm"]["cluster_name"], - job["cw"]["mila_email_username"].replace("@", " @") - if job["cw"]["mila_email_username"] is not None - else "", + ( + job["cw"]["mila_email_username"].replace("@", " @") + if job["cw"]["mila_email_username"] is not None + else "" + ), job["slurm"]["job_id"], ] for job in sorted_mila_jobs @@ -335,9 +339,11 @@ def test_filter_by_status_except_two(page: Page): expected_results = [ [ job["slurm"]["cluster_name"], - job["cw"]["mila_email_username"].replace("@", " @") - if job["cw"]["mila_email_username"] is not None - else "", + ( + job["cw"]["mila_email_username"].replace("@", " @") + if job["cw"]["mila_email_username"] is not None + else "" + ), job["slurm"]["job_id"], ] for job in sorted_mila_jobs @@ -404,9 +410,11 @@ def test_multiple_filters(page: Page): expected_results = [ [ job["slurm"]["cluster_name"], - job["cw"]["mila_email_username"].replace("@", " @") - if job["cw"]["mila_email_username"] is not None - else "", + ( + job["cw"]["mila_email_username"].replace("@", " @") + if job["cw"]["mila_email_username"] is not None + else "" + ), job["slurm"]["job_id"], ] for job in sorted_jobs @@ -478,9 +486,11 @@ def test_jobs_table_sorting_by_end_time(page: Page): expected_results = [ [ job["slurm"]["cluster_name"], - job["cw"]["mila_email_username"].replace("@", " @") - if job["cw"]["mila_email_username"] is not None - else "", + ( + job["cw"]["mila_email_username"].replace("@", " @") + if job["cw"]["mila_email_username"] is not None + else "" + ), job["slurm"]["job_id"], ] for job in sorted( diff --git a/clockwork_tools/clockwork_tools/client.py b/clockwork_tools/clockwork_tools/client.py index a5511f3a..4d150392 100644 --- a/clockwork_tools/clockwork_tools/client.py +++ b/clockwork_tools/clockwork_tools/client.py @@ -127,7 +127,7 @@ def jobs_list( """ endpoint = "api/v1/clusters/jobs/list" params = {} - for (k, a) in [ + for k, a in [ ("username", username), ("relative_time", relative_time), ("cluster_name", cluster_name), @@ -154,7 +154,7 @@ def jobs_one(self, job_id: str = None, cluster_name: str = None) -> dict[str, an """ endpoint = "api/v1/clusters/jobs/one" params = {} - for (k, a) in [ + for k, a in [ ("job_id", job_id), ("cluster_name", cluster_name), ]: @@ -231,7 +231,7 @@ def nodes_list(self, cluster_name: str = None) -> list[dict[str, any]]: """ endpoint = "api/v1/clusters/nodes/list" params = {} - for (k, a) in [ + for k, a in [ ("cluster_name", cluster_name), ]: if a is not None: @@ -258,7 +258,7 @@ def nodes_one( """ endpoint = "api/v1/clusters/nodes/one" params = {} - for (k, a) in [ + for k, a in [ ("node_name", node_name), ("cluster_name", cluster_name), ]: @@ -337,7 +337,7 @@ def _create_params_for_request(self, target_self: bool, **kwargs): preparing arguments to pass to a request in the parent class. """ params = {} - for (k, a) in kwargs.items(): + for k, a in kwargs.items(): if a is not None: params[k] = a elif target_self and k in self.this_specific_slurm_job_params: diff --git a/clockwork_tools_test/conftest.py b/clockwork_tools_test/conftest.py index 162068f7..7ab22c3c 100644 --- a/clockwork_tools_test/conftest.py +++ b/clockwork_tools_test/conftest.py @@ -20,7 +20,7 @@ def config(): "email": os.environ["clockwork_tools_test_EMAIL"], "clockwork_api_key": os.environ["clockwork_tools_test_CLOCKWORK_API_KEY"], } - for (k, v) in config.items(): + for k, v in config.items(): assert v, f"Missing value in environment for clockwork_tools configuration {k}." return config diff --git a/clockwork_tools_test/test_mt_nodes.py b/clockwork_tools_test/test_mt_nodes.py index 0f29c541..cc872b8b 100644 --- a/clockwork_tools_test/test_mt_nodes.py +++ b/clockwork_tools_test/test_mt_nodes.py @@ -79,7 +79,7 @@ def test_get_nodes_with_filter(mtclient, fake_data, cluster_name): ) # compare all the dicts one by one - for (D_node, D_original_node) in zip(LD_nodes, LD_original_nodes): + for D_node, D_original_node in zip(LD_nodes, LD_original_nodes): for k1 in D_original_node: assert k1 in ["slurm", "cw"] assert k1 in D_node, f"{D_node.keys()}" diff --git a/clockwork_web/browser_routes/clusters.py b/clockwork_web/browser_routes/clusters.py index 06e227d8..6d80cfe4 100644 --- a/clockwork_web/browser_routes/clusters.py +++ b/clockwork_web/browser_routes/clusters.py @@ -1,6 +1,7 @@ """ Browser routes dealing with the "cluster" entity """ + import logging from flask import Blueprint, request diff --git a/clockwork_web/browser_routes/status.py b/clockwork_web/browser_routes/status.py index b6ffa24a..55518de2 100644 --- a/clockwork_web/browser_routes/status.py +++ b/clockwork_web/browser_routes/status.py @@ -1,6 +1,7 @@ """ Browser routes dealing with the "cluster" entity """ + import logging from flask import Blueprint, request diff --git a/clockwork_web/core/clusters_helper.py b/clockwork_web/core/clusters_helper.py index 3398315a..a6c705d8 100644 --- a/clockwork_web/core/clusters_helper.py +++ b/clockwork_web/core/clusters_helper.py @@ -1,6 +1,7 @@ """ Helper function regarding the clusters. """ + # Import the functions from clockwork_web.config from clockwork_web.config import get_config, register_config diff --git a/clockwork_web/core/job_user_props_helper.py b/clockwork_web/core/job_user_props_helper.py index 6089678c..a4a1e50e 100644 --- a/clockwork_web/core/job_user_props_helper.py +++ b/clockwork_web/core/job_user_props_helper.py @@ -1,4 +1,5 @@ """Internal functions to manage job-user props.""" + from ..db import get_db import json diff --git a/clockwork_web/core/users_helper.py b/clockwork_web/core/users_helper.py index 05a519f4..303fdc1f 100644 --- a/clockwork_web/core/users_helper.py +++ b/clockwork_web/core/users_helper.py @@ -591,6 +591,7 @@ def render_template_with_user_settings(template_name_or_list, **context): ) # Get cluster status (if jobs are old and cluster has error). + """ for cluster_name in context["clusters"]: # Cluster error cannot yet be checked, so # cluster_has_error is always False for now. @@ -599,6 +600,7 @@ def render_template_with_user_settings(template_name_or_list, **context): "jobs_are_old": _jobs_are_old(cluster_name), "cluster_has_error": cluster_has_error, } + """ return render_template(template_name_or_list, **context) diff --git a/clockwork_web/server_app.py b/clockwork_web/server_app.py index 6f396898..7255b2cc 100644 --- a/clockwork_web/server_app.py +++ b/clockwork_web/server_app.py @@ -3,7 +3,6 @@ in the right place. """ - # export FLASK_RUN_PORT=5555 # export FLASK_DEBUG=1 # export FLASK_APP=main.py @@ -62,7 +61,7 @@ def create_app(extra_config: dict): app = Flask(__name__) app.secret_key = get_config("flask.secret_key") - for (k, v) in extra_config.items(): + for k, v in extra_config.items(): app.config[k] = v app.register_blueprint(nodes_routes_flask_api, url_prefix="/nodes") diff --git a/clockwork_web/templates/base.html b/clockwork_web/templates/base.html index 9303a210..ce3f6e20 100644 --- a/clockwork_web/templates/base.html +++ b/clockwork_web/templates/base.html @@ -231,24 +231,28 @@

- {% if D_cluster['status']['jobs_are_old'] %} + +
{% if cluster_name in user_clusters %} diff --git a/clockwork_web_test/test_browser_users.py b/clockwork_web_test/test_browser_users.py index 0ae4d613..8903e858 100644 --- a/clockwork_web_test/test_browser_users.py +++ b/clockwork_web_test/test_browser_users.py @@ -1,6 +1,7 @@ """ Tests fort the clockwork_web.browser_routes.users functions. """ + import pytest diff --git a/clockwork_web_test/test_core_clusters_helper.py b/clockwork_web_test/test_core_clusters_helper.py index b95ea99f..970cdaec 100644 --- a/clockwork_web_test/test_core_clusters_helper.py +++ b/clockwork_web_test/test_core_clusters_helper.py @@ -28,10 +28,10 @@ def test_get_all_clusters(): "official_documentation": "https://docs.alliancecan.ca/wiki/B%C3%A9luga", "mila_documentation": "https://docs.mila.quebec/Extra_compute.html#beluga", "display_order": 4, - "status": { - "cluster_has_error": False, - "jobs_are_old": True, - }, + # "status": { + # "cluster_has_error": False, + # "jobs_are_old": True, + # }, }, "cedar": { "organization": "Digital Research Alliance of Canada", @@ -48,10 +48,10 @@ def test_get_all_clusters(): "official_documentation": "https://docs.alliancecan.ca/wiki/Cedar", "mila_documentation": "https://docs.mila.quebec/Extra_compute.html#cedar", "display_order": 3, - "status": { - "cluster_has_error": False, - "jobs_are_old": True, - }, + # "status": { + # "cluster_has_error": False, + # "jobs_are_old": True, + # }, }, "graham": { "organization": "Digital Research Alliance of Canada", @@ -68,10 +68,10 @@ def test_get_all_clusters(): "official_documentation": "https://docs.alliancecan.ca/wiki/Graham", "mila_documentation": "https://docs.mila.quebec/Extra_compute.html#graham", "display_order": 5, - "status": { - "cluster_has_error": False, - "jobs_are_old": True, - }, + # "status": { + # "cluster_has_error": False, + # "jobs_are_old": True, + # }, }, "mila": { "organization": "Mila", @@ -83,10 +83,10 @@ def test_get_all_clusters(): "official_documentation": "https://docs.mila.quebec/Information.html", "mila_documentation": False, "display_order": 1, - "status": { - "cluster_has_error": False, - "jobs_are_old": True, - }, + # "status": { + # "cluster_has_error": False, + # "jobs_are_old": True, + # }, }, "narval": { "organization": "Digital Research Alliance of Canada", @@ -103,10 +103,10 @@ def test_get_all_clusters(): "official_documentation": "https://docs.alliancecan.ca/wiki/Narval", "mila_documentation": False, "display_order": 2, - "status": { - "cluster_has_error": False, - "jobs_are_old": True, - }, + # "status": { + # "cluster_has_error": False, + # "jobs_are_old": True, + # }, }, } diff --git a/clockwork_web_test/test_core_pagination_helper.py b/clockwork_web_test/test_core_pagination_helper.py index dfd033fa..a17fba1a 100644 --- a/clockwork_web_test/test_core_pagination_helper.py +++ b/clockwork_web_test/test_core_pagination_helper.py @@ -40,6 +40,7 @@ # When user is None + # When user is None and page_num of wrong type @pytest.mark.parametrize( "page_num,nbr_items_per_page", @@ -420,6 +421,7 @@ def test_get_pagination_none_user_positive_value_positive_value( # When user is unknown + # When user is unknown and page_num of wrong type @pytest.mark.parametrize( "page_num,nbr_items_per_page", @@ -800,6 +802,7 @@ def test_get_pagination_unknown_user_positive_value_positive_value( # When user is known + # When user is known and page_num of wrong type @pytest.mark.parametrize( "page_num,nbr_items_per_page", diff --git a/scripts/import_users_from_sarc.py b/scripts/import_users_from_sarc.py index 328b0a8f..125c4027 100644 --- a/scripts/import_users_from_sarc.py +++ b/scripts/import_users_from_sarc.py @@ -25,12 +25,16 @@ def process_user(D_sarc_user): "mila_cluster_uid": D_sarc_user["mila_ldap"]["mila_cluster_uid"], "mila_cluster_gid": D_sarc_user["mila_ldap"]["mila_cluster_gid"], "status": "enabled" if D_sarc_user["mila"]["active"] else "disabled", - "cc_account_username": D_sarc_user["drac_members"]["username"] - if D_sarc_user["drac_members"] is not None - else None, - "cc_account_ccri": D_sarc_user["drac_members"]["ccri"] - if D_sarc_user["drac_members"] is not None - else None, + "cc_account_username": ( + D_sarc_user["drac_members"]["username"] + if D_sarc_user["drac_members"] is not None + else None + ), + "cc_account_ccri": ( + D_sarc_user["drac_members"]["ccri"] + if D_sarc_user["drac_members"] is not None + else None + ), } return user diff --git a/scripts/read_mila_ldap.py b/scripts/read_mila_ldap.py index 8e2778eb..1aa82ae3 100644 --- a/scripts/read_mila_ldap.py +++ b/scripts/read_mila_ldap.py @@ -257,9 +257,11 @@ def process_user(user_raw: dict) -> dict: "mila_cluster_uid": user_raw["uidNumber"][0], "mila_cluster_gid": user_raw["gidNumber"][0], "display_name": user_raw["displayName"][0], - "status": "disabled" - if (user_raw["suspended"][0] in ["True", "true", True]) - else "enabled", + "status": ( + "disabled" + if (user_raw["suspended"][0] in ["True", "true", True]) + else "enabled" + ), } assert user_raw["mail"][0].startswith(user_raw["googleUid"][0]) assert user_raw["mail"][0].startswith(user_raw["uid"][0]) diff --git a/scripts/server_benchmark.py b/scripts/server_benchmark.py index 8692b149..9fa27a2e 100644 --- a/scripts/server_benchmark.py +++ b/scripts/server_benchmark.py @@ -3,6 +3,7 @@ Instead, consider using `server_benchmark_locust.py`. """ + import os import argparse diff --git a/scripts/server_benchmark_locust.py b/scripts/server_benchmark_locust.py index 00eeaf18..31bf1274 100644 --- a/scripts/server_benchmark_locust.py +++ b/scripts/server_benchmark_locust.py @@ -8,6 +8,7 @@ Locust documentation: https://docs.locust.io/en/stable/index.html """ + import json import base64 diff --git a/scripts/stitch_json_lists_as_dict.py b/scripts/stitch_json_lists_as_dict.py index 62a9f636..15869f34 100644 --- a/scripts/stitch_json_lists_as_dict.py +++ b/scripts/stitch_json_lists_as_dict.py @@ -23,7 +23,7 @@ def main(argv): D_results = {} output_path = argv[1] - for (k, v_path) in zip(argv[2::2], argv[3::2]): + for k, v_path in zip(argv[2::2], argv[3::2]): print((k, v_path)) with open(v_path, "r") as f: v = json.load(f) diff --git a/scripts_test/test_read_mila_ldap.py b/scripts_test/test_read_mila_ldap.py index 0c3b1414..c7b8cfc6 100644 --- a/scripts_test/test_read_mila_ldap.py +++ b/scripts_test/test_read_mila_ldap.py @@ -163,9 +163,9 @@ def test_client_side_user_updates(): "mila_cluster_gid": "%d" % (1500000000 + i), "display_name": name.upper(), # whatever "status": "enabled" if random.random() > 0.5 else "disabled", - "clockwork_api_key": None - if random.random() > 0.5 - else str(random.random()), + "clockwork_api_key": ( + None if random.random() > 0.5 else str(random.random()) + ), "cc_account_username": None if random.random() > 0.5 else ("cc_" + name), } for (i, name) in enumerate( diff --git a/slurm_state/anonymize_report.py b/slurm_state/anonymize_report.py index 7405b380..8b1eb4cc 100644 --- a/slurm_state/anonymize_report.py +++ b/slurm_state/anonymize_report.py @@ -96,7 +96,7 @@ def anonymize_node(D_raw_node: dict, D_cluster_account: dict): D_anonymized_node = {} # For each element of the raw node, anonymize, don't modify or ignore the information - for (k, v) in D_raw_node.items(): + for k, v in D_raw_node.items(): if k == "name": # A new name is created from the actual name and the cluster on which the node is D_anonymized_node[k] = get_machine_name( @@ -186,7 +186,7 @@ def anonymize_job(D_raw_job: dict, D_cluster_account: dict): D_anonymized_job = {} # For each element of the raw job, anonymize, don't modify or ignore the information - for (k, v) in D_raw_job.items(): + for k, v in D_raw_job.items(): if k == "job_id": # The job ID and the JobArray ID have a precedence relation, thus both are set here @@ -356,7 +356,7 @@ def main(argv): output_data = {} # Load the sacct or sinfo data input_data = json.load(f_in) - for (k, v) in input_data.items(): + for k, v in input_data.items(): if k == "nodes" or k == "jobs": # Initialize an empty jobs or nodes list. The jobs and nodes # will then be anonymized before be added to that list. diff --git a/slurm_state/helpers/parser_helper.py b/slurm_state/helpers/parser_helper.py index 5750b7e7..01928fb2 100644 --- a/slurm_state/helpers/parser_helper.py +++ b/slurm_state/helpers/parser_helper.py @@ -70,7 +70,7 @@ def zero_to_null(v): The converted values """ # If a value of v equals 0, transform it to None - for (v_k, v_v) in v.items(): + for v_k, v_v in v.items(): if v_v == 0: v[v_k] = None # Return v diff --git a/slurm_state/sacct_parser.py b/slurm_state/sacct_parser.py index e06031e9..39f87ecb 100644 --- a/slurm_state/sacct_parser.py +++ b/slurm_state/sacct_parser.py @@ -2,6 +2,7 @@ The sacct parser is used to convert jobs retrieved through a sacct command on a cluster to jobs in the format used by Clockwork. """ + import json, os # Imports related to sacct call @@ -68,7 +69,7 @@ def zero_to_null(v): The converted values """ # If a value of v equals 0, transform it to None - for (v_k, v_v) in v.items(): + for v_k, v_v in v.items(): if v_v == 0: v[v_k] = None # Return v diff --git a/test_common/fake_data.py b/test_common/fake_data.py index 06f9cfdc..d77cf42d 100644 --- a/test_common/fake_data.py +++ b/test_common/fake_data.py @@ -2,7 +2,6 @@ Utilities to prepare fake data for tests. """ - import pytest import os import json @@ -105,7 +104,7 @@ def cleanup_function(): copy_e.pop("props") db_insertion_point["job_user_props"].delete_many(copy_e) - for (k, sub, id_field) in [ + for k, sub, id_field in [ ("jobs", "slurm", "job_id"), ("nodes", "slurm", "name"), ]: @@ -193,7 +192,7 @@ def mutate_some_job_status(data): nodes = data["nodes"] - for (i, job) in enumerate(data["jobs"]): + for i, job in enumerate(data["jobs"]): slurm = job["slurm"] job_state = L_status[i % len(L_status)] slurm["job_state"] = job_state diff --git a/test_common/jobs_test_helpers.py b/test_common/jobs_test_helpers.py index 8fda22c5..98abfcc6 100644 --- a/test_common/jobs_test_helpers.py +++ b/test_common/jobs_test_helpers.py @@ -15,7 +15,6 @@ the information. """ - import random import time import copy @@ -162,7 +161,7 @@ def validator(LD_jobs): # matching elements in the same order LD_jobs = list(sorted(LD_jobs, key=lambda D_job: D_job["slurm"]["job_id"])) # compare all the dicts one by one - for (D_job, D_original_job) in zip(LD_jobs, LD_original_jobs): + for D_job, D_original_job in zip(LD_jobs, LD_original_jobs): for k1 in D_original_job: assert k1 in ["slurm", "cw", "job_user_props"] assert D_job[k1] == D_original_job[k1]