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

Commit 5be7adc

Browse files
author
Dario Asprone
committed
Merge branch 'master' into t/25391/sagemath_fails_to_build_on_on_fedora_28_with_gcc_8_1
Updating to the new beta version
2 parents 473f214 + b4a14f9 commit 5be7adc

File tree

245 files changed

+10627
-3455
lines changed

Some content is hidden

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

245 files changed

+10627
-3455
lines changed

‎VERSION.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
SageMath version 8.3.beta1, Release Date: 2018-05-14
1+
SageMath version 8.3.beta2, Release Date: 2018-05-18

‎build/pkgs/atlas/patches/atlas-config

+27-32
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ def pid_exists(pid):
2222
return False
2323
try:
2424
os.kill(pid, 0)
25-
except OSError, e:
25+
except OSError as e:
2626
return e.errno == errno.EPERM
2727
else:
2828
return True
@@ -39,11 +39,11 @@ def unthrottle_posix(pid):
3939
f.write('performance')
4040

4141
def signal_handler(signum, frame):
42-
print 'Signal hanadler called with signal', signum
42+
print('Signal handler called with signal', signum)
4343
for cpu, governor in zip(cpus, scaling_governor):
4444
with open(cpu, 'w') as f:
4545
f.write(governor)
46-
print 'Reverted throttling to the previous behaviour.'
46+
print('Reverted throttling to the previous behaviour.')
4747
sys.exit(0)
4848

4949
signal.signal(signal.SIGPIPE, signal_handler)
@@ -63,7 +63,8 @@ def unthrottle(pid):
6363
if os.name == 'posix':
6464
unthrottle_posix(pid)
6565
else:
66-
print 'I don\'t know how to unthrottle your system ('+platform.system()+')'
66+
print('I don\'t know how to unthrottle your system (' +
67+
platform.system() + ')')
6768
sys.exit(3)
6869

6970

@@ -81,29 +82,30 @@ def is_throttled():
8182
if os.name == 'posix':
8283
return is_throttled_posix()
8384
else:
84-
print 'I don\'t know how to unthrottle your system ('+platform.system()+')'
85+
print('I don\'t know how to unthrottle your system (' +
86+
platform.system() + ')')
8587
sys.exit(3)
8688

8789

8890
def check_root():
8991
if os.name == 'posix':
9092
if os.getuid() == 0:
9193
return
92-
print '\nError: You need to be root to (un)throttle the CPU.\n'
94+
print('\nError: You need to be root to (un)throttle the CPU.\n')
9395
sys.exit(1)
9496
else:
95-
print 'I don\'t know how to probe administrator rights on your system ('+platform.system()+')'
97+
print('I don\'t know how to probe administrator rights on your system ('+platform.system()+')')
9698
sys.exit(3)
9799

98100

99101
def check_nonroot():
100102
if os.name == 'posix':
101103
if os.getuid() > 0:
102104
return
103-
print '\nError: You are crazy to run this as root, exiting.\n'
105+
print('\nError: You are crazy to run this as root, exiting.\n')
104106
sys.exit(2)
105107
else:
106-
print 'I don\'t know how to probe administrator rights on your system ('+platform.system()+')'
108+
print('I don\'t know how to probe administrator rights on your system ('+platform.system()+')')
107109
sys.exit(3)
108110

109111

@@ -123,14 +125,14 @@ atexit.register(wait_for_command)
123125
def unthrottle_self():
124126
if os.name == 'posix':
125127
global command
126-
print 'Running sudo atlas-config --unthrottle to turn CPU throttling off.'
128+
print('Running sudo atlas-config --unthrottle to turn CPU throttling off.')
127129
command = subprocess.Popen(['sudo', os.path.abspath( __file__ ),
128130
'--unthrottle', str(os.getpid())])
129131
else:
130-
print 'I don\'t know how to unthrottle your system ('+platform.system()+')'
132+
print('I don\'t know how to unthrottle your system ('+platform.system()+')')
131133
sys.exit(2)
132134

133-
print 'Waiting for CPU throttling to be turned off...'
135+
print('Waiting for CPU throttling to be turned off...')
134136
while is_throttled():
135137
time.sleep(1)
136138

@@ -147,35 +149,28 @@ if __name__ == '__main__':
147149
unthrottle_self()
148150
print
149151
if os.environ.get('SAGE_FAT_BINARY', 'no') == 'yes':
150-
print 'Building ATLAS with SAGE_FAT_BINARY (generic archdefs).'
151-
elif os.environ.has_key('SAGE_ATLAS_ARCH'):
152-
print 'Building ATLAS with SAGE_ATLAS_ARCH =', os.environ['SAGE_ATLAS_ARCH']
152+
print('Building ATLAS with SAGE_FAT_BINARY (generic archdefs).')
153+
elif 'SAGE_ATLAS_ARCH' in os.environ:
154+
print('Building ATLAS with SAGE_ATLAS_ARCH =', os.environ['SAGE_ATLAS_ARCH'])
153155
else:
154-
print 'Building ATLAS without specifying architecture.'
155-
print 'This may take many hours during which you should leave the computer otherwise'
156-
print 'idle to obtain accurate timings.'
156+
print('Building ATLAS without specifying architecture.')
157+
print('This may take many hours during which you should leave the computer otherwise')
158+
print('idle to obtain accurate timings.')
157159
if args.archdef:
158160
os.environ['SAGE_ATLAS_SAVE_ARCHDEF'] = os.getcwd()
159-
print 'The resulting <archdef>.tar.bz2 will be saved in '+os.getcwd()
160-
print
161-
print 'You have 5 seconds to interrupt...'
161+
print('The resulting <archdef>.tar.bz2 will be saved in ' + os.getcwd())
162+
print()
163+
print('You have 5 seconds to interrupt...')
162164
time.sleep(1)
163-
print 'You have 4 seconds to interrupt...'
165+
print('You have 4 seconds to interrupt...')
164166
time.sleep(1)
165-
print 'You have 3 seconds to interrupt...'
167+
print('You have 3 seconds to interrupt...')
166168
time.sleep(1)
167-
print 'You have 2 seconds to interrupt...'
169+
print('You have 2 seconds to interrupt...')
168170
time.sleep(1)
169-
print 'You have 1 second to interrupt...'
171+
print('You have 1 second to interrupt...')
170172
time.sleep(1)
171173

172174
sys.stdout.flush()
173175
sys.stderr.flush()
174176
os.system('sage -f atlas')
175-
176-
177-
178-
179-
180-
181-

‎build/pkgs/brial/dependencies

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
boost_cropped m4ri libpng pkgconf $(PYTHON) | pip
1+
boost_cropped m4ri libpng $(PYTHON) | pip pkgconf
22

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

‎build/pkgs/bzip2/dependencies

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
pkgconf
1+
| pkgconf
22

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

‎build/pkgs/cddlib/checksums.ini

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
tarball=cddlib-VERSION.tar.bz2
2-
sha1=7fb95db0f42c20edd4dde1835342c2b41b74f267
3-
md5=a40a0f16ce81d152dcdda674aac966c3
4-
cksum=200778222
1+
tarball=cddlib-VERSION.tar.gz
2+
sha1=7b2dc29969d668ad35ff543170cfc68a03699995
3+
md5=8aec6578fcfe038138a9f6440d971376
4+
cksum=2058915280

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
094g.p2
1+
094i

‎build/pkgs/configure/checksums.ini

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
tarball=configure-VERSION.tar.gz
2-
sha1=3895cb984ffb129f2880278a2c57b57c64905dc6
3-
md5=1f0e379b82ed3a41b23af0efd8a2c88c
4-
cksum=4081775049
2+
sha1=c03a34f83312834d9062afbee286e1137c71e592
3+
md5=04df2df845e00a411a8043ced9c49de1
4+
cksum=2766347879

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
264
1+
265

‎build/pkgs/graphs/SPKG.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ Grout. Since April 2012 it also contains the ISGCI graph database.
1414
* For Andries Brouwer's database:
1515

1616
The data is taken from from Andries E. Brouwer's website
17-
(http://www.win.tue.nl/~aeb/). Anything related to the data should be
17+
(https://www.win.tue.nl/~aeb/). Anything related to the data should be
1818
reported to him directly ([email protected])
1919

2020
The code used to parse the data and create the .json file is available at

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
5.5.0
1+
5.5.0.p0

‎build/pkgs/ipython/patches/signature.patch

+47
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,47 @@
1+
See https://github.com/ipython/ipython/pull/11139
2+
3+
commit 98e7ddd43bab127de68a3c66870b8e17a5b50eeb
4+
Author: Jeroen Demeyer <[email protected]>
5+
Date: Wed May 16 14:32:15 2018 +0200
6+
7+
Use inspect instead of type checks
8+
9+
diff --git a/IPython/utils/_signatures.py b/IPython/utils/_signatures.py
10+
index 3b53e89..20f52b9 100644
11+
--- a/IPython/utils/_signatures.py
12+
+++ b/IPython/utils/_signatures.py
13+
@@ -21,6 +21,7 @@
14+
import functools
15+
import re
16+
import types
17+
+import inspect
18+
19+
20+
# patch for single-file
21+
@@ -71,7 +72,7 @@ def signature(obj):
22+
if not callable(obj):
23+
raise TypeError('{0!r} is not a callable object'.format(obj))
24+
25+
- if isinstance(obj, types.MethodType):
26+
+ if inspect.ismethod(obj):
27+
if obj.__self__ is None:
28+
# Unbound method - treat it as a function (no distinction in Py 3)
29+
obj = obj.__func__
30+
@@ -96,7 +97,7 @@ def signature(obj):
31+
else:
32+
return signature(wrapped)
33+
34+
- if isinstance(obj, types.FunctionType):
35+
+ if inspect.isfunction(obj):
36+
return Signature.from_function(obj)
37+
38+
if isinstance(obj, functools.partial):
39+
@@ -511,7 +512,7 @@ def __init__(self, parameters=None, return_annotation=_empty,
40+
def from_function(cls, func):
41+
'''Constructs Signature for the given python function'''
42+
43+
- if not isinstance(func, types.FunctionType):
44+
+ if not inspect.isfunction(func):
45+
raise TypeError('{0!r} is not a Python function'.format(func))
46+
47+
Parameter = cls._parameter_cls

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
2.6.1
1+
2.6.1.p0

‎build/pkgs/mathjax/spkg-install

+2-10
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,4 @@
1-
# Check required environment variable
2-
if [ -z "$SAGE_SHARE" ]; then
3-
echo >&2 "SAGE_SHARE undefined ... exiting"
4-
echo >&2 "Maybe run 'sage --sh'?"
5-
exit 1
6-
fi
7-
8-
# Move mathjax to its final destination.
91
TARGET="${SAGE_SHARE}/mathjax"
2+
# Cleanup installed version
103
rm -rf "${TARGET}"
11-
cp -r 'src' "${TARGET}"
12-
4+
sdh_install src/* "${TARGET}"

‎build/pkgs/maxima/checksums.ini

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
tarball=maxima-VERSION.tar.gz
2-
sha1=c366966d740b17ff8a86c3b6019522c5f8195d34
3-
md5=3bccafb512ff1054be700c61601088af
4-
cksum=743287720
2+
sha1=0f69a6603d7334bfec6388151eeb768e8c5e7626
3+
md5=972c51384d7895c88d78eb045c6aedb2
4+
cksum=2882871019

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
5.39.0.p2
1+
5.41.0

‎build/pkgs/pkgconf/dependencies

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
patch
1+
| patch
22

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

‎build/pkgs/ppl/spkg-install

+7-32
Original file line numberDiff line numberDiff line change
@@ -1,38 +1,22 @@
1-
if [ "x$SAGE_LOCAL" = x ]; then
2-
echo >&2 "SAGE_LOCAL undefined ... exiting"
3-
echo >&2 "Maybe run 'sage -sh'?"
4-
exit 1
5-
fi
6-
71
# Make sure that we prefer Sage's mpir library over system-wide gmp/mpir installs
82
export CXXFLAGS="$CXXFLAGS -I$SAGE_LOCAL/include"
93

104
cd src
115

126
# Enable only what's needed for Sage
7+
GMP_PATHS=( "--with-gmp-include=$SAGE_LOCAL/include"
8+
"--with-gmp-lib=$SAGE_LOCAL/lib" )
139
PPL_CONFIGURE="--enable-coefficients=mpz --disable-fpmath $PPL_CONFIGURE"
1410

1511
# First try configuring both the C and C++ interfaces.
1612
# If that fails (for example, because of a broken version of m4),
1713
# try to configure again with only the C++ interface, which is
1814
# sufficient for Sage. See #11391 and #12672.
19-
./configure --prefix="$SAGE_LOCAL" --libdir="$SAGE_LOCAL/lib" \
20-
--with-gmp-include="$SAGE_LOCAL/include" \
21-
--with-gmp-lib="$SAGE_LOCAL/lib" \
22-
--enable-interfaces=c,c++ \
23-
$PPL_CONFIGURE
24-
if [ $? -ne 0 ]; then
15+
if ! (sdh_configure --enable-interfaces=c,c++ "${GMP_PATHS[@]}" \
16+
$PPL_CONFIGURE); then
2517
echo >&2 "Error configuring PPL with both C and C++ interfaces, trying"
2618
echo >&2 "again with only the C++ interface."
27-
./configure --prefix="$SAGE_LOCAL" --libdir="$SAGE_LOCAL/lib" \
28-
--with-gmp-include="$SAGE_LOCAL/include" \
29-
--with-gmp-lib="$SAGE_LOCAL/lib" \
30-
$PPL_CONFIGURE \
31-
--enable-interfaces=c++
32-
if [ $? -ne 0 ]; then
33-
echo >&2 "Error configuring the Parma Polyhedra Library."
34-
exit 1
35-
fi
19+
sdh_configure --enable-interfaces=c++ "${GMP_PATHS[@]}" $PPL_CONFIGURE
3620
fi
3721

3822
# Workaround to disable PPL's "watchdog timer", preventing it from clobbering
@@ -42,14 +26,5 @@ if [ "$UNAME" = "CYGWIN" ]; then
4226
sed -i 's/#define HAVE_DECL_SETITIMER 1/#define HAVE_DECL_SETITIMER 0/' config.h
4327
fi
4428

45-
$MAKE
46-
if [ $? -ne 0 ]; then
47-
echo >&2 "Error building the Parma Polyhedra Library."
48-
exit 1
49-
fi
50-
51-
$MAKE install
52-
if [ $? -ne 0 ]; then
53-
echo >&2 "Error installing the Parma Polyhedra Library."
54-
exit 1
55-
fi
29+
sdh_make
30+
sdh_make_install

‎build/pkgs/pynac/dependencies

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
$(PYTHON) $(MP_LIBRARY) pkgconf flint singular giac
1+
$(PYTHON) $(MP_LIBRARY) flint singular giac | pkgconf
22

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

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
9624e0a0
1+
9624e0a0.p0

‎build/pkgs/thebe/spkg-install

+1-13
Original file line numberDiff line numberDiff line change
@@ -1,13 +1 @@
1-
if [ -z "$SAGE_SHARE" ]; then
2-
echo >&2 "SAGE_SHARE undefined ... exiting"
3-
echo >&2 "Maybe run 'sage --sh'?"
4-
exit 1
5-
fi
6-
7-
TARGET="${SAGE_SHARE}/thebe"
8-
if [ ! -d "${TARGET}" ]; then
9-
mkdir "${TARGET}"
10-
fi
11-
12-
cp 'src/static/main-built.js' "${TARGET}/thebe.js"
13-
1+
sdh_install -T src/static/main-built.js "$SAGE_SHARE/thebe/thebe.js"

0 commit comments

Comments
 (0)