[packages/python3-scipy] up to 1.15.2
atler
atler at pld-linux.org
Wed Mar 26 23:19:26 CET 2025
commit c1f7fa51d12eca90541f8554dc6e782b4a5dee28
Author: Jan Palus <atler at pld-linux.org>
Date: Wed Mar 26 23:17:28 2025 +0100
up to 1.15.2
numpy-deprecation-warnings.patch | 10 ---
python3-scipy-cython3.patch | 11 ---
python3-scipy.spec | 167 ++++++++++++++++++++++-----------------
scipy-numpydoc-update.patch | 48 -----------
scipy-pythran.patch | 83 -------------------
5 files changed, 94 insertions(+), 225 deletions(-)
---
diff --git a/python3-scipy.spec b/python3-scipy.spec
index 482ac3b..9d56d53 100644
--- a/python3-scipy.spec
+++ b/python3-scipy.spec
@@ -9,48 +9,52 @@
Summary: A library of scientific tools
Summary(pl.UTF-8): Biblioteka narzędzi naukowych
Name: python3-%{module}
-Version: 1.8.1
-Release: 3
+Version: 1.15.2
+Release: 1
License: BSD
Group: Development/Languages/Python
#Source0Download: https://github.com/scipy/scipy/releases/
-Source0: https://github.com/scipy/scipy/releases/download/v%{version}/%{module}-%{version}.tar.xz
-# Source0-md5: 15c3e57656dbd1626ae33971f2e80ab1
-Patch0: numpy-deprecation-warnings.patch
-Patch1: %{name}-cython3.patch
-# https://github.com/scipy/scipy/pull/16646
-Patch2: scipy-pythran.patch
-Patch3: scipy-numpydoc-update.patch
+Source0: https://github.com/scipy/scipy/releases/download/v%{version}/%{module}-%{version}.tar.gz
+# Source0-md5: 515fc1544d7617b38fe5a9328538047b
URL: https://www.scipy.org/
BuildRequires: blas-devel >= 3.6.0
+BuildRequires: cblas-devel
BuildRequires: f2py3 >= 1:1.14.5
BuildRequires: gcc-fortran
BuildRequires: lapack-devel >= 3.6.0
BuildRequires: libstdc++-devel >= 6:5
-BuildRequires: python3 >= 1:3.8
+BuildRequires: python3 >= 1:3.10
+BuildRequires: python3-Cython >= 3.0.8
+BuildRequires: python3-build
BuildRequires: python3-devel >= 1:3.8
-BuildRequires: python3-numpy >= 1:1.17.3
-BuildRequires: python3-numpy-devel >= 1:1.17.3
-BuildRequires: python3-numpy-devel < 1:1.25
-BuildRequires: python3-pybind11 >= 2.4.3
-BuildRequires: python3-pythran >= 0.10.0
-BuildRequires: python3-setuptools
+BuildRequires: python3-installer
+BuildRequires: python3-meson-python >= 0.15.0
+BuildRequires: python3-numpy >= 1:2.0.0
+BuildRequires: python3-numpy-devel >= 1:2.0.0
+BuildRequires: python3-numpy-devel < 1:2.5
+BuildRequires: python3-pybind11 >= 2.13.2
+BuildRequires: python3-pythran >= 0.14.0
BuildRequires: rpm-build >= 4.6
-BuildRequires: rpmbuild(macros) >= 1.752
+BuildRequires: rpmbuild(macros) >= 2.044
BuildRequires: tar >= 1:1.22
-BuildRequires: xz
%if %{with doc}
BuildRequires: pydoc3
-BuildRequires: python3-matplotlib >= 2
-# local version is used
-#BuildRequires: python3-numpydoc
+BuildRequires: python3-intersphinx_registry
+BuildRequires: python3-jupyterlite_pyodide_kernel
+BuildRequires: python3-jupyterlite_sphinx >= 0.16.55
+BuildRequires: python3-jupytext
+BuildRequires: python3-matplotlib >= 3.5
+BuildRequires: python3-myst_nb
+BuildRequires: python3-numpydoc
+BuildRequires: python3-pooch
BuildRequires: python3-pydata_sphinx_theme >= 0.6.1
-BuildRequires: python3-sphinx_panels
-BuildRequires: sphinx-pdg-3 >= 2.0
+BuildRequires: python3-sphinx_copybutton
+BuildRequires: python3-sphinx_design
+BuildRequires: sphinx-pdg-3 >= 5.0.0
%endif
Requires: lapack >= 3.6.0
-Requires: python3-modules >= 1:3.8
-Requires: python3-numpy >= 1:1.17.3
+Requires: python3-modules >= 1:3.10
+Requires: python3-numpy >= 1:2.0.0
Suggests: python3-pillow
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -79,29 +83,14 @@ Dokumentacja API modułu SciPy.
%prep
%setup -q -n scipy-%{version}
-%patch -P 0 -p1
-%patch -P 1 -p1
-%patch -P 2 -p1
-%patch -P 3 -p1
%build
-# numpy.distutils uses LDFLAGS as its own flags replacement,
-# instead of appending proper options (like -shared)
-CFLAGS="%{rpmcflags}"
-LDFLAGS="%{rpmldflags} -shared"
-export CFLAGS LDFLAGS
-
-export BLAS=%{_libdir}
-export LAPACK=%{_libdir}
-
-%py3_build
+%py3_build_pyproject -Csetup-args="-Dblas=blas" -Csetup-args="-Dlapack=lapack"
%if %{with doc}
-cp -pr scipy/io/tests build-3/lib.*/scipy/io
-cp -p scipy/misc/*.dat build-3/lib.*/scipy/misc
-cp -p scipy/stats/_sobol_direction_numbers.npz build-3/lib.*/scipy/stats
+%__unzip -qo build-3/*.whl -d build-3/build-path
LANG=C \
-PYTHONPATH=$(readlink -f build-3/lib.*) \
+PYTHONPATH=$(pwd)/build-3/build-path \
%{__make} -C doc html-build \
SPHINXBUILD=sphinx-build-3
%endif
@@ -109,17 +98,10 @@ PYTHONPATH=$(readlink -f build-3/lib.*) \
%install
rm -rf $RPM_BUILD_ROOT
-export BLAS=%{_libdir}
-export LAPACK=%{_libdir}
-
-%py3_install
+%py3_install_pyproject
-%{__rm} $RPM_BUILD_ROOT%{py3_sitedir}/%{module}/*.txt
%{__rm} $RPM_BUILD_ROOT%{py3_sitedir}/%{module}/_lib/_uarray/LICENSE
%{__rm} $RPM_BUILD_ROOT%{py3_sitedir}/%{module}/fft/_pocketfft/LICENSE.md
-%{__rm} $RPM_BUILD_ROOT%{py3_sitedir}/%{module}/linalg/src/{id_dist/doc/doc.tex,lapack_deprecations/LICENSE}
-%{__rm} $RPM_BUILD_ROOT%{py3_sitedir}/%{module}/optimize/lbfgsb_src/README
-%{__rm} $RPM_BUILD_ROOT%{py3_sitedir}/%{module}/sparse/linalg/{_dsolve/SuperLU/License.txt,_eigen/arpack/ARPACK/COPYING}
%{__rm} $RPM_BUILD_ROOT%{py3_sitedir}/%{module}/spatial/qhull_src/COPYING.txt
%{__rm} $RPM_BUILD_ROOT%{py3_sitedir}/%{module}/_lib/_test_deprecation_*.so
%{__rm} -r $RPM_BUILD_ROOT%{py3_sitedir}/%{module}/*/tests
@@ -132,14 +114,10 @@ rm -rf $RPM_BUILD_ROOT
%files -n python3-%{module}
%defattr(644,root,root,755)
-%doc INSTALL.rst.txt LICENSE.txt README.rst doc/{API.rst.txt,ROADMAP.rst.txt}
+%doc LICENSE.txt README.rst
%dir %{py3_sitedir}/%{module}
%{py3_sitedir}/%{module}/*.py
%{py3_sitedir}/%{module}/__pycache__
-%{py3_sitedir}/%{module}/*.pxd
-%dir %{py3_sitedir}/%{module}/_build_utils
-%{py3_sitedir}/%{module}/_build_utils/*.py
-%{py3_sitedir}/%{module}/_build_utils/__pycache__
%dir %{py3_sitedir}/%{module}/_lib
%attr(755,root,root) %{py3_sitedir}/%{module}/_lib/_ccallback_c.*.so
%attr(755,root,root) %{py3_sitedir}/%{module}/_lib/_fpumode.*.so
@@ -151,6 +129,39 @@ rm -rf $RPM_BUILD_ROOT
%attr(755,root,root) %{py3_sitedir}/%{module}/_lib/_uarray/_uarray.cpython-*.so
%{py3_sitedir}/%{module}/_lib/_uarray/*.py
%{py3_sitedir}/%{module}/_lib/_uarray/__pycache__
+%dir %{py3_sitedir}/%{module}/_lib/array_api_compat
+%{py3_sitedir}/%{module}/_lib/array_api_compat/*.py
+%{py3_sitedir}/%{module}/_lib/array_api_compat/__pycache__
+%dir %{py3_sitedir}/%{module}/_lib/array_api_compat/common
+%{py3_sitedir}/%{module}/_lib/array_api_compat/common/*.py
+%{py3_sitedir}/%{module}/_lib/array_api_compat/common/__pycache__
+%dir %{py3_sitedir}/%{module}/_lib/array_api_compat/cupy
+%{py3_sitedir}/%{module}/_lib/array_api_compat/cupy/*.py
+%{py3_sitedir}/%{module}/_lib/array_api_compat/cupy/__pycache__
+%dir %{py3_sitedir}/%{module}/_lib/array_api_compat/dask
+%{py3_sitedir}/%{module}/_lib/array_api_compat/dask/*.py
+%{py3_sitedir}/%{module}/_lib/array_api_compat/dask/__pycache__
+%dir %{py3_sitedir}/%{module}/_lib/array_api_compat/dask/array
+%{py3_sitedir}/%{module}/_lib/array_api_compat/dask/array/*.py
+%{py3_sitedir}/%{module}/_lib/array_api_compat/dask/array/__pycache__
+%dir %{py3_sitedir}/%{module}/_lib/array_api_compat/numpy
+%{py3_sitedir}/%{module}/_lib/array_api_compat/numpy/*.py
+%{py3_sitedir}/%{module}/_lib/array_api_compat/numpy/__pycache__
+%dir %{py3_sitedir}/%{module}/_lib/array_api_compat/torch
+%{py3_sitedir}/%{module}/_lib/array_api_compat/torch/*.py
+%{py3_sitedir}/%{module}/_lib/array_api_compat/torch/__pycache__
+%dir %{py3_sitedir}/%{module}/_lib/array_api_extra
+%{py3_sitedir}/%{module}/_lib/array_api_extra/*.py
+%{py3_sitedir}/%{module}/_lib/array_api_extra/__pycache__
+%dir %{py3_sitedir}/%{module}/_lib/cobyqa
+%{py3_sitedir}/%{module}/_lib/cobyqa/*.py
+%{py3_sitedir}/%{module}/_lib/cobyqa/__pycache__
+%dir %{py3_sitedir}/%{module}/_lib/cobyqa/subsolvers
+%{py3_sitedir}/%{module}/_lib/cobyqa/subsolvers/*.py
+%{py3_sitedir}/%{module}/_lib/cobyqa/subsolvers/__pycache__
+%dir %{py3_sitedir}/%{module}/_lib/cobyqa/utils
+%{py3_sitedir}/%{module}/_lib/cobyqa/utils/*.py
+%{py3_sitedir}/%{module}/_lib/cobyqa/utils/__pycache__
%dir %{py3_sitedir}/%{module}/cluster
%attr(755,root,root) %{py3_sitedir}/%{module}/cluster/*.so
%{py3_sitedir}/%{module}/cluster/*.py
@@ -158,6 +169,12 @@ rm -rf $RPM_BUILD_ROOT
%dir %{py3_sitedir}/%{module}/constants
%{py3_sitedir}/%{module}/constants/*.py
%{py3_sitedir}/%{module}/constants/__pycache__
+%dir %{py3_sitedir}/%{module}/datasets
+%{py3_sitedir}/%{module}/datasets/*.py
+%{py3_sitedir}/%{module}/datasets/__pycache__
+%dir %{py3_sitedir}/%{module}/differentiate
+%{py3_sitedir}/%{module}/differentiate/*.py
+%{py3_sitedir}/%{module}/differentiate/__pycache__
%dir %{py3_sitedir}/%{module}/fft
%{py3_sitedir}/%{module}/fft/*.py
%{py3_sitedir}/%{module}/fft/__pycache__
@@ -176,6 +193,9 @@ rm -rf $RPM_BUILD_ROOT
%dir %{py3_sitedir}/%{module}/integrate/_ivp
%{py3_sitedir}/%{module}/integrate/_ivp/*.py
%{py3_sitedir}/%{module}/integrate/_ivp/__pycache__
+%dir %{py3_sitedir}/%{module}/integrate/_rules
+%{py3_sitedir}/%{module}/integrate/_rules/*.py
+%{py3_sitedir}/%{module}/integrate/_rules/__pycache__
%dir %{py3_sitedir}/%{module}/interpolate
%attr(755,root,root) %{py3_sitedir}/%{module}/interpolate/*.so
%{py3_sitedir}/%{module}/interpolate/*.py
@@ -184,6 +204,10 @@ rm -rf $RPM_BUILD_ROOT
%{py3_sitedir}/%{module}/io/*.py
%{py3_sitedir}/%{module}/io/__pycache__
%attr(755,root,root) %{py3_sitedir}/%{module}/io/*.so
+%dir %{py3_sitedir}/%{module}/io/_fast_matrix_market
+%{py3_sitedir}/%{module}/io/_fast_matrix_market/*.py
+%{py3_sitedir}/%{module}/io/_fast_matrix_market/__pycache__
+%attr(755,root,root) %{py3_sitedir}/%{module}/io/_fast_matrix_market/*.so
%dir %{py3_sitedir}/%{module}/io/_harwell_boeing
%{py3_sitedir}/%{module}/io/_harwell_boeing/*.py
%{py3_sitedir}/%{module}/io/_harwell_boeing/__pycache__
@@ -201,9 +225,6 @@ rm -rf $RPM_BUILD_ROOT
%{py3_sitedir}/%{module}/linalg/*.pyi
%{py3_sitedir}/%{module}/linalg/__pycache__
%dir %{py3_sitedir}/%{module}/misc
-%{py3_sitedir}/%{module}/misc/ascent.dat
-%{py3_sitedir}/%{module}/misc/ecg.dat
-%{py3_sitedir}/%{module}/misc/face.dat
%{py3_sitedir}/%{module}/misc/*.py
%{py3_sitedir}/%{module}/misc/__pycache__
%dir %{py3_sitedir}/%{module}/ndimage
@@ -217,13 +238,11 @@ rm -rf $RPM_BUILD_ROOT
%dir %{py3_sitedir}/%{module}/optimize
%attr(755,root,root) %{py3_sitedir}/%{module}/optimize/*.so
%{py3_sitedir}/%{module}/optimize/*.py
-%{py3_sitedir}/%{module}/optimize/*.pyi
%{py3_sitedir}/%{module}/optimize/__pycache__
-%dir %{py3_sitedir}/%{module}/optimize/_highs
-%attr(755,root,root) %{py3_sitedir}/%{module}/optimize/_highs/*.so
-%{py3_sitedir}/%{module}/optimize/_highs/*.py
-%{py3_sitedir}/%{module}/optimize/_highs/__pycache__
-%{py3_sitedir}/%{module}/optimize/_highs/cython
+%dir %{py3_sitedir}/%{module}/optimize/_highspy
+%attr(755,root,root) %{py3_sitedir}/%{module}/optimize/_highspy/*.so
+%{py3_sitedir}/%{module}/optimize/_highspy/*.py
+%{py3_sitedir}/%{module}/optimize/_highspy/__pycache__
%dir %{py3_sitedir}/%{module}/optimize/_lsq
%attr(755,root,root) %{py3_sitedir}/%{module}/optimize/_lsq/*.so
%{py3_sitedir}/%{module}/optimize/_lsq/*.py
@@ -247,6 +266,7 @@ rm -rf $RPM_BUILD_ROOT
%dir %{py3_sitedir}/%{module}/signal
%attr(755,root,root) %{py3_sitedir}/%{module}/signal/*.so
%{py3_sitedir}/%{module}/signal/*.py
+%{py3_sitedir}/%{module}/signal/*.pyi
%{py3_sitedir}/%{module}/signal/__pycache__
%dir %{py3_sitedir}/%{module}/signal/windows
%{py3_sitedir}/%{module}/signal/windows/*.py
@@ -277,7 +297,6 @@ rm -rf $RPM_BUILD_ROOT
%{py3_sitedir}/%{module}/sparse/linalg/_eigen/lobpcg/*.py
%{py3_sitedir}/%{module}/sparse/linalg/_eigen/lobpcg/__pycache__
%dir %{py3_sitedir}/%{module}/sparse/linalg/_isolve
-%attr(755,root,root) %{py3_sitedir}/%{module}/sparse/linalg/_isolve/*.so
%{py3_sitedir}/%{module}/sparse/linalg/_isolve/*.py
%{py3_sitedir}/%{module}/sparse/linalg/_isolve/__pycache__
%dir %{py3_sitedir}/%{module}/sparse/linalg/_propack
@@ -290,7 +309,6 @@ rm -rf $RPM_BUILD_ROOT
%dir %{py3_sitedir}/%{module}/spatial/transform
%attr(755,root,root) %{py3_sitedir}/%{module}/spatial/transform/*.so
%{py3_sitedir}/%{module}/spatial/transform/*.py
-%{py3_sitedir}/%{module}/spatial/transform/*.pyi
%{py3_sitedir}/%{module}/spatial/transform/__pycache__
%dir %{py3_sitedir}/%{module}/special
%attr(755,root,root) %{py3_sitedir}/%{module}/special/*.so
@@ -308,17 +326,20 @@ rm -rf $RPM_BUILD_ROOT
%{py3_sitedir}/%{module}/stats/*.pxd
%{py3_sitedir}/%{module}/stats/_sobol_direction_numbers.npz
%{py3_sitedir}/%{module}/stats/__pycache__
-%dir %{py3_sitedir}/%{module}/stats/_boost
-%attr(755,root,root) %{py3_sitedir}/%{module}/stats/_boost/*.so
-%{py3_sitedir}/%{module}/stats/_boost/*.py
-%{py3_sitedir}/%{module}/stats/_boost/__pycache__
+%dir %{py3_sitedir}/%{module}/stats/_levy_stable
+%attr(755,root,root) %{py3_sitedir}/%{module}/stats/_levy_stable/*.so
+%{py3_sitedir}/%{module}/stats/_levy_stable/*.py
+%{py3_sitedir}/%{module}/stats/_levy_stable/__pycache__
+%dir %{py3_sitedir}/%{module}/stats/_rcont
+%attr(755,root,root) %{py3_sitedir}/%{module}/stats/_rcont/*.so
+%{py3_sitedir}/%{module}/stats/_rcont/*.py
+%{py3_sitedir}/%{module}/stats/_rcont/__pycache__
%dir %{py3_sitedir}/%{module}/stats/_unuran
%attr(755,root,root) %{py3_sitedir}/%{module}/stats/_unuran/*.so
-%{py3_sitedir}/%{module}/stats/_unuran/*.pxd
%{py3_sitedir}/%{module}/stats/_unuran/*.py
%{py3_sitedir}/%{module}/stats/_unuran/*.pyi
%{py3_sitedir}/%{module}/stats/_unuran/__pycache__
-%{py3_sitedir}/SciPy-%{version}-py*.egg-info
+%{py3_sitedir}/scipy-%{version}.dist-info
%if %{with doc}
%files apidocs
diff --git a/numpy-deprecation-warnings.patch b/numpy-deprecation-warnings.patch
deleted file mode 100644
index 62c712d..0000000
--- a/numpy-deprecation-warnings.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- scipy-1.4.1/scipy/odr/__odrpack.c.orig 2019-12-18 20:27:46.000000000 +0100
-+++ scipy-1.4.1/scipy/odr/__odrpack.c 2020-04-01 21:34:52.050513623 +0200
-@@ -10,6 +10,7 @@
- */
-
- #define PY_SSIZE_T_CLEAN
-+#define NPY_NO_DEPRECATED_API NPY_1_7_API_VERSION
- #include "odrpack.h"
-
-
diff --git a/python3-scipy-cython3.patch b/python3-scipy-cython3.patch
deleted file mode 100644
index 44795a7..0000000
--- a/python3-scipy-cython3.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- scipy-1.7.3/tools/cythonize.py.orig 2021-11-23 18:19:51.152109400 +0100
-+++ scipy-1.7.3/tools/cythonize.py 2022-03-26 07:41:27.385985910 +0100
-@@ -103,7 +103,7 @@ def process_pyx(fromfile, tofile, cwd):
-
- try:
- try:
-- r = subprocess.call(['cython'] + flags + ["-o", tofile, fromfile], cwd=cwd)
-+ r = subprocess.call(['cython3'] + flags + ["-o", tofile, fromfile], cwd=cwd)
- if r != 0:
- raise Exception('Cython failed')
- except OSError as e:
diff --git a/scipy-numpydoc-update.patch b/scipy-numpydoc-update.patch
deleted file mode 100644
index f4c49b8..0000000
--- a/scipy-numpydoc-update.patch
+++ /dev/null
@@ -1,48 +0,0 @@
---- scipy-1.8.1/doc/sphinxext/numpydoc/numpydoc.py.orig 2022-05-16 14:36:30.816477500 +0200
-+++ scipy-1.8.1/doc/sphinxext/numpydoc/numpydoc.py 2023-01-07 16:22:34.589245962 +0100
-@@ -82,10 +82,10 @@ def _is_cite_in_numpydoc_docstring(citat
- if section_node is None:
- return False
-
-- sibling_sections = itertools.chain(section_node.traverse(is_docstring_section,
-- include_self=True,
-- descend=False,
-- siblings=True))
-+ sibling_sections = itertools.chain(section_node.findall(is_docstring_section,
-+ include_self=True,
-+ descend=False,
-+ siblings=True))
- for sibling_section in sibling_sections:
- if not sibling_section.children:
- continue
-@@ -102,7 +102,7 @@ def _is_cite_in_numpydoc_docstring(citat
-
- def relabel_references(app, doc):
- # Change 'hash-ref' to 'ref' in label text
-- for citation_node in doc.traverse(citation):
-+ for citation_node in doc.findall(citation):
- if not _is_cite_in_numpydoc_docstring(citation_node):
- continue
- label_node = citation_node[0]
-@@ -120,7 +120,7 @@ def relabel_references(app, doc):
- return (isinstance(node, pending_xref) and
- node[0].astext() == '[%s]' % ref_text)
-
-- for xref_node in ref.parent.traverse(matching_pending_xref):
-+ for xref_node in ref.parent.findall(matching_pending_xref):
- xref_node.replace(xref_node[0], Text('[%s]' % new_text))
- ref.replace(ref_text, new_text.copy())
-
-@@ -128,10 +128,10 @@ def relabel_references(app, doc):
- def clean_backrefs(app, doc, docname):
- # only::latex directive has resulted in citation backrefs without reference
- known_ref_ids = set()
-- for ref in doc.traverse(reference, descend=True):
-+ for ref in doc.findall(reference, descend=True):
- for id_ in ref['ids']:
- known_ref_ids.add(id_)
-- for citation_node in doc.traverse(citation, descend=True):
-+ for citation_node in doc.findall(citation, descend=True):
- # remove backrefs to non-existent refs
- citation_node['backrefs'] = [id_ for id_ in citation_node['backrefs']
- if id_ in known_ref_ids]
diff --git a/scipy-pythran.patch b/scipy-pythran.patch
deleted file mode 100644
index 1796692..0000000
--- a/scipy-pythran.patch
+++ /dev/null
@@ -1,83 +0,0 @@
-From 4cd073e0306a025a76dc74899736c43b33c03f67 Mon Sep 17 00:00:00 2001
-From: serge-sans-paille <serge.guelton at telecom-bretagne.eu>
-Date: Mon, 29 Aug 2022 08:15:49 +0200
-Subject: [PATCH] MAINT: have `get_index_dtype` follow its docs and return
- int32 or int64
-
----
- scipy/optimize/_group_columns.py | 8 ++++----
- scipy/signal/_max_len_seq.py | 5 +++--
- scipy/signal/_max_len_seq_inner.py | 4 ++--
- scipy/sparse/_sputils.py | 3 ++-
- 4 files changed, 11 insertions(+), 9 deletions(-)
-
-diff --git a/scipy/optimize/_group_columns.py b/scipy/optimize/_group_columns.py
-index 8b4fcee34e7..99751d28e4e 100644
---- a/scipy/optimize/_group_columns.py
-+++ b/scipy/optimize/_group_columns.py
-@@ -52,10 +52,10 @@ def group_dense(m, n, A):
- return groups
-
-
--#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[::])
-+#pythran export group_sparse(int, int, int32[], int32[])
-+#pythran export group_sparse(int, int, int64[], int64[])
-+#pythran export group_sparse(int, int, int32[::], int32[::])
-+#pythran export group_sparse(int, int, int64[::], int64[::])
- def group_sparse(m, n, indices, indptr):
- groups = -np.ones(n, dtype=np.intp)
- current_group = 0
-diff --git a/scipy/signal/_max_len_seq.py b/scipy/signal/_max_len_seq.py
-index 04a2e78828a..afe97dd4f4b 100644
---- a/scipy/signal/_max_len_seq.py
-+++ b/scipy/signal/_max_len_seq.py
-@@ -101,14 +101,15 @@ def max_len_seq(nbits, state=None, length=None, taps=None):
- >>> plt.show()
-
- """
-+ taps_dtype = np.int32 if np.intp().itemsize == 4 else np.int64
- if taps is None:
- if nbits not in _mls_taps:
- known_taps = np.array(list(_mls_taps.keys()))
- raise ValueError('nbits must be between %s and %s if taps is None'
- % (known_taps.min(), known_taps.max()))
-- taps = np.array(_mls_taps[nbits], np.intp)
-+ taps = np.array(_mls_taps[nbits], taps_dtype)
- else:
-- taps = np.unique(np.array(taps, np.intp))[::-1]
-+ taps = np.unique(np.array(taps, taps_dtype))[::-1]
- if np.any(taps < 0) or np.any(taps > nbits) or taps.size < 1:
- raise ValueError('taps must be non-empty with values between '
- 'zero and nbits (inclusive)')
-diff --git a/scipy/signal/_max_len_seq_inner.py b/scipy/signal/_max_len_seq_inner.py
-index 88d6ef3d755..8de08937a9c 100644
---- a/scipy/signal/_max_len_seq_inner.py
-+++ b/scipy/signal/_max_len_seq_inner.py
-@@ -3,8 +3,8 @@
-
- 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[])
-+#pythran export _max_len_seq_inner(int32[], int8[], int, int, int8[])
-+#pythran export _max_len_seq_inner(int64[], int8[], int, int, int8[])
-
- # Fast inner loop of max_len_seq.
- def _max_len_seq_inner(taps, state, nbits, length, seq):
-diff --git a/scipy/sparse/_sputils.py b/scipy/sparse/_sputils.py
-index 64e7efc6c9d..f492b926131 100644
---- a/scipy/sparse/_sputils.py
-+++ b/scipy/sparse/_sputils.py
-@@ -153,7 +153,8 @@ def get_index_dtype(arrays=(), maxval=No
- int32min = np.iinfo(np.int32).min
- int32max = np.iinfo(np.int32).max
-
-- dtype = np.intc
-+ # not using intc directly due to misinteractions with pythran
-+ dtype = np.int32 if np.intc().itemsize == 4 else np.int64
- if maxval is not None:
- if maxval > int32max:
- dtype = np.int64
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/python3-scipy.git/commitdiff/c1f7fa51d12eca90541f8554dc6e782b4a5dee28
More information about the pld-cvs-commit
mailing list