[Python-modules-commits] r27995 - in packages/numpy/trunk/debian (3 files)

[jtaylor-guest at users.alioth.debian.org]

    Date: Sunday, March 2, 2014 @ 15:51:17
  Author: jtaylor-guest
Revision: 27995

python3-soabi.patch: fix ctypeslib for python3 soabi in extension filenames

Added:
  packages/numpy/trunk/debian/patches/python3-soabi.patch
Modified:
  packages/numpy/trunk/debian/changelog
  packages/numpy/trunk/debian/patches/series

Modified: packages/numpy/trunk/debian/changelog
===================================================================
--- packages/numpy/trunk/debian/changelog	2014-03-02 15:51:14 UTC (rev 27994)
+++ packages/numpy/trunk/debian/changelog	2014-03-02 15:51:17 UTC (rev 27995)
@@ -10,6 +10,7 @@
   * build depend on cython and cythonize mtrand.pyx (Closes: #710177)
   * move documentation build depends to -indep (Closes: #739019)
   * run tests in verbose mode (Closes: #724611)
+  * python3-soabi.patch: fix ctypeslib for python3 soabi in extension filenames
 
  -- Julian Taylor <jtaylor.debian at googlemail.com>  Sat, 11 Jan 2014 18:39:03 +0100
 

Added: packages/numpy/trunk/debian/patches/python3-soabi.patch
===================================================================
--- packages/numpy/trunk/debian/patches/python3-soabi.patch	                        (rev 0)
+++ packages/numpy/trunk/debian/patches/python3-soabi.patch	2014-03-02 15:51:17 UTC (rev 27995)
@@ -0,0 +1,35 @@
+Description: adapt to python3 multiarch soabi
+ python3 soabi contains multiarch but does not export it via SOABI. So hardcode
+ it and disable a test. get_shared_lib_extension can't be properly fixed:
+ doko: we still want this as the default for people building extensions not
+        only for the distribution
+ Nothing in debian uses it to get the python extension.
+Author: Julian Taylor <jtaylor at ubuntu.com>
+Forwarded: not-needed, debian specific
+--- a/numpy/ctypeslib.py
++++ b/numpy/ctypeslib.py
+@@ -107,6 +107,14 @@
+             so_ext2 = get_shared_lib_extension(is_python_ext=True)
+             if not so_ext2 == so_ext:
+                 libname_ext.insert(0, libname + so_ext2)
++            try:
++                import sysconfig
++                so_ext3 = '.%s-%s.so' % (sysconfig.get_config_var('SOABI'),
++                                         sysconfig.get_config_var('MULTIARCH'))
++                libname_ext.insert(0, libname + so_ext3)
++            except (KeyError, ImportError):
++                pass
++
+         else:
+             libname_ext = [libname]
+ 
+--- a/numpy/tests/test_ctypeslib.py
++++ b/numpy/tests/test_ctypeslib.py
+@@ -25,6 +25,7 @@
+                   " (import error was: %s)" % str(e)
+             print(msg)
+ 
++    @dec.skipif(True, 'Skipped as per debian/patches/python3-soabi.patch')
+     @dec.skipif(not _HAS_CTYPE, "ctypes not available on this python installation")
+     @dec.knownfailureif(sys.platform=='cygwin', "This test is known to fail on cygwin")
+     def test_basic2(self):

Modified: packages/numpy/trunk/debian/patches/series
===================================================================
--- packages/numpy/trunk/debian/patches/series	2014-03-02 15:51:14 UTC (rev 27994)
+++ packages/numpy/trunk/debian/patches/series	2014-03-02 15:51:17 UTC (rev 27995)
@@ -3,3 +3,4 @@
 03_force_f2py_version.patch
 #05_fix_endianness_detection.patch
 10_use_local_python.org_object.inv_sphinx.diff
+python3-soabi.patch