Control: tags 1000204 + pending Dear maintainer,
I've prepared an NMU for pyfai (versioned as 0.20.0+dfsg1-4.1) and uploaded it to DELAYED/5. Please feel free to tell me if I should delay it longer. Also filed as https://salsa.debian.org/science-team/pyfai/-/merge_requests/4 Regards, SR
diff -Nru pyfai-0.20.0+dfsg1/debian/changelog pyfai-0.20.0+dfsg1/debian/changelog --- pyfai-0.20.0+dfsg1/debian/changelog 2021-09-19 07:57:57.000000000 -0400 +++ pyfai-0.20.0+dfsg1/debian/changelog 2021-11-22 21:29:59.000000000 -0400 @@ -1,3 +1,10 @@ +pyfai (0.20.0+dfsg1-4.1) UNRELEASED; urgency=medium + + * Non-maintainer upload. + * Patch: Python 3.10 support, thanks Lukas Märdian. (Closes: #1000204) + + -- Stefano Rivera <stefa...@debian.org> Mon, 22 Nov 2021 21:29:59 -0400 + pyfai (0.20.0+dfsg1-4) unstable; urgency=medium * Bug fix: "Removal of the python3-*-dbg packages in sid/bookworm", diff -Nru pyfai-0.20.0+dfsg1/debian/patches/0009-Fix-collections.MutableSets-compat-with-python3.10.patch pyfai-0.20.0+dfsg1/debian/patches/0009-Fix-collections.MutableSets-compat-with-python3.10.patch --- pyfai-0.20.0+dfsg1/debian/patches/0009-Fix-collections.MutableSets-compat-with-python3.10.patch 1969-12-31 20:00:00.000000000 -0400 +++ pyfai-0.20.0+dfsg1/debian/patches/0009-Fix-collections.MutableSets-compat-with-python3.10.patch 2021-11-22 21:29:59.000000000 -0400 @@ -0,0 +1,45 @@ +From: Lukas Märdian <sl...@ubuntu.com> +Date: Mon, 22 Nov 2021 21:30:44 -0400 +Subject: Fix collections.MutableSets compat with python3.10 + +collections.MutableSet was deprecated a long time ago and removed with python3.10. +https://docs.python.org/3/whatsnew/3.10.html#removed +https://bugs.python.org/issue37324 + +Using the old class name leads to test failures such as this one: +====================================================================== +ERROR: test_import_all_modules (pyFAI.test.test_bug_regression.TestBugRegression) +Try to import every single module in the package +---------------------------------------------------------------------- +Traceback (most recent call last): + File "/<<BUILDDIR>>/pyfai-0.20.0+dfsg1/.pybuild/cpython3_3.10_pyfai/build/pyFAI/test/test_bug_regression.py", line 286, in test_import_all_modules + raise err + File "/<<BUILDDIR>>/pyfai-0.20.0+dfsg1/.pybuild/cpython3_3.10_pyfai/build/pyFAI/test/test_bug_regression.py", line 271, in test_import_all_modules + load_source(fqn, path) + File "/<<BUILDDIR>>/pyfai-0.20.0+dfsg1/.pybuild/cpython3_3.10_pyfai/build/pyFAI/test/test_bug_regression.py", line 78, in load_source + spec.loader.exec_module(module) + File "<frozen importlib._bootstrap_external>", line 883, in exec_module + File "<frozen importlib._bootstrap>", line 241, in _call_with_frames_removed + File "/<<BUILDDIR>>/pyfai-0.20.0+dfsg1/.pybuild/cpython3_3.10_pyfai/build/pyFAI/utils/orderedset.py", line 30, in <module> + class OrderedSet(collections.MutableSet): +AttributeError: module 'collections' has no attribute 'MutableSet' + +Origin: vendor, Ubuntu +Forwarded: https://github.com/silx-kit/pyFAI/pull/1588 +--- + pyFAI/utils/orderedset.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/pyFAI/utils/orderedset.py b/pyFAI/utils/orderedset.py +index de097cf..417490f 100644 +--- a/pyFAI/utils/orderedset.py ++++ b/pyFAI/utils/orderedset.py +@@ -27,7 +27,7 @@ + import collections + + +-class OrderedSet(collections.MutableSet): ++class OrderedSet(collections.abc.MutableSet): + + def __init__(self, iterable=None): + self.end = end = [] diff -Nru pyfai-0.20.0+dfsg1/debian/patches/series pyfai-0.20.0+dfsg1/debian/patches/series --- pyfai-0.20.0+dfsg1/debian/patches/series 2021-09-19 07:57:57.000000000 -0400 +++ pyfai-0.20.0+dfsg1/debian/patches/series 2021-11-22 21:29:59.000000000 -0400 @@ -6,3 +6,4 @@ 0006-fix-a-couple-of-test-failing-with-i386.patch 0007-cleaner-test.patch 0008-tunning.patch +0009-Fix-collections.MutableSets-compat-with-python3.10.patch
