Merge ~adrien/ubuntu/+source/mpi4py:plucky-merge-4.0.1-6 into ubuntu/+source/mpi4py:debian/sid

[Adrien Nader]

Merge from Debian. Chances are that will fix a test triggered by openmpi and help with the transition.

I've dropped changes that are not needed anymore: as far as I understand, they only applied during build but not during autopkgtest unfortunately. I wasn't able to test in a PPA due to infra issues (pulling from a PPA is broken everywhere at the moment) but the tests passed at build-time, including on armhf and s390x.

It's possible that we could sync the package instead but without the ability to test in PPA, I went for a middle-ground that seemed enough and safe.

[Sudip Mukherjee (sudipmuk)]

uploaded

review: Approve

diff --git a/debian/changelog b/debian/changelog
index bb6e43a..97bbe24 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+mpi4py (4.0.1-6ubuntu1) plucky; urgency=medium
+
+  * Merge with Debian; remaining changes:
+    - Restore test_pack skipping in skip_failing_tests_32bit_mpich.patch
+
+ -- Adrien Nader <[e-mail]>  Fri, 29 Nov 2024 17:44:01 +0100
+
 mpi4py (4.0.1-6) unstable; urgency=medium
 
   * mips64el is in trouble. Reinstate version restriction. Test
@@ -29,6 +36,20 @@ mpi4py (4.0.1-4) unstable; urgency=medium
 
  -- Drew Parsons <[e-mail]>  Mon, 18 Nov 2024 23:37:00 +0100
 
+mpi4py (4.0.1-3ubuntu2) plucky; urgency=medium
+
+  * No-change rebuild for openmpi soname change.
+
+ -- Matthias Klose <[e-mail]>  Sat, 30 Nov 2024 07:13:34 +0100
+
+mpi4py (4.0.1-3ubuntu1) plucky; urgency=medium
+
+  * Merge with Debian; remaining changes:
+    - Restore test_pack skipping in skip_failing_tests_32bit_mpich.patch
+  * Add armhf and s390x to the list of architectures to ignore test results.
+
+ -- Matthias Klose <[e-mail]>  Mon, 18 Nov 2024 09:22:46 +0100
+
 mpi4py (4.0.1-3) unstable; urgency=medium
 
   * s390x ppc64: skip testConnectAccept too
@@ -145,6 +166,12 @@ mpi4py (4.0.0-1exp1) experimental; urgency=medium
 
  -- Drew Parsons <[e-mail]>  Mon, 29 Jul 2024 23:49:55 +0200
 
+mpi4py (3.1.6-9ubuntu1) oracular; urgency=medium
+
+  * Restore test_pack skipping in skip_failing_tests_32bit_mpich.patch
+
+ -- Graham Inggs <[e-mail]>  Thu, 05 Sep 2024 10:51:28 +0000
+
 mpi4py (3.1.6-9) unstable; urgency=medium
 
   * debian patch mpich_32bit_13e8af6.patch applies upstream commit
diff --git a/debian/control b/debian/control
index e17bc3b..aeefcf6 100644
--- a/debian/control
+++ b/debian/control
@@ -1,5 +1,6 @@
 Source: mpi4py
-Maintainer: Debian Science Maintainers <[e-mail]>
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: Debian Science Maintainers <[e-mail]>
 Uploaders: Drew Parsons <[e-mail]>,
            Yaroslav Halchenko <[e-mail]>,
            Michael Hanke <[e-mail]>,
diff --git a/debian/patches/series b/debian/patches/series
index 11a257d..f9a8105 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,4 @@ intersphinx_use_local_inventory.patch
 skip_ppc_failing_tests.patch
 skip_s390x_failing_tests.patch
 skip_testPackUnpackExternal_sparc64.patch
+skip_failing_tests_32bit_mpich.patch
diff --git a/debian/patches/skip_failing_tests_32bit_mpich.patch b/debian/patches/skip_failing_tests_32bit_mpich.patch
new file mode 100644
index 0000000..6264554
--- /dev/null
+++ b/debian/patches/skip_failing_tests_32bit_mpich.patch
@@ -0,0 +1,28 @@
+--- a/test/test_pack.py
++++ b/test/test_pack.py
+@@ -90,6 +90,7 @@ class BaseTestPackExternal:
+                         self.assertGreaterEqual(real_size, 0)
+ 
+     @unittest.skipMPI("openmpi(<5.0)", platform.machine() == 'sparc64')
++    @unittest.skipMPI("mpich", platform.architecture()[0] == '32bit')
+     def testPackUnpackExternal(self):
+         for array, typecode1 in arrayimpl.loop():
+             with arrayimpl.test(self):
+--- a/test/test_spawn.py
++++ b/test/test_spawn.py
+@@ -1,6 +1,7 @@
+ from mpi4py import MPI
+ import mpiunittest as unittest
+ import sys, os, mpi4py
++import platform
+ 
+ import platform
+ 
+@@ -93,6 +94,7 @@ def skip_spawn():
+ @unittest.skipMPI('openmpi(>=5.0.0,<5.1.0)', skip_spawn())
+ @unittest.skipMPI('mpich(<4.1.0)', appnum() is None)
+ @unittest.skipMPI('mpich(<4.3.0)', badport())
[e-mail]("mpich", platform.architecture()[0] == '32bit')
+ @unittest.skipMPI('msmpi(<8.1.0)')
+ @unittest.skipMPI('msmpi', skip_spawn())
+ @unittest.skipMPI('msmpi', appnum() is None)