Fixed xsdata 24 compatibillity (#73)

* Updated schema * Updated xsdata requirements * Updated conda * Updated xsdata dependency * Update build.sh * Update build.sh * Update meta.yaml * Update meta.yaml * Update build.sh * Update build.sh * Update meta.yaml * Update build.sh * Update meta.yaml * Update setup.py
ismrmrd · Apr 16, 2024 · 25e98e5 · 25e98e5
1 parent 41deff1
commit 25e98e5
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 12 deletions.
diff --git a/conda/meta.yaml b/conda/meta.yaml
@@ -10,23 +10,28 @@ source:
 requirements:
   build:
     - python {{ python }}
-    - numpy>=1.22.0
-    - h5py>=2.3
-    - nose>=1.0
-    - docformatter<=1.4
-    - xsdata>=22.2
-
+    - xsdata >=24.0
+    - setuptools
+    - wheel
+    - jinja2 >=2.11.0
+    - pip
+    
   run:
     - python
-    - xsdata>=22.2
     - numpy>=1.22.0
     - h5py>=2.3
-    - xsdata>=22.2
+    - xsdata>=24.0
 
 test:
+  imports:
+    - ismrmrd
   source_files:
     - tests
+  commands:
+    - pip check
+    - nosetests
   requires:
+    - pip
     - nose
 
 about:

diff --git a/ismrmrd/xsd/pyxb_compat.py b/ismrmrd/xsd/pyxb_compat.py
@@ -2,6 +2,7 @@
 
 from xsdata.formats.dataclass.parsers import XmlParser
 from xsdata.formats.dataclass.parsers.config import ParserConfig
+from xsdata.formats.dataclass.context import XmlContext
 
 from xsdata.formats.dataclass.serializers import XmlSerializer
 from xsdata.formats.dataclass.serializers.config import SerializerConfig
@@ -15,8 +16,8 @@ def CreateFromDocument(document):
 
 
 def ToXML(header: ismrmrdHeader , encoding='ascii'):
-    config = SerializerConfig(encoding=encoding,pretty_print=True)
-    serializer = XmlSerializer(config)
+    config = SerializerConfig(encoding=encoding,indent=' ')
+    serializer = XmlSerializer(config=config,context=XmlContext())
     return serializer.render(header,ns_map={"":"http://www.ismrm.org/ISMRMRD"})
 
 def ToDOM(header: ismrmrdHeader):

diff --git a/requirements.txt b/requirements.txt
@@ -3,4 +3,4 @@ nose==1.3.7
 numpy==1.22.0
 PyXB==1.2.6
 six==1.12.0
-xsdata==22.2
+xsdata==24.4
diff --git a/setup.py b/setup.py
@@ -58,7 +58,7 @@ def to_uri(filename):
 
 setup(
     name='ismrmrd',
-    version='1.14.0',
+    version='1.14.1',
     author='ISMRMRD Developers',
     description='Python implementation of the ISMRMRD',
     license='Public Domain',