* [gentoo-commits] repo/gentoo:master commit in: dev-python/scipy/, dev-python/scipy/files/
@ 2022-05-17 11:11 Michał Górny
0 siblings, 0 replies; 4+ messages in thread
From: Michał Górny @ 2022-05-17 11:11 UTC (permalink / raw
To: gentoo-commits
commit: 6e04bcb7dba28218aba794b6e0737acf0891a510
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Tue May 17 10:41:20 2022 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Tue May 17 10:41:20 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6e04bcb7
dev-python/scipy: Remove old
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
dev-python/scipy/Manifest | 1 -
.../files/scipy-1.7.1-pythran-tests-32-bit.patch | 31 ----
dev-python/scipy/scipy-1.7.3.ebuild | 194 ---------------------
3 files changed, 226 deletions(-)
diff --git a/dev-python/scipy/Manifest b/dev-python/scipy/Manifest
index 87adcb9658aa..d49ac5272be8 100644
--- a/dev-python/scipy/Manifest
+++ b/dev-python/scipy/Manifest
@@ -1,4 +1,3 @@
-DIST scipy-1.7.3.tar.gz 36102562 BLAKE2B 9a605a45d8f03aae3411a6fa92e32c7f6d10373455493ead847d4ad01429b55dbbc33c1a0309d6c9d76d3e9ab1a06772df59c08d393377896c4b534599f9eb9b SHA512 83fe00cf708a13a08d28af7022ec645d8976c177f2fefb56e0a47bfcbec726330b973d1f44364e23c939ae708e239a05904346f515ea1a37e8b70ad160b81cee
DIST scipy-1.8.0.tar.gz 38313602 BLAKE2B 3f071ad3dfa350bba7eaf8e06c8bdb660f9dc1ef0e0bfc1eb1be2c400f947b2b26d62066a4b0f603ae56244131aff6e4c5b7e87cfd2aa7b278e3071062a4bf02 SHA512 674652728ae76479d17189e6974895bb838a8e83b17b9fb91c5f86faebf2a1387e1466555ac5b51d05c293f9b31b9a72e634f5858105ea984ca94bd2f05bbb4c
DIST scipy-html-1.7.1.zip 32435246 BLAKE2B fd8173da41aba95a14b1376f848bc668c4659bf1bbbdd0f87d926633d36f29c039957d38be145a5583010ebd83f6458090f75bdad773cc0f1591664e13c04c20 SHA512 ee59722878f6ef2d2319cdf4e6a60d3d1184f7c22752f9a8859eaa46fb677ebac9e8eef9c0826998e12bac9399e336799843341ef203224a82c9101347149672
DIST scipy-ref-1.7.1.pdf 33542025 BLAKE2B 6c978f06b770805f0fae06db740e8596658d98bbbc93c865127eae909957503bb38e02a9c97319aed07608718f8f373374b1cf3a8c3bd624aa3143f1d21bc428 SHA512 45720dc299594bac5c7539f950a0ff135b125d86bfe9847032cbff1f294601fefd0a1ac3fd7e3928b2702390c318ae2f8adca6403ba06ea1ded705fcff94ab79
diff --git a/dev-python/scipy/files/scipy-1.7.1-pythran-tests-32-bit.patch b/dev-python/scipy/files/scipy-1.7.1-pythran-tests-32-bit.patch
deleted file mode 100644
index 206d1d9fa3b2..000000000000
--- a/dev-python/scipy/files/scipy-1.7.1-pythran-tests-32-bit.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-https://github.com/scipy/scipy/commit/5b3a3b440525aa5038e2cead1f9b4f23a610cd9f
-
-From: serge-sans-paille <serge.guelton@telecom-bretagne.eu>
-Date: Sun, 18 Jul 2021 11:14:29 +0200
-Subject: [PATCH] Extra pythran annotation for i686 support
-
-Bug spotted on Fedora, see https://src.fedoraproject.org/rpms/scipy/pull-request/22
-
-The `int[::]` annotation is used to accept non-contiguous views.
---- a/scipy/optimize/_group_columns.py
-+++ b/scipy/optimize/_group_columns.py
-@@ -54,6 +54,8 @@ def group_dense(m, n, A):
-
- #pythran export group_sparse(int, int, intc[], intc[])
- #pythran export group_sparse(int, int, int[], int[])
-+#pythran export group_sparse(int, int, intc[::], intc[::])
-+#pythran export group_sparse(int, int, int[::], int[::])
- def group_sparse(m, n, indices, indptr):
- groups = -np.ones(n, dtype=np.intp)
- current_group = 0
---- a/scipy/signal/_max_len_seq_inner.py
-+++ b/scipy/signal/_max_len_seq_inner.py
-@@ -4,6 +4,7 @@
- import numpy as np
-
- #pythran export _max_len_seq_inner(intp[], int8[], int, int, int8[])
-+#pythran export _max_len_seq_inner(int[], int8[], int, int, int8[])
-
- # Fast inner loop of max_len_seq.
- def _max_len_seq_inner(taps, state, nbits, length, seq):
-
diff --git a/dev-python/scipy/scipy-1.7.3.ebuild b/dev-python/scipy/scipy-1.7.3.ebuild
deleted file mode 100644
index 3a3cfc929a8b..000000000000
--- a/dev-python/scipy/scipy-1.7.3.ebuild
+++ /dev/null
@@ -1,194 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} )
-PYTHON_REQ_USE="threads(+)"
-
-inherit fortran-2 distutils-r1 flag-o-matic multiprocessing toolchain-funcs
-
-# upstream is slacking forever with doc updates
-DOC_PV=1.7.1
-DESCRIPTION="Scientific algorithms library for Python"
-HOMEPAGE="https://www.scipy.org/"
-SRC_URI="
- mirror://pypi/${PN:0:1}/${PN}/${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
- )"
-
-LICENSE="BSD LGPL-2"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 -hppa ~ia64 ppc ppc64 ~riscv ~s390 ~sparc x86"
-IUSE="doc +pythran sparse"
-
-DEPEND="
- >=dev-python/numpy-1.16.5[lapack,${PYTHON_USEDEP}]
- sci-libs/arpack:0=
- virtual/cblas
- virtual/lapack
- sparse? ( sci-libs/umfpack:0= )"
-RDEPEND="${DEPEND}
- dev-python/pillow[${PYTHON_USEDEP}]"
-BDEPEND="
- dev-lang/swig
- >=dev-python/cython-0.29.18[${PYTHON_USEDEP}]
- dev-python/pybind11[${PYTHON_USEDEP}]
- virtual/pkgconfig
- doc? ( app-arch/unzip )
- pythran? ( dev-python/pythran[${PYTHON_USEDEP}] )
- test? (
- dev-python/nose[${PYTHON_USEDEP}]
- dev-python/pytest-xdist[${PYTHON_USEDEP}]
- )"
-
-DISTUTILS_IN_SOURCE_BUILD=1
-
-distutils_enable_tests pytest
-
-PATCHES=(
- "${FILESDIR}"/${PN}-1.7.1-pythran-tests-32-bit.patch
-)
-
-src_unpack() {
- default
- if use doc; then
- unzip -qo "${DISTDIR}"/${PN}-html-${DOC_PV}.zip -d html || die
- fi
-}
-
-pc_incdir() {
- $(tc-getPKG_CONFIG) --cflags-only-I $@ | \
- sed -e 's/^-I//' -e 's/[ ]*-I/:/g' -e 's/[ ]*$//' -e 's|^:||'
-}
-
-pc_libdir() {
- $(tc-getPKG_CONFIG) --libs-only-L $@ | \
- sed -e 's/^-L//' -e 's/[ ]*-L/:/g' -e 's/[ ]*$//' -e 's|^:||'
-}
-
-pc_libs() {
- $(tc-getPKG_CONFIG) --libs-only-l $@ | \
- sed -e 's/[ ]-l*\(pthread\|m\)\([ ]\|$\)//g' \
- -e 's/^-l//' -e 's/[ ]*-l/,/g' -e 's/[ ]*$//' \
- | tr ',' '\n' | sort -u | tr '\n' ',' | sed -e 's|,$||'
-}
-
-python_prepare_all() {
- # scipy automatically detects libraries by default
- export {FFTW,FFTW3,UMFPACK}=None
- use sparse && unset UMFPACK
- # the missing symbols are in -lpythonX.Y, but since the version can
- # differ, we just introduce the same scaryness as on Linux/ELF
- [[ ${CHOST} == *-darwin* ]] \
- && append-ldflags -bundle "-undefined dynamic_lookup" \
- || append-ldflags -shared
- [[ -z ${FC} ]] && export FC="$(tc-getFC)"
- # hack to force F77 to be FC until bug #278772 is fixed
- [[ -z ${F77} ]] && export F77="$(tc-getFC)"
- export F90="${FC}"
- export SCIPY_FCONFIG="config_fc --noopt --noarch"
- append-fflags -fPIC
-
- local libdir="${EPREFIX}"/usr/$(get_libdir)
- cat >> site.cfg <<-EOF || die
- [blas]
- include_dirs = $(pc_incdir cblas)
- library_dirs = $(pc_libdir cblas blas):${libdir}
- blas_libs = $(pc_libs cblas blas)
- [lapack]
- library_dirs = $(pc_libdir lapack):${libdir}
- lapack_libs = $(pc_libs lapack)
- EOF
- cat >> setup.cfg <<-EOF || die
- [options]
- zip_safe = False
- EOF
-
- # TODO
- sed -e "s:== 'levy_stable':in ('levy_stable', 'crystalball', 'ncf'):" \
- -i scipy/stats/tests/test_continuous_basic.py || die
-
- # Skip known-failing test. Broken on all versions in Gentoo for years.
- # bug #743295
- sed -e 's:test_bisplev_integer_overflow:_&:' \
- -i scipy/interpolate/tests/test_fitpack.py || die
-
- # Skip a few 32-bit related failures
- if use x86 ; then
- # TODO: Tidy this up and switch to epytest
- sed -i -e 's:test_nd_axis_m1:_&:' \
- -e 's:test_nd_axis_0:_&:' \
- -e 's:test_maxiter_worsening:_&:' \
- -e 's:test_pdist_jensenshannon_iris:_&:' \
- -e 's:test_align_vectors_single_vector:_&:' \
- scipy/signal/tests/test_spectral.py \
- scipy/sparse/linalg/isolve/tests/test_iterative.py \
- scipy/spatial/tests/test_distance.py \
- scipy/spatial/transform/tests/test_rotation.py || die
- fi
-
- if has_version ">=sci-libs/lapack-3.10"; then
- sed -e 's:test_sort(:_&:' \
- -i scipy/linalg/tests/test_decomp.py || die
- sed -e 's:test_solve_discrete_are:_&:' \
- -i scipy/linalg/tests/test_solvers.py || die
- fi
-
- distutils-r1_python_prepare_all
-}
-
-python_configure_all() {
- export SCIPY_USE_PYTHRAN=$(usex pythran 1 0)
-
- # bug 721860
- test-flag-FC -fallow-argument-mismatch &&
- append-fflags -fallow-argument-mismatch
-}
-
-python_compile() {
- # FIXME: parallel python building fails, bug #614464
- export ORIGINAL_MAKEOPTS="${MAKEOPTS}"
- export MAKEOPTS=-j1
-
- ${EPYTHON} tools/cythonize.py || die
- distutils-r1_python_compile \
- ${SCIPY_FCONFIG}
-}
-
-python_test() {
- # fails with bdist_egg. should it be fixed in distutils-r1 eclass?
- distutils_install_for_testing ${SCIPY_FCONFIG}
- cd "${TEST_DIR}/lib" || die "no ${TEST_DIR} available"
-
- # Let's try using pytest again with xdist to speed things up.
- # Note that using pytest is required to avoid dying b/c of a
- # deprecation warning with distutils in Python 3.01.
- epytest -n "$(makeopts_jobs "${ORIGINAL_MAKEOPTS}" "$(get_nproc)")"
-
- # Old test runner
-# PYTHONPATH=. "${EPYTHON}" -c "
-#import scipy, sys
-#r = scipy.test('fast', verbose=2)
-#sys.exit(0 if r else 1)" || die "Tests fail with ${EPYTHON}"
-}
-
-python_install_all() {
- use doc && \
- local DOCS=( "${DISTDIR}"/${PN}-ref-${DOC_PV}.pdf ) \
- local HTML_DOCS=( "${WORKDIR}"/html/. )
- distutils-r1_python_install_all
-}
-
-python_install() {
- distutils-r1_python_install ${SCIPY_FCONFIG}
- python_optimize
-}
-
-pkg_postinst() {
- elog "You might want to set the variable SCIPY_PIL_IMAGE_VIEWER"
- elog "to your prefered image viewer. Example:"
- elog " echo \"export SCIPY_PIL_IMAGE_VIEWER=display\" >> ~/.bashrc"
-}
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-python/scipy/, dev-python/scipy/files/
@ 2022-06-12 8:47 Sam James
0 siblings, 0 replies; 4+ messages in thread
From: Sam James @ 2022-06-12 8:47 UTC (permalink / raw
To: gentoo-commits
commit: ec7abffe5f08b26e8e6bf9361a14b1ae80a8c675
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Jun 2 22:46:22 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Jun 12 08:42:06 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ec7abffe
dev-python/scipy: add 1.9.9999 for Meson testing
Signed-off-by: Sam James <sam <AT> gentoo.org>
.../scipy-1.9.9999-meson-options-lapack.patch | 28 +++++++++
dev-python/scipy/scipy-1.9.9999.ebuild | 73 ++++++++++++++++++++++
2 files changed, 101 insertions(+)
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
new file mode 100644
index 000000000000..23d29c31c2cb
--- /dev/null
+++ b/dev-python/scipy/files/scipy-1.9.9999-meson-options-lapack.patch
@@ -0,0 +1,28 @@
+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/scipy-1.9.9999.ebuild b/dev-python/scipy/scipy-1.9.9999.ebuild
new file mode 100644
index 000000000000..a25a63827ff7
--- /dev/null
+++ b/dev-python/scipy/scipy-1.9.9999.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=meson-python
+PYTHON_COMPAT=( python3_{8..10} )
+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
+
+ SRC_URI="
+ mirror://pypi/${PN:0:1}/${PN}/${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
+ )"
+
+ KEYWORDS="~amd64 ~arm ~arm64 -hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+fi
+
+LICENSE="BSD LGPL-2"
+SLOT="0"
+IUSE="doc +sparse"
+
+DEPEND="
+ >=dev-python/numpy-1.17.3[lapack,${PYTHON_USEDEP}]
+ sci-libs/arpack:0=
+ virtual/cblas
+ virtual/lapack
+ sparse? ( sci-libs/umfpack:0= )"
+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/patchelf
+ virtual/pkgconfig
+ doc? ( app-arch/unzip )
+ test? ( dev-python/pytest-xdist[${PYTHON_USEDEP}] )"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-1.9.9999-meson-options-lapack.patch
+)
+
+distutils_enable_tests pytest
+
+python_test() {
+ cd "${T}" || die
+
+ epytest -n "$(makeopts_jobs)" --pyargs scipy
+}
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-python/scipy/, dev-python/scipy/files/
@ 2023-04-21 4:06 Michał Górny
0 siblings, 0 replies; 4+ messages in thread
From: Michał Górny @ 2023-04-21 4:06 UTC (permalink / raw
To: gentoo-commits
commit: 17f51f309e960e6373baf0686af843033a82470f
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Fri Apr 21 03:53:41 2023 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Fri Apr 21 04:06:19 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=17f51f30
dev-python/scipy: Remove old
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
dev-python/scipy/Manifest | 3 -
.../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, 266 deletions(-)
diff --git a/dev-python/scipy/Manifest b/dev-python/scipy/Manifest
index bf48763a7d9e..88e1ca57c849 100644
--- a/dev-python/scipy/Manifest
+++ b/dev-python/scipy/Manifest
@@ -1,8 +1,5 @@
-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
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.
</longdescription>
- <use>
- <flag name="pythran">Use <pkg>dev-python/pythran</pkg> to accelerate runtime</flag>
- </use>
<upstream>
<remote-id type="github">scipy/scipy</remote-id>
<remote-id type="pypi">scipy</remote-id>
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
-}
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-python/scipy/, dev-python/scipy/files/
@ 2023-07-03 4:01 Michał Górny
0 siblings, 0 replies; 4+ messages in thread
From: Michał Górny @ 2023-07-03 4:01 UTC (permalink / raw
To: gentoo-commits
commit: 453d46869ba0b852113fd5a207b98e46d2d9b8b5
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Mon Jul 3 03:53:59 2023 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Mon Jul 3 03:53:59 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=453d4686
dev-python/scipy: Add a patch for Cython-3
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
dev-python/scipy/files/scipy-1.11.1-cython-3.patch | 45 ++++++++++++++++++++++
dev-python/scipy/scipy-1.11.1.ebuild | 8 ++--
2 files changed, 50 insertions(+), 3 deletions(-)
diff --git a/dev-python/scipy/files/scipy-1.11.1-cython-3.patch b/dev-python/scipy/files/scipy-1.11.1-cython-3.patch
new file mode 100644
index 000000000000..4b402b5c469d
--- /dev/null
+++ b/dev-python/scipy/files/scipy-1.11.1-cython-3.patch
@@ -0,0 +1,45 @@
+From d0dd5c957876300c33db303042dfa4888b1696f4 Mon Sep 17 00:00:00 2001
+From: Matus Valo <matusvalo@gmail.com>
+Date: Sun, 2 Jul 2023 23:12:51 +0200
+Subject: [PATCH 1/2] Add cython_optimize.pxd to _cython_tree
+
+---
+ scipy/optimize/meson.build | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/scipy/optimize/meson.build b/scipy/optimize/meson.build
+index 26458b05cd7..7c6097acf55 100644
+--- a/scipy/optimize/meson.build
++++ b/scipy/optimize/meson.build
+@@ -206,6 +206,10 @@ endif
+
+ _dummy_init_optimize = fs.copyfile('__init__.py')
+
++_cython_tree = [
++ fs.copyfile('cython_optimize.pxd'),
++]
++
+ opt_gen = generator(cython,
+ arguments : cython_args,
+ output : '@BASENAME@.c',
+
+From b8621185fa61d6b3610e2cb62eae3b81434952c9 Mon Sep 17 00:00:00 2001
+From: Matus Valo <matusvalo@gmail.com>
+Date: Sun, 2 Jul 2023 23:28:41 +0200
+Subject: [PATCH 2/2] Use absolute import in cython_optimize.pxd
+
+---
+ scipy/optimize/cython_optimize.pxd | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/scipy/optimize/cython_optimize.pxd b/scipy/optimize/cython_optimize.pxd
+index d5a0bdd758e..d35f8da68b3 100644
+--- a/scipy/optimize/cython_optimize.pxd
++++ b/scipy/optimize/cython_optimize.pxd
+@@ -7,5 +7,5 @@
+ # support. Changing it causes an ABI forward-compatibility break
+ # (gh-11793), so we currently leave it as is (no further cimport
+ # statements should be used in this file).
+-from .cython_optimize._zeros cimport (
++from scipy.optimize.cython_optimize._zeros cimport (
+ brentq, brenth, ridder, bisect, zeros_full_output)
diff --git a/dev-python/scipy/scipy-1.11.1.ebuild b/dev-python/scipy/scipy-1.11.1.ebuild
index 426e9b0827c1..df08d271714e 100644
--- a/dev-python/scipy/scipy-1.11.1.ebuild
+++ b/dev-python/scipy/scipy-1.11.1.ebuild
@@ -58,11 +58,8 @@ RDEPEND="
${DEPEND}
dev-python/pillow[${PYTHON_USEDEP}]
"
-# Cython-3 fails if scipy is already installed
-# https://github.com/scipy/scipy/issues/18792
BDEPEND="
dev-lang/swig
- <dev-python/cython-3[${PYTHON_USEDEP}]
>=dev-python/cython-0.29.35[${PYTHON_USEDEP}]
>=dev-python/meson-python-0.12.1[${PYTHON_USEDEP}]
>=dev-python/pybind11-2.10.4[${PYTHON_USEDEP}]
@@ -81,6 +78,11 @@ BDEPEND="
distutils_enable_tests pytest
+PATCHES=(
+ # https://github.com/scipy/scipy/pull/18810
+ "${FILESDIR}/${P}-cython-3.patch"
+)
+
src_unpack() {
default
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2023-07-03 4:01 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-06-12 8:47 [gentoo-commits] repo/gentoo:master commit in: dev-python/scipy/, dev-python/scipy/files/ Sam James
-- strict thread matches above, loose matches on Subject: below --
2023-07-03 4:01 Michał Górny
2023-04-21 4:06 Michał Górny
2022-05-17 11:11 Michał Górny
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox