From 7ed126f13e8b9b61b4a2856e49c704394a3f8d4f Mon Sep 17 00:00:00 2001 From: yatin Date: Feb 18 2019 11:44:45 +0000 Subject: Update to 1.1.0 Remove the patch that's already included in 1.1.0 release. Also use Recommends only on Fedora and RedHat > 7. --- diff --git a/.gitignore b/.gitignore index 1c4b32b..685d1bc 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,4 @@ mpmath-0.15.tar.gz /mpmath-docsrc-0.19.tar.gz /mpmath-0.19.tar.gz /python-mpmath-1.0.0.tar.gz +/python-mpmath-1.1.0.tar.gz diff --git a/0001-Fix-PEP-479-compatibility-python-3.7.patch b/0001-Fix-PEP-479-compatibility-python-3.7.patch deleted file mode 100644 index 31eba18..0000000 --- a/0001-Fix-PEP-479-compatibility-python-3.7.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 8a5e3bcdb6975d96442f757fdef084cd186a9fdf Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= -Date: Fri, 20 Jul 2018 22:10:18 +0200 -Subject: [PATCH] Fix PEP-479 compatibility (python 3.7) - -'raise StopIteration' is turned into a RuntimeError under python3.7 -when the generator function stack is exited because of it (and causes -a warning under python3.6). It is equivalent to plain 'return', which -works under both python2.x and python3.x. ---- - mpmath/functions/qfunctions.py | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/mpmath/functions/qfunctions.py b/mpmath/functions/qfunctions.py -index 7211507d59..5a20e53a8b 100644 ---- a/mpmath/functions/qfunctions.py -+++ b/mpmath/functions/qfunctions.py -@@ -123,7 +123,7 @@ def factors(): - r *= q - k += 1 - if k >= n: -- raise StopIteration -+ return - if k > maxterms: - raise ctx.NoConvergence - return ctx.mul_accurately(factors) diff --git a/python-mpmath.spec b/python-mpmath.spec index fed4255..7a97820 100644 --- a/python-mpmath.spec +++ b/python-mpmath.spec @@ -5,8 +5,8 @@ %endif Name: python-mpmath -Version: 1.0.0 -Release: 4%{?dist} +Version: 1.1.0 +Release: 1%{?dist} Summary: A pure Python library for multiprecision floating-point arithmetic License: BSD URL: http://mpmath.org @@ -15,8 +15,6 @@ Source0: https://github.com/fredrik-johansson/mpmath/archive/%{version}/% # Switch to 'traditional' theme in RHEL since 'classic' isn't available Patch0: python-mpmath-1.0.0-sphinx.patch -# https://github.com/fredrik-johansson/mpmath/pull/398 -Patch1: 0001-Fix-PEP-479-compatibility-python-3.7.patch BuildArch: noarch @@ -25,9 +23,11 @@ BuildRequires: python2-devel BuildRequires: dvipng BuildRequires: python2-sphinx BuildRequires: tex(latex) +BuildRequires: python2-pytest %if 0%{?with_python3} BuildRequires: python3-devel +BuildRequires: python3-pytest %endif %global _description\ @@ -44,7 +44,9 @@ use gmpy to speed up high precision operations. %package -n python2-mpmath Summary: %summary +%if 0%{?fedora} || 0%{?rhel} > 7 Recommends: python2-matplotlib +%endif %{?python_provide:%python_provide python2-mpmath} %description -n python2-mpmath %_description @@ -52,7 +54,9 @@ Recommends: python2-matplotlib %if 0%{?with_python3} %package -n python3-mpmath Summary: A pure Python library for multiprecision floating-point arithmetic +%if 0%{?fedora} || 0%{?rhel} > 7 Recommends: python3-matplotlib +%endif %{?python_provide:%python_provide python3-mpmath} %description -n python3-mpmath @@ -113,11 +117,10 @@ cd doc %endif # with _python3 %check -export PYTHONPATH=`pwd`/build/lib cd build/lib/mpmath/tests/ -%{__python2} runtests.py +py.test-2 %if 0%{?with_python3} -%{__python3} runtests.py +py.test-3 %endif # with _python3 %files -n python2-mpmath @@ -136,6 +139,9 @@ cd build/lib/mpmath/tests/ %doc doc/build/* %changelog +* Mon Feb 18 2019 Yatin Karel - 1.1.0-1 +- Update to 1.1.0. + * Sat Feb 02 2019 Fedora Release Engineering - 1.0.0-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild diff --git a/sources b/sources index 5f474a0..3256654 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (python-mpmath-1.0.0.tar.gz) = 5b73d7c04313158af0e5a720aec36e66ddbdd5ac20156d96ec4d7fc0992d60fda541b5240464dbb21be7af397a19d7abcd7ee9e20df2fb7c8e45b48707bbbc63 +SHA512 (python-mpmath-1.1.0.tar.gz) = 628b6c61015825516d983bfcc54fc3a2793f3d9d2b93ba9c5a487a340ddf13eb4e83f17fa35692b22dd8a200a8da3a65ed88091d75abb4c48c9c4e4f2c686bcc