From baf08f29b9f31e56b54b7053d08b0a642a87bed9 Mon Sep 17 00:00:00 2001 From: "David C. Hansen" Date: Thu, 23 Mar 2023 09:53:04 +0100 Subject: [PATCH 01/14] Updated schema --- schema/ismrmrd.xsd | 82 ++++++++++++++++++++++++++++++++-------------- setup.py | 2 +- 2 files changed, 59 insertions(+), 25 deletions(-) diff --git a/schema/ismrmrd.xsd b/schema/ismrmrd.xsd index d07adbe..78bf187 100644 --- a/schema/ismrmrd.xsd +++ b/schema/ismrmrd.xsd @@ -22,7 +22,7 @@ - + @@ -67,7 +67,7 @@ - + @@ -123,7 +123,6 @@ - @@ -134,13 +133,6 @@ - - - - - - - @@ -174,14 +166,6 @@ - - - - - - - - @@ -221,6 +205,7 @@ + @@ -233,22 +218,44 @@ - + + + - + + + + + + + + + + + + + + + + + + + + + - - - + + + @@ -295,6 +302,32 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -327,6 +360,7 @@ + @@ -349,4 +383,4 @@ - + \ No newline at end of file diff --git a/setup.py b/setup.py index 47324e4..6e4a1c8 100644 --- a/setup.py +++ b/setup.py @@ -58,7 +58,7 @@ def to_uri(filename): setup( name='ismrmrd', - version='1.13.1', + version='1.14.0', author='ISMRMRD Developers', description='Python implementation of the ISMRMRD', license='Public Domain', From 8829b403f4f1adabf14ca99aea911f23d0d753b6 Mon Sep 17 00:00:00 2001 From: "David C. Hansen" Date: Mon, 27 Mar 2023 19:44:31 +0200 Subject: [PATCH 02/14] Updated xsdata requirements --- setup.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/setup.py b/setup.py index 6e4a1c8..a104ca6 100644 --- a/setup.py +++ b/setup.py @@ -74,8 +74,8 @@ def to_uri(filename): 'Operating System :: OS Independent', 'Topic :: Scientific/Engineering :: Medical Science Apps.' ], - install_requires=['xsdata>=22.2', 'numpy>=1.22.0', 'h5py>=2.3'], - setup_requires=['nose>=1.0', 'xsdata[cli]>=22.2', 'jinja2 >= 2.11'], + install_requires=['xsdata>=22.12', 'numpy>=1.22.0', 'h5py>=2.3'], + setup_requires=['nose>=1.0', 'xsdata[cli]>=22.12', 'jinja2 >= 2.11'], test_suite='nose.collector', cmdclass={'build_py':my_build_py} ) From fb0124007982a9740adb9667477e314e5883fcae Mon Sep 17 00:00:00 2001 From: "David C. Hansen" Date: Mon, 27 Mar 2023 19:58:49 +0200 Subject: [PATCH 03/14] Updated conda --- conda/build.sh | 2 +- conda/meta.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/conda/build.sh b/conda/build.sh index 16796e3..b190fdf 100755 --- a/conda/build.sh +++ b/conda/build.sh @@ -1,5 +1,5 @@ #!/bin/bash set -euo pipefail - +pip install xsdata[cli] pip install . diff --git a/conda/meta.yaml b/conda/meta.yaml index f16e82b..1151e6e 100644 --- a/conda/meta.yaml +++ b/conda/meta.yaml @@ -13,13 +13,13 @@ requirements: - numpy>=1.22.0 - h5py>=2.3 - nose>=1.0 - - xsdata>=22.2 run: - python - xsdata>=22.2 - numpy>=1.22.0 - h5py>=2.3 + - xsdata >= 22.2 test: source_files: From 0408a5ad3176e42e892b4a1b82755aacb0a85e36 Mon Sep 17 00:00:00 2001 From: "David C. Hansen" Date: Sun, 7 Apr 2024 15:41:15 +0200 Subject: [PATCH 04/14] Updated xsdata dependency --- conda/meta.yaml | 3 +-- ismrmrd/xsd/pyxb_compat.py | 5 +++-- requirements.txt | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/conda/meta.yaml b/conda/meta.yaml index 7539868..2a1016b 100644 --- a/conda/meta.yaml +++ b/conda/meta.yaml @@ -18,10 +18,9 @@ requirements: run: - python - - xsdata>=22.2 - numpy>=1.22.0 - h5py>=2.3 - - xsdata >= 22.2 + - xsdata>=22.2 test: source_files: diff --git a/ismrmrd/xsd/pyxb_compat.py b/ismrmrd/xsd/pyxb_compat.py index c1bb69b..5310edc 100644 --- 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 index 956e28d..311eac9 100644 --- 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 \ No newline at end of file +xsdata==24.4 \ No newline at end of file From fae71b921b31b746822135cd054c042bcd9c729d Mon Sep 17 00:00:00 2001 From: David Christoffer Hansen Date: Mon, 8 Apr 2024 15:12:10 +0200 Subject: [PATCH 05/14] Update build.sh --- conda/build.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/conda/build.sh b/conda/build.sh index b190fdf..51ac1bd 100755 --- a/conda/build.sh +++ b/conda/build.sh @@ -1,5 +1,4 @@ #!/bin/bash set -euo pipefail -pip install xsdata[cli] pip install . From 67007b46416bdd49cbb83b40f2459d5028cb4864 Mon Sep 17 00:00:00 2001 From: David Christoffer Hansen Date: Tue, 9 Apr 2024 09:23:58 +0200 Subject: [PATCH 06/14] Update build.sh --- conda/build.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/conda/build.sh b/conda/build.sh index 51ac1bd..b190fdf 100755 --- a/conda/build.sh +++ b/conda/build.sh @@ -1,4 +1,5 @@ #!/bin/bash set -euo pipefail +pip install xsdata[cli] pip install . From ebe97f1c267d8894364177a85849a62462ac7928 Mon Sep 17 00:00:00 2001 From: David Christoffer Hansen Date: Tue, 9 Apr 2024 10:58:22 +0200 Subject: [PATCH 07/14] Update meta.yaml --- conda/meta.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/conda/meta.yaml b/conda/meta.yaml index 2a1016b..bc8bbd0 100644 --- a/conda/meta.yaml +++ b/conda/meta.yaml @@ -14,6 +14,7 @@ requirements: - h5py>=2.3 - nose>=1.0 - docformatter<=1.4 + - pip>=22.0 - xsdata>=22.2 run: @@ -36,4 +37,4 @@ about: Python interface and utilities for the ISMRM Raw Data (ISMRMRD a.k.a. MRD) format. dev_url: https://github.com/ismrmrd/ismrmrd-python doc_url: https://github.com/ismrmrd/ismrmrd-python - doc_source_url: https://github.com/ismrmrd/ismrmrd-python/blob/main/README.md \ No newline at end of file + doc_source_url: https://github.com/ismrmrd/ismrmrd-python/blob/main/README.md From bfc191c0a8094b7b953b0fb9da14fcdc1b1f747b Mon Sep 17 00:00:00 2001 From: David Christoffer Hansen Date: Tue, 9 Apr 2024 11:03:13 +0200 Subject: [PATCH 08/14] Update meta.yaml --- conda/meta.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/conda/meta.yaml b/conda/meta.yaml index bc8bbd0..9349ea0 100644 --- a/conda/meta.yaml +++ b/conda/meta.yaml @@ -15,7 +15,6 @@ requirements: - nose>=1.0 - docformatter<=1.4 - pip>=22.0 - - xsdata>=22.2 run: - python From 71c71f664870eb62b3687274b65182f3f98e6242 Mon Sep 17 00:00:00 2001 From: David Christoffer Hansen Date: Tue, 9 Apr 2024 11:50:02 +0200 Subject: [PATCH 09/14] Update build.sh --- conda/build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conda/build.sh b/conda/build.sh index b190fdf..22c8513 100755 --- a/conda/build.sh +++ b/conda/build.sh @@ -1,5 +1,5 @@ #!/bin/bash set -euo pipefail -pip install xsdata[cli] +python -m pip install xsdata[cli] pip install . From d6da9306c6183b7605557dc119e0591a485fafbc Mon Sep 17 00:00:00 2001 From: David Christoffer Hansen Date: Tue, 9 Apr 2024 12:10:45 +0200 Subject: [PATCH 10/14] Update build.sh --- conda/build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conda/build.sh b/conda/build.sh index 22c8513..dad476b 100755 --- a/conda/build.sh +++ b/conda/build.sh @@ -1,5 +1,5 @@ #!/bin/bash set -euo pipefail -python -m pip install xsdata[cli] +python -m pip install "xsdata[cli]" pip install . From e9c618dac1a11a5e4ebe693a313d3f7fa4978145 Mon Sep 17 00:00:00 2001 From: David Christoffer Hansen Date: Thu, 11 Apr 2024 15:41:27 +0200 Subject: [PATCH 11/14] Update meta.yaml --- conda/meta.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/conda/meta.yaml b/conda/meta.yaml index 9349ea0..7a97db3 100644 --- a/conda/meta.yaml +++ b/conda/meta.yaml @@ -14,13 +14,13 @@ requirements: - h5py>=2.3 - nose>=1.0 - docformatter<=1.4 - - pip>=22.0 + - xsdata >=24.0 run: - python - numpy>=1.22.0 - h5py>=2.3 - - xsdata>=22.2 + - xsdata>=24.0 test: source_files: From 3d34a290ac7ff6e1a6dd6f84eb88aec7ee6a240d Mon Sep 17 00:00:00 2001 From: David Christoffer Hansen Date: Thu, 11 Apr 2024 15:41:41 +0200 Subject: [PATCH 12/14] Update build.sh --- conda/build.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/conda/build.sh b/conda/build.sh index dad476b..51ac1bd 100755 --- a/conda/build.sh +++ b/conda/build.sh @@ -1,5 +1,4 @@ #!/bin/bash set -euo pipefail -python -m pip install "xsdata[cli]" pip install . From 9f28b1f4a4ee4b5f70f7ba43c5667b5d98201d3a Mon Sep 17 00:00:00 2001 From: David Christoffer Hansen Date: Thu, 11 Apr 2024 20:39:59 +0200 Subject: [PATCH 13/14] Update meta.yaml --- conda/meta.yaml | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/conda/meta.yaml b/conda/meta.yaml index 7a97db3..e33d45b 100644 --- a/conda/meta.yaml +++ b/conda/meta.yaml @@ -10,12 +10,12 @@ source: requirements: build: - python {{ python }} - - numpy>=1.22.0 - - h5py>=2.3 - - nose>=1.0 - - docformatter<=1.4 - xsdata >=24.0 - + - setuptools + - wheel + - jinja2 >=2.11.0 + - pip + run: - python - numpy>=1.22.0 @@ -23,9 +23,15 @@ requirements: - xsdata>=24.0 test: + imports: + - ismrmrd source_files: - tests + commands: + - pip check + - nosetests requires: + - pip - nose about: From 6c0041c62998b849b2849fff6f656928b746676b Mon Sep 17 00:00:00 2001 From: David Christoffer Hansen Date: Tue, 16 Apr 2024 08:49:59 +0200 Subject: [PATCH 14/14] Update setup.py --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index a104ca6..a7cd7d2 100644 --- 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',