From 0cdd46ad5d0cd7ede78815175764fdf76649d46e Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 21 Apr 2023 06:01:43 +0100 Subject: gentoo auto-resync : 21:04:2023 - 06:01:43 --- dev-python/scipy/Manifest | 8 +- .../scipy-1.9.9999-meson-options-lapack.patch | 28 ----- dev-python/scipy/metadata.xml | 3 - dev-python/scipy/scipy-1.10.0.ebuild | 125 --------------------- dev-python/scipy/scipy-1.9.2.ebuild | 107 ------------------ 5 files changed, 1 insertion(+), 270 deletions(-) delete mode 100644 dev-python/scipy/files/scipy-1.9.9999-meson-options-lapack.patch delete mode 100644 dev-python/scipy/scipy-1.10.0.ebuild delete mode 100644 dev-python/scipy/scipy-1.9.2.ebuild (limited to 'dev-python/scipy') diff --git a/dev-python/scipy/Manifest b/dev-python/scipy/Manifest index 3290e4dd1e39..ac2668645767 100644 --- a/dev-python/scipy/Manifest +++ b/dev-python/scipy/Manifest @@ -1,14 +1,8 @@ -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.10.1.tar.gz 42407997 BLAKE2B 807dceb1e056a1a2c0ec354e4e21f64e59cdab9eaf286cec3783bb93bf80efa00a71e7bd8d1898e8a2fdf86b614f035a0a97436dc4515574d73d9d4521824316 SHA512 767e1dee6285d98e4d58d8d8d1e3654b00e3216e9ad55455fc9473f1d044bef80ecce749bcd24d8f331367b882c9c3e6b652a6e901bb4296ddc7cc44699215b6 -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.10.1.zip 49191107 BLAKE2B 5163ae3a62745992bcf94ab02ca2bb13fcf6d2ae0eb2a113ba29bc37a8e8f40ec70e39fe16e6371ce0bc31d4c8f0f46746be91b4fe2ad41c68a985c6f00fb8e7 SHA512 f3252452d3bfd400890f29460de2f97bf72732e0fc864582e906b78808e856ead5b1bf97cba531f2150e396408e585499d127004231421d20108e96040316232 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 2789 BLAKE2B 6b124a6b86b1e8d2581b2614f4c7d62c1de12a8c20e41ee758da74464fd8921db31baf66c93e7fc6fc57e175d3a73dec133aae99959c96222a0673c19f7d9c3c SHA512 4d6b0a20ccf73df7f39fe29c461d21606580bcf3404fe049cd6fa1876de35307ad34c0b75439e8eb4941c68161fdd101031ec3297d22b6cc8db32bfde32c70ad EBUILD scipy-1.10.1.ebuild 2704 BLAKE2B a13bc553bb45387472bfb270e19ad7bb5649f3e8f407ea7ce580fd0b96004b21a2286ac965e60a9196ef0f312a4fa59772ac5379fe333de5cb61fc750a727543 SHA512 2eae20506e54a06e4b7d1f70896cd12febdad03be142b54d2891c6665214a3a8c4df8231f468744933bc22417afe5a1fd068bec8f294115d60858b4bf55f41fc -EBUILD scipy-1.9.2.ebuild 2354 BLAKE2B a4eaa4602214ab99912c0c7fd022ec6a28f15e1da3ee726d9b58b5ff9f89f2646778db383e42d3739dee738add3c701968292745146d9ecb92cf69419207abc3 SHA512 5656b4e55bfb9023138673028cad35fccb4c4e1eb6ae8c6547b2995cf3cbda04e5574c20d64d7293b7b2012aa8fb0ea647a112aa2f9058e120fb10c25c815a02 EBUILD scipy-1.9.3.ebuild 2437 BLAKE2B 40db678acdef419a95c27aeb36257b5a34a94b332d1f2cfb68c92c9704a26cc9c4f2a05894cfcc66c1b72a48852ce93a0d4197b8cda5a9a66dffc6518d4e0cf7 SHA512 95bf16f4ee511791b46a14def90708294873b8be0e21439f4ef0ac9a456b83b431dc6e22adee586bf3528bb57f1e780b1b8ecabe29e4a712a84e938dc5dd8ace -MISC metadata.xml 1054 BLAKE2B 490b13e1a307b1990f692d43f3bdc2bbe92e8dad809a24c9223358028eeff2e0387043383e7616df3d010d6bf669337c4c7cf57587181c2c77d93e2ef6e3b8e4 SHA512 379160f7146a8e7dbbfb7243e39f76e12399e47cf0eab632fc3e1598f5fa4482151b769d16c6f026192ac16b8fefdd363427b14decf66c7e1f6e1630444abdf7 +MISC metadata.xml 953 BLAKE2B a09ea1325a175e349fbc3ca77c5e7b373538ea01147e8544f44b7d4e0c55fbbc2012431fcfe9a3457e82d295e4b5630df1ed69c48ef3462ed9b157af30a1e09a SHA512 74a21c6e1a9bef95b3d74a9513c59d302f473725c04fa32a9991b6108113c0f4b78179ce4a628140e7aa870c24ca60bddf7a00063b6b73dd45110112311371d8 diff --git a/dev-python/scipy/files/scipy-1.9.9999-meson-options-lapack.patch b/dev-python/scipy/files/scipy-1.9.9999-meson-options-lapack.patch deleted file mode 100644 index 23d29c31c2cb..000000000000 --- a/dev-python/scipy/files/scipy-1.9.9999-meson-options-lapack.patch +++ /dev/null @@ -1,28 +0,0 @@ -diff --git a/meson_options.txt b/meson_options.txt -index 5935bb8..f8c14ce 100644 ---- a/meson_options.txt -+++ b/meson_options.txt -@@ -1,6 +1,6 @@ --option('blas', type: 'string', value: 'openblas', -+option('blas', type: 'string', value: 'blas', - description: 'option for BLAS library switching') --option('lapack', type: 'string', value: 'openblas', -+option('lapack', type: 'string', value: 'lapack', - description: 'option for LAPACK library switching') - option('use-g77-abi', type: 'boolean', value: 'false', - description: 'If set to true, forces using g77 compatibility wrappers ' + -diff --git a/meson.build b/meson.build -index d80ebc93e..c0c92c00f 100644 ---- a/meson.build -+++ b/meson.build -@@ -16,8 +16,8 @@ project( - 'c_args=-Wno-unused-function -Wno-conversion -Wno-misleading-indentation -Wno-incompatible-pointer-types', - 'fortran_args=-Wno-conversion', - 'fortran_std=legacy', -- 'blas=openblas', -- 'lapack=openblas' -+ 'blas=blas', -+ 'lapack=lapack' - ], - ) - diff --git a/dev-python/scipy/metadata.xml b/dev-python/scipy/metadata.xml index 3d6d78db5ad1..65faa04f1fe2 100644 --- a/dev-python/scipy/metadata.xml +++ b/dev-python/scipy/metadata.xml @@ -17,9 +17,6 @@ integration, special functions, signal and image processing, genetic algorithms, ODE solvers, and others. - - Use dev-python/pythran to accelerate runtime - scipy/scipy scipy diff --git a/dev-python/scipy/scipy-1.10.0.ebuild b/dev-python/scipy/scipy-1.10.0.ebuild deleted file mode 100644 index bf013408674e..000000000000 --- a/dev-python/scipy/scipy-1.10.0.ebuild +++ /dev/null @@ -1,125 +0,0 @@ -# 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_{9..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 arm arm64 -hppa ~ppc ppc64 ~riscv ~sparc x86" - 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.2.ebuild b/dev-python/scipy/scipy-1.9.2.ebuild deleted file mode 100644 index 622b086267d8..000000000000 --- a/dev-python/scipy/scipy-1.9.2.ebuild +++ /dev/null @@ -1,107 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DISTUTILS_USE_PEP517=meson-python -PYTHON_COMPAT=( python3_{9..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 ppc ppc64 ~riscv ~s390 x86" - fi -fi - -LICENSE="BSD LGPL-2" -SLOT="0" -IUSE="doc +pythran" - -# 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/pybind11[${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=( - "${FILESDIR}"/${PN}-1.9.9999-meson-options-lapack.patch -) - -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 -} - -src_configure() { - export SCIPY_USE_PYTHRAN=$(usex pythran 1 0) -} - -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