Skip factorial() float tests on Python 3.10

- resolves: #1898157

.gitignore

@@ -30,3 +30,5 @@ scipy-0.7.2.tar.gz
 /scipy-1.4.1.tar.gz
 /scipy-1.5.0.tar.gz
 /scipy-1.5.2.tar.gz
+/scipy-1.5.3.tar.gz
+/scipy-1.5.4.tar.gz

scipy.spec

@@ -14,8 +14,8 @@
 
 Summary:    Scientific Tools for Python
 Name:       scipy
-Version:    1.5.2
+Version:    1.5.4
-Release:    2.0.riscv64%{?dist}
+Release:    2%{?dist}
 
 # BSD -- whole package except:
 # Boost -- scipy/special/cephes/scipy_iv.c
@@ -26,6 +26,8 @@ Source0:    https://github.com/scipy/scipy/releases/download/v%{version}/scipy-%
 
 # https://github.com/scipy/scipy/pull/12899
 Patch0:     skip-certain-tests-on-32-bit-arches.patch
+# https://github.com/scipy/scipy/pull/13130
+Patch1:     skip-factorial-float-tests-on-py310.patch
 
 BuildRequires: fftw-devel, suitesparse-devel
 BuildRequires: %{blaslib}-devel
@@ -153,34 +155,8 @@ export PYTEST_ADDOPTS="-k '\
     not test_pdf_logpdf_weighted'"
 %endif
 
-%ifarch riscv64
-# skip failing tests on riscv64 for now
-export PYTEST_ADDOPTS="-k '\
-    not test_gejsv_general and \
-    not test_moments and \
-    not test_twosamp and \
-    not test_pdist_correlation_iris_nonC and \
-    not test_kde_2d_weighted and \
-    not test_pdist_correlation_iris_float32 and \
-    not test_cont_basic and \
-    not test_kde_2d and \
-    not test_pdist_correlation_iris and \
-    not test_list_of_problems and \
-    not test_cont_basic and \
-    not test_pdf_nolan_samples and \
-    not test_diagonal_data_types and \
-    not test_crash_2609 and \
-    not test_random_exact and \
-    not test_random_complex_exact and \
-    not test_ldl_type_size_combinations and \
-    not test_ifft and \
-    not test_gejsv_edge_arguments and \
-    not test_gejsv_NAG and \
-    not test_ihfft'"
-%endif
-
 pushd %{buildroot}/%{python3_sitearch}
-%{pytest} --timeout=300 scipy --numprocesses=auto
+%{pytest} --timeout=500 scipy --numprocesses=auto
 # Remove test remnants
 rm -rf gram{A,B}
 popd
@@ -197,8 +173,19 @@ popd
 %endif
 
 %changelog
-* Sat Dec 26 2020 David Abdurachmanov <david.abdurachmanov@sifive.com> - 1.5.2-2.0.riscv64
+* Wed Nov 25 2020 Nikola Forró <nforro@redhat.com> - 1.5.4-2
-- Disable failing tests on riscv64 for now
+- Skip factorial() float tests on Python 3.10
+  resolves: #1898157
+
+* Thu Nov 05 2020 Nikola Forró <nforro@redhat.com> - 1.5.4-1
+- New upstream release 1.5.4
+- Increase test timeout, 300 seconds is not always enough
+  for test_logpdf_overflow on s390x
+  resolves: #1894887
+
+* Mon Oct 19 2020 Nikola Forró <nforro@redhat.com> - 1.5.3-1
+- New upstream release 1.5.3
+  resolves: #1889132
 
 * Wed Sep 30 2020 Nikola Forró <nforro@redhat.com> - 1.5.2-2
 - Skip one more test expected to fail on 32-bit architectures

skip-factorial-float-tests-on-py310.patch

@@ -0,0 +1,40 @@
+From eabd8ea25fe291665f37fd069a1c574cd30d12cc Mon Sep 17 00:00:00 2001
+From: Victor Stinner <vstinner@python.org>
+Date: Wed, 25 Nov 2020 11:41:15 +0100
+Subject: [PATCH] GH-13122: Skip factorial() float tests on Python 3.10
+
+special.factorial() argument should be an array of integers.
+On Python 3.10, math.factorial() reject float.
+On Python 3.9, a DeprecationWarning is emitted.
+A numpy array casts all integers to float if the array contains a
+single NaN.
+---
+ scipy/special/tests/test_basic.py | 8 ++++++++
+ 1 file changed, 8 insertions(+)
+
+diff --git a/scipy/special/tests/test_basic.py b/scipy/special/tests/test_basic.py
+index 9b7260e8435..e2ae29812a5 100644
+--- a/scipy/special/tests/test_basic.py
++++ b/scipy/special/tests/test_basic.py
+@@ -19,6 +19,7 @@
+ 
+ import itertools
+ import platform
++import sys
+ 
+ import numpy as np
+ from numpy import (array, isnan, r_, arange, finfo, pi, sin, cos, tan, exp,
+@@ -1822,6 +1823,13 @@ def test_nan_inputs(self, x, exact):
+         result = special.factorial(x, exact=exact)
+         assert_(np.isnan(result))
+ 
++    # GH-13122: special.factorial() argument should be an array of integers.
++    # On Python 3.10, math.factorial() reject float.
++    # On Python 3.9, a DeprecationWarning is emitted.
++    # A numpy array casts all integers to float if the array contains a
++    # single NaN.
++    @pytest.mark.skipif(sys.version_info >= (3, 10),
++                        reason="Python 3.10+ math.factorial() requires int")
+     def test_mixed_nan_inputs(self):
+         x = np.array([np.nan, 1, 2, 3, np.nan])
+         with suppress_warnings() as sup:

sources

@@ -1 +1 @@
-SHA512 (scipy-1.5.2.tar.gz) = 45463df30a0f6270d9f4cf52235f31607904a6ae1375e12600e7f1ab2d27b1dc25a6211b49dceb71506be22c756890adaf9f81d9e6be7455def86c9caf0dc923
+SHA512 (scipy-1.5.4.tar.gz) = d23f68911a8880f87767819750d4d175ba8f9c72fcb9b8080305ee65722c046d4485fde4f0c85cc53c46247dd99813afe675a38b3b0569a683ddc2c2e021b8fc