[gentoo-commits] repo/gentoo:master commit in: dev-python/numexpr/files/, dev-python/numexpr/
commit: a2e1678a8d7679dae5b25b17ce8edb512a698466
Author: Michał Górny gentoo org>
AuthorDate: Mon Jul 25 16:13:26 2022 +
Commit: Michał Górny gentoo org>
CommitDate: Mon Jul 25 16:13:26 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a2e1678a
dev-python/numexpr: Remove old
Signed-off-by: Michał Górny gentoo.org>
dev-python/numexpr/Manifest| 1 -
.../numexpr/files/numexpr-2.8.1-numpy-1.23.0.patch | 22 -
dev-python/numexpr/numexpr-2.8.1-r1.ebuild | 38 --
dev-python/numexpr/numexpr-2.8.1.ebuild| 33 ---
4 files changed, 94 deletions(-)
diff --git a/dev-python/numexpr/Manifest b/dev-python/numexpr/Manifest
index 3c4e3b144f8d..634719c086b6 100644
--- a/dev-python/numexpr/Manifest
+++ b/dev-python/numexpr/Manifest
@@ -1,2 +1 @@
-DIST numexpr-2.8.1.tar.gz 111984 BLAKE2B
b5d0b5bd5507c8c513db6404917b6256d9c8d232ea5d2f027f42cdac4a5e5c5f8c2db3d2283734f80d0ae7df2551314d088ccd2ed8e2c7401cc04a15ad61751d
SHA512
243cddcb1fece9410e35c87a4c3f794ac0963ddfcc054b9a9c9842a2bb4e782d6c939f532d00d724d4b447d915764c3c8bbb87a99c71a22951798329aa7494bd
DIST numexpr-2.8.3.gh.tar.gz 112551 BLAKE2B
c433e27dafe14e0760cd825992a4dcf3e35ae7a32c1bb768c6f5632e8505be5b10dc08a89c97836f019e53d77cf4aa811cc0822832d605934e35ae93e1cbb661
SHA512
4753159f8247ed18dba01d4db21e8e0a149a253cfc064719c9ccdcdd779d109aca64d2306820d912c274b5b6037a9dc849285ef015fec1e1dc9f0c8bad246393
diff --git a/dev-python/numexpr/files/numexpr-2.8.1-numpy-1.23.0.patch
b/dev-python/numexpr/files/numexpr-2.8.1-numpy-1.23.0.patch
deleted file mode 100644
index b0e841077620..
--- a/dev-python/numexpr/files/numexpr-2.8.1-numpy-1.23.0.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-https://github.com/pydata/numexpr/commit/1c6a024947c3aa1bf926ecb9828036b306d7c6d7
-https://bugs.gentoo.org/853955
-
-From 1c6a024947c3aa1bf926ecb9828036b306d7c6d7 Mon Sep 17 00:00:00 2001
-From: Robert McLeod
-Date: Mon, 24 Jan 2022 10:54:34 -0800
-Subject: [PATCH] Fix for #397, use of NPY_ARRAY_UPDATEIFCOPY flag
-
- Changes from 2.8.0 to 2.8.1
- ---
a/numexpr/interpreter.cpp
-+++ b/numexpr/interpreter.cpp
-@@ -1269,7 +1269,7 @@ NumExpr_run(NumExprObject *self, PyObject *args,
PyObject *kwds)
- }
- Py_INCREF(dtypes[0]);
- a = (PyArrayObject *)PyArray_FromArray(operands[0], dtypes[0],
--
NPY_ARRAY_ALIGNED|NPY_ARRAY_UPDATEIFCOPY);
-+NPY_ARRAY_ALIGNED);
- if (a == NULL) {
- goto fail;
- }
-
diff --git a/dev-python/numexpr/numexpr-2.8.1-r1.ebuild
b/dev-python/numexpr/numexpr-2.8.1-r1.ebuild
deleted file mode 100644
index 55c558ac78d4..
--- a/dev-python/numexpr/numexpr-2.8.1-r1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..11} )
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="Fast numerical array expression evaluator for Python and NumPy"
-HOMEPAGE="https://github.com/pydata/numexpr;
-SRC_URI="https://github.com/pydata/numexpr/archive/v${PV}.tar.gz ->
${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390
~sparc ~x86 ~amd64-linux ~x86-linux"
-
-DEPEND="
- >=dev-python/numpy-1.13.3[${PYTHON_USEDEP}]
-"
-RDEPEND="${DEPEND}
- dev-python/packaging[${PYTHON_USEDEP}]
-"
-
-PATCHES=(
- "${FILESDIR}"/${P}-numpy-1.23.0.patch
-)
-
-python_test() {
- pushd "${BUILD_DIR}/install/usr/lib/${EPYTHON}/site-packages"
>/dev/null || die
- "${EPYTHON}" - <<-EOF || die "Tests failed with ${EPYTHON}"
- import sys,numexpr
- sys.exit(0 if numexpr.test().wasSuccessful() else 1)
- EOF
- pushd >/dev/null || die
-}
diff --git a/dev-python/numexpr/numexpr-2.8.1.ebuild
b/dev-python/numexpr/numexpr-2.8.1.ebuild
deleted file mode 100644
index 915229e23609..
--- a/dev-python/numexpr/numexpr-2.8.1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="Fast numerical array expression evaluator for Python and NumPy"
-HOMEPAGE="https://github.com/pydata/numexpr;
-SRC_URI="https://github.com/pydata/numexpr/archive/v${PV}.tar.gz ->
${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 ~sparc x86
~amd64-linux ~x86-linux"
-
-DEPEND="
- >=dev-python/numpy-1.13.3[${PYTHON_USEDEP}]
-"
-RDEPEND="${DEPEND}
- dev-python/packaging[${PYTHON_USEDEP}]
-"
-
-python_test() {
- pushd "${BUILD_DIR}"/lib
[gentoo-commits] repo/gentoo:master commit in: dev-python/numexpr/files/, dev-python/numexpr/
commit: 2a6dc1335a46d15eafd97470097668dfa1af74d6
Author: Sam James gentoo org>
AuthorDate: Fri Jun 24 03:52:50 2022 +
Commit: Sam James gentoo org>
CommitDate: Fri Jun 24 03:52:50 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2a6dc133
dev-python/numexpr: fix build with numpy 1.23.0
Closes: https://bugs.gentoo.org/853955
Signed-off-by: Sam James gentoo.org>
.../numexpr/files/numexpr-2.8.1-numpy-1.23.0.patch | 22 ++
dev-python/numexpr/numexpr-2.8.1-r1.ebuild | 4
2 files changed, 26 insertions(+)
diff --git a/dev-python/numexpr/files/numexpr-2.8.1-numpy-1.23.0.patch
b/dev-python/numexpr/files/numexpr-2.8.1-numpy-1.23.0.patch
new file mode 100644
index ..b0e841077620
--- /dev/null
+++ b/dev-python/numexpr/files/numexpr-2.8.1-numpy-1.23.0.patch
@@ -0,0 +1,22 @@
+https://github.com/pydata/numexpr/commit/1c6a024947c3aa1bf926ecb9828036b306d7c6d7
+https://bugs.gentoo.org/853955
+
+From 1c6a024947c3aa1bf926ecb9828036b306d7c6d7 Mon Sep 17 00:00:00 2001
+From: Robert McLeod
+Date: Mon, 24 Jan 2022 10:54:34 -0800
+Subject: [PATCH] Fix for #397, use of NPY_ARRAY_UPDATEIFCOPY flag
+
+ Changes from 2.8.0 to 2.8.1
+ ---
+--- a/numexpr/interpreter.cpp
b/numexpr/interpreter.cpp
+@@ -1269,7 +1269,7 @@ NumExpr_run(NumExprObject *self, PyObject *args,
PyObject *kwds)
+ }
+ Py_INCREF(dtypes[0]);
+ a = (PyArrayObject *)PyArray_FromArray(operands[0], dtypes[0],
+-
NPY_ARRAY_ALIGNED|NPY_ARRAY_UPDATEIFCOPY);
++NPY_ARRAY_ALIGNED);
+ if (a == NULL) {
+ goto fail;
+ }
+
diff --git a/dev-python/numexpr/numexpr-2.8.1-r1.ebuild
b/dev-python/numexpr/numexpr-2.8.1-r1.ebuild
index 494235d35671..55c558ac78d4 100644
--- a/dev-python/numexpr/numexpr-2.8.1-r1.ebuild
+++ b/dev-python/numexpr/numexpr-2.8.1-r1.ebuild
@@ -24,6 +24,10 @@ RDEPEND="${DEPEND}
dev-python/packaging[${PYTHON_USEDEP}]
"
+PATCHES=(
+ "${FILESDIR}"/${P}-numpy-1.23.0.patch
+)
+
python_test() {
pushd "${BUILD_DIR}/install/usr/lib/${EPYTHON}/site-packages"
>/dev/null || die
"${EPYTHON}" - <<-EOF || die "Tests failed with ${EPYTHON}"
[gentoo-commits] repo/gentoo:master commit in: dev-python/numexpr/files/, dev-python/numexpr/
commit: 60b0e8eb477ee2ed1d57116d884e95f278bf19f0
Author: Justin Lecher gentoo org>
AuthorDate: Sat Feb 25 20:09:41 2017 +
Commit: Justin Lecher gentoo org>
CommitDate: Sat Feb 25 20:42:16 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=60b0e8eb
dev-python/numexpr: Drop old
Package-Manager: Portage-2.3.3, Repoman-2.3.1
Signed-off-by: Justin Lecher gentoo.org>
dev-python/numexpr/Manifest| 4 --
.../numexpr/files/numexpr-2.4.3-testfix.patch | 34 -
dev-python/numexpr/numexpr-2.4.3.ebuild| 55 --
dev-python/numexpr/numexpr-2.4.4.ebuild| 53 -
dev-python/numexpr/numexpr-2.4.6.ebuild| 53 -
dev-python/numexpr/numexpr-2.5.ebuild | 55 --
6 files changed, 254 deletions(-)
diff --git a/dev-python/numexpr/Manifest b/dev-python/numexpr/Manifest
index 87f2ee2ba2..183b02c5fe 100644
--- a/dev-python/numexpr/Manifest
+++ b/dev-python/numexpr/Manifest
@@ -1,5 +1 @@
-DIST numexpr-2.4.3.tar.gz 85171 SHA256
3ae7191c89df40db6b0a8637a4dace7c5956bc910793a53225f985f3b443c722 SHA512
b33984072fddd4303980be8533e1348b48ff27de5e150029147e3666ce6bb9e1147dbc45eb0ef22506aebaea6fb366d65ff01221235f9b9935d78ea70ba9aa53
WHIRLPOOL
ac5981bac643b825d6ab2fbd6c46b6d73ad62374490e5f05a71fc0b9c4269ab401617da98079e1604b11f454863e64e009a2acc00b7b30499b20eff73efe033f
-DIST numexpr-2.4.4.tar.gz 87133 SHA256
dfa2fad1af040e93a8022fbe4437f2183bf80e5f64d466381ad589308a73565b SHA512
abc53f8aafb39e55b6b811c1f08c01eefca23c36fb9d20a82484ef658c8062ffe51d8841d6651f43fb7f8cea6420270623df6ba9f98a95a0f7a09e6ceef91b35
WHIRLPOOL
9ab19609189e866a11c03b0aeaa3b93124d8018d53e8dec641721eff39eb73c969c34c457209d63988361ffadef13a205ba5b71d19ad120e9f44313f42c7cd1b
-DIST numexpr-2.4.6.tar.gz 87481 SHA256
052397670dc56d7845ff894cd7d858e4f115491ecd93bcc0eda5cb83990c5da3 SHA512
fb68e0e782fd9e9e3cef9288addc0dfc3b79dbf01f0e72422cda6d5effd0f1629a49f9e5b89dcd16fa904423e0e9c776f3f276b4817e83cc58029c90a8627096
WHIRLPOOL
485eb98636f1ee5e1efbc843b404a23f3495d1b6682de15b67275a9c4082c87a1550d1bb91a19a7942f10f2f137af4a6294aaed95d7fd746f2db45d7319b70ec
-DIST numexpr-2.5.tar.gz 88347 SHA256
319cdf4e402177a1c8ed4972cffd09f523446f186d347b7c1974787cdabf0294 SHA512
32cc70a9dd8cec67d014056c98e798bdaef6338365366ebebd60fa5655dda2cdcb5df550c8afe87aa85e0c87ebada6ae695d125d8b605f32c368bde731ff2a6c
WHIRLPOOL
a48a887b324d9a904083621024fcdd6c5fcaa60577c9d76bf88bb370d844b75c409851e9f4a28aefce2a5a3f0420329c67f3d68e825c2525db1dd6aea2340bb1
DIST numexpr-2.6.1.tar.gz 90819 SHA256
db2ee72f277b23c82d204189290ea4b792f9bd5b9d67744b045f8c2a8e929a06 SHA512
07c88b1788ecad2c59260e7a6a15dfc21d486462a8866091d157286e5ce3b5b77f5fdab401fd30e2a5e4880398af53641d557003497c7d3658421bfcff38c31c
WHIRLPOOL
ef77ff356f79d2171685aa1267a63dfbd89a120300dd970bb9768df611a734483e21f78d4b1b09c4f3a5943cbbb6e9b48f03191bd7738063df076c07b6663a49
diff --git a/dev-python/numexpr/files/numexpr-2.4.3-testfix.patch
b/dev-python/numexpr/files/numexpr-2.4.3-testfix.patch
deleted file mode 100644
index 3104ddcc3d..00
--- a/dev-python/numexpr/files/numexpr-2.4.3-testfix.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-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
deleted file mode 100644
index a69f39208f..00
--- a/dev-python/numexpr/numexpr-2.4.3.ebuild
+++ /dev/null
@@ -1,55
[gentoo-commits] repo/gentoo:master commit in: dev-python/numexpr/files/, dev-python/numexpr/
commit: 262ee4db31e1258580005824bcd6d6d1ba164f11
Author: Ian Delaney idella4 AT gentoo DOT org
AuthorDate: Wed Aug 19 06:59:43 2015 +
Commit: Ian Delaney idella4 AT gentoo DOT org
CommitDate: Wed Aug 19 07:00:31 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=262ee4db
dev-python/numexpr: add patch merged upstream to fix test failures
Package-Manager: portage-2.2.20
.../numexpr/files/numexpr-2.4.3-testfix.patch | 34 ++
dev-python/numexpr/numexpr-2.4.3.ebuild| 4 +--
2 files changed, 36 insertions(+), 2 deletions(-)
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
index 000..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, bpepe])
++b = np.array([bpepe2, 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([bp, bpepe])
++b = np.array([bpepe2, 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 40aa4ec..34e6218 100644
--- 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
