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

Commit

Permalink
Merge tag '6.7.beta1' into #17821
Browse files Browse the repository at this point in the history
  • Loading branch information
vbraun committed Apr 15, 2015
2 parents 70e4d3a + 9d18e27 commit 6278235
Show file tree
Hide file tree
Showing 647 changed files with 46,435 additions and 12,815 deletions.
8 changes: 8 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
/local
/logs
/upstream
/src/mac-app/build

#############################
# Autotools generated files #
Expand Down Expand Up @@ -70,3 +71,10 @@ $RECYCLE.BIN/

# SublimeText
*.sublime-workspace

#################
# SageMathCloud #
#################
*.sage-chat
*.sage-history
*.syncdoc*
2 changes: 2 additions & 0 deletions COPYING.txt
Original file line number Diff line number Diff line change
Expand Up @@ -76,9 +76,11 @@ linbox LGPLv2.1+
lrcalc GPLv2+
m4ri GPLv2+
m4rie GPLv2+
markupsafe Simplified BSD
mathjax Apache License 2.0
matplotlib Matplotlib License (BSD compatible, see below)
maxima See below
mistune Modified BSD
mpc LGPLv3+
mpfi COPYING is GPLv2, source files state LGPLv2.1+
mpfr LGPLv3+
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ build: logs configure
"../$(PIPE)" \
"env SAGE_PARALLEL_SPKG_BUILD='$(SAGE_PARALLEL_SPKG_BUILD)' ./install all 2>&1" \
"tee -a ../logs/install.log"
./sage -b
+./sage -b

# Preemptively download all standard upstream source tarballs.
download:
Expand Down
2 changes: 1 addition & 1 deletion VERSION.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
Sage version 6.6.beta5, released 2015-03-13
Sage version 6.7.beta1, released 2015-04-15
18 changes: 13 additions & 5 deletions build/deps
Original file line number Diff line number Diff line change
Expand Up @@ -68,9 +68,11 @@ all-sage: \
$(INST)/$(LINBOX) \
$(INST)/$(M4RI) \
$(INST)/$(M4RIE) \
$(INST)/$(MARKUPSAFE) \
$(INST)/$(MATHJAX) \
$(INST)/$(MATPLOTLIB) \
$(INST)/$(MAXIMA) \
$(INST)/$(MISTUNE) \
$(INST)/$(MPC) \
$(INST)/$(MPFI) \
$(INST)/$(MPFR) \
Expand Down Expand Up @@ -315,6 +317,9 @@ $(INST)/$(LIBGAP): $(INST)/$(GAP)
$(INST)/$(JSONSCHEMA): $(INST)/$(PYTHON) $(INST)/$(SETUPTOOLS)
+$(PIPE) "$(SAGE_SPKG) $(JSONSCHEMA) 2>&1" "tee -a $(SAGE_LOGS)/$(JSONSCHEMA).log"

$(INST)/$(MISTUNE): $(INST)/$(SETUPTOOLS) $(INST)/$(CYTHON)
+$(PIPE) "$(SAGE_SPKG) $(MISTUNE) 2>&1" "tee -a $(SAGE_LOGS)/$(MISTUNE).log"

$(INST)/$(IPYTHON): $(INST)/$(PYTHON) $(INST)/$(JINJA2) $(INST)/$(TORNADO) $(INST)/$(PYZMQ)
+$(PIPE) "$(SAGE_SPKG) $(IPYTHON) 2>&1" "tee -a $(SAGE_LOGS)/$(IPYTHON).log"

Expand Down Expand Up @@ -374,7 +379,7 @@ $(INST)/$(FREETYPE): $(INST)/$(LIBPNG)
$(INST)/$(LIBPNG): $(INST)/$(ZLIB)
+$(PIPE) "$(SAGE_SPKG) $(LIBPNG) 2>&1" "tee -a $(SAGE_LOGS)/$(LIBPNG).log"

$(INST)/$(SIX): $(INST)/$(PYTHON)
$(INST)/$(SIX): $(INST)/$(PYTHON) $(INST)/$(SETUPTOOLS)
+$(PIPE) "$(SAGE_SPKG) $(SIX) 2>&1" "tee -a $(SAGE_LOGS)/$(SIX).log"

$(INST)/$(DATEUTIL): $(INST)/$(PYTHON) $(INST)/$(SIX) $(INST)/$(SETUPTOOLS)
Expand Down Expand Up @@ -467,7 +472,10 @@ $(INST)/$(SPHINX): $(INST)/$(PYTHON) $(INST)/$(SETUPTOOLS) $(INST)/$(DOCUTILS) \
$(INST)/$(JINJA2) $(INST)/$(PYGMENTS)
+$(PIPE) "$(SAGE_SPKG) $(SPHINX) 2>&1" "tee -a $(SAGE_LOGS)/$(SPHINX).log"

$(INST)/$(JINJA2): $(INST)/$(PYTHON) $(INST)/$(SETUPTOOLS) $(INST)/$(DOCUTILS)
$(INST)/$(MARKUPSAFE): $(INST)/$(PYTHON) $(INST)/$(SETUPTOOLS)
+$(PIPE) "$(SAGE_SPKG) $(MARKUPSAFE) 2>&1" "tee -a $(SAGE_LOGS)/$(MARKUPSAFE).log"

$(INST)/$(JINJA2): $(INST)/$(MARKUPSAFE) $(INST)/$(SETUPTOOLS) $(INST)/$(DOCUTILS)
+$(PIPE) "$(SAGE_SPKG) $(JINJA2) 2>&1" "tee -a $(SAGE_LOGS)/$(JINJA2).log"

$(INST)/$(PYGMENTS): $(INST)/$(PYTHON) $(INST)/$(SETUPTOOLS)
Expand Down Expand Up @@ -519,7 +527,7 @@ $(INST)/sage: \
$(INST)/csage
if [ -z "$$SAGE_INSTALL_FETCH_ONLY" ]; then \
cd $(SAGE_SRC) && source bin/sage-env && \
$(PIPE) 'time python setup.py install 2>&1' 'tee -a $(SAGE_LOGS)/sage-$(SAGE_VERSION).log' && \
$(PIPE) 'time $(MAKE) sage 2>&1' 'tee -a $(SAGE_LOGS)/sage-$(SAGE_VERSION).log' && \
touch $@; \
fi

Expand All @@ -530,8 +538,8 @@ $(INST)/csage: $(INST)/$(SCONS) \
$(INST)/$(PYTHON) \
$(CSAGE_SOURCES)
if [ -z "$$SAGE_INSTALL_FETCH_ONLY" ]; then \
cd $(SAGE_SRC) && source bin/sage-env && cd c_lib && \
$(PIPE) 'time scons -Q install 2>&1' 'tee -a $(SAGE_LOGS)/csage-$(SAGE_VERSION).log' && \
cd $(SAGE_SRC) && source bin/sage-env && \
$(PIPE) 'time $(MAKE) csage 2>&1' 'tee -a $(SAGE_LOGS)/csage-$(SAGE_VERSION).log' && \
touch $@; \
fi

Expand Down
2 changes: 2 additions & 0 deletions build/install
Original file line number Diff line number Diff line change
Expand Up @@ -343,9 +343,11 @@ LIBPNG=`newest_version libpng`
LINBOX=`newest_version linbox`
M4RI=`newest_version m4ri`
M4RIE=`newest_version m4rie`
MARKUPSAFE=`newest_version markupsafe`
MATHJAX=`newest_version mathjax`
MATPLOTLIB=`newest_version matplotlib`
MAXIMA=`newest_version maxima`
MISTUNE=`newest_version mistune`
MPC=`newest_version mpc`
MPFI=`newest_version mpfi`
MPFR=`newest_version mpfr`
Expand Down
28 changes: 28 additions & 0 deletions build/pkgs/cbc/SPKG.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
= COIN-OR / CBC =

== Description ==

The Computational Infrastructure for Operations Research (COIN-OR**,
or simply COIN) project is an initiative to spur the development of
open-source software for the operations research community.

The COIN Branch and Cut solver (CBC) is an open-source
mixed-integer program (MIP) solver written in C++. CBC is intended to
be used primarily as a callable library to create customized
branch-and-cut solvers. A basic, stand-alone executable version is
also available. CBC is an active open-source project led by John
Forrest at www.coin-or.org.

== License ==

Eclipse Public License, Version 1.0 (EPL-1.0)
(http://opensource.org/licenses/eclipse-1.0)

== Upstream Contact ==

* John Forrest <[email protected]>
* Robin Lougee-Heimer

== Project Home Page ==

* https://projects.coin-or.org/Cbc
4 changes: 4 additions & 0 deletions build/pkgs/cbc/checksums.ini
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
tarball=cbc-VERSION.tar.gz
sha1=d937d6af1ee8838d44659ebd4cf7bbb1b20372ce
md5=2134576233cc95cdfedc63991a4944ec
cksum=1215468781
1 change: 1 addition & 0 deletions build/pkgs/cbc/package-version.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
2.9.4
22 changes: 22 additions & 0 deletions build/pkgs/cbc/spkg-install
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
if [ "$SAGE_LOCAL" = "" ]; then
echo >&2 "SAGE_LOCAL undefined ... exiting";
echo >&2 "Maybe run 'sage -sh'?"
exit 1
fi

export LDFLAGS="$LDFLAGS -lz -lbz2"
#export CPPFLAGS="-DHAVE_CLOCK_GETTIME=0"

# See discussion on #12220
#
#-> Mac and Linux behave differently according to the presence of librt, and a
# good way around if to make the computer believe that it does not exist
# locally, or more precisely that it does not contain the clock_gettime
# function. Cbc uses an alternative method to do the job, and it looks like
# all this is required when Cbc solves LP with several threads.
#
cd src &&
sed -i -e "s/clock\_gettime ()/Grrrrrrrrrrrr\ ()/g" Cbc/configure &&
./configure --prefix="$SAGE_LOCAL" "${args[@]}" --enable-cbc-parallel --enable-parallel --enable-gnu-packages --enable-static &&
make &&
make install
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=12e8d35579711c8bf8beddb890aaebd6b2c51db1
md5=dbb592c16e66f4f2e3345071fb115abf
cksum=693230472
sha1=ca70b58ba6c8bd0bbcab9ed5408f9f43dde8fffa
md5=02a841e6f9e8915d674ac2180447562b
cksum=923598272
2 changes: 1 addition & 1 deletion build/pkgs/configure/package-version.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
75
87
2 changes: 1 addition & 1 deletion build/pkgs/cython/package-version.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
0.22
0.22.p1
44 changes: 44 additions & 0 deletions build/pkgs/cython/patches/embedsignatures.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
commit 9139a7f836151fb5bdb1624a05dce13b1bb17164
Author: Stefan Behnel <[email protected]>
Date: Mon Apr 6 10:45:48 2015 +0200

support NULL as default argument in auto doc transform

diff --git a/Cython/Compiler/AutoDocTransforms.py b/Cython/Compiler/AutoDocTransforms.py
index 775f635..88b0cd8 100644
--- a/Cython/Compiler/AutoDocTransforms.py
+++ b/Cython/Compiler/AutoDocTransforms.py
@@ -51,6 +51,8 @@ class EmbedSignature(CythonTransform):
default_val = arg.default
if not default_val:
return None
+ if isinstance(default_val, ExprNodes.NullNode):
+ return 'NULL'
try:
denv = self.denv # XXX
ctval = default_val.compile_time_value(self.denv)
diff --git a/tests/run/embedsignatures.pyx b/tests/run/embedsignatures.pyx
index 0bfebfe..781cd21 100644
--- a/tests/run/embedsignatures.pyx
+++ b/tests/run/embedsignatures.pyx
@@ -199,6 +199,9 @@ __doc__ = ur"""

>>> print(funcdoc(f_defexpr5))
f_defexpr5(int x=4)
+
+ >>> print(funcdoc(f_charptr_null))
+ f_charptr_null(char *s=NULL) -> char *
"""

cdef class Ext:
@@ -403,6 +406,10 @@ cpdef f_defexpr4(int x = (Ext.CONST1 + FLAG1) * Ext.CONST2):
cpdef f_defexpr5(int x = 2+2):
pass

+cpdef (char*) f_charptr_null(char* s=NULL):
+ return s or b'abc'
+
+
# no signatures for lambda functions
lambda_foo = lambda x: 10
lambda_bar = lambda x: 20
29 changes: 29 additions & 0 deletions build/pkgs/database_pari/SPKG.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
= database_pari =

== Description ==

The collection of optional PARI packages elldata, seadata, galpol,
nftables (galdata is included in the standard PARI spkg).
See http://pari.math.u-bordeaux.fr/packages.html

== License ==

GNU General Public License (GPL version 2 or any later version).

== SPKG Maintainers ==

* Jeroen Demeyer

== Upstream Contact ==

http://pari.math.u-bordeaux.fr/

== Dependencies ==

* Installation: None
* Runtime: PARI/GP

== Special Update/Build Instructions ==

Download the four mentioned tarballs and extract them, then move them
out of the top-level directory data.
4 changes: 4 additions & 0 deletions build/pkgs/database_pari/checksums.ini
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
tarball=database_pari-VERSION.tar.bz2
sha1=92dcb68e7a6def53ffc5fb82e3593d5b80c940cb
md5=652d36d18ea300193957120815298be7
cksum=2257060384
1 change: 1 addition & 0 deletions build/pkgs/database_pari/package-version.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
20140908
9 changes: 9 additions & 0 deletions build/pkgs/database_pari/spkg-check
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
#!/usr/bin/env bash

if [ -z "$SAGE_SRC" ]; then
echo >&2 "SAGE_SRC undefined ... exiting"
echo >&2 "Maybe run 'sage --sh'?"
exit 1
fi

sage -tp --long --optional=database_pari,sage "$SAGE_SRC/sage/tests/parigp.py" "$SAGE_SRC/sage/libs/pari"
10 changes: 10 additions & 0 deletions build/pkgs/database_pari/spkg-install
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
#!/usr/bin/env bash

if [ -z "$GP_DATA_DIR" ]; then
echo >&2 "GP_DATA_DIR undefined ... exiting"
echo >&2 "Maybe run 'sage --sh'?"
exit 1
fi

cd src
cp -pR elldata galpol nftables seadata "$GP_DATA_DIR"
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=b8a8b5232caf2332e650d8b6b8ec009979312974
md5=da8b822c6bbef913bcef6d7491c8c999
cksum=3800001876
sha1=78c29e1a3dd56f78c7c73518bbbcc87ec46ccaa6
md5=9f236177d235a3105ec4f7d513ab0470
cksum=3608506624
2 changes: 1 addition & 1 deletion build/pkgs/eclib/package-version.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
20140921
20150323
6 changes: 3 additions & 3 deletions build/pkgs/ipython/checksums.ini
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
tarball=ipython-VERSION.tar.gz
sha1=a8dbfad1faa4adb647c7695bd2584ab48ddddb34
md5=b3f00f3c0be036fafef3b0b9d663f27e
cksum=123101250
sha1=e81b5b9730b3392948cdc69aa107b407028dba5e
md5=a749d90c16068687b0ec45a27e72ef8f
cksum=998856847
2 changes: 1 addition & 1 deletion build/pkgs/ipython/package-version.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
3.0.0
3.1.0
23 changes: 23 additions & 0 deletions build/pkgs/ipython/patches/catch_termios_error.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
See https://github.com/ipython/ipython/pull/8208

Catch termios.error in pager

This error is raised by termios.tcgetattr on really old Linux versions
(here: Ubuntu 8.04.4) in doctests, that is, without a real stdout.

diff --git a/IPython/core/page.py b/IPython/core/page.py
index 2a0305e..067b540 100644
--- a/IPython/core/page.py
+++ b/IPython/core/page.py
@@ -100,7 +100,10 @@ def _detect_screen_size(screen_lines_def):
# flags each time), we just save the initial terminal state and
# unconditionally reset it every time. It's cheaper than making
# the checks.
- term_flags = termios.tcgetattr(sys.stdout)
+ try:
+ term_flags = termios.tcgetattr(sys.stdout)
+ except termios.error as err:
+ raise TypeError

# Curses modifies the stdout buffer size by default, which messes
# up Python's normal stdout buffering. This would manifest itself
8 changes: 4 additions & 4 deletions build/pkgs/jinja2/checksums.ini
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
tarball=jinja2-VERSION.tar.bz2
sha1=e9e13b4f573effd35e03b1ecd978c684342d549c
md5=3ca3504c27a147d38f4d32214a3f3004
cksum=1443664485
tarball=jinja2-VERSION.tar.gz
sha1=25ab3881f0c1adfcf79053b58de829c5ae65d3ac
md5=b9dffd2f3b43d673802fe857c8445b1a
cksum=3563905877
2 changes: 1 addition & 1 deletion build/pkgs/jinja2/package-version.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2.5.5
2.7.3
2 changes: 2 additions & 0 deletions build/pkgs/jinja2/spkg-install
Original file line number Diff line number Diff line change
Expand Up @@ -23,3 +23,5 @@ cd src
python setup.py install
success 'Error installing Jinja2'

### The Jinja2 docs use Sphinx which requires Jinja2... do not build!
# make -C docs html
19 changes: 19 additions & 0 deletions build/pkgs/markupsafe/SPKG.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
= markupsafe =

== Description ==

Implements a XML/HTML/XHTML Markup safe string for Python

== License ==

Simplified BSD

== Upstream Contact ==

Home page: http://github.com/mitsuhiko/markupsafe

== Dependencies ==

Python, setuptools


4 changes: 4 additions & 0 deletions build/pkgs/markupsafe/checksums.ini
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
tarball=markupsafe-VERSION.tar.gz
sha1=cd5c22acf6dd69046d6cb6a3920d84ea66bdf62a
md5=f5ab3deee4c37cd6a922fb81e730da6e
cksum=586757310
1 change: 1 addition & 0 deletions build/pkgs/markupsafe/package-version.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
0.23
Loading

0 comments on commit 6278235

Please sign in to comment.