dev-python/numexpr: add patch merged upstream to fix test failures

Package-Manager: portage-2.2.20

diff --git a/dev-python/numexpr/files/numexpr-2.4.3-testfix.patch b/dev-python/numexpr/files/numexpr-2.4.3-testfix.patch
new file mode 100644 (file)
index 0000000..3104ddc
--- /dev/null
+++ b/dev-python/numexpr/files/numexpr-2.4.3-testfix.patch
@@ -0,0 +1,34 @@
+https://github.com/avalentino/numexpr/commit/0c2ef2ed05185211d2dd90a193c26f1805c30ad4
+diff --git a/numexpr/tests/test_numexpr.py b/numexpr/tests/test_numexpr.py
+index 44761c3..e7e109f 100644
+--- a/numexpr/tests/test_numexpr.py
++++ b/numexpr/tests/test_numexpr.py
+@@ -721,19 +721,19 @@ def test_add_string_array(self):
+         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/dev-python/numexpr/numexpr-2.4.3.ebuild b/dev-python/numexpr/numexpr-2.4.3.ebuild
index 40aa4ecea9db369d316228380240a8b790235d9a..34e62183e34b1c7af32ea2c1e72c547751b2506c 100644 (file)
--- a/dev-python/numexpr/numexpr-2.4.3.ebuild
+++ b/dev-python/numexpr/numexpr-2.4.3.ebuild
@@ -23,6 +23,8 @@ RDEPEND="
 DEPEND="${RDEPEND}
        dev-python/setuptools[${PYTHON_USEDEP}]"
 
+PATCHES=( "${FILESDIR}"/${P}-testfix.patch )
+
 python_prepare_all() {
        # TODO: mkl can be used but it fails for me
        # only works with mkl in tree. newer mkl will use pkgconfig
@@ -46,8 +48,6 @@ python_compile() {
 }
 
 python_test() {
-       # https://github.com/pydata/numexpr/issues/177
-       # there are 2 known test failures under py3 only
        pushd "${BUILD_DIR}"/lib > /dev/null
        "${PYTHON}" -c "import numexpr; numexpr.test()" || die
        pushd > /dev/null