Merge branch 'develop' into t/20475/upgrade_to_pynac_0_6_5

sagemath · Apr 23, 2016 · e06a26c · e06a26c
2 parents 11e2b78 + 950f0f5
commit e06a26c
Show file tree

Hide file tree

Showing 231 changed files with 4,053 additions and 1,338 deletions.
diff --git a/VERSION.txt b/VERSION.txt
@@ -1 +1 @@
-SageMath version 7.2.beta4, Release Date: 2016-04-12
+SageMath version 7.2.beta5, Release Date: 2016-04-21
diff --git a/build/pkgs/babel/SPKG.txt b/build/pkgs/babel/SPKG.txt
@@ -0,0 +1,7 @@
+= babel =
+
+== Description ==
+
+Internationalization utilities
+
+A collection of tools for internationalizing Python applications.
diff --git a/build/pkgs/babel/checksums.ini b/build/pkgs/babel/checksums.ini
@@ -0,0 +1,4 @@
+tarball=Babel-VERSION.tar.gz
+sha1=e02392bc9a16f7672686bce23e4e3cdadcc1b1c8
+md5=1b69e4b2ab3795119266ccaa36b36f15
+cksum=2897183559
diff --git a/build/pkgs/babel/dependencies b/build/pkgs/babel/dependencies
@@ -0,0 +1,5 @@
+$(PYTHON) | pip pytz
+
+----------
+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/babel/package-version.txt b/build/pkgs/babel/package-version.txt
@@ -0,0 +1 @@
+2.2.0
diff --git a/build/pkgs/babel/spkg-install b/build/pkgs/babel/spkg-install
@@ -0,0 +1,3 @@
+#!/usr/bin/env bash
+
+cd src && python setup.py install
diff --git a/build/pkgs/babel/type b/build/pkgs/babel/type
@@ -0,0 +1 @@
+standard
diff --git a/build/pkgs/configure/checksums.ini b/build/pkgs/configure/checksums.ini
@@ -1,4 +1,4 @@
 tarball=configure-VERSION.tar.gz
-sha1=a688b4151ebffbd892199e47edf21f0e295ae06f
-md5=1da510585db296e3930eaa33cbb40a87
-cksum=3334341322
+sha1=443f6e49b23bbc1e9004f32c802b83e35abe3a77
+md5=bb7132154839ae45a55ca1c46331289d
+cksum=2428928852
diff --git a/build/pkgs/configure/package-version.txt b/build/pkgs/configure/package-version.txt
@@ -1 +1 @@
-158
+159
diff --git a/build/pkgs/flask/SPKG.txt b/build/pkgs/flask/SPKG.txt
@@ -0,0 +1,8 @@
+= Flask =
+
+== Description ==
+
+A microframework based on Werkzeug, Jinja2 and good intentions
+
+Flask is a microframework for Python based on Werkzeug, Jinja 2 and good
+intentions. And before you ask: It’s BSD licensed!
diff --git a/build/pkgs/flask/checksums.ini b/build/pkgs/flask/checksums.ini
@@ -0,0 +1,4 @@
+tarball=Flask-VERSION.tar.gz
+sha1=d3d078262b053f4438e2ed3fd6f9b923c2c92172
+md5=378670fe456957eb3c27ddaef60b2b24
+cksum=2901487846
diff --git a/build/pkgs/flask/dependencies b/build/pkgs/flask/dependencies
@@ -0,0 +1,5 @@
+$(PYTHON) | pip werkzeug jinja2 itsdangerous
+
+----------
+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/flask/package-version.txt b/build/pkgs/flask/package-version.txt
@@ -0,0 +1 @@
+0.10.1
diff --git a/build/pkgs/flask/spkg-install b/build/pkgs/flask/spkg-install
@@ -0,0 +1,3 @@
+#!/usr/bin/env bash
+
+cd src && python setup.py install
diff --git a/build/pkgs/flask/type b/build/pkgs/flask/type
@@ -0,0 +1 @@
+standard
diff --git a/build/pkgs/flask_autoindex/SPKG.txt b/build/pkgs/flask_autoindex/SPKG.txt
@@ -0,0 +1,9 @@
+= Flask-AutoIndex =
+
+== Description ==
+
+The mod_autoindex for Flask
+
+Flask-AutoIndex generates an index page for your Flask application
+automatically. The result just like mod_autoindex, but the look is more
+awesome!
diff --git a/build/pkgs/flask_autoindex/checksums.ini b/build/pkgs/flask_autoindex/checksums.ini
@@ -0,0 +1,4 @@
+tarball=Flask_AutoIndex-VERSION.tar.gz
+sha1=15e08bd3a516aa327ab4af767a29154a4bebdae3
+md5=24984602365704737468bb4d2586a739
+cksum=1140907747
diff --git a/build/pkgs/flask_autoindex/dependencies b/build/pkgs/flask_autoindex/dependencies
@@ -0,0 +1,5 @@
+$(PYTHON) | pip flask_silk
+
+----------
+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/flask_autoindex/package-version.txt b/build/pkgs/flask_autoindex/package-version.txt
@@ -0,0 +1 @@
+0.5
diff --git a/build/pkgs/flask_autoindex/spkg-install b/build/pkgs/flask_autoindex/spkg-install
@@ -0,0 +1,3 @@
+#!/usr/bin/env bash
+
+cd Flask* && python setup.py install
diff --git a/build/pkgs/flask_autoindex/type b/build/pkgs/flask_autoindex/type
@@ -0,0 +1 @@
+standard
diff --git a/build/pkgs/flask_babel/SPKG.txt b/build/pkgs/flask_babel/SPKG.txt
@@ -0,0 +1,6 @@
+= Flask-Babel =
+
+== Description ==
+
+Adds i18n/l10n support to Flask applications with the help of the Babel
+library.
diff --git a/build/pkgs/flask_babel/checksums.ini b/build/pkgs/flask_babel/checksums.ini
@@ -0,0 +1,4 @@
+tarball=Flask_Babel-VERSION.tar.gz
+sha1=977d3b152f876e06c215f6bb72616b4ce138fa49
+md5=4762e0392303f464d53cbebedfb87ded
+cksum=2286190911
diff --git a/build/pkgs/flask_babel/dependencies b/build/pkgs/flask_babel/dependencies
@@ -0,0 +1,5 @@
+$(PYTHON) | pip flask speaklater
+
+----------
+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/flask_babel/package-version.txt b/build/pkgs/flask_babel/package-version.txt
@@ -0,0 +1 @@
+0.9
diff --git a/build/pkgs/flask_babel/spkg-install b/build/pkgs/flask_babel/spkg-install
@@ -0,0 +1,3 @@
+#!/usr/bin/env bash
+
+cd Flask* && python setup.py install
diff --git a/build/pkgs/flask_babel/type b/build/pkgs/flask_babel/type
@@ -0,0 +1 @@
+standard
diff --git a/build/pkgs/flask_oldsessions/SPKG.txt b/build/pkgs/flask_oldsessions/SPKG.txt
@@ -0,0 +1,5 @@
+= Flask-OldSessions =
+
+== Description ==
+
+Provides a session class that works like the one in Flask before 0.10.
diff --git a/build/pkgs/flask_oldsessions/checksums.ini b/build/pkgs/flask_oldsessions/checksums.ini
@@ -0,0 +1,4 @@
+tarball=Flask_OldSessions-VERSION.tar.gz
+sha1=1c0bbcd79b4fc626da2fd34ce9b59b2d43f6d81e
+md5=3d731d343d5380bb9f502742ad62df50
+cksum=709943870
diff --git a/build/pkgs/flask_oldsessions/dependencies b/build/pkgs/flask_oldsessions/dependencies
@@ -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.
diff --git a/build/pkgs/flask_oldsessions/package-version.txt b/build/pkgs/flask_oldsessions/package-version.txt
@@ -0,0 +1 @@
+0.10
diff --git a/build/pkgs/flask_oldsessions/spkg-install b/build/pkgs/flask_oldsessions/spkg-install
@@ -0,0 +1,3 @@
+#!/usr/bin/env bash
+
+cd *flask-oldsessions* && python setup.py install
diff --git a/build/pkgs/flask_oldsessions/type b/build/pkgs/flask_oldsessions/type
@@ -0,0 +1 @@
+standard
diff --git a/build/pkgs/flask_openid/SPKG.txt b/build/pkgs/flask_openid/SPKG.txt
@@ -0,0 +1,5 @@
+= Flask-OpenID =
+
+== Description ==
+
+OpenID support for Flask
diff --git a/build/pkgs/flask_openid/checksums.ini b/build/pkgs/flask_openid/checksums.ini
@@ -0,0 +1,4 @@
+tarball=Flask_OpenID-VERSION.tar.gz
+sha1=18d39e03417cd2b577cd5c1f5c2ac117493f3fef
+md5=a40c63df701ec634450d03490ddfb6c1
+cksum=995771756
diff --git a/build/pkgs/flask_openid/dependencies b/build/pkgs/flask_openid/dependencies
@@ -0,0 +1,5 @@
+$(PYTHON) | pip flask python_openid
+
+----------
+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/flask_openid/package-version.txt b/build/pkgs/flask_openid/package-version.txt
@@ -0,0 +1 @@
+1.2.5
diff --git a/build/pkgs/flask_openid/spkg-install b/build/pkgs/flask_openid/spkg-install
@@ -0,0 +1,3 @@
+#!/usr/bin/env bash
+
+cd Flask* && python setup.py install
diff --git a/build/pkgs/flask_openid/type b/build/pkgs/flask_openid/type
@@ -0,0 +1 @@
+standard
diff --git a/build/pkgs/flask_silk/SPKG.txt b/build/pkgs/flask_silk/SPKG.txt
@@ -0,0 +1,5 @@
+= Flask-Silk =
+
+== Description ==
+
+Adds silk icons to your Flask application or blueprint, or extension.
diff --git a/build/pkgs/flask_silk/checksums.ini b/build/pkgs/flask_silk/checksums.ini
@@ -0,0 +1,4 @@
+tarball=Flask_Silk-VERSION.tar.gz
+sha1=cef42b469c9ebb69a766d0cd33ad27480800d518
+md5=aca545a94063dc4acd21779ea5dde330
+cksum=1557295080
diff --git a/build/pkgs/flask_silk/dependencies b/build/pkgs/flask_silk/dependencies
@@ -0,0 +1,5 @@
+$(PYTHON) | pip flask
+
+----------
+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/flask_silk/package-version.txt b/build/pkgs/flask_silk/package-version.txt
@@ -0,0 +1 @@
+0.2
diff --git a/build/pkgs/flask_silk/spkg-install b/build/pkgs/flask_silk/spkg-install
@@ -0,0 +1,3 @@
+#!/usr/bin/env bash
+
+cd Flask* && python setup.py install
diff --git a/build/pkgs/flask_silk/type b/build/pkgs/flask_silk/type
@@ -0,0 +1 @@
+standard
diff --git a/build/pkgs/itsdangerous/SPKG.txt b/build/pkgs/itsdangerous/SPKG.txt
@@ -0,0 +1,6 @@
+= itsdangerous =
+
+== Description ==
+
+Various helpers to pass data to untrusted environments and to get it back
+safe and sound.
diff --git a/build/pkgs/itsdangerous/checksums.ini b/build/pkgs/itsdangerous/checksums.ini
@@ -0,0 +1,4 @@
+tarball=itsdangerous-VERSION.tar.gz
+sha1=0a6ae9c20cd72e89d75314ebc7b0f390f93e6a0d
+md5=a3d55aa79369aef5345c036a8a26307f
+cksum=2767256127
diff --git a/build/pkgs/itsdangerous/dependencies b/build/pkgs/itsdangerous/dependencies
@@ -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.
diff --git a/build/pkgs/itsdangerous/package-version.txt b/build/pkgs/itsdangerous/package-version.txt
@@ -0,0 +1 @@
+0.24
diff --git a/build/pkgs/itsdangerous/spkg-install b/build/pkgs/itsdangerous/spkg-install
@@ -0,0 +1,3 @@
+#!/usr/bin/env bash
+
+cd src && python setup.py install
diff --git a/build/pkgs/itsdangerous/type b/build/pkgs/itsdangerous/type
@@ -0,0 +1 @@
+standard
diff --git a/build/pkgs/libfplll/checksums.ini b/build/pkgs/libfplll/checksums.ini
@@ -1,4 +1,4 @@
-tarball=libfplll-VERSION.tar.bz2
-sha1=0810bb8283671b7bb84392494cc84a20162dd40f
-md5=281bbe2b95572401b6cd5264b5694863
-cksum=3698765896
+tarball=libfplll-VERSION.tar.gz
+sha1=4f03734645abe800cd4d7838fcec0cbd2c551633
+md5=661440d1249e1f8d6346ab91a8658de6
+cksum=1133822281
diff --git a/build/pkgs/libfplll/package-version.txt b/build/pkgs/libfplll/package-version.txt
@@ -1 +1 @@
-20160107
+20160331
diff --git a/build/pkgs/libfplll/spkg-src b/build/pkgs/libfplll/spkg-src
@@ -0,0 +1,34 @@
+#!/usr/bin/env bash
+
+if [ -z "$SAGE_LOCAL" ]; then
+    echo >&2 "Error: SAGE_LOCAL undefined - exiting..."
+    echo >&2 "Maybe run 'sage -sh'?"
+    exit 1
+fi
+
+FPLLL_REVISION="b50fd91ba0aeea2067dc9d82e6c352dbe0210eb3"
+FPLLL_VERSION="4.0.5"
+SPKG_ROOT="$SAGE_ROOT/build/pkgs/libfplll"
+
+set -e
+
+cd "$SPKG_ROOT"
+
+FPLLL_SAGE_VERSION=`cat package-version.txt |sed 's/[.]p.*//'`
+
+rm -rf fplll-checkout
+git clone git://github.com/dstehle/fplll fplll-checkout
+
+cd fplll-checkout
+git checkout "$FPLLL_REVISION"
+./autogen.sh
+./configure
+make dist
+tar xvfz libfplll-"$FPLLL_VERSION".tar.gz
+rm libfplll-"$FPLLL_VERSION".tar.gz
+mv libfplll-"$FPLLL_VERSION" libfplll-"$FPLLL_SAGE_VERSION"
+tar cvfz libfplll-"$FPLLL_SAGE_VERSION".tar.gz libfplll-"$FPLLL_SAGE_VERSION"
+
+mv  libfplll-"$FPLLL_SAGE_VERSION".tar.gz "$SAGE_DISTFILES/"
+cd ..
+rm -rf fplll-checkout
diff --git a/build/pkgs/matplotlib/dependencies b/build/pkgs/matplotlib/dependencies
@@ -1,7 +1,4 @@
-$(PYTHON) numpy freetype libpng dateutil pyparsing tornado six cycler | sagenb setuptools
-
-The sagenb dependency is because of the "pytz" package. If that package
-is ever pulled out from sagenb, replace "sagenb" by "pytz" above.
+$(PYTHON) numpy freetype libpng dateutil pyparsing tornado six cycler | pytz setuptools
 
 ----------
 All lines of this file are ignored except the first.

diff --git a/build/pkgs/mpfr/patches/mpfr-3.1.4-1.src.patch b/build/pkgs/mpfr/patches/mpfr-3.1.4-1.src.patch
@@ -1,11 +1,25 @@
---- mpfr-3.1.4/src/mpfr-impl.h	2016-03-06 12:33:04.000000000 +0100
-+++ mpfr-3.1.4/src/mpfr-impl.h	2016-03-06 17:25:16.341090700 +0100
-@@ -257,6 +257,8 @@ typedef struct __gmpfr_cache_s *mpfr_cac
- # if defined(_WIN32)
- #  error "Both __unix__ and _WIN32 are defined"
- # endif
-+#endif
-+#if (defined(__unix__) && !defined(__CYGWIN__))
- # if __GMP_LIBGMP_DLL
- #  error "__unix__ is defined and __GMP_LIBGMP_DLL is true"
- # endif
+Patch from upstream needed to fix an error when compiling on Cygwin
+See http://trac.sagemath.org/ticket/20423 for discussion and link to
+the original upstream patch.
+--- trunk/src/mpfr-impl.h	2016/04/08 15:55:03	10257
++++ trunk/src/mpfr-impl.h	2016/04/08 23:17:07	10260
+@@ -208,19 +208,6 @@
+ # define MPFR_WIN_THREAD_SAFE_DLL 1
+ #endif
+
+-/* Detect some possible inconsistencies under Unix. */
+-#if defined(__unix__)
+-# if defined(_WIN32)
+-#  error "Both __unix__ and _WIN32 are defined"
+-# endif
+-# if __GMP_LIBGMP_DLL
+-#  error "__unix__ is defined and __GMP_LIBGMP_DLL is true"
+-# endif
+-# if defined(MPFR_WIN_THREAD_SAFE_DLL)
+-#  error "Both __unix__ and MPFR_WIN_THREAD_SAFE_DLL are defined"
+-# endif
+-#endif
+-
+ #if defined(__MPFR_WITHIN_MPFR) || !defined(MPFR_WIN_THREAD_SAFE_DLL)
+ extern MPFR_THREAD_ATTR mpfr_flags_t __gmpfr_flags;
+ extern MPFR_THREAD_ATTR mpfr_exp_t   __gmpfr_emin;
diff --git a/build/pkgs/nbconvert/checksums.ini b/build/pkgs/nbconvert/checksums.ini
@@ -1,4 +1,4 @@
 tarball=nbconvert-VERSION.tar.gz
-sha1=079fd51c75e5c8b76f9679aa7fc5ad8176004720
-md5=58ee16f5da0dd2976ff992511d6bfb43
-cksum=75346878
+sha1=0f3c792cc624e09b2524cd0a010618036647a8cd
+md5=710e356c4effcfddd29a3c10f1d8c3e6
+cksum=137274062
diff --git a/build/pkgs/nbconvert/package-version.txt b/build/pkgs/nbconvert/package-version.txt
@@ -1 +1 @@
-4.1.0
+4.2.0
diff --git a/build/pkgs/notebook/checksums.ini b/build/pkgs/notebook/checksums.ini
@@ -1,4 +1,4 @@
 tarball=notebook-VERSION.tar.gz
-sha1=cf953bcaf73ba43e7ef0ce829126b6605105dd0f
-md5=d390cf1a0785a43711a2548c8f3c91b8
-cksum=2636243005
+sha1=f5466b2f04e1b9c913dcf79f7e03812eba718d0d
+md5=3a72bb93f6f01caec69e5e65718f5f7f
+cksum=3858938777
diff --git a/build/pkgs/notebook/package-version.txt b/build/pkgs/notebook/package-version.txt
@@ -1 +1 @@
-4.1.0
+4.2.0
diff --git a/build/pkgs/notebook/patches/help_link_url_fix.patch b/build/pkgs/notebook/patches/help_link_url_fix.patch
diff --git a/build/pkgs/numpy/checksums.ini b/build/pkgs/numpy/checksums.ini
@@ -1,4 +1,4 @@
 tarball=numpy-VERSION.tar.gz
-sha1=46a653d3a3e474bf284cbf213c2ce5fa85c39371
-md5=aed294de0aa1ac7bd3f9745f4f1968ad
-cksum=4106390035
+sha1=3e43596cba1d5df4002dd0c87d4041f31ea6e1b5
+md5=bc56fb9fc2895aa4961802ffbdb31d0b
+cksum=906704492
diff --git a/build/pkgs/numpy/package-version.txt b/build/pkgs/numpy/package-version.txt
@@ -1 +1 @@
-1.10.4.p1
+1.11.0
diff --git a/build/pkgs/numpy/patches/numpy-1.10.1-asarray_conversion.patch b/build/pkgs/numpy/patches/numpy-1.10.1-asarray_conversion.patch
@@ -1,12 +1,17 @@
+BUG: Let linspace accept input that has an array_interface but is not otherwise a numpy or python type.
+
+Upstream PR: https://github.com/numpy/numpy/pull/6659
+
+
 diff -Naur numpy-1.10.1.orig/numpy/core/function_base.py numpy-1.10.1/numpy/core/function_base.py
 --- numpy-1.10.1.orig/numpy/core/function_base.py	2015-11-11 10:12:45.583322683 +1300
 +++ numpy-1.10.1/numpy/core/function_base.py	2015-11-11 10:14:05.813343880 +1300
 @@ -3,7 +3,7 @@
  __all__ = ['logspace', 'linspace']
 
  from . import numeric as _nx
--from .numeric import result_type, NaN
-+from .numeric import result_type, NaN, asanyarray
+-from .numeric import result_type, NaN, shares_memory, MAY_SHARE_BOUNDS, TooHardError
++from .numeric import result_type, NaN, shares_memory, MAY_SHARE_BOUNDS, TooHardError, asanyarray
 
 
  def linspace(start, stop, num=50, endpoint=True, retstep=False, dtype=None):