zyppe/sagemath
1
0
Fork 0
mirror of https://src.fedoraproject.org/rpms/sagemath.git synced 2025-04-22 11:45:56 -04:00
Code Issues Projects Releases Packages Wiki Activity

Update to sagemath 8.3 (bz 1612867).

Browse source 
Also:
- Drop -lrslib, -gap-hap, and -flask patches.
- Drop obsolete scriplets to fix F24 to F25 upgrade (bz 1594429 and 1618934).
- Drop obsolete mktexlsr invocations.
- Fix more Singular paths.
- Fix still more uses of /usr/bin/env.
- Drop disallow/dissallow fixup for cython; now fixed in cython itself.
This commit is contained in:
Jerry James 2018-09-23 08:28:54 -06:00
parent 3dc6dbb3c1
commit 1a0bd1afc6
24 changed files with 285 additions and 525 deletions
Download patch file Download diff file Expand all files Collapse all files

87
sagemath-scripts.patch
View file

@ -1,7 +1,7 @@
diff -up src/bin/sage.orig src/bin/sage
--- src/bin/sage.orig 2018-05-05 16:21:22.000000000 -0600
+++ src/bin/sage 2018-05-16 12:29:16.699989835 -0600
@@ -13,13 +13,10 @@ usage() {
--- src/bin/sage.orig 2018-08-03 05:10:08.000000000 -0600
+++ src/bin/sage 2018-08-29 08:32:06.325478480 -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"
echo " -c <cmd> -- Evaluates cmd as sage code"
@ -15,15 +15,15 @@ diff -up src/bin/sage.orig src/bin/sage
echo " -inotebook [...] -- start the *insecure* Sage notebook (deprecated)"
echo " -maxima [...] -- run Sage's Maxima with given arguments"
echo " -mwrank [...] -- run Sage's mwrank with given arguments"
@@ -27,7 +24,6 @@ usage() {
@@ -40,7 +37,6 @@ usage() {
echo " 'default', 'sagenb', 'jupyter', and 'export')"
echo " Current default is 'export' from sagenb to jupyter"
echo " -n, --notebook -- shortcut for --notebook=default"
- echo " -optional -- list all optional packages that can be installed"
echo " -python [...] -- run the Python 2 interpreter"
echo " -python [...] -- run the Python interpreter"
echo " -python2 [...] -- run the Python 2 interpreter"
echo " -python3 [...] -- run the Python 3 interpreter"
echo " -R [...] -- run Sage's R with given arguments"
@@ -44,10 +40,6 @@ usage() {
@@ -58,10 +54,6 @@ usage() {
echo " --optional - controls which optional tests are run"
echo " --sagenb - test all sagenb files"
echo " --help - show all testing options"
@ -34,7 +34,7 @@ diff -up src/bin/sage.orig src/bin/sage
echo " -v, -version -- display Sage version information"
exit 0
}
@@ -66,11 +58,8 @@ usage_advanced() {
@@ -81,11 +73,8 @@ usage_advanced() {
echo " -preparse <file.sage> -- preparse file.sage and produce corresponding file.sage.py"
echo " -q -- quiet; start with no banner"
echo " -root -- print the Sage root directory"
@ -46,7 +46,7 @@ diff -up src/bin/sage.orig src/bin/sage
echo
#### 1.......................26..................................................78
@@ -82,8 +71,6 @@ usage_advanced() {
@@ -97,8 +86,6 @@ usage_advanced() {
echo " See the output of sage --notebook --help"
echo " for more details and examples of how to pass"
echo " optional arguments"
@ -55,7 +55,7 @@ diff -up src/bin/sage.orig src/bin/sage
echo " -inotebook [...] -- start the *insecure* Sage notebook (deprecated)"
echo " -n, -notebook [...] -- start the default Sage notebook (options are the"
echo " same as for the notebook command in Sage). See the"
@@ -103,18 +90,11 @@ usage_advanced() {
@@ -118,18 +105,11 @@ usage_advanced() {
echo " -ipython [...] -- run Sage's IPython using the default environment (not"
echo " Sage), passing additional options to IPython"
echo " -ipython3 [...] -- same as above, but using Python 3"
@ -74,7 +74,7 @@ diff -up src/bin/sage.orig src/bin/sage
echo " -python [...] -- run the Python interpreter"
echo " -R [...] -- run Sage's R with given arguments"
echo " -scons [...] -- run Sage's scons"
@@ -126,55 +106,7 @@ usage_advanced() {
@@ -141,55 +121,7 @@ usage_advanced() {
echo
#### 1.......................26..................................................78
#### |.....................--.|...................................................|
@ -131,7 +131,7 @@ diff -up src/bin/sage.orig src/bin/sage
echo " -startuptime [module] -- display how long each component of Sage takes to"
echo " start up; optionally specify a module to get more"
echo " details about that particular module"
@@ -205,7 +137,6 @@ usage_advanced() {
@@ -220,7 +152,6 @@ usage_advanced() {
echo " -coverage <files> -- give info about doctest coverage of files"
echo " -coverageall -- give summary info about doctest coverage of all"
echo " files in the Sage library"
@ -139,7 +139,7 @@ diff -up src/bin/sage.orig src/bin/sage
echo " -search_src <string> -- search through all the Sage library code for string"
echo " -search_doc <string> -- search through the Sage documentation for string"
echo " -grep <string> -- same as -search_src"
@@ -227,16 +158,6 @@ usage_advanced() {
@@ -244,16 +175,6 @@ usage_advanced() {
echo
#### 1.......................26..................................................78
#### |.....................--.|...................................................|
@ -156,7 +156,7 @@ diff -up src/bin/sage.orig src/bin/sage
echo "Valgrind memory debugging:"
echo " -cachegrind -- run Sage using Valgrind's cachegrind tool. The log"
echo " files are named sage-cachegrind.PID can be found in"
@@ -250,9 +171,6 @@ usage_advanced() {
@@ -267,9 +188,6 @@ usage_advanced() {
echo " -memcheck -- run Sage using Valgrind's memcheck tool. The log"
echo " files are named sage-memcheck.PID can be found in"
echo " $DOT_SAGE"
@ -166,11 +166,10 @@ 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'."
@@ -261,128 +179,6 @@ usage_advanced() {
}
@@ -279,115 +197,6 @@ usage_advanced() {
-#####################################################################
#####################################################################
-# Special options to be processed without sage-env
-#####################################################################
-
@ -279,6 +278,14 @@ diff -up src/bin/sage.orig src/bin/sage
-fi
-
-
-#####################################################################
# Report information about the Sage environment
#####################################################################
@@ -416,35 +225,8 @@ if [ $# -gt 0 ]; then
fi
-#####################################################################
-# Source sage-env ($0 is the name of this "sage" script, so we can just
-# append -env to that). We redirect stdout to stderr, which is safer
@ -292,11 +299,6 @@ diff -up src/bin/sage.orig src/bin/sage
-fi
-
-
if [ $# -gt 0 ]; then
if [ "$1" = '-h' -o "$1" = '-?' -o "$1" = '-help' -o "$1" = '--help' ]; then
usage
@@ -394,20 +190,6 @@ fi
# Prepare for running Sage, either interactively or non-interactively.
sage_setup() {
- # Check that we're not in a source tarball which hasn't been built yet (#13561).
@ -316,7 +318,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
@@ -418,20 +200,6 @@ sage_setup() {
@@ -455,20 +237,6 @@ sage_setup() {
}
@ -337,7 +339,7 @@ diff -up src/bin/sage.orig src/bin/sage
# Start an interactive Sage session, this function never returns.
interactive_sage() {
sage_setup
@@ -536,16 +304,6 @@ if [ "$1" = '-lisp' -o "$1" = '--lisp' ]
@@ -552,16 +320,6 @@ if [ "$1" = '-lisp' -o "$1" = '--lisp' ]
exec ecl "$@"
fi
@ -354,7 +356,7 @@ diff -up src/bin/sage.orig src/bin/sage
if [ "$1" = '-maxima' -o "$1" = '--maxima' ]; then
shift
exec maxima "$@"
@@ -571,11 +329,6 @@ if [ "$1" = '-pip' -o "$1" = '--pip' ];
@@ -587,11 +345,6 @@ if [ "$1" = '-pip' -o "$1" = '--pip' ];
exec pip "$@"
fi
@ -365,8 +367,8 @@ diff -up src/bin/sage.orig src/bin/sage
-
if [ "$1" = '-python' -o "$1" = '--python' ]; then
shift
exec python "$@"
@@ -606,16 +359,6 @@ if [ "$1" = '-ipython3' -o "$1" = '--ipy
if [ "$SAGE_PYTHON3" = 'yes' ]; then
@@ -626,16 +379,6 @@ if [ "$1" = '-ipython3' -o "$1" = '--ipy
exec ipython3 "$@"
fi
@ -383,7 +385,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
@@ -735,20 +478,6 @@ EOF
@@ -755,20 +498,6 @@ EOF
fi
#####################################################################
@ -404,7 +406,7 @@ diff -up src/bin/sage.orig src/bin/sage
# File conversion
#####################################################################
@@ -771,11 +500,6 @@ fi
@@ -796,11 +525,6 @@ fi
# Run Sage's versions of the standard Algebra/Geometry etc. software
#####################################################################
@ -416,7 +418,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 "$@"
@@ -786,13 +510,6 @@ if [ "$1" = "-notebook" -o "$1" = '--not
@@ -811,13 +535,6 @@ if [ "$1" = "-notebook" -o "$1" = '--not
exec sage-notebook "$@"
fi
@ -430,7 +432,7 @@ diff -up src/bin/sage.orig src/bin/sage
if [ "$1" = "-inotebook" -o "$1" = '--inotebook' ]; then
shift
sage-cleaner &>/dev/null &
@@ -811,34 +528,15 @@ if [ "$1" = '-grepdoc' -o "$1" = "--grep
@@ -836,34 +553,15 @@ if [ "$1" = '-grepdoc' -o "$1" = "--grep
exit 0
fi
@ -467,7 +469,7 @@ diff -up src/bin/sage.orig src/bin/sage
shift
exec sage-runtests -p "$@"
else
@@ -847,10 +545,7 @@ if [ "$1" = '-t' -o "$1" = '-bt' -o "$1"
@@ -872,10 +570,7 @@ if [ "$1" = '-t' -o "$1" = '-bt' -o "$1"
fi
fi
@ -479,7 +481,7 @@ diff -up src/bin/sage.orig src/bin/sage
shift
sage_setup
export PYTHONIOENCODING="utf-8" # Fix encoding for doctests
@@ -871,119 +566,6 @@ if [ "$1" = '-c' ]; then
@@ -896,122 +591,6 @@ if [ "$1" = '-c' ]; then
exec sage-eval "$@"
fi
@ -545,7 +547,7 @@ diff -up src/bin/sage.orig src/bin/sage
-
-if [ "$1" = '-installed' -o "$1" = "--installed" ]; then
- shift
- exec sage-list-packages installed $@
- exec sage-list-packages all --installed-only $@
-fi
-
-if [ "$1" = '-p' ]; then
@ -592,14 +594,17 @@ diff -up src/bin/sage.orig src/bin/sage
-fi
-
-if [ "$1" = "-docbuild" -o "$1" = "--docbuild" ]; then
- # Redirect stdin from /dev/null. This helps with running TeX which
- # tends to ask interactive questions if something goes wrong. These
- # cause the build to hang. If stdin is /dev/null, TeX just aborts.
- shift
- exec sage-python23 -m "sage_setup.docbuild" "$@"
- exec sage-python23 -m sage_setup.docbuild "$@" </dev/null
-fi
-
if [ "$1" = '-gdb' -o "$1" = "--gdb" ]; then
shift
sage_setup
@@ -1033,12 +615,6 @@ if [ "$1" = '-callgrind' -o "$1" = "--ca
@@ -1061,12 +640,6 @@ if [ "$1" = '-callgrind' -o "$1" = "--ca
exec sage-callgrind "$@"
fi
@ -612,8 +617,9 @@ diff -up src/bin/sage.orig src/bin/sage
if [ "$1" = '-startuptime' -o "$1" = '--startuptime' ]; then
exec sage-startuptime.py "$@"
fi
--- src/bin/sage-runtests.orig 2018-05-05 16:21:22.000000000 -0600
+++ src/bin/sage-runtests 2018-05-16 12:16:10.707645467 -0600
diff -up src/bin/sage-runtests.orig src/bin/sage-runtests
--- src/bin/sage-runtests.orig 2018-08-03 05:10:08.000000000 -0600
+++ src/bin/sage-runtests 2018-08-29 08:27:37.703807389 -0600
@@ -67,10 +67,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 " +
@ -625,8 +631,9 @@ diff -up src/bin/sage.orig src/bin/sage
parser.add_option("-f", "--failed", action="store_true", default=False,
help="doctest only those files that failed in the previous run")
--- src/bin/sage-valgrind.orig 2018-05-05 16:21:22.000000000 -0600
+++ src/bin/sage-valgrind 2018-05-16 12:16:10.708645454 -0600
diff -up src/bin/sage-valgrind.orig src/bin/sage-valgrind
--- src/bin/sage-valgrind.orig 2018-08-03 05:10:08.000000000 -0600
+++ src/bin/sage-valgrind 2018-08-29 08:27:37.703807389 -0600
@@ -1,16 +1,6 @@
#!/usr/bin/env bash