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

COPYING.txt

@@ -30,10 +30,12 @@ SOFTWARE                    LICENSE
 -----------------------------------------------------------------------
 atlas                       Modified BSD
 boehm_gc                    MIT-like license (see below)
+backports_ssl_match_hostname  Python License
 boost_cropped               Boost Software License (see below)
 bzip2                       BSD-ish (see below)
 cddlib                      GPLv2+
 cephes                      "may be used freely" (see below)
+certifi                     ISC
 cliquer                     GPLv2+
 conway_polynomials          None (database)
 cvxopt                      GPLv2+
@@ -65,6 +67,7 @@ iml                         COPYING is GPLv2, source files state modified BSD
 ipython                     Modified BSD
 jinja2                      Modified BSD
 jmol                        LGPLv2.1+
+jsonschema                  MIT License
 lcalc                       GPLv2+
 libfplll                    LGPLv2.1+
 libgap                      GPLv3+
@@ -73,6 +76,7 @@ linbox                      LGPLv2.1+
 lrcalc                      GPLv2+
 m4ri                        GPLv2+
 m4rie                       GPLv2+
+mathjax                     Apache License 2.0
 matplotlib                  Matplotlib License (BSD compatible, see below)
 maxima                      See below
 mpc                         LGPLv3+

VERSION.txt

@@ -1 +1 @@
-Sage version 6.6.beta1, released 2015-02-21
+Sage version 6.6.beta5, released 2015-03-13

build/deps

@@ -23,10 +23,12 @@ all:
 # All targets except for the base packages
 all-sage: \
      $(INST)/$(ATLAS) \
+     $(INST)/$(BACKPORTS_SSL_MATCH_HOSTNAME) \
      $(INST)/$(BOEHM_GC) \
      $(INST)/$(BOOST_CROPPED) \
      $(INST)/$(CDDLIB) \
      $(INST)/$(CEPHES) \
+     $(INST)/$(CERTIFI) \
      $(INST)/$(CLIQUER) \
      $(INST)/$(COMBINATORIAL_DESIGNS) \
      $(INST)/$(CONWAY) \
@@ -58,13 +60,15 @@ all-sage: \
      $(INST)/$(IPYTHON) \
      $(INST)/$(JINJA2) \
      $(INST)/$(JMOL) \
+     $(INST)/$(JSONSCHEMA) \
      $(INST)/$(LCALC) \
      $(INST)/$(LRCALC) \
      $(INST)/$(LIBGAP) \
      $(INST)/$(LIBPNG) \
      $(INST)/$(LINBOX) \
      $(INST)/$(M4RI) \
      $(INST)/$(M4RIE) \
+     $(INST)/$(MATHJAX) \
      $(INST)/$(MATPLOTLIB) \
      $(INST)/$(MAXIMA) \
      $(INST)/$(MPC) \
@@ -308,6 +312,9 @@ $(INST)/$(GAP): $(INST)/$(NCURSES) $(INST)/$(READLINE) $(INST)/$(SAGE_MP_LIBRARY
 $(INST)/$(LIBGAP): $(INST)/$(GAP)
 	+$(PIPE) "$(SAGE_SPKG) $(LIBGAP) 2>&1" "tee -a $(SAGE_LOGS)/$(LIBGAP).log"
 
+$(INST)/$(JSONSCHEMA): $(INST)/$(PYTHON) $(INST)/$(SETUPTOOLS)
+	+$(PIPE) "$(SAGE_SPKG) $(JSONSCHEMA) 2>&1" "tee -a $(SAGE_LOGS)/$(JSONSCHEMA).log"
+
 $(INST)/$(IPYTHON): $(INST)/$(PYTHON) $(INST)/$(JINJA2) $(INST)/$(TORNADO) $(INST)/$(PYZMQ)
 	+$(PIPE) "$(SAGE_SPKG) $(IPYTHON) 2>&1" "tee -a $(SAGE_LOGS)/$(IPYTHON).log"
 
@@ -379,9 +386,19 @@ $(INST)/$(PYPARSING): $(INST)/$(PYTHON)
 $(INST)/$(PYZMQ): $(INST)/$(PYTHON) $(INST)/$(ZEROMQ) $(INST)/$(SETUPTOOLS)
 	+$(PIPE) "$(SAGE_SPKG) $(PYZMQ) 2>&1" "tee -a $(SAGE_LOGS)/$(PYZMQ).log"
 
-$(INST)/$(TORNADO): $(INST)/$(PYTHON) $(INST)/$(SETUPTOOLS)
+$(INST)/$(CERTIFI):  $(INST)/$(PYTHON) $(INST)/$(SETUPTOOLS)
+	+$(PIPE) "$(SAGE_SPKG) $(CERTIFI) 2>&1" "tee -a $(SAGE_LOGS)/$(CERTIFI).log"
+
+$(INST)/$(BACKPORTS_SSL_MATCH_HOSTNAME): $(INST)/$(PYTHON) $(INST)/$(SETUPTOOLS)
+	+$(PIPE) "$(SAGE_SPKG) $(BACKPORTS_SSL_MATCH_HOSTNAME) 2>&1" "tee -a $(SAGE_LOGS)/$(BACKPORTS_SSL_MATCH_HOSTNAME).log"
+
+$(INST)/$(TORNADO): $(INST)/$(PYTHON) $(INST)/$(SETUPTOOLS) \
+                    $(INST)/$(BACKPORTS_SSL_MATCH_HOSTNAME) $(INST)/$(CERTIFI)
 	+$(PIPE) "$(SAGE_SPKG) $(TORNADO) 2>&1" "tee -a $(SAGE_LOGS)/$(TORNADO).log"
 
+$(INST)/$(MATHJAX):
+	+$(PIPE) "$(SAGE_SPKG) $(MATHJAX) 2>&1" "tee -a $(SAGE_LOGS)/$(MATHJAX).log"
+
 $(INST)/$(MATPLOTLIB): $(INST)/$(PYTHON) $(INST)/$(NUMPY) \
                        $(INST)/$(FREETYPE) $(INST)/$(LIBPNG) \
                        $(INST)/$(GDMODULE) $(INST)/$(DATEUTIL) \

build/install

@@ -296,11 +296,13 @@ newest_version() {
 cat >&5 <<EOF
 # Standard packages
 ATLAS=`newest_version atlas`
+BACKPORTS_SSL_MATCH_HOSTNAME=`newest_version backports_ssl_match_hostname`
 BOEHM_GC=`newest_version boehm_gc`
 BOOST_CROPPED=`newest_version boost_cropped`
 BZIP2=`newest_version bzip2`
 CDDLIB=`newest_version cddlib`
 CEPHES=`newest_version cephes`
+CERTIFI=`newest_version certifi`
 CLIQUER=`newest_version cliquer`
 COMBINATORIAL_DESIGNS=`newest_version combinatorial_designs`
 CONWAY=`newest_version conway_polynomials`
@@ -333,13 +335,15 @@ IML=`newest_version iml`
 IPYTHON=`newest_version ipython`
 JINJA2=`newest_version jinja2`
 JMOL=`newest_version jmol`
+JSONSCHEMA=`newest_version jsonschema`
 LCALC=`newest_version lcalc`
 LRCALC=`newest_version lrcalc`
 LIBGAP=`newest_version libgap`
 LIBPNG=`newest_version libpng`
 LINBOX=`newest_version linbox`
 M4RI=`newest_version m4ri`
 M4RIE=`newest_version m4rie`
+MATHJAX=`newest_version mathjax`
 MATPLOTLIB=`newest_version matplotlib`
 MAXIMA=`newest_version maxima`
 MPC=`newest_version mpc`

build/pkgs/atlas/spkg-install

@@ -367,6 +367,9 @@ def configure_fast():
     elif conf['IA64?']:
         print('Fast configuration on Itanium.')
         arch = 'IA64Itan2'
+    elif conf['ARM?']:
+        print('Fast configuration on ARM.')
+        arch='ARMv7'
     else:
         raise NotImplementedError('I don\'t know a "fast" configuration for your cpu.')
     return (arch, isa_ext, thread_limit)
@@ -392,6 +395,9 @@ def configure_base():
     elif conf['IA64?']:
         print('Base configuration on Itanium.')
         arch = 'IA64Itan'
+    elif conf['ARM?']:
+        print('Base configuration on ARM.')
+        arch = 'ARMv6'
     else:
         raise NotImplementedError('I don\'t know a "base" configuration for your cpu.')
     return (arch, isa_ext, thread_limit)

build/pkgs/backports_ssl_match_hostname/SPKG.txt

@@ -0,0 +1,24 @@
+= backports.ssl_match_hostname =
+
+== Description ==
+
+This backport brings match_hostname() to users of
+Python 2.x
+
+== License ==
+
+Python Software Foundation License
+
+== Upstream Contact ==
+
+Home page: https://pypi.python.org/pypi/backports.ssl_match_hostname
+
+== Dependencies ==
+
+Python, Setuptools
+
+== Special Update/Build Instructions ==
+
+* Unpack the tarball
+* rename backports.ssl_match_hostname -> backports_ssl_match_hostname
+* Tar as backports_ssl_match_hostname.VERSION.tar.gz

build/pkgs/backports_ssl_match_hostname/checksums.ini

@@ -0,0 +1,4 @@
+tarball=backports_ssl_match_hostname-VERSION.tar.gz
+sha1=194503d8b47066c2ce8d23cab707d19d6ada2eb9
+md5=5def436c23fa2bc09aedf221d61b7017
+cksum=132706006

build/pkgs/backports_ssl_match_hostname/package-version.txt

@@ -0,0 +1 @@
+3.4.0.2

build/pkgs/backports_ssl_match_hostname/spkg-install

@@ -0,0 +1,15 @@
+#!/usr/bin/env bash
+
+if [ -z "$SAGE_LOCAL" ]; then
+    echo >&2 "SAGE_LOCAL undefined ... exiting"
+    echo >&2 "Maybe run 'sage --sh'?"
+    exit 1
+fi
+
+cd src
+
+python setup.py install
+if [ $? -ne 0 ]; then
+    echo "Error installing backports.ssl_match_hostname ... exiting"
+    exit 1
+fi

build/pkgs/certifi/SPKG.txt

@@ -0,0 +1,18 @@
+= Certifi =
+
+== Description ==
+
+Python package for providing Mozilla's CA Bundle.
+
+== License ==
+
+ISC
+
+== Upstream Contact ==
+
+Home page: https://pypi.python.org/pypi/certifi
+
+== Dependencies ==
+
+Python, Setuptools
+

build/pkgs/certifi/checksums.ini

@@ -0,0 +1,4 @@
+tarball=certifi-VERSION.tar.gz
+sha1=f53dc8f57aaf6d69c183ebadcec52ece0a55cc3f
+md5=315ea4e50673a16ab047099f816fd32a
+cksum=3559413705

build/pkgs/certifi/package-version.txt

@@ -0,0 +1 @@
+14.05.14

build/pkgs/certifi/spkg-install

@@ -0,0 +1,15 @@
+#!/usr/bin/env bash
+
+if [ -z "$SAGE_LOCAL" ]; then
+    echo >&2 "SAGE_LOCAL undefined ... exiting"
+    echo >&2 "Maybe run 'sage --sh'?"
+    exit 1
+fi
+
+cd src
+
+python setup.py install
+if [ $? -ne 0 ]; then
+    echo "Error installing certifi ... exiting"
+    exit 1
+fi

build/pkgs/configure/checksums.ini

@@ -1,4 +1,4 @@
 tarball=configure-VERSION.tar.gz
-sha1=452bd2a009e486be95a8ce008e03d868a83f0e44
-md5=afd37eb3577967415ceac51cb9a432ff
-cksum=66417740
+sha1=12e8d35579711c8bf8beddb890aaebd6b2c51db1
+md5=dbb592c16e66f4f2e3345071fb115abf
+cksum=693230472

build/pkgs/configure/package-version.txt

@@ -1 +1 @@
-71
+75

build/pkgs/eclib/spkg-install

@@ -49,6 +49,14 @@ rm -rf "$SAGE_LOCAL"/include/eclib/
 
 
 cd src/
+for patch in ../patches/*.patch; do
+    [ -r "$patch" ] || continue  # Skip non-existing or non-readable patches
+    patch -p1 <"$patch"
+    if [ $? -ne 0 ]; then
+        echo >&2 "Error applying '$patch'"
+        exit 1
+    fi
+done
 
 echo
 echo "Now configuring eclib..."

build/pkgs/git/checksums.ini

@@ -1,4 +1,4 @@
 tarball=git-VERSION.tar.gz
-sha1=1385edbc9aa77b6e0971f52f75ba4f2ff35c1aa2
-md5=25bd471879e0cbdc4d6cc6eedf307491
-cksum=1144276279
+sha1=150efeb9c016cb8d3e768a408f3f407d18d69661
+md5=edf994cf34cd3354dadcdfa6b4292335
+cksum=995320395

build/pkgs/git/package-version.txt

@@ -1 +1 @@
-2.1.2
+2.3.0

build/pkgs/ipython/checksums.ini

@@ -1,4 +1,4 @@
 tarball=ipython-VERSION.tar.gz
-sha1=8f51a383fc8436e476110417fb8ae694d499defd
-md5=70149981d6515d77ecb3d7507de2d7d9
-cksum=820757681
+sha1=a8dbfad1faa4adb647c7695bd2584ab48ddddb34
+md5=b3f00f3c0be036fafef3b0b9d663f27e
+cksum=123101250

build/pkgs/ipython/package-version.txt

@@ -1 +1 @@
-2.4.1
+3.0.0