chore: ruff format .

Author: nedbat

benchmark/benchmark.py

@@ -109,9 +109,7 @@ def run_command(self, cmd: str) -> str:
 
         if proc.returncode != 0:
             self.print(f"ERROR: command returned {proc.returncode}")
-            raise Exception(
-                f"Command failed ({proc.returncode}): {cmd!r}, output was:\n{output}"
-            )
+            raise Exception(f"Command failed ({proc.returncode}): {cmd!r}, output was:\n{output}")
 
         return output.strip()
 
@@ -318,9 +316,7 @@ def run_with_coverage(self, env: Env, cov_ver: Coverage) -> float:
         with self.tweak_coverage_settings(cov_ver.tweaks):
             self.pre_check(env)  # NOTE: Not properly factored, and only used from here.
             duration = self.run_tox(env, env.pyver.toxenv, "--skip-pkg-install")
-            self.post_check(
-                env
-            )  # NOTE: Not properly factored, and only used from here.
+            self.post_check(env)  # NOTE: Not properly factored, and only used from here.
         return duration
 
 
@@ -333,9 +329,7 @@ def run_with_coverage(self, env: Env, cov_ver: Coverage) -> float:
         raise Exception("This doesn't work because options changed to tweaks")
         covenv = env.pyver.toxenv + "-cov"  # type: ignore[unreachable]
         self.run_tox(env, covenv, "--notest")
-        env.shell.run_command(
-            f".tox/{covenv}/bin/python -m pip install {cov_ver.pip_args}"
-        )
+        env.shell.run_command(f".tox/{covenv}/bin/python -m pip install {cov_ver.pip_args}")
         if cov_ver.tweaks:
             replace = ("# reference: https", f"[run]\n{cov_ver.tweaks}\n#")
         else:
@@ -499,9 +493,7 @@ def run_with_coverage(self, env: Env, cov_ver: Coverage) -> float:
         )
         with self.tweak_coverage_settings(cov_ver.tweaks):
             self.pre_check(env)  # NOTE: Not properly factored, and only used here.
-            duration = self.run_tox(
-                env, env.pyver.toxenv, "--skip-pkg-install -- --cov"
-            )
+            duration = self.run_tox(env, env.pyver.toxenv, "--skip-pkg-install -- --cov")
             self.post_check(env)  # NOTE: Not properly factored, and only used here.
         return duration
 
@@ -542,9 +534,7 @@ def run_no_coverage(self, env: Env) -> float:
 
     def run_with_coverage(self, env: Env, cov_ver: Coverage) -> float:
         env.shell.run_command(f"{env.python} -m pip install {cov_ver.pip_args}")
-        env.shell.run_command(
-            f"{env.python} -m coverage run -m unittest tests.test_suite"
-        )
+        env.shell.run_command(f"{env.python} -m coverage run -m unittest tests.test_suite")
         duration = env.shell.last_duration
         report = env.shell.run_command(f"{env.python} -m coverage report --precision=6")
         print("Results:", report.splitlines()[-1])
@@ -598,19 +588,21 @@ def run_with_coverage(self, env: Env, cov_ver: Coverage) -> float:
 class ProjectMypy(ToxProject):
     git_url = "https://github.com/python/mypy"
 
-    SLOW_TESTS = " or ".join([
-        "PythonCmdline",
-        "PEP561Suite",
-        "PythonEvaluation",
-        "testdaemon",
-        "StubgenCmdLine",
-        "StubgenPythonSuite",
-        "TestRun",
-        "TestRunMultiFile",
-        "TestExternal",
-        "TestCommandLine",
-        "ErrorStreamSuite",
-    ])
+    SLOW_TESTS = " or ".join(
+        [
+            "PythonCmdline",
+            "PEP561Suite",
+            "PythonEvaluation",
+            "testdaemon",
+            "StubgenCmdLine",
+            "StubgenPythonSuite",
+            "TestRun",
+            "TestRunMultiFile",
+            "TestExternal",
+            "TestCommandLine",
+            "ErrorStreamSuite",
+        ]
+    )
 
     FAST = f"-k 'not ({SLOW_TESTS})'"
 
@@ -713,9 +705,7 @@ def tweak_toml_coverage_settings(toml_file: str, tweaks: TweaksType) -> Iterator
 class AdHocProject(ProjectToTest):
     """A standalone program to run locally."""
 
-    def __init__(
-        self, python_file: str, cur_dir: str | None = None, pip_args: str = ""
-    ):
+    def __init__(self, python_file: str, cur_dir: str | None = None, pip_args: str = ""):
         super().__init__()
         self.python_file = Path(python_file)
         if not self.python_file.exists():
@@ -821,9 +811,7 @@ def __init__(self, slug: str = "nocov"):
 class CoveragePR(Coverage):
     """A version of coverage.py from a pull request."""
 
-    def __init__(
-        self, number: int, tweaks: TweaksType = None, env_vars: Env_VarsType = None
-    ):
+    def __init__(self, number: int, tweaks: TweaksType = None, env_vars: Env_VarsType = None):
         url = f"https://github.com/nedbat/coveragepy.git@refs/pull/{number}/merge"
         url_must_exist(url)
         super().__init__(
@@ -837,9 +825,7 @@ def __init__(
 class CoverageCommit(Coverage):
     """A version of coverage.py from a specific commit."""
 
-    def __init__(
-        self, sha: str, tweaks: TweaksType = None, env_vars: Env_VarsType = None
-    ):
+    def __init__(self, sha: str, tweaks: TweaksType = None, env_vars: Env_VarsType = None):
         url = f"https://github.com/nedbat/coveragepy.git@{sha}"
         url_must_exist(url)
         super().__init__(
@@ -915,18 +901,11 @@ def load_results(self) -> dict[ResultKey, list[float]]:
         if self.results_file.exists():
             with self.results_file.open("r", encoding="utf-8") as f:
                 data: dict[str, list[float]] = json.load(f)
-            return {
-                (k.split()[0], k.split()[1], k.split()[2]): v for k, v in data.items()
-            }
+            return {(k.split()[0], k.split()[1], k.split()[2]): v for k, v in data.items()}
         return {}
 
     def run(self, num_runs: int = 3) -> None:
-        total_runs = (
-            len(self.projects)
-            * len(self.py_versions)
-            * len(self.cov_versions)
-            * num_runs
-        )
+        total_runs = len(self.projects) * len(self.py_versions) * len(self.cov_versions) * num_runs
         total_run_nums = iter(itertools.count(start=1))
 
         all_runs = []
@@ -962,10 +941,7 @@ def run(self, num_runs: int = 3) -> None:
         for proj, pyver, cov_ver, env in all_runs:
             result_key = (proj.slug, pyver.slug, cov_ver.slug)
             total_run_num = next(total_run_nums)
-            if (
-                result_key in self.result_data
-                and len(self.result_data[result_key]) >= num_runs
-            ):
+            if result_key in self.result_data and len(self.result_data[result_key]) >= num_runs:
                 print(f"Skipping {result_key} as results already exist.")
                 continue
 
@@ -1100,9 +1076,7 @@ def run_experiment(
     if any(rslug not in slugs for rslug in ratio_slugs):
         raise Exception(f"Ratio slug doesn't match a slug: {ratio_slugs}, {slugs}")
     if set(rows + [column]) != set(DIMENSION_NAMES):
-        raise Exception(
-            f"All of these must be in rows or column: {', '.join(DIMENSION_NAMES)}"
-        )
+        raise Exception(f"All of these must be in rows or column: {', '.join(DIMENSION_NAMES)}")
 
     print(f"Removing and re-making {PERF_DIR}")
     remake(PERF_DIR)

benchmark/empty.py

@@ -7,13 +7,9 @@
     ],
     cov_versions=[
         Coverage("701", "coverage==7.0.1"),
-        Coverage(
-            "701.dynctx", "coverage==7.0.1", [("dynamic_context", "test_function")]
-        ),
+        Coverage("701.dynctx", "coverage==7.0.1", [("dynamic_context", "test_function")]),
         Coverage("702", "coverage==7.0.2"),
-        Coverage(
-            "702.dynctx", "coverage==7.0.2", [("dynamic_context", "test_function")]
-        ),
+        Coverage("702.dynctx", "coverage==7.0.2", [("dynamic_context", "test_function")]),
     ],
     projects=[
         EmptyProject("empty", [1.2, 3.4]),

benchmark/fake.py

@@ -1,9 +1,11 @@
 from benchmark import *
 
+
 class ProjectSlow(EmptyProject):
     def __init__(self):
         super().__init__(slug="slow", fake_durations=[23.9, 24.2])
 
+
 class ProjectOdd(EmptyProject):
     def __init__(self):
         super().__init__(slug="odd", fake_durations=[10.1, 10.5, 9.9])
@@ -13,7 +15,7 @@ def __init__(self):
     py_versions=[
         Python(3, 10),
         Python(3, 11),
-    #    Python(3, 12),
+        #    Python(3, 12),
     ],
     cov_versions=[
         Coverage("753", "coverage==7.5.3"),
@@ -27,6 +29,6 @@ def __init__(self):
     column="pyver",
     ratios=[
         ("11 vs 10", "python3.11", "python3.10"),
-    #    ("12 vs 11", "python3.12", "python3.11"),
+        #    ("12 vs 11", "python3.12", "python3.11"),
     ],
 )

benchmark/run.py

@@ -9,7 +9,7 @@
     action="store_true",
     dest="clean",
     default=False,
-    help="Delete the results.json file before running benchmarks"
+    help="Delete the results.json file before running benchmarks",
 )
 options, args = parser.parse_args()
 
@@ -52,13 +52,9 @@
         ],
         cov_versions=[
             Coverage("701", "coverage==7.0.1"),
-            Coverage(
-                "701.dynctx", "coverage==7.0.1", [("dynamic_context", "test_function")]
-            ),
+            Coverage("701.dynctx", "coverage==7.0.1", [("dynamic_context", "test_function")]),
             Coverage("702", "coverage==7.0.2"),
-            Coverage(
-                "702.dynctx", "coverage==7.0.2", [("dynamic_context", "test_function")]
-            ),
+            Coverage("702.dynctx", "coverage==7.0.2", [("dynamic_context", "test_function")]),
         ],
         projects=[
             ProjectAttrs(),
@@ -88,8 +84,7 @@
         rows=["cov", "proj"],
         column="pyver",
         ratios=[
-            (f"3.{b} vs 3.{a}", f"python3.{b}", f"python3.{a}")
-            for a, b in zip(vers, vers[1:])
+            (f"3.{b} vs 3.{a}", f"python3.{b}", f"python3.{a}") for a, b in zip(vers, vers[1:])
         ],
     )
 
@@ -107,8 +102,8 @@
             CoverageSource(slug="sysmon", env_vars={"COVERAGE_CORE": "sysmon"}),
         ],
         projects=[
-            ProjectPillow(), #"-k test_pickle"),
-            ProjectPillowBranch(), #"-k test_pickle"),
+            ProjectPillow(),  # "-k test_pickle"),
+            ProjectPillowBranch(),  # "-k test_pickle"),
             # ProjectSphinx(),  # Works, slow
             # ProjectPygments(),  # Doesn't work on 3.14
             # ProjectRich(),  # Doesn't work
@@ -165,8 +160,8 @@
             ),
         ],
         projects=[
-            ProjectMashumaro(),     # small: "-k ck"
-            ProjectOperator(),      # small: "-k irk"
+            ProjectMashumaro(),  # small: "-k ck"
+            ProjectOperator(),  # small: "-k irk"
         ],
         rows=["pyver", "proj"],
         column="cov",

ci/comment_on_fixes.py

@@ -16,18 +16,18 @@
 
 # Get the first entry in the changelog:
 for etitle, sections in changelog.entries().items():
-    version = etitle.split()[1]     # particular to our title format.
+    version = etitle.split()[1]  # particular to our title format.
     text = "\n".join(sections)
     break
 
 comment = (
-    f"This is now released as part of [coverage {version}]" +
-    f"(https://pypi.org/project/coverage/{version})."
+    f"This is now released as part of [coverage {version}]"
+    + f"(https://pypi.org/project/coverage/{version})."
 )
 print(f"Comment will be:\n\n{comment}\n")
 
 repo_owner = sys.argv[1]
-url_matches = re.finditer(fr"https://github.com/{repo_owner}/(issues|pull)/(\d+)", text)
+url_matches = re.finditer(rf"https://github.com/{repo_owner}/(issues|pull)/(\d+)", text)
 urls = set((m[0], m[1], m[2]) for m in url_matches)
 
 for url, kind, number in urls:

ci/session.py

@@ -10,6 +10,7 @@
 
 _SESSIONS = {}
 
+
 def get_session(env="GITHUB_TOKEN"):
     """Get a properly authenticated requests Session.
 

coverage/bytecode.py

@@ -116,9 +116,7 @@ def branch_trails(code: CodeType) -> TBranchTrails:
     arc from the original instruction's line to the new source line.
 
     """
-    the_trails: TBranchTrails = collections.defaultdict(
-        lambda: collections.defaultdict(set)
-    )
+    the_trails: TBranchTrails = collections.defaultdict(lambda: collections.defaultdict(set))
     iwalker = InstructionWalker(code)
     for inst in iwalker.walk(follow_jumps=False):
         if not inst.jump_target: