[med-svn] [Git][med-team/pydicom][master] 2 commits: d/rules: Attempting to fix s390x test failures in a different way.

[Karsten Schöke (@karso)]

Karsten Schöke pushed to branch master at Debian Med / pydicom


Commits:
89a8021a by Karsten Schöke at 2026-10-20T13:26:41+02:00
d/rules: Attempting to fix s390x test failures in a different way.

- - - - -
a383da43 by Karsten Schöke at 2026-10-20T13:51:51+02:00
Update changelog for 3.0.2-9 release

- - - - -


2 changed files:

- debian/changelog
- debian/rules


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,10 @@
+pydicom (3.0.2-9) unstable; urgency=medium
+
+  * Team upload.
+  * d/rules: Attempting to fix s390x test failures in a different way.
+
+ -- Karsten Schöke <karsten.schoeke at geobasis-bb.de>  Tue, 20 Oct 2026 13:50:07 +0200
+
 pydicom (3.0.2-8) unstable; urgency=medium
 
   * Team upload.


=====================================
debian/rules
=====================================
@@ -4,20 +4,6 @@
 #export DH_VERBOSE=1
 export PYBUILD_NAME=pydicom
 
-# pydicom byte-order bugs on big-endian (s390x): set_pixel_data / pixel_array
-# and waveform generate_multiplex/multiplex_array don't byte-swap, so the
-# round-trip values are byte-swapped. Fine on little-endian -> deselect there
-# only. Upstream fix should make this block removable.
-DEB_HOST_ARCH_ENDIAN ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_ENDIAN)
-ifeq ($(DEB_HOST_ARCH_ENDIAN),big)
-export PYBUILD_TEST_PYTEST_ARGS := \
-    --deselect=tests/pixels/test_utils.py::TestSetPixelData::test_grayscale_16bit_signed \
-    --deselect=tests/test_waveform.py::TestHandlerGenerateMultiplex::test_as_raw \
-    --deselect=tests/test_waveform.py::TestHandlerGenerateMultiplex::test_not_as_raw \
-    --deselect=tests/test_waveform.py::TestHandlerMultiplexArray::test_as_raw \
-    --deselect=tests/test_waveform.py::TestHandlerMultiplexArray::test_not_as_raw
-endif
-
 export PYBUILD_AFTER_INSTALL=rm -fr {destdir}/usr/lib/python3*/dist-packages/${PYBUILD_NAME}/data/charset_files/FileInfo.txt; \
                      find {destdir}/usr/lib/python3*/dist-packages/${PYBUILD_NAME} -name 'README*' -delete
 
@@ -35,3 +21,16 @@ ifeq (,$(findstring nodoc, $(DEB_BUILD_PROFILES)))
 	cd doc; PYTHONPATH=$(CURDIR)/src sphinx-build -j1 -N -b html . $(CURDIR)/debian/python-$(PYBUILD_NAME)-doc/usr/share/doc/python-$(PYBUILD_NAME)-doc/html
 	find  $(CURDIR)/debian/python-$(PYBUILD_NAME)-doc/usr/share/doc/python-$(PYBUILD_NAME)-doc/html -type f -exec sed -i 's,$(CURDIR),,g' {} +
 endif
+
+# pydicom byte-order bugs on big-endian (s390x): set_pixel_data / pixel_array
+# and waveform generate_multiplex/multiplex_array don't byte-swap, so the
+# round-trip values are byte-swapped. Fine on little-endian -> deselect there
+# only. Upstream fix should make this block removable.
+execute_before_dh_auto_test:
+	@if [ "$$(dpkg-architecture -qDEB_HOST_ARCH_ENDIAN)" = "big" ] && ! grep -q "test_grayscale_16bit_signed" pytest.ini; then \
+	printf '\n    --deselect=tests/pixels/test_utils.py::TestSetPixelData::test_grayscale_16bit_signed\n' >> pytest.ini; \
+	printf '    --deselect=tests/test_waveform.py::TestHandlerGenerateMultiplex::test_as_raw\n' >> pytest.ini; \
+	printf '    --deselect=tests/test_waveform.py::TestHandlerGenerateMultiplex::test_not_as_raw\n' >> pytest.ini; \
+	printf '    --deselect=tests/test_waveform.py::TestHandlerMultiplexArray::test_as_raw\n' >> pytest.ini; \
+	printf '    --deselect=tests/test_waveform.py::TestHandlerMultiplexArray::test_not_as_raw\n' >> pytest.ini; \
+	fi



View it on GitLab: https://salsa.debian.org/med-team/pydicom/-/compare/cc618882a0f99c86c5820f21de190e096be93534...a383da436c35a9442ca08b0f17e751a9dc9ef84c

-- 
View it on GitLab: https://salsa.debian.org/med-team/pydicom/-/compare/cc618882a0f99c86c5820f21de190e096be93534...a383da436c35a9442ca08b0f17e751a9dc9ef84c
You're receiving this email because of your account on salsa.debian.org. Manage all notifications: https://salsa.debian.org/-/profile/notifications | Help: https://salsa.debian.org/help


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/debian-med-commit/attachments/20261020/5813cf94/attachment-0001.htm>