Merge branch 'develop' into t/17790/builtinfunction_doesn_t_pass_non_…

…sr_coercible_arguments_to_function_code

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.beta4, Release Date: 2016-06-12
+SageMath version 7.3, Release Date: 2016-08-04

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-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

@@ -272,7 +272,8 @@ elif [ -z "$PKG_HAS_PATH" ]; then
             echo "that it will build correctly, or behave as expected."
             echo "Use at your own risk!"
             echo "==============================================================="
-            read -p "Are you sure you want to continue [Y/n]? " answer
+            echo "Are you sure you want to continue [Y/n]?"
+            read -p "Answer: " answer
             case "$answer" in
                 n*|N*) exit 0;;
             esac
@@ -365,7 +366,8 @@ if [ ! -f "$PKG_SRC" ]; then
                             echo "For more information about making Sage packages, see"
                             echo "http://doc.sagemath.org/html/en/developer/packaging.html"
                             echo "=========================================================================="
-                            read -p "Are you sure you want to continue [Y/n]? " answer
+                            echo "Are you sure you want to continue [Y/n]?"
+                            read -p "Answer: " answer
                             case "$answer" in
                                 n*|N*) exit 0;;
                             esac
@@ -381,7 +383,8 @@ if [ ! -f "$PKG_SRC" ]; then
                             echo "http://doc.sagemath.org/html/en/developer/packaging.html"
                             echo "=========================================================================="
                             echo
-                            read -t 30 -p "Are you sure (automatically continuing in 30 seconds) [Y/n]? " answer
+                            echo "Are you sure (automatically continuing in 30 seconds) [Y/n]?"
+                            read -t 30 -p "Answer: " answer
                             case "$answer" in
                                 n*|N*) exit 0;;
                             esac
@@ -520,32 +523,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 -d src "$PKG_SRC"
-if [ $? -ne 0 ]; then
-    echo >&2 "Error: failed to extract $PKG_SRC"
-    exit 1
-fi
-
-if [ "$USE_LOCAL_SCRIPTS" = yes ]; then
-    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
 ##################################################################