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

Commit 1f9c338

Browse files
rwstrwst
committed
Merge branch 'develop' into t/15852/15852
* develop: (352 commits) Updated Sage version to 6.6.beta5 Ellipsize Sage version in docstrings Updated Sage version to 6.6.beta4 Trac #17829: Discrepancy between sage -bdist and sage-bdist Trac #17940: Execute JMol in C locale. Fix integral_points() for polyhedra in 0 dimensions #12455 Airy functions: avoid calling deprecated function #12455 Airy funs: hold_derivative by default #12455 Airy funs: raise NotImplementedError on diff(airy_?i(α,x),α) #12455 Airy functions: doc fixes and clarifications Ref: add/fix module titles in r/interfaces trac #17929 make sure pdf doc builds Improve documentation for QQ.random_element. trac #17928 setting rays immutable trac #17928 neg of cone in correct class trac #17871: missing trac role sort trac #17871: Reviewer's comment trac #17871; Rephrase the 'deprecation' section of the developer's manual Ref: more missing modules in r/categories ... Conflicts: src/sage/structure/parent.pyx
2 parents dbadd6a + 52db42b commit 1f9c338

File tree

547 files changed

+24648
-13386
lines changed

Some content is hidden

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

547 files changed

+24648
-13386
lines changed

‎COPYING.txt

+4
Original file line numberDiff line numberDiff line change
@@ -30,10 +30,12 @@ SOFTWARE LICENSE
3030
-----------------------------------------------------------------------
3131
atlas Modified BSD
3232
boehm_gc MIT-like license (see below)
33+
backports_ssl_match_hostname Python License
3334
boost_cropped Boost Software License (see below)
3435
bzip2 BSD-ish (see below)
3536
cddlib GPLv2+
3637
cephes "may be used freely" (see below)
38+
certifi ISC
3739
cliquer GPLv2+
3840
conway_polynomials None (database)
3941
cvxopt GPLv2+
@@ -65,6 +67,7 @@ iml COPYING is GPLv2, source files state modified BSD
6567
ipython Modified BSD
6668
jinja2 Modified BSD
6769
jmol LGPLv2.1+
70+
jsonschema MIT License
6871
lcalc GPLv2+
6972
libfplll LGPLv2.1+
7073
libgap GPLv3+
@@ -73,6 +76,7 @@ linbox LGPLv2.1+
7376
lrcalc GPLv2+
7477
m4ri GPLv2+
7578
m4rie GPLv2+
79+
mathjax Apache License 2.0
7680
matplotlib Matplotlib License (BSD compatible, see below)
7781
maxima See below
7882
mpc LGPLv3+

‎VERSION.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
Sage version 6.6.beta1, released 2015-02-21
1+
Sage version 6.6.beta5, released 2015-03-13

‎build/deps

+18-1
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,12 @@ all:
2323
# All targets except for the base packages
2424
all-sage: \
2525
$(INST)/$(ATLAS) \
26+
$(INST)/$(BACKPORTS_SSL_MATCH_HOSTNAME) \
2627
$(INST)/$(BOEHM_GC) \
2728
$(INST)/$(BOOST_CROPPED) \
2829
$(INST)/$(CDDLIB) \
2930
$(INST)/$(CEPHES) \
31+
$(INST)/$(CERTIFI) \
3032
$(INST)/$(CLIQUER) \
3133
$(INST)/$(COMBINATORIAL_DESIGNS) \
3234
$(INST)/$(CONWAY) \
@@ -58,13 +60,15 @@ all-sage: \
5860
$(INST)/$(IPYTHON) \
5961
$(INST)/$(JINJA2) \
6062
$(INST)/$(JMOL) \
63+
$(INST)/$(JSONSCHEMA) \
6164
$(INST)/$(LCALC) \
6265
$(INST)/$(LRCALC) \
6366
$(INST)/$(LIBGAP) \
6467
$(INST)/$(LIBPNG) \
6568
$(INST)/$(LINBOX) \
6669
$(INST)/$(M4RI) \
6770
$(INST)/$(M4RIE) \
71+
$(INST)/$(MATHJAX) \
6872
$(INST)/$(MATPLOTLIB) \
6973
$(INST)/$(MAXIMA) \
7074
$(INST)/$(MPC) \
@@ -308,6 +312,9 @@ $(INST)/$(GAP): $(INST)/$(NCURSES) $(INST)/$(READLINE) $(INST)/$(SAGE_MP_LIBRARY
308312
$(INST)/$(LIBGAP): $(INST)/$(GAP)
309313
+$(PIPE) "$(SAGE_SPKG) $(LIBGAP) 2>&1" "tee -a $(SAGE_LOGS)/$(LIBGAP).log"
310314

315+
$(INST)/$(JSONSCHEMA): $(INST)/$(PYTHON) $(INST)/$(SETUPTOOLS)
316+
+$(PIPE) "$(SAGE_SPKG) $(JSONSCHEMA) 2>&1" "tee -a $(SAGE_LOGS)/$(JSONSCHEMA).log"
317+
311318
$(INST)/$(IPYTHON): $(INST)/$(PYTHON) $(INST)/$(JINJA2) $(INST)/$(TORNADO) $(INST)/$(PYZMQ)
312319
+$(PIPE) "$(SAGE_SPKG) $(IPYTHON) 2>&1" "tee -a $(SAGE_LOGS)/$(IPYTHON).log"
313320

@@ -379,9 +386,19 @@ $(INST)/$(PYPARSING): $(INST)/$(PYTHON)
379386
$(INST)/$(PYZMQ): $(INST)/$(PYTHON) $(INST)/$(ZEROMQ) $(INST)/$(SETUPTOOLS)
380387
+$(PIPE) "$(SAGE_SPKG) $(PYZMQ) 2>&1" "tee -a $(SAGE_LOGS)/$(PYZMQ).log"
381388

382-
$(INST)/$(TORNADO): $(INST)/$(PYTHON) $(INST)/$(SETUPTOOLS)
389+
$(INST)/$(CERTIFI): $(INST)/$(PYTHON) $(INST)/$(SETUPTOOLS)
390+
+$(PIPE) "$(SAGE_SPKG) $(CERTIFI) 2>&1" "tee -a $(SAGE_LOGS)/$(CERTIFI).log"
391+
392+
$(INST)/$(BACKPORTS_SSL_MATCH_HOSTNAME): $(INST)/$(PYTHON) $(INST)/$(SETUPTOOLS)
393+
+$(PIPE) "$(SAGE_SPKG) $(BACKPORTS_SSL_MATCH_HOSTNAME) 2>&1" "tee -a $(SAGE_LOGS)/$(BACKPORTS_SSL_MATCH_HOSTNAME).log"
394+
395+
$(INST)/$(TORNADO): $(INST)/$(PYTHON) $(INST)/$(SETUPTOOLS) \
396+
$(INST)/$(BACKPORTS_SSL_MATCH_HOSTNAME) $(INST)/$(CERTIFI)
383397
+$(PIPE) "$(SAGE_SPKG) $(TORNADO) 2>&1" "tee -a $(SAGE_LOGS)/$(TORNADO).log"
384398

399+
$(INST)/$(MATHJAX):
400+
+$(PIPE) "$(SAGE_SPKG) $(MATHJAX) 2>&1" "tee -a $(SAGE_LOGS)/$(MATHJAX).log"
401+
385402
$(INST)/$(MATPLOTLIB): $(INST)/$(PYTHON) $(INST)/$(NUMPY) \
386403
$(INST)/$(FREETYPE) $(INST)/$(LIBPNG) \
387404
$(INST)/$(GDMODULE) $(INST)/$(DATEUTIL) \

‎build/install

+4
Original file line numberDiff line numberDiff line change
@@ -296,11 +296,13 @@ newest_version() {
296296
cat >&5 <<EOF
297297
# Standard packages
298298
ATLAS=`newest_version atlas`
299+
BACKPORTS_SSL_MATCH_HOSTNAME=`newest_version backports_ssl_match_hostname`
299300
BOEHM_GC=`newest_version boehm_gc`
300301
BOOST_CROPPED=`newest_version boost_cropped`
301302
BZIP2=`newest_version bzip2`
302303
CDDLIB=`newest_version cddlib`
303304
CEPHES=`newest_version cephes`
305+
CERTIFI=`newest_version certifi`
304306
CLIQUER=`newest_version cliquer`
305307
COMBINATORIAL_DESIGNS=`newest_version combinatorial_designs`
306308
CONWAY=`newest_version conway_polynomials`
@@ -333,13 +335,15 @@ IML=`newest_version iml`
333335
IPYTHON=`newest_version ipython`
334336
JINJA2=`newest_version jinja2`
335337
JMOL=`newest_version jmol`
338+
JSONSCHEMA=`newest_version jsonschema`
336339
LCALC=`newest_version lcalc`
337340
LRCALC=`newest_version lrcalc`
338341
LIBGAP=`newest_version libgap`
339342
LIBPNG=`newest_version libpng`
340343
LINBOX=`newest_version linbox`
341344
M4RI=`newest_version m4ri`
342345
M4RIE=`newest_version m4rie`
346+
MATHJAX=`newest_version mathjax`
343347
MATPLOTLIB=`newest_version matplotlib`
344348
MAXIMA=`newest_version maxima`
345349
MPC=`newest_version mpc`

‎build/pkgs/atlas/spkg-install

+6
Original file line numberDiff line numberDiff line change
@@ -367,6 +367,9 @@ def configure_fast():
367367
elif conf['IA64?']:
368368
print('Fast configuration on Itanium.')
369369
arch = 'IA64Itan2'
370+
elif conf['ARM?']:
371+
print('Fast configuration on ARM.')
372+
arch='ARMv7'
370373
else:
371374
raise NotImplementedError('I don\'t know a "fast" configuration for your cpu.')
372375
return (arch, isa_ext, thread_limit)
@@ -392,6 +395,9 @@ def configure_base():
392395
elif conf['IA64?']:
393396
print('Base configuration on Itanium.')
394397
arch = 'IA64Itan'
398+
elif conf['ARM?']:
399+
print('Base configuration on ARM.')
400+
arch = 'ARMv6'
395401
else:
396402
raise NotImplementedError('I don\'t know a "base" configuration for your cpu.')
397403
return (arch, isa_ext, thread_limit)

‎build/pkgs/backports_ssl_match_hostname/SPKG.txt

+24
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
= backports.ssl_match_hostname =
2+
3+
== Description ==
4+
5+
This backport brings match_hostname() to users of
6+
Python 2.x
7+
8+
== License ==
9+
10+
Python Software Foundation License
11+
12+
== Upstream Contact ==
13+
14+
Home page: https://pypi.python.org/pypi/backports.ssl_match_hostname
15+
16+
== Dependencies ==
17+
18+
Python, Setuptools
19+
20+
== Special Update/Build Instructions ==
21+
22+
* Unpack the tarball
23+
* rename backports.ssl_match_hostname -> backports_ssl_match_hostname
24+
* Tar as backports_ssl_match_hostname.VERSION.tar.gz

‎build/pkgs/backports_ssl_match_hostname/checksums.ini

+4
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
tarball=backports_ssl_match_hostname-VERSION.tar.gz
2+
sha1=194503d8b47066c2ce8d23cab707d19d6ada2eb9
3+
md5=5def436c23fa2bc09aedf221d61b7017
4+
cksum=132706006

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

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

‎build/pkgs/backports_ssl_match_hostname/spkg-install

+15
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
#!/usr/bin/env bash
2+
3+
if [ -z "$SAGE_LOCAL" ]; then
4+
echo >&2 "SAGE_LOCAL undefined ... exiting"
5+
echo >&2 "Maybe run 'sage --sh'?"
6+
exit 1
7+
fi
8+
9+
cd src
10+
11+
python setup.py install
12+
if [ $? -ne 0 ]; then
13+
echo "Error installing backports.ssl_match_hostname ... exiting"
14+
exit 1
15+
fi

‎build/pkgs/certifi/SPKG.txt

+18
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
= Certifi =
2+
3+
== Description ==
4+
5+
Python package for providing Mozilla's CA Bundle.
6+
7+
== License ==
8+
9+
ISC
10+
11+
== Upstream Contact ==
12+
13+
Home page: https://pypi.python.org/pypi/certifi
14+
15+
== Dependencies ==
16+
17+
Python, Setuptools
18+

‎build/pkgs/certifi/checksums.ini

+4
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
tarball=certifi-VERSION.tar.gz
2+
sha1=f53dc8f57aaf6d69c183ebadcec52ece0a55cc3f
3+
md5=315ea4e50673a16ab047099f816fd32a
4+
cksum=3559413705

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

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

‎build/pkgs/certifi/spkg-install

+15
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
#!/usr/bin/env bash
2+
3+
if [ -z "$SAGE_LOCAL" ]; then
4+
echo >&2 "SAGE_LOCAL undefined ... exiting"
5+
echo >&2 "Maybe run 'sage --sh'?"
6+
exit 1
7+
fi
8+
9+
cd src
10+
11+
python setup.py install
12+
if [ $? -ne 0 ]; then
13+
echo "Error installing certifi ... exiting"
14+
exit 1
15+
fi

‎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=452bd2a009e486be95a8ce008e03d868a83f0e44
3-
md5=afd37eb3577967415ceac51cb9a432ff
4-
cksum=66417740
2+
sha1=12e8d35579711c8bf8beddb890aaebd6b2c51db1
3+
md5=dbb592c16e66f4f2e3345071fb115abf
4+
cksum=693230472

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

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

‎build/pkgs/eclib/spkg-install

+8
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,14 @@ rm -rf "$SAGE_LOCAL"/include/eclib/
4949

5050

5151
cd src/
52+
for patch in ../patches/*.patch; do
53+
[ -r "$patch" ] || continue # Skip non-existing or non-readable patches
54+
patch -p1 <"$patch"
55+
if [ $? -ne 0 ]; then
56+
echo >&2 "Error applying '$patch'"
57+
exit 1
58+
fi
59+
done
5260

5361
echo
5462
echo "Now configuring eclib..."

‎build/pkgs/git/checksums.ini

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
tarball=git-VERSION.tar.gz
2-
sha1=1385edbc9aa77b6e0971f52f75ba4f2ff35c1aa2
3-
md5=25bd471879e0cbdc4d6cc6eedf307491
4-
cksum=1144276279
2+
sha1=150efeb9c016cb8d3e768a408f3f407d18d69661
3+
md5=edf994cf34cd3354dadcdfa6b4292335
4+
cksum=995320395

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
2.1.2
1+
2.3.0

‎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=8f51a383fc8436e476110417fb8ae694d499defd
3-
md5=70149981d6515d77ecb3d7507de2d7d9
4-
cksum=820757681
2+
sha1=a8dbfad1faa4adb647c7695bd2584ab48ddddb34
3+
md5=b3f00f3c0be036fafef3b0b9d663f27e
4+
cksum=123101250

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
2.4.1
1+
3.0.0

‎build/pkgs/ipython/patches/github_pr_5874.patch

-21
This file was deleted.

0 commit comments

Comments
 (0)