Merge pull request #731 from tefra/fix-build

Fix build errors

.pre-commit-config.yaml

@@ -2,7 +2,7 @@ exclude: tests/fixtures
 
 repos:
   - repo: https://github.com/asottile/pyupgrade
-    rev: v3.3.0
+    rev: v3.3.1
     hooks:
       - id: pyupgrade
         args: [ --py37-plus ]
@@ -11,7 +11,7 @@ repos:
     hooks:
       - id: reorder-python-imports
   - repo: https://github.com/ambv/black
-    rev: 22.10.0
+    rev: 22.12.0
     hooks:
       - id: black
   - repo: https://github.com/PyCQA/autoflake
@@ -36,7 +36,7 @@ repos:
       - id: end-of-file-fixer
       - id: debug-statements
   - repo: https://github.com/myint/docformatter
-    rev: v1.5.0
+    rev: v1.5.1
     hooks:
       - id: docformatter
         args: [ "--in-place", "--pre-summary-newline" ]

CHANGES.rst

@@ -1,3 +1,9 @@
+22.12 (2022-12-17)
+------------------
+- Added option to ignore xml pattern restrictions `#727 <https://github.com/tefra/xsdata/pull/727>`_
+- Added globalns support via SerializerConfig `#724 <https://github.com/tefra/xsdata/pull/724>`_
+- Pinned docformatter version to v1.5.0 `#729 <https://github.com/tefra/xsdata/pull/729>`_
+
 22.11 (2022-11-06)
 ------------------
 - Added list wrapper for elements and primitive nodes `#710 <https://github.com/tefra/xsdata/pull/710>`_

README.rst

@@ -99,6 +99,8 @@ Features
 
 
 
-Changelog: 22.11 (2022-11-06)
+Changelog: 22.12 (2022-12-17)
 -----------------------------
-- Added list wrapper for elements and primitive nodes `#710 <https://github.com/tefra/xsdata/pull/710>`_
+- Added option to ignore xml pattern restrictions `#727 <https://github.com/tefra/xsdata/pull/727>`_
+- Added globalns support via SerializerConfig `#724 <https://github.com/tefra/xsdata/pull/724>`_
+- Pinned docformatter version to v1.5.0 `#729 <https://github.com/tefra/xsdata/pull/729>`_

tests/codegen/mappers/test_definitions.py

@@ -725,7 +725,6 @@ def test_build_message_class(self, mock_create_message_attributes):
         self.assertEqual(expected, actual)
 
     def test_get_or_create_inner_class(self):
-
         target = ClassFactory.create(
             location="foo", package=None, ns_map={"foo": "bar"}
         )
@@ -775,7 +774,6 @@ def test_map_port_type_message(self):
         self.assertEqual([expected], list(actual))
 
     def test_operation_namespace(self):
-
         self.assertIsNone(DefinitionsMapper.operation_namespace({}))
         self.assertIsNone(DefinitionsMapper.operation_namespace({"transport": "foo"}))
         self.assertEqual(

tests/codegen/models/test_attr_type.py

@@ -4,7 +4,6 @@
 
 class AttrTypeTests(FactoryTestCase):
     def test_property_is_dependency(self):
-
         attr_type = AttrTypeFactory.create(forward=True, native=True, circular=True)
         self.assertFalse(attr_type.is_dependency(False))
 

tests/codegen/models/test_class.py

@@ -187,7 +187,6 @@ def test_property_references(self):
         self.assertEqual(list(range(1, 7)), list(obj.references))
 
     def test_property_target_module(self):
-
         obj = ClassFactory.create(module=None, package=None)
         with self.assertRaises(CodeGenerationError) as cm:
             obj.target_module

tests/codegen/test_utils.py

@@ -52,7 +52,6 @@ def test_clean_inner_classes(self, mock_is_orphan_inner):
         self.assertEqual(survivor, target.inner[0])
 
     def test_is_orphan_inner(self):
-
         inner = ClassFactory.create(qname="thug")
         target = ClassFactory.create(
             attrs=[

tests/formats/dataclass/parsers/test_json.py

@@ -326,7 +326,6 @@ def test_bind_derived_value_with_choice_var(self):
         )
 
     def test_bind_wildcard_dataclass(self):
-
         data = {"a": None, "wildcard": {"x": 1}}
         expected = ExtendedType(wildcard=TypeA(x=1))
         self.assertEqual(expected, self.parser.bind_dataclass(data, ExtendedType))

tests/formats/dataclass/parsers/test_mixins.py

@@ -30,7 +30,6 @@ def test_parse(self):
         self.assertEqual({"brk": "urn:books"}, self.parser.ns_map)
 
     def test_parse_with_unhandled_event(self):
-
         with self.assertRaises(XmlHandlerError) as cm:
             self.parser.parse([("reverse", "")], Books)
 

tests/formats/dataclass/serializers/test_mixins.py

@@ -13,7 +13,6 @@
 
 
 class XmlWriterImpl(XmlWriter):
-
     __slots__ = ()
 
     def __init__(self, config: SerializerConfig, output: TextIO, ns_map: Dict):

tests/formats/dataclass/serializers/test_xml.py

@@ -626,7 +626,6 @@ def test_next_attribute(self):
         self.assertEqual(expected, list(actual))
 
     def test_render_mixed_content(self):
-
         obj = Paragraph()
         obj.content.append(AnyElement(qname="b", text="Mr."))
         obj.content.append(Span("chris"))

tests/formats/test_converter.py

@@ -1,3 +1,4 @@
+import sys
 import warnings
 from datetime import date
 from datetime import datetime
@@ -8,6 +9,8 @@
 from unittest import TestCase
 from xml.etree.ElementTree import QName
 
+import pytest
+
 from tests.fixtures.datatypes import Telephone
 from xsdata.exceptions import ConverterError
 from xsdata.formats.converter import Converter
@@ -212,7 +215,6 @@ def test_serialize_with_base64_format(self):
         self.assertEqual("MS0yLTM=", output)
 
     def test_serialize_raises_exception(self):
-
         with self.assertRaises(ConverterError) as cm:
             self.converter.deserialize(1, format="foo")
 
@@ -359,6 +361,10 @@ class EnumConverterTests(TestCase):
     def setUp(self):
         self.converter = converter.type_converter(Enum)
 
+    @pytest.mark.skipif(
+        sys.version_info == (3, 11, 1, "final", 0),
+        reason="https://github.com/python/cpython/issues/100098",
+    )
     def test_deserialize(self):
         convert = self.converter.deserialize
         self.assertEqual(EnumA.C, convert("2.1", data_type=EnumA))

tests/models/enums/test_datatype.py

@@ -35,7 +35,6 @@ def test_from_value_float(self):
         self.assertEqual(DataType.DOUBLE, DataType.from_value(3.402823467e38))
 
     def test_from_value_period(self):
-
         g_day = XmlPeriod("---20-02:44")
         self.assertEqual(DataType.G_DAY, DataType.from_value(g_day))
 

tests/models/test_config.py

@@ -128,7 +128,6 @@ def test_read_with_wrong_value(self):
             GeneratorConfig.read(file_path)
 
     def test_format_with_invalid_state(self):
-
         with self.assertRaises(GeneratorConfigError) as cm:
             OutputFormat(eq=False, order=True)
 

tests/models/test_datatype.py

@@ -417,7 +417,6 @@ def test_properties(self):
         self.assertFalse(duration.negative)
 
     def test_init_valid(self):
-
         fixtures = {
             "P2Y6M5DT12H35M30.5S": {
                 "days": 5,
@@ -497,7 +496,6 @@ def test_properties(self):
         self.assertEqual(-164, period.offset)
 
     def test_init_valid(self):
-
         fixtures = {
             "--05---05:00": {"month": 5, "offset": -300},
             "---01 ": {"day": 1},

tests/utils/test_objects.py

@@ -6,7 +6,6 @@
 
 class ObjectsTests(TestCase):
     def test_update(self):
-
         obj = SimpleNamespace()
         obj.foo = SimpleNamespace()
         obj.foo.bar = 2

xsdata/__init__.py

@@ -1 +1 @@
-__version__ = "22.11"
+__version__ = "22.12"

xsdata/codegen/container.py

@@ -38,7 +38,6 @@ class Steps:
 
 
 class ClassContainer(ContainerInterface):
-
     __slots__ = ("data", "processors")
 
     def __init__(self, config: GeneratorConfig):

xsdata/codegen/handlers/validate_attributes_overrides.py

@@ -24,7 +24,6 @@ class ValidateAttributesOverrides(RelativeHandlerInterface):
     __slots__ = ()
 
     def process(self, target: Class):
-
         base_attrs_map = self.base_attrs_map(target)
         for attr in list(target.attrs):
             base_attrs = base_attrs_map.get(attr.slug)

xsdata/codegen/resolver.py

@@ -15,7 +15,6 @@
 
 
 class DependenciesResolver:
-
     __slots__ = "packages", "aliases", "imports", "class_list", "class_map", "package"
 
     def __init__(self, packages: Dict[str, str]):

xsdata/formats/converter.py

@@ -495,7 +495,6 @@ def deserialize(self, value: Any, **kwargs: Any) -> datetime:
 
 
 class ProxyConverter(Converter):
-
     __slots__ = ("factory",)
 
     def __init__(self, factory: Callable):

xsdata/formats/dataclass/compat.py

@@ -16,7 +16,6 @@
 
 
 class ClassType(abc.ABC):
-
     __slots__ = ()
 
     @property
@@ -106,7 +105,6 @@ def get_type(self, name: str) -> ClassType:
 
 
 class Dataclasses(ClassType):
-
     __slots__ = ()
 
     @property

xsdata/formats/dataclass/filters.py

@@ -28,7 +28,6 @@
 
 
 class Filters:
-
     DEFAULT_KEY = "default"
     FACTORY_KEY = "default_factory"
     UNESCAPED_DBL_QUOTE_REGEX = re.compile(r"([^\\])\"")

xsdata/formats/dataclass/models/builders.py

@@ -234,7 +234,6 @@ def default_xml_type(self, clazz: Type) -> str:
 
 
 class XmlVarBuilder:
-
     __slots__ = (
         "class_type",
         "default_xml_type",

xsdata/formats/dataclass/transports.py

@@ -6,7 +6,6 @@
 
 
 class Transport(abc.ABC):
-
     __slots__ = ()
 
     @abc.abstractmethod

xsdata/models/xsd.py

@@ -270,7 +270,6 @@ def real_name(self) -> str:
 
     @property
     def attr_types(self) -> Iterator[str]:
-
         for simple_type in self.simple_types:
             yield from simple_type.attr_types
 

xsdata/utils/dates.py

@@ -231,7 +231,6 @@ def parse_fixed_digits(self, max_digits: int) -> int:
         return int(self.value[start : self.vidx].ljust(just, "0"))
 
     def parse_offset(self) -> Optional[int]:
-
         if not self.has_more():
             return None