Reformat codebase with ruff (replacing black 20.8b1 + flake8 + reorder-python-imports)

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

Author: rtibbles

.pre-commit-hooks/check_lfs_pointers.py

@@ -9,6 +9,7 @@
 not binary data. This works whether or not Git LFS is installed in the environment
 running the check.
 """
+
 import logging
 import subprocess
 import sys
@@ -90,9 +91,7 @@ def main(filenames):
         logger.error("ERROR: LFS Pointer Check Failed")
         logger.error("=" * 80)
         logger.error("")
-        logger.error(
-            "The following files should be LFS pointers but contain binary data:"
-        )
+        logger.error("The following files should be LFS pointers but contain binary data:")
         logger.error("")
 
         for filepath in failed_files:
@@ -105,9 +104,7 @@ def main(filenames):
         logger.error("")
         logger.error("To fix this issue:")
         logger.error("  1. Ensure Git LFS is installed: git lfs install")
-        logger.error(
-            "  2. Remove the binary files from staging: git rm --cached <file>"
-        )
+        logger.error("  2. Remove the binary files from staging: git rm --cached <file>")
         logger.error("  3. Re-add the files (Git LFS will handle them): git add <file>")
         logger.error("=" * 80)
         logger.error("")

build_tools/customize_build.py

@@ -5,6 +5,7 @@
 
 For more detail see the documentation in __init__.py
 """
+
 import logging
 import os
 import sys
@@ -23,43 +24,28 @@ def load_plugins_from_file(file_path):
     if file_path not in plugins_cache:
         # We have been passed a URL, not a local file path
         if file_path.startswith("http"):
-            logger.info(
-                "Downloading plugins manifest from {file_path}".format(
-                    file_path=file_path
-                )
-            )
+            logger.info("Downloading plugins manifest from {file_path}".format(file_path=file_path))
             _, path = tempfile.mkstemp(suffix=".txt", text=True)
             with open(path, "w") as f:
                 r = requests.get(file_path)
                 f.write(r.content)
             file_path = path
         with open(file_path, "r") as f:
-            plugins_cache[file_path] = [
-                plugin.strip() for plugin in f.readlines() if plugin.strip()
-            ]
+            plugins_cache[file_path] = [plugin.strip() for plugin in f.readlines() if plugin.strip()]
     return plugins_cache[file_path]
 
 
-build_config_path = os.path.join(
-    os.path.dirname(__file__), "../kolibri/utils/build_config"
-)
+build_config_path = os.path.join(os.path.dirname(__file__), "../kolibri/utils/build_config")
 
 default_settings_template = "settings_path = '{path}'"
 
 
 def set_default_settings_module():
-    if (
-        "DEFAULT_SETTINGS_MODULE" in os.environ
-        and os.environ["DEFAULT_SETTINGS_MODULE"]
-    ):
+    if "DEFAULT_SETTINGS_MODULE" in os.environ and os.environ["DEFAULT_SETTINGS_MODULE"]:
         default_settings_path = os.environ["DEFAULT_SETTINGS_MODULE"]
         with open(os.path.join(build_config_path, "default_settings.py"), "w") as f:
             # Just write out settings_path = '<settings_path>'
-            logger.info(
-                "Setting default settings module to {path}".format(
-                    path=default_settings_path
-                )
-            )
+            logger.info("Setting default settings module to {path}".format(path=default_settings_path))
             f.write(default_settings_template.format(path=default_settings_path))
 
 

build_tools/customize_docker_envlist.py

@@ -4,13 +4,12 @@
 
 For more detail see the documentation in __init__.py
 """
+
 import logging
 import os
 
 BUILD_ENV_PREFIX = "KOLIBRI_BUILD_"
-ENVLIST_FILE = os.path.abspath(
-    os.path.join(os.path.dirname(os.path.dirname(__file__)), "docker", "env.list")
-)
+ENVLIST_FILE = os.path.abspath(os.path.join(os.path.dirname(os.path.dirname(__file__)), "docker", "env.list"))
 
 logger = logging.getLogger(__name__)
 
@@ -26,11 +25,7 @@ def add_env_var_to_docker():
             if env.startswith(BUILD_ENV_PREFIX):
                 key = env.replace(BUILD_ENV_PREFIX, "")
                 f.write("\n{key}={value}".format(key=key, value=envs[env]))
-                logger.info(
-                    "Writing value of environment variable {} to Docker env.list\n".format(
-                        key
-                    )
-                )
+                logger.info("Writing value of environment variable {} to Docker env.list\n".format(key))
 
 
 if __name__ == "__main__":

build_tools/customize_requirements.py

@@ -4,6 +4,7 @@
 
 For more detail see the documentation in __init__.py
 """
+
 import logging
 import os
 import tempfile
@@ -18,27 +19,17 @@ def add_requirements_to_base():
         file_path = os.environ["EXTRA_REQUIREMENTS"]
         # We have been passed a URL, not a local file path
         if file_path.startswith("http"):
-            logger.info(
-                "Downloading extra requirements from {file_path}".format(
-                    file_path=file_path
-                )
-            )
+            logger.info("Downloading extra requirements from {file_path}".format(file_path=file_path))
             _, path = tempfile.mkstemp(suffix=".txt", text=True)
             with open(path, "w") as f:
                 r = requests.get(file_path)
                 f.write(r.content)
             file_path = path
         try:
             with open(file_path, "r") as f:
-                requirements = [
-                    requirement.strip()
-                    for requirement in f.readlines()
-                    if requirement.strip()
-                ]
+                requirements = [requirement.strip() for requirement in f.readlines() if requirement.strip()]
             if requirements:
-                with open(
-                    os.path.join(os.path.dirname(__file__), "../requirements.txt"), "a"
-                ) as f:
+                with open(os.path.join(os.path.dirname(__file__), "../requirements.txt"), "a") as f:
                     f.writelines(requirements)
         except OSError:
             pass

build_tools/i18n/cleanup_unsupported_languages.py

@@ -5,6 +5,7 @@
 This script should be run after downloading translations from Crowdin to clean up
 any languages that were downloaded but are not officially supported by Kolibri.
 """
+
 import logging
 import os
 import shutil
@@ -40,9 +41,7 @@ def cleanup_unsupported_languages():
             removed_locales.append(item)
 
     if removed_locales:
-        logging.info(
-            f"Removed unsupported language directories: {', '.join(sorted(removed_locales))}"
-        )
+        logging.info(f"Removed unsupported language directories: {', '.join(sorted(removed_locales))}")
     else:
         logging.info("No unsupported language directories found")
 

build_tools/i18n/fonts.py

@@ -2,6 +2,7 @@
 For usage instructions, see:
     https://kolibri-dev.readthedocs.io/en/develop/references/i18n.html
 """
+
 import argparse
 import base64
 import functools
@@ -32,9 +33,7 @@
     utils.install_requirement(f"fonttools=={font_tools_version}")
 except AssertionError:
     utils.install_requirement(f"fonttools=={font_tools_version}")
-    logging.error(
-        "Wrong fontTools version was installed. This has been updated. Please re-run the command."
-    )
+    logging.error("Wrong fontTools version was installed. This has been updated. Please re-run the command.")
     sys.exit(1)
 
 import noto_source  # noqa E402
@@ -328,9 +327,7 @@ def _full_font_face(font_family, font_name, weight, omit_glyphs=None):
     glyphs = _font_glyphs(hashed_path) - omit_glyphs
     if not glyphs:
         return ""
-    return _gen_font_face(
-        font_family, hashed_filename, weight, unicodes=_fmt_range(glyphs)
-    )
+    return _gen_font_face(font_family, hashed_filename, weight, unicodes=_fmt_range(glyphs))
 
 
 def _gen_full_css_modern(lang_info):
@@ -345,11 +342,7 @@ def _gen_full_css_modern(lang_info):
     font_faces = []
     for font_name in _font_priorities(lang_info[utils.KEY_DEFAULT_FONT]):
         for weight in noto_source.WEIGHTS:
-            font_faces.append(
-                _full_font_face(
-                    SCOPE_FULL, font_name, weight, omit_glyphs=previous_glyphs
-                )
-            )
+            font_faces.append(_full_font_face(SCOPE_FULL, font_name, weight, omit_glyphs=previous_glyphs))
 
         # Assumes all four variants have the same glyphs, from the content Regular font
         regular_path = _woff_font_path(_scoped(SCOPE_FULL, font_name), "Regular")
@@ -358,9 +351,7 @@ def _gen_full_css_modern(lang_info):
         hashed_path = os.path.join(OUTPUT_PATH, hashed_filename)
         previous_glyphs |= _font_glyphs(hashed_path)
 
-    original_filename = "{}.modern.css".format(
-        _scoped(SCOPE_FULL, lang_info[utils.KEY_INTL_CODE])
-    )
+    original_filename = "{}.modern.css".format(_scoped(SCOPE_FULL, lang_info[utils.KEY_INTL_CODE]))
     temp_path = os.path.join(OUTPUT_PATH, original_filename + ".tmp")
 
     # Write to temporary file
@@ -380,9 +371,7 @@ def _gen_full_css_modern(lang_info):
 
 
 def _gen_full_css_basic(lang_info):
-    original_filename = "{}.basic.css".format(
-        _scoped(SCOPE_FULL, lang_info[utils.KEY_INTL_CODE])
-    )
+    original_filename = "{}.basic.css".format(_scoped(SCOPE_FULL, lang_info[utils.KEY_INTL_CODE]))
     temp_path = os.path.join(OUTPUT_PATH, original_filename + ".tmp")
 
     # Write to temporary file
@@ -493,9 +482,7 @@ def _write_inline_font(file_object, font_path, font_family, weight):
     """
     with open(font_path, mode="rb") as f:
         data = f.read()
-    data_uri = "data:application/x-font-woff;charset=utf-8;base64,\\\n{}".format(
-        "\\\n".join(_chunks(base64.b64encode(data).decode()))
-    )
+    data_uri = "data:application/x-font-woff;charset=utf-8;base64,\\\n{}".format("\\\n".join(_chunks(base64.b64encode(data).decode())))
     glyphs = _font_glyphs(font_path)
     if not glyphs:
         return
@@ -658,7 +645,6 @@ def _subset_and_merge_fonts(text, default_font, scope):
     remaining_glyphs = set([ord(c) for c in text])
 
     for font_name in _font_priorities(default_font):
-
         if font_name in FONTS_TO_EXCLUDE_FROM_SUBSET:
             continue
 

build_tools/i18n/generate_mapping.py

@@ -4,6 +4,7 @@
 Reads language_info.json and uses our copy of Django's locale utilities
 to convert intl_code to locale format.
 """
+
 import json
 import os
 
@@ -19,9 +20,7 @@ def get_language_mapping():
     """
     # Get the path to language_info.json relative to this script
     script_dir = os.path.dirname(os.path.abspath(__file__))
-    json_path = os.path.join(
-        script_dir, "..", "..", "kolibri", "locale", "language_info.json"
-    )
+    json_path = os.path.join(script_dir, "..", "..", "kolibri", "locale", "language_info.json")
 
     with open(json_path, "r", encoding="utf-8") as f:
         languages = json.load(f)

build_tools/i18n/noto_source.py

@@ -72,19 +72,13 @@
 # filename and directory patterns
 HINTED_PATH_PATTERN = r"^fonts\/[^\/]+\/hinted\/ttf\/(NotoSans\w*)-\w*.ttf$"
 
-VARIABLE_SLIM_LINE_PATTERN = (
-    r"^fonts/[^/]+\/unhinted\/variable-ttf\/(NotoSans\w*)\[\w*\].ttf$"
-)
+VARIABLE_SLIM_LINE_PATTERN = r"^fonts/[^/]+\/unhinted\/variable-ttf\/(NotoSans\w*)\[\w*\].ttf$"
 
-VARIABLE_PATTERN = (
-    r"^fonts/[^/]+\/unhinted\/slim-variable-ttf\/(NotoSans\w*)\[\w*\].ttf$"
-)
+VARIABLE_PATTERN = r"^fonts/[^/]+\/unhinted\/slim-variable-ttf\/(NotoSans\w*)\[\w*\].ttf$"
 
 WEIGHT_REGEXES = [re.compile(f"^(NotoSans\\w*)-{weight}\\.ttf$") for weight in WEIGHTS]
 
-DOWNLOAD_URL = (
-    "https://raw.githubusercontent.com/notofonts/notofonts.github.io/{ref}/{path}"
-)
+DOWNLOAD_URL = "https://raw.githubusercontent.com/notofonts/notofonts.github.io/{ref}/{path}"
 
 
 def _request(path):
@@ -118,11 +112,7 @@ def _is_base_font(name):
 
 @functools.cache
 def _get_fixed_weight_fonts(recursive_tree):
-    file_paths = [
-        item["path"]
-        for item in recursive_tree["tree"]
-        if re.match(HINTED_PATH_PATTERN, item["path"])
-    ]
+    file_paths = [item["path"] for item in recursive_tree["tree"] if re.match(HINTED_PATH_PATTERN, item["path"])]
 
     # Accumulate dicts of github info objects for font weights
     fixed_weight_fonts = {}
@@ -163,22 +153,12 @@ def _get_all_typefaces(git_tree):
     variable_slim_fonts = _get_variable_slim_fonts(git_tree)
 
     # these are the fonts that have all weight variants or variable fonts
-    all_typefaces = (
-        reduce(and_, (set(v) for v in fixed_weight_fonts.values()))
-        | set(variable_fonts.keys())
-        | set(variable_slim_fonts.keys())
-    )
+    all_typefaces = reduce(and_, (set(v) for v in fixed_weight_fonts.values())) | set(variable_fonts.keys()) | set(variable_slim_fonts.keys())
 
     # remove UI variants as we will automatically pick these if available
     # also coerce to a list for dumping to JSON
 
-    return {
-        font_name
-        for font_name in all_typefaces
-        if not font_name.endswith("UI")
-        and font_name not in EXCLUDED_TYPEFACES
-        and _is_base_font(font_name)
-    }
+    return {font_name for font_name in all_typefaces if not font_name.endswith("UI") and font_name not in EXCLUDED_TYPEFACES and _is_base_font(font_name)}
 
 
 def _font_info(recursive_tree, ref):
@@ -208,17 +188,11 @@ def _font_info(recursive_tree, ref):
         output[font_name] = {}
         for weight in WEIGHTS:
             if base_font_name in fixed_weight_fonts[weight]:
-                output[font_name][weight] = DOWNLOAD_URL.format(
-                    ref=ref, path=fixed_weight_fonts[weight][base_font_name]
-                )
+                output[font_name][weight] = DOWNLOAD_URL.format(ref=ref, path=fixed_weight_fonts[weight][base_font_name])
             elif base_font_name in variable_slim_fonts:
-                output[font_name]["Variable"] = DOWNLOAD_URL.format(
-                    ref=ref, path=variable_slim_fonts[base_font_name]
-                )
+                output[font_name]["Variable"] = DOWNLOAD_URL.format(ref=ref, path=variable_slim_fonts[base_font_name])
             elif base_font_name in variable_fonts:
-                output[font_name]["Variable"] = DOWNLOAD_URL.format(
-                    ref=ref, path=variable_fonts[base_font_name]
-                )
+                output[font_name]["Variable"] = DOWNLOAD_URL.format(ref=ref, path=variable_fonts[base_font_name])
 
     return output
 
@@ -317,9 +291,7 @@ def fetch_fonts():
                 for instance in font["fvar"].instances:
                     name = font["name"].getDebugName(instance.subfamilyNameID)
                     if name == weight:
-                        instancer.instantiateVariableFont(
-                            font, instance.coordinates, inplace=True
-                        )
+                        instancer.instantiateVariableFont(font, instance.coordinates, inplace=True)
                         break
                 else:
                     # No named font, so set the weight specifically