Karsten Schöke pushed to branch master at Debian Med / pydicom
Commits: e475afad by Karsten Schöke at 2026-08-24T13:18:48+02:00 insert fix-fileset-uid-property-annotation to try fix FTBT again. - - - - - 5d7077ac by Karsten Schöke at 2026-08-24T16:42:09+02:00 Update changelog for 3.0.2-4 release - - - - - 3 changed files: - debian/changelog - + debian/patches/fix-fileset-uid-property-annotation.patch - debian/patches/series Changes: ===================================== debian/changelog ===================================== @@ -1,3 +1,9 @@ +pydicom (3.0.2-4) unstable; urgency=medium + + * insert fix-fileset-uid-property-annotation.patch to try fix FTBT again. + + -- Karsten Schöke <[email protected]> Mon, 24 Aug 2026 15:13:30 +0200 + pydicom (3.0.2-3) unstable; urgency=medium * Team upload. ===================================== debian/patches/fix-fileset-uid-property-annotation.patch ===================================== @@ -0,0 +1,58 @@ +From: =?utf-8?q?Karsten_Sch=C3=B6ke?= <[email protected]> +Date: Mon, 24 Aug 2026 16:37:39 +0200 +Subject: fix-fileset-uid-property-annotation with Python 3.14 +Python 3.14 may resolve the UID annotation of a property named UID to +the property object itself. This causes Sphinx autodoc to include the +property object's memory address in the generated documentation, +resulting in architecture-dependent documentation and FTBR failures. + +Use an explicitly qualified UID type for the affected UID properties +in FileSet and CoderBase to avoid the name collision. + +Forwarded: https://github.com/pydicom/pydicom/issues/2357 +--- + src/pydicom/fileset.py | 6 +++--- + src/pydicom/pixels/common.py | 3 ++- + 2 files changed, 5 insertions(+), 4 deletions(-) + +diff --git a/src/pydicom/fileset.py b/src/pydicom/fileset.py +index 01ad5e9..f6fb3a7 100644 +--- a/src/pydicom/fileset.py ++++ b/src/pydicom/fileset.py +@@ -2028,12 +2028,12 @@ class FileSet: + return "\n".join(s) + + @property +- def UID(self) -> UID: ++ def UID(self) -> sop.UID: + """Return the File-set's UID.""" +- return cast(UID, self._uid) ++ return cast(sop.UID, self._uid) + + @UID.setter +- def UID(self, uid: UID) -> None: ++ def UID(self, uid: sop.UID) -> None: + """Set the File-set UID. + + Parameters +diff --git a/src/pydicom/pixels/common.py b/src/pydicom/pixels/common.py +index 10a4a93..c403401 100644 +--- a/src/pydicom/pixels/common.py ++++ b/src/pydicom/pixels/common.py +@@ -7,6 +7,7 @@ from typing import TYPE_CHECKING, Any, TypedDict + + from pydicom.misc import warn_and_log + from pydicom.pixels.utils import as_pixel_options ++import pydicom.uid as sop + from pydicom.uid import UID + + if TYPE_CHECKING: # pragma: no cover +@@ -194,7 +195,7 @@ class CoderBase: + raise ValueError(f"Unable to remove '{label}', no such plugin'") + + @property +- def UID(self) -> UID: ++ def UID(self) -> sop.UID: + """Return the corresponding *Transfer Syntax UID* as :class:`~pydicom.uid.UID`.""" + return self._uid + ===================================== debian/patches/series ===================================== @@ -4,3 +4,4 @@ doc-conf.py-sphinx-use-local-inventory-references-fo.patch doc-conf.py-deactivate-performance-datafooter-in-doc.patch fix-example-for-reproducible-build.patch make-documentation-example-reproducible.patch +fix-fileset-uid-property-annotation.patch View it on GitLab: https://salsa.debian.org/med-team/pydicom/-/compare/1c19e71088c4970c9ab8e25411acbefc0cc598c8...5d7077ac6f4e057d78318b78f9b8579ec513a1c4 -- View it on GitLab: https://salsa.debian.org/med-team/pydicom/-/compare/1c19e71088c4970c9ab8e25411acbefc0cc598c8...5d7077ac6f4e057d78318b78f9b8579ec513a1c4 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
_______________________________________________ debian-med-commit mailing list [email protected] https://alioth-lists.debian.net/cgi-bin/mailman/listinfo/debian-med-commit
