Merge branch 'develop' into t/22844/symbolic_limit

Author: rwst

VERSION.txt

@@ -1 +1 @@
-SageMath version 8.0.beta4, Release Date: 2017-04-27
+SageMath version 8.0.beta5, Release Date: 2017-05-04

build/bin/sage-pip-install

@@ -31,8 +31,18 @@ if [ "$1" != "." ]; then
     exit 1
 fi
 
+
+if [ "$SAGE_PYTHON3" = yes ]; then
+    PYTHON=python3
+    PIP=pip3
+else
+    PYTHON=python2
+    PIP=pip2
+fi
+
+
 # Find out the name of the package that we are installing
-name="$(python setup.py --name)"
+name="$($PYTHON setup.py --name)"
 
 if [ $? -ne 0 ]; then
     echo >&2 "Error: could not determine package name"
@@ -46,29 +56,36 @@ if [ $(echo "$name" | wc -l) -gt 1 ]; then
     echo >&2 "line as the package name: $name"
 fi
 
-# We should avoid running pip while uninstalling a package because that
+
+# We should avoid running pip2/3 while uninstalling a package because that
 # is prone to race conditions. Therefore, we use a lockfile while
-# running pip. This is implemented in the Python script pip-lock.
+# running pip. This is implemented in the Python script pip2/3-lock.
 
 # Keep uninstalling as long as it succeeds
 while true; do
-    out=$(pip-lock uninstall --disable-pip-version-check -y "$name" 2>&1)
+    out=$($PIP-lock uninstall --disable-pip-version-check -y "$name" 2>&1)
     if [ $? -ne 0 ]; then
         break
     fi
     echo "$out"
 done
 
 # Not ideal, but this is the easiest way to check if the package
-# was not installed to begin with (which pip treats as an error).
+# was not installed to begin with (which pip2/3 treats as an error).
 # If it wasn't, then we proceed quietly; if it was installed show the
 # uninstallation output and error out.
 if [[ "$out" != *"not installed" ]]; then
     echo >&2 "$out"
     exit 1
 fi
 
-# Finally actually do the installation (the "SHARED" tells pip-lock
+# Finally actually do the installation (the "SHARED" tells pip2/3-lock
 # to apply a shared lock)
-echo "Installing package $name using pip"
-exec pip-lock SHARED install $pip_install_flags .
+echo "Installing package $name using $PIP"
+
+$PIP-lock SHARED install $pip_install_flags .
+if [ $? -ne 0 ]; then
+    echo >&2 "Error: installing with $PIP failed"
+    exit 3
+fi
+

build/bin/sage-python23

@@ -0,0 +1,21 @@
+#!/usr/bin/env bash
+
+
+# Run the Python interpreter that we are currently building Sage with
+#
+# An existing Python is a build-time dependency for Sage, but
+# sometimes packages need to specifically run the one in Sage and not
+# just any Python interpreter.
+#
+# This is similar to the sage-pip-install script, which you should be
+# using for installing Python packages if at all possible.
+
+
+if [ "$SAGE_PYTHON3" = yes ]; then
+   PYTHON="$SAGE_LOCAL/bin/python3"
+else
+   PYTHON="$SAGE_LOCAL/bin/python2"
+fi
+
+
+exec $PYTHON "$@"

build/pkgs/brial/spkg-install

@@ -17,6 +17,8 @@ cd src
 # C++11 workaround https://trac.sagemath.org/ticket/20926
 export CXXFLAGS="$CXXFLAGS -std=c++98"
 
+export PYTHON=sage-python23
+
 ./configure \
     --prefix="$SAGE_LOCAL" \
     --libdir="$SAGE_LOCAL/lib" \

build/pkgs/configure/checksums.ini

@@ -1,4 +1,4 @@
 tarball=configure-VERSION.tar.gz
-sha1=965fb15ff18f39c5cf38fcc8ff40d7450f70a122
-md5=7b67114fe41bb58afac9386c621d2b88
-cksum=821175052
+sha1=339f2474b789d33051dde8f69d047ae723a36379
+md5=9bb01c255b39648bb19f62a3fa24a80d
+cksum=2072910001

build/pkgs/configure/package-version.txt

@@ -1 +1 @@
-218
+219

build/pkgs/cvxopt/spkg-check

@@ -41,7 +41,7 @@ for di in "$CUR"/src/examples/doc/chap* ; do
     cd "$di"
     for i in `ls | grep -v bin` ; do
         echo "Testing $i ..."
-        python $i
+        sage-python23 $i
         if [ $? -ne 0 ]; then
             echo >&2 "Error: test $di/$i failed"
             exit 1

build/pkgs/gambit/spkg-install

@@ -21,7 +21,7 @@ if [ $? -ne 0 ]; then
 fi
 
 cd src/python
-python setup.py --no-user-cfg build install
+sage-python23 setup.py --no-user-cfg build install
 
 if [ $? -ne 0 ]; then
     echo "Error installing Python API"

build/pkgs/gap_jupyter/SPKG.txt

@@ -0,0 +1,16 @@
+= jupyter-kernel-gap =
+
+== Description ==
+
+Jupyter kernel for GAP
+
+This wrapper-kernel is a Jupyter kernel for the GAP Computer Algebra System
+based on the same ideas as the bash wrapper kernel.
+
+== License ==
+
+3-Clause BSD License
+
+== Upstream Contact ==
+
+* https://github.com/gap-packages/jupyter-gap

build/pkgs/gap_jupyter/checksums.ini

@@ -0,0 +1,4 @@
+tarball=jupyter-kernel-gap-VERSION.tar.gz
+sha1=9536aa352c6dee815ae5179e3971bfb9216f8eda
+md5=f5853cc8cd62ce495be8d3c8bdb2500f
+cksum=3578940226