Control: tags 1140946 + patch Control: tags 1140946 + pending Dear maintainer,
I've prepared an NMU for mat2 (versioned as 0.14.0-2.1) and uploaded it to DELAYED/2. Please feel free to tell me if I should cancel it. cu Adrian
diffstat for mat2-0.14.0 mat2-0.14.0 changelog | 8 + patches/0001-Improve-the-testsuite-s-portability.patch | 47 +++++++++++ patches/0002-Fix-test_climat2-failure-on-Python-3.15.patch | 55 +++++++++++++ patches/series | 2 4 files changed, 112 insertions(+) diff -Nru mat2-0.14.0/debian/changelog mat2-0.14.0/debian/changelog --- mat2-0.14.0/debian/changelog 2026-02-09 21:50:15.000000000 +0200 +++ mat2-0.14.0/debian/changelog 2026-07-05 18:15:20.000000000 +0300 @@ -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 <[email protected]> Sun, 05 Jul 2026 18:15:20 +0300 + mat2 (0.14.0-2) unstable; urgency=medium [Jeremy Bícha] diff -Nru mat2-0.14.0/debian/patches/0001-Improve-the-testsuite-s-portability.patch mat2-0.14.0/debian/patches/0001-Improve-the-testsuite-s-portability.patch --- mat2-0.14.0/debian/patches/0001-Improve-the-testsuite-s-portability.patch 1970-01-01 02:00:00.000000000 +0200 +++ mat2-0.14.0/debian/patches/0001-Improve-the-testsuite-s-portability.patch 2026-07-05 18:14:58.000000000 +0300 @@ -0,0 +1,47 @@ +From 1fbc68289988a05592e324a1b6bb340c42c0fc75 Mon Sep 17 00:00:00 2001 +From: jvoisin <[email protected]> +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 + diff -Nru mat2-0.14.0/debian/patches/0002-Fix-test_climat2-failure-on-Python-3.15.patch mat2-0.14.0/debian/patches/0002-Fix-test_climat2-failure-on-Python-3.15.patch --- mat2-0.14.0/debian/patches/0002-Fix-test_climat2-failure-on-Python-3.15.patch 1970-01-01 02:00:00.000000000 +0200 +++ mat2-0.14.0/debian/patches/0002-Fix-test_climat2-failure-on-Python-3.15.patch 2026-07-05 18:14:58.000000000 +0300 @@ -0,0 +1,55 @@ +From c258940ca5dff83cf423d4c890d6af82b8803a97 Mon Sep 17 00:00:00 2001 +From: Emir Akdag <[email protected]> +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 + diff -Nru mat2-0.14.0/debian/patches/series mat2-0.14.0/debian/patches/series --- mat2-0.14.0/debian/patches/series 2026-02-09 21:50:15.000000000 +0200 +++ mat2-0.14.0/debian/patches/series 2026-07-05 18:15:18.000000000 +0300 @@ -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
