Merge branch 'develop' into t/19296/generating_function_in_findstat_i…

…nterface

VERSION.txt

@@ -1 +1 @@
-Sage version 6.9.rc1, released 2015-10-01
+Sage version 6.9, released 2015-10-10

build/make/deps

@@ -44,6 +44,12 @@ all-sage: \
 		$(EXTCODE) \
 		$(SCRIPTS)
 
+# Download all packages which should be inside an sdist tarball (the -B
+# option to make forces all targets to be built unconditionally)
+download-for-sdist: base
+	env SAGE_INSTALL_FETCH_ONLY=yes $(MAKE) -B SAGERUNTIME= \
+		$(STANDARD_PACKAGES) gcc mpir python2
+
 # TOOLCHAIN consists of dependencies determined by build/make/install,
 # including for example the GCC package.
 toolchain: $(TOOLCHAIN)

build/pkgs/configure/checksums.ini

@@ -1,4 +1,4 @@
 tarball=configure-VERSION.tar.gz
-sha1=8a65cdb752db6a5dec7455b4ad4a19828d3c62d3
-md5=278cd95661b3854ae016f02591ec3481
-cksum=4192095503
+sha1=beb4de16a8e5a632516a6b5f63313e66c6770183
+md5=d6922f63e807c1d240582601e746dcb1
+cksum=2973216508

build/pkgs/configure/package-version.txt

@@ -1 +1 @@
-116
+119

build/pkgs/gcc/spkg-install

@@ -137,3 +137,7 @@ $MAKE install
 # Force re-installation of mpir, mpfr and mpc with the GCC we just built.
 cd "$SAGE_SPKG_INST"
 rm -f mpir-* mpfr-* mpc-*
+
+# Force re-configuration: the next time that "make" is run, we don't
+# want GCC to be built again, see Trac #19324
+touch "$SAGE_ROOT/configure"

build/pkgs/notebook/package-version.txt

@@ -1 +1 @@
-4.0.4
+4.0.4.p1

build/pkgs/notebook/patches/jupyter_notebook_config.py

@@ -0,0 +1,7 @@
+# Configuration file for Sage's builtin Jupyter notebook server
+
+# Note for distributors: Sage uses mathjax, so the notebook server
+# needs to have the mathjax_url set to wherever your distribution
+# installs mathjax.
+
+c.NotebookApp.mathjax_url = '../nbextensions/mathjax/MathJax.js'

build/pkgs/notebook/spkg-install

@@ -1,3 +1,8 @@
 #!/usr/bin/env bash
 
 cd src && python setup.py install
+
+# Install the Jupyter notebook configuration
+ETC_JUPYTER="$SAGE_ETC"/jupyter
+mkdir -p "$ETC_JUPYTER"
+cp ../patches/jupyter_notebook_config.py  "$ETC_JUPYTER"/

src/bin/sage-banner

@@ -1,8 +1,5 @@
 ┌────────────────────────────────────────────────────────────────────┐
-│ SageMath Version 6.9.rc1, Release Date: 2015-10-01                 │
+│ SageMath Version 6.9, Release Date: 2015-10-10                     │
 │ Type "notebook()" for the browser-based notebook interface.        │
 │ Type "help()" for help.                                            │
 └────────────────────────────────────────────────────────────────────┘
-┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓
-┃ Warning: this is a prerelease version, and it may be unstable.     ┃
-┗━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┛

src/bin/sage-sdist

@@ -43,12 +43,10 @@ echo "Sage version $SAGE_VERSION, release date $SAGE_RELEASE_DATE"
 TARGET="sage-$SAGE_VERSION"
 sage-clone-source "$SAGE_ROOT" "$TMP_DIR/$TARGET"
 
-# Download and copy all upstream tarballs (the -B option to make forces
-# all targets to be built unconditionally)
+# Download and copy all upstream tarballs
 cd "$SAGE_ROOT/build/make"
-SAGE_INSTALL_GCC=yes SAGE_SPKG_COPY_UPSTREAM="$TMP_DIR/$TARGET/upstream" \
-SAGE_INSTALL_FETCH_ONLY=yes \
-./install -B all-build
+export SAGE_SPKG_COPY_UPSTREAM="$TMP_DIR/$TARGET/upstream"
+$MAKE download-for-sdist
 
 # Create source .tar.gz
 cd "$TMP_DIR"

src/bin/sage-version.sh

@@ -1,4 +1,4 @@
 # Sage version information for shell scripts
 # This file is auto-generated by the sage-update-version script, do not edit!
-SAGE_VERSION='6.9.rc1'
-SAGE_RELEASE_DATE='2015-10-01'
+SAGE_VERSION='6.9'
+SAGE_RELEASE_DATE='2015-10-10'

src/doc/en/developer/coding_in_python.rst

@@ -503,7 +503,7 @@ documentation for more information on its behaviour and optional arguments.
       def my_new_function():
           ...
 
-      my_old_function = deprecated_function_alias(my_new_function)
+      my_old_function = deprecated_function_alias(666, my_new_function)
 
 * **Moving an object to a different module:**
   if you rename a source file or move some function (or class) to a

src/sage/repl/ipython_kernel/install.py

@@ -250,29 +250,33 @@ def update(cls):
         instance._symlink_resources()
 
 
-def have_prerequisites():
+def have_prerequisites(debug=True):
     """
-    Check that we have all prerequisites to run the IPython notebook.
+    Check that we have all prerequisites to run the Jupyter notebook.
 
-    In particular, the IPython notebook requires OpenSSL whether or
+    In particular, the Jupyter notebook requires OpenSSL whether or
     not you are using https. See :trac:`17318`.
 
+    INPUT:
+
+    ``debug`` -- boolean (default: ``True``). Whether to print debug
+    information in case that prerequisites are missing.
+
     OUTPUT:
 
     Boolean.
 
     EXAMPLES::
 
         sage: from sage.repl.ipython_kernel.install import have_prerequisites
-        sage: have_prerequisites() in [True, False]
+        sage: have_prerequisites(debug=False) in [True, False]
         True
     """
     try:
         from notebook.notebookapp import NotebookApp
         return True
     except ImportError:
+        if debug:
+            import traceback
+            traceback.print_exc()
         return False
-
-
-
-

src/sage/version.py

@@ -1,4 +1,4 @@
 # Sage version information for Python scripts
 # This file is auto-generated by the sage-update-version script, do not edit!
-version = '6.9.rc1'
-date = '2015-10-01'
+version = '6.9'
+date = '2015-10-10'