Merge branch 'main' into stubs-package-data

Author: cdce8p

.github/workflows/ci.yml

@@ -30,11 +30,11 @@ jobs:
     outputs:
       wheel-distribution: ${{ steps.wheel-distribution.outputs.path }}
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
         with: {fetch-depth: 0}  # deep clone for setuptools-scm
       - uses: actions/setup-python@v6
         with: {python-version: "3.x"}
-      - uses: astral-sh/setup-uv@v6
+      - uses: astral-sh/setup-uv@v7
       - name: Run static analysis and format checkers
         run: >-
           uvx --with tox-uv
@@ -49,15 +49,15 @@ jobs:
       - name: Store the distribution files for use in other stages
         # `tests` and `publish` will use the same pre-built distributions,
         # so we make sure to release the exact same package that was tested
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v5
         with:
           name: python-distribution-files
           path: dist/
           retention-days: 1
       - name: Download files used for testing
         run: python tools/cache_urls_for_tests.py
       - name: Store downloaded files
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v5
         with:
           name: test-download-files
           path: ${{ env.VALIDATE_PYPROJECT_CACHE_REMOTE }}
@@ -79,17 +79,17 @@ jobs:
         - windows-latest
     runs-on: ${{ matrix.platform }}
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
       - uses: actions/setup-python@v6
         with:
           python-version: ${{ matrix.python }}
           allow-prereleases: true
-      - uses: astral-sh/setup-uv@v6
+      - uses: astral-sh/setup-uv@v7
       - name: Retrieve pre-built distribution files
-        uses: actions/download-artifact@v5
+        uses: actions/download-artifact@v6
         with: {name: python-distribution-files, path: dist/}
       - name: Retrieve test download files
-        uses: actions/download-artifact@v5
+        uses: actions/download-artifact@v6
         with:
           name: test-download-files
           path: ${{ env.VALIDATE_PYPROJECT_CACHE_REMOTE }}
@@ -124,12 +124,12 @@ jobs:
     if: ${{ github.event_name == 'push' && contains(github.ref, 'refs/tags/') }}
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
       - uses: actions/setup-python@v6
         with: {python-version: "3.x"}
-      - uses: astral-sh/setup-uv@v6
+      - uses: astral-sh/setup-uv@v7
       - name: Retrieve pre-built distribution files
-        uses: actions/download-artifact@v5
+        uses: actions/download-artifact@v6
         with: {name: python-distribution-files, path: dist/}
       - name: Publish Package
         env:

.gitignore

@@ -52,3 +52,7 @@ MANIFEST
 .venv*/
 .conda*/
 .python-version
+
+# Lock files
+uv.lock
+*pylock.toml

.pre-commit-config.yaml

@@ -26,10 +26,10 @@ repos:
     args: ["--ignore-words-list=THIRDPARTY", --write-changes]
 
 - repo: https://github.com/astral-sh/ruff-pre-commit
-  rev: v0.14.1
+  rev: v0.14.5
   hooks:
   - id: ruff-check
-    args: [--exclude=tools/to_schemastore.py, "--ignore=PLC0415,RUF200", --fix, --show-fixes, ]
+    args: [--fix, --show-fixes]
   - id: ruff-format
 
 - repo: https://github.com/adamchainz/blacken-docs
@@ -63,15 +63,15 @@ repos:
       - validate-pyproject[all]>=0.13
 
 - repo: https://github.com/python-jsonschema/check-jsonschema
-  rev: 0.34.1
+  rev: 0.35.0
   hooks:
     - id: check-metaschema
       files: \.schema\.json$
     - id: check-readthedocs
     - id: check-github-workflows
 
 - repo: https://github.com/scientific-python/cookie
-  rev: 2025.10.20
+  rev: 2025.11.10
   hooks:
     - id: sp-repo-review
       name: Validate Python repository

.ruff.toml

@@ -1,31 +1,52 @@
 # --- General config ---
 target-version = "py38"
+exclude = ["tools/to_schemastore.py", "tests/invalid-examples"]
 
 # --- Linting config ---
 [lint]
 extend-select = [
+  "ARG",         # flake8-unused-arguments
   "B",           # flake8-bugbear
+  "BLE",         # flake8-blind-except
   "C4",          # flake8-comprehensions
   "C90",         # McCabe cyclomatic complexity
   "DTZ",         # flake8-datetimez
+  "EM",          # flake8-errmsg
   "EXE",         # flake8-executable
+  "FA",          # flake8-future-annotations
   "FBT",         # flake8-boolean-trap
+  "FLY",         # flynt
+  "FURB",        # refurb
   "I",           # isort
   "ICN",         # flake8-import-conventions
   "INT",         # flake8-gettext
+  "ISC",         # flake8-implicit-str-concat
+  "LOG",         # flake8-logging
+  "PERF",        # Perflint
+  "PGH",         # pygrep-hooks
+  "PIE",         # flake8-pie
   "PL",          # Pylint
+  "PT",          # flake8-pytest-style
   "PYI",         # flake8-pyi
+  "Q",           # flake8-quotes
   "RET",         # flake8-return
+  "RSE",         # flake8-raise
   "RUF",         # Ruff-specific rules
   "S",           # flake8-bandit
   "SIM",         # flake8-simplify
+  "SLOT",        # flake8-slots
   "T10",         # flake8-debugger
+  "TC",          # flake8-type-checking
   "TCH",         # flake8-type-checking
+  "TRY",         # tryceratops
   "UP",          # pyupgrade
   "YTT",         # flake8-2020
 ]
 ignore = [
-  "SIM105",  # contextlib.supress (3.7 feature)
+  "PLC0415",  # import at top of file
+  "RSE102",   # parens on exception raise
+  "S101",     # assert is used by mypy and pytest
+  "TRY401",   # redundant logging message, TODO check
 ]
 
 [lint.per-file-ignores]

docs/_gendocs.py

@@ -19,7 +19,7 @@
 __location__ = Path(__file__).parent
 
 
-def gen_stubs(module_dir: str, output_dir: str):
+def gen_stubs(module_dir: str, output_dir: str):  # noqa: ARG001
     shutil.rmtree(output_dir, ignore_errors=True)  # Always start fresh
     out = Path(output_dir)
     out.mkdir(parents=True, exist_ok=True)

pyproject.toml

@@ -52,6 +52,7 @@ validate_pyproject = "validate_pyproject.repo_review:repo_review_families"
 [dependency-groups]
 dev = [
     { include-group = "test" },
+    "validate_pyproject[all]",
 ]
 docs = [
     "furo>=2023.08.17",
@@ -79,9 +80,6 @@ typecheck = [
 environments = [
   "python_version >= '3.9'",
 ]
-dev-dependencies = [
-  "validate_pyproject[all]",
-]
 
 [tool.setuptools_scm]
 version_scheme = "no-guess-dev"
@@ -97,7 +95,7 @@ addopts = """
 """
 norecursedirs = ["dist", "build", ".*"]
 testpaths = ["src", "tests"]
-log_cli_level = "info"
+log_level = "INFO"
 
 [tool.mypy]
 python_version = "3.8"

src/validate_pyproject/_tomllib.py

@@ -12,7 +12,8 @@
         )
         from toml import loads  # type: ignore[no-redef]
     except ImportError as ex:
-        raise ImportError("Please install `tomli` (TOML parser)") from ex
+        msg = "Please install `tomli` (TOML parser)"
+        raise ImportError(msg) from ex
 
 
 __all__ = [

src/validate_pyproject/api.py

@@ -2,6 +2,8 @@
 Retrieve JSON schemas for validating dicts representing a ``pyproject.toml`` file.
 """
 
+from __future__ import annotations
+
 import json
 import logging
 import sys
@@ -11,14 +13,10 @@
 from types import MappingProxyType, ModuleType
 from typing import (
     Callable,
-    Dict,
     Iterator,
     Mapping,
-    Optional,
     Sequence,
-    Tuple,
     TypeVar,
-    Union,
 )
 
 import fastjsonschema as FJS
@@ -37,7 +35,7 @@
 if sys.version_info >= (3, 9):  # pragma: no cover
     from importlib.resources import files
 
-    def read_text(package: Union[str, ModuleType], resource: str) -> str:
+    def read_text(package: str | ModuleType, resource: str) -> str:
         """:meta private:"""
         return files(package).joinpath(resource).read_text(encoding="utf-8")
 
@@ -94,8 +92,8 @@ class SchemaRegistry(Mapping[str, Schema]):
     :meta private: (low level detail)
     """
 
-    def __init__(self, plugins: Sequence["PluginProtocol"] = ()):
-        self._schemas: Dict[str, Tuple[str, str, Schema]] = {}
+    def __init__(self, plugins: Sequence[PluginProtocol] = ()):
+        self._schemas: dict[str, tuple[str, str, Schema]] = {}
         # (which part of the TOML, who defines, schema)
 
         top_level = typing.cast("dict", load(TOP_LEVEL_SCHEMA))  # Make it mutable
@@ -114,7 +112,7 @@ def __init__(self, plugins: Sequence["PluginProtocol"] = ()):
         # Add tools using Plugins
         for plugin in plugins:
             if plugin.tool:
-                allow_overwrite: Optional[str] = None
+                allow_overwrite: str | None = None
                 if plugin.tool in tool_properties:
                     _logger.warning(f"{plugin} overwrites `tool.{plugin.tool}` schema")
                     allow_overwrite = plugin.schema.get("$id")
@@ -150,7 +148,7 @@ def _ensure_compatibility(
         self,
         reference: str,
         schema: Schema,
-        allow_overwrite: Optional[str] = None,
+        allow_overwrite: str | None = None,
     ) -> Schema:
         if "$id" not in schema or not schema["$id"]:
             raise errors.SchemaMissingId(reference or "<extra>")
@@ -208,19 +206,19 @@ def __getitem__(self, key: str) -> Callable[[str], Schema]:
 
 
 class Validator:
-    _plugins: Sequence["PluginProtocol"]
+    _plugins: Sequence[PluginProtocol]
 
     def __init__(
         self,
-        plugins: Union[Sequence["PluginProtocol"], AllPlugins] = ALL_PLUGINS,
+        plugins: Sequence[PluginProtocol] | AllPlugins = ALL_PLUGINS,
         format_validators: Mapping[str, FormatValidationFn] = FORMAT_FUNCTIONS,
         extra_validations: Sequence[ValidationFn] = EXTRA_VALIDATIONS,
         *,
-        extra_plugins: Sequence["PluginProtocol"] = (),
+        extra_plugins: Sequence[PluginProtocol] = (),
     ):
-        self._code_cache: Optional[str] = None
-        self._cache: Optional[ValidationFn] = None
-        self._schema: Optional[Schema] = None
+        self._code_cache: str | None = None
+        self._cache: ValidationFn | None = None
+        self._schema: Schema | None = None
 
         # Let's make the following options readonly
         self._format_validators = MappingProxyType(format_validators)

src/validate_pyproject/caching.py

@@ -1,11 +1,15 @@
 # This module is intentionally kept minimal,
 # so that it can be imported without triggering imports outside stdlib.
+from __future__ import annotations
+
 import hashlib
-import io
 import logging
 import os
 from pathlib import Path
-from typing import Callable, Optional, Union
+from typing import TYPE_CHECKING, Callable, Union
+
+if TYPE_CHECKING:
+    import io
 
 PathLike = Union[str, "os.PathLike[str]"]
 _logger = logging.getLogger(__name__)
@@ -14,8 +18,8 @@
 def as_file(
     fn: Callable[[str], io.StringIO],
     arg: str,
-    cache_dir: Optional[PathLike] = None,
-) -> Union[io.StringIO, io.BufferedReader]:
+    cache_dir: PathLike | None = None,
+) -> io.StringIO | io.BufferedReader:
     """
     Cache the result of calling ``fn(arg)`` into a file inside ``cache_dir``.
     The file name is derived from ``arg``.
@@ -36,7 +40,7 @@ def as_file(
     return open(cache_path, "rb")
 
 
-def path_for(arbitrary_id: str, cache: Optional[PathLike] = None) -> Optional[Path]:
+def path_for(arbitrary_id: str, cache: PathLike | None = None) -> Path | None:
     cache_dir = cache or os.getenv("VALIDATE_PYPROJECT_CACHE_REMOTE")
     if not cache_dir:
         return None