From 8caa98c2cd3b7097bde511d5a7f42fbcc86c6f30 Mon Sep 17 00:00:00 2001 From: Jerry James Date: Wed, 24 Jun 2020 10:03:43 -0600 Subject: [PATCH] Add setuptools BR. Add -ast patch to fix compilation with python 3.9. --- sympy-ast.patch | 38 ++++++++++++++++++++++++++++++++++++++ sympy.spec | 34 +++++++++++++++++++++------------- 2 files changed, 59 insertions(+), 13 deletions(-) create mode 100644 sympy-ast.patch diff --git a/sympy-ast.patch b/sympy-ast.patch new file mode 100644 index 0000000..d9de64a --- /dev/null +++ b/sympy-ast.patch @@ -0,0 +1,38 @@ +--- sympy-sympy-1.6/sympy/parsing/sympy_parser.py.orig 2020-05-22 19:34:58.000000000 -0600 ++++ sympy-sympy-1.6/sympy/parsing/sympy_parser.py 2020-06-24 09:39:41.248164173 -0600 +@@ -1058,7 +1058,7 @@ class EvaluateFalseTransformer(ast.NodeT + right = ast.Call( + func=ast.Name(id='Mul', ctx=ast.Load()), + args=[ast.UnaryOp(op=ast.USub(), operand=ast.Num(1)), right], +- keywords=[ast.keyword(arg='evaluate', value=ast.Name(id='False', ctx=ast.Load()))], ++ keywords=[ast.keyword(arg='evaluate', value=ast.Constant(value=False))], + starargs=None, + kwargs=None + ) +@@ -1069,7 +1069,7 @@ class EvaluateFalseTransformer(ast.NodeT + left = ast.Call( + func=ast.Name(id='Pow', ctx=ast.Load()), + args=[left, ast.UnaryOp(op=ast.USub(), operand=ast.Num(1))], +- keywords=[ast.keyword(arg='evaluate', value=ast.Name(id='False', ctx=ast.Load()))], ++ keywords=[ast.keyword(arg='evaluate', value=ast.Constant(value=False))], + starargs=None, + kwargs=None + ) +@@ -1077,7 +1077,7 @@ class EvaluateFalseTransformer(ast.NodeT + right = ast.Call( + func=ast.Name(id='Pow', ctx=ast.Load()), + args=[right, ast.UnaryOp(op=ast.USub(), operand=ast.Num(1))], +- keywords=[ast.keyword(arg='evaluate', value=ast.Name(id='False', ctx=ast.Load()))], ++ keywords=[ast.keyword(arg='evaluate', value=ast.Constant(value=False))], + starargs=None, + kwargs=None + ) +@@ -1085,7 +1085,7 @@ class EvaluateFalseTransformer(ast.NodeT + new_node = ast.Call( + func=ast.Name(id=sympy_class, ctx=ast.Load()), + args=[left, right], +- keywords=[ast.keyword(arg='evaluate', value=ast.Name(id='False', ctx=ast.Load()))], ++ keywords=[ast.keyword(arg='evaluate', value=ast.Constant(value=False))], + starargs=None, + kwargs=None + ) diff --git a/sympy.spec b/sympy.spec index cbc0626..7856ab5 100644 --- a/sympy.spec +++ b/sympy.spec @@ -1,6 +1,6 @@ Name: sympy Version: 1.6 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A Python library for symbolic mathematics License: BSD URL: http://sympy.org/ @@ -9,6 +9,9 @@ Source0: https://github.com/%{name}/%{name}/archive/%{name}-%{version}.ta Patch0: %{name}-float.patch # Default to python3 in the Cython backend Patch1: %{name}-python3.patch +# Adapt to AST changes in python 3.9 +# See https://github.com/sympy/sympy/issues/19638 +Patch2: %{name}-ast.patch BuildArch: noarch @@ -22,19 +25,20 @@ BuildRequires: librsvg2-tools BuildRequires: parallel BuildRequires: procps BuildRequires: python3-devel -BuildRequires: python3dist(cython) -BuildRequires: python3dist(docutils) -BuildRequires: python3dist(fastcache) -BuildRequires: python3dist(gmpy2) -BuildRequires: python3dist(matplotlib) -BuildRequires: python3dist(mpmath) -BuildRequires: python3dist(numexpr) -BuildRequires: python3dist(numpy) +BuildRequires: %{py3_dist cython} +BuildRequires: %{py3_dist docutils} +BuildRequires: %{py3_dist fastcache} +BuildRequires: %{py3_dist gmpy2} +BuildRequires: %{py3_dist matplotlib} +BuildRequires: %{py3_dist mpmath} +BuildRequires: %{py3_dist numexpr} +BuildRequires: %{py3_dist numpy} BuildRequires: python3-numpy-f2py -BuildRequires: python3dist(scipy) -BuildRequires: python3dist(sphinx-math-dollar) -BuildRequires: python3dist(theano) -BuildRequires: python3dist(wurlitzer) +BuildRequires: %{py3_dist scipy} +BuildRequires: %{py3_dist setuptools} +BuildRequires: %{py3_dist sphinx-math-dollar} +BuildRequires: %{py3_dist theano} +BuildRequires: %{py3_dist wurlitzer} BuildRequires: tex(latex) BuildRequires: tex-dvipng BuildRequires: xorg-x11-fonts-Type1 @@ -173,6 +177,10 @@ fi %{_docdir}/%{name}-doc/html %changelog +* Wed Jun 24 2020 Jerry James - 1.6-2 +- Add setuptools BR +- Add -ast patch to fix compilation with python 3.9 + * Fri May 29 2020 Jerry James - 1.6-1 - Version 1.6 - Drop upstreamed -doc and -sample-set patches