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

Proposed by Adrien Nader
Status: Merged
Merge reported by: Adrien Nader
Merged at revision: 28653254247577e3aa2a44d63ad4011ae7f3cbf8
Proposed branch: ~adrien/ubuntu/+source/mpi4py:plucky-merge-4.0.1-6
Merge into: ubuntu/+source/mpi4py:debian/sid
Diff against target: 104 lines (+58/-1)
4 files modified
debian/changelog (+27/-0)
debian/control (+2/-1)
debian/patches/series (+1/-0)
debian/patches/skip_failing_tests_32bit_mpich.patch (+28/-0)
Reviewer Review Type Date Requested Status
Sudip Mukherjee (community) Approve
Ubuntu Sponsors Pending
Review via email: mp+477902@code.launchpad.net

This proposal supersedes a proposal from 2024-11-29.

Description of the change

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.

To post a comment you must log in.
Revision history for this message
Sudip Mukherjee (sudip) wrote :

uploaded

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
diff --git a/debian/changelog b/debian/changelog
index bb6e43a..97bbe24 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
1mpi4py (4.0.1-6ubuntu1) plucky; urgency=medium
2
3 * Merge with Debian; remaining changes:
4 - Restore test_pack skipping in skip_failing_tests_32bit_mpich.patch
5
6 -- Adrien Nader <adrien.nader@canonical.com> Fri, 29 Nov 2024 17:44:01 +0100
7
1mpi4py (4.0.1-6) unstable; urgency=medium8mpi4py (4.0.1-6) unstable; urgency=medium
29
3 * mips64el is in trouble. Reinstate version restriction. Test10 * mips64el is in trouble. Reinstate version restriction. Test
@@ -29,6 +36,20 @@ mpi4py (4.0.1-4) unstable; urgency=medium
2936
30 -- Drew Parsons <dparsons@debian.org> Mon, 18 Nov 2024 23:37:00 +010037 -- Drew Parsons <dparsons@debian.org> Mon, 18 Nov 2024 23:37:00 +0100
3138
39mpi4py (4.0.1-3ubuntu2) plucky; urgency=medium
40
41 * No-change rebuild for openmpi soname change.
42
43 -- Matthias Klose <doko@ubuntu.com> Sat, 30 Nov 2024 07:13:34 +0100
44
45mpi4py (4.0.1-3ubuntu1) plucky; urgency=medium
46
47 * Merge with Debian; remaining changes:
48 - Restore test_pack skipping in skip_failing_tests_32bit_mpich.patch
49 * Add armhf and s390x to the list of architectures to ignore test results.
50
51 -- Matthias Klose <doko@ubuntu.com> Mon, 18 Nov 2024 09:22:46 +0100
52
32mpi4py (4.0.1-3) unstable; urgency=medium53mpi4py (4.0.1-3) unstable; urgency=medium
3354
34 * s390x ppc64: skip testConnectAccept too55 * s390x ppc64: skip testConnectAccept too
@@ -145,6 +166,12 @@ mpi4py (4.0.0-1exp1) experimental; urgency=medium
145166
146 -- Drew Parsons <dparsons@debian.org> Mon, 29 Jul 2024 23:49:55 +0200167 -- Drew Parsons <dparsons@debian.org> Mon, 29 Jul 2024 23:49:55 +0200
147168
169mpi4py (3.1.6-9ubuntu1) oracular; urgency=medium
170
171 * Restore test_pack skipping in skip_failing_tests_32bit_mpich.patch
172
173 -- Graham Inggs <ginggs@ubuntu.com> Thu, 05 Sep 2024 10:51:28 +0000
174
148mpi4py (3.1.6-9) unstable; urgency=medium175mpi4py (3.1.6-9) unstable; urgency=medium
149176
150 * debian patch mpich_32bit_13e8af6.patch applies upstream commit177 * 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 @@
1Source: mpi4py1Source: mpi4py
2Maintainer: Debian Science Maintainers <debian-science-maintainers@lists.alioth.debian.org>2Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
3XSBC-Original-Maintainer: Debian Science Maintainers <debian-science-maintainers@lists.alioth.debian.org>
3Uploaders: Drew Parsons <dparsons@debian.org>,4Uploaders: Drew Parsons <dparsons@debian.org>,
4 Yaroslav Halchenko <debian@onerussian.com>,5 Yaroslav Halchenko <debian@onerussian.com>,
5 Michael Hanke <michael.hanke@gmail.com>,6 Michael Hanke <michael.hanke@gmail.com>,
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
2skip_ppc_failing_tests.patch2skip_ppc_failing_tests.patch
3skip_s390x_failing_tests.patch3skip_s390x_failing_tests.patch
4skip_testPackUnpackExternal_sparc64.patch4skip_testPackUnpackExternal_sparc64.patch
5skip_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
5new file mode 1006446new file mode 100644
index 0000000..6264554
--- /dev/null
+++ b/debian/patches/skip_failing_tests_32bit_mpich.patch
@@ -0,0 +1,28 @@
1--- a/test/test_pack.py
2+++ b/test/test_pack.py
3@@ -90,6 +90,7 @@ class BaseTestPackExternal:
4 self.assertGreaterEqual(real_size, 0)
5
6 @unittest.skipMPI("openmpi(<5.0)", platform.machine() == 'sparc64')
7+ @unittest.skipMPI("mpich", platform.architecture()[0] == '32bit')
8 def testPackUnpackExternal(self):
9 for array, typecode1 in arrayimpl.loop():
10 with arrayimpl.test(self):
11--- a/test/test_spawn.py
12+++ b/test/test_spawn.py
13@@ -1,6 +1,7 @@
14 from mpi4py import MPI
15 import mpiunittest as unittest
16 import sys, os, mpi4py
17+import platform
18
19 import platform
20
21@@ -93,6 +94,7 @@ def skip_spawn():
22 @unittest.skipMPI('openmpi(>=5.0.0,<5.1.0)', skip_spawn())
23 @unittest.skipMPI('mpich(<4.1.0)', appnum() is None)
24 @unittest.skipMPI('mpich(<4.3.0)', badport())
25+@unittest.skipMPI("mpich", platform.architecture()[0] == '32bit')
26 @unittest.skipMPI('msmpi(<8.1.0)')
27 @unittest.skipMPI('msmpi', skip_spawn())
28 @unittest.skipMPI('msmpi', appnum() is None)

Subscribers

People subscribed via source and target branches