[numexpr] 06/07: Drop all patches

[Antonio Valentino]

This is an automated email from the git hooks/post-receive script.

a_valentino-guest pushed a commit to branch master
in repository numexpr.

commit 68ad466c9d20a4a9eb22e1f3f2741a69e344fa2d
Author: Antonio Valentino <antonio.valentino at tiscali.it>
Date:   Sun Apr 20 15:07:43 2014 +0000

    Drop all patches
---
 debian/changelog                                   |  4 +-
 debian/patches/0001-debian-changes-1.3.1-1.patch   | 21 -------
 .../0002-skip-threading-tests-on-sparc.patch       | 72 ----------------------
 debian/patches/series                              |  2 -
 4 files changed, 3 insertions(+), 96 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index fd456ed..b6d1def 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,13 +1,15 @@
 numexpr (2.4-1) UNRELEASED; urgency=medium
 
   * New upstream release
+  * The watch file has been updated to point to the new project home
   * debian/control
     - fixed long description of python3-numexpr that mentioned pyepr
       instead of numexpr (typo)
-  * The watch file has been updated to point to the new project home
   * debian/copyright
     - update copyright dates
     - added entry for the new numexpr/str-two-way.hpp file
+  * debian/patches
+    - drop all patches: no longer necessary or applied upstream
 
  -- Antonio Valentino <antonio.valentino at tiscali.it>  Sun, 20 Apr 2014 16:30:14 +0200
 
diff --git a/debian/patches/0001-debian-changes-1.3.1-1.patch b/debian/patches/0001-debian-changes-1.3.1-1.patch
deleted file mode 100644
index 7ca432b..0000000
--- a/debian/patches/0001-debian-changes-1.3.1-1.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-From: Debian Science Maintainers
- <debian-science-maintainers at lists.alioth.debian.org>
-Date: Sun, 4 Mar 2012 12:04:34 +0100
-Subject: debian-changes-1.3.1-1
-
----
- numexpr.egg-info/SOURCES.txt | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/numexpr.egg-info/SOURCES.txt b/numexpr.egg-info/SOURCES.txt
-index f95273e..00dc3aa 100644
---- a/numexpr.egg-info/SOURCES.txt
-+++ b/numexpr.egg-info/SOURCES.txt
-@@ -6,6 +6,7 @@ LICENSE.txt
- MANIFEST.in
- README.txt
- RELEASE_NOTES.txt
-+setup.cfg
- setup.py
- site.cfg.example
- ./numexpr/tests/__init__.py
diff --git a/debian/patches/0002-skip-threading-tests-on-sparc.patch b/debian/patches/0002-skip-threading-tests-on-sparc.patch
deleted file mode 100644
index ffa1289..0000000
--- a/debian/patches/0002-skip-threading-tests-on-sparc.patch
+++ /dev/null
@@ -1,72 +0,0 @@
-From: Antonio Valentino <antonio.valentino at tiscali.it>
-Date: Sun, 8 Dec 2013 12:32:28 +0000
-Subject: Skip tests related to threading on sparc
-
----
- numexpr/tests/test_numexpr.py | 39 +++++++++++++++++++++------------------
- 1 file changed, 21 insertions(+), 18 deletions(-)
-
-diff --git a/numexpr/tests/test_numexpr.py b/numexpr/tests/test_numexpr.py
-index 3b4ba80..8ccd40a 100644
---- a/numexpr/tests/test_numexpr.py
-+++ b/numexpr/tests/test_numexpr.py
-@@ -10,6 +10,7 @@
- 
- import os
- import sys
-+import platform
- import warnings
- 
- import numpy
-@@ -279,23 +280,24 @@ class test_evaluate(TestCase):
-         else:
-             self.fail()
- 
--    # Execution order set here so as to not use too many threads
--    # during the rest of the execution.  See #33 for details.
--    def test_changing_nthreads_00_inc(self):
--        a = linspace(-1, 1, 1e6)
--        b = ((.25*a + .75)*a - 1.5)*a - 2
--        for nthreads in range(1,7):
--            numexpr.set_num_threads(nthreads)
--            c = evaluate("((.25*a + .75)*a - 1.5)*a - 2")
--            assert_array_almost_equal(b, c)
--
--    def test_changing_nthreads_01_dec(self):
--        a = linspace(-1, 1, 1e6)
--        b = ((.25*a + .75)*a - 1.5)*a - 2
--        for nthreads in range(6, 1, -1):
--            numexpr.set_num_threads(nthreads)
--            c = evaluate("((.25*a + .75)*a - 1.5)*a - 2")
--            assert_array_almost_equal(b, c)
-+    if 'sparc' not in platform.machine():
-+        # Execution order set here so as to not use too many threads
-+        # during the rest of the execution.  See #33 for details.
-+        def test_changing_nthreads_00_inc(self):
-+            a = linspace(-1, 1, 1e6)
-+            b = ((.25*a + .75)*a - 1.5)*a - 2
-+            for nthreads in range(1,7):
-+                numexpr.set_num_threads(nthreads)
-+                c = evaluate("((.25*a + .75)*a - 1.5)*a - 2")
-+                assert_array_almost_equal(b, c)
-+
-+        def test_changing_nthreads_01_dec(self):
-+            a = linspace(-1, 1, 1e6)
-+            b = ((.25*a + .75)*a - 1.5)*a - 2
-+            for nthreads in range(6, 1, -1):
-+                numexpr.set_num_threads(nthreads)
-+                c = evaluate("((.25*a + .75)*a - 1.5)*a - 2")
-+                assert_array_almost_equal(b, c)
- 
- 
- tests = [
-@@ -767,7 +769,8 @@ def suite():
- 
-     for n in range(niter):
-         theSuite.addTest(unittest.makeSuite(test_numexpr))
--        theSuite.addTest(unittest.makeSuite(test_numexpr2))
-+        if 'sparc' not in platform.machine():
-+            theSuite.addTest(unittest.makeSuite(test_numexpr2))
-         theSuite.addTest(unittest.makeSuite(test_evaluate))
-         theSuite.addTest(unittest.makeSuite(TestExpressions))
-         theSuite.addTest(unittest.makeSuite(test_int32_int64))
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 0e41ec3..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1,2 +0,0 @@
-0001-debian-changes-1.3.1-1.patch
-0002-skip-threading-tests-on-sparc.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/numexpr.git