.gitignore

@@ -1 +1 @@
-SOURCES/scipy-1.6.2.tar.gz
+SOURCES/scipy-1.5.4.tar.gz

.scipy.metadata

@@ -1 +1 @@
-7ef8a684f9feb4fd24d35e87f9d1f69eb6ec793e SOURCES/scipy-1.6.2.tar.gz
+ffbc97517d08d8a5b290c7a5dd6cda0c730ed531 SOURCES/scipy-1.5.4.tar.gz

SOURCES/skip-certain-tests-on-32-bit-arches.patch

@@ -0,0 +1,47 @@
+From ea0a77cf8761a8b8636b93314139ed0fc0a9d1db Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Nikola=20Forr=C3=B3?= <nforro@redhat.com>
+Date: Wed, 30 Sep 2020 11:44:25 +0200
+Subject: [PATCH] TST: make a couple of tests expected to fail on 32-bit
+ architectures
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+In TestConstructUtils.test_concatenate_int32_overflow
+and test_nnz_overflow, on a 32-bit architecture, in case
+check_free_memory() passes, ValueError is raised on an attempt
+to create a numpy array too large for a 32-bit architecture.
+
+Signed-off-by: Nikola Forró <nforro@redhat.com>
+---
+ scipy/sparse/tests/test_construct.py   | 1 +
+ scipy/sparse/tests/test_sparsetools.py | 1 +
+ 2 files changed, 2 insertions(+)
+
+diff --git a/scipy/sparse/tests/test_construct.py b/scipy/sparse/tests/test_construct.py
+index 3a882c6cc..5a2b92667 100644
+--- a/scipy/sparse/tests/test_construct.py
++++ b/scipy/sparse/tests/test_construct.py
+@@ -378,6 +378,7 @@ class TestConstructUtils(object):
+         excinfo.match(r'Got blocks\[0,1\]\.shape\[0\] == 1, expected 2')
+ 
+     @pytest.mark.slow
++    @pytest.mark.xfail_on_32bit("Can't create large array for test")
+     def test_concatenate_int32_overflow(self):
+         """ test for indptr overflow when concatenating matrices """
+         check_free_memory(30000)
+diff --git a/scipy/sparse/tests/test_sparsetools.py b/scipy/sparse/tests/test_sparsetools.py
+index 0c208ef44..e95df1ba0 100644
+--- a/scipy/sparse/tests/test_sparsetools.py
++++ b/scipy/sparse/tests/test_sparsetools.py
+@@ -61,6 +61,7 @@ def test_regression_std_vector_dtypes():
+ 
+ 
+ @pytest.mark.slow
++@pytest.mark.xfail_on_32bit("Can't create large array for test")
+ def test_nnz_overflow():
+     # Regression test for gh-7230 / gh-7871, checking that coo_todense
+     # with nnz > int32max doesn't overflow.
+-- 
+2.26.2
+

SPECS/scipy.spec

@@ -1,21 +1,17 @@
 # without means enabled
 %bcond_with doc
+%bcond_without tests
 
 # Set to pre-release version suffix if building pre-release, else %%{nil}
 %global rcver %{nil}
 
-%if 0%{?fedora} >= 33 || 0%{?rhel} >= 9
-%global blaslib flexiblas
-%global blasvar %{nil}
-%else
 %global blaslib openblas
 %global blasvar p
-%endif
 
 Summary:    Scientific Tools for Python
 Name:       scipy
-Version:    1.6.2
+Version:    1.5.4
-Release:    8%{?dist}
+Release:    5%{?dist}
 
 # BSD -- whole package except:
 # Boost -- scipy/special/cephes/scipy_iv.c
@@ -24,19 +20,30 @@ 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
 
+# Exclude i686 arch. Due to a modularity issue it's being added to the
+# x86_64 compose of CRB, but we don't want to ship it at all.
+# See: https://projects.engineering.redhat.com/browse/RCM-72605
+ExcludeArch: i686
+
+# https://github.com/scipy/scipy/pull/12899
+Patch0:     skip-certain-tests-on-32-bit-arches.patch
+
 BuildRequires: fftw-devel, suitesparse-devel
 BuildRequires: %{blaslib}-devel
 BuildRequires: gcc-gfortran, swig, gcc-c++
 BuildRequires: qhull-devel
-BuildRequires: /usr/bin/pathfix.py
 
-BuildRequires:  pybind11-devel
+BuildRequires:  python%{python3_pkgversion}-pybind11-devel
-BuildRequires:  python3-pybind11 >= 2.4.0
+BuildRequires:  python%{python3_pkgversion}-pybind11 >= 2.4.0
-BuildRequires:  python3-numpy, python3-devel, python3-numpy-f2py
+BuildRequires:  python%{python3_pkgversion}-devel
-BuildRequires:  python3-setuptools
+BuildRequires:  python%{python3_pkgversion}-rpm-macros
-BuildRequires:  python3-Cython
+BuildRequires:  python%{python3_pkgversion}-numpy
-BuildRequires:  python3-pytest
+BuildRequires:  python%{python3_pkgversion}-numpy-f2py
-BuildRequires:  python3-pytest-timeout
+BuildRequires:  python%{python3_pkgversion}-setuptools
+BuildRequires:  python%{python3_pkgversion}-Cython
+%if %{with tests}
+BuildRequires:  python%{python3_pkgversion}-pytest
+%endif
 
 %if %{with doc}
 BuildRequires:  python3-sphinx
@@ -57,17 +64,17 @@ leading scientists and engineers.}
 
 %description %_description
 
-%package -n python3-scipy
+%package -n python%{python3_pkgversion}-scipy
 Summary:    Scientific Tools for Python
-Requires:   python3-numpy, python3-f2py
+Requires:   python%{python3_pkgversion}-numpy, python%{python3_pkgversion}-numpy-f2py
-%{?python_provide:%python_provide python3-scipy}
+%{?python_provide:%python_provide python%{python3_pkgversion}-scipy}
-%description -n python3-scipy %_description
+%description -n python%{python3_pkgversion}-scipy %_description
 
 %if %{with doc}
-%package -n python3-scipy-doc
+%package -n python%{python3_pkgversion}-scipy-doc
 Summary:    Scientific Tools for Python - documentation
-Requires:   python3-scipy = %{version}-%{release}
+Requires:   python%{python3_pkgversion}-scipy = %{version}-%{release}
-%description -n python3-scipy-doc
+%description -n python%{python3_pkgversion}-scipy-doc
 HTML documentation for Scipy
 %endif
 
@@ -103,12 +110,8 @@ rm $(grep -rl '/\* Generated by Cython') PKG-INFO
 for PY in %{python3_version}; do
   # Adding -fallow-argument-mismatch workaround for https://github.com/scipy/scipy/issues/11611
   env CFLAGS="$RPM_OPT_FLAGS -lm" \
-  %if 0%{?fedora} >= 32 || 0%{?rhel} >= 9
+    FFLAGS="$RPM_OPT_FLAGS -fPIC -cpp" \
-      FFLAGS="$RPM_OPT_FLAGS -fPIC -fallow-argument-mismatch" \
+    LDFLAGS="$RPM_LD_FLAGS -shared" \
-  %else
-      FFLAGS="$RPM_OPT_FLAGS -fPIC" \
-  %endif
-    LDFLAGS="%{__global_ldflags}" \
     %{_bindir}/python$PY setup.py config_fc \
     --fcompiler=gnu95 --noarch \
     build
@@ -126,15 +129,13 @@ done
 %install
 %py3_install
 # Some files got ambiguous python shebangs, we fix them after everything else is done
-pathfix.py -pni "%{__python3} %{py3_shbang_opts}" %{buildroot}%{python3_sitearch}
+pathfix%{python3_version}.py -pni "%{__python3} %{py3_shbang_opts}" %{buildroot}%{python3_sitearch}
 
+%if %{with tests}
 %check
 # check against the reference BLAS/LAPACK
 export FLEXIBLAS=netlib
 
-# default test timeout
-TIMEOUT=500
-
 %ifarch s390x
 # skip failing tests on s390x for now
 export PYTEST_ADDOPTS="-k '\
@@ -149,78 +150,69 @@ export PYTEST_ADDOPTS="-k '\
     not test_kde_integer_input and \
     not test_pdf_logpdf and \
     not test_pdf_logpdf_weighted'"
+%endif
 
-# some tests (namely test_logpdf_overflow) tend to run for a long time on s390x
+# Those tests fail on koji/brew for ppc64le but pass
-TIMEOUT=1000
+# locally for that architecture
+%ifarch ppc64le
+export PYTEST_ADDOPTS="-k '\
+    not TestFFTConvolve and \
+    not TestDoubleFFT and \
+    not TestSingleFFT and \
+    not TestDoubleIFFT and \
+    not TestSingleIFFT and \
+    not test_tpsv and \
+    not TestLinear and \
+    not test_Mx1_economic and \
+    not test_hegst and \
+    not test_tpqrt_tpmqrt and \
+    not test_pteqr and \
+    not test_against_numpy_convolve and \
+    not test_convolve_method and \
+    not test_rank1 and \
+    not test_splu_smoketest and \
+    not test_spilu_smoketest and \
+    not test_threads_parallel and \
+    not test_hermitian and \
+    not test_convergence'"
 %endif
 
 pushd %{buildroot}/%{python3_sitearch}
-%{pytest} --timeout=${TIMEOUT} scipy
+%{pytest} scipy
 # Remove test remnants
 rm -rf gram{A,B}
 popd
+%endif # with tests
+
 
-%files -n python3-scipy
+%files -n python%{python3_pkgversion}-scipy
 %doc LICENSE.txt
 %{python3_sitearch}/scipy/
 %{python3_sitearch}/*.egg-info
 
 %if %{with doc}
-%files -n python3-scipy-doc
+%files -n python%{python3_pkgversion}-scipy-doc
 %license LICENSE.txt
 %doc doc/build-%{python3_version}/html
 %endif
 
 %changelog
-* Mon Feb 21 2022 Tomas Orsava <torsava@redhat.com> - 1.6.2-8
+* Fri Jul 14 2023 Charalampos Stratakis <cstratak@redhat.com> - 1.5.4-5
-- Add gating configuration and a simple smoke test
+- Skip some tests that fail on the ppc64le builders
-- Related: rhbz#1950291
+- Resolves: rhbz#2217858
 
-* Tue Feb 08 2022 Tomáš Hrnčiar <thrnciar@redhat.com> - 1.6.2-7
+* Fri Jul 14 2023 Charalampos Stratakis <cstratak@redhat.com> - 1.5.4-4
-- Add automatically generated Obsoletes tag with the python39- prefix
-  for smoother upgrade from RHEL8
-- Related: rhbz#1990421
-
-* Tue Aug 10 2021 Mohan Boddu <mboddu@redhat.com> - 1.6.2-6
-- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
-  Related: rhbz#1991688
-
-* Thu May 13 2021 Nikola Forró <nforro@redhat.com> - 1.6.2-5
-- Use proper LDFLAGS
-  related: #1945060
-
-* Mon Apr 26 2021 Nikola Forró <nforro@redhat.com> - 1.6.2-4
 - Remove RPATH from certain shared object files
-  related: #1945060
+- Resolves: rhbz#2222715
-
-* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 1.6.2-3
-- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
-
-* Thu Apr 08 2021 Nikola Forró <nforro@redhat.com> - 1.6.2-2
-- Remove python-pytest-xdist dependency
-  resolves: #1945060
-
-* Thu Mar 25 2021 Nikola Forró <nforro@redhat.com> - 1.6.2-1
-- New upstream release 1.6.2
-  resolves: #1942896
-
-* Thu Feb 18 2021 Nikola Forró <nforro@redhat.com> - 1.6.1-1
-- New upstream release 1.6.1
-  resolves: #1929994
-
-* Wed Feb 03 2021 Nikola Forró <nforro@redhat.com> - 1.6.0-3
-- Increase test timeout on s390x
-
-* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.6.0-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
 
-* Mon Jan 04 2021 Nikola Forró <nforro@redhat.com> - 1.6.0-1
+* Mon Jan 18 2021 Tomas Orsava <torsava@redhat.com> - 1.5.4-3
-- New upstream release 1.6.0
+- Specify LDFLAGS explicitly
-  resolves: #1906692
+- Force preprocessing of Fortran sources to make annobin record proper flags
+- Resolves: rhbz#1778983 rhbz#1877430
 
-* Wed Nov 25 2020 Nikola Forró <nforro@redhat.com> - 1.5.4-2
+* Mon Jan 18 2021 Tomas Orsava <torsava@redhat.com> - 1.5.4-2
-- Skip factorial() float tests on Python 3.10
+- Convert from Fedora to the python39 module in RHEL8
-  resolves: #1898157
+- Resolves: rhbz#1877430
 
 * Thu Nov 05 2020 Nikola Forró <nforro@redhat.com> - 1.5.4-1
 - New upstream release 1.5.4
@@ -237,7 +229,7 @@ popd
 
 * Mon Aug 31 2020 Nikola Forró <nforro@redhat.com> - 1.5.2-1
 - New upstream release 1.5.2
-  resolves: #1853871 and #1840077
+  resolves: #1853871 and 1840077
 
 * Sun Aug 16 2020 Iñaki Úcar <iucar@fedoraproject.org> - 1.5.0-4
 - https://fedoraproject.org/wiki/Changes/FlexiBLAS_as_BLAS/LAPACK_manager