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

Commit 7ab331e

Browse files
rwstrwst
committed
Merge branch 'develop' into t/18970/18970-2
2 parents e46bc47 + bc45dab commit 7ab331e

File tree

317 files changed

+6545
-2681
lines changed

Some content is hidden

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

317 files changed

+6545
-2681
lines changed

‎VERSION.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
SageMath version 8.1.beta8, Release Date: 2017-10-16
1+
SageMath version 8.1.beta9, Release Date: 2017-10-22

‎build/make/deps

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ $(STARTED): $(STANDARD_PACKAGES)
102102
#
103103
# This consists of packages which are required for the Sage build system.
104104
###############################################################################
105-
base: $(inst_bzip2) $(inst_patch) $(inst_pkgconf)
105+
base: $(inst_patch) $(inst_pkgconf)
106106

107107
###############################################################################
108108
# Building normal packages

‎build/pkgs/alabaster/spkg-install

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
cd src && $PIP_INSTALL .
1+
cd src && sdh_pip_install .

‎build/pkgs/appnope/spkg-install

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ cd src
22

33
# Only install this package on OS X
44
if python -c 'from sys import *; exit(0 if platform == "darwin" else 1)'; then
5-
$PIP_INSTALL . || exit $?
5+
sdh_pip_install .
66
else
77
echo "Not OS X, skipping installation of package 'appnope'"
88
fi

‎build/pkgs/babel/spkg-install

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
cd src && $PIP_INSTALL .
1+
cd src && sdh_pip_install .

‎build/pkgs/backports_abc/spkg-install

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ fi
66

77
cd src
88

9-
$PIP_INSTALL .
9+
sdh_pip_install .
1010

1111
if [ $? -ne 0 ]; then
1212
echo "Error installing backports_abc ... exiting"

‎build/pkgs/backports_shutil_get_terminal_size/spkg-install

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
cd src
22

3-
$PIP_INSTALL .
3+
sdh_pip_install .

‎build/pkgs/backports_ssl_match_hostname/spkg-install

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ fi
66

77
cd src
88

9-
$PIP_INSTALL .
9+
sdh_pip_install .
1010

1111
if [ $? -ne 0 ]; then
1212
echo "Error installing backports.ssl_match_hostname ... exiting"

‎build/pkgs/brial/SPKG.txt

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,3 +13,11 @@ this C++-library we provide a Python interface. This allows parsing of
1313
complex polynomial systems, as well as sophisticated and extendable
1414
strategies for Gröbner base computation. PolyBoRi features a powerful
1515
reference implementation for Gröbner basis computation.
16+
17+
== License ==
18+
19+
GPL version 2 or later
20+
21+
== Upstream Contact ==
22+
23+
https://github.com/BRiAl/BRiAl

‎build/pkgs/brial/checksums.ini

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
tarball=brial-VERSION.tar.bz2
2-
sha1=7e6b7a625773da78cefda241dc016f242da27d7f
3-
md5=449858d7e7f918066eb9224d903cd8f6
4-
cksum=2006315550
2+
sha1=619b94d9640616cdc782fbfdd2baa087c04de5e6
3+
md5=8b75aa118ff91732a00d8099d24ad4c2
4+
cksum=4058332917

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
0.8.7
1+
1.0.1

‎build/pkgs/brial/patches/BooleConstant_not_const.patch

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
See https://github.com/BRiAl/BRiAl/pull/15
2+
3+
commit f82632367865ea57f98257f984cbe0c8465e6a29
4+
Author: Jeroen Demeyer <[email protected]>
5+
Date: Mon Oct 2 15:32:54 2017 +0200
6+
7+
BooleConstant member should not be const
8+
9+
diff --git a/libbrial/include/polybori/BooleConstant.h b/libbrial/include/polybori/BooleConstant.h
10+
index d593029..d7599fe 100644
11+
--- a/libbrial/include/polybori/BooleConstant.h
12+
+++ b/libbrial/include/polybori/BooleConstant.h
13+
@@ -101,7 +101,7 @@ public:
14+
15+
protected:
16+
/// Boolean value is stored as simple bool
17+
- const bool m_value;
18+
+ bool m_value;
19+
};
20+
21+
/// Stream output operator

‎build/pkgs/brial/spkg-install

Lines changed: 21 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,15 +12,22 @@ rm -rf "$SAGE_LOCAL"/share/polybori
1212

1313
cd src
1414

15-
# C++11 workaround https://trac.sagemath.org/ticket/20926
16-
export CXXFLAGS="$CXXFLAGS -std=c++98"
15+
# Use C++11 to compile BRiAl, see https://trac.sagemath.org/ticket/21083
16+
export CXXFLAGS="$CXXFLAGS -std=c++11"
1717

1818
export PYTHON=sage-python23
1919

20+
#
21+
# BRiAl consists of a C++ library and a Python module
22+
#
23+
# First, install the library
24+
#
25+
2026
./configure \
2127
--prefix="$SAGE_LOCAL" \
2228
--libdir="$SAGE_LOCAL/lib" \
23-
--enable-shared --disable-static
29+
--enable-shared --disable-static \
30+
--with-boost-unit-test-framework=no
2431
if [ $? -ne 0 ]; then
2532
echo "Error configuring BRiAl"
2633
exit 1
@@ -32,8 +39,18 @@ if [ $? -ne 0 ]; then
3239
exit 1
3340
fi
3441

35-
$MAKE install -j1
42+
$MAKE install
3643
if [ $? -ne 0 ]; then
3744
echo "Error installing BRiAl"
3845
exit 1
3946
fi
47+
48+
#
49+
# Next, install the Python module
50+
#
51+
52+
cd sage-brial && $PIP_INSTALL .
53+
if [ $? -ne 0 ]; then
54+
echo "Error installing BRiAl Python module"
55+
exit 1
56+
fi

‎build/pkgs/certifi/spkg-install

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ fi
66

77
cd src
88

9-
$PIP_INSTALL .
9+
sdh_pip_install .
1010

1111
if [ $? -ne 0 ]; then
1212
echo "Error installing certifi ... exiting"

‎build/pkgs/configparser/spkg-install

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
cd src && $PIP_INSTALL .
1+
cd src && sdh_pip_install .

‎build/pkgs/configure/checksums.ini

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
tarball=configure-VERSION.tar.gz
2-
sha1=e3d622d2a2bb2269a80d329b24a8eb42482831fe
3-
md5=66684bb9389e7d030bd6e16fd114ba29
4-
cksum=2091457177
2+
sha1=775c6fdb165d221a8f3dfc91c77140d60853cf22
3+
md5=518b63035a7ecf78717ff26693f42518
4+
cksum=3843406884

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
240
1+
241

‎build/pkgs/cvxopt/spkg-install

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ if [ "$UNAME" = FreeBSD ]; then
2626
export CPPFLAGS="$CPPFLAGS -I$SAGE_LOCAL/include"
2727
fi
2828

29-
$PIP_INSTALL .
29+
sdh_pip_install .
3030

3131
if [ $? -ne 0 ]; then
3232
echo "Error building/installing cvxopt"

‎build/pkgs/cycler/spkg-install

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ fi
66

77
cd src
88

9-
$PIP_INSTALL .
9+
sdh_pip_install .
1010
if [ $? -ne 0 ]; then
1111
echo "Error installing cycler ... exiting"
1212
exit 1

‎build/pkgs/cypari/spkg-install

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
cd src && $PIP_INSTALL .
1+
cd src && sdh_pip_install .

‎build/pkgs/cysignals/spkg-install

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ if [ $? -ne 0 ]; then
1616
exit 1
1717
fi
1818

19-
$PIP_INSTALL .
19+
sdh_pip_install .
2020
if [ $? -ne 0 ]; then
2121
echo "Error installing cysignals ... exiting"
2222
exit 1

‎build/pkgs/cython/spkg-install

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ fi
66

77
cd src
88

9-
$PIP_INSTALL .
9+
sdh_pip_install .
1010

1111
if [ $? -ne 0 ]; then
1212
echo "Error installing Cython"

‎build/pkgs/dateutil/spkg-install

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ fi
66

77
cd src
88

9-
$PIP_INSTALL .
9+
sdh_pip_install .
1010
if [ $? -ne 0 ]; then
1111
echo "Error installing dateutil ... exiting"
1212
exit 1

‎build/pkgs/decorator/spkg-install

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
cd src && $PIP_INSTALL .
1+
cd src && sdh_pip_install .

‎build/pkgs/docutils/spkg-install

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ fi
77
#Install new version
88
cd src
99

10-
$PIP_INSTALL .
10+
sdh_pip_install .
1111

1212
if [ $? -ne 0 ]; then
1313
echo "Error installing docutils."

‎build/pkgs/entrypoints/spkg-install

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@
33
#
44

55
mv setup.py src
6-
cd src && $PIP_INSTALL .
6+
cd src && sdh_pip_install .

‎build/pkgs/enum34/spkg-install

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@ if [ "$SAGE_PYTHON3" = "yes" ]; then
33
exit 0
44
fi
55

6-
cd src && $PIP_INSTALL .
6+
cd src && sdh_pip_install .

‎build/pkgs/flask/spkg-install

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
cd src && $PIP_INSTALL .
1+
cd src && sdh_pip_install .

‎build/pkgs/flask_autoindex/spkg-install

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
cd src && $PIP_INSTALL .
1+
cd src && sdh_pip_install .

‎build/pkgs/flask_babel/spkg-install

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
cd src && $PIP_INSTALL .
1+
cd src && sdh_pip_install .

‎build/pkgs/flask_oldsessions/spkg-install

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
cd src && $PIP_INSTALL .
1+
cd src && sdh_pip_install .

‎build/pkgs/flask_openid/spkg-install

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
cd src && $PIP_INSTALL .
1+
cd src && sdh_pip_install .

‎build/pkgs/flask_silk/spkg-install

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
cd src && $PIP_INSTALL .
1+
cd src && sdh_pip_install .

‎build/pkgs/fpylll/spkg-install

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,4 @@ if [ -z "$SAGE_LOCAL" ]; then
44
exit 1
55
fi
66

7-
cd src && $PIP_INSTALL .
7+
cd src && sdh_pip_install .

‎build/pkgs/freetype/dependencies

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
libpng
1+
libpng bzip2
22

33
----------
44
All lines of this file are ignored except the first.

‎build/pkgs/fricas/spkg-install

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,11 @@
11
cd src
22

3+
# Use newer version of config.guess and config.sub (see Trac #23847)
4+
cp "$SAGE_ROOT"/config/config.* config
5+
36
./configure --prefix="$SAGE_LOCAL" \
47
--libdir="$SAGE_LOCAL/lib" \
58
--with-lisp=ecl
6-
79
if [ $? -ne 0 ]; then
810
echo >&2 "Error configuring fricas."
911
exit 1

‎build/pkgs/fricas/type

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
experimental
1+
optional

‎build/pkgs/functools32/spkg-install

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ fi
1111

1212
cd src
1313

14-
$PIP_INSTALL .
14+
sdh_pip_install .
1515

1616
if [ $? -ne 0 ]; then
1717
echo "Error installing functools32 ... exiting"

‎build/pkgs/future/spkg-install

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
cd src
22

3-
$PIP_INSTALL .
3+
sdh_pip_install .
44
if [ $? -ne 0 ]; then
55
echo "Error installing future ... exiting"
66
exit 1

‎build/pkgs/gambit/checksums.ini

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
tarball=gambit-VERSION.tar.gz
2-
sha1=31f7980d36459fa1c34f129b63fa471e8f448621
3-
md5=d5cb640d53128e165917f2feef8fb5ce
4-
cksum=1192706249
2+
sha1=603dd52e8c0c2881bc2fdc8523bd8cbd9106b36f
3+
md5=db47a02f66644806dbd43f77dc41ebeb
4+
cksum=2352708160

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
14.1.0
1+
15.1.1

‎build/pkgs/gambit/patches/b91115633dbf6f64745fda2db7fbb83f918dd500.patch

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
From b91115633dbf6f64745fda2db7fbb83f918dd500 Mon Sep 17 00:00:00 2001
2+
From: Ted Turocy <[email protected]>
3+
Date: Fri, 7 Jul 2017 12:56:56 +0100
4+
Subject: [PATCH] Const-correctness fix in shared_ptr.h
5+
6+
This corrects the parameter to weak_ptr::swap(), which had been
7+
incorrectly labeled as const.
8+
---
9+
src/libgambit/shared_ptr.h | 2 +-
10+
1 file changed, 1 insertion(+), 1 deletion(-)
11+
12+
diff --git a/src/libgambit/shared_ptr.h b/src/libgambit/shared_ptr.h
13+
index 959510e5..4379840e 100644
14+
--- a/src/libgambit/shared_ptr.h
15+
+++ b/src/libgambit/shared_ptr.h
16+
@@ -131,7 +131,7 @@ template <class T> class weak_ptr {
17+
long use_count(void) const { return *m_count; }
18+
bool expired(void) const { return *m_count == 0; }
19+
20+
- void swap(const weak_ptr<T> &other) // never throws
21+
+ void swap(weak_ptr<T> &other) // never throws
22+
{
23+
std::swap(m_ptr, other.m_ptr);
24+
std::swap(m_count, other.m_count);

‎build/pkgs/gap_jupyter/spkg-install

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
cd src && $PIP_INSTALL .
1+
cd src && sdh_pip_install .

‎build/pkgs/giacpy_sage/spkg-install

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ echo "Deleting $SAGE_LOCAL/lib/python*/site-packages/giacpy_sage*"
2424
rm -f "$SAGE_LOCAL"/lib/python*/site-packages/giacpy_sage*
2525

2626

27-
$PIP_INSTALL .
27+
sdh_pip_install .
2828

2929
if [ $? -ne 0 ]; then
3030
exit 1

‎build/pkgs/git_trac/spkg-install

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ fi
66

77
cd src
88

9-
$PIP_INSTALL .
9+
sdh_pip_install .
1010

1111
if [ $? -ne 0 ]; then
1212
echo >&2 "Error installing git-trac, exiting."

‎build/pkgs/gmpy2/spkg-install

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
cd src && $PIP_INSTALL .
1+
cd src && sdh_pip_install .

‎build/pkgs/imagesize/spkg-install

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
cd src && $PIP_INSTALL .
1+
cd src && sdh_pip_install .

‎build/pkgs/ipykernel/checksums.ini

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
tarball=ipykernel-VERSION.tar.gz
2-
sha1=b94d49af3a9a89eb9b4d32c63868b8fcb689de19
3-
md5=4048987076b85814202cd29b1dd3fc7b
4-
cksum=1741951088
2+
sha1=21b1930141d1652c79d986092556f46c2bcf8024
3+
md5=1b320ff87a1a0b049e83df2de91b7f7c
4+
cksum=3573376709

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
4.5.2
1+
4.6.1

‎build/pkgs/ipykernel/spkg-install

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
cd src
22

3-
$PIP_INSTALL .
3+
sdh_pip_install .

‎build/pkgs/ipython/spkg-install

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ fi
66

77
cd src
88

9-
$PIP_INSTALL .
9+
sdh_pip_install .
1010

1111
if [ $? -ne 0 ]; then
1212
echo >&2 "Error installing IPython"

‎build/pkgs/ipython_genutils/checksums.ini

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
tarball=ipython_genutils-VERSION.tar.gz
2-
sha1=bbabe9a5935e7b7cb6d57d4279763756420ed09b
3-
md5=9a8afbe0978adbcbfcb3b35b2d015a56
4-
cksum=3663270374
2+
sha1=5bbf262704d1406ed63e639c5136bf80b87272c5
3+
md5=5a4f9781f78466da0ea1a648f3e1f79f
4+
cksum=2736651136

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
0.1.0.p0
1+
0.2.0

0 commit comments

Comments
 (0)