Merge branch 'develop' into t/21249/realsets_fail_their_testsuite___test_category___test_pickling

Author: hivert

VERSION.txt

@@ -1 +1 @@
-SageMath version 7.6.beta4, Release Date: 2017-02-14
+SageMath version 7.6.rc0, Release Date: 2017-03-12

build/bin/sage-logger

@@ -60,14 +60,17 @@ else
     SED=cat
 fi
 
+# Store the current value of V, but do all logging of child processes
+# with V=1 to ensure that no information is lost.
+currentV=$V
+export V=1
+
 mkdir -p "$logdir"
 
-if [[ "$V" = 0 && $use_prefix = true ]]; then
+if [[ "$currentV" = 0 && $use_prefix = true ]]; then
     # Silent build.
     # Similar to https://www.gnu.org/software/automake/manual/html_node/Automake-Silent-Rules.html#Automake-Silent-Rules
     echo "[$logname] installing. Log file: $logfile"
-    # Use verbose mode for output to logfiles.
-    export V=1
     ( exec>> $logfile 2>&1 ; eval "$cmd" )
     status=$?
     if [[ $status != 0 ]]; then

build/make/deps

@@ -146,7 +146,8 @@ sagelib: \
 		$(inst_planarity) \
 		$(inst_ppl) \
 		$(inst_pynac) \
-		$(PYTHON) \
+		$(inst_python2) \
+		$(inst_python3) \
 		$(inst_ratpoints) \
 		$(inst_readline) \
 		$(inst_rw) \
@@ -200,7 +201,7 @@ DOC_DEPENDENCIES = sagelib $(inst_sphinx) $(inst_sagenb) \
 	| $(SAGERUNTIME) $(inst_maxima) $(inst_networkx) $(inst_scipy) \
 	$(inst_matplotlib) $(inst_pillow) $(inst_mathjax) $(inst_mpmath) \
 	$(inst_ipykernel) $(inst_jupyter_client) $(inst_conway_polynomials) \
-	$(inst_tachyon) $(inst_jmol) $(inst_thebe)
+	$(inst_tachyon) $(inst_jmol) $(inst_thebe) $(inst_ipywidgets)
 
 doc: doc-html
 

build/pkgs/configure/checksums.ini

@@ -1,4 +1,4 @@
 tarball=configure-VERSION.tar.gz
-sha1=f217d9ec85b7d0e8b6d6b8c9879b027e5e983709
-md5=5e76dd251dd6ad8fa2465b1d590173eb
-cksum=3094273803
+sha1=6f78567b00c4e2420368526ff172f22a59fa3f4a
+md5=c187e0d86960a61d32dbce29ec101b98
+cksum=3689960718

build/pkgs/configure/package-version.txt

@@ -1 +1 @@
-206
+209

build/pkgs/functools32/spkg-install

@@ -6,7 +6,7 @@ if [ -z "$SAGE_LOCAL" ]; then
     exit 1
 fi
 
-if [ -x "$SAGE_LOCAL/bin/python3" ]; then
+if [ -n -x "$SAGE_LOCAL/bin/python2" ]; then
     echo "Skipping functools32 since it is not necessary on Python 3"
     exit 0
 fi

build/pkgs/gap3/spkg-install

@@ -20,7 +20,7 @@ echo "INSTALL_DIR = $INSTALL_DIR"
 ## INSTALLATION
 ###########################################
 
-cd src
+cd src/src
 $MAKE
 if [ $? -ne 0 ]; then
     echo >&2 "Error building $PACKAGE_SHORTNAME."

build/pkgs/gdb/spkg-install

@@ -8,7 +8,8 @@ fi
 
 cd src
 
-LDFLAGS="${LDFLAGS} -L${SAGE_LOCAL}/lib"
+# We add -ltinfo flag to let gdb compile on some 32bit VM, see #22487.
+LDFLAGS="${LDFLAGS} -L${SAGE_LOCAL}/lib -ltinfo"
 export LDFLAGS
 
 ./configure --prefix="$SAGE_LOCAL" --libdir="$SAGE_LOCAL/lib" \

build/pkgs/ipywidgets/checksums.ini

@@ -1,4 +1,4 @@
 tarball=ipywidgets-VERSION.tar.gz
-sha1=f4f57d78fe6e89ef87e9eee31dd9e3f15d1e8601
-md5=317e49cc76353352939c2527920f3ebe
-cksum=1256350577
+sha1=3ec713b82cc415ebe63e2971cc7acae28e89d657
+md5=245c978e0ca64b9e686b716c71efb675
+cksum=3038350627

build/pkgs/ipywidgets/package-version.txt

@@ -1 +1 @@
-5.2.2.p1
+6.0.0