[arch-commits] Commit in sagemath/trunk (PKGBUILD sagemath-sympy-1.6.patch)

[Antonio Rojas]

    Date: Monday, May 25, 2020 @ 09:26:35
  Author: arojas
Revision: 634065

Add fixes for sympy 1.6

Added:
  sagemath/trunk/sagemath-sympy-1.6.patch
Modified:
  sagemath/trunk/PKGBUILD

--------------------------+
 PKGBUILD                 |   10 +++++--
 sagemath-sympy-1.6.patch |   60 +++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 67 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-05-25 09:23:15 UTC (rev 634064)
+++ PKGBUILD	2020-05-25 09:26:35 UTC (rev 634065)
@@ -8,7 +8,7 @@
 pkgbase=sagemath
 pkgname=(sagemath sagemath-jupyter)
 pkgver=9.1
-pkgrel=1
+pkgrel=2
 pkgdesc="Open Source Mathematics Software, free alternative to Magma, Maple, Mathematica, and Matlab"
 arch=(x86_64)
 url="http://www.sagemath.org"
@@ -48,7 +48,8 @@
         sagemath-matplotlib-3.2.patch
         sagemath-pari-2.11.3.patch
         sagemath-jedi-0.16.patch
-        sagemath-sphinx-3.patch)
+        sagemath-sphinx-3.patch
+        sagemath-sympy-1.6.patch)
 sha256sums=('07f3da5ca3e48f92c5a55b690408a3c87642689c28675a1f25b55a0f48ce5023'
             '5034676c4ce46181723f261d6bd180a795adea417f485c5e3e361b3aaef498ec'
             '6a5470d7044a50a35a6478f57c19adf72fe54aefebeea8a095915b63f9e219ac'
@@ -64,7 +65,8 @@
             '4947a86264622dffebb58b802f0616f0fb47b5784d95346f44ee426cb2e541fc'
             'f4c48127791f7fac46f0f4589bca4fdec43ab0689665f37436d52743d263fb0f'
             'b15762a283b2dade0d5131c7b22b33f47bcbc1eca4975b1e00d85fa152299503'
-            'eeeafd1a74c8c43c369569c8ea1dbae8fd9fcfdf0e6609471c030e9738b97ce5')
+            'eeeafd1a74c8c43c369569c8ea1dbae8fd9fcfdf0e6609471c030e9738b97ce5'
+            'fde6e00ccc200c748d6f092e35c60b93d4ed096f7b35b2db42681935f30ebcee')
 
 prepare(){
   cd sage-$pkgver
@@ -104,6 +106,8 @@
   patch -p1 -i ../sagemath-sphinx-3.patch
 # Fix warnings with matplotlib 3.2 https://trac.sagemath.org/ticket/29547
   patch -p1 -i ../sagemath-matplotlib-3.2.patch
+# Port to sympy 1.6 changes https://trac.sagemath.org/ticket/29730
+  patch -p1 -i ../sagemath-sympy-1.6.patch
 
   sed -e 's|sage-python23|python|' -i src/bin/*
   sed -e 's|$SAGE_PYTHON3|yes|' -i src/bin/sage

Added: sagemath-sympy-1.6.patch
===================================================================
--- sagemath-sympy-1.6.patch	                        (rev 0)
+++ sagemath-sympy-1.6.patch	2020-05-25 09:26:35 UTC (rev 634065)
@@ -0,0 +1,60 @@
+diff --git a/build/pkgs/sympy/checksums.ini b/build/pkgs/sympy/checksums.ini
+index 1b98ad8879..e5b80927ab 100644
+--- a/build/pkgs/sympy/checksums.ini
++++ b/build/pkgs/sympy/checksums.ini
+@@ -1,4 +1,5 @@
+ tarball=sympy-VERSION.tar.gz
+-sha1=be2e740860f7900f0ee2a8102d2943fded44125c
+-md5=fa9ad424535075312df022964ede21bc
+-cksum=3298250000
++sha1=067078df2d0401f3c4b49ee2e50a4105f92c5272
++md5=dbb7b21d2972c41f37d48f744b6189a3
++cksum=575244204
++upstream_url=https://github.com/sympy/sympy/releases/download/sympy-VERSION/sympy-VERSION.tar.gz
+diff --git a/build/pkgs/sympy/package-version.txt b/build/pkgs/sympy/package-version.txt
+index c239c60cba..810ee4e91e 100644
+--- a/build/pkgs/sympy/package-version.txt
++++ b/build/pkgs/sympy/package-version.txt
+@@ -1 +1 @@
+-1.5
++1.6
+diff --git a/src/sage/calculus/test_sympy.py b/src/sage/calculus/test_sympy.py
+index 9fb9358cb2..86f9366704 100644
+--- a/src/sage/calculus/test_sympy.py
++++ b/src/sage/calculus/test_sympy.py
+@@ -109,7 +109,7 @@ And here are some actual tests of sympy::
+ 
+     sage: e = (1/cos(x)^3)._sympy_(); e
+     cos(x)**(-3)
+-    sage: f = e.series(x, 0, 10); f
++    sage: f = e.series(x, 0, int(10)); f
+     1 + 3*x**2/2 + 11*x**4/8 + 241*x**6/240 + 8651*x**8/13440 + O(x**10)
+ 
+ And the pretty-printer.  Since unicode characters are not working on
+diff --git a/src/sage/manifolds/calculus_method.py b/src/sage/manifolds/calculus_method.py
+index 7042afe77a..a658551ee9 100644
+--- a/src/sage/manifolds/calculus_method.py
++++ b/src/sage/manifolds/calculus_method.py
+@@ -65,7 +65,7 @@ def _SR_to_Sympy(expression):
+ 
+     """
+     # Nothing to do if expression is already a SymPy object:
+-    if type(expression) in sympy.core.all_classes:
++    if type(expression) in sympy.core.core.all_classes:
+         return expression
+     return SR(expression)._sympy_()
+ 
+diff --git a/src/sage/symbolic/relation.py b/src/sage/symbolic/relation.py
+index 028f628797..d252434d52 100644
+--- a/src/sage/symbolic/relation.py
++++ b/src/sage/symbolic/relation.py
+@@ -914,7 +914,8 @@ def solve(f, *args, **kwds):
+     print them::
+ 
+         sage: solve(sinh(x) - 2*cosh(x),x,algorithm='sympy')
+-        ConditionSet(x, Eq((-exp(2*x) - 3)*exp(-x)/2, 0), Reals)
++        [ImageSet(Lambda(_n, I*(2*_n*pi + pi/2) + log(sqrt(3))), Integers),
++         ImageSet(Lambda(_n, I*(2*_n*pi - pi/2) + log(sqrt(3))), Integers)]
+         sage: solve(2*sin(x) - 2*sin(2*x), x,algorithm='sympy')
+         [ImageSet(Lambda(_n, 2*_n*pi), Integers),
+          ImageSet(Lambda(_n, 2*_n*pi + pi), Integers),