Trac #19431: merge 6.10.beta0

Sage version 6.10.beta0
sagemath · Oct 18, 2015 · fa814b0 · fa814b0
2 parents 5ac0fea + 792aab7
commit fa814b0
Show file tree

Hide file tree

Showing 246 changed files with 12,370 additions and 3,430 deletions.
diff --git a/VERSION.txt b/VERSION.txt
@@ -1 +1 @@
-Sage version 6.9.rc0, released 2015-09-25
+Sage version 6.10.beta0, released 2015-10-15
diff --git 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/build/pkgs/boehm_gc/dependencies b/build/pkgs/boehm_gc/dependencies
@@ -0,0 +1,5 @@
+# no dependencies
+
+----------
+All lines of this file are ignored except the first.
+It is copied by SAGE_ROOT/build/make/install into SAGE_ROOT/build/make/Makefile.
diff --git a/build/pkgs/boost_cropped/dependencies b/build/pkgs/boost_cropped/dependencies
@@ -0,0 +1,5 @@
+# no dependencies
+
+----------
+All lines of this file are ignored except the first.
+It is copied by SAGE_ROOT/build/make/install into SAGE_ROOT/build/make/Makefile.
diff --git a/build/pkgs/buckygen/dependencies b/build/pkgs/buckygen/dependencies
@@ -0,0 +1,5 @@
+# no dependencies
+
+----------
+All lines of this file are ignored except the first.
+It is copied by SAGE_ROOT/build/make/install into SAGE_ROOT/build/make/Makefile.
diff --git a/build/pkgs/cephes/dependencies b/build/pkgs/cephes/dependencies
@@ -0,0 +1,5 @@
+# no dependencies
+
+----------
+All lines of this file are ignored except the first.
+It is copied by SAGE_ROOT/build/make/install into SAGE_ROOT/build/make/Makefile.
diff --git a/build/pkgs/cliquer/dependencies b/build/pkgs/cliquer/dependencies
@@ -0,0 +1,5 @@
+# no dependencies
+
+----------
+All lines of this file are ignored except the first.
+It is copied by SAGE_ROOT/build/make/install into SAGE_ROOT/build/make/Makefile.
diff --git a/build/pkgs/combinatorial_designs/dependencies b/build/pkgs/combinatorial_designs/dependencies
@@ -0,0 +1,5 @@
+# no dependencies
+
+----------
+All lines of this file are ignored except the first.
+It is copied by SAGE_ROOT/build/make/install into SAGE_ROOT/build/make/Makefile.
diff --git a/build/pkgs/compilerwrapper/dependencies b/build/pkgs/compilerwrapper/dependencies
@@ -0,0 +1,5 @@
+# no dependencies
+
+----------
+All lines of this file are ignored except the first.
+It is copied by SAGE_ROOT/build/make/install into SAGE_ROOT/build/make/Makefile.
diff --git a/build/pkgs/configure/checksums.ini b/build/pkgs/configure/checksums.ini
@@ -1,4 +1,4 @@
 tarball=configure-VERSION.tar.gz
-sha1=8cfd9c770b0b2b6740da8861b8e5fb55be6a1961
-md5=e24e7847a5df019a174b8a8f4d1928dd
-cksum=1203608624
+sha1=3e0d10789b34d6f890e1575c2a06894a90e4807e
+md5=020a9b7f31e61b57056969b6816455f1
+cksum=2662451870
diff --git a/build/pkgs/configure/package-version.txt b/build/pkgs/configure/package-version.txt
@@ -1 +1 @@
-115
+120
diff --git a/build/pkgs/cryptominisat/dependencies b/build/pkgs/cryptominisat/dependencies
@@ -0,0 +1,5 @@
+# no dependencies
+
+----------
+All lines of this file are ignored except the first.
+It is copied by SAGE_ROOT/build/make/install into SAGE_ROOT/build/make/Makefile.
diff --git a/build/pkgs/cython/checksums.ini b/build/pkgs/cython/checksums.ini
@@ -1,4 +1,4 @@
 tarball=Cython-VERSION.tar.gz
-sha1=2ff0f863d3b996d2265d0bf06e567e5dd23d004d
-md5=db3c5b365e1c3f71c7cd90e96473a3ab
-cksum=1672168057
+sha1=d5592dc3d529c55a5ef95346caccf11c556993bd
+md5=813df20f7ce5f00e60568e0371fbd07c
+cksum=365027876
diff --git a/build/pkgs/cython/package-version.txt b/build/pkgs/cython/package-version.txt
@@ -1 +1 @@
-0.23.1.p0
+0.23.3
diff --git a/build/pkgs/d3js/dependencies b/build/pkgs/d3js/dependencies
@@ -0,0 +1,5 @@
+# no dependencies
+
+----------
+All lines of this file are ignored except the first.
+It is copied by SAGE_ROOT/build/make/install into SAGE_ROOT/build/make/Makefile.
diff --git a/build/pkgs/database_cremona_ellcurve/dependencies b/build/pkgs/database_cremona_ellcurve/dependencies
@@ -0,0 +1,5 @@
+# no dependencies
+
+----------
+All lines of this file are ignored except the first.
+It is copied by SAGE_ROOT/build/make/install into SAGE_ROOT/build/make/Makefile.
diff --git a/build/pkgs/database_jones_numfield/dependencies b/build/pkgs/database_jones_numfield/dependencies
@@ -0,0 +1,5 @@
+# no dependencies
+
+----------
+All lines of this file are ignored except the first.
+It is copied by SAGE_ROOT/build/make/install into SAGE_ROOT/build/make/Makefile.
diff --git a/build/pkgs/database_stein_watkins/dependencies b/build/pkgs/database_stein_watkins/dependencies
@@ -0,0 +1,5 @@
+# no dependencies
+
+----------
+All lines of this file are ignored except the first.
+It is copied by SAGE_ROOT/build/make/install into SAGE_ROOT/build/make/Makefile.
diff --git a/build/pkgs/database_stein_watkins_mini/dependencies b/build/pkgs/database_stein_watkins_mini/dependencies
@@ -0,0 +1,5 @@
+# no dependencies
+
+----------
+All lines of this file are ignored except the first.
+It is copied by SAGE_ROOT/build/make/install into SAGE_ROOT/build/make/Makefile.
diff --git a/build/pkgs/database_symbolic_data/dependencies b/build/pkgs/database_symbolic_data/dependencies
@@ -0,0 +1,5 @@
+# no dependencies
+
+----------
+All lines of this file are ignored except the first.
+It is copied by SAGE_ROOT/build/make/install into SAGE_ROOT/build/make/Makefile.
diff --git 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"
diff --git a/build/pkgs/graphs/dependencies b/build/pkgs/graphs/dependencies
@@ -0,0 +1,5 @@
+# no dependencies
+
+----------
+All lines of this file are ignored except the first.
+It is copied by SAGE_ROOT/build/make/install into SAGE_ROOT/build/make/Makefile.
diff --git a/build/pkgs/iconv/dependencies b/build/pkgs/iconv/dependencies
@@ -0,0 +1,5 @@
+# no dependencies
+
+----------
+All lines of this file are ignored except the first.
+It is copied by SAGE_ROOT/build/make/install into SAGE_ROOT/build/make/Makefile.
diff --git a/build/pkgs/libogg/dependencies b/build/pkgs/libogg/dependencies
@@ -0,0 +1,5 @@
+# no dependencies
+
+----------
+All lines of this file are ignored except the first.
+It is copied by SAGE_ROOT/build/make/install into SAGE_ROOT/build/make/Makefile.
diff --git a/build/pkgs/lrcalc/dependencies b/build/pkgs/lrcalc/dependencies
@@ -0,0 +1,5 @@
+# no dependencies
+
+----------
+All lines of this file are ignored except the first.
+It is copied by SAGE_ROOT/build/make/install into SAGE_ROOT/build/make/Makefile.
diff --git a/build/pkgs/nauty/dependencies b/build/pkgs/nauty/dependencies
@@ -0,0 +1,5 @@
+# no dependencies
+
+----------
+All lines of this file are ignored except the first.
+It is copied by SAGE_ROOT/build/make/install into SAGE_ROOT/build/make/Makefile.
diff --git a/build/pkgs/ncurses/dependencies b/build/pkgs/ncurses/dependencies
@@ -0,0 +1,5 @@
+# no dependencies
+
+----------
+All lines of this file are ignored except the first.
+It is copied by SAGE_ROOT/build/make/install into SAGE_ROOT/build/make/Makefile.
diff --git a/build/pkgs/networkx/checksums.ini b/build/pkgs/networkx/checksums.ini
@@ -1,4 +1,4 @@
 tarball=networkx-VERSION.tar.gz
-sha1=d6c1524724d3e47f7621bb2072863463924bfb99
-md5=b4a9e68ecd1b0164446ee432d2e20bd0
-cksum=3256827710
+sha1=99292e464c25be5e96de295752880bf5e5f1848a
+md5=eb7a065e37250a4cc009919dacfe7a9d
+cksum=2520536431
diff --git a/build/pkgs/networkx/dependencies b/build/pkgs/networkx/dependencies
@@ -1,4 +1,4 @@
-$(INST)/$(PYTHON)
+$(INST)/$(PYTHON) $(INST)/$(DECORATOR)
 
 ----------
 All lines of this file are ignored except the first.

diff --git a/build/pkgs/networkx/package-version.txt b/build/pkgs/networkx/package-version.txt
@@ -1 +1 @@
-1.8.1
+1.10
diff --git a/build/pkgs/networkx/spkg-install b/build/pkgs/networkx/spkg-install
@@ -15,4 +15,4 @@ rm -rf "$SAGE_LOCAL"/spkg/network*
 
 cd src
 
-python setup.py install --home="$SAGE_LOCAL" --force
+python setup.py install
diff --git 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
@@ -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'
diff --git 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/build/pkgs/openssl/dependencies b/build/pkgs/openssl/dependencies
@@ -0,0 +1,5 @@
+# no dependencies
+
+----------
+All lines of this file are ignored except the first.
+It is copied by SAGE_ROOT/build/make/install into SAGE_ROOT/build/make/Makefile.
diff --git a/build/pkgs/pari/checksums.ini b/build/pkgs/pari/checksums.ini
@@ -1,4 +1,4 @@
 tarball=pari-VERSION.tar.gz
-sha1=307409c3917f6df71d2e10640c119e7d31c1f2e6
-md5=41936ce2dce6bd00a662bf43a772685f
-cksum=855809013
+sha1=fa23e0c8b6e38a356048d19224dc9b9658d77724
+md5=c753faaa4780de5ad8d461f0ffd70ecf
+cksum=1220765312
diff --git a/build/pkgs/pari/package-version.txt b/build/pkgs/pari/package-version.txt
@@ -1 +1 @@
-2.8-1637-g489005a.p1
+2.8-1813-g6157df4.p0
diff --git a/build/pkgs/pari/patches/KERNELCFLAGS.patch b/build/pkgs/pari/patches/KERNELCFLAGS.patch
diff --git a/build/pkgs/pari/patches/README.txt b/build/pkgs/pari/patches/README.txt
@@ -11,17 +11,7 @@ Patches to configuration files:
   Darwin. Submitted upstream, but upstream only applied it for PowerPC.
   Since this doesn't break anything and only improves performance, add
   the flag unconditionally.
-* KERNELCFLAGS.patch (Jeroen Demeyer): when SAGE_DEBUG=yes, compile
-  kernel files with -O1 instead of -funroll-loops; -O0 gives a
-  segmentation fault on some OS X systems when doing
-  factor(10356613*10694706299664611221)
-  See #13921, also reported upstream:
-  - http://pari.math.u-bordeaux.fr/archives/pari-dev-1301/msg00000.html
 
 C files:
-* det_garbage.patch (Jeroen Demeyer, #15654): When computing a
-  determinant(), only collect garbage once per outer loop iteration.
-  Better increase PARI stack size instead of collecting garbage too
-  often.
 * public_memory_functions.patch (Jeroen Demeyer, #16997): Make some of
   PARI's private memory functions public to improve interface with Sage.
diff --git a/build/pkgs/pari/patches/det_garbage.patch b/build/pkgs/pari/patches/det_garbage.patch
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		Sage version 6.9.rc0, released 2015-09-25
		Sage version 6.10.beta0, released 2015-10-15
Original file line number	Diff line number	Diff line change
Expand Up		@@ -15,4 +15,4 @@ rm -rf "$SAGE_LOCAL"/spkg/network*

		cd src

		python setup.py install --home="$SAGE_LOCAL" --force
		python setup.py install