commit: 3016a64377c355128fad71f6d419002b2fbe2357
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Oct 8 23:37:06 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Oct 8 23:44:55 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3016a643
dev-python/scipy: add 1.9.2
Signed-off-by: Sam James <sam <AT> gentoo.org>
dev-python/scipy/Manifest | 1 +
.../{scipy-1.9.9999.ebuild => scipy-1.9.2.ebuild} | 20 +++++++++++---------
dev-python/scipy/scipy-1.9.9999.ebuild | 20 +++++++++++---------
3 files changed, 23 insertions(+), 18 deletions(-)
diff --git a/dev-python/scipy/Manifest b/dev-python/scipy/Manifest
index 7b42cb8e9a66..a6f36eba71a1 100644
--- a/dev-python/scipy/Manifest
+++ b/dev-python/scipy/Manifest
@@ -1,4 +1,5 @@
DIST scipy-1.8.1.tar.gz 38196215 BLAKE2B
180ae646adba2031a4bf99cd4feefe652b8e340110b3b2872e61aa1083054aadf369c7e3b3e3fd8fb71fcd831c95841d2dadd1c71e35e5f7d95800e5551173f0
SHA512
f6fc71c209991fe82baa4b10d8ade0deb1057f6f5942a91dfb7ae45f3eb78a4535efa2861badf5e2d37239fa99dbd99de760aa7e4854b95991ade0263004e7ea
DIST scipy-1.9.1.tar.gz 42019478 BLAKE2B
aa7f9e8f354d2c73cfeb0e349562279ec323e6c16641c82c47080108d21f385acb1431c1f072e454a043f56e8fd708778fc34c0eddaceedca979f40b6b11e358
SHA512
1378a24c59b66e2818929acd015fe5408cdd57926d96b7b909d5eb7e2bb6bae942e8fe802f107c8b0901af9873b8e24461624ca0917867e24bb50c7d28e09e71
+DIST scipy-1.9.2.tar.gz 42068300 BLAKE2B
0962115990a12339d8b87eabbee02d52a52e57259fbe2e74884fa2f08d66d8b7505f84561f643b539603bc8bf4ef3bf73c3d908453fbb0c99f732c3a81f8a328
SHA512
5f8667aa66aa0b5fad689d960f742874ce09f830bfd5aa241917526f153fbc09c7f709bc84113f83283fcbb8a47113eb215478d9c3473f76d8f7dbf0989429a2
DIST scipy-html-1.8.1.zip 37060661 BLAKE2B
2fa617c58eb47463f8a61f9798b32c6da255d26b8e86c1558e427a715093f5a29ced3847ab6ecfe88ce1017664f36ac3e9fa9bbf72ede7e0fd3812b5f41fe933
SHA512
95153dc1f404aa64898a700c94c0deea3ca842c3152167d0987edabcf4a8eba16b6c8e6bc38a6775a849dc621e6a21434baf53d1669b1865fa5049cffa4387ac
DIST scipy-ref-1.8.1.pdf 35025868 BLAKE2B
9221755d2dc69b8623271f75ff3078a0a4410fe9ff69ee317b40bf145af7da21a7f5f4b6b67820d8bb2878f83b7014f1ea7c2f0e026afb716da0479d394505e2
SHA512
8f27dcb9dd1030e15266389af21a1475ecfec5ea777fb2dbcf8db8d3398ac6e45c7040b8d6dbaffd29be3920925427be7c55efdc8094d670c857edfdab7f7728
diff --git a/dev-python/scipy/scipy-1.9.9999.ebuild
b/dev-python/scipy/scipy-1.9.2.ebuild
similarity index 86%
copy from dev-python/scipy/scipy-1.9.9999.ebuild
copy to dev-python/scipy/scipy-1.9.2.ebuild
index e2718fe21ca6..06820b113911 100644
--- a/dev-python/scipy/scipy-1.9.9999.ebuild
+++ b/dev-python/scipy/scipy-1.9.2.ebuild
@@ -4,7 +4,7 @@
EAPI=8
DISTUTILS_USE_PEP517=meson-python
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} )
PYTHON_REQ_USE="threads(+)"
inherit fortran-2 distutils-r1 multiprocessing
@@ -38,13 +38,13 @@ else
S="${WORKDIR}"/${MY_P}
if [[ ${PV} != *rc* ]] ; then
- KEYWORDS="~amd64 -hppa ~ppc64 ~riscv"
+ KEYWORDS="~amd64 ~arm64 -hppa ~ppc64 ~riscv"
fi
fi
LICENSE="BSD LGPL-2"
SLOT="0"
-IUSE="doc"
+IUSE="doc +pythran"
# umfpack is technically optional but it's preferred to have it available.
DEPEND="
@@ -58,16 +58,15 @@ RDEPEND="
${DEPEND}
dev-python/pillow[${PYTHON_USEDEP}]
"
-# TODO: restore pythran optionality?
BDEPEND="
dev-lang/swig
>=dev-python/cython-0.29.18[${PYTHON_USEDEP}]
dev-python/pybind11[${PYTHON_USEDEP}]
- dev-python/pythran[${PYTHON_USEDEP}]
>=dev-util/meson-0.62.2
dev-util/patchelf
virtual/pkgconfig
doc? ( app-arch/unzip )
+ pythran? ( dev-python/pythran[${PYTHON_USEDEP}] )
test? ( dev-python/pytest-xdist[${PYTHON_USEDEP}] )"
PATCHES=(
@@ -84,11 +83,15 @@ distutils_enable_tests pytest
src_unpack() {
default
- if [[ ${PV} != *9999 ]] && use doc; then
+ if use doc; then
unzip -qo "${DISTDIR}"/${PN}-html-${DOC_PV}.zip -d html || die
fi
}
+src_configure() {
+ export SCIPY_USE_PYTHRAN=$(usex pythran 1 0)
+}
+
python_test() {
cd "${T}" || die
@@ -96,10 +99,9 @@ python_test() {
}
python_install_all() {
- if [[ ${PV} != *9999 ]] && use doc; then
- local DOCS=( "${DISTDIR}"/${PN}-ref-${DOC_PV}.pdf )
+ use doc && \
+ local DOCS=( "${DISTDIR}"/${PN}-ref-${DOC_PV}.pdf ) \
local HTML_DOCS=( "${WORKDIR}"/html/. )
- fi
distutils-r1_python_install_all
}
diff --git a/dev-python/scipy/scipy-1.9.9999.ebuild
b/dev-python/scipy/scipy-1.9.9999.ebuild
index e2718fe21ca6..06820b113911 100644
--- a/dev-python/scipy/scipy-1.9.9999.ebuild
+++ b/dev-python/scipy/scipy-1.9.9999.ebuild
@@ -4,7 +4,7 @@
EAPI=8
DISTUTILS_USE_PEP517=meson-python
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} )
PYTHON_REQ_USE="threads(+)"
inherit fortran-2 distutils-r1 multiprocessing
@@ -38,13 +38,13 @@ else
S="${WORKDIR}"/${MY_P}
if [[ ${PV} != *rc* ]] ; then
- KEYWORDS="~amd64 -hppa ~ppc64 ~riscv"
+ KEYWORDS="~amd64 ~arm64 -hppa ~ppc64 ~riscv"
fi
fi
LICENSE="BSD LGPL-2"
SLOT="0"
-IUSE="doc"
+IUSE="doc +pythran"
# umfpack is technically optional but it's preferred to have it available.
DEPEND="
@@ -58,16 +58,15 @@ RDEPEND="
${DEPEND}
dev-python/pillow[${PYTHON_USEDEP}]
"
-# TODO: restore pythran optionality?
BDEPEND="
dev-lang/swig
>=dev-python/cython-0.29.18[${PYTHON_USEDEP}]
dev-python/pybind11[${PYTHON_USEDEP}]
- dev-python/pythran[${PYTHON_USEDEP}]
>=dev-util/meson-0.62.2
dev-util/patchelf
virtual/pkgconfig
doc? ( app-arch/unzip )
+ pythran? ( dev-python/pythran[${PYTHON_USEDEP}] )
test? ( dev-python/pytest-xdist[${PYTHON_USEDEP}] )"
PATCHES=(
@@ -84,11 +83,15 @@ distutils_enable_tests pytest
src_unpack() {
default
- if [[ ${PV} != *9999 ]] && use doc; then
+ if use doc; then
unzip -qo "${DISTDIR}"/${PN}-html-${DOC_PV}.zip -d html || die
fi
}
+src_configure() {
+ export SCIPY_USE_PYTHRAN=$(usex pythran 1 0)
+}
+
python_test() {
cd "${T}" || die
@@ -96,10 +99,9 @@ python_test() {
}
python_install_all() {
- if [[ ${PV} != *9999 ]] && use doc; then
- local DOCS=( "${DISTDIR}"/${PN}-ref-${DOC_PV}.pdf )
+ use doc && \
+ local DOCS=( "${DISTDIR}"/${PN}-ref-${DOC_PV}.pdf ) \
local HTML_DOCS=( "${WORKDIR}"/html/. )
- fi
distutils-r1_python_install_all
}
