[med-svn] [Git][med-team/insighttoolkit][itk-4.y] 4 commits: add python3.10.patch to fix FTBFS with Python 3.10

[Étienne Mollier (@emollier)]

Étienne Mollier pushed to branch itk-4.y at Debian Med / insighttoolkit


Commits:
06340a9a by Étienne Mollier at 2022-04-02T10:27:27+02:00
add python3.10.patch to fix FTBFS with Python 3.10

Closes: #1008803

- - - - -
ea8004cb by Étienne Mollier at 2022-04-02T10:28:29+02:00
update changelog

- - - - -
e749ec05 by Étienne Mollier at 2022-04-04T02:04:15+02:00
d/rules: force PY_SITE_PACKAGES_PATH setting

This is necessary to work around a bug in the python path name
introduced by the distutils deprecation message.

- - - - -
e1b1027e by Étienne Mollier at 2022-04-04T02:09:47+02:00
ready changelog to upload to unstable

- - - - -


4 changed files:

- debian/changelog
- + debian/patches/python3.10.patch
- debian/patches/series
- debian/rules


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,11 @@
+insighttoolkit4 (4.13.3withdata-dfsg2-2) unstable; urgency=medium
+
+  * add python3.10.patch to fix FTBFS with Python 3.10 (Closes: #1008803)
+  * d/rules: force PY_SITE_PACKAGES_PATH setting; work around a bug introduced
+    by the distutils deprecation message.
+
+ -- Étienne Mollier <emollier at debian.org>  Mon, 04 Apr 2022 02:07:04 +0200
+
 insighttoolkit4 (4.13.3withdata-dfsg2-1) unstable; urgency=medium
 
   [ Andreas Tille ]


=====================================
debian/patches/python3.10.patch
=====================================
@@ -0,0 +1,47 @@
+Description: use collections.abc.Callable instead of collections.Callable
+ This fixes failure to build from source with Python 3.10.  The issue is
+ already fixed upstream in ITKv5, the patch is for the unmaintained ITKv4.
+Author: Étienne Mollier <emollier at debian.org>
+Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1008803
+Forwarded: not-needed
+Last-Update: 2022-04-02
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- insighttoolkit.orig/Modules/ThirdParty/pygccxml/src/pygccxml/declarations/scopedef.py
++++ insighttoolkit/Modules/ThirdParty/pygccxml/src/pygccxml/declarations/scopedef.py
+@@ -7,7 +7,7 @@
+ 
+ import time
+ import warnings
+-import collections
++import collections.abc
+ from . import algorithm
+ from . import templates
+ from . import declaration
+@@ -332,7 +332,7 @@
+ 
+     @staticmethod
+     def _build_operator_function(name, function):
+-        if isinstance(name, collections.Callable):
++        if isinstance(name, collections.abc.Callable):
+             return name
+         else:
+             return function
+@@ -345,7 +345,7 @@
+                 return 'operator ' + sym
+             else:
+                 return 'operator' + sym
+-        if isinstance(name, collections.Callable) and None is function:
++        if isinstance(name, collections.abc.Callable) and None is function:
+             name = None
+         if name:
+             if 'operator' not in name:
+@@ -368,7 +368,7 @@
+     @staticmethod
+     def __normalize_args(**keywds):
+         """implementation details"""
+-        if isinstance(keywds['name'], collections.Callable) and \
++        if isinstance(keywds['name'], collections.abc.Callable) and \
+                 None is keywds['function']:
+             keywds['function'] = keywds['name']
+             keywds['name'] = None


=====================================
debian/patches/series
=====================================
@@ -12,3 +12,4 @@ remove_gcc_version_test.patch
 python3.8.diff
 ignore_failing_test.patch
 gcc11.patch
+python3.10.patch


=====================================
debian/rules
=====================================
@@ -72,7 +72,8 @@ CMAKE_FLAGS = \
         -DITK_WRAP_covariant_vector_double:BOOL=ON \
         -DITK_WRAP_complex_double:BOOL=ON \
         -DITK_WRAPPING:BOOL=$(ENABLE_PYTHON) \
-        -DITK_WRAP_PYTHON:BOOL=$(ENABLE_PYTHON)
+        -DITK_WRAP_PYTHON:BOOL=$(ENABLE_PYTHON) \
+	-DPY_SITE_PACKAGES_PATH=/usr/lib/python$(PYVER)/dist-packages
 
 pkg_lib = libinsighttoolkit$(SOVERSION)
 pkg_dev = libinsighttoolkit$(VER_MAJOR)-dev



View it on GitLab: https://salsa.debian.org/med-team/insighttoolkit/-/compare/74521b3560c79232b65faeca534ad5408f9df417...e1b1027ecafdf5e6b96163ec76bc390ef7490fd6

-- 
View it on GitLab: https://salsa.debian.org/med-team/insighttoolkit/-/compare/74521b3560c79232b65faeca534ad5408f9df417...e1b1027ecafdf5e6b96163ec76bc390ef7490fd6
You're receiving this email because of your account on salsa.debian.org.


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