Update to 1.4. Drop -factorial patch.

2019-04-17 19:14:40 -06:00 · 2019-04-17 19:14:40 -06:00 · 01ee18672a
parent 9bf77eb378
commit 01ee18672a
7 changed files with 33 additions and 65 deletions
--- a/2
+++ b/2
@ -1 +1 @@
-SHA512 (sympy-1.3.tar.gz) = 153af141b2fa30a9fcea94630bfe985cda279380f789be745c29f23be253bcff1a40a9eacf8c81621b2eed05d4d32d1918e5a00563fcabe4b354ec15a7e1d0fa
+SHA512 (sympy-1.4.tar.gz) = fdf2113478393ac71c08a440c97ded1d11e2cb630da237a4e32d03a54fda1bb51c6317a757e5d51683fc1ff7ed865cf3b4c02927bec5974eb68bacc5b88f865a
--- a/sympy-doc.patch
+++ b/sympy-doc.patch
@ -1,5 +1,5 @@
--- sympy-sympy-1.3/README.rst.orig	2018-09-14 12:51:02.000000000 -0600
-+++ sympy-sympy-1.3/README.rst	2018-10-07 09:34:14.231369432 -0600
+--- sympy-sympy-1.4/README.rst.orig	2019-04-09 18:29:25.000000000 -0600
+++ sympy-sympy-1.4/README.rst	2019-04-17 14:31:01.408877172 -0600
@@ -240,7 +240,7 @@ To cite SymPy in publications use
 
 A BibTeX entry for LaTeX users is
--- a/sympy-factorial.patch
+++ b/sympy-factorial.patch
@ -1,32 +0,0 @@
--- sympy-sympy-1.3/sympy/parsing/tests/test_implicit_multiplication_application.py.orig	2018-09-14 12:51:02.000000000 -0600
-+++ sympy-sympy-1.3/sympy/parsing/tests/test_implicit_multiplication_application.py	2019-01-30 18:41:34.381323987 -0700
-@@ -49,7 +49,6 @@ def test_implicit_multiplication():
- 
- def test_implicit_application():
-     cases = {
-        'factorial': 'factorial',
-         'sin x': 'sin(x)',
-         'tan y**3': 'tan(y**3)',
-         'cos 2*x': 'cos(2*x)',
-@@ -156,7 +155,6 @@ def test_all_implicit_steps():
-         'sin(sin x)': 'sin(sin(x))',
-         'sin x!': 'sin(factorial(x))',
-         'sin x!!': 'sin(factorial2(x))',
-        'factorial': 'factorial',  # don't apply a bare function
-         'x sin x': 'x * sin(x)',  # both application and multiplication
-         'xy sin x': 'x * y * sin(x)',
-         '(x+2)(x+3)': '(x + 2) * (x+3)',
-@@ -164,13 +162,11 @@ def test_all_implicit_steps():
-         'pi': 'pi',  # don't mess with constants
-         'None': 'None',
-         'ln sin x': 'ln(sin(x))',  # multiple implicit function applications
-        'factorial': 'factorial',  # don't add parentheses
-         'sin x**2': 'sin(x**2)',  # implicit application to an exponential
-         'alpha': 'Symbol("alpha")',  # don't split Greek letters/subscripts
-         'x_2': 'Symbol("x_2")',
-         'sin^2 x**2': 'sin(x**2)**2',  # function raised to a power
-         'sin**3(x)': 'sin(x)**3',
-        '(factorial)': 'factorial',
-         'tan 3x': 'tan(3*x)',
-         'sin^2(3*E^(x))': 'sin(3*E**(x))**2',
-         'sin**2(E^(3x))': 'sin(E**(3*x))**2',
--- a/sympy-float.patch
+++ b/sympy-float.patch
@ -1,5 +1,5 @@
--- sympy-sympy-1.3/sympy/core/tests/test_sympify.py.orig	2018-09-14 12:51:02.000000000 -0600
-+++ sympy-sympy-1.3/sympy/core/tests/test_sympify.py	2018-10-07 09:57:01.908641658 -0600
+--- sympy-sympy-1.4/sympy/core/tests/test_sympify.py.orig	2019-04-09 18:29:25.000000000 -0600
+++ sympy-sympy-1.4/sympy/core/tests/test_sympify.py	2019-04-17 14:29:48.765055139 -0600
@@ -590,8 +590,6 @@ def test_sympify_numpy():
     assert equal(sympify(np.float32(1.123456)), Float(1.123456, precision=24))
     assert equal(sympify(np.float64(1.1234567891234)),
@ -9,16 +9,14 @@
     assert equal(sympify(np.complex64(1 + 2j)), S(1.0 + 2.0*I))
     assert equal(sympify(np.complex128(1 + 2j)), S(1.0 + 2.0*I))
     assert equal(sympify(np.longcomplex(1 + 2j)), S(1.0 + 2.0*I))
-@@ -602,12 +600,6 @@ def test_sympify_numpy():
-     except AttributeError:  #float96 does not exist on all platforms
-         pass
- 
-    try:
+@@ -600,10 +598,6 @@ def test_sympify_numpy():
+     if hasattr(np, 'float96'):
+         assert equal(sympify(np.float96(1.123456789)),
+                     Float(1.123456789, precision=80))
+-    #float128 does not exist on all platforms
+-    if hasattr(np, 'float128'):
 -        assert equal(sympify(np.float128(1.123456789123)),
 -                    Float(1.123456789123, precision=80))
-    except AttributeError:  #float128 does not exist on all platforms
-        pass
-
+ 
 
 @XFAIL
- def test_sympify_rational_numbers_set():
--- a/sympy-python3.patch
+++ b/sympy-python3.patch
@ -1,5 +1,5 @@
--- sympy-sympy-1.3/sympy/utilities/autowrap.py.orig	2018-09-14 12:51:02.000000000 -0600
-+++ sympy-sympy-1.3/sympy/utilities/autowrap.py	2018-10-07 20:17:40.375409612 -0600
+--- sympy-sympy-1.4/sympy/utilities/autowrap.py.orig	2019-04-09 18:29:25.000000000 -0600
+++ sympy-sympy-1.4/sympy/utilities/autowrap.py	2019-04-17 14:34:26.580374579 -0600
@@ -228,6 +228,8 @@ except ImportError:
     from distutils.extension import Extension
 from Cython.Build import cythonize
@ -9,8 +9,8 @@
 {np_import}
 ext_mods = [Extension(
     {ext_args},
--- sympy-sympy-1.3/sympy/utilities/_compilation/compilation.py.orig	2018-09-14 12:51:02.000000000 -0600
-+++ sympy-sympy-1.3/sympy/utilities/_compilation/compilation.py	2018-10-07 20:16:40.951549612 -0600
+--- sympy-sympy-1.4/sympy/utilities/_compilation/compilation.py.orig	2019-04-09 18:29:25.000000000 -0600
+++ sympy-sympy-1.4/sympy/utilities/_compilation/compilation.py	2019-04-17 14:34:26.581374576 -0600
@@ -292,6 +292,8 @@ def simple_cythonize(src, destdir=None,
     try:
         cy_options = CompilationOptions(default_options)
@ -20,9 +20,9 @@
         cy_result = cy_compile([src], cy_options)
         if cy_result.num_errors > 0:
             raise ValueError("Cython compilation failed.")
--- sympy-sympy-1.3/sympy/utilities/tests/test_autowrap.py.orig	2018-09-14 12:51:02.000000000 -0600
-+++ sympy-sympy-1.3/sympy/utilities/tests/test_autowrap.py	2018-10-07 21:25:06.458000421 -0600
-@@ -104,6 +104,8 @@ except ImportError:
+--- sympy-sympy-1.4/sympy/utilities/tests/test_autowrap.py.orig	2019-04-09 18:29:25.000000000 -0600
+++ sympy-sympy-1.4/sympy/utilities/tests/test_autowrap.py	2019-04-17 14:34:26.581374576 -0600
+@@ -100,6 +100,8 @@ except ImportError:
     from distutils.extension import Extension
 from Cython.Build import cythonize
 cy_opts = {}
@ -31,7 +31,7 @@
 
 ext_mods = [Extension(
     'wrapper_module_%(num)s', ['wrapper_module_%(num)s.pyx', 'wrapped_code_%(num)s.c'],
-@@ -141,6 +143,8 @@ except ImportError:
+@@ -138,6 +140,8 @@ except ImportError:
     from distutils.extension import Extension
 from Cython.Build import cythonize
 cy_opts = {'compiler_directives': {'boundscheck': False}}
@ -40,7 +40,7 @@
 
 ext_mods = [Extension(
     'wrapper_module_%(num)s', ['wrapper_module_%(num)s.pyx', 'wrapped_code_%(num)s.c'],
-@@ -167,6 +171,8 @@ except ImportError:
+@@ -164,6 +168,8 @@ except ImportError:
     from distutils.extension import Extension
 from Cython.Build import cythonize
 cy_opts = {'compiler_directives': {'boundscheck': False}}
--- a/sympy-sympify.patch
+++ b/sympy-sympify.patch
@ -1,6 +1,6 @@
--- sympy-sympy-1.3/sympy/core/sympify.py.orig	2018-09-14 12:51:02.000000000 -0600
-+++ sympy-sympy-1.3/sympy/core/sympify.py	2019-01-29 21:12:59.797604449 -0700
-@@ -366,7 +366,7 @@ def sympify(a, locals=None, convert_xor=
+--- sympy-sympy-1.4/sympy/core/sympify.py.orig	2019-04-09 18:29:25.000000000 -0600
+++ sympy-sympy-1.4/sympy/core/sympify.py	2019-04-17 14:36:06.028059616 -0600
+@@ -382,7 +382,7 @@ def sympify(a, locals=None, convert_xor=
     try:
         a = a.replace('\n', '')
         expr = parse_expr(a, local_dict=locals, transformations=transformations, evaluate=evaluate)
--- a/sympy.spec
+++ b/sympy.spec
@ -1,20 +1,18 @@
 Name:           sympy
-Version:        1.3
-Release:        3%{?dist}
+Version:        1.4
+Release:        1%{?dist}
 Summary:        A Python library for symbolic mathematics
 License:        BSD
 URL:            http://sympy.org/
 Source0:        https://github.com/%{name}/%{name}/archive/%{name}-%{version}.tar.gz
 # Remove tests that fail on non-x86 architectures
 Patch0:         %{name}-float.patch
-# Fix a couple of documentation typos
+# Fix a documentation typo
 Patch1:         %{name}-doc.patch
 # Default to python3 in the Cython backend
 Patch2:         %{name}-python3.patch
 # Convert TypeError to SympifyError inside sympify()
 Patch3:         %{name}-sympify.patch
-# Disable failing factorial tests until a cause can be determined
-Patch4:         %{name}-factorial.patch

 BuildArch:      noarch

@ -25,6 +23,8 @@ BuildRequires:  gettext
 BuildRequires:  graphviz
 BuildRequires:  ImageMagick
 BuildRequires:  librsvg2-tools
+BuildRequires:  parallel
+BuildRequires:  procps
 BuildRequires:  python3-devel
 BuildRequires:  python3dist(cython)
 BuildRequires:  python3dist(docutils)
@ -41,7 +41,6 @@ BuildRequires:  tex(latex)
 BuildRequires:  tex-dvipng
 BuildRequires:  xorg-x11-fonts-Type1
 BuildRequires:  xorg-x11-server-Xvfb
-BuildRequires:  parallel

 %global _description\
 SymPy aims to become a full-featured computer algebra system (CAS)\
@ -58,7 +57,6 @@ Requires:       python3dist(cython)
 Requires:       python3dist(fastcache)
 Requires:       python3dist(gmpy2)
 Requires:       python3dist(matplotlib)
-Requires:       python3dist(mpmath)
 Requires:       python3dist(pyglet)

 Recommends:     python3dist(scipy)
@ -195,6 +193,10 @@ xvfb-run -a -n $dnum \
 %{_docdir}/%{name}-doc/html

 %changelog
+* Wed Apr 17 2019 Jerry James <loganjerry@gmail.com> - 1.4-1
+- Update to 1.4
+- Drop -factorial patch
+
 * Sun Feb 03 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.3-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild