Merge pull request #2661 from raoatifshad/black-2.6.0-formatting

smuzaffar · web-flow · commit 499b7f5687c7 · 2026-01-21T16:02:08.000+01:00
Format Python code with black 26.1.0 (excluding archive/ folder)
diff --git a/DMWM/AggregatePylint.py b/DMWM/AggregatePylint.py
@@ -6,7 +6,7 @@
 
 usage = "usage: %prog [options] message"
 parser = OptionParser(usage)
-(options, args) = parser.parse_args()
+options, args = parser.parse_args()
 if len(args) != 1:
     parser.error("You must supply a label")
 
diff --git a/DMWM/IdentifyPythonFiles.py b/DMWM/IdentifyPythonFiles.py
@@ -7,7 +7,7 @@
 
 usage = "usage: %prog [options] list_of_files.txt"
 parser = OptionParser(usage)
-(options, args) = parser.parse_args()
+options, args = parser.parse_args()
 if len(args) != 1:
     parser.error("You must supply a file with a list of files to check")
 
diff --git a/DMWM/IssueMessage.py b/DMWM/IssueMessage.py
@@ -7,7 +7,7 @@
 
 usage = "usage: %prog [options] message"
 parser = OptionParser(usage)
-(options, args) = parser.parse_args()
+options, args = parser.parse_args()
 if len(args) != 1:
     parser.error("You must supply a message.")
 
diff --git a/RelValArgs.py b/RelValArgs.py
@@ -100,19 +100,15 @@
 RELVAL_ARGS = []
 RELVAL_ARGS.append({})
 # For SLHC releases
-RELVAL_ARGS[len(RELVAL_ARGS) - 1][
-    "_SLHC(DEV|)_"
-] = """
+RELVAL_ARGS[len(RELVAL_ARGS) - 1]["_SLHC(DEV|)_"] = """
   @USE_INPUT@
   @WORKFLOWS@
 """
 RELVAL_ARGS[len(RELVAL_ARGS) - 1]["CMSSW_4_2_"] = ""
 
 RELVAL_ARGS.append({})
 # For rleease cycles >= 7
-RELVAL_ARGS[len(RELVAL_ARGS) - 1][
-    "CMSSW_([1-9][0-9]|[7-9])_"
-] = """
+RELVAL_ARGS[len(RELVAL_ARGS) - 1]["CMSSW_([1-9][0-9]|[7-9])_"] = """
   @USE_INPUT@
   @JOB_REPORT@
   --command "
@@ -128,9 +124,7 @@
 
 RELVAL_ARGS.append({})
 # For all other releases
-RELVAL_ARGS[len(RELVAL_ARGS) - 1][
-    ".+"
-] = """
+RELVAL_ARGS[len(RELVAL_ARGS) - 1][".+"] = """
   @USE_INPUT@
 """
 
diff --git a/buildLogAnalyzer.py b/buildLogAnalyzer.py
@@ -4,6 +4,7 @@
 Created by Andreas Pfeiffer on 2008-08-05.
 Copyright (c) 2008 CERN. All rights reserved.
 """
+
 from __future__ import print_function
 import sys, os, re, time
 import getopt
diff --git a/compareTriggerResults.py b/compareTriggerResults.py
@@ -3,6 +3,7 @@
 Script to compare the content of edm::TriggerResults collections in EDM files across multiple workflows
  - CMSSW dependencies: edmDumpEventContent, hltDiff
 """
+
 from __future__ import print_function
 import argparse
 import os
diff --git a/compareTriggerResultsSummary.py b/compareTriggerResultsSummary.py
@@ -3,6 +3,7 @@
 Script to summarise the outputs of compareTriggerResults
 (i.e. the outputs of hltDiff in .json format)
 """
+
 from __future__ import print_function
 import argparse
 import os
diff --git a/comparisons/analyzeFWComparison.py b/comparisons/analyzeFWComparison.py
@@ -46,7 +46,7 @@
         help="Generate the thresholds for the relmon comparisons",
         default=False,
     )
-    (options, args) = parser.parse_args()
+    options, args = parser.parse_args()
 
     # -----------------------------------------------------------------------------------
     # ---- Review of arguments
diff --git a/comparisons/compare-maxmem-summary.py b/comparisons/compare-maxmem-summary.py
@@ -2,6 +2,7 @@
 """
 Script to summarise the outputs of compare-maxmem.py
 """
+
 from __future__ import print_function
 import argparse
 import os
diff --git a/comparisons/resources-diff.py b/comparisons/resources-diff.py
@@ -29,10 +29,8 @@ def diff_from(metrics, data, data_total, dest, dest_total, res):
 
 
 if len(sys.argv) == 1:
-    print(
-        """Usage: resources-diff.py IB_FILE PR_FILE
-Diff the content of two "resources.json" files and print the result to standard output."""
-    )
+    print("""Usage: resources-diff.py IB_FILE PR_FILE
+Diff the content of two "resources.json" files and print the result to standard output.""")
     sys.exit(1)
 
 with open(sys.argv[1]) as f:
diff --git a/comparisons/validateJR.py b/comparisons/validateJR.py
@@ -180,7 +180,7 @@ def process_file(each_root_file):
     parser.add_option(
         "--procs", dest="procs", default=None, type=int, help="number of processes to run"
     )
-    (options, args) = parser.parse_args()
+    options, args = parser.parse_args()
 
     if not compile_lib():
         sys.exit()
diff --git a/githublabels.py b/githublabels.py
@@ -25,10 +25,10 @@ def get_dpg_pog():
 }
 
 # TYPE_COMMANDS[LABEL_NAME]=[LABEL_COLOR,
-#                           REGEXP_TO_MATCH_CCOMMENT",
-#                           TYPE
-#                                type: only apply the last comment
-#                                mtype: accomulate all comments]
+# REGEXP_TO_MATCH_CCOMMENT",
+# TYPE
+# type: only apply the last comment
+# mtype: accomulate all comments]
 TYPE_COMMANDS = {
     "bug-fix": [LABEL_COLORS["bug"], "bug(?:-?fix)?", "type"],
     "new-feature": [LABEL_COLORS["info"], "(?:new-)?(?:feature|idea)", "type"],
diff --git a/jenkins/jenkins-kill-placeholder-job.py b/jenkins/jenkins-kill-placeholder-job.py
@@ -3,6 +3,7 @@
 This job will check if there are queued jobs for jenkins slaves with 'condor' label and how many.
 Then it will kill needed amount of placeholder jobs.
 """
+
 from pprint import pprint
 import re, sys
 from os.path import dirname, abspath, join, exists
diff --git a/jenkins/jenkins-project-report-to-markdown.py b/jenkins/jenkins-project-report-to-markdown.py
@@ -4,6 +4,7 @@
 Author     : Zygimantas Matonis
 Description: This script will generate markdown files from Jenkins project reports
 """
+
 import json
 import os
 import re
@@ -106,9 +107,7 @@ def write_markdown_file(view_data_dict, all_project_dict, markdown_output_dir):
 
 ---
 
-""".format(
-                cron_message
-            )
+""".format(cron_message)
             output_f.write(periodic_builds_message)
 
 
@@ -119,9 +118,7 @@ def write_readme(markdown_output_dir):
 This is automatically generated documentation of Jenkins jobs. **All changes in this directory will be overwritten 
 by scheduled job.** In oder to update the documentation, edit project description in Jenkins instead.
 
-""".format(
-        project_report_section_name
-    )
+""".format(project_report_section_name)
     with open(markdown_output_dir + "/README.md", "w") as output_f:
         output_f.write(readme_message)
 
diff --git a/jenkins/parser/actions.py b/jenkins/parser/actions.py
@@ -6,7 +6,6 @@
 
 import helpers
 
-
 email_addresses = "cms-sdt-logs@cern.ch"
 
 html_file_path = os.environ.get("HOME") + "/builds/jenkins-test-parser-monitor/json-web-info.json"
diff --git a/jenkins/parser/paser-config-unittest.py b/jenkins/parser/paser-config-unittest.py
@@ -4,7 +4,6 @@
 from subprocess import getstatusoutput
 import time
 
-
 jobs_config_path = "jenkins/parser/jobs-config.json"
 error_types = []
 
diff --git a/jenkins/report-jenkins-jobs.py b/jenkins/report-jenkins-jobs.py
@@ -27,7 +27,6 @@
 import json
 import time
 
-
 try:
     fd = open("/tmp/report_gen.txt")
     txt = fd.read()
diff --git a/jenkins_monitor_queue.py b/jenkins_monitor_queue.py
@@ -12,23 +12,17 @@
 except:
     JENKINS_PREFIX = "jenkins"
 
-query_pending_builds = (
-    """{
+query_pending_builds = """{
 "query": {"bool": {"must": {"query_string": {"query": "_index:cmssdt-jenkins-queue-* AND in_queue:1 AND jenkins_server:%s", "default_operator": "AND"}}}},
 "from": 0,
 "size": 10000
-}"""
-    % JENKINS_PREFIX
-)
+}""" % JENKINS_PREFIX
 
-query_offline_nodes = (
-    """{
+query_offline_nodes = """{
 "query": {"bool": {"must": {"query_string": {"query": "jenkins_server:%s", "default_operator": "AND"}}}},
 "from": 0,
 "size": 10000
-}"""
-    % JENKINS_PREFIX
-)
+}""" % JENKINS_PREFIX
 
 
 queue_index = "cmssdt-jenkins-offline-nodes"
diff --git a/logRootQA.py b/logRootQA.py
@@ -447,7 +447,7 @@ def summaryComp(compDir):
             json.dump([nDiff, nAll, nOK], f)
     else:
         with open("comparison-JR.json") as f:
-            (nDiff, nAll, nOK) = json.load(f)
+            nDiff, nAll, nOK = json.load(f)
     print("SUMMARY Reco comparison results:", nDiff, "differences found in the comparisons")
     if nAll != nOK:
         print("SUMMARY Reco comparison had ", nAll - nOK, "failed jobs")
diff --git a/modify_comment.py b/modify_comment.py
@@ -2,6 +2,7 @@
 """
 Modifies last cmsbot message on Github
 """
+
 from github import Github
 from os.path import expanduser, dirname, abspath, join, exists
 from optparse import OptionParser
diff --git a/parse_iwyu_logs.py b/parse_iwyu_logs.py
@@ -9,8 +9,7 @@
 pkg_name = "/".join(sys.argv[1].split("/")[-3:-1])
 files = 0
 splitline = sys.argv[2] + "/src/"
-print(
-    """<!DOCTYPE html>
+print("""<!DOCTYPE html>
 <html>
 <head>
 <style>
@@ -23,8 +22,7 @@
     text-align: left;
 }
 </style>
-</head>"""
-)
+</head>""")
 print("<a href=" + '"' + sys.argv[1].split("/")[-1] + '"' + ">" + "Access BuildLog" + "</a><br/>")
 print('<table  align="center">')
 lines_seen = set()
diff --git a/parse_jenkins_builds.py b/parse_jenkins_builds.py
@@ -99,24 +99,18 @@ def grep(filename, pattern, verbose=False):
                     return True
 
 
-query_running_builds = (
-    """{
+query_running_builds = """{
 "query": {"bool": {"must": {"query_string": {"query": "job_status:Running AND jenkins_server:%s", "default_operator": "AND"}}}},
 "from": 0,
 "size": 10000
-}"""
-    % JENKINS_PREFIX
-)
+}""" % JENKINS_PREFIX
 
 # Query job with in_queue=1
-query_inqueue1 = (
-    """{
+query_inqueue1 = """{
 "query": {"bool": {"must": {"query_string": {"query": "in_queue: 1 AND start_time: 0 AND jenkins_server: %s", "default_operator": "AND"}}}},
 "from": 0,
 "size": 10000
-}"""
-    % JENKINS_PREFIX
-)
+}""" % JENKINS_PREFIX
 
 # Query jobs with in_queue=0
 query_inqueue0 = """{
diff --git a/pr-checks/check-pr-files.py b/pr-checks/check-pr-files.py
@@ -36,7 +36,7 @@ def check_commits_files(repo, pr, detail=False):
             print(o)
             return all_ok
         for l in [re.sub("\\s+", " ", x.strip()) for x in o.split("\n") if x.strip()]:
-            (t, f) = l.split(" ")
+            t, f = l.split(" ")
             if not f in data:
                 data[f] = []
                 details[f] = {}
diff --git a/process-error-reports.py b/process-error-reports.py
@@ -332,7 +332,7 @@ def understandError(name, t, p, info):
         # steps to it.
         for workflow, info in workflows.items():
             for step in info["steps"]:
-                (h, errorTitle, errorMessage) = understandError(name, t, p, info)
+                h, errorTitle, errorMessage = understandError(name, t, p, info)
                 if not h in validErrorReport:
                     validErrorReport[h] = {
                         "queue": t,
diff --git a/process-pull-request.py b/process-pull-request.py
@@ -2,6 +2,7 @@
 """
 Returns top commit of a PR (mostly used to comments)
 """
+
 from os.path import expanduser, dirname, abspath, join, exists
 from optparse import OptionParser
 from socket import setdefaulttimeout
diff --git a/pyproject.toml b/pyproject.toml
@@ -1,7 +1,7 @@
 [tool.black]
 line-length = 99
 target-version = ['py36', 'py37', 'py38', 'py39', 'py310', 'py311']
-exclude = 'crab/python26/functools.py'
+exclude = 'crab/python26/functools.py|archive/.*'
 
 [tool.pylint.main]
 # Analyse import fallback blocks. This can be used to support both Python 2 and 3
diff --git a/reco_profiling/profileRunner.py b/reco_profiling/profileRunner.py
@@ -256,19 +256,15 @@ def wrapInRetry(cmd):
    echo "attempt $n"
    {} && break
    n=$((n+1))
-done""".format(
-        cmd
-    )
+done""".format(cmd)
     return s
 
 
 def echoBefore(cmd, msg):
     s = """
 echo "{}"
 {}
-""".format(
-        msg, cmd
-    )
+""".format(msg, cmd)
     return s
 
 
diff --git a/report-pull-request-results.py b/report-pull-request-results.py
@@ -98,7 +98,7 @@
     default="",
 )
 
-(options, args) = parser.parse_args()
+options, args = parser.parse_args()
 
 
 def openlog(log, mode="r"):
diff --git a/report-summary-merged-prs.py b/report-summary-merged-prs.py
@@ -2,6 +2,7 @@
 """
 This script generates json file (like CMSSW_10_0_X.json) which is then used to render cmssdt ib page.
 """
+
 from __future__ import print_function
 from optparse import OptionParser
 import subprocess
@@ -47,7 +48,7 @@
     default=False,
 )
 
-(options, args) = parser.parse_args()
+options, args = parser.parse_args()
 
 """
 -----------------------------------------------------------------------------------
diff --git a/simple-cms-bot.py b/simple-cms-bot.py
@@ -2,6 +2,7 @@
 """
 Returns top commit of a PR (mostly used to comments)
 """
+
 from os.path import expanduser, dirname, abspath, join, exists
 from optparse import OptionParser
 from socket import setdefaulttimeout
diff --git a/tests/test_config-map.py b/tests/test_config-map.py
@@ -11,5 +11,5 @@
         l = l.strip(";")
         for p in l.split(";"):
             assert "=" in p
-            (key, value) = p.split("=")
+            key, value = p.split("=")
             assert re.match(KEYS_RE, key)

Original file line number	Diff line number	Diff line change
`@@ -46,7 +46,7 @@`
`46`	`46`	`help="Generate the thresholds for the relmon comparisons",`
`47`	`47`	`default=False,`
`48`	`48`	`)`
`49`		`- (options, args) = parser.parse_args()`
	`49`	`+ options, args = parser.parse_args()`
`50`	`50`
`51`	`51`	`# -----------------------------------------------------------------------------------`
`52`	`52`	`# ---- Review of arguments`