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

Commit 8bacaf5

Browse files
bhutzbhutz
committed
Merge branch 'master' into ticket/17729
Conflicts: src/sage/schemes/affine/affine_space.py
2 parents e06c496 + 6c5572a commit 8bacaf5

File tree

160 files changed

+11966
-2093
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

160 files changed

+11966
-2093
lines changed

‎VERSION.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
Sage version 6.6.beta0, released 2015-02-18
1+
Sage version 6.6.beta1, released 2015-02-21

‎build/deps

+2-1
Original file line numberDiff line numberDiff line change
@@ -510,7 +510,8 @@ $(INST)/csage: $(INST)/$(SCONS) \
510510
$(INST)/$(SAGE_MP_LIBRARY) \
511511
$(INST)/$(NTL) \
512512
$(INST)/$(PARI) \
513-
$(INST)/$(PYTHON)
513+
$(INST)/$(PYTHON) \
514+
$(CSAGE_SOURCES)
514515
if [ -z "$$SAGE_INSTALL_FETCH_ONLY" ]; then \
515516
cd $(SAGE_SRC) && source bin/sage-env && cd c_lib && \
516517
$(PIPE) 'time scons -Q install 2>&1' 'tee -a $(SAGE_LOGS)/csage-$(SAGE_VERSION).log' && \

‎build/install

+5
Original file line numberDiff line numberDiff line change
@@ -418,6 +418,11 @@ if [ "$need_to_install_gcc" = yes ]; then
418418
fi
419419
echo >&5
420420

421+
echo >&5 'CSAGE_SOURCES = \'
422+
for file in "$SAGE_SRC/c_lib/src/"*.c "$SAGE_SRC/c_lib/src/"*.cpp "$SAGE_SRC/c_lib/include"/*.h; do
423+
echo >&5 " \$(SAGE_SRC)${file#$SAGE_SRC} \\"
424+
done
425+
echo >&5
421426
echo >&5 'SCRIPT_SOURCES = \'
422427
for file in "$SAGE_SRC/bin/"*; do
423428
echo >&5 " \$(SAGE_SRC)${file#$SAGE_SRC} \\"

‎build/pkgs/arb/checksums.ini

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
tarball=arb-VERSION.tar.gz
2-
sha1=e96a54950b88e762fc80ab5eb88b2273aaf79be1
3-
md5=4a98e6aaa1108adfc5a46f1f64be0ec1
4-
cksum=1828799562
2+
sha1=ba51573e0c50250bbb16bfca027dc26531347f12
3+
md5=5b2c10b103cf64f33dc7d15c1fb2948f
4+
cksum=1391275088

‎build/pkgs/arb/package-version.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
2.3.0
1+
2.5.0
22

‎build/pkgs/arb/patches/dedekind_sum.patch

+28
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
Patch tests of arb-2.5 to be compatible with flint-2.4.4
2+
3+
Arb's testsuite, src/acb_modular/test/t-epsilon_arg.c, calls
4+
fmpq_dedekind_sum. However, this function does not exist in
5+
flint-2.4.4.
6+
7+
fmpq_dedekind_sum was introduced in
8+
https://github.com/wbhart/flint2/commit/64f656fb8db591ea11db606c7905de9f47b05e84
9+
and arith_dedekind_sum is now an alias to fmpq_dedekind_sum.
10+
11+
So I patch src/acb_modular/test/t-epsilon_arg.c to call
12+
arith_dedekind_sum instead of fmpq_dedekind_sum.
13+
14+
See also http://trac.sagemath.org/ticket/17688#comment:8 .
15+
16+
diff -r -u src/acb_modular/test/t-epsilon_arg.c new/acb_modular/test/t-epsilon_arg.c
17+
--- src/acb_modular/test/t-epsilon_arg.c 2015-01-28 19:20:07.000000000 +0200
18+
+++ new/acb_modular/test/t-epsilon_arg.c 2015-02-11 14:07:30.947675579 +0200
19+
@@ -49,7 +49,7 @@
20+
fmpz_mul_ui(fmpq_denref(arg), c, 12);
21+
fmpq_canonicalise(arg);
22+
23+
- fmpq_dedekind_sum(t, d, c);
24+
+ arith_dedekind_sum(t, d, c);
25+
fmpq_sub(arg, arg, t);
26+
27+
fmpq_clear(t);
28+
Only in new/acb_modular/test: t-epsilon_arg.c~

‎build/pkgs/arb/spkg-install

+9
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,15 @@
22

33
cd src
44

5+
for patch in ../patches/*.patch; do
6+
[ -r "$patch" ] || continue # Skip non-existing or non-readable patches
7+
patch -p1 <"$patch"
8+
if [ $? -ne 0 ]; then
9+
echo >&2 "Error applying '$patch'"
10+
exit 1
11+
fi
12+
done
13+
514
./configure --prefix="$SAGE_LOCAL" --with-flint="$SAGE_LOCAL" \
615
--with-gmp="$SAGE_LOCAL" --with-mpfr="$SAGE_LOCAL"
716
if [ $? -ne 0 ]; then

‎build/pkgs/configure/checksums.ini

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
tarball=configure-VERSION.tar.gz
2-
sha1=fc6a6e09db9e9ef7877296947cfcc0929b6d08bf
3-
md5=ca43ab046439d42063bf4af39baecb18
4-
cksum=3453818239
2+
sha1=452bd2a009e486be95a8ce008e03d868a83f0e44
3+
md5=afd37eb3577967415ceac51cb9a432ff
4+
cksum=66417740

‎build/pkgs/configure/package-version.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
70
1+
71

‎build/pkgs/database_gap/checksums.ini

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
tarball=database_gap-VERSION.tar.bz2
2-
sha1=0e81cd017dc0542fc5faf923324eb1fffb61cdeb
3-
md5=879fc85f53fa9ff9f12dc7ebd621a528
4-
cksum=3437971482
2+
sha1=14f99d80583928d373b053cb346d21effd17d53e
3+
md5=1fe8a7e5e0eddf8c7de46b1485fb491f
4+
cksum=2596097681

‎build/pkgs/database_gap/package-version.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
4.7.5
1+
4.7.7

‎build/pkgs/database_odlyzko_zeta/SPKG.txt

+12
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
= Zeros of the Riemann zeta function =
2+
3+
== Description ==
4+
5+
Table of zeros of the Riemann zeta function by Andrew Odlyzko.
6+
7+
This package contains the file 'zeros6' with the first 2,001,052 zeros
8+
of the Riemann zeta function, accurate to within 4*10^(-9).
9+
10+
== Dependencies ==
11+
12+
* Sage library

‎build/pkgs/database_odlyzko_zeta/checksums.ini

+4
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
tarball=database_odlyzko_zeta-VERSION.tar.bz2
2+
sha1=97f586307d2f67a0a8594bd010602e2c4d5e0b4d
3+
md5=c93f63760540d5a787728a7a89ca2d9c
4+
cksum=3293740202

‎build/pkgs/database_odlyzko_zeta/package-version.txt

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
20061209

‎build/pkgs/database_odlyzko_zeta/spkg-install

+15
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
#!/usr/bin/env python
2+
3+
import os
4+
from sage.all import save
5+
from sage.env import SAGE_SHARE
6+
from sage.misc.misc import sage_makedirs
7+
8+
install_root = os.path.join(SAGE_SHARE, 'odlyzko')
9+
target = os.path.join(install_root, 'zeros.sobj')
10+
11+
if __name__ == '__main__':
12+
sage_makedirs(install_root)
13+
print("Creating Odlyzko database.")
14+
F = [float(x) for x in open("src/zeros6").readlines()]
15+
save(F, target)

‎build/pkgs/flint/checksums.ini

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
tarball=flint-VERSION.tar.gz
2-
sha1=71075ce6d851af6244110644479bf29b4403212c
3-
md5=b527fe3a49fd02a0367227fe8ec9cbe4
4-
cksum=3731007559
2+
sha1=d6349906644a09b4b2a43532012fbdd59da02780
3+
md5=6504b9deabeafb9313e57153a1730b33
4+
cksum=817805972

‎build/pkgs/flint/package-version.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
2.4.4
1+
2.4.5

‎build/pkgs/gap/checksums.ini

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
tarball=gap-VERSION.tar.bz2
2-
sha1=8a2437546c374652457da6d4d9749e94f39d83e7
3-
md5=348a75094d3320303e8179bd6962d560
4-
cksum=2730509972
2+
sha1=da4cd8882f47e7eb27797ba587210309aa11d21d
3+
md5=7f6ed7fd81b6741fd877e4c984781d11
4+
cksum=3892263440

‎build/pkgs/gap/package-version.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
4.7.5
1+
4.7.7

‎build/pkgs/gap/patches/testall.patch

+6-4
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
Remove tests that rely on the (non-GPL) small group library
22

33
diff -ur old/tst/testinstall.g src/tst/testinstall.g
4-
--- old/tst/testinstall.g 2012-06-04 23:58:40.000000000 +0100
5-
+++ src/tst/testinstall.g 2012-09-02 10:43:10.321694748 +0100
4+
--- old/tst/testinstall.g 2012-06-04 23:58:40.000000000 +0100
5+
+++ src/tst/testinstall.g 2012-09-02 10:43:10.321694748 +0100
66
@@ -49,7 +49,6 @@
77
[ "ctblfuns.tst", 3900000 ],
88
[ "ctblmoli.tst", 98500000 ],
@@ -11,13 +11,15 @@ diff -ur old/tst/testinstall.g src/tst/testinstall.g
1111
[ "cyclotom.tst", 900000 ],
1212
[ "ffe.tst", 3600000 ],
1313
[ "ffeconway.tst", 50200000 ],
14-
@@ -57,13 +56,11 @@
14+
@@ -57,7 +56,6 @@
1515
[ "grpfp.tst", 146700000 ],
1616
[ "grpfree.tst", 700000 ],
1717
[ "grpmat.tst", 481000000 ],
1818
- [ "grppc.tst", 45300000 ],
1919
[ "grppcnrm.tst", 2333400000 ],
20-
[ "listgen.tst", 1000000 ],
20+
[ "infinity.tst", 1000 ],
21+
[ "intarith.tst", 2300000 ],
22+
@@ -65,7 +63,6 @@
2123
[ "mapping.tst", 37300000 ],
2224
[ "mgmring.tst", 1800000 ],
2325
[ "modfree.tst", 5800000 ],

‎build/pkgs/gap_packages/checksums.ini

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
tarball=gap_packages-VERSION.tar.bz2
2-
sha1=f9703c422906fa37f1e6896f6d497e2eda2aa576
3-
md5=ceb9d10e091753a14fe135078e8c7d2c
4-
cksum=3463670966
2+
sha1=3984baed3e2fe015f17d823e6fb9ffbbd9742097
3+
md5=7ae2b0a238bc768bdad4c335070ac70c
4+
cksum=2500850839

‎build/pkgs/gap_packages/package-version.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
4.7.5
1+
4.7.7

‎build/pkgs/ipython/checksums.ini

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
tarball=ipython-VERSION.tar.gz
2-
sha1=02d71cfd9d7e8807fc4440506332f0391eba6d5e
3-
md5=222eecd3a8299c0119c56954c79e4d0f
4-
cksum=720149757
2+
sha1=8f51a383fc8436e476110417fb8ae694d499defd
3+
md5=70149981d6515d77ecb3d7507de2d7d9
4+
cksum=820757681

‎build/pkgs/ipython/package-version.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
2.3.0.p0
1+
2.4.1

‎build/pkgs/libgap/checksums.ini

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
tarball=libgap-VERSION.tar.gz
2-
sha1=6880c1c36a59051a1e94f4866848a37f4d79cb7c
3-
md5=f797ca3b8d3232cb24b5fe3be704a08a
4-
cksum=1046627126
2+
sha1=9f075313a0aac4a7b7096f9601f76df5aae3d31e
3+
md5=4486634a518ee5e8187988ebce47bd69
4+
cksum=3748372434

‎build/pkgs/libgap/package-version.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
4.7.5.1
1+
4.7.7

‎build/pkgs/pari/gprc.expect

-45
This file was deleted.

‎build/pkgs/pari/package-version.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
2.7.1.p3
1+
2.7.1.p4

‎build/pkgs/pari/spkg-install

-7
Original file line numberDiff line numberDiff line change
@@ -195,13 +195,6 @@ install()
195195
fi
196196

197197
cd "$CUR"
198-
199-
# Copy gprc.expect to $SAGE_LOCAL/etc
200-
cp -f "$TOP/gprc.expect" "$SAGE_LOCAL/etc"
201-
if [ $? -ne 0 ]; then
202-
echo >&2 "Error installing gprc.expect"
203-
exit 1
204-
fi
205198
}
206199

207200

‎src/bin/sage-banner

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
┌────────────────────────────────────────────────────────────────────┐
2-
│ Sage Version 6.6.beta0, Release Date: 2015-02-18 │
2+
│ Sage Version 6.6.beta1, Release Date: 2015-02-21 │
33
│ Type "notebook()" for the browser-based notebook interface. │
44
│ Type "help()" for help. │
55
└────────────────────────────────────────────────────────────────────┘

‎src/bin/sage-version.sh

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
# Sage version information for shell scripts
22
# This file is auto-generated by the sage-update-version script, do not edit!
3-
SAGE_VERSION='6.6.beta0'
4-
SAGE_RELEASE_DATE='2015-02-18'
3+
SAGE_VERSION='6.6.beta1'
4+
SAGE_RELEASE_DATE='2015-02-21'

‎src/c_lib/include/memory.h

+18
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@ Wrappers for malloc(), calloc(), free(), realloc().
66
77
- Jeroen Demeyer (2011-01-13): initial version (#10258)
88
9+
- Jeroen Demeyer (2014-12-14): add more functions (#10257)
10+
911
*/
1012

1113
/*****************************************************************************
@@ -26,6 +28,22 @@ Wrappers for malloc(), calloc(), free(), realloc().
2628
extern "C" {
2729
#endif
2830

31+
32+
#define MUL_NO_OVERFLOW ( ((size_t)1) << (4*sizeof(size_t)))
33+
34+
static inline size_t mul_overflowcheck(size_t a, size_t b)
35+
/* Return a*b, checking for overflow. Assume that a > 0.
36+
* If overflow occurs, return ((size_t)-1).
37+
* We assume that malloc( (size_t)-1 ) always fails. */
38+
{
39+
if (a >= MUL_NO_OVERFLOW || b >= MUL_NO_OVERFLOW)
40+
{
41+
if (b > ((size_t)-1) / a)
42+
return ((size_t)-1);
43+
}
44+
return a*b;
45+
}
46+
2947
static inline void* sage_malloc(size_t n)
3048
{
3149
sig_block();

‎src/doc/common/builder.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -1302,7 +1302,7 @@ def get_formats():
13021302
tut_b = DocBuilder('en/tutorial')
13031303
formats = tut_b._output_formats()
13041304
formats.remove('html')
1305-
return ['html', 'html-no-pix', 'pdf'] + formats
1305+
return ['html', 'pdf'] + formats
13061306

13071307
def help_formats(s=u""):
13081308
"""

‎src/doc/en/reference/algebras/index.rst

+2-1
Original file line numberDiff line numberDiff line change
@@ -25,14 +25,15 @@ Algebras
2525
sage/algebras/free_algebra_quotient
2626
sage/algebras/free_algebra_quotient_element
2727

28-
sage/algebras/group_algebra_new
28+
sage/algebras/group_algebra
2929

3030
sage/algebras/iwahori_hecke_algebra
3131
sage/algebras/iwahori_hecke_algebra
3232
sage/algebras/nil_coxeter_algebra
3333
sage/algebras/affine_nil_temperley_lieb
3434

3535
sage/algebras/hall_algebra
36+
sage/algebras/jordan_algebra
3637

3738
sage/algebras/quatalg/quaternion_algebra
3839

‎src/doc/en/reference/graphs/index.rst

+1
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,7 @@ Libraries of algorithms
6161

6262
sage/graphs/graph_coloring
6363
sage/graphs/cliquer
64+
sage/graphs/asteroidal_triples
6465
sage/graphs/independent_sets
6566
sage/graphs/comparability
6667
sage/graphs/line_graph

0 commit comments

Comments
 (0)