From f29a41111b3a606f5d95049b1ba92daabbc68cc0 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Thu, 5 Jan 2023 12:08:58 +0000 Subject: gentoo auto-resync : 05:01:2023 - 12:08:57 --- dev-python/scipy/Manifest | 4 +- dev-python/scipy/scipy-1.10.0.ebuild | 125 +++++++++++++++++++++++++++++++++ dev-python/scipy/scipy-1.9.9999.ebuild | 109 ---------------------------- 3 files changed, 128 insertions(+), 110 deletions(-) create mode 100644 dev-python/scipy/scipy-1.10.0.ebuild delete mode 100644 dev-python/scipy/scipy-1.9.9999.ebuild (limited to 'dev-python/scipy') diff --git a/dev-python/scipy/Manifest b/dev-python/scipy/Manifest index 086131ee74f2..ef1cceb0551d 100644 --- a/dev-python/scipy/Manifest +++ b/dev-python/scipy/Manifest @@ -1,9 +1,11 @@ AUX scipy-1.9.9999-meson-options-lapack.patch 1013 BLAKE2B 04cb7b3bc281ef06fe4360f31ea6befe91134bc68ce2a981df704f52814487503d35100bf7fd429d854d0716eaac20f5d55aadad02a4d48eeed8ad55955232b6 SHA512 6d8f6e4c6399f5e8a641a87168b1e2abd31b69a23f90582cba5d8d22d46de0c89d7b0719a25f3cf4e6cd9f81c9ebe0c94d1ba8b6c6b0209020491603b1f548aa +DIST scipy-1.10.0.tar.gz 42398693 BLAKE2B fc2c1ef997fb14716453d94a6d12f8cbdfb742c99bec2c5c504a70248217e44d84b3326304e7bfafd3a52b968de3404b0a084d1e8043295842d01f4337732d91 SHA512 13fec0a2c24b90617ad4701c43c54757c91d2c62ca4b9ea5e5c5d130177ba4d2bb8687aae9057b58c26d1a77e4291164bad7ba9e21352669c07ba18bf539ad32 DIST scipy-1.9.2.tar.gz 42068300 BLAKE2B 0962115990a12339d8b87eabbee02d52a52e57259fbe2e74884fa2f08d66d8b7505f84561f643b539603bc8bf4ef3bf73c3d908453fbb0c99f732c3a81f8a328 SHA512 5f8667aa66aa0b5fad689d960f742874ce09f830bfd5aa241917526f153fbc09c7f709bc84113f83283fcbb8a47113eb215478d9c3473f76d8f7dbf0989429a2 DIST scipy-1.9.3.tar.gz 42075414 BLAKE2B f19e829d26a5673cccb69bce43a9142637f42a9ec462a3fd2ea44b62564cff6fb27a4deaccc59e0e738cc0c997b0a7de948bf9f2db6fa7896323405a072e0111 SHA512 119f9a5e1ce3b4268ba38a0eb82dff78837593d9a5c5e464663925a4b3b1de060201fe568236e19ed0996a045754333c580e181c4cdec2cc707e57060f59364e +DIST scipy-html-1.10.0.zip 65656379 BLAKE2B 4a4f1e428bc2355f32be05e35634e5aaccb0938f170ee247931a892cf7ab59b3a9ab952060e98936e153bed752c29c01ed34eba02188b3514de7607285c01d08 SHA512 3bda526f209905355b3f87ba1529b9f45c3580ce7d9b80a63931871dab1542347f243c9f688854cb67d575e9a645ec89105775accdc746fc290113f28978b73b DIST scipy-html-1.8.1.zip 37060661 BLAKE2B 2fa617c58eb47463f8a61f9798b32c6da255d26b8e86c1558e427a715093f5a29ced3847ab6ecfe88ce1017664f36ac3e9fa9bbf72ede7e0fd3812b5f41fe933 SHA512 95153dc1f404aa64898a700c94c0deea3ca842c3152167d0987edabcf4a8eba16b6c8e6bc38a6775a849dc621e6a21434baf53d1669b1865fa5049cffa4387ac DIST scipy-ref-1.8.1.pdf 35025868 BLAKE2B 9221755d2dc69b8623271f75ff3078a0a4410fe9ff69ee317b40bf145af7da21a7f5f4b6b67820d8bb2878f83b7014f1ea7c2f0e026afb716da0479d394505e2 SHA512 8f27dcb9dd1030e15266389af21a1475ecfec5ea777fb2dbcf8db8d3398ac6e45c7040b8d6dbaffd29be3920925427be7c55efdc8094d670c857edfdab7f7728 +EBUILD scipy-1.10.0.ebuild 2751 BLAKE2B ccf59eb73016641dd8c8b0b3d39ecf90b7273f44902fedaa3419e7fd96688890e2931e056a46573e3b0ab65a25af9da0dfd63a9416c258d5c287a6905a959121 SHA512 d052c19902bfbf1ef46c0f7acb4cf6951b8c3d9d70c344eefd2b93d62a5f764a5f04c5198709ddc722296e9b5fb1b9fa1383602d2f539230a1aa2f37a00a942e EBUILD scipy-1.9.2.ebuild 2354 BLAKE2B c013d3f8f9ddf0ba89246c9af4d4285f06b6aefdafb3c988924c93b3f70e97486c352933a6855e0b33d2d62dca49a6a58a0202b590f0b32f7834894a4e97db55 SHA512 dc72624aefd000730f8b8837e0ee7f4b56f57905e211c5eff186d3b9b21d891f8eda4484235edaccbf2505bbb02e25d5945b49f51265dedc9b4fe6ec0fc18b0f EBUILD scipy-1.9.3.ebuild 2439 BLAKE2B cfe98bc6faa372817b90889b0c6f96aceb7f5c1df7822b9aee2f74470b8e2615dbc6369844188ffae9ad3c0ec264178a054d708713c84ccabc1f226fb410a901 SHA512 b3d5e11e9e85ad1c76211a26733b8eeb32b307c1bb5473f130ab1f8a6d615115eed4b11e708f10613ef012f9567f421f2b569b7e8bf66d48b2f18a42e00e661b -EBUILD scipy-1.9.9999.ebuild 2430 BLAKE2B f21f758cfdf268fdf4f58d7e4b856b0c348372e61d7875cd36f08720be587cd07c15ad539726bb4035a98d7a6eac399d2e5eeac925f11e23805bc015eaa81ef2 SHA512 4881d7658c22fed8b7b15d417e12e24e0389637ed5378dee5128aca4647788cc2450dc084fbece5666a629c6136e1a117070e71ecbe1b0b96a0e1ad3902fe8e4 MISC metadata.xml 1054 BLAKE2B 490b13e1a307b1990f692d43f3bdc2bbe92e8dad809a24c9223358028eeff2e0387043383e7616df3d010d6bf669337c4c7cf57587181c2c77d93e2ef6e3b8e4 SHA512 379160f7146a8e7dbbfb7243e39f76e12399e47cf0eab632fc3e1598f5fa4482151b769d16c6f026192ac16b8fefdd363427b14decf66c7e1f6e1630444abdf7 diff --git a/dev-python/scipy/scipy-1.10.0.ebuild b/dev-python/scipy/scipy-1.10.0.ebuild new file mode 100644 index 000000000000..deff07afc050 --- /dev/null +++ b/dev-python/scipy/scipy-1.10.0.ebuild @@ -0,0 +1,125 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +FORTRAN_NEEDED=fortran +DISTUTILS_USE_PEP517=meson-python +PYTHON_COMPAT=( python3_{8..11} ) +PYTHON_REQ_USE="threads(+)" + +inherit fortran-2 distutils-r1 multiprocessing + +DESCRIPTION="Scientific algorithms library for Python" +HOMEPAGE=" + https://scipy.org/ + https://github.com/scipy/scipy/ + https://pypi.org/project/scipy/ +" + +if [[ ${PV} == *9999* ]] ; then + inherit git-r3 + + # Need submodules, so git for now. + EGIT_REPO_URI="https://github.com/scipy/scipy" + EGIT_BRANCH="maintenance/$(ver_cut 1-2).x" + EGIT_SUBMODULES=( '*' ) +else + # Upstream is often behind with doc updates + DOC_PV=1.10.0 + MY_PV=${PV/_rc/rc} + MY_P=${PN}-${MY_PV} + + SRC_URI=" + mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz + doc? ( + https://docs.scipy.org/doc/${PN}-${DOC_PV}/${PN}-html-${DOC_PV}.zip + )" + S="${WORKDIR}"/${MY_P} + + if [[ ${PV} != *rc* ]] ; then + KEYWORDS="~amd64 -hppa" + fi +fi + +LICENSE="BSD LGPL-2" +SLOT="0" +IUSE="doc +fortran test-rust" + +# umfpack is technically optional but it's preferred to have it available. +DEPEND=" + >=dev-python/numpy-1.19.5[lapack,${PYTHON_USEDEP}] + sci-libs/arpack:= + sci-libs/umfpack + virtual/cblas + >=virtual/lapack-3.8 +" +RDEPEND=" + ${DEPEND} + dev-python/pillow[${PYTHON_USEDEP}] +" +BDEPEND=" + dev-lang/swig + >=dev-python/cython-0.29.18[${PYTHON_USEDEP}] + >=dev-python/meson-python-0.11[${PYTHON_USEDEP}] + dev-python/pybind11[${PYTHON_USEDEP}] + >=dev-util/meson-0.62.2 + dev-util/patchelf + virtual/pkgconfig + doc? ( app-arch/unzip ) + fortran? ( dev-python/pythran[${PYTHON_USEDEP}] ) + test? ( + dev-python/pytest-xdist[${PYTHON_USEDEP}] + ) + test-rust? ( + dev-python/pooch[${PYTHON_USEDEP}] + ) +" + +EPYTEST_DESELECT=( + linalg/tests/test_decomp.py::TestSchur::test_sort + linalg/tests/test_solvers.py::test_solve_discrete_are + optimize/tests/test_milp.py::test_milp_timeout_16545 + + # Network + datasets/tests/test_data.py::TestDatasets::test_existence_all + datasets/tests/test_data.py::TestDatasets::test_ascent + datasets/tests/test_data.py::TestDatasets::test_face + datasets/tests/test_data.py::TestDatasets::test_electrocardiogram +) + +distutils_enable_tests pytest + +src_unpack() { + default + + if use doc; then + unzip -qo "${DISTDIR}"/${PN}-html-${DOC_PV}.zip -d html || die + fi +} + +python_configure_all() { + export SCIPY_USE_PYTHRAN=$(usex fortran 1 0) + DISTUTILS_ARGS=( + -Dblas=blas + -Dlapack=lapack + ) +} + +python_test() { + cd "${T}" || die + + if ! has_version -b "dev-python/pooch[${PYTHON_USEDEP}]" ; then + EPYTEST_IGNORE+=( + datasets/tests/test_data.py + ) + fi + + epytest -n "$(makeopts_jobs)" --pyargs scipy +} + +python_install_all() { + use doc && local HTML_DOCS=( "${WORKDIR}"/html/. ) + + 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 deleted file mode 100644 index 98456d78bf82..000000000000 --- a/dev-python/scipy/scipy-1.9.9999.ebuild +++ /dev/null @@ -1,109 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -FORTRAN_NEEDED=fortran -DISTUTILS_USE_PEP517=meson-python -PYTHON_COMPAT=( python3_{8..11} ) -PYTHON_REQ_USE="threads(+)" - -inherit fortran-2 distutils-r1 multiprocessing - -DESCRIPTION="Scientific algorithms library for Python" -HOMEPAGE=" - https://scipy.org/ - https://github.com/scipy/scipy/ - https://pypi.org/project/scipy/ -" - -if [[ ${PV} == *9999* ]] ; then - inherit git-r3 - - # Need submodules, so git for now. - EGIT_REPO_URI="https://github.com/scipy/scipy" - EGIT_BRANCH="maintenance/$(ver_cut 1-2).x" - EGIT_SUBMODULES=( '*' ) -else - # Upstream is often behind with doc updates - DOC_PV=1.8.1 - MY_PV=${PV/_rc/rc} - MY_P=${PN}-${MY_PV} - - SRC_URI=" - mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz - doc? ( - https://docs.scipy.org/doc/${PN}-${DOC_PV}/${PN}-html-${DOC_PV}.zip - https://docs.scipy.org/doc/${PN}-${DOC_PV}/${PN}-ref-${DOC_PV}.pdf - )" - S="${WORKDIR}"/${MY_P} - - if [[ ${PV} != *rc* ]] ; then - KEYWORDS="~amd64 ~arm ~arm64 -hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~x86" - fi -fi - -LICENSE="BSD LGPL-2" -SLOT="0" -IUSE="doc +fortran" - -# umfpack is technically optional but it's preferred to have it available. -DEPEND=" - >=dev-python/numpy-1.18.5[lapack,${PYTHON_USEDEP}] - sci-libs/arpack:= - sci-libs/umfpack - virtual/cblas - >=virtual/lapack-3.8 -" -RDEPEND=" - ${DEPEND} - dev-python/pillow[${PYTHON_USEDEP}] -" -BDEPEND=" - dev-lang/swig - >=dev-python/cython-0.29.18[${PYTHON_USEDEP}] - >=dev-python/meson-python-0.11[${PYTHON_USEDEP}] - dev-python/pybind11[${PYTHON_USEDEP}] - >=dev-util/meson-0.62.2 - dev-util/patchelf - virtual/pkgconfig - doc? ( app-arch/unzip ) - fortran? ( dev-python/pythran[${PYTHON_USEDEP}] ) - test? ( dev-python/pytest-xdist[${PYTHON_USEDEP}] )" - -EPYTEST_DESELECT=( - linalg/tests/test_decomp.py::TestSchur::test_sort - linalg/tests/test_solvers.py::test_solve_discrete_are -) - -distutils_enable_tests pytest - -src_unpack() { - default - - if use doc; then - unzip -qo "${DISTDIR}"/${PN}-html-${DOC_PV}.zip -d html || die - fi -} - -python_configure_all() { - export SCIPY_USE_PYTHRAN=$(usex fortran 1 0) - DISTUTILS_ARGS=( - -Dblas=blas - -Dlapack=lapack - ) -} - -python_test() { - cd "${T}" || die - - epytest -n "$(makeopts_jobs)" --pyargs scipy -} - -python_install_all() { - use doc && \ - local DOCS=( "${DISTDIR}"/${PN}-ref-${DOC_PV}.pdf ) \ - local HTML_DOCS=( "${WORKDIR}"/html/. ) - - distutils-r1_python_install_all -} -- cgit v1.2.3