Package: release.debian.org
Severity: normal
User: release.debian....@packages.debian.org
Usertags: unblock
Please unblock package mpi4py.
It contains a fix for RC bug #700995 ("directory vs. symlink conflict:
/usr/include/python3.2"), and another bug fix for #691244 (to fix
failing unittests with python3.3).
Debdiff is as follows:
diff -Nru mpi4py-1.3+hg20120611/debian/changelog
mpi4py-1.3+hg20120611/debian/changelog
--- mpi4py-1.3+hg20120611/debian/changelog 2012-06-11 18:51:02.000000000
-0700
+++ mpi4py-1.3+hg20120611/debian/changelog 2013-02-20 12:00:26.000000000
-0800
@@ -1,3 +1,18 @@
+mpi4py (1.3+hg20120611-3) unstable; urgency=medium
+
+ * Create a suffixed (e.g. python3.2mu) python3 directory matching the
+ one present on the system for the given version of python3 (Closes:
+ #700995)
+
+ -- Yaroslav Halchenko <deb...@onerussian.com> Wed, 20 Feb 2013 14:51:54 -0500
+
+mpi4py (1.3+hg20120611-2) unstable; urgency=low
+
+ * Cherry-picked patch from upstream for python3.3 compatibility (failing
+ unittests) (Closes: #691244)
+
+ -- Yaroslav Halchenko <deb...@onerussian.com> Tue, 23 Oct 2012 10:23:29 -0400
+
mpi4py (1.3+hg20120611-1) unstable; urgency=low
[ Bradley M. Froehle ]
diff -Nru mpi4py-1.3+hg20120611/debian/patches/series
mpi4py-1.3+hg20120611/debian/patches/series
--- mpi4py-1.3+hg20120611/debian/patches/series 2012-06-11
18:51:02.000000000 -0700
+++ mpi4py-1.3+hg20120611/debian/patches/series 2013-02-20
12:00:26.000000000 -0800
@@ -1,2 +1,3 @@
up_no_modlibs
cython_version_check.patch
+up_test_win_python3.3.patch
diff -Nru mpi4py-1.3+hg20120611/debian/patches/up_test_win_python3.3.patch
mpi4py-1.3+hg20120611/debian/patches/up_test_win_python3.3.patch
--- mpi4py-1.3+hg20120611/debian/patches/up_test_win_python3.3.patch
1969-12-31
16:00:00.000000000 -0800
+++ mpi4py-1.3+hg20120611/debian/patches/up_test_win_python3.3.patch
2013-02-20
12:00:26.000000000 -0800
@@ -0,0 +1,43 @@
+Author: Lisandro Dalcin <dalc...@gmail.com>
+Subject: Python 3.3 compatibility patch from upstream
+
+Origin: upstream
+Bug-Debian: http://bugs.debian.org/691244
+Applied-Upstream:
https://code.google.com/p/mpi4py/source/detail?r=330fde6ffccbdf68f5e3bdd0378bf4d6cfa82f50
+Last-Update: 2012-10-23
+
+diff --git a/test/test_win.py b/test/test_win.py
+--- a/test/test_win.py
++++ b/test/test_win.py
+@@ -25,7 +25,10 @@
+ if type(self.memory).__name__ == 'buffer':
+ self.assertEqual(sys.getrefcount(self.memory), refcnt+1)
+ else:
+- self.assertEqual(sys.getrefcount(self.memory), refcnt)
++ if sys.version_info[:3] < (3, 3):
++ self.assertEqual(sys.getrefcount(self.memory), refcnt)
++ else:
++ self.assertEqual(sys.getrefcount(self.memory), refcnt+1)
+
+ def tearDown(self):
+ refcnt = sys.getrefcount(self.memory)
+@@ -33,7 +36,10 @@
+ if type(self.memory).__name__ == 'buffer':
+ self.assertEqual(sys.getrefcount(self.memory), refcnt-1)
+ else:
+- self.assertEqual(sys.getrefcount(self.memory), refcnt)
++ if sys.version_info[:3] < (3, 3):
++ self.assertEqual(sys.getrefcount(self.memory), refcnt)
++ else:
++ self.assertEqual(sys.getrefcount(self.memory), refcnt-1)
+ if self.mpi_memory:
+ MPI.Free_mem(self.mpi_memory)
+
+@@ -46,7 +52,6 @@
+ self.assertEqual(dunit, 1)
+ self.assertEqual(base, pointer)
+
+-
+ def testAttributes(self):
+ cgroup = self.COMM.Get_group()
+ wgroup = self.WIN.Get_group()
diff -Nru mpi4py-1.3+hg20120611/debian/rules mpi4py-1.3+hg20120611/debian/rules
--- mpi4py-1.3+hg20120611/debian/rules 2012-06-11 18:51:02.000000000 -0700
+++ mpi4py-1.3+hg20120611/debian/rules 2013-02-20 12:00:26.000000000 -0800
@@ -54,10 +54,14 @@
done
: # Python 3
+ : # Can have python$$v symlink pointing to python3.?m or python3.?mu
+ : # see #700995 for more details. So first look where it points to
+ : # and use that directory
set -e; for v in $(PY3VERS); do \
[ -d $(CURDIR)/debian/python3-mpi4py/usr/include/python$$v ] || \
- mkdir -p $(CURDIR)/debian/python3-mpi4py/usr/include/python$$v;
\
- dh_link -ppython3-mpi4py
usr/lib/python3/dist-packages/mpi4py/include/mpi4py
usr/include/python$$v/mpi4py; \
+ pythonv_inc_dir=$$(readlink -f /usr/include/python$$v); \
+ mkdir -p $(CURDIR)/debian/python3-mpi4py$$pythonv_inc_dir; \
+ dh_link -ppython3-mpi4py
usr/lib/python3/dist-packages/mpi4py/include/mpi4py
$${pythonv_inc_dir#/}/mpi4py; \
done
: # share -dbg and normal package doc dirs
unblock mpi4py/1.3+hg20120611-3
Regards,
Vincent
--
To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
