Update to 1.10.0 & add the optional python3-pooch dependency

.gitignore

@@ -39,3 +39,4 @@ scipy-0.7.2.tar.gz
 /scipy-1.7.3.tar.gz
 /scipy-1.8.0.tar.gz
 /scipy-1.8.1.tar.gz
+/scipy-1.10.0.tar.gz

scipy-1.8.1-syevr-operator-order-explicit.patch

@@ -1,69 +0,0 @@
---- scipy-1.8.1/scipy/linalg/flapack_sym_herm.pyf.src.debug	2022-04-30 06:14:37.965527300 +0900
-+++ scipy-1.8.1/scipy/linalg/flapack_sym_herm.pyf.src	2022-07-01 22:51:14.057047006 +0900
-@@ -772,10 +772,10 @@
-     integer intent(hide),dimension(liwork),depend(liwork) :: iwork
- 
-     <ftype2> intent(out),dimension(n),depend(n) :: w
--    <ftype2> intent(out),dimension((compute_v?MAX(0,n):0),(compute_v?(*range=='I'?iu-il+1:MAX(1,n)):0)),depend(n,compute_v,range,iu,il) :: z
-+    <ftype2> intent(out),dimension((compute_v?MAX(0,n):0),(compute_v?((*range=='I')?(iu-il+1):MAX(1,n)):0)),depend(n,compute_v,range,iu,il) :: z
-     integer intent(out) :: m
-     ! Only returned if range=='A' or range=='I' and il, iu = 1, n
--    integer intent(out),dimension((compute_v?(2*(*range=='A'||(*range=='I' && iu-il+1==n)?n:0)):0)),depend(n,iu,il,compute_v,range) :: isuppz
-+    integer intent(out),dimension((compute_v?(2*((*range=='A')||((*range=='I') && (iu-il+1==n))?n:0)):0)),depend(n,iu,il,compute_v,range) :: isuppz
-     integer intent(out) :: info
- 
- end subroutine <prefix2>syevr
-@@ -844,7 +844,7 @@
-     integer intent(hide),dimension(liwork),depend(liwork) :: iwork
- 
-     <ftype2> intent(out),dimension(n),depend(n) :: w
--    <ftype2c> intent(out),dimension((compute_v?MAX(0,n):0),(compute_v?(*range=='I'?iu-il+1:MAX(1,n)):0)),depend(n,compute_v,range,iu,il) :: z
-+    <ftype2c> intent(out),dimension((compute_v?MAX(0,n):0),(compute_v?((*range=='I')?(iu-il+1):MAX(1,n)):0)),depend(n,compute_v,range,iu,il) :: z
-     integer intent(out) :: m
-     ! MKL implementation has a bug that still accesses isuppz array even if
-     ! range=='A' or range=='I' and il, iu = 1, n which is not the case for
-@@ -852,7 +852,7 @@
-     ! of the settings. It is wasteful but necessary. The bug is fixed in
-     ! mkl 2020 update 2 and when time comes change this line with
-     !
--    ! integer intent(out),dimension((compute_v?(2*(*range=='A'||(*range=='I' && iu-il+1==n)?n:0)):0)),depend(n,iu,il,range,compute_v) :: isuppz
-+    ! integer intent(out),dimension((compute_v?(2*(*range=='A'||((*range=='I') && (iu-il+1==n))?n:0)):0)),depend(n,iu,il,range,compute_v) :: isuppz
-     !
-     integer intent(out),dimension(2*max(1,n)),depend(n) :: isuppz
-     integer intent(out) :: info
-@@ -919,7 +919,7 @@
-     integer intent(hide),dimension(5*n),depend(n) :: iwork
- 
-     <ftype2> intent(out),dimension(n),depend(n) :: w
--    <ftype2> intent(out),dimension((compute_v?MAX(0,n):0),(compute_v?(*range=='I'?iu-il+1:MAX(1,n)):0)),depend(n,compute_v,range,iu,il) :: z
-+    <ftype2> intent(out),dimension((compute_v?MAX(0,n):0),(compute_v?((*range=='I')?(iu-il+1):MAX(1,n)):0)),depend(n,compute_v,range,iu,il) :: z
-     integer intent(out) :: m
-     integer intent(out),dimension((compute_v?n:0)),depend(compute_v,n):: ifail
-     integer intent(out) :: info
-@@ -984,7 +984,7 @@
-     <ftype2> intent(hide),dimension(7*n),depend(n) :: rwork
- 
-     <ftype2> intent(out),dimension(n),depend(n) :: w
--    <ftype2c> intent(out),dimension((compute_v*n),(compute_v?(*range=='I'?iu-il+1:MAX(1,n)):0)),depend(compute_v,range,n,iu,il) :: z
-+    <ftype2c> intent(out),dimension((compute_v*n),(compute_v?((*range=='I')?(iu-il+1):MAX(1,n)):0)),depend(compute_v,range,n,iu,il) :: z
-     integer intent(out) :: m
-     integer intent(out),dimension(compute_v*n),depend(compute_v,n):: ifail
-     integer intent(out) :: info
-@@ -1222,7 +1222,7 @@
-     integer intent(hide),dimension(5*n),depend(n) :: iwork
- 
-     <ftype2> intent(out),dimension(n),depend(n) :: w
--    <ftype2> intent(out),dimension((jobz[0]=='V'?MAX(0,n):0),(jobz[0]=='V'?(range[0]=='I'?iu-il+1:MAX(1,n)):0)),depend(n,jobz,range,iu,il) :: z
-+    <ftype2> intent(out),dimension((jobz[0]=='V'?MAX(0,n):0),(jobz[0]=='V'?((range[0]=='I')?(iu-il+1):MAX(1,n)):0)),depend(n,jobz,range,iu,il) :: z
-     integer intent(out) :: m
-     integer intent(out),dimension((jobz[0]=='N'?0:n)),depend(jobz,n):: ifail
-     integer intent(out) :: info
-@@ -1293,7 +1293,7 @@
-     <ftype2> intent(hide),dimension(7*n),depend(n) :: rwork
- 
-     <ftype2> intent(out),dimension(n),depend(n) :: w
--    <ftype2c> intent(out),dimension((jobz[0]=='V'?MAX(0,n):0),(jobz[0]=='V'?(range[0]=='I'?iu-il+1:MAX(1,n)):0)),depend(n,jobz,range,iu,il) :: z
-+    <ftype2c> intent(out),dimension((jobz[0]=='V'?MAX(0,n):0),(jobz[0]=='V'?((range[0]=='I')?(iu-il+1):MAX(1,n)):0)),depend(n,jobz,range,iu,il) :: z
-     integer intent(out) :: m
-     integer intent(out),dimension((jobz[0]=='N'?0:n)),depend(jobz,n):: ifail
-     integer intent(out) :: info

scipy.spec

@@ -24,8 +24,8 @@
 
 Summary:    Scientific Tools for Python
 Name:       scipy
-Version:    1.8.1
+Version:    1.10.0
-Release:    7%{?dist}
+Release:    1%{?dist}
 
 # BSD -- whole package except:
 # Boost -- scipy/special/cephes/scipy_iv.c
@@ -33,10 +33,6 @@ Release:    7%{?dist}
 License:    BSD and Boost and Public Domain
 Url:        http://www.scipy.org/scipylib/index.html
 Source0:    https://github.com/scipy/scipy/releases/download/v%{version}/scipy-%{version}.tar.gz
-# https://bugzilla.redhat.com/show_bug.cgi?id=2099102
-# https://github.com/scipy/scipy/issues/16527
-# https://github.com/scipy/scipy/pull/16528
-Patch0:     scipy-1.8.1-syevr-operator-order-explicit.patch
 
 BuildRequires: fftw-devel, suitesparse-devel
 BuildRequires: %{blaslib}-devel
@@ -46,6 +42,7 @@ BuildRequires: qhull-devel
 BuildRequires:  pybind11-devel
 BuildRequires:  python3-pybind11 >= 2.4.0
 BuildRequires:  python3-numpy, python3-devel, python3-numpy-f2py
+BuildRequires:  python3-pooch
 BuildRequires:  python3-setuptools
 BuildRequires:  python3-Cython
 BuildRequires:  python3-pytest
@@ -112,9 +109,6 @@ EOF
 # Docs won't build unless the .dat files are specified here
 sed -i 's/metadata = dict(/metadata = dict(package_data={"": ["*.dat"]},/' setup.py
 
-# remove bundled numpydoc
-rm doc/sphinxext -r
-
 rm $(grep -rl '/\* Generated by Cython') PKG-INFO
 
 %build
@@ -162,35 +156,61 @@ export FLEXIBLAS=netlib
 # default test timeout
 TIMEOUT=500
 
-# skip failing TestSchur, it needs to be fixed to account for different
+# https://github.com/scipy/scipy/issues/17912
-# (but still valid) results from lapack >= 3.10
+SKIP_ALL="\
-# see: https://github.com/Reference-LAPACK/lapack/issues/628
+not TestDatasets and \
-export PYTEST_ADDOPTS="-k 'not TestSchur'"
+not TestOde and \
-
+not TestComplexOde and \
-%ifarch s390x
+not TestVODECheckParameterUse and \
-# skip failing tests on s390x for now
+not TestZVODECheckParameterUse and \
-export PYTEST_ADDOPTS="-k 'not TestSchur and \
+not test_banded_ode_solvers and \
-    not (TestNoData and test_nodata) and \
+not test_examples[True-complex64]"
-    not test_solve_discrete_are'"
+export PYTEST_ADDOPTS="-k '$SKIP_ALL'"
-
+# TestConstructUtils::test_concatenate_int32_overflow is flaky on aarch64
-# some tests (namely test_logpdf_overflow) tend to run for a long time on s390x
+%ifarch aarch64 || ppc64le
+# https://bugzilla.redhat.com/show_bug.cgi?id=1959353
+export PYTEST_ADDOPTS="-k '$SKIP_ALL and \
+not test_solve_discrete_are and \
+not test_maxiter_worsening[lgmres] and \
+not test_concatenate_int32_overflow'"
 TIMEOUT=1000
 %endif
 
-%ifarch aarch64 || ppc64le
+%ifarch s390x
 # https://bugzilla.redhat.com/show_bug.cgi?id=1959353
-export PYTEST_ADDOPTS="-k 'not TestSchur and not test_solve_discrete_are'"
+export PYTEST_ADDOPTS="-k '$SKIP_ALL and \
+not test_solve_discrete_are and \
+not test_maxiter_worsening[lgmres] and \
+not TestInterop and \
+not TestSplder and \
+not test_dblint and \
+not TestUnivariateSpline and \
+not TestLSQBivariateSpline and \
+not TestPPoly and \
+not TestLevyStable'"
 TIMEOUT=1000
 %endif
 
 %ifarch x86_64
 # skip also failing test_sygst for now
-export PYTEST_ADDOPTS="-k 'not TestSchur and not test_sygst'"
+export PYTEST_ADDOPTS="-k '$SKIP_ALL and \
+not test_sygst'"
 %endif
 
 %ifarch i686 || armv7hl
 # skip also test_cython_api: https://bugzilla.redhat.com/show_bug.cgi?id=2068496
-export PYTEST_ADDOPTS="-k 'not TestSchur and not test_sygst and not test_cython_api'"
+# https://github.com/scipy/scipy/issues/17213
+export PYTEST_ADDOPTS="-k '$SKIP_ALL and \
+not test_sygst and \
+not test_cython_api and \
+not test_examples and \
+not test_shifts and \
+not test_mu and \
+not test_sum and \
+not test_svdp and \
+not test_resiliency_all_32 and \
+not test_resiliency_random[TestCSC-test_sum_dtype]'"
+
 %endif
 
 pushd %{buildroot}/%{python3_sitearch}
@@ -211,6 +231,11 @@ popd
 %endif
 
 %changelog
+* Wed Jan 25 2023 Pavel Šimovec <psimovec@redhat.com> - 1.10.0-1
+- New upstream release 1.10.0
+  resolves: #2101172
+- Use the optional python3-pooch dependency
+
 * Sat Jan 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.8.1-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
 

sources

@@ -1 +1 @@
-SHA512 (scipy-1.8.1.tar.gz) = f6fc71c209991fe82baa4b10d8ade0deb1057f6f5942a91dfb7ae45f3eb78a4535efa2861badf5e2d37239fa99dbd99de760aa7e4854b95991ade0263004e7ea
+SHA512 (scipy-1.10.0.tar.gz) = 13fec0a2c24b90617ad4701c43c54757c91d2c62ca4b9ea5e5c5d130177ba4d2bb8687aae9057b58c26d1a77e4291164bad7ba9e21352669c07ba18bf539ad32