Merge 7.3.beta8 into t/20227/ticket/20227

Conflicts:
	src/sage/schemes/generic/algebraic_scheme.py

Makefile

@@ -15,7 +15,7 @@ build: all-build
 %::
 	@if [ -x relocate-once.py ]; then ./relocate-once.py; fi
 	$(MAKE) build/make/Makefile
-	+build/bin/sage-logger -p \
+	+build/bin/sage-logger \
 		"cd build/make && ./install '$@'" logs/install.log
 
 # If configure was run before, rerun it with the old arguments.

README.md

@@ -3,7 +3,7 @@
 >   "Creating a Viable Open Source Alternative to
 >    Magma, Maple, Mathematica, and MATLAB"
 
->   Copyright (C) 2005-2014 The Sage Development Team
+>   Copyright (C) 2005-2016 The Sage Development Team
 
    http://www.sagemath.org
 
@@ -67,7 +67,7 @@ source. More detailed instructions, including how to build faster on
 multicore machines, are contained later in this README and in the  
 Installation Guide:  
 
-   http://www.sagemath.org/doc/installation
+   http://doc.sagemath.org/html/en/installation
 
 __1. Make sure you have the dependencies and 5 GB of free disk space.__
 
@@ -110,14 +110,19 @@ __3. cd into the Sage directory and type make:__
    should work fine on all fully supported platforms. If it does not, we  
    want to know!  
 
+   If you'd like to contribute to Sage, be sure to read the
+   Developer's Guide:
+
+   http://doc.sagemath.org/html/en/developer/index.html
+
 
 Environment Variables
 ---------------------
 
 There are a lot of environment variables which control the install  
 process of Sage, see:  
 
-   http://sagemath.org/doc/installation/source.html#environment-variables
+   http://doc.sagemath.org/html/en/installation/source.html#environment-variables
 
 
 Implementation
@@ -325,7 +330,7 @@ SAGE_ROOT                 Root directory (sage-x.y.z in Sage tarball)
 ```
 For more details, see:
 
-    http://sagemath.org/doc/developer/coding_basics.html#files-and-directory-structure
+    http://doc.sagemath.org/html/en/developer/coding_basics.html#files-and-directory-structure
 
 
 Relocation
@@ -343,7 +348,7 @@ Sage as root at least once prior to using the system-wide Sage as a
 normal user. See the Installation Guide for further information on  
 performing a system-wide installation:
 
-   http://www.sagemath.org/doc/installation/source.html#installation-in-a-multiuser-environment
+   http://doc.sagemath.org/html/en/installation/source.html#installation-in-a-multiuser-environment
 
 If you find anything that doesn't work correctly after you moved the  
 directory, please email the sage-support mailing list.  

VERSION.txt

@@ -1 +1 @@
-SageMath version 7.3.beta2, Release Date: 2016-05-28
+SageMath version 7.3.beta8, Release Date: 2016-07-14

build/bin/sage-download-file

@@ -24,5 +24,5 @@ except ImportError:
     sys.path.insert(0, os.path.join(os.path.dirname(__file__), '..'))
     import sage_bootstrap
 
-from sage_bootstrap.cmdline import SageDownloadFileApplication
-SageDownloadFileApplication().run()
+from sage_bootstrap.download.cmdline import run_safe
+run_safe()

build/bin/sage-logger

@@ -41,13 +41,24 @@ else
     prefix=""
 fi
 
+# Use sed option to reduce buffering, to make the output appear more
+# smoothly. For GNU sed, this is the --unbuffered option.
+# For BSD sed (which is also on OS X), this is the -l option.
+if sed </dev/null 2>/dev/null --unbuffered ""; then
+    SED="sed --unbuffered"
+elif sed </dev/null 2>/dev/null -l ""; then
+    SED="sed -l"
+else
+    SED="sed"
+fi
+
 mkdir -p "$logdir"
 
 # Redirect stdout and stderr to a subprocess running tee.
 # We trap SIGINT such that SIGINT interrupts the main process being
 # run, not the logging.
-( exec 2>&1; eval "$cmd" ) | ( trap '' SIGINT; tee -a "$logfile" ) | \
-    (while read line; do echo "${prefix}${line}"; done)
+( exec 2>&1; eval "$cmd" ) | \
+    ( trap '' SIGINT; tee -a "$logfile" | $SED "s/^/$prefix/" )
 
 pipestatus=(${PIPESTATUS[*]})
 

build/bin/sage-package

@@ -38,5 +38,5 @@ except ImportError:
     sys.path.insert(0, os.path.join(os.path.dirname(__file__), '..'))
     import sage_bootstrap
 
-from sage_bootstrap.cmdline import SagePkgApplication
-SagePkgApplication().run()
+from sage_bootstrap.cmdline import run
+run()

build/bin/sage-spkg

@@ -520,44 +520,36 @@ fi
 ##################################################################
 
 if [ "$USE_LOCAL_SCRIPTS" = yes ]; then
+    # New-style package
     echo "Setting up build directory for $PKG_NAME"
     cp -Rp "$PKG_SCRIPTS" "$PKG_NAME"
     cd "$PKG_NAME" || exit $?
+
+    sage-uncompress-spkg -d src "$PKG_SRC"
+    if [ $? -ne 0 ]; then
+        echo >&2 "Error: failed to extract $PKG_SRC"
+        exit 1
+    fi
 else
+    # Old-style package (deprecated)
     echo "Extracting package $PKG_SRC"
     ls -l "$PKG_SRC"
-fi
 
-sage-uncompress-spkg "$PKG_SRC"
-if [ $? -ne 0 ]; then
-    echo >&2 "Error: failed to extract $PKG_SRC"
-    exit 1
-fi
-
-if [ "$USE_LOCAL_SCRIPTS" = yes ]; then
-    shopt -s nocaseglob      # see trac:16415
-    # Strip file extension from the archive file and hope (as per
-    # automake standards) that this is the same as the directory name
-    # inside; move the directory to "src".  (This goes wrong for
-    # upstream package archives that have been renamed to appease some
-    # other Sage script, such as "latte-int", whose archive is renamed
-    # to "latte_int".)
-    mv "$(echo "$PKG_NAME_UPSTREAM" | sed 's/\.zip$//g;s/\.tgz$//g;s/\.tar\.gz$//g;s/\.tar\.xz$//g;s/\.tar\.lz$//g;s/\.tar\.bz2$//g;s/\.tar$//g')"* src
-    # Do not check for errors here; the "mv" fails in the situation
-    # mentioned above, and the package-specific script needs to do
-    # this work itself.
-    shopt -u nocaseglob
-    echo "Finished set up"
-else
-    echo "Finished extraction"
+    sage-uncompress-spkg "$PKG_SRC"
+    if [ $? -ne 0 ]; then
+        echo >&2 "Error: failed to extract $PKG_SRC"
+        exit 1
+    fi
 
     cd "$PKG_NAME"
     if [ $? -ne 0 ]; then
-        echo >&2 "Error: after extracting, the directory $PKG_NAME does not exist"
+        echo >&2 "Error: after extracting, the directory '$PKG_NAME' does not exist"
         exit 1
     fi
 fi
 
+echo "Finished extraction"
+
 ##################################################################
 # The package has been extracted, prepare for installation
 ##################################################################