From 0f558761aa2dee1017b4751e4017205e015a9560 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 29 Jun 2022 12:04:12 +0100 Subject: gentoo resync : 29.12.2022 --- dev-python/numexpr/Manifest | 4 +++ .../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.3.ebuild | 34 +++++++++++++++++++ 4 files changed, 98 insertions(+) create mode 100644 dev-python/numexpr/files/numexpr-2.8.1-numpy-1.23.0.patch create mode 100644 dev-python/numexpr/numexpr-2.8.1-r1.ebuild create mode 100644 dev-python/numexpr/numexpr-2.8.3.ebuild (limited to 'dev-python/numexpr') diff --git a/dev-python/numexpr/Manifest b/dev-python/numexpr/Manifest index 9bf1d5be4907..68c4a01ead77 100644 --- a/dev-python/numexpr/Manifest +++ b/dev-python/numexpr/Manifest @@ -1,3 +1,7 @@ +AUX numexpr-2.8.1-numpy-1.23.0.patch 883 BLAKE2B ec2ebce730e72d2813892a152a18ab791565da18c2133d380a06d43c0508120d06d6b7be1e303897f9abb59811a42985c9f315468de09d0e2a79e176780b5d8f SHA512 1a00adc9c9ede86e982368a434a90b297c4907dda351fec6557b42ca02f766633d17346aadadfc6cbb4044dc599d3c67caf5dd7ce4f1c0c52f1914623f46a6e3 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 +EBUILD numexpr-2.8.1-r1.ebuild 1004 BLAKE2B dce2c039e02112a06e1bb2b209e3bd7055ed17579efed26ce411016f6e985a7f82940ccd4085eed19aaecd0734ef0ebf75d73a1f36c8b74bc372ffae0aaac45d SHA512 f8d30d44a473ce1b80556bc2422ffbf1ecb247cd88a82aa51f22d31bb404fc59a47f13efbb6ebe7379ae3c058b33d58bc553b27b58897b577de866bb17f5e74c EBUILD numexpr-2.8.1.ebuild 877 BLAKE2B fcb53d1172529a31edcf3a161b12ffffe3ddb938ec797f247f97bc62f57fd43a6fd82c5c5323b010528d81022785ff24810e5db06b10eced877d24ec4a2b4165 SHA512 cf79f29d797eef24877beba01d5273bdbcdfdbe664de076d927fb182252cfdce5d7d09ab17df52eff1f252e69d2b72b7a0661578ac5c70ec5cdedbbabe980d19 +EBUILD numexpr-2.8.3.ebuild 955 BLAKE2B a2b1f390de3d09bc4111e3a43d7ae46b57ac6c19f8d5bea78d3750b91bf8221bc3f333d2cbd7a50708b9ab8a6819ebea7659b852a4ff525fa89251aeafb343c3 SHA512 98b7d4f34bdea9cb2352a83973627c974c9aeeb2c3418b43453b7dc4f2a1c22bb56431757348cb78a1b2b6090a152e42d64bfdf08573290cab464b64689bd50c MISC metadata.xml 961 BLAKE2B e94e9d69b1a1f5c1dca1e9d0d791b215c7a7ef8f8b42a00bd32e16ee9ba3379a1f5049a1539c8bfcfc7adb110b8179928c5a8273429550000b1a5e6f5cf4c897 SHA512 4e59af51f1f4a44de1289ae47dea1bb2461bc3ab860191e6ed8bc0c244e43cef766d571a903cbdf4e23b3b06bbd0d240b77d1234f30362fb26d1f7a43619dd57 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 000000000000..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 new file mode 100644 index 000000000000..55c558ac78d4 --- /dev/null +++ b/dev-python/numexpr/numexpr-2.8.1-r1.ebuild @@ -0,0 +1,38 @@ +# 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.3.ebuild b/dev-python/numexpr/numexpr-2.8.3.ebuild new file mode 100644 index 000000000000..cbfed545e678 --- /dev/null +++ b/dev-python/numexpr/numexpr-2.8.3.ebuild @@ -0,0 +1,34 @@ +# 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}.gh.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}/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 +} -- cgit v1.2.3