Skip to content
This repository has been archived by the owner on Jan 30, 2023. It is now read-only.

Commit

Permalink
Merge branch 'develop' into t/21819/rewrite_error_functions_and_docum…
Browse files Browse the repository at this point in the history
…entation
  • Loading branch information
rwst committed Jan 28, 2017
2 parents be39e50 + ac31f23 commit 7fade55
Show file tree
Hide file tree
Showing 498 changed files with 28,644 additions and 5,000 deletions.
2 changes: 1 addition & 1 deletion VERSION.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
SageMath version 7.5.rc1, Release Date: 2016-12-28
SageMath version 7.6.beta1, Release Date: 2017-01-25
4 changes: 3 additions & 1 deletion build/bin/sage-pip-install
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,9 @@
# --no-deps : Don't install runtime dependencies from PyPI.
# --no-index : Don't look at the package index.
# This also disables pip's version self-check.
pip_install_flags="--ignore-installed --verbose --no-deps --no-index"
# --isolated : Don't read configuration files such as
# ~/.pydistutils.cfg
pip_install_flags="--ignore-installed --verbose --no-deps --no-index --isolated"

# Consume any additional pip install arguments except the last one
while [ $# -gt 1 ]; do
Expand Down
6 changes: 3 additions & 3 deletions build/pkgs/configure/checksums.ini
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
tarball=configure-VERSION.tar.gz
sha1=493e8dd34bd53110ba2b6ca36239b8ead312df46
md5=b86405e6ca3828cada072c37db55eba3
cksum=2146672182
sha1=1a3c575cc77fb6611465d21a767a7a802c127e43
md5=71f93688fb5feced01824ab28c3eb546
cksum=2358556693
2 changes: 1 addition & 1 deletion build/pkgs/configure/package-version.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
197
203
6 changes: 3 additions & 3 deletions build/pkgs/database_pari/checksums.ini
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
tarball=database_pari-VERSION.tar.bz2
sha1=92dcb68e7a6def53ffc5fb82e3593d5b80c940cb
md5=652d36d18ea300193957120815298be7
cksum=2257060384
sha1=dd2b168da033a9fca98ce5d9d81ad76fbc1739fb
md5=0fb372a3c8de787f84c066f81511a276
cksum=3988008667
2 changes: 1 addition & 1 deletion build/pkgs/database_pari/package-version.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
20140908
20161017
3 changes: 1 addition & 2 deletions build/pkgs/dot2tex/SPKG.txt
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,7 @@ by Graphviz a more LaTeX friendly look and feel. This is accomplished
by converting xdot output from Graphviz to a series of PSTricks or
PGF/TikZ commands.

See http://www.fauskes.net/code/dot2tex/
or http://dot2tex.googlecode.com/
See https://github.com/kjellmf/dot2tex/

== License ==
* MIT
Expand Down
6 changes: 3 additions & 3 deletions build/pkgs/eclib/checksums.ini
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
tarball=eclib-VERSION.tar.bz2
sha1=acd51ec5e7ab7be6a3151fe645320f71c6a11ede
md5=ac1eee9c42b1b6987173f574b6f43744
cksum=673064945
sha1=b5098fe705dcea8f492e5e331ad8a69f5721898f
md5=af8c339c44155ed813cb40f39fcfe344
cksum=2757924773
2 changes: 1 addition & 1 deletion build/pkgs/eclib/package-version.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
20160720
20170104
9 changes: 9 additions & 0 deletions build/pkgs/enum34/SPKG.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
= enum34 =

== Description ==

Python 3.4 Enum backported to 3.3, 3.2, 3.1, 2.7, 2.6, 2.5, and 2.4

An enumeration is a set of symbolic names (members) bound to unique,
constant values. Within an enumeration, the members can be compared by
identity, and the enumeration itself can be iterated over.
4 changes: 4 additions & 0 deletions build/pkgs/enum34/checksums.ini
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
tarball=enum34-VERSION.tar.gz
sha1=014ef5878333ff91099893d615192c8cd0b1525a
md5=5f13a0841a61f7fc295c514490d120d0
cksum=3196958404
5 changes: 5 additions & 0 deletions build/pkgs/enum34/dependencies
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
$(PYTHON) | pip

----------
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.
1 change: 1 addition & 0 deletions build/pkgs/enum34/package-version.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
1.1.6
3 changes: 3 additions & 0 deletions build/pkgs/enum34/spkg-install
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
#!/usr/bin/env bash

cd src && $PIP_INSTALL .
1 change: 1 addition & 0 deletions build/pkgs/enum34/type
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
standard
3 changes: 1 addition & 2 deletions build/pkgs/gambit/spkg-install
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,7 @@ if [ $? -ne 0 ]; then
fi

cd src/python
python setup.py build
python setup.py install
python setup.py --no-user-cfg build install

if [ $? -ne 0 ]; then
echo "Error installing Python API"
Expand Down
2 changes: 1 addition & 1 deletion build/pkgs/giac/dependencies
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
readline $(MP_LIBRARY) mpfr mpfi ntl gsl pari
readline $(MP_LIBRARY) mpfr mpfi ntl gsl pari libpng

----------
All lines of this file are ignored except the first.
Expand Down
6 changes: 3 additions & 3 deletions build/pkgs/git/checksums.ini
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
tarball=git-VERSION.tar.gz
sha1=ff32a94936309ca3f0e3d56e479e7510a3c1c925
md5=da293290da69f45a86a311ad3cd43dc8
cksum=2025246710
sha1=21a227ac7f3a8b3c29e6d6fbd13f7a6b958c81ed
md5=eac9324afcf4c95ab11acb2e2283e376
cksum=2000477778
2 changes: 1 addition & 1 deletion build/pkgs/git/package-version.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2.6.2
2.11.0
6 changes: 3 additions & 3 deletions build/pkgs/gp2c/checksums.ini
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
tarball=gp2c-VERSION.tar.gz
sha1=e07cebffcd09c0d644d52335130984f33042b46f
md5=3f6bb47d41ddca7b6a4938d16abbe4e8
cksum=3338275717
sha1=6bce2bbb69227de44fa768619d1dffa861d6470a
md5=41d3e76fb070ba7f73242b76ae5cb529
cksum=2256538341
2 changes: 1 addition & 1 deletion build/pkgs/gp2c/package-version.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
0.0.9pl5
0.0.10
2 changes: 1 addition & 1 deletion build/pkgs/gsl/package-version.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2.1.p0
2.1.p1
16 changes: 16 additions & 0 deletions build/pkgs/gsl/patches/gsl-2.1-gslcblas.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
Do not include gslcblas in .pc. We already have the selected cblas
added to libs. Which could be an external cblas if someone wanted too.

diff --git a/gsl.pc.in b/gsl.pc.in
index 5e9ef21..3a70648 100644
--- a/gsl.pc.in
+++ b/gsl.pc.in
@@ -2,7 +2,7 @@ prefix=@prefix@
exec_prefix=@exec_prefix@
libdir=@libdir@
includedir=@includedir@
-GSL_CBLAS_LIB=-lgslcblas
+GSL_CBLAS_LIB=

Name: GSL
Description: GNU Scientific Library
6 changes: 3 additions & 3 deletions build/pkgs/ipykernel/checksums.ini
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
tarball=ipykernel-VERSION.tar.gz
sha1=1a16f3366a655edd1c0dc264fc3fe1489cf2c2df
md5=0b1150602203af298631555509a809bd
cksum=69264790
sha1=b94d49af3a9a89eb9b4d32c63868b8fcb689de19
md5=4048987076b85814202cd29b1dd3fc7b
cksum=1741951088
2 changes: 1 addition & 1 deletion build/pkgs/ipykernel/package-version.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
4.3.1.p0
4.5.2
6 changes: 3 additions & 3 deletions build/pkgs/jupyter_client/checksums.ini
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
tarball=jupyter_client-VERSION.tar.gz
sha1=909b47a92960364300765a36963c8c9bf9c179ab
md5=4ae3d5e04baea1e8fa8d3ec24c600c17
cksum=854482584
sha1=1455be4a05b45051f83ae30a10d97a432fa5e01e
md5=8a428a07cbcd4f2e4ca7c2f728b718ea
cksum=1097112492
2 changes: 1 addition & 1 deletion build/pkgs/jupyter_client/package-version.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
4.3.0.p0
4.4.0
6 changes: 3 additions & 3 deletions build/pkgs/jupyter_core/checksums.ini
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
tarball=jupyter_core-VERSION.tar.gz
sha1=7836ef4bbe750048361624c6a3968ed733bf8f6a
md5=78f6add824eef72b12e0f6e6940372b3
cksum=3147890695
sha1=983a8eca910b3ac4290f1944fe6589770c254b1d
md5=f707f8693e537177341c4a89081fdac3
cksum=3375597820
2 changes: 1 addition & 1 deletion build/pkgs/jupyter_core/package-version.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
4.1.0.p0
4.2.1
2 changes: 1 addition & 1 deletion build/pkgs/modular_decomposition/type
Original file line number Diff line number Diff line change
@@ -1 +1 @@
optional
experimental
2 changes: 1 addition & 1 deletion build/pkgs/mpmath/SPKG.txt
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ Mpmath is a pure-Python library for multiprecision floating-point arithmetic. It

* Author: Fredrik Johansson
* Email: fredrik.johansson@gmail.com
* Website: http://code.google.com/p/mpmath/
* Website: https://github.com/fredrik-johansson/mpmath/

== Dependencies ==

Expand Down
6 changes: 3 additions & 3 deletions build/pkgs/nbformat/checksums.ini
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
tarball=nbformat-VERSION.tar.gz
sha1=c823d95938cb12b8e8af918bd2e547d3ca966e4f
md5=684c4dc3c6fd8036fd1ae1c908003e23
cksum=3054783982
sha1=96c8836cc2ef1457b150d61bb7f20cdcab64d66c
md5=f90f24d317b651226a6b547fa69d8da4
cksum=159106855
2 changes: 1 addition & 1 deletion build/pkgs/nbformat/package-version.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
4.0.1.p0
4.2.0
6 changes: 3 additions & 3 deletions build/pkgs/notebook/checksums.ini
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
tarball=notebook-VERSION.tar.gz
sha1=cec36e2d1aa7835f2b4dda7dde8455d33a06361a
md5=09e727ba598ab1848327d211fd2ad057
cksum=2780054946
sha1=ab665a9b0f42a6fc430dfe61db83a8d54bce3f97
md5=70cc97ad19c0f9246ad295a653475e2a
cksum=660926754
2 changes: 1 addition & 1 deletion build/pkgs/notebook/package-version.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
4.2.1.p0
4.3.1
4 changes: 3 additions & 1 deletion build/pkgs/numpy/spkg-install
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,9 @@ rm -rf "$SAGE_LOCAL/lib/python/site-packages/numpy"
# Program around a bug in SciPY's distutils.
unset CFLAGS

python setup.py install \
python setup.py \
--no-user-cfg \
install \
--single-version-externally-managed \
--record /dev/null \
${NUMPY_FCONFIG}
Expand Down
6 changes: 3 additions & 3 deletions build/pkgs/pari/checksums.ini
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
tarball=pari-VERSION.tar.gz
sha1=efd1eb6b8d87066b2b9f3b2c38ecb30bbfdb48d2
md5=f3f3342913a3b3b306970b3462f4d47d
cksum=1553747906
sha1=ad6af366153ae160aaa4cb49edf3a32a69f7afc1
md5=f997d6b526df6cd9145af0de5b822bf4
cksum=2625551585
2 changes: 1 addition & 1 deletion build/pkgs/pari/package-version.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2.8.0.alpha.p2
2.9.1.p0
5 changes: 0 additions & 5 deletions build/pkgs/pari/patches/README.txt
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,3 @@ Patches to configuration files:
C files:
* stackwarn.patch (Jeroen Demeyer, #19883): do not display warnings
regarding the stack size (unless DEBUGMEM is set).

Building documentation
* perl_inc.patch (Francois Bissey, #21622): import upstream patch
to deal with perl install where "." is not part of @INC anymore
in perl.
51 changes: 0 additions & 51 deletions build/pkgs/pari/patches/fix_constants.patch

This file was deleted.

45 changes: 0 additions & 45 deletions build/pkgs/pari/patches/perl_inc.patch

This file was deleted.

Loading

0 comments on commit 7fade55

Please sign in to comment.