mirror of
https://src.fedoraproject.org/rpms/sagemath.git
synced 2025-04-22 11:45:56 -04:00
Update to sagemath 8.8 (bz 1724394).
Also: - Remove configparser dependencies (bz 1706597). - Fix broken sed conversion (bz 1706234). - Fix python2 versus python3 snafu (bz 1706337, 1707166). - Build and install sagetex (bz 1706322).
This commit is contained in:
Jerry James
parent
05337076b6
commit
5a519c8e85
15 changed files with 277 additions and 497 deletions
|
|
@ -1,6 +1,6 @@
|
|||
diff -up src/bin/sage.orig src/bin/sage
|
||||
--- src/bin/sage.orig 2019-03-23 16:20:31.000000000 -0600
|
||||
+++ src/bin/sage 2019-04-08 11:42:38.305818631 -0600
|
||||
--- src/bin/sage.orig 2019-06-26 14:41:04.000000000 -0600
|
||||
+++ src/bin/sage 2019-06-27 11:28:35.352810438 -0600
|
||||
@@ -26,13 +26,10 @@ usage() {
|
||||
echo " file.[sage|py|spyx] -- run given .sage, .py or .spyx file"
|
||||
echo " -advanced -- list all command line options"
|
||||
|
|
@ -166,7 +166,7 @@ diff -up src/bin/sage.orig src/bin/sage
|
|||
echo " -valgrind -- this is an alias for -memcheck"
|
||||
echo
|
||||
echo "You can also use -- before a long option, e.g., 'sage --optional'."
|
||||
@@ -287,115 +205,6 @@ usage_advanced() {
|
||||
@@ -287,116 +205,6 @@ usage_advanced() {
|
||||
|
||||
|
||||
#####################################################################
|
||||
|
|
@ -193,7 +193,7 @@ diff -up src/bin/sage.orig src/bin/sage
|
|||
- # We set PYTHONPATH to that directory such that the system Python
|
||||
- # should also find the sage_patchbot package.
|
||||
- cmd='import sage_patchbot as p; import os; print(os.path.dirname(p.__path__[0]))'
|
||||
- export PYTHONPATH=`"$SAGE_ROOT/sage" --python -c "$cmd"`
|
||||
- export PYTHONPATH=`"$SAGE_ROOT/sage" --python3 -c "$cmd"`
|
||||
- if [ -z "$PYTHONPATH" ]; then
|
||||
- # Something went wrong, assume that the patchbot is not installed
|
||||
- echo >&2 "Error: cannot find installation path for sage_patchbot"
|
||||
|
|
@ -201,13 +201,10 @@ diff -up src/bin/sage.orig src/bin/sage
|
|||
- exit 1
|
||||
- fi
|
||||
-
|
||||
- # Try "python2.7", then "python2", then "python"
|
||||
- shopt -s execfail # Do not exit if "exec" fails
|
||||
- exec python2.7 -m sage_patchbot.patchbot "$@"
|
||||
- exec python2 -m sage_patchbot.patchbot "$@"
|
||||
- exec python -m sage_patchbot.patchbot "$@"
|
||||
- echo >&2 "Error: cannot find a suitable Python program."
|
||||
- echo >&2 "The SageMath patchbot requires a system Python installation."
|
||||
- exec python3 -m sage_patchbot.patchbot "$@"
|
||||
- echo >&2 "Error: cannot find a suitable Python 3 program."
|
||||
- echo >&2 "The SageMath patchbot requires a system Python 3 installation."
|
||||
- exit 127
|
||||
-fi
|
||||
-
|
||||
|
|
@ -274,6 +271,10 @@ diff -up src/bin/sage.orig src/bin/sage
|
|||
- fi
|
||||
- $MAKE SAGE_SPKG="sage-spkg $INSTALL_OPTIONS" "$PKG"
|
||||
- done
|
||||
-
|
||||
- echo "New packages may have been installed."
|
||||
- echo "Re-running configure and make in case any dependent packages need updating."
|
||||
- touch "$SAGE_ROOT/configure" && $MAKE all-build
|
||||
- exit 0
|
||||
-fi
|
||||
-
|
||||
|
|
@ -282,7 +283,7 @@ diff -up src/bin/sage.orig src/bin/sage
|
|||
# Report information about the Sage environment
|
||||
#####################################################################
|
||||
|
||||
@@ -424,35 +233,8 @@ if [ $# -gt 0 ]; then
|
||||
@@ -425,35 +233,8 @@ if [ $# -gt 0 ]; then
|
||||
fi
|
||||
|
||||
|
||||
|
|
@ -318,7 +319,7 @@ diff -up src/bin/sage.orig src/bin/sage
|
|||
if [ ! -d "$IPYTHONDIR" ]; then
|
||||
# make sure that $DOT_SAGE exists so that ipython will happily
|
||||
# create its config directories there. If DOT_SAGE doesn't
|
||||
@@ -463,20 +245,6 @@ sage_setup() {
|
||||
@@ -464,20 +245,6 @@ sage_setup() {
|
||||
}
|
||||
|
||||
|
||||
|
|
@ -339,7 +340,7 @@ diff -up src/bin/sage.orig src/bin/sage
|
|||
# Start an interactive Sage session, this function never returns.
|
||||
interactive_sage() {
|
||||
sage_setup
|
||||
@@ -560,16 +328,6 @@ if [ "$1" = '-lisp' -o "$1" = '--lisp' ]
|
||||
@@ -561,16 +328,6 @@ if [ "$1" = '-lisp' -o "$1" = '--lisp' ]
|
||||
exec ecl "$@"
|
||||
fi
|
||||
|
||||
|
|
@ -356,8 +357,8 @@ diff -up src/bin/sage.orig src/bin/sage
|
|||
if [ "$1" = '-maxima' -o "$1" = '--maxima' ]; then
|
||||
shift
|
||||
exec maxima "$@"
|
||||
@@ -595,11 +353,6 @@ if [ "$1" = '-pip' -o "$1" = '--pip' ];
|
||||
exec sage-python23 -m pip "$@"
|
||||
@@ -601,11 +358,6 @@ if [ "$1" = '--pip3' ]; then
|
||||
exec python3 -m pip "$@"
|
||||
fi
|
||||
|
||||
-if [ "$1" = '-fix-pkg-checksums' -o "$1" = '--fix-pkg-checksums' ]; then
|
||||
|
|
@ -368,7 +369,7 @@ diff -up src/bin/sage.orig src/bin/sage
|
|||
if [ "$1" = '-python' -o "$1" = '--python' ]; then
|
||||
shift
|
||||
if [ "$SAGE_PYTHON3" = 'yes' ]; then
|
||||
@@ -639,16 +392,6 @@ if [ "$1" = '-jupyter' -o "$1" = '--jupy
|
||||
@@ -645,16 +397,6 @@ if [ "$1" = '-jupyter' -o "$1" = '--jupy
|
||||
exec jupyter "$@"
|
||||
fi
|
||||
|
||||
|
|
@ -385,7 +386,7 @@ diff -up src/bin/sage.orig src/bin/sage
|
|||
if [ "$1" = '-sh' -o "$1" = '--sh' ]; then
|
||||
# AUTHORS:
|
||||
# - Carl Witty and William Stein: initial version
|
||||
@@ -768,20 +511,6 @@ EOF
|
||||
@@ -774,20 +516,6 @@ EOF
|
||||
fi
|
||||
|
||||
#####################################################################
|
||||
|
|
@ -406,7 +407,7 @@ diff -up src/bin/sage.orig src/bin/sage
|
|||
# File conversion
|
||||
#####################################################################
|
||||
|
||||
@@ -812,11 +541,6 @@ fi
|
||||
@@ -818,11 +546,6 @@ fi
|
||||
# Run Sage's versions of the standard Algebra/Geometry etc. software
|
||||
#####################################################################
|
||||
|
||||
|
|
@ -418,7 +419,7 @@ diff -up src/bin/sage.orig src/bin/sage
|
|||
if [[ "$1" =~ ^--notebook=.* || "$1" =~ ^-n=.* || "$1" =~ ^-notebook=.* ]] ; then
|
||||
sage-cleaner &>/dev/null &
|
||||
exec sage-notebook "$@"
|
||||
@@ -827,13 +551,6 @@ if [ "$1" = "-notebook" -o "$1" = '--not
|
||||
@@ -833,13 +556,6 @@ if [ "$1" = "-notebook" -o "$1" = '--not
|
||||
exec sage-notebook "$@"
|
||||
fi
|
||||
|
||||
|
|
@ -432,7 +433,7 @@ diff -up src/bin/sage.orig src/bin/sage
|
|||
if [ "$1" = "-inotebook" -o "$1" = '--inotebook' ]; then
|
||||
shift
|
||||
sage-cleaner &>/dev/null &
|
||||
@@ -852,34 +569,15 @@ if [ "$1" = '-grepdoc' -o "$1" = "--grep
|
||||
@@ -858,34 +574,15 @@ if [ "$1" = '-grepdoc' -o "$1" = "--grep
|
||||
exit 0
|
||||
fi
|
||||
|
||||
|
|
@ -469,7 +470,7 @@ diff -up src/bin/sage.orig src/bin/sage
|
|||
shift
|
||||
exec sage-runtests -p "$@"
|
||||
else
|
||||
@@ -888,10 +586,7 @@ if [ "$1" = '-t' -o "$1" = '-bt' -o "$1"
|
||||
@@ -894,10 +591,7 @@ if [ "$1" = '-t' -o "$1" = '-bt' -o "$1"
|
||||
fi
|
||||
fi
|
||||
|
||||
|
|
@ -481,7 +482,7 @@ diff -up src/bin/sage.orig src/bin/sage
|
|||
shift
|
||||
sage_setup
|
||||
export PYTHONIOENCODING="utf-8" # Fix encoding for doctests
|
||||
@@ -912,122 +607,6 @@ if [ "$1" = '-c' ]; then
|
||||
@@ -918,122 +612,6 @@ if [ "$1" = '-c' ]; then
|
||||
exec sage-eval "$@"
|
||||
fi
|
||||
|
||||
|
|
@ -604,7 +605,7 @@ diff -up src/bin/sage.orig src/bin/sage
|
|||
if [ "$1" = '-gdb' -o "$1" = "--gdb" ]; then
|
||||
shift
|
||||
sage_setup
|
||||
@@ -1077,12 +656,6 @@ if [ "$1" = '-callgrind' -o "$1" = "--ca
|
||||
@@ -1083,12 +661,6 @@ if [ "$1" = '-callgrind' -o "$1" = "--ca
|
||||
exec sage-callgrind "$@"
|
||||
fi
|
||||
|
||||
|
|
@ -618,9 +619,9 @@ diff -up src/bin/sage.orig src/bin/sage
|
|||
exec sage-startuptime.py "$@"
|
||||
fi
|
||||
diff -up src/bin/sage-runtests.orig src/bin/sage-runtests
|
||||
--- src/bin/sage-runtests.orig 2019-03-23 16:20:31.000000000 -0600
|
||||
+++ src/bin/sage-runtests 2019-04-08 11:40:35.881987545 -0600
|
||||
@@ -79,10 +79,6 @@ if __name__ == "__main__":
|
||||
--- src/bin/sage-runtests.orig 2019-06-26 14:41:04.000000000 -0600
|
||||
+++ src/bin/sage-runtests 2019-06-27 11:22:47.435227309 -0600
|
||||
@@ -95,10 +95,6 @@ if __name__ == "__main__":
|
||||
help="run doctests using Valgrind's cachegrind tool. The log "
|
||||
"files are named sage-cachegrind.PID and can be found in " +
|
||||
os.path.join(DOT_SAGE, "valgrind"))
|
||||
|
|
@ -632,8 +633,8 @@ diff -up src/bin/sage-runtests.orig src/bin/sage-runtests
|
|||
parser.add_option("-f", "--failed", action="store_true", default=False,
|
||||
help="doctest only those files that failed in the previous run")
|
||||
diff -up src/bin/sage-valgrind.orig src/bin/sage-valgrind
|
||||
--- src/bin/sage-valgrind.orig 2019-03-23 16:20:31.000000000 -0600
|
||||
+++ src/bin/sage-valgrind 2019-04-08 11:40:35.881987545 -0600
|
||||
--- src/bin/sage-valgrind.orig 2019-06-26 14:41:04.000000000 -0600
|
||||
+++ src/bin/sage-valgrind 2019-06-27 11:22:47.435227309 -0600
|
||||
@@ -1,16 +1,6 @@
|
||||
#!/usr/bin/env bash
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue