Merge remote-tracking branch 'trac/develop' into 24655

VERSION.txt

-SageMath version 8.3.rc0, Release Date: 2018-07-08
+SageMath version 8.3.rc1, Release Date: 2018-07-14

build/bin/sage-spkg

@@ -846,6 +846,9 @@ export SAGE_DESTDIR="${SAGE_BUILD_DIR}/${PKG_NAME}/inst"
 # end of spkg-install.
 export SAGE_DESTDIR_LOCAL="${SAGE_DESTDIR}${SAGE_LOCAL}"
 
+# First uninstall the previous version of this package, if any
+sage-spkg-uninstall "$PKG_BASE"
+
 
 if [ -f spkg-build ]; then
     # Package has both spkg-build and spkg-install; execute the latter with SAGE_SUDO
@@ -868,10 +871,6 @@ else
     fi
 fi
 
-# We are now ready to install the new package files into $SAGE_LOCAL, so first
-# uninstall the previous version of this package, if any
-sage-spkg-uninstall "$PKG_BASE"
-
 # All spkgs should eventually support this, but fall back on old behavior in
 # case DESTDIR=$SAGE_DESTDIR installation was not used
 echo "Copying package files from temporary location $SAGE_DESTDIR to $SAGE_LOCAL"

build/pkgs/configure/checksums.ini

 tarball=configure-VERSION.tar.gz
-sha1=32dd5d6c8e2a91a4103d86a9846f7a059f1168e3
-md5=f3f6afb5cba47088f49fb638ca439204
-cksum=3865784923
+sha1=cc4b2f985ac58603b428a9e7850b58432d39a121
+md5=201f009787dac0d858a1c6b6de3670ce
+cksum=1591313806

build/pkgs/configure/package-version.txt

-272
+273

src/bin/sage-dist-helpers

@@ -212,7 +212,7 @@ sdh_install() {
     # Prefix SAGE_DESTDIR to the destination for DESTDIR installs
     dest="${SAGE_DESTDIR}$dest"
 
-    if [ -e "$dest" -a ! -d "$dest" ]; then
+    if [ $T -eq 0 -a -e "$dest" -a ! -d "$dest" ]; then
         sdh_die "Error: destination $dest for sdh_install exists and is not a directory"
     fi
 

src/bin/sage-version.sh

 # Sage version information for shell scripts
 # This file is auto-generated by the sage-update-version script, do not edit!
-SAGE_VERSION='8.3.rc0'
-SAGE_RELEASE_DATE='2018-07-08'
-SAGE_VERSION_BANNER='SageMath version 8.3.rc0, Release Date: 2018-07-08'
+SAGE_VERSION='8.3.rc1'
+SAGE_RELEASE_DATE='2018-07-14'
+SAGE_VERSION_BANNER='SageMath version 8.3.rc1, Release Date: 2018-07-14'

src/sage/manifolds/differentiable/pseudo_riemannian_submanifold.py

@@ -178,7 +178,8 @@ from sage.functions.other import factorial
 from sage.symbolic.ring import SR
 from sage.misc.cachefunc import cached_method
 from sage.rings.integer import Integer
-from Queue import Queue
+from queue import Queue
+
 
 class PseudoRiemannianSubmanifold(PseudoRiemannianManifold,
                                   DifferentiableSubmanifold):
@@ -1583,7 +1584,7 @@ class PseudoRiemannianSubmanifold(PseudoRiemannianManifold,
         return self._shape_operator
 
     def clear_cache(self):
-        """
+        r"""
         Reset all the cached functions and the derived quantities.
 
         Use this function if you modified the immersion (or embedding) of the
@@ -1614,7 +1615,6 @@ class PseudoRiemannianSubmanifold(PseudoRiemannianManifold,
             sage: N.clear_cache()
             sage: n is N.normal()
             False
-
         """
         self.difft.clear_cache()
         self.gradt.clear_cache()

src/sage/rings/complex_arb.pyx

@@ -786,16 +786,16 @@ class ComplexBallField(UniqueRepresentation, Field):
             ...
             ValueError: unable to isolate the roots (try using proof=False or
             increasing the precision)
-            sage: pol.roots(multiplicities=False, proof=False)
+            sage: sorted(pol.roots(multiplicities=False, proof=False), key=str)
             doctest:...
             UserWarning: roots may have been lost...
-            [[0.001000000 +/- 2.52e-10] + [+/- 2.05e-10]*I,
+            [[-14.72907378354557 +/- 4.63e-15] + [-10.70100790294238 +/- 2.16e-15]*I,
+             [-14.72907378354557 +/- 4.63e-15] + [10.70100790294238 +/- 2.16e-15]*I,
              [0.00100000 +/- 1.56e-10] + [+/- 1.27e-10]*I,
+             [0.001000000 +/- 2.52e-10] + [+/- 2.05e-10]*I,
              [18.20524201487994 +/- 1.22e-15] + [+/- 5.75e-37]*I,
-             [-14.72907378354557 +/- 4.63e-15] + [10.70100790294238 +/- 2.16e-15]*I,
-             [-14.72907378354557 +/- 4.63e-15] + [-10.70100790294238 +/- 2.16e-15]*I,
-             [5.625452776105595 +/- 2.29e-16] + [17.31459450084417 +/- 4.09e-15]*I,
-             [5.625452776105595 +/- 2.29e-16] + [-17.31459450084417 +/- 4.09e-15]*I]
+             [5.625452776105595 +/- 2.29e-16] + [-17.31459450084417 +/- 4.09e-15]*I,
+             [5.625452776105595 +/- 2.29e-16] + [17.31459450084417 +/- 4.09e-15]*I]
             sage: pol.roots(ComplexBallField(100), multiplicities=False)
             [[0.00099999999997763932022675...] + [+/- ...]*I,
              ...]

src/sage/version.py

 # Sage version information for Python scripts
 # This file is auto-generated by the sage-update-version script, do not edit!
-version = '8.3.rc0'
-date = '2018-07-08'
-banner = 'SageMath version 8.3.rc0, Release Date: 2018-07-08'
+version = '8.3.rc1'
+date = '2018-07-14'
+banner = 'SageMath version 8.3.rc1, Release Date: 2018-07-14'