Merge branch 't/22219/upgrade_to_pynac_0_7_4' into t/22090/gosper_alg…

…orithm
sagemath · Jan 22, 2017 · 5fdc5ff · 5fdc5ff
2 parents 5b729ed + c7eb7ff
commit 5fdc5ff
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 9 deletions.
diff --git a/build/pkgs/pynac/checksums.ini b/build/pkgs/pynac/checksums.ini
@@ -1,4 +1,4 @@
 tarball=pynac-VERSION.tar.bz2
-sha1=71c1193897252cbead573171c3f38c9dbf0c38f3
-md5=c76c749bc4301d09b90073bcaa230a24
-cksum=877159616
+sha1=f375fbb59ec841dc1fee6b09cf9cc2d5e06ea757
+md5=92b4d7b8a152536ec476ecb8bf208261
+cksum=262865416
diff --git a/build/pkgs/pynac/package-version.txt b/build/pkgs/pynac/package-version.txt
@@ -1 +1 @@
-0.7.3
+0.7.4
diff --git a/build/pkgs/pynac/spkg-install b/build/pkgs/pynac/spkg-install
@@ -35,7 +35,7 @@ build_pynac()
 {
     cd ${PYNACDIR}
     PKG_CONFIG_PATH=${SAGE_LOCAL}/lib/pkgconfig; export PKG_CONFIG_PATH
-    ./configure --disable-static --prefix=${SAGE_LOCAL} --with-giac=no --libdir="$SAGE_LOCAL/lib"
+    ./configure --disable-static --prefix=${SAGE_LOCAL} --libdir="$SAGE_LOCAL/lib"
     $MAKE
     if [ $? -ne 0 ]; then
         echo "Error building pynac."

diff --git a/src/sage/calculus/wester.py b/src/sage/calculus/wester.py
@@ -508,7 +508,11 @@
     sage: # (OK-ish) D(x)Abs(x)
     sage: #    Verify(D(x) Abs(x), Sign(x));
     sage: diff(abs(x))
+    1/2*(x + conjugate(x))/abs(x)
+    sage: _ = var('x', domain='real')
+    sage: diff(abs(x))
     x/abs(x)
+    sage: forget()
 
 ::
 

diff --git a/src/sage/libs/pynac/pynac.pyx b/src/sage/libs/pynac/pynac.pyx
@@ -1506,7 +1506,7 @@ cdef object py_sin(object x) except +:
         sage: sin(2.*I)
         3.62686040784702*I
         sage: sin(QQbar(I))
-        1.17520119364380*I
+        sin(I)
     """
     try:
         return x.sin()
@@ -1528,7 +1528,7 @@ cdef object py_cos(object x) except +:
         sage: cos(2.*I)
         3.76219569108363
         sage: cos(QQbar(I))
-        1.54308063481524
+        cos(I)
     """
     try:
         return x.cos()

diff --git a/src/sage/symbolic/expression.pyx b/src/sage/symbolic/expression.pyx
@@ -4354,7 +4354,7 @@ cdef class Expression(CommutativeRingElement):
             sage: x,y = var('x,y', domain='real')
             sage: p,q = var('p,q', domain='positive')
             sage: (c/2*(5*(3*a*b*x*y*p*q)^2)^(7/2*c)).expand()
-            1/2*45^(7/2*c)*(a^2*b^2)^(7/2*c)*c*p^(7*c)*q^(7*c)*(x^2)^(7/2*c)*(y^2)^(7/2*c)
+            1/2*45^(7/2*c)*(a^2*b^2*x^2*y^2)^(7/2*c)*c*p^(7*c)*q^(7*c)
             sage: ((-(-a*x*p)^3*(b*y*p)^3)^(c/2)).expand()
             (a^3*b^3*x^3*y^3)^(1/2*c)*p^(3*c)
             sage: x,y,p,q = var('x,y,p,q', domain='complex')

diff --git a/src/sage/symbolic/function.pyx b/src/sage/symbolic/function.pyx
@@ -395,7 +395,7 @@ cdef class Function(SageObject):
             ...
             TypeError: cannot coerce arguments: ...
             sage: exp(QQbar(I))
-            0.540302305868140 + 0.841470984807897*I
+            e^I
 
         For functions with single argument, if coercion fails we try to call
         a method with the name of the function on the object::