[Python-modules-commits] r33703 - in packages/numpy/trunk/debian (5 files)

[morph at users.alioth.debian.org]

    Date: Tuesday, August 11, 2015 @ 23:28:16
  Author: morph
Revision: 33703

* debian/patches/*
  - refreshed for new upstream code

Modified:
  packages/numpy/trunk/debian/changelog
  packages/numpy/trunk/debian/patches/03_force_f2py_version.patch
  packages/numpy/trunk/debian/patches/adapt_swig_docs_to_debian.patch
  packages/numpy/trunk/debian/patches/python3-soabi.patch
  packages/numpy/trunk/debian/patches/series

Modified: packages/numpy/trunk/debian/changelog
===================================================================
--- packages/numpy/trunk/debian/changelog	2015-08-11 22:26:03 UTC (rev 33702)
+++ packages/numpy/trunk/debian/changelog	2015-08-11 23:28:16 UTC (rev 33703)
@@ -1,8 +1,10 @@
 python-numpy (1:1.10.0~b1-1) UNRELEASED; urgency=medium
 
   * New upstream beta release
+  * debian/patches/*
+    - refreshed for new upstream code
 
- -- Sandro Tosi <morph at debian.org>  Tue, 11 Aug 2015 23:25:05 +0100
+ -- Sandro Tosi <morph at debian.org>  Wed, 12 Aug 2015 00:28:03 +0100
 
 python-numpy (1:1.9.2-2) unstable; urgency=medium
 

Modified: packages/numpy/trunk/debian/patches/03_force_f2py_version.patch
===================================================================
--- packages/numpy/trunk/debian/patches/03_force_f2py_version.patch	2015-08-11 22:26:03 UTC (rev 33702)
+++ packages/numpy/trunk/debian/patches/03_force_f2py_version.patch	2015-08-11 23:28:16 UTC (rev 33703)
@@ -2,12 +2,12 @@
 
 --- a/numpy/f2py/setup.py
 +++ b/numpy/f2py/setup.py
-@@ -43,7 +43,7 @@ def configuration(parent_package='',top_
+@@ -55,7 +55,7 @@ def configuration(parent_package='', top
      config.make_svn_version_py()
  
      def generate_f2py_py(build_dir):
--        f2py_exe = 'f2py'+os.path.basename(sys.executable)[6:]
+-        f2py_exe = 'f2py' + os.path.basename(sys.executable)[6:]
 +        f2py_exe = 'f2py'+sys.version[:3]
-         if f2py_exe[-4:]=='.exe':
+         if f2py_exe[-4:] == '.exe':
              f2py_exe = f2py_exe[:-4] + '.py'
          if 'bdist_wininst' in sys.argv and f2py_exe[-3:] != '.py':

Modified: packages/numpy/trunk/debian/patches/adapt_swig_docs_to_debian.patch
===================================================================
--- packages/numpy/trunk/debian/patches/adapt_swig_docs_to_debian.patch	2015-08-11 22:26:03 UTC (rev 33702)
+++ packages/numpy/trunk/debian/patches/adapt_swig_docs_to_debian.patch	2015-08-11 23:28:16 UTC (rev 33703)
@@ -25,10 +25,10 @@
 @@ -11,7 +11,8 @@ for a total of 888 typemaps supported "o
  typemaps, in turn, might require several unit tests in order to verify
  expected behavior for both proper and improper inputs.  Currently,
- this results in 1,427 individual unit tests that are performed when
--``make test`` is run in the ``numpy/docs/swig`` subdirectory.
+ this results in more than 1,000 individual unit tests executed when
+-``make test`` is run in the ``numpy/tools/swig`` subdirectory.
 +``make test`` is run in the ``swig`` directory of ``python-numpy-doc``
 +package.
- 
+
  To facilitate this many similar unit tests, some high-level
  programming techniques are employed, including C and `SWIG`_ macros,

Modified: packages/numpy/trunk/debian/patches/python3-soabi.patch
===================================================================
--- packages/numpy/trunk/debian/patches/python3-soabi.patch	2015-08-11 22:26:03 UTC (rev 33702)
+++ packages/numpy/trunk/debian/patches/python3-soabi.patch	2015-08-11 23:28:16 UTC (rev 33703)
@@ -25,11 +25,11 @@
  
 --- a/numpy/tests/test_ctypeslib.py
 +++ b/numpy/tests/test_ctypeslib.py
-@@ -25,6 +25,7 @@ class TestLoadLibrary(TestCase):
-                   " (import error was: %s)" % str(e)
+@@ -27,6 +27,7 @@ class TestLoadLibrary(TestCase):
+                    " (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):
+     @dec.skipif(not _HAS_CTYPE,
+                 "ctypes not available on this python installation")
+     @dec.knownfailureif(sys.platform ==

Modified: packages/numpy/trunk/debian/patches/series
===================================================================
--- packages/numpy/trunk/debian/patches/series	2015-08-11 22:26:03 UTC (rev 33702)
+++ packages/numpy/trunk/debian/patches/series	2015-08-11 23:28:16 UTC (rev 33703)
@@ -1,4 +1,4 @@
-02_build_dotblas.patch
+#02_build_dotblas.patch
 03_force_f2py_version.patch
 10_use_local_python.org_object.inv_sphinx.diff
 python3-soabi.patch