Merge remote-tracking branch 'trac/develop' into 24854

sagemath · Nov 25, 2018 · b8fe26a · b8fe26a
2 parents 86c452e + f894105
commit b8fe26a
Show file tree

Hide file tree

Showing 63 changed files with 2,526 additions and 2,093 deletions.
diff --git a/VERSION.txt b/VERSION.txt
@@ -1 +1 @@
-SageMath version 8.5.beta3, Release Date: 2018-11-11
+SageMath version 8.5.beta4, Release Date: 2018-11-18
diff --git a/build/pkgs/configure/checksums.ini b/build/pkgs/configure/checksums.ini
@@ -1,4 +1,4 @@
 tarball=configure-VERSION.tar.gz
-sha1=0ed00ab9925291f76228582bfb16e211b20d49ae
-md5=0e58299d30d067ccea3e75561d0eaaf8
-cksum=2356004790
+sha1=0a8ccb51309ccd09f7290238fb529cab7ca591b2
+md5=c4b07abb7ea9f7064a5981539e9e9543
+cksum=36612397
diff --git a/build/pkgs/configure/package-version.txt b/build/pkgs/configure/package-version.txt
@@ -1 +1 @@
-291
+292
diff --git a/build/pkgs/sagenb/dependencies b/build/pkgs/sagenb/dependencies
@@ -1,4 +1,4 @@
-$(PYTHON) | pip babel flask flask_autoindex flask_babel flask_oldsessions flask_openid mathjax twisted sphinx
+$(PYTHON) | $(SAGERUNTIME) pip babel flask flask_autoindex flask_babel flask_oldsessions flask_openid mathjax twisted sphinx
 
 ----------
 All lines of this file are ignored except the first.

diff --git a/build/pkgs/sympy/checksums.ini b/build/pkgs/sympy/checksums.ini
@@ -1,4 +1,4 @@
 tarball=sympy-VERSION.tar.gz
-sha1=7f149e0fab7dc0572fa2396c055decceaf384e03
-md5=11b24840f5740bb03feddb7d60c18a67
-cksum=1213046999
+sha1=bbbf7b4331547f57fc43609cfb2d466f9ba75e1f
+md5=11e18423f52e248108a3bd4307185bc1
+cksum=635766045
diff --git a/build/pkgs/sympy/package-version.txt b/build/pkgs/sympy/package-version.txt
@@ -1 +1 @@
-1.2.p0
+1.3.p0
diff --git a/src/bin/sage-version.sh b/src/bin/sage-version.sh
@@ -1,5 +1,5 @@
 # Sage version information for shell scripts
 # This file is auto-generated by the sage-update-version script, do not edit!
-SAGE_VERSION='8.5.beta3'
-SAGE_RELEASE_DATE='2018-11-11'
-SAGE_VERSION_BANNER='SageMath version 8.5.beta3, Release Date: 2018-11-11'
+SAGE_VERSION='8.5.beta4'
+SAGE_RELEASE_DATE='2018-11-18'
+SAGE_VERSION_BANNER='SageMath version 8.5.beta4, Release Date: 2018-11-18'
diff --git a/src/doc/common/conf.py b/src/doc/common/conf.py
@@ -404,7 +404,7 @@ def set_intersphinx_mappings(app):
 \fi
 
 \let\textLaTeX\LaTeX
-\renewcommand*{\LaTeX}{\hbox{\textLaTeX}}
+\AtBeginDocument{\renewcommand*{\LaTeX}{\hbox{\textLaTeX}}}
 """
 
 # Documents to append as an appendix to all manuals.