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 6.5

Browse source
This commit is contained in:
pcpa 2015-04-03 20:10:52 -03:00
parent 48c70ab672
commit baae9bd2a8
23 changed files with 299 additions and 174 deletions
Download patch file Download diff file Expand all files Collapse all files

160
sagemath-scripts.patch
View file

@ -1,6 +1,6 @@
diff -up src/bin/sage.orig src/bin/sage
--- src/bin/sage.orig 2014-11-17 17:42:48.321925514 -0200
+++ src/bin/sage 2014-11-17 17:55:52.524955544 -0200
--- src/bin/sage.orig 2015-04-03 14:45:35.718351593 -0300
+++ src/bin/sage 2015-04-03 14:54:09.029371249 -0300
@@ -13,11 +13,9 @@ usage() {
echo " file.[sage|py|spyx] -- run given .sage, .py or .spyx file"
echo " -advanced -- list all command line options"
@ -32,16 +32,18 @@ diff -up src/bin/sage.orig src/bin/sage
echo " -v, -version -- print the Sage version"
exit 0
}
@@ -63,8 +56,6 @@ usage_advanced() {
@@ -63,10 +56,7 @@ 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"
- echo " -gthread, -qthread, -q4thread, -wthread, -pylab"
- echo " -- pass the option through to ipython"
echo " -v, -version -- print the Sage version"
- echo " -git-branch -- print the current git branch"
echo
@@ -75,8 +66,6 @@ usage_advanced() {
#### 1.......................26..................................................78
@@ -76,8 +66,6 @@ usage_advanced() {
echo " 'default', 'sagenb', and 'ipython'). See the output"
echo " of sage --notebook --help for more details and"
echo " examples of how to pass optional arguments"
@ -50,7 +52,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"
@@ -94,13 +83,9 @@ usage_advanced() {
@@ -95,13 +83,9 @@ usage_advanced() {
echo " -gp [...] -- run Sage's PARI/GP calculator with given arguments"
echo " -ipython [...] -- run Sage's IPython using the default environment (not"
echo " Sage), passing additional options to IPython"
@ -64,7 +66,7 @@ diff -up src/bin/sage.orig src/bin/sage
echo " -maxima [...] -- run Sage's Maxima with given arguments"
echo " -mwrank [...] -- run Sage's mwrank with given arguments"
echo " -python [...] -- run the Python interpreter"
@@ -114,74 +99,10 @@ usage_advanced() {
@@ -115,44 +99,7 @@ usage_advanced() {
echo
#### 1.......................26..................................................78
#### |.....................--.|...................................................|
@ -106,32 +108,19 @@ diff -up src/bin/sage.orig src/bin/sage
- echo " -- replace failing doctests with the actual output. With"
- echo " optional output_file: redirect there. With the --long"
- echo " option: include #long time tests."
- 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"
- echo " -t [options] <--all|files|dir>"
- echo " -- test examples in .py, .pyx, .sage, .tex or .rst files"
- echo " selected options:"
- echo " --long - include lines with the phrase 'long time'"
- echo " --verbose - print debugging output during the test"
- echo " --optional - controls which optional tests are run"
- echo " --randorder[=seed] - randomize order of tests"
+ echo "Testing the Sage library:"
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"
@@ -163,7 +110,6 @@ usage_advanced() {
echo " --verbose - print debugging output during the test"
echo " --optional - controls which optional tests are run"
echo " --randorder[=seed] - randomize order of tests"
- echo " --new - only test files modified since last commit"
- echo " --initial - only show the first failure per block"
- echo " --debug - drop into PDB after an unexpected error"
- echo " --failed - only test files that failed last test"
- echo " --sagenb - test all sagenb files"
- echo " --help - show all testing options"
- echo " --warn-long [timeout] - warning if doctest is slow"
- echo " -tp <N> [...] -- like -t above, but tests in parallel using N threads"
- echo " with 0 interpreted as a sensible default"
- echo " -testall [options] -- test all source files, docs, and examples. options"
- echo " like -t"
-
- echo
- #### 1.......................26..................................................78
- #### |.....................--.|...................................................|
echo "Documentation:"
echo " --initial - only show the first failure per block"
echo " --debug - drop into PDB after an unexpected error"
echo " --failed - only test files that failed last test"
@@ -182,7 +128,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,13 +128,12 @@ 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"
@@ -201,16 +122,6 @@ usage_advanced() {
@@ -202,15 +147,6 @@ usage_advanced() {
echo
#### 1.......................26..................................................78
#### |.....................--.|...................................................|
- echo "Making Sage packages or distributions:"
- echo " -bdist VER -- build a binary distribution of Sage"
- echo " -crap sage-ver.tar -- detect suspicious garbage in sage source tarball"
- echo " -pkg <dir> -- create Sage package dir.spkg from a given directory"
- echo " -pkg_nc <dir> -- as -pkg, but do not compress the package"
- echo " -sdist -- build a source distribution of Sage"
@ -156,7 +144,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"
@@ -224,9 +135,6 @@ usage_advanced() {
@@ -224,9 +160,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,7 +154,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'."
@@ -246,65 +154,14 @@ if [ "$1" = '--nodotsage' ]; then
@@ -246,34 +179,6 @@ if [ "$1" = '--nodotsage' ]; then
exit $status
fi
@ -198,19 +186,13 @@ 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
- fi
- if [ "$1" = "-advanced" -o "$1" = "--advanced" ]; then
- usage_advanced
- fi
-fi
-
if [ $# -gt 0 ]; then
if [ "$1" = '-h' -o "$1" = '-?' -o "$1" = '-help' -o "$1" = '--help' ]; then
usage
@@ -286,24 +191,11 @@ 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).
# Check that we're not in a source tarball which hasn't been built yet (#13561).
- if [ ! -d "$SAGE_LOCAL/lib/python/site-packages/sage" ]; then
- echo >&2 '************************************************************************'
- echo >&2 'It seems that you are attempting to run Sage from an unpacked source'
@ -232,10 +214,11 @@ 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
@@ -315,20 +172,6 @@ sage_setup() {
@@ -313,21 +205,6 @@ sage_setup() {
sage-cleaner &>/dev/null &
}
-
-# Check to see if the whole Sage install tree has moved. If so,
-# change various hardcoded paths. Skip this if we don't have write
-# access to $SAGE_LOCAL (e.g. when running as a different user) or
@ -253,7 +236,7 @@ diff -up src/bin/sage.orig src/bin/sage
# Start an interactive Sage session, this function never returns.
interactive_sage() {
sage_setup
@@ -390,7 +233,7 @@ fi
@@ -389,7 +266,7 @@ fi
if [ "$1" = '-singular' -o "$1" = '--singular' ]; then
shift
@ -262,10 +245,15 @@ diff -up src/bin/sage.orig src/bin/sage
fi
if [ "$1" = '-sqlite3' -o "$1" = '--sqlite3' ]; then
@@ -423,11 +266,6 @@ if [ "$1" = '-kash' -o "$1" = '--kash' ]
exec kash "$@"
@@ -417,16 +294,6 @@ if [ "$1" = '-lisp' -o "$1" = '--lisp' ]
exec ecl "$@"
fi
-if [ "$1" = '-kash' -o "$1" = '--kash' ]; then
- shift
- exec kash "$@"
-fi
-
-if [ "$1" = '-fixdoctests' -o "$1" = '--fixdoctests' ]; then
- shift
- exec sage-fixdoctests "$@"
@ -274,15 +262,11 @@ diff -up src/bin/sage.orig src/bin/sage
if [ "$1" = '-maxima' -o "$1" = '--maxima' ]; then
shift
exec maxima "$@"
@@ -448,15 +286,6 @@ if [ "$1" = '-scons' -o "$1" = '--scons'
@@ -447,11 +314,6 @@ if [ "$1" = '-scons' -o "$1" = '--scons'
exec scons "$@"
fi
-if [ "$1" = '-pip' -o "$1" = '--pip' ]; then
- if [ ! -x "$SAGE_LOCAL/bin/pip" ]; then
- echo "Pip is not installed. Run \"sage -i pip\" to install it."
- exit 1
- fi
- shift
- exec pip "$@"
-fi
@ -290,7 +274,24 @@ diff -up src/bin/sage.orig src/bin/sage
if [ "$1" = '-python' -o "$1" = '--python' ]; then
shift
exec python "$@"
@@ -596,20 +425,6 @@ EOF
@@ -467,16 +329,6 @@ if [ "$1" = '-ipython' -o "$1" = '--ipyt
exec ipython "$@"
fi
-if [ "$1" = '-git' -o "$1" = '--git' ]; then
- shift
- exec git "$@"
-fi
-
-if [ "$1" = '-git-branch' -o "$1" = '--git-branch' ]; then
- shift
- exec git --git-dir="$SAGE_ROOT"/.git rev-parse --abbrev-ref HEAD
-fi
-
if [ "$1" = '-sh' -o "$1" = '--sh' ]; then
# AUTHORS:
# - Carl Witty and William Stein: initial version
@@ -596,20 +448,6 @@ EOF
fi
#####################################################################
@ -311,19 +312,7 @@ diff -up src/bin/sage.orig src/bin/sage
# File conversion
#####################################################################
@@ -624,23 +439,9 @@ if [ "$1" = '-rst2sws' -o "$1" = '--rst2
fi
#####################################################################
-# Crap
-#####################################################################
-
-if [ "$1" = "-crap" -o "$1" = "--crap" ]; then
- shift
- exec sage-crap $@
-fi
-
-#####################################################################
@@ -627,11 +465,6 @@ fi
# Run Sage's versions of the standard Algebra/Geometry etc. software
#####################################################################
@ -332,11 +321,11 @@ diff -up src/bin/sage.orig src/bin/sage
- sage-build "$@" || exit $?
-}
-
if [[ "$1" =~ "--notebook="* || "$1" =~ "-n="* || "$1" =~ "-notebook="* ]]; then
if [[ "$1" =~ ^--notebook=.* || "$1" =~ ^-n=.* || "$1" =~ ^-notebook=.* ]] ; then
sage-cleaner &>/dev/null &
exec sage-notebook "$@"
@@ -652,13 +453,6 @@ if [ "$1" = "-notebook" -o "$1" = '--not
exec sage-notebook --notebook=default "$@"
@@ -642,13 +475,6 @@ if [ "$1" = "-notebook" -o "$1" = '--not
exec sage-notebook "$@"
fi
-if [ "$1" = "-bn" -o "$1" = "--build-and-notebook" ]; then
@ -349,7 +338,7 @@ diff -up src/bin/sage.orig src/bin/sage
if [ "$1" = "-inotebook" -o "$1" = '--inotebook' ]; then
shift
sage-cleaner &>/dev/null &
@@ -677,40 +471,19 @@ if [ "$1" = '-grepdoc' -o "$1" = "--grep
@@ -667,40 +493,19 @@ if [ "$1" = '-grepdoc' -o "$1" = "--grep
exit 0
fi
@ -392,7 +381,7 @@ diff -up src/bin/sage.orig src/bin/sage
shift
exec sage-runtests -p "$@"
else
@@ -719,10 +492,7 @@ if [ "$1" = '-t' -o "$1" = '-bt' -o "$1"
@@ -709,16 +514,6 @@ if [ "$1" = '-t' -o "$1" = '-bt' -o "$1"
fi
fi
@ -400,11 +389,16 @@ diff -up src/bin/sage.orig src/bin/sage
- if [ "$1" = '-btnew' ]; then
- build_sage
- fi
+if [ "$1" = '-tnew' ]; then
- shift
- SAGE_BANNER="no"
- sage_setup
- exec sage-runtests --new "$@"
-fi
-
if [ "$1" = '-testall' -o "$1" = "--testall" ]; then
shift
SAGE_BANNER="no"
sage_setup
@@ -744,136 +514,6 @@ if [ "$1" = '-c' ]; then
@@ -734,136 +529,6 @@ if [ "$1" = '-c' ]; then
exec sage-eval "$@"
fi
@ -541,7 +535,7 @@ diff -up src/bin/sage.orig src/bin/sage
if [ "$1" = '-gdb' -o "$1" = "--gdb" ]; then
shift
sage_setup
@@ -922,26 +562,10 @@ if [ "$1" = '-callgrind' -o "$1" = "--ca
@@ -912,26 +577,10 @@ if [ "$1" = '-callgrind' -o "$1" = "--ca
exec sage-callgrind "$@"
fi
@ -569,8 +563,8 @@ diff -up src/bin/sage.orig src/bin/sage
T=`echo "$1" | sed -e "s/.*\.//"`
if [ "$T" = "spkg" ]; then
diff -up src/bin/sage-runtests.orig src/bin/sage-runtests
--- src/bin/sage-runtests.orig 2014-11-17 17:43:03.195926083 -0200
+++ src/bin/sage-runtests 2014-11-17 17:48:39.236938952 -0200
--- src/bin/sage-runtests.orig 2015-04-03 14:45:48.439352080 -0300
+++ src/bin/sage-runtests 2015-04-03 14:54:20.773371699 -0300
@@ -54,10 +54,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 " +
@ -583,8 +577,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 2014-11-17 17:43:14.588926520 -0200
+++ src/bin/sage-valgrind 2014-11-17 17:48:18.884938172 -0200
--- src/bin/sage-valgrind.orig 2015-04-03 14:45:55.318352343 -0300
+++ src/bin/sage-valgrind 2015-04-03 14:54:41.525372494 -0300
@@ -1,16 +1,6 @@
#!/usr/bin/env bash