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

Commit

Permalink
Merge branch 'develop' into t/22465/doctest-continuation-last
Browse files Browse the repository at this point in the history
  • Loading branch information
jm58660 committed Mar 14, 2017
2 parents 4db20c0 + 457b950 commit 4e7d27a
Show file tree
Hide file tree
Showing 728 changed files with 11,452 additions and 7,404 deletions.
2 changes: 1 addition & 1 deletion VERSION.txt
@@ -1 +1 @@
SageMath version 7.6.beta5, Release Date: 2017-02-26
SageMath version 7.6.rc0, Release Date: 2017-03-12
9 changes: 6 additions & 3 deletions build/bin/sage-logger
Expand Up @@ -60,14 +60,17 @@ else
SED=cat
fi

# Store the current value of V, but do all logging of child processes
# with V=1 to ensure that no information is lost.
currentV=$V
export V=1

mkdir -p "$logdir"

if [[ "$V" = 0 && $use_prefix = true ]]; then
if [[ "$currentV" = 0 && $use_prefix = true ]]; then
# Silent build.
# Similar to https://www.gnu.org/software/automake/manual/html_node/Automake-Silent-Rules.html#Automake-Silent-Rules
echo "[$logname] installing. Log file: $logfile"
# Use verbose mode for output to logfiles.
export V=1
( exec>> $logfile 2>&1 ; eval "$cmd" )
status=$?
if [[ $status != 0 ]]; then
Expand Down
2 changes: 1 addition & 1 deletion build/make/deps
Expand Up @@ -201,7 +201,7 @@ DOC_DEPENDENCIES = sagelib $(inst_sphinx) $(inst_sagenb) \
| $(SAGERUNTIME) $(inst_maxima) $(inst_networkx) $(inst_scipy) \
$(inst_matplotlib) $(inst_pillow) $(inst_mathjax) $(inst_mpmath) \
$(inst_ipykernel) $(inst_jupyter_client) $(inst_conway_polynomials) \
$(inst_tachyon) $(inst_jmol) $(inst_thebe)
$(inst_tachyon) $(inst_jmol) $(inst_thebe) $(inst_ipywidgets)

doc: doc-html

Expand Down
6 changes: 3 additions & 3 deletions build/pkgs/configure/checksums.ini
@@ -1,4 +1,4 @@
tarball=configure-VERSION.tar.gz
sha1=baa91f26fce5ea9c83a8749454342948e9a298d7
md5=27f65dfa1e255f7f569353e49eba4968
cksum=1946128373
sha1=6f78567b00c4e2420368526ff172f22a59fa3f4a
md5=c187e0d86960a61d32dbce29ec101b98
cksum=3689960718
2 changes: 1 addition & 1 deletion build/pkgs/configure/package-version.txt
@@ -1 +1 @@
207
209
2 changes: 1 addition & 1 deletion build/pkgs/gap3/spkg-install
Expand Up @@ -20,7 +20,7 @@ echo "INSTALL_DIR = $INSTALL_DIR"
## INSTALLATION
###########################################

cd src
cd src/src
$MAKE
if [ $? -ne 0 ]; then
echo >&2 "Error building $PACKAGE_SHORTNAME."
Expand Down
3 changes: 2 additions & 1 deletion build/pkgs/gdb/spkg-install
Expand Up @@ -8,7 +8,8 @@ fi

cd src

LDFLAGS="${LDFLAGS} -L${SAGE_LOCAL}/lib"
# We add -ltinfo flag to let gdb compile on some 32bit VM, see #22487.
LDFLAGS="${LDFLAGS} -L${SAGE_LOCAL}/lib -ltinfo"
export LDFLAGS

./configure --prefix="$SAGE_LOCAL" --libdir="$SAGE_LOCAL/lib" \
Expand Down
6 changes: 3 additions & 3 deletions build/pkgs/ipywidgets/checksums.ini
@@ -1,4 +1,4 @@
tarball=ipywidgets-VERSION.tar.gz
sha1=f4f57d78fe6e89ef87e9eee31dd9e3f15d1e8601
md5=317e49cc76353352939c2527920f3ebe
cksum=1256350577
sha1=3ec713b82cc415ebe63e2971cc7acae28e89d657
md5=245c978e0ca64b9e686b716c71efb675
cksum=3038350627
2 changes: 1 addition & 1 deletion build/pkgs/ipywidgets/package-version.txt
@@ -1 +1 @@
5.2.2.p1
6.0.0
130 changes: 0 additions & 130 deletions build/pkgs/ipywidgets/patches/remove-deprecated.patch

This file was deleted.

45 changes: 45 additions & 0 deletions build/pkgs/ipywidgets/patches/widget_repr.patch
@@ -0,0 +1,45 @@
commit aadd75cb60d73638a24c8f69e5fbd0c5c8a44780
Author: Jeroen Demeyer <jdemeyer@cage.ugent.be>
Date: Thu Jan 5 17:34:52 2017 +0100

Add __repr__ to Widget for testing/debugging

diff --git a/ipywidgets/widgets/widget.py b/ipywidgets/widgets/widget.py
index 8f4abd3..db474ac 100644
--- a/ipywidgets/widgets/widget.py
+++ b/ipywidgets/widgets/widget.py
@@ -123,6 +123,34 @@ class Widget(LoggingConfigurable):
widgets = {}
widget_types = {}

+ def __repr__(self):
+ """
+ Textual representation of this widget, mainly used for testing
+ and debugging.
+ """
+ # List of attributes to show with default values. The attribute
+ # is printed if it exists and its value is not equal to this
+ # default value.
+ attributes = [("value", None),
+ ("min", None),
+ ("max", None),
+ ("step", None),
+ ("options", None),
+ ("description", ""),
+ ("children", [])]
+ r = ""
+ for (attr, default) in attributes:
+ try:
+ v = getattr(self, attr)
+ except AttributeError:
+ continue
+ if default == v:
+ continue
+ if r:
+ r += ", "
+ r += attr + "=" + repr(v)
+ return "%s(%s)" % (type(self).__name__, r)
+
@staticmethod
def on_widget_constructed(callback):
"""Registers a callback to be called when a widget is constructed.
2 changes: 1 addition & 1 deletion build/pkgs/latte_int/dependencies
@@ -1,4 +1,4 @@
$(MP_LIBRARY) ntl 4ti2 cddlib
$(MP_LIBRARY) ntl 4ti2 cddlib lrslib lidia

----------
All lines of this file are ignored except the first.
Expand Down
2 changes: 1 addition & 1 deletion build/pkgs/libfplll/spkg-install
Expand Up @@ -57,7 +57,7 @@ if [ $? -ne 0 ]; then
fi

echo "Now building fplll..."
$MAKE V=1
$MAKE
if [ $? -ne 0 ]; then
echo "Error building fplll"
exit 1
Expand Down
6 changes: 3 additions & 3 deletions build/pkgs/lrslib/checksums.ini
@@ -1,4 +1,4 @@
tarball=lrslib-VERSION.tar.gz
sha1=7d1b187abd8dbb7ff2c8d7fdf0361a4fc27bb087
md5=17fcc81d6153caf9b1e881566fdb70c1
cksum=1582540417
sha1=c644600ca4a51eb08e61ba175e1d4ec999dc3e4b
md5=bb435ccdd5faf292102e246827926680
cksum=3830123478
2 changes: 1 addition & 1 deletion build/pkgs/lrslib/package-version.txt
@@ -1 +1 @@
062+autotools-2016-09-08
062+autotools-2017-03-03
6 changes: 1 addition & 5 deletions build/pkgs/ncurses/SPKG.txt
Expand Up @@ -38,8 +38,4 @@ None

== Special Update/Build Instructions ==

=== Patches ===

* xopen_source.patch: remove harmful check from aclocal.m4 which may
reintroduce XOPEN_SOURCE on systems where it should not be used.

None
8 changes: 4 additions & 4 deletions build/pkgs/ncurses/checksums.ini
@@ -1,4 +1,4 @@
tarball=ncurses-VERSION.tar.bz2
sha1=c9e9e398a9bcfeb1cc005c4d3eac0998f3445ff2
md5=b2996284ae18610aa2a4e5a968c5e1f3
cksum=3072370532
tarball=ncurses-VERSION.tar.gz
sha1=acd606135a5124905da770803c05f1f20dd3b21c
md5=ee13d052e1ead260d7c28071f46eefb1
cksum=1470804880
2 changes: 1 addition & 1 deletion build/pkgs/ncurses/package-version.txt
@@ -1 +1 @@
5.9.20131221
6.0

0 comments on commit 4e7d27a

Please sign in to comment.