From 0f9019534834ca1b9d38d5dcb9625de7505b56c8 Mon Sep 17 00:00:00 2001 From: Jeroen Demeyer Date: Thu, 1 Oct 2015 10:16:13 +0200 Subject: [PATCH 1/8] Force reconfiguration after GCC installation --- build/pkgs/gcc/spkg-install | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/build/pkgs/gcc/spkg-install b/build/pkgs/gcc/spkg-install index a93411334ad..f9c7fe690e9 100755 --- a/build/pkgs/gcc/spkg-install +++ b/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" From 698579c245ca131aa14b837c18bc01bbf9d6290c Mon Sep 17 00:00:00 2001 From: Volker Braun Date: Sat, 3 Oct 2015 13:16:25 +0200 Subject: [PATCH 2/8] Updated Sage version to 6.9.rc2 --- VERSION.txt | 2 +- build/pkgs/configure/checksums.ini | 6 +++--- build/pkgs/configure/package-version.txt | 2 +- src/bin/sage-banner | 2 +- src/bin/sage-version.sh | 4 ++-- src/sage/version.py | 4 ++-- 6 files changed, 10 insertions(+), 10 deletions(-) diff --git a/VERSION.txt b/VERSION.txt index 9bd68a18d71..0b9154de703 100644 --- a/VERSION.txt +++ b/VERSION.txt @@ -1 +1 @@ -Sage version 6.9.rc1, released 2015-10-01 +Sage version 6.9.rc2, released 2015-10-03 diff --git a/build/pkgs/configure/checksums.ini b/build/pkgs/configure/checksums.ini index 478eca36b16..d5d29ab9f1d 100644 --- a/build/pkgs/configure/checksums.ini +++ b/build/pkgs/configure/checksums.ini @@ -1,4 +1,4 @@ tarball=configure-VERSION.tar.gz -sha1=8a65cdb752db6a5dec7455b4ad4a19828d3c62d3 -md5=278cd95661b3854ae016f02591ec3481 -cksum=4192095503 +sha1=ada10da8395c80225ed3f14fb431903738e018e6 +md5=34d89f1260160198a6255a73553c5c1d +cksum=3738976361 diff --git a/build/pkgs/configure/package-version.txt b/build/pkgs/configure/package-version.txt index 4699eb3cc96..5bc6609e3d8 100644 --- a/build/pkgs/configure/package-version.txt +++ b/build/pkgs/configure/package-version.txt @@ -1 +1 @@ -116 +117 diff --git a/src/bin/sage-banner b/src/bin/sage-banner index e18dae9f900..ec3aa085983 100644 --- a/src/bin/sage-banner +++ b/src/bin/sage-banner @@ -1,5 +1,5 @@ ┌────────────────────────────────────────────────────────────────────┐ -│ SageMath Version 6.9.rc1, Release Date: 2015-10-01 │ +│ SageMath Version 6.9.rc2, Release Date: 2015-10-03 │ │ Type "notebook()" for the browser-based notebook interface. │ │ Type "help()" for help. │ └────────────────────────────────────────────────────────────────────┘ diff --git a/src/bin/sage-version.sh b/src/bin/sage-version.sh index 14674cf646a..1c0f8fe3ffb 100644 --- a/src/bin/sage-version.sh +++ b/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.rc2' +SAGE_RELEASE_DATE='2015-10-03' diff --git a/src/sage/version.py b/src/sage/version.py index ab18d3e7efa..2089950ea72 100644 --- a/src/sage/version.py +++ b/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.rc2' +date = '2015-10-03' From de554dcf47578218e3db9c86f0b79d32dc4604c5 Mon Sep 17 00:00:00 2001 From: Jeroen Demeyer Date: Sat, 3 Oct 2015 15:34:38 +0200 Subject: [PATCH 3/8] Add ticket number in deprecated_function_alias() doc --- src/doc/en/developer/coding_in_python.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/doc/en/developer/coding_in_python.rst b/src/doc/en/developer/coding_in_python.rst index 30c65ff6557..d8b74192727 100644 --- a/src/doc/en/developer/coding_in_python.rst +++ b/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 From 34379a94487c494f38bea80ebe17c7e6d2c35e42 Mon Sep 17 00:00:00 2001 From: Jeroen Demeyer Date: Mon, 5 Oct 2015 11:04:41 +0200 Subject: [PATCH 4/8] Fix downloading in sage-sdist --- build/make/deps | 6 ++++++ src/bin/sage-sdist | 8 +++----- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/build/make/deps b/build/make/deps index c9becf07a8a..3d0fb935312 100644 --- a/build/make/deps +++ b/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) diff --git a/src/bin/sage-sdist b/src/bin/sage-sdist index 6b08cec0dc1..69424b20148 100755 --- a/src/bin/sage-sdist +++ b/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" From aabe6d1f51e3da7fd74787353802885815b45ea6 Mon Sep 17 00:00:00 2001 From: Volker Braun Date: Wed, 7 Oct 2015 00:47:09 +0200 Subject: [PATCH 5/8] Updated Sage version to 6.9.rc3 --- VERSION.txt | 2 +- build/pkgs/configure/checksums.ini | 6 +++--- build/pkgs/configure/package-version.txt | 2 +- src/bin/sage-banner | 2 +- src/bin/sage-version.sh | 4 ++-- src/sage/version.py | 4 ++-- 6 files changed, 10 insertions(+), 10 deletions(-) diff --git a/VERSION.txt b/VERSION.txt index 0b9154de703..fffa4f6775c 100644 --- a/VERSION.txt +++ b/VERSION.txt @@ -1 +1 @@ -Sage version 6.9.rc2, released 2015-10-03 +Sage version 6.9.rc3, released 2015-10-06 diff --git a/build/pkgs/configure/checksums.ini b/build/pkgs/configure/checksums.ini index d5d29ab9f1d..55c47a9e1f3 100644 --- a/build/pkgs/configure/checksums.ini +++ b/build/pkgs/configure/checksums.ini @@ -1,4 +1,4 @@ tarball=configure-VERSION.tar.gz -sha1=ada10da8395c80225ed3f14fb431903738e018e6 -md5=34d89f1260160198a6255a73553c5c1d -cksum=3738976361 +sha1=03f35d65364edef5f2f8bb43a2e53e8816be4dbe +md5=903c006410269e4ca3767a6cd4db8971 +cksum=850114776 diff --git a/build/pkgs/configure/package-version.txt b/build/pkgs/configure/package-version.txt index 5bc6609e3d8..415196e47f5 100644 --- a/build/pkgs/configure/package-version.txt +++ b/build/pkgs/configure/package-version.txt @@ -1 +1 @@ -117 +118 diff --git a/src/bin/sage-banner b/src/bin/sage-banner index ec3aa085983..b4a7da6767f 100644 --- a/src/bin/sage-banner +++ b/src/bin/sage-banner @@ -1,5 +1,5 @@ ┌────────────────────────────────────────────────────────────────────┐ -│ SageMath Version 6.9.rc2, Release Date: 2015-10-03 │ +│ SageMath Version 6.9.rc3, Release Date: 2015-10-06 │ │ Type "notebook()" for the browser-based notebook interface. │ │ Type "help()" for help. │ └────────────────────────────────────────────────────────────────────┘ diff --git a/src/bin/sage-version.sh b/src/bin/sage-version.sh index 1c0f8fe3ffb..8b2b6b5fb05 100644 --- a/src/bin/sage-version.sh +++ b/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.rc2' -SAGE_RELEASE_DATE='2015-10-03' +SAGE_VERSION='6.9.rc3' +SAGE_RELEASE_DATE='2015-10-06' diff --git a/src/sage/version.py b/src/sage/version.py index 2089950ea72..27ca7af9cf7 100644 --- a/src/sage/version.py +++ b/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.rc2' -date = '2015-10-03' +version = '6.9.rc3' +date = '2015-10-06' From 4fcdb6ee743d6d73f90017bf919b87a7095e8fab Mon Sep 17 00:00:00 2001 From: Volker Braun Date: Sat, 10 Oct 2015 12:59:52 +0200 Subject: [PATCH 6/8] Use jupyter_notebook_config.py to setup mathjax url --- build/pkgs/notebook/package-version.txt | 2 +- .../pkgs/notebook/patches/jupyter_notebook_config.py | 10 ++++++++++ build/pkgs/notebook/spkg-install | 5 +++++ src/sage/repl/ipython_kernel/install.py | 11 +++++++++-- 4 files changed, 25 insertions(+), 3 deletions(-) create mode 100644 build/pkgs/notebook/patches/jupyter_notebook_config.py diff --git a/build/pkgs/notebook/package-version.txt b/build/pkgs/notebook/package-version.txt index c5106e6d139..61d8a2af785 100644 --- a/build/pkgs/notebook/package-version.txt +++ b/build/pkgs/notebook/package-version.txt @@ -1 +1 @@ -4.0.4 +4.0.4.p1 diff --git a/build/pkgs/notebook/patches/jupyter_notebook_config.py b/build/pkgs/notebook/patches/jupyter_notebook_config.py new file mode 100644 index 00000000000..3cb41976c98 --- /dev/null +++ b/build/pkgs/notebook/patches/jupyter_notebook_config.py @@ -0,0 +1,10 @@ +# 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. + +import os +c = get_config() + +c.NotebookApp.mathjax_url = '/nbextensions/mathjax/MathJax.js' diff --git a/build/pkgs/notebook/spkg-install b/build/pkgs/notebook/spkg-install index afb3f302fd1..10759a4d973 100755 --- a/build/pkgs/notebook/spkg-install +++ b/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"/ diff --git a/src/sage/repl/ipython_kernel/install.py b/src/sage/repl/ipython_kernel/install.py index 7bc122fd509..08bad01cb58 100644 --- a/src/sage/repl/ipython_kernel/install.py +++ b/src/sage/repl/ipython_kernel/install.py @@ -250,13 +250,18 @@ 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. In particular, the IPython 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. @@ -264,13 +269,15 @@ def have_prerequisites(): 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: + import traceback + traceback.print_exc() return False From fbbb44dbb56529080b8229ad857a209ac54495c8 Mon Sep 17 00:00:00 2001 From: Jeroen Demeyer Date: Sat, 10 Oct 2015 13:21:33 +0200 Subject: [PATCH 7/8] Use relative path to MathJax; minor fixes --- .../notebook/patches/jupyter_notebook_config.py | 5 +---- src/sage/repl/ipython_kernel/install.py | 13 +++++-------- 2 files changed, 6 insertions(+), 12 deletions(-) diff --git a/build/pkgs/notebook/patches/jupyter_notebook_config.py b/build/pkgs/notebook/patches/jupyter_notebook_config.py index 3cb41976c98..3bf63a1649a 100644 --- a/build/pkgs/notebook/patches/jupyter_notebook_config.py +++ b/build/pkgs/notebook/patches/jupyter_notebook_config.py @@ -4,7 +4,4 @@ # needs to have the mathjax_url set to wherever your distribution # installs mathjax. -import os -c = get_config() - -c.NotebookApp.mathjax_url = '/nbextensions/mathjax/MathJax.js' +c.NotebookApp.mathjax_url = '../nbextensions/mathjax/MathJax.js' diff --git a/src/sage/repl/ipython_kernel/install.py b/src/sage/repl/ipython_kernel/install.py index 08bad01cb58..55e03622122 100644 --- a/src/sage/repl/ipython_kernel/install.py +++ b/src/sage/repl/ipython_kernel/install.py @@ -252,9 +252,9 @@ def update(cls): 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: @@ -276,10 +276,7 @@ def have_prerequisites(debug=True): from notebook.notebookapp import NotebookApp return True except ImportError: - import traceback - traceback.print_exc() + if debug: + import traceback + traceback.print_exc() return False - - - - From 2cc7f6ce9b270c1efcd07b541fe94e34a245918d Mon Sep 17 00:00:00 2001 From: Volker Braun Date: Sat, 10 Oct 2015 23:41:42 +0200 Subject: [PATCH 8/8] Updated Sage version to 6.9 --- VERSION.txt | 2 +- build/pkgs/configure/checksums.ini | 6 +++--- build/pkgs/configure/package-version.txt | 2 +- src/bin/sage-banner | 5 +---- src/bin/sage-version.sh | 4 ++-- src/sage/version.py | 4 ++-- 6 files changed, 10 insertions(+), 13 deletions(-) diff --git a/VERSION.txt b/VERSION.txt index fffa4f6775c..68733eba217 100644 --- a/VERSION.txt +++ b/VERSION.txt @@ -1 +1 @@ -Sage version 6.9.rc3, released 2015-10-06 +Sage version 6.9, released 2015-10-10 diff --git a/build/pkgs/configure/checksums.ini b/build/pkgs/configure/checksums.ini index 55c47a9e1f3..ad47e649554 100644 --- a/build/pkgs/configure/checksums.ini +++ b/build/pkgs/configure/checksums.ini @@ -1,4 +1,4 @@ tarball=configure-VERSION.tar.gz -sha1=03f35d65364edef5f2f8bb43a2e53e8816be4dbe -md5=903c006410269e4ca3767a6cd4db8971 -cksum=850114776 +sha1=beb4de16a8e5a632516a6b5f63313e66c6770183 +md5=d6922f63e807c1d240582601e746dcb1 +cksum=2973216508 diff --git a/build/pkgs/configure/package-version.txt b/build/pkgs/configure/package-version.txt index 415196e47f5..078fa0fe576 100644 --- a/build/pkgs/configure/package-version.txt +++ b/build/pkgs/configure/package-version.txt @@ -1 +1 @@ -118 +119 diff --git a/src/bin/sage-banner b/src/bin/sage-banner index b4a7da6767f..955061b92e5 100644 --- a/src/bin/sage-banner +++ b/src/bin/sage-banner @@ -1,8 +1,5 @@ ┌────────────────────────────────────────────────────────────────────┐ -│ SageMath Version 6.9.rc3, Release Date: 2015-10-06 │ +│ 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. ┃ -┗━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┛ diff --git a/src/bin/sage-version.sh b/src/bin/sage-version.sh index 8b2b6b5fb05..7b35690365e 100644 --- a/src/bin/sage-version.sh +++ b/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.rc3' -SAGE_RELEASE_DATE='2015-10-06' +SAGE_VERSION='6.9' +SAGE_RELEASE_DATE='2015-10-10' diff --git a/src/sage/version.py b/src/sage/version.py index 27ca7af9cf7..da4209e58b1 100644 --- a/src/sage/version.py +++ b/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.rc3' -date = '2015-10-06' +version = '6.9' +date = '2015-10-10'