[Pkg-privacy-commits] [Git][pkg-privacy-team/mat2][master] Backport upstream fix for FTBFS with Python 3.14
Georg Faerber (@georg)
georg at debian.org
Tue Jul 14 08:28:02 BST 2026
Georg Faerber pushed to branch master at Privacy Maintainers / mat2
Commits:
0a01597f by Georg Faerber at 2026-07-14T07:27:37+00:00
Backport upstream fix for FTBFS with Python 3.14
Credits to Adrian Bunk <bunk at debian.org>
- - - - -
4 changed files:
- debian/changelog
- + debian/patches/0001-Improve-the-testsuite-s-portability.patch
- + debian/patches/0002-Fix-test_climat2-failure-on-Python-3.15.patch
- debian/patches/series
Changes:
=====================================
debian/changelog
=====================================
@@ -1,3 +1,11 @@
+mat2 (0.14.0-2.1) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Backport upstream fix for FTBFS with Python 3.14.
+ (Closes: #1140946)
+
+ -- Adrian Bunk <bunk at debian.org> Sun, 05 Jul 2026 18:15:20 +0300
+
mat2 (0.14.0-2) unstable; urgency=medium
[Jeremy Bícha]
=====================================
debian/patches/0001-Improve-the-testsuite-s-portability.patch
=====================================
@@ -0,0 +1,47 @@
+From 1fbc68289988a05592e324a1b6bb340c42c0fc75 Mon Sep 17 00:00:00 2001
+From: jvoisin <julien.voisin at dustri.org>
+Date: Fri, 21 Nov 2025 16:59:32 +0100
+Subject: Improve the testsuite's portability
+
+Small terminal sizes might split the cli's help message on odd places.
+
+This should close #26
+---
+ tests/test_climat2.py | 11 +++++++----
+ 1 file changed, 7 insertions(+), 4 deletions(-)
+
+diff --git a/tests/test_climat2.py b/tests/test_climat2.py
+index aaf715e..654dbb0 100644
+--- a/tests/test_climat2.py
++++ b/tests/test_climat2.py
+@@ -24,9 +24,11 @@ class TestHelp(unittest.TestCase):
+ self.assertIn(b'mat2 [-h] [-V]', stdout)
+ self.assertIn(b'[--unknown-members policy]', stdout)
+ self.assertIn(b'[--inplace]', stdout)
+- self.assertIn(b' [-v] [-l]', stdout)
++ self.assertIn(b'[-v]', stdout)
++ self.assertIn(b'[-l]', stdout)
+ self.assertIn(b'[--check-dependencies]', stdout)
+- self.assertIn(b'[-L | -s]', stdout)
++ self.assertIn(b'[-L', stdout)
++ self.assertIn(b'-s]', stdout)
+ self.assertIn(b'[files ...]', stdout)
+
+ def test_no_arg(self):
+@@ -35,10 +37,11 @@ class TestHelp(unittest.TestCase):
+ self.assertIn(b'mat2 [-h] [-V]', stdout)
+ self.assertIn(b'[--unknown-members policy]', stdout)
+ self.assertIn(b'[--inplace]', stdout)
+- self.assertIn(b' [-v]', stdout)
++ self.assertIn(b'[-v]', stdout)
+ self.assertIn(b'[-l]', stdout)
+ self.assertIn(b'[--check-dependencies]', stdout)
+- self.assertIn(b'[-L | -s]', stdout)
++ self.assertIn(b'[-L', stdout)
++ self.assertIn(b'-s]', stdout)
+ self.assertIn(b'[files ...]', stdout)
+
+
+--
+2.47.3
+
=====================================
debian/patches/0002-Fix-test_climat2-failure-on-Python-3.15.patch
=====================================
@@ -0,0 +1,55 @@
+From c258940ca5dff83cf423d4c890d6af82b8803a97 Mon Sep 17 00:00:00 2001
+From: Emir Akdag <infraw.linux at proton.me>
+Date: Sun, 21 Dec 2025 20:54:26 +0300
+Subject: Fix test_climat2 failure on Python 3.15
+
+Python 3.15 changed argparse output formatting by removing brackets
+around options.
+
+Relax the assertions to ensure compatibility with both old and new
+Python versions.
+---
+ tests/test_climat2.py | 16 ++++++++--------
+ 1 file changed, 8 insertions(+), 8 deletions(-)
+
+diff --git a/tests/test_climat2.py b/tests/test_climat2.py
+index 654dbb0..405b837 100644
+--- a/tests/test_climat2.py
++++ b/tests/test_climat2.py
+@@ -24,12 +24,12 @@ class TestHelp(unittest.TestCase):
+ self.assertIn(b'mat2 [-h] [-V]', stdout)
+ self.assertIn(b'[--unknown-members policy]', stdout)
+ self.assertIn(b'[--inplace]', stdout)
+- self.assertIn(b'[-v]', stdout)
+- self.assertIn(b'[-l]', stdout)
+- self.assertIn(b'[--check-dependencies]', stdout)
++ self.assertIn(b'-v', stdout)
++ self.assertIn(b'-l', stdout)
++ self.assertIn(b'--check-dependencies', stdout)
+ self.assertIn(b'[-L', stdout)
+ self.assertIn(b'-s]', stdout)
+- self.assertIn(b'[files ...]', stdout)
++ self.assertIn(b'files', stdout)
+
+ def test_no_arg(self):
+ proc = subprocess.Popen(mat2_binary, stdout=subprocess.PIPE)
+@@ -37,12 +37,12 @@ class TestHelp(unittest.TestCase):
+ self.assertIn(b'mat2 [-h] [-V]', stdout)
+ self.assertIn(b'[--unknown-members policy]', stdout)
+ self.assertIn(b'[--inplace]', stdout)
+- self.assertIn(b'[-v]', stdout)
+- self.assertIn(b'[-l]', stdout)
+- self.assertIn(b'[--check-dependencies]', stdout)
++ self.assertIn(b'-v', stdout)
++ self.assertIn(b'-l', stdout)
++ self.assertIn(b'--check-dependencies', stdout)
+ self.assertIn(b'[-L', stdout)
+ self.assertIn(b'-s]', stdout)
+- self.assertIn(b'[files ...]', stdout)
++ self.assertIn(b'files', stdout)
+
+
+ class TestVersion(unittest.TestCase):
+--
+2.47.3
+
=====================================
debian/patches/series
=====================================
@@ -1 +1,3 @@
Disable-tests-that-don-t-work-with-gdk-pixbuf-and-glycin.patch
+0001-Improve-the-testsuite-s-portability.patch
+0002-Fix-test_climat2-failure-on-Python-3.15.patch
View it on GitLab: https://salsa.debian.org/pkg-privacy-team/mat2/-/commit/0a01597f5e038e193a30f010fb49d69908a93ff6
--
View it on GitLab: https://salsa.debian.org/pkg-privacy-team/mat2/-/commit/0a01597f5e038e193a30f010fb49d69908a93ff6
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/pkg-privacy-commits/attachments/20260714/34e7c26b/attachment-0001.htm>
More information about the Pkg-privacy-commits
mailing list