Update pre-commit hooks

.pre-commit-config.yaml

@@ -8,12 +8,12 @@ repos:
       - id: end-of-file-fixer
       - id: debug-statements
   - repo: https://github.com/crate-ci/typos
-    rev: v1.27.0
+    rev: v1.28.2
     hooks:
       - id: typos
         exclude: ^tests/|.xsd|xsdata/models/datatype.py$
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.7.2
+    rev: v0.8.2
     hooks:
       - id: ruff
         args: [ --fix, --show-fixes]
@@ -31,11 +31,9 @@ repos:
           - types-docutils
           - types-toposort
         args: [ "--check-untyped-defs", "--ignore-missing-imports" ]
-  - repo: https://github.com/pre-commit/mirrors-prettier
-    rev: v4.0.0-alpha.8
+  - repo: https://github.com/rbubley/mirrors-prettier
+    rev: v3.4.2
     hooks:
       - id: prettier
-        additional_dependencies:
-          - [email protected]
         types_or: [markdown]
         args: [--prose-wrap=always, --print-width=88]

pyproject.toml

@@ -83,7 +83,7 @@ license-files = ["LICENSE"]
 version = {attr = "xsdata.__version__"}
 
 [tool.ruff]
-target-version = "py38"
+target-version = "py39"
 
 [tool.ruff.lint]
 select = [
@@ -114,8 +114,6 @@ select = [
 ]
 
 ignore = [
-    "ANN101",
-    "ANN102",
     "ANN201",
     "ANN202",
     "ANN204",
@@ -133,6 +131,7 @@ ignore = [
 
 [tool.ruff.lint.per-file-ignores]
 "**/{tests}/*" = ["ANN001", "ANN002", "ANN003", "E501", "B018", "D"]
+"tests/formats/dataclass/cases/**" = ["UP"]
 "**/utils/testing.py" = ["D"]
 "docs/*" = ["D"]
 

tests/codegen/handlers/test_vacuum_inner_classes.py

@@ -1,4 +1,4 @@
-from typing import Generator
+from collections.abc import Generator
 
 from xsdata.codegen.handlers import VacuumInnerClasses
 from xsdata.models.enums import DataType

tests/codegen/mappers/test_definitions.py

@@ -1,4 +1,4 @@
-from typing import Generator
+from collections.abc import Generator
 from unittest import mock
 
 from xsdata.codegen.mappers import DefinitionsMapper

tests/codegen/mappers/test_dtd.py

@@ -1,5 +1,5 @@
 import sys
-from typing import Iterator
+from collections.abc import Iterator
 from unittest import mock
 
 from xsdata.codegen.mappers import DtdMapper

tests/codegen/mappers/test_schema.py

@@ -1,5 +1,5 @@
+from collections.abc import Iterator
 from types import GeneratorType
-from typing import Iterator
 from unittest import mock
 
 from xsdata.codegen.mappers import SchemaMapper

tests/codegen/models/test_codegen.py

@@ -1,13 +1,12 @@
 import unittest
 from dataclasses import dataclass
-from typing import List
 
 from xsdata.codegen.models import CodegenModel
 
 
 @dataclass
 class Foo(CodegenModel):
-    bar: List["Bar"]
+    bar: list["Bar"]
 
     @dataclass
     class Bar(CodegenModel):

tests/codegen/test_utils.py

@@ -1,5 +1,5 @@
 import sys
-from typing import Generator
+from collections.abc import Generator
 from unittest import mock
 
 from xsdata.codegen.exceptions import CodegenError

tests/codegen/test_writer.py

@@ -1,6 +1,6 @@
+from collections.abc import Iterator
 from pathlib import Path
 from tempfile import TemporaryDirectory
-from typing import Iterator, List
 from unittest import mock
 
 from xsdata.codegen.exceptions import CodegenError
@@ -13,7 +13,7 @@
 
 
 class NoneGenerator(AbstractGenerator):
-    def render(self, classes: List[Class]) -> Iterator[GeneratorResult]:
+    def render(self, classes: list[Class]) -> Iterator[GeneratorResult]:
         pass
 
 

tests/conftest.py

@@ -1,5 +1,4 @@
 from pathlib import Path
-from typing import Type
 
 from lxml import etree
 
@@ -13,7 +12,7 @@
 from xsdata.formats.dataclass.serializers.config import SerializerConfig
 
 
-def validate_bindings(schema: Path, clazz: Type):
+def validate_bindings(schema: Path, clazz: type):
     __tracebackhide__ = True
 
     sample = schema.parent.joinpath("sample.xml")

tests/fixtures/artists/metadata.py

@@ -1,5 +1,5 @@
 from dataclasses import dataclass, field
-from typing import List, Optional, Union
+from typing import Optional, Union
 
 from xsdata.models.datatype import XmlDate, XmlPeriod
 
@@ -111,7 +111,7 @@ class Meta:
         name = "ipi-list"
         namespace = "http://musicbrainz.org/ns/mmd-2.0#"
 
-    ipi: List[str] = field(
+    ipi: list[str] = field(
         default_factory=list,
         metadata={
             "type": "Element",
@@ -126,7 +126,7 @@ class Meta:
         name = "isni-list"
         namespace = "http://musicbrainz.org/ns/mmd-2.0#"
 
-    isni: List[str] = field(
+    isni: list[str] = field(
         default_factory=list,
         metadata={
             "type": "Element",
@@ -207,7 +207,7 @@ class Meta:
             "required": True,
         },
     )
-    alias: List[Alias] = field(
+    alias: list[Alias] = field(
         default_factory=list,
         metadata={
             "type": "Element",

tests/fixtures/books/books.py

@@ -1,5 +1,5 @@
 from dataclasses import dataclass, field
-from typing import List, Optional
+from typing import Optional
 
 from xsdata.models.datatype import XmlDate
 
@@ -87,7 +87,7 @@ class BookForm:
 
 @dataclass
 class BooksForm:
-    book: List[BookForm] = field(
+    book: list[BookForm] = field(
         default_factory=list,
         metadata={
             "type": "Element",

tests/fixtures/compound/models.py

@@ -1,5 +1,5 @@
 from dataclasses import dataclass, field
-from typing import List, Union
+from typing import Union
 
 
 @dataclass
@@ -35,7 +35,7 @@ class Root:
     class Meta:
         name = "root"
 
-    alpha_or_bravo_or_charlie: List[Union[Alpha, Bravo, List[str]]] = field(
+    alpha_or_bravo_or_charlie: list[Union[Alpha, Bravo, list[str]]] = field(
         default_factory=list,
         metadata={
             "type": "Elements",
@@ -50,7 +50,7 @@ class Meta:
                 },
                 {
                     "name": "charlie",
-                    "type": List[str],
+                    "type": list[str],
                     "namespace": "",
                     "default_factory": list,
                     "tokens": True,

tests/fixtures/dtd/models/complete_example.py

@@ -1,6 +1,6 @@
 from dataclasses import dataclass, field
 from enum import Enum
-from typing import List, Optional
+from typing import Optional
 
 
 @dataclass
@@ -60,7 +60,7 @@ class Title:
 
 @dataclass
 class Tags:
-    tag: List[Tag] = field(
+    tag: list[Tag] = field(
         default_factory=list,
         metadata={
             "name": "Tag",
@@ -100,14 +100,14 @@ class Post:
             "required": True,
         },
     )
-    origin: List[Origin] = field(
+    origin: list[Origin] = field(
         default_factory=list,
         metadata={
             "name": "Origin",
             "type": "Element",
         },
     )
-    source: List[Source] = field(
+    source: list[Source] = field(
         default_factory=list,
         metadata={
             "name": "Source",
@@ -142,7 +142,7 @@ class Post:
 
 @dataclass
 class Blog:
-    post: List[Post] = field(
+    post: list[Post] = field(
         default_factory=list,
         metadata={
             "name": "Post",

tests/fixtures/models.py

@@ -8,8 +8,6 @@
 from typing import Union
 from xml.etree.ElementTree import QName
 
-from xsdata.utils.constants import return_true
-
 __NAMESPACE__ = "xsdata"
 
 

tests/fixtures/primer/order.py

@@ -1,6 +1,6 @@
 from dataclasses import dataclass, field
 from decimal import Decimal
-from typing import List, Optional
+from typing import Optional
 
 from xsdata.models.datatype import XmlDate
 
@@ -74,7 +74,7 @@ class Meta:
 
 @dataclass
 class Items:
-    item: List["Items.Item"] = field(
+    item: list["Items.Item"] = field(
         default_factory=list,
         metadata={
             "type": "Element",

tests/fixtures/series/series.py

@@ -1,5 +1,5 @@
 from dataclasses import dataclass, field
-from typing import List, Optional
+from typing import Optional
 
 from xsdata.models.datatype import XmlDate
 
@@ -119,7 +119,7 @@ class Meta:
             "required": True,
         },
     )
-    days: List[str] = field(
+    days: list[str] = field(
         default_factory=list,
         metadata={
             "type": "Element",
@@ -231,7 +231,7 @@ class Meta:
             "required": True,
         },
     )
-    genres: List[str] = field(
+    genres: list[str] = field(
         default_factory=list,
         metadata={
             "type": "Element",

tests/fixtures/stripe/models/balance.py

@@ -1,5 +1,5 @@
 from dataclasses import dataclass, field
-from typing import Optional, Tuple
+from typing import Optional
 
 
 @dataclass(order=True, frozen=True)
@@ -113,14 +113,14 @@ class Meta:
             "required": True,
         },
     )
-    available: Tuple[Available, ...] = field(
+    available: tuple[Available, ...] = field(
         default_factory=tuple,
         metadata={
             "type": "Element",
             "min_occurs": 1,
         },
     )
-    connect_reserved: Tuple[ConnectReserved, ...] = field(
+    connect_reserved: tuple[ConnectReserved, ...] = field(
         default_factory=tuple,
         metadata={
             "type": "Element",
@@ -134,7 +134,7 @@ class Meta:
             "required": True,
         },
     )
-    pending: Tuple[Pending, ...] = field(
+    pending: tuple[Pending, ...] = field(
         default_factory=tuple,
         metadata={
             "type": "Element",

tests/fixtures/wrapper/models.py

@@ -1,5 +1,5 @@
 from dataclasses import dataclass, field
-from typing import List, Optional
+from typing import Optional
 
 __NAMESPACE__ = "xsdata"
 
@@ -25,7 +25,7 @@ class Meta:
         name = "bravos"
         namespace = "xsdata"
 
-    bravo: List[int] = field(
+    bravo: list[int] = field(
         default_factory=list,
         metadata={
             "type": "Element",
@@ -60,7 +60,7 @@ class Meta:
         name = "charlies"
         namespace = "xsdata"
 
-    charlie: List[Charlie] = field(
+    charlie: list[Charlie] = field(
         default_factory=list,
         metadata={
             "type": "Element",
@@ -83,15 +83,15 @@ class Meta:
             "required": True,
         },
     )
-    bravo: List[int] = field(
+    bravo: list[int] = field(
         default_factory=list,
         metadata={
             "wrapper": "bravos",
             "type": "Element",
             "min_occurs": 1,
         },
     )
-    charlie: List[Charlie] = field(
+    charlie: list[Charlie] = field(
         default_factory=list,
         metadata={
             "wrapper": "charlies",