Update Ruff and pre-commit hooks

object-Object · object-Object · commit 234335e7023d · 2025-12-29T22:37:02.000-05:00
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -4,7 +4,7 @@ default_install_hook_types:
   - pre-push
 repos:
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v4.5.0
+    rev: v6.0.0
     hooks:
       - id: trailing-whitespace
       - id: end-of-file-fixer
@@ -16,7 +16,7 @@ repos:
         files: ^web/docusaurus/
         types_or: [javascript, jsx, ts, tsx, mdx]
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.3.2
+    rev: v0.14.10
     hooks:
       - name: ruff-fix
         id: ruff
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -14,8 +14,8 @@
         "editor.rulers": [120],
     },
     "ruff.organizeImports": true,
-    "ruff.lint.args": [
-        "--extend-ignore=I", // format on save is enabled, so don't show the squiggles
+    "ruff.lint.ignore": [
+        "I", // format on save is enabled, so don't show the squiggles
     ],
     "python.languageServer": "Pylance",
     "python.analysis.diagnosticMode": "workspace",
diff --git a/pyproject.toml b/pyproject.toml
@@ -86,7 +86,7 @@ test = [
 ]
 dev = [
     "hexdoc[pdoc,test]",
-    "ruff~=0.3.2",
+    "ruff~=0.14.10",
     "pre-commit",
     "nox[uv]",
 ]
diff --git a/src/_scripts/json_schema.py b/src/_scripts/json_schema.py
@@ -4,11 +4,12 @@
 
 import rich
 import typer
+from pydantic import BaseModel, TypeAdapter
+from typer import Argument, Option
+
 from hexdoc.cli.utils import DefaultTyper
 from hexdoc.cli.utils.args import parse_import_class
 from hexdoc.core.compat import MinecraftVersion
-from pydantic import BaseModel, TypeAdapter
-from typer import Argument, Option
 
 app = DefaultTyper()
 
diff --git a/src/hexdoc/cli/app.py b/src/hexdoc/cli/app.py
@@ -176,7 +176,7 @@ def repl(*, props_file: PropsOption):
         banner=dedent(
             f"""\
             [hexdoc repl] Python {sys.version}
-            Locals: {', '.join(sorted(repl_locals.keys()))}"""
+            Locals: {", ".join(sorted(repl_locals.keys()))}"""
         ),
         readfunc=repl_readfunc(),
         local=repl_locals,
diff --git a/src/hexdoc/graphics/loader.py b/src/hexdoc/graphics/loader.py
@@ -233,7 +233,7 @@ def _from_renderer(self, model_id: ResourceLocation):
         # TODO: implement a smarter way of choosing an override?
         n = len(model.overrides)
         for i, override in enumerate(model.overrides):
-            logger.debug(f"Rendering model override ({i+1}/{n}): {override.model}")
+            logger.debug(f"Rendering model override ({i + 1}/{n}): {override.model}")
             try:
                 return self._render_model_recursive(override.model)
             except Exception as e:
diff --git a/src/hexdoc/minecraft/tags.py b/src/hexdoc/minecraft/tags.py
@@ -120,9 +120,8 @@ def _export(self: Tag, current: Tag | None):
     def _load_values(self, loader: ModResourceLoader) -> Iterator[TagValue]:
         for value in self.values:
             match value:
-                case (
-                    (ResourceLocation() as child_id)
-                    | OptionalTagValue(id=child_id)
+                case (ResourceLocation() as child_id) | OptionalTagValue(
+                    id=child_id
                 ) if child_id.is_tag:
                     try:
                         child = Tag.load(self.registry, child_id, loader)
diff --git a/src/hexdoc_modonomicon/_hooks.py b/src/hexdoc_modonomicon/_hooks.py
@@ -14,7 +14,6 @@
     hookimpl,
 )
 from hexdoc.utils import ContextSource, JSONDict, cast_context
-
 from hexdoc_modonomicon.book import Modonomicon
 
 
diff --git a/src/hexdoc_modonomicon/book.py b/src/hexdoc_modonomicon/book.py
@@ -1,6 +1,7 @@
+from pydantic import Field, model_validator
+
 from hexdoc.core import LocalizedStr, ResourceLocation
 from hexdoc.model import HexdocModel
-from pydantic import Field, model_validator
 
 
 def _gui_texture(name: str):
@@ -40,8 +41,8 @@ def _validate_constraints(self):
         if self.generate_book_item:
             assert self.model, "model is required if generate_book_item is True"
         else:
-            assert (
-                self.custom_book_item
-            ), "custom_book_item is required if generate_book_item is False"
+            assert self.custom_book_item, (
+                "custom_book_item is required if generate_book_item is False"
+            )
 
         return self
diff --git a/src/hexdoc_modonomicon/category.py b/src/hexdoc_modonomicon/category.py
@@ -1,7 +1,8 @@
+from pydantic import Field
+
 from hexdoc.core import LocalizedStr, ResourceLocation
 from hexdoc.graphics import ImageField, ItemImage, TextureImage
 from hexdoc.model import HexdocModel
-from pydantic import Field
 
 from .condition import Condition
 
diff --git a/src/hexdoc_modonomicon/entry.py b/src/hexdoc_modonomicon/entry.py
@@ -1,7 +1,8 @@
+from pydantic import Field
+
 from hexdoc.core import LocalizedStr, ResourceLocation
 from hexdoc.graphics import ImageField, ItemImage, TextureImage
 from hexdoc.model import HexdocModel
-from pydantic import Field
 
 from .condition import Condition
 from .page import Page
diff --git a/src/hexdoc_modonomicon/page/abstract_pages.py b/src/hexdoc_modonomicon/page/abstract_pages.py
@@ -1,9 +1,10 @@
 from typing import Unpack
 
+from pydantic import ConfigDict
+
 from hexdoc.core import ResourceLocation
 from hexdoc.model import TypeTaggedTemplate
 from hexdoc.utils import Inherit, InheritType, NoValue, classproperty
-from pydantic import ConfigDict
 
 
 class Page(TypeTaggedTemplate, type=None):
diff --git a/test/conftest.py b/test/conftest.py
@@ -4,13 +4,14 @@
 from typing import Any
 
 import pytest
-from hexdoc.core.properties import Properties
-from hexdoc.plugin import PluginManager
 from pytest import MonkeyPatch
 from syrupy.assertion import SnapshotAssertion
 from syrupy.extensions.single_file import SingleFileSnapshotExtension, WriteMode
 from syrupy.types import SerializableData, SerializedData
 
+from hexdoc.core.properties import Properties
+from hexdoc.plugin import PluginManager
+
 collect_ignore = [
     "noxfile.py",
 ]
diff --git a/test/core/test_resource.py b/test/core/test_resource.py
@@ -1,7 +1,8 @@
 import pytest
-from hexdoc.core.resource import AssumeTag, ItemStack, ResLoc, ResourceLocation
 from pydantic import TypeAdapter
 
+from hexdoc.core.resource import AssumeTag, ItemStack, ResLoc, ResourceLocation
+
 resource_locations: list[tuple[str, ResourceLocation, str]] = [
     (
         "stone",
diff --git a/test/graphics/model/test_element.py b/test/graphics/model/test_element.py
@@ -1,9 +1,10 @@
 from typing import Any
 
 import pytest
-from hexdoc.graphics.model.element import ElementFaceTextureVariable, TextureVariable
 from pydantic import TypeAdapter
 
+from hexdoc.graphics.model.element import ElementFaceTextureVariable, TextureVariable
+
 
 @pytest.mark.parametrize(
     ["type_", "value", "want"],
diff --git a/test/hooks/test_manager.py b/test/hooks/test_manager.py
@@ -4,6 +4,10 @@
 from typing import Any, Callable
 
 import pytest
+from jinja2.sandbox import SandboxedEnvironment
+from markupsafe import Markup
+from pytest import FixtureRequest, Mark
+
 from hexdoc.jinja.render import create_jinja_env
 from hexdoc.plugin import (
     ModPlugin,
@@ -12,9 +16,6 @@
     UpdateTemplateArgsImpl,
     hookimpl,
 )
-from jinja2.sandbox import SandboxedEnvironment
-from markupsafe import Markup
-from pytest import FixtureRequest, Mark
 
 RenderTemplate = Callable[[list[str]], str]
 
diff --git a/test/integration/test_copier.py b/test/integration/test_copier.py
@@ -5,10 +5,11 @@
 from pathlib import Path
 
 import pytest
-from hexdoc.cli import ci
 from pytest import MonkeyPatch
 from syrupy.assertion import SnapshotAssertion
 
+from hexdoc.cli import ci
+
 from ..conftest import list_directory
 from ..tree import write_file_tree
 
diff --git a/test/integration/test_extend_book.py b/test/integration/test_extend_book.py
@@ -2,6 +2,9 @@
 from typing import Any
 
 import pytest
+from pytest import MonkeyPatch
+from yarl import URL
+
 from hexdoc._hooks import HexdocPlugin
 from hexdoc.cli.utils.load import init_context
 from hexdoc.core import I18n, ModResourceLoader, PathResourceDir, PluginResourceDir
@@ -14,8 +17,6 @@
 from hexdoc.patchouli.book_context import BookContext
 from hexdoc.patchouli.text import FormattingContext
 from hexdoc.plugin import PluginManager
-from pytest import MonkeyPatch
-from yarl import URL
 
 from ..tree import write_file_tree
 
diff --git a/test/integration/test_main.py b/test/integration/test_main.py
@@ -6,10 +6,11 @@
 from typing import TYPE_CHECKING, assert_type
 
 import pytest
-from hexdoc.cli.app import build, callback
 from pytest import MonkeyPatch, TempPathFactory
 from syrupy.assertion import SnapshotAssertion
 
+from hexdoc.cli.app import build, callback
+
 from ..conftest import list_directory
 
 CHECK_RENDERED_FILENAMES = [
diff --git a/test/integration/test_merge.py b/test/integration/test_merge.py
@@ -4,12 +4,13 @@
 from typing import Any
 
 import pytest
+from pytest import MonkeyPatch
+
 from hexdoc.cli import app
 from hexdoc.plugin import hookimpl
 from hexdoc.plugin.manager import PluginManager
 from hexdoc.plugin.mod_plugin import ModPluginWithBook
 from hexdoc.plugin.specs import ModPluginImpl
-from pytest import MonkeyPatch
 
 from ..tree import write_file_tree
 
diff --git a/test/integration/test_modpack.py b/test/integration/test_modpack.py
@@ -2,6 +2,9 @@
 from typing import Any
 
 import pytest
+from pytest import MonkeyPatch
+from yarl import URL
+
 from hexdoc._hooks import HexdocPlugin
 from hexdoc.cli.utils.load import init_context
 from hexdoc.core import I18n, ModResourceLoader
@@ -13,8 +16,6 @@
 from hexdoc.patchouli.book import Book
 from hexdoc.patchouli.text import FormatTree
 from hexdoc.plugin import PluginManager
-from pytest import MonkeyPatch
-from yarl import URL
 
 from ..tree import write_file_tree
 
diff --git a/test/minecraft/assets/test_with_texture.py b/test/minecraft/assets/test_with_texture.py
@@ -1,12 +1,13 @@
 from typing import Any
 
 import pytest
+from pydantic import TypeAdapter
+
 from hexdoc.core import I18n, Properties
 from hexdoc.core.properties import LangProps
 from hexdoc.graphics import ItemImage, TagImage
 from hexdoc.plugin import PluginManager
 from hexdoc.utils.context import ContextSource
-from pydantic import TypeAdapter
 
 
 @pytest.fixture
diff --git a/test/minecraft/recipe/test_recipes.py b/test/minecraft/recipe/test_recipes.py
@@ -3,6 +3,8 @@
 from typing import Any
 
 import pytest
+from pydantic import TypeAdapter
+
 from hexdoc.core.i18n import I18n
 from hexdoc.core.loader import ModResourceLoader
 from hexdoc.core.properties import LangProps, Properties
@@ -12,7 +14,6 @@
 from hexdoc.minecraft.recipe.recipes import CraftingShapelessRecipe, Recipe
 from hexdoc.plugin.manager import PluginManager
 from hexdoc.utils.context import ContextSource
-from pydantic import TypeAdapter
 
 
 @pytest.fixture
diff --git a/test/minecraft/test_i18n.py b/test/minecraft/test_i18n.py
@@ -1,6 +1,7 @@
 from typing import Any
 
 import pytest
+
 from hexdoc.core import I18n, LocalizedStr, ResourceLocation
 from hexdoc.core.properties import LangProps
 from hexdoc.patchouli.page.abstract_pages import PageWithTitle
diff --git a/test/minecraft/test_tags.py b/test/minecraft/test_tags.py
@@ -3,6 +3,7 @@
 import textwrap
 
 import pytest
+
 from hexdoc.core.resource import ResourceLocation
 from hexdoc.minecraft.tags import OptionalTagValue, Tag, TagValue
 from hexdoc.utils.types import PydanticOrderedSet
diff --git a/test/model/test_tagged_union.py b/test/model/test_tagged_union.py
@@ -1,11 +1,12 @@
 from typing import Any, cast
 
 import pytest
+from pydantic import TypeAdapter
+
 from hexdoc.core.properties import Properties
 from hexdoc.model import HexdocModel, TypeTaggedUnion
 from hexdoc.plugin import PluginManager
 from hexdoc.utils.singletons import NoValue
-from pydantic import TypeAdapter
 
 
 class _TaggedUnion(TypeTaggedUnion, type=NoValue):
diff --git a/test/patchouli/test_page.py b/test/patchouli/test_page.py
@@ -1,6 +1,7 @@
 from typing import Any
 
 import pytest
+
 from hexdoc.patchouli.book_context import BookContext
 from hexdoc.patchouli.page import EmptyPage, Page
 from hexdoc.plugin import PluginManager
diff --git a/test/patchouli/test_text.py b/test/patchouli/test_text.py
@@ -3,6 +3,9 @@
 from typing import Any, cast
 
 import pytest
+from jinja2 import PackageLoader
+from yarl import URL
+
 from hexdoc.core import I18n
 from hexdoc.core.resource import ResourceLocation
 from hexdoc.jinja.render import create_jinja_env_with_loader
@@ -17,8 +20,6 @@
     SpecialStyleType,
 )
 from hexdoc.plugin import PluginManager
-from jinja2 import PackageLoader
-from yarl import URL
 
 
 class MockPluginManager:
diff --git a/test/templates/pages/patchouli/test_image.py b/test/templates/pages/patchouli/test_image.py
@@ -1,9 +1,10 @@
 from types import SimpleNamespace
 
+from jinja2 import PackageLoader
+
 from hexdoc.core.resource import ResourceLocation
 from hexdoc.jinja.render import create_jinja_env_with_loader
 from hexdoc.patchouli.page.pages import ImagePage
-from jinja2 import PackageLoader
 
 
 def test_no_title():
diff --git a/test/utils/deserialize/test_toml.py b/test/utils/deserialize/test_toml.py
@@ -3,6 +3,7 @@
 import copy
 
 import pytest
+
 from hexdoc.utils.deserialize.toml import TOMLDict, fill_placeholders
 
 
diff --git a/test/utils/test_logging.py b/test/utils/test_logging.py
diff --git a/test/utils/test_types.py b/test/utils/test_types.py

Original file line number	Diff line number	Diff line change
`@@ -86,7 +86,7 @@ test = [`
`86`	`86`	`]`
`87`	`87`	`dev = [`
`88`	`88`	`"hexdoc[pdoc,test]",`
`89`		`- "ruff~=0.3.2",`
	`89`	`+ "ruff~=0.14.10",`
`90`	`90`	`"pre-commit",`
`91`	`91`	`"nox[uv]",`
`92`	`92`	`]`
Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,6 @@`
`14`	`14`	`hookimpl,`
`15`	`15`	`)`
`16`	`16`	`from hexdoc.utils import ContextSource, JSONDict, cast_context`
`17`		`-`
`18`	`17`	`from hexdoc_modonomicon.book import Modonomicon`
`19`	`18`
`20`	`19`