Merge branch 'u/rws/24062' of git://trac.sagemath.org/sage into t/22024/symbolic_placeholder_for_complex_root

Author: rwst

build/pkgs/sympy/checksums.ini

@@ -1,4 +1,4 @@
 tarball=sympy-VERSION.tar.gz
-sha1=370707a29cda59b696433107d44048dfa3ebafcd
-md5=43e797de799f00f9e8fd2307dba9fab1
-cksum=58295624
+sha1=d5acc09a7429de76713898728f1ec50a3c48e133
+md5=c410a9c2346878716d16ec873d72e72a
+cksum=3457785807

build/pkgs/sympy/package-version.txt

@@ -1 +1 @@
-1.0.p4
+1.1.1

build/pkgs/sympy/patches/01_undeffun_sage.patch

@@ -0,0 +1,29 @@
+diff --git a/sympy/core/function.py b/sympy/core/function.py
+index cda559716..12a83e7a3 100644
+--- a/sympy/core/function.py
++++ b/sympy/core/function.py
+@@ -771,6 +771,16 @@ def _sage_(self):
+         func = sage.function(fname)(*args)
+         return func
+ 
++class UndefSage(object):
++    def __get__(self, ins, typ):
++        from sage.calculus.var import function
++        if ins is None:
++            return lambda: function(typ.__name__)
++        else:
++            args = [arg._sage_() for arg in ins.args]
++            return lambda : function(ins.__class__.__name__)(*args)
++
++
+ class UndefinedFunction(FunctionClass):
+     """
+     The (meta)class of undefined functions.
+@@ -780,6 +790,7 @@ def __new__(mcl, name, bases=(AppliedUndef,), __dict__=None, **kwargs):
+         __dict__.update(kwargs)
+         __dict__['__module__'] = None # For pickling
+         ret = super(UndefinedFunction, mcl).__new__(mcl, name, bases, __dict__)
++        ret._sage_ = UndefSage()
+         return ret
+ 
+     def __instancecheck__(cls, instance):

build/pkgs/sympy/patches/02_undeffun_sage.patch

@@ -102,6 +102,7 @@ and testing to make sure nothing funny is going on).
    sage/interfaces/sage0
    sage/interfaces/scilab
    sage/interfaces/singular
+   sage/interfaces/sympy
    sage/interfaces/tachyon
    sage/interfaces/tides
 

build/pkgs/sympy/patches/03_undeffun_sage.patch

@@ -650,6 +650,8 @@ def symbolic_sum(expression, v, a, b, algorithm='maxima', hold=False):
     elif algorithm == 'sympy':
         expression,v,a,b = [expr._sympy_() for expr in (expression, v, a, b)]
         from sympy import summation
+        from sage.interfaces.sympy import sympy_init
+        sympy_init()
         result = summation(expression, (v, a, b))
         try:
             return result._sage_()
@@ -894,6 +896,8 @@ def symbolic_product(expression, v, a, b, algorithm='maxima', hold=False):
     elif algorithm == 'sympy':
         expression,v,a,b = [expr._sympy_() for expr in (expression, v, a, b)]
         from sympy import product as sproduct
+        from sage.interfaces.sympy import sympy_init
+        sympy_init()
         result = sproduct(expression, (v, a, b))
         try:
             return result._sage_()
@@ -1536,6 +1540,8 @@ def laplace(ex, t, s, algorithm='maxima'):
     elif algorithm == 'sympy':
         ex_sy, t, s = [expr._sympy_() for expr in (ex, t, s)]
         from sympy import laplace_transform
+        from sage.interfaces.sympy import sympy_init
+        sympy_init()
         result = laplace_transform(ex_sy, t, s)
         if isinstance(result, tuple):
             try:
@@ -1702,6 +1708,8 @@ def inverse_laplace(ex, s, t, algorithm='maxima'):
     elif algorithm == 'sympy':
         ex_sy, s, t = [expr._sympy_() for expr in (ex, s, t)]
         from sympy import inverse_laplace_transform
+        from sage.interfaces.sympy import sympy_init
+        sympy_init()
         result = inverse_laplace_transform(ex_sy, s, t)
         try:
             return result._sage_()

build/pkgs/sympy/patches/fix-dmp_ff_div-by-simplifying-gmpy-rationals-divisio.patch

@@ -107,7 +107,7 @@
 
 ::
 
-    sage: e = sympify(1)/cos(x)**3; e
+    sage: e = (1/cos(x)^3)._sympy_(); e
     cos(x)**(-3)
     sage: f = e.series(x, 0, 10); f
     1 + 3*x**2/2 + 11*x**4/8 + 241*x**6/240 + 8651*x**8/13440 + O(x**10)
@@ -138,12 +138,12 @@
     sage: e._sage_().taylor(x._sage_(), 0, 8)
     8651/13440*x^8 + 241/240*x^6 + 11/8*x^4 + 3/2*x^2 + 1
     sage: f._sage_()
-    8651/13440*x^8 + 241/240*x^6 + 11/8*x^4 + 3/2*x^2 + 1
+    8651/13440*x^8 + 241/240*x^6 + 11/8*x^4 + 3/2*x^2 + Order(x^10) + 1
 
 Mixing SymPy with Sage::
 
     sage: import sympy
-    sage: sympy.sympify(var("y"))+sympy.Symbol("x")
+    sage: var("x")._sympy_() + var("y")._sympy_()
     x + y
     sage: o = var("omega")
     sage: s = sympy.Symbol("x")