Replace black/flake with ruffs

.pre-commit-config.yaml

@@ -1,40 +1,19 @@
 exclude: tests/fixtures
 
 repos:
-  - repo: https://github.com/asottile/pyupgrade
-    rev: v3.15.0
-    hooks:
-      - id: pyupgrade
-        args: [ --py38-plus ]
-  - repo: https://github.com/asottile/reorder_python_imports
-    rev: v3.12.0
-    hooks:
-      - id: reorder-python-imports
-  - repo: https://github.com/ambv/black
-    rev: 23.12.0
-    hooks:
-      - id: black
-  - repo: https://github.com/PyCQA/autoflake
-    rev: v2.2.1
-    hooks:
-      - id: autoflake
-  - repo: https://github.com/PyCQA/flake8
-    rev: 6.1.0
-    hooks:
-      - id: flake8
-        additional_dependencies: [
-          flake8-bugbear,
-          flake8-annotations,
-          flake8-comprehensions,
-        ]
-        args: [ "--suppress-none-returning" ]
-
   - repo: https://github.com/pre-commit/pre-commit-hooks
     rev: v4.5.0
     hooks:
       - id: trailing-whitespace
       - id: end-of-file-fixer
       - id: debug-statements
+  - repo: https://github.com/astral-sh/ruff-pre-commit
+    rev: v0.1.8
+    hooks:
+      - id: ruff
+        args: [ --fix ]
+      - id: ruff-format
+
   - repo: https://github.com/PyCQA/docformatter
     rev: v1.7.3
     hooks:
@@ -52,7 +31,7 @@ repos:
           - types-click
           - types-docutils
           - types-toposort
-        args: [ "--check-untyped-defs", "--ignore-missing-imports"]
+        args: [ "--check-untyped-defs", "--ignore-missing-imports" ]
   - repo: https://github.com/PyCQA/doc8
     rev: v1.1.1
     hooks:

benchmark.py

@@ -3,15 +3,15 @@
 from timeit import Timer
 
 from tests import xsdata_temp_dir
-from tests.integration.benchmarks.utils import make_books
-from tests.integration.benchmarks.utils import parse
-from tests.integration.benchmarks.utils import parse_json
-from tests.integration.benchmarks.utils import write
-from tests.integration.benchmarks.utils import write_json
-from xsdata.formats.dataclass.parsers import handlers
-from xsdata.formats.dataclass.parsers import JsonParser
-from xsdata.formats.dataclass.serializers import JsonSerializer
-from xsdata.formats.dataclass.serializers import writers
+from tests.integration.benchmarks.utils import (
+    make_books,
+    parse,
+    parse_json,
+    write,
+    write_json,
+)
+from xsdata.formats.dataclass.parsers import JsonParser, handlers
+from xsdata.formats.dataclass.serializers import JsonSerializer, writers
 
 if __name__ == "__main__":
     components = [

docs/_ext/xsdatadocs.py

@@ -1,19 +1,13 @@
 import shlex
 import subprocess
-from typing import Any
-from typing import Dict
-from typing import List
-from typing import Tuple
-from typing import TYPE_CHECKING
+from typing import TYPE_CHECKING, Any, Dict, List, Tuple
 
 from docutils import nodes
-from docutils.nodes import Element
-from docutils.nodes import Node
+from docutils.nodes import Element, Node
 from docutils.parsers.rst import directives  # type: ignore
 from sphinx.directives.code import container_wrapper
 from sphinx.locale import __
-from sphinx.util import logging
-from sphinx.util import parselinenos
+from sphinx.util import logging, parselinenos
 from sphinx.util.docutils import SphinxDirective
 from sphinx.util.typing import OptionSpec
 

pyproject.toml

@@ -76,6 +76,47 @@ license-files = ["LICENSE"]
 [tool.setuptools.dynamic]
 version = {attr = "xsdata.__version__"}
 
+[tool.ruff]
+target-version = "py38"
+
+select = [
+    # pycodestyle
+    "E",
+    # Pyflakes
+    "F",
+    # pyupgrade
+    "UP",
+    # flake8-bugbear
+    "B",
+    # flake8-simplify
+    "SIM",
+    # flake8-annotations
+    "ANN",
+    # flake8-comprehensions
+    "C4",
+    # isort
+    "I",
+]
+
+ignore = [
+    "ANN101",
+    "ANN102",
+    "ANN201",
+    "ANN202",
+    "ANN204",
+    "ANN206",
+    "ANN401",
+    "E203",
+    "B028",
+    "B904",
+]
+
+isort = { known-first-party = ['xsdata', 'tests'] }
+
+[tool.ruff.lint.per-file-ignores]
+"**/{tests}/*" = ["ANN001", "ANN002", "ANN003", "E501", "B018"]
+
+
 [tool.doc8]
 max-line-length = 88
 

tests/__init__.py

@@ -1,7 +1,6 @@
 import tempfile
 from pathlib import Path
 
-
 root = Path(__file__).parent.parent
 fixtures_dir = root.joinpath("tests/fixtures")
 xsdata_temp_dir = Path(tempfile.gettempdir()).joinpath("xsdata")

tests/codegen/handlers/test_add_attribute_substitutions.py

@@ -6,10 +6,12 @@
 from xsdata.models.config import GeneratorConfig
 from xsdata.models.enums import Tag
 from xsdata.utils.namespaces import build_qname
-from xsdata.utils.testing import AttrFactory
-from xsdata.utils.testing import AttrTypeFactory
-from xsdata.utils.testing import ClassFactory
-from xsdata.utils.testing import FactoryTestCase
+from xsdata.utils.testing import (
+    AttrFactory,
+    AttrTypeFactory,
+    ClassFactory,
+    FactoryTestCase,
+)
 
 
 class AddAttributeSubstitutionsTests(FactoryTestCase):

tests/codegen/handlers/test_calculate_attribute_paths.py

@@ -1,8 +1,6 @@
 from xsdata.codegen.handlers import CalculateAttributePaths
 from xsdata.codegen.models import Restrictions
-from xsdata.utils.testing import AttrFactory
-from xsdata.utils.testing import ClassFactory
-from xsdata.utils.testing import FactoryTestCase
+from xsdata.utils.testing import AttrFactory, ClassFactory, FactoryTestCase
 
 
 class CalculateAttributePathsTests(FactoryTestCase):

tests/codegen/handlers/test_create_compound_fields.py

@@ -6,10 +6,12 @@
 from xsdata.models.config import GeneratorConfig
 from xsdata.models.enums import Tag
 from xsdata.utils import collections
-from xsdata.utils.testing import AttrFactory
-from xsdata.utils.testing import ClassFactory
-from xsdata.utils.testing import ExtensionFactory
-from xsdata.utils.testing import FactoryTestCase
+from xsdata.utils.testing import (
+    AttrFactory,
+    ClassFactory,
+    ExtensionFactory,
+    FactoryTestCase,
+)
 
 
 class CreateCompoundFieldsTests(FactoryTestCase):

tests/codegen/handlers/test_designate_class_packages.py

@@ -1,14 +1,14 @@
 from xsdata.codegen.container import ClassContainer
 from xsdata.codegen.handlers import DesignateClassPackages
 from xsdata.exceptions import CodeGenerationError
-from xsdata.models.config import GeneratorConfig
-from xsdata.models.config import GeneratorSubstitution
-from xsdata.models.config import ObjectType
-from xsdata.models.config import StructureStyle
+from xsdata.models.config import (
+    GeneratorConfig,
+    GeneratorSubstitution,
+    ObjectType,
+    StructureStyle,
+)
 from xsdata.models.enums import Namespace
-from xsdata.utils.testing import AttrFactory
-from xsdata.utils.testing import ClassFactory
-from xsdata.utils.testing import FactoryTestCase
+from xsdata.utils.testing import AttrFactory, ClassFactory, FactoryTestCase
 
 
 class DesignateClassPackagesTests(FactoryTestCase):

tests/codegen/handlers/test_filter_classes.py

@@ -2,12 +2,9 @@
 
 from xsdata.codegen.container import ClassContainer
 from xsdata.codegen.handlers import FilterClasses
-from xsdata.models.config import ClassFilterStrategy
-from xsdata.models.config import GeneratorConfig
+from xsdata.models.config import ClassFilterStrategy, GeneratorConfig
 from xsdata.models.enums import Tag
-from xsdata.utils.testing import AttrFactory
-from xsdata.utils.testing import ClassFactory
-from xsdata.utils.testing import FactoryTestCase
+from xsdata.utils.testing import AttrFactory, ClassFactory, FactoryTestCase
 
 
 class FilterClassesTests(FactoryTestCase):

tests/codegen/handlers/test_flatten_attribute_groups.py

@@ -2,15 +2,12 @@
 
 from xsdata.codegen.container import ClassContainer
 from xsdata.codegen.handlers import FlattenAttributeGroups
-from xsdata.codegen.models import Attr
-from xsdata.codegen.models import Status
+from xsdata.codegen.models import Attr, Status
 from xsdata.codegen.utils import ClassUtils
 from xsdata.exceptions import AnalyzerValueError
 from xsdata.models.config import GeneratorConfig
 from xsdata.models.enums import Tag
-from xsdata.utils.testing import AttrFactory
-from xsdata.utils.testing import ClassFactory
-from xsdata.utils.testing import FactoryTestCase
+from xsdata.utils.testing import AttrFactory, ClassFactory, FactoryTestCase
 
 
 class FlattenAttributeGroupsTests(FactoryTestCase):

tests/codegen/handlers/test_flatten_class_extensions.py

@@ -3,17 +3,17 @@
 
 from xsdata.codegen.container import ClassContainer
 from xsdata.codegen.handlers import FlattenClassExtensions
-from xsdata.codegen.models import Restrictions
-from xsdata.codegen.models import Status
+from xsdata.codegen.models import Restrictions, Status
 from xsdata.codegen.utils import ClassUtils
 from xsdata.models.config import GeneratorConfig
-from xsdata.models.enums import DataType
-from xsdata.models.enums import Tag
-from xsdata.utils.testing import AttrFactory
-from xsdata.utils.testing import AttrTypeFactory
-from xsdata.utils.testing import ClassFactory
-from xsdata.utils.testing import ExtensionFactory
-from xsdata.utils.testing import FactoryTestCase
+from xsdata.models.enums import DataType, Tag
+from xsdata.utils.testing import (
+    AttrFactory,
+    AttrTypeFactory,
+    ClassFactory,
+    ExtensionFactory,
+    FactoryTestCase,
+)
 
 
 class FlattenClassExtensionsTests(FactoryTestCase):

tests/codegen/handlers/test_merge_attributes.py

@@ -1,10 +1,12 @@
 from xsdata.codegen.handlers import MergeAttributes
 from xsdata.codegen.models import Restrictions
 from xsdata.models.enums import DataType
-from xsdata.utils.testing import AttrFactory
-from xsdata.utils.testing import AttrTypeFactory
-from xsdata.utils.testing import ClassFactory
-from xsdata.utils.testing import FactoryTestCase
+from xsdata.utils.testing import (
+    AttrFactory,
+    AttrTypeFactory,
+    ClassFactory,
+    FactoryTestCase,
+)
 
 
 class MergeAttributesTests(FactoryTestCase):

tests/codegen/handlers/test_process_attributes_types.py

@@ -2,17 +2,16 @@
 
 from xsdata.codegen.container import ClassContainer
 from xsdata.codegen.handlers import ProcessAttributeTypes
-from xsdata.codegen.models import Class
-from xsdata.codegen.models import Restrictions
-from xsdata.codegen.models import Status
+from xsdata.codegen.models import Class, Restrictions, Status
 from xsdata.codegen.utils import ClassUtils
 from xsdata.models.config import GeneratorConfig
-from xsdata.models.enums import DataType
-from xsdata.models.enums import Tag
-from xsdata.utils.testing import AttrFactory
-from xsdata.utils.testing import AttrTypeFactory
-from xsdata.utils.testing import ClassFactory
-from xsdata.utils.testing import FactoryTestCase
+from xsdata.models.enums import DataType, Tag
+from xsdata.utils.testing import (
+    AttrFactory,
+    AttrTypeFactory,
+    ClassFactory,
+    FactoryTestCase,
+)
 
 
 class ProcessAttributeTypesTests(FactoryTestCase):

tests/codegen/handlers/test_process_mixed_content_class.py

@@ -2,11 +2,8 @@
 
 from xsdata.codegen.handlers import ProcessMixedContentClass
 from xsdata.codegen.models import Restrictions
-from xsdata.models.enums import DataType
-from xsdata.models.enums import NamespaceType
-from xsdata.utils.testing import AttrFactory
-from xsdata.utils.testing import ClassFactory
-from xsdata.utils.testing import FactoryTestCase
+from xsdata.models.enums import DataType, NamespaceType
+from xsdata.utils.testing import AttrFactory, ClassFactory, FactoryTestCase
 
 
 class ProcessMixedContentClassTests(FactoryTestCase):

tests/codegen/handlers/test_rename_duplicate_attributes.py

@@ -1,8 +1,6 @@
 from xsdata.codegen.handlers import RenameDuplicateAttributes
 from xsdata.models.enums import Tag
-from xsdata.utils.testing import AttrFactory
-from xsdata.utils.testing import ClassFactory
-from xsdata.utils.testing import FactoryTestCase
+from xsdata.utils.testing import AttrFactory, ClassFactory, FactoryTestCase
 
 
 class RenameDuplicateAttributesTests(FactoryTestCase):

tests/codegen/handlers/test_rename_duplicate_classes.py

@@ -2,14 +2,15 @@
 
 from xsdata.codegen.container import ClassContainer
 from xsdata.codegen.handlers import RenameDuplicateClasses
-from xsdata.models.config import GeneratorConfig
-from xsdata.models.config import StructureStyle
+from xsdata.models.config import GeneratorConfig, StructureStyle
 from xsdata.models.enums import Tag
-from xsdata.utils.testing import AttrFactory
-from xsdata.utils.testing import AttrTypeFactory
-from xsdata.utils.testing import ClassFactory
-from xsdata.utils.testing import ExtensionFactory
-from xsdata.utils.testing import FactoryTestCase
+from xsdata.utils.testing import (
+    AttrFactory,
+    AttrTypeFactory,
+    ClassFactory,
+    ExtensionFactory,
+    FactoryTestCase,
+)
 
 
 class RenameDuplicateClassesTests(FactoryTestCase):