ruff check --select UP --target-version py310 --fix

Author: hugovk

ci-matrix.py

@@ -39,7 +39,7 @@ def meets_conditional_version(version: str, min_version: str) -> bool:
     return Version(version) >= Version(min_version)
 
 
-def parse_labels(labels: Optional[str]) -> dict[str, set[str]]:
+def parse_labels(labels: str | None) -> dict[str, set[str]]:
     """Parse labels into a dict of category filters."""
     if not labels:
         return {}
@@ -106,7 +106,7 @@ def should_include_entry(entry: dict[str, str], filters: dict[str, set[str]]) ->
 
 def generate_docker_matrix_entries(
     runners: dict[str, Any],
-    platform_filter: Optional[str] = None,
+    platform_filter: str | None = None,
 ) -> list[dict[str, str]]:
     """Generate matrix entries for docker image builds."""
     if platform_filter and platform_filter != "linux":
@@ -132,7 +132,7 @@ def generate_crate_build_matrix_entries(
     runners: dict[str, Any],
     config: dict[str, Any],
     force_crate_build: bool = False,
-    platform_filter: Optional[str] = None,
+    platform_filter: str | None = None,
 ) -> list[dict[str, str]]:
     """Generate matrix entries for crate builds based on python build matrix."""
     needed_builds = set()
@@ -181,8 +181,8 @@ def generate_crate_build_matrix_entries(
 def generate_python_build_matrix_entries(
     config: dict[str, Any],
     runners: dict[str, Any],
-    platform_filter: Optional[str] = None,
-    label_filters: Optional[dict[str, set[str]]] = None,
+    platform_filter: str | None = None,
+    label_filters: dict[str, set[str]] | None = None,
 ) -> list[dict[str, str]]:
     """Generate matrix entries for python builds."""
     matrix_entries = []
@@ -348,10 +348,10 @@ def main() -> None:
     args = parse_args()
     labels = parse_labels(args.labels)
 
-    with open(CI_TARGETS_YAML, "r") as f:
+    with open(CI_TARGETS_YAML) as f:
         config = yaml.safe_load(f)
 
-    with open(CI_RUNNERS_YAML, "r") as f:
+    with open(CI_RUNNERS_YAML) as f:
         runners = yaml.safe_load(f)
 
     # If only free runners are allowed, reduce to a subset

cpython-unix/build.py

@@ -483,11 +483,7 @@ def python_build_info(
         arch = platform.removeprefix("linux_")
 
         bi["core"]["static_lib"] = (
-            "install/lib/python{version}/config-{version}{binary_suffix}-{arch}-linux-gnu/libpython{version}{binary_suffix}.a".format(
-                version=version,
-                binary_suffix=binary_suffix,
-                arch=arch,
-            )
+            f"install/lib/python{version}/config-{version}{binary_suffix}-{arch}-linux-gnu/libpython{version}{binary_suffix}.a"
         )
 
         if not static:
@@ -508,9 +504,7 @@ def python_build_info(
             object_file_format = "elf"
     elif platform.startswith("macos_"):
         bi["core"]["static_lib"] = (
-            "install/lib/python{version}/config-{version}{binary_suffix}-darwin/libpython{version}{binary_suffix}.a".format(
-                version=version, binary_suffix=binary_suffix
-            )
+            f"install/lib/python{version}/config-{version}{binary_suffix}-darwin/libpython{version}{binary_suffix}.a"
         )
         bi["core"]["shared_lib"] = "install/lib/libpython%s%s.dylib" % (
             version,

pythonbuild/buildenv.py

@@ -23,7 +23,7 @@
 )
 
 
-class ContainerContext(object):
+class ContainerContext:
     def __init__(self, container):
         self.container = container
 
@@ -139,7 +139,7 @@ def find_output_files(self, base_path, pattern):
             yield line[len("/build/out/%s/" % base_path) :].decode("ascii")
 
 
-class TempdirContext(object):
+class TempdirContext:
     def __init__(self, td):
         self.td = pathlib.Path(td)
 

pythonbuild/utils.py

@@ -569,7 +569,7 @@ def add_env_common(env):
 
     env_path = os.path.expanduser("~/.python-build-standalone-env")
     try:
-        with open(env_path, "r") as fh:
+        with open(env_path) as fh:
             for line in fh:
                 line = line.strip()
                 if line.startswith("#"):