[numexpr] 04/05: Drom patches applied upstream

[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 5315b564b2d6e12c73287818473d51331bb7421e
Author: Antonio Valentino <antonio.valentino at tiscali.it>
Date:   Sat Sep 19 18:31:15 2015 +0000

    Drom patches applied upstream
---
 debian/changelog                         |  1 +
 debian/patches/0001-Fix-test-suite.patch | 40 --------------------------------
 debian/patches/series                    |  1 -
 3 files changed, 1 insertion(+), 41 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index e7a9f5f..452ef49 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ numexpr (2.4.4-1) unstable; urgency=medium
   * New upstream release
   * Add dependency from python(3)-pkg-resources to fix
     autopkgtest failure
+  * Drop debian/patches/0001-Fix-test-suite.patch (applied upstream)
 
  -- Antonio Valentino <antonio.valentino at tiscali.it>  Sat, 19 Sep 2015 18:26:38 +0000
 
diff --git a/debian/patches/0001-Fix-test-suite.patch b/debian/patches/0001-Fix-test-suite.patch
deleted file mode 100644
index 1554b6e..0000000
--- a/debian/patches/0001-Fix-test-suite.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From: Antonio Valentino <antonio.valentino at tiscali.it>
-Date: Sat, 15 Aug 2015 12:38:56 +0200
-Subject: Fix test suite
-
----
- numexpr/tests/test_numexpr.py | 16 ++++++++--------
- 1 file changed, 8 insertions(+), 8 deletions(-)
-
-diff --git a/numexpr/tests/test_numexpr.py b/numexpr/tests/test_numexpr.py
-index 53dd284..6d49cc7 100644
---- a/numexpr/tests/test_numexpr.py
-+++ b/numexpr/tests/test_numexpr.py
-@@ -720,19 +720,19 @@ class test_strings(TestCase):
-         self.assert_missing_op('add_sss', expr, locals())
- 
-     def test_empty_string1(self):
--        a = np.array(["", "pepe"])
--        b = np.array(["pepe2", ""])
--        res = evaluate("(a == '') & (b == 'pepe2')")
-+        a = np.array([b"", b"pepe"])
-+        b = np.array([b"pepe2", b""])
-+        res = evaluate("(a == b'') & (b == b'pepe2')")
-         assert_array_equal(res, np.array([True, False]))
--        res2 = evaluate("(a == 'pepe') & (b == '')")
-+        res2 = evaluate("(a == b'pepe') & (b == b'')")
-         assert_array_equal(res2, np.array([False, True]))
- 
-     def test_empty_string2(self):
--        a = np.array(["p", "pepe"])
--        b = np.array(["pepe2", ""])
--        res = evaluate("(a == '') & (b == 'pepe2')")
-+        a = np.array([b"p", b"pepe"])
-+        b = np.array([b"pepe2", b""])
-+        res = evaluate("(a == b'') & (b == b'pepe2')")
-         assert_array_equal(res, np.array([False, False]))
--        res2 = evaluate("(a == 'pepe') & (b == '')")
-+        res2 = evaluate("(a == b'pepe') & (b == b'')")
-         assert_array_equal(res, np.array([False, False]))
- 
-     def test_add_numeric_array(self):
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 7bb1bc3..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-0001-Fix-test-suite.patch

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