Merge 7.2.beta6 into t/20227/ticket/20227

Conflicts:
	src/sage/schemes/projective/projective_space.py

Makefile

@@ -13,6 +13,7 @@ build: all-build
 
 # Defer unknown targets to build/make/Makefile
 %::
+	@if [ -x relocate-once.py ]; then ./relocate-once.py; fi
 	$(MAKE) build/make/Makefile
 	+build/bin/sage-logger \
 		"cd build/make && ./install '$@'" logs/install.log
@@ -90,34 +91,37 @@ test: all
 check: test
 
 testall: all
-	$(TESTALL) --optional=all --logfile=logs/testall.log
+	$(TESTALL) --optional=sage,optional,external --logfile=logs/testall.log
 
 testlong: all
 	$(TESTALL) --long --logfile=logs/testlong.log
 
 testalllong: all
-	$(TESTALL) --long --optional=all --logfile=logs/testalllong.log
+	$(TESTALL) --long --optional=sage,optional,external --logfile=logs/testalllong.log
 
 ptest: all
 	$(PTESTALL) --logfile=logs/ptest.log
 
 ptestall: all
-	$(PTESTALL) --optional=all --logfile=logs/ptestall.log
+	$(PTESTALL) --optional=sage,optional,external --logfile=logs/ptestall.log
 
 ptestlong: all
 	$(PTESTALL) --long --logfile=logs/ptestlong.log
 
 ptestalllong: all
-	$(PTESTALL) --long --optional=all --logfile=logs/ptestalllong.log
+	$(PTESTALL) --long --optional=sage,optional,external --logfile=logs/ptestalllong.log
 
+testoptional: all
+	$(TESTALL) --optional=sage,optional --logfile=logs/testoptional.log
 
-testoptional: testall # just an alias
+testoptionallong: all
+	$(TESTALL) --long --optional=sage,optional --logfile=logs/testoptionallong.log
 
-testoptionallong: testalllong # just an alias
+ptestoptional: all
+	$(PTESTALL) --optional=sage,optional --logfile=logs/ptestoptional.log
 
-ptestoptional: ptestall # just an alias
-
-ptestoptionallong: ptestalllong # just an alias
+ptestoptionallong: all
+	$(PTESTALL) --long --optional=sage,optional --logfile=logs/ptestoptionallong.log
 
 configure: configure.ac src/bin/sage-version.sh m4/*.m4
 	./bootstrap -d

VERSION.txt

@@ -1 +1 @@
-Sage version 7.1.rc0, released 2016-03-10
+SageMath version 7.2.beta6, Release Date: 2016-04-28

build/bin/sage-uncompress-spkg

@@ -18,28 +18,29 @@ if __name__ == '__main__':
     filename = sys.argv[1]
     if tarfile.is_tarfile(filename):
         # tar file, possibly compressed:
-        with tarfile.open(filename, 'r:*') as archive:
-            if len(sys.argv) == 2:
-                archive.extractall()
-            else:
-                member = sys.argv[2]
-                if member in archive.getnames():
-                    SPKG_TXT = archive.extractfile(member)
-                    sys.stdout.write(SPKG_TXT.read())
-                else:
-                    exit(1)
+        archive = tarfile.open(filename, 'r:*')
+        if len(sys.argv) == 2:
+            archive.extractall()
+        else:
+            member = sys.argv[2]
+            if member in archive.getnames():
+                SPKG_TXT = archive.extractfile(member)
+                sys.stdout.write(SPKG_TXT.read())
+                exit(1)
+        archive.close()
         exit(0)
     if zipfile.is_zipfile(filename):
         # zip file:
-        with zipfile.ZipFile(filename, 'r') as archive:
-            if len(sys.argv) == 1:
-                archive.extractall()
+        archive = zipfile.ZipFile(filename, 'r')
+        if len(sys.argv) == 2:
+            archive.extractall()
+        else:
+            member = sys.argv[2]
+            if member in archive.namelist():
+                sys.stdout.write(archive.read(member))
             else:
-                member = sys.argv[2]
-                if member in archive.namelist():
-                    sys.stdout.write(archive.read(member))
-                else:
-                    exit(1)
+                exit(1)
+        archive.close()
         exit(0)
     else:
         print ('Error: Unknown file type: {}'.format(filename))

build/make/deps

@@ -3,6 +3,9 @@
 # $SAGE_ROOT/build/make/Makefile by $SAGE_ROOT/build/make/install
 ###############################################################################
 
+# We need to be able to override this to support ./sage -i -c PKG
+SAGE_SPKG = sage-spkg
+
 STARTED = $(SAGE_LOCAL)/etc/sage-started.txt
 
 # Tell make not to look for files with these names:
@@ -146,7 +149,7 @@ sagelib: \
 		$(EXTCODE)
 	if [ -z "$$SAGE_INSTALL_FETCH_ONLY" ]; then \
 		cd $(SAGE_SRC) && source bin/sage-env && \
-		sage-logger 'time $(MAKE) sage' '$(SAGE_LOGS)/sage-$(SAGE_VERSION).log'; \
+		sage-logger 'time $(MAKE) sage' '$(SAGE_LOGS)/sagelib-$(SAGE_VERSION).log'; \
 	fi
 
 

build/pkgs/alabaster/SPKG.txt

@@ -0,0 +1,13 @@
+= alabaster =
+
+== Description ==
+
+Alabaster is a visually (c)lean, responsive, configurable theme for the Sphinx
+documentation system. It is Python 2+3 compatible.
+
+It began as a third-party theme, and is still maintained separately, but as of
+Sphinx 1.3, Alabaster is an install-time dependency of Sphinx and is selected
+as the default theme.
+
+Live examples of this theme can be seen on paramiko.org, fabfile.org and
+pyinvoke.org.

build/pkgs/alabaster/checksums.ini

@@ -0,0 +1,4 @@
+tarball=alabaster-VERSION.tar.gz
+sha1=ff3e575ee7eb4ba1721f17d91ec5a54b16283603
+md5=957c665d7126dea8121f98038debcba7
+cksum=738605178

build/pkgs/alabaster/dependencies

@@ -0,0 +1,5 @@
+$(PYTHON) | pip
+
+----------
+All lines of this file are ignored except the first.
+It is copied by SAGE_ROOT/build/make/install into SAGE_ROOT/build/make/Makefile.

build/pkgs/alabaster/package-version.txt

@@ -0,0 +1 @@
+0.7.7

build/pkgs/alabaster/spkg-install

@@ -0,0 +1,3 @@
+#!/usr/bin/env bash
+
+cd src && python setup.py install

build/pkgs/alabaster/type

@@ -0,0 +1 @@
+standard

build/pkgs/babel/SPKG.txt

@@ -0,0 +1,7 @@
+= babel =
+
+== Description ==
+
+Internationalization utilities
+
+A collection of tools for internationalizing Python applications.

build/pkgs/babel/checksums.ini

@@ -0,0 +1,4 @@
+tarball=Babel-VERSION.tar.gz
+sha1=e02392bc9a16f7672686bce23e4e3cdadcc1b1c8
+md5=1b69e4b2ab3795119266ccaa36b36f15
+cksum=2897183559

build/pkgs/babel/dependencies

@@ -0,0 +1,5 @@
+$(PYTHON) | pip pytz
+
+----------
+All lines of this file are ignored except the first.
+It is copied by SAGE_ROOT/build/make/install into SAGE_ROOT/build/make/Makefile.

build/pkgs/babel/package-version.txt

@@ -0,0 +1 @@
+2.2.0

build/pkgs/babel/spkg-install

@@ -0,0 +1,3 @@
+#!/usr/bin/env bash
+
+cd src && python setup.py install

build/pkgs/babel/type

@@ -0,0 +1 @@
+standard

build/pkgs/brial/patches/build/cygwin-gnucpp.patch

@@ -0,0 +1,10 @@
+--- a/common.mk	2016-04-07 15:53:44.907758600 +0200
++++ b/common.mk	2016-04-07 15:54:02.599770500 +0200
+@@ -3,6 +3,6 @@
+ 	-I$(top_srcdir)/libpolybori/include
+
+ AM_CFLAGS = -std=c99
+-AM_CXXFLAGS = -std=c++98 -ftemplate-depth-100
++AM_CXXFLAGS = -std=gnu++98 -ftemplate-depth-100
+
+ AM_DEFAULT_SOURCE_EXT = .cc

build/pkgs/brial/patches/cygwin-gnucpp.patch

@@ -0,0 +1,51 @@
+diff --git a/Cudd/cudd/Makefile.in b/Cudd/cudd/Makefile.in
+index 645eb7d..760278b
+--- a/Cudd/cudd/Makefile.in
++++ b/Cudd/cudd/Makefile.in
+@@ -350,7 +350,7 @@ AM_CPPFLAGS = \
+ 	-I$(top_srcdir)/libpolybori/include
+
+ AM_CFLAGS = -std=c99
+-AM_CXXFLAGS = -std=c++98 -ftemplate-depth-100
++AM_CXXFLAGS = -std=gnu++98 -ftemplate-depth-100
+ AM_DEFAULT_SOURCE_EXT = .cc
+ noinst_LTLIBRARIES = libcudd.la
+ libcudd_la_SOURCES = \
+diff --git a/common.mk b/common.mk
+index 7915587..0afda02 100755
+--- a/common.mk
++++ b/common.mk
+@@ -3,6 +3,6 @@ AM_CPPFLAGS = \
+ 	-I$(top_srcdir)/libpolybori/include
+
+ AM_CFLAGS = -std=c99
+-AM_CXXFLAGS = -std=c++98 -ftemplate-depth-100
++AM_CXXFLAGS = -std=gnu++98 -ftemplate-depth-100
+
+ AM_DEFAULT_SOURCE_EXT = .cc
+diff --git a/groebner/src/Makefile.in b/groebner/src/Makefile.in
+index ef7882c..cb3b04f
+--- a/groebner/src/Makefile.in
++++ b/groebner/src/Makefile.in
+@@ -372,7 +372,7 @@ AM_CPPFLAGS = \
+ 	-I$(top_srcdir)/libpolybori/include
+
+ AM_CFLAGS = -std=c99
+-AM_CXXFLAGS = -std=c++98 -ftemplate-depth-100
++AM_CXXFLAGS = -std=gnu++98 -ftemplate-depth-100
+ AM_DEFAULT_SOURCE_EXT = .cc
+ lib_LTLIBRARIES = libpolybori_groebner.la
+ libpolybori_groebner_la_CXXFLAGS = $(AM_CXXFLAGS) $(SIMMD_CFLAGS)
+diff --git a/libpolybori/src/Makefile.in b/libpolybori/src/Makefile.in
+index 4e4e60a..4d110c2
+--- a/libpolybori/src/Makefile.in
++++ b/libpolybori/src/Makefile.in
+@@ -323,7 +323,7 @@ AM_CPPFLAGS = \
+ 	-I$(top_srcdir)/libpolybori/include
+
+ AM_CFLAGS = -std=c99
+-AM_CXXFLAGS = -std=c++98 -ftemplate-depth-100
++AM_CXXFLAGS = -std=gnu++98 -ftemplate-depth-100
+ AM_DEFAULT_SOURCE_EXT = .cc
+ noinst_LTLIBRARIES = libpolybori_base.la
+ libpolybori_base_la_SOURCES = \

build/pkgs/cddlib/spkg-install

@@ -28,7 +28,7 @@ cd src
 cp ../patches/random.{c,h} lib-src/
 cp ../patches/random.{c,h} lib-src-gmp/
 
-# Required by sage.geometry.polyhedra 
+# Required by sage.geometry.polyhedron
 cp ../patches/cdd_both_reps.c src/
 cp ../patches/cdd_both_reps.c src-gmp/cdd_both_reps.c
 

build/pkgs/configure/checksums.ini

@@ -1,4 +1,4 @@
 tarball=configure-VERSION.tar.gz
-sha1=4d12a9be7cddd42242462dbbc9457d7ed2d96217
-md5=929501b778370fb5c490260a924caa39
-cksum=1604852641
+sha1=dedd72dbd12d4b2d3101616a7946cacd7704046d
+md5=fc0e4afaf65bd5f241380893d5f72d30
+cksum=3500657664

build/pkgs/configure/package-version.txt

@@ -1 +1 @@
-150
+160

build/pkgs/csdp/type

@@ -1 +1 @@
-experimental
+optional

build/pkgs/cysignals/checksums.ini

@@ -1,4 +1,4 @@
 tarball=cysignals-VERSION.tar.bz2
-sha1=392505d05d3cd849a94da614bd6d52aadf5a0db5
-md5=a2538b783d654f35d0c40d8a465470b0
-cksum=3111713488
+sha1=26b5fa9ac855af6ab33157fe7c8f095ca086063b
+md5=31e95c68349b33b7781969e0d1ecab91
+cksum=939390582

build/pkgs/cysignals/package-version.txt

@@ -1 +1 @@
-1.0.1
+1.1.0

build/pkgs/cython/checksums.ini

@@ -1,4 +1,4 @@
 tarball=Cython-VERSION.tar.gz
-sha1=fc574c5050cd5a8e34435432e2a4a693353ed807
-md5=157df1f69bcec6b56fd97e0f2e057f6e
-cksum=346066359
+sha1=32f12b8dd976111668ef8ba7e716a850869a0bf6
+md5=14fbc970f4a856845e633cbc09e61048
+cksum=2292891014

build/pkgs/cython/package-version.txt

@@ -1 +1 @@
-0.23.4.p0
+0.24.p0

build/pkgs/database_gap/checksums.ini

@@ -1,4 +1,4 @@
 tarball=database_gap-VERSION.tar.bz2
-sha1=46760a6a606eb1eea55b86f12d429a86c97740d7
-md5=87273df691a15bcf6b4b75b372cb6d0c
-cksum=1428556919
+sha1=30f30b05f83eda0e092002e509b47768862a743f
+md5=b443d7e7852471f83d19dd409b19a221
+cksum=4104886394

build/pkgs/database_gap/package-version.txt

@@ -1 +1 @@
-4.7.9
+4.8.3

build/pkgs/database_gap/spkg-src

@@ -13,11 +13,11 @@ shopt -s extglob
 # Remove old sources and download new
 rm -rf src
 if [ -z "$UPSTREAM_SOURCE_TARBALL" ]; then
-    tar xjf <( curl http://www.gap-system.org/pub/gap/gap47/tar.bz2/gap4r7p8_2015_06_09-20_27.tar.bz2)
+    tar xf <( curl http://www.gap-system.org/pub/gap/gap47/tar.bz2/gap4r7p8_2015_06_09-20_27.tar.bz2)
 else
-    tar xjf "$UPSTREAM_SOURCE_TARBALL"
+    tar xf "$UPSTREAM_SOURCE_TARBALL"
 fi
-GAP=`pwd`/gap4r7
+GAP=`pwd`/gap4r8
 
 # Make everything writable
 chmod -R u+w "$GAP"