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.3

Browse source
This commit is contained in:
pcpa 2014-08-15 13:30:04 -03:00
parent 86aa0a3b29
commit 886f9fabef
22 changed files with 1019 additions and 1023 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-05-26 13:29:30.741773304 -0300
+++ src/bin/sage 2014-05-26 13:29:50.173774048 -0300
--- src/bin/sage.orig 2014-08-12 13:51:14.714911495 -0300
+++ src/bin/sage 2014-08-12 13:59:39.911930840 -0300
@@ -13,17 +13,14 @@ usage() {
echo " file.<sage|py|spyx> -- run given .sage, .py or .spyx files"
echo " -advanced -- list all command line options"
@ -30,10 +30,12 @@ diff -up src/bin/sage.orig src/bin/sage
echo " -v, -version -- print the Sage version"
exit 0
}
@@ -63,14 +56,14 @@ usage_advanced() {
@@ -61,16 +54,14 @@ 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 " -gthread, -qthread, -q4thread, -wthread, -pylab"
- echo " -- pass the option through to ipython"
+ echo " -testall [options] -- test all source files, docs, and examples. options"
+ echo " like -t"
echo " -v, -version -- print the Sage version"
@ -47,13 +49,13 @@ diff -up src/bin/sage.orig src/bin/sage
echo " -inotebook [...] -- start the *insecure* Sage notebook"
echo " -n, -notebook [...] -- start the Sage notebook (options are the same"
echo " as for the notebook command in Sage)"
@@ -87,13 +80,9 @@ usage_advanced() {
@@ -87,13 +78,8 @@ 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"
- echo " -kash [...] -- run Sage's Kash with given arguments"
- command -v kash &>/dev/null || \
echo " (not installed currently, run sage -i kash)"
- echo " (not installed currently, run sage -i kash)"
echo " -lisp [...] -- run Lisp interpreter included with Sage"
echo " -M2 [...] -- run Sage's Macaulay2 with given arguments"
- command -v M2 &>/dev/null || \
@ -61,7 +63,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"
@@ -107,80 +96,10 @@ usage_advanced() {
@@ -107,75 +93,10 @@ usage_advanced() {
echo
#### 1.......................26..................................................78
#### |.....................--.|...................................................|
@ -93,11 +95,6 @@ diff -up src/bin/sage.orig src/bin/sage
- echo "Building and testing the Sage library:"
- echo " -b [branch] -- build Sage library. If branch is given, switch to"
- echo " branch in devel/sage-branch and build that branch"
- echo " -sync-build -- delete old code and other files in the Sage library"
- echo " that have already been deleted from devel/sage but"
- echo " remain in the build directory. This is sometimes"
- echo " necessary because \`sage -b\` merely copies new or"
- echo " modified files to the target directory."
- echo " -ba [branch] -- same as -b and rebuild all Cython code"
- echo " -ba-force [branch] -- same as -ba, but don't query before rebuilding"
- echo " -br [branch] -- switch to, build, and run Sage given branch"
@ -142,13 +139,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"
@@ -200,17 +119,6 @@ usage_advanced() {
@@ -195,16 +116,6 @@ usage_advanced() {
echo
#### 1.......................26..................................................78
#### |.....................--.|...................................................|
- echo "Making Sage packages or distributions:"
- echo " -bdist VER -- build a binary distribution of Sage"
- echo " -combinat [...] -- run sage-combinat patch management script"
- 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"
@ -160,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"
@@ -224,9 +132,6 @@ usage_advanced() {
@@ -218,9 +129,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"
@ -170,10 +166,27 @@ 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'."
@@ -255,17 +160,6 @@ if [ "$1" = '-upgrade' -o "$1" = "--upgr
@@ -240,34 +148,6 @@ if [ "$1" = '--nodotsage' ]; then
exit $status
fi
-# Check for '--patchbot' before sourcing sage-env: patchbot needs
-# an unclobbered environment before testing unsafe tickets.
-if [ "$1" = '-patchbot' -o "$1" = "--patchbot" ]; then
- shift
- cd "$SAGE_ROOT"
- exec local/bin/patchbot/patchbot.py "$@"
-fi
-
-# Check for '--upgrade' before sourcing sage-env: the top-level "make"
-# should be run outside of the Sage shell, see #15517.
-if [ "$1" = '-upgrade' -o "$1" = "--upgrade" ]; then
- shift
- cd "$SAGE_ROOT"
- exec local/bin/sage-upgrade "$@"
-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
-# for scripts.
@ -188,8 +201,11 @@ diff -up src/bin/sage.orig src/bin/sage
if [ $# -gt 0 ]; then
if [ "$1" = '-h' -o "$1" = '-?' -o "$1" = '-help' -o "$1" = '--help' ]; then
usage
@@ -278,25 +172,11 @@ fi
@@ -277,28 +157,13 @@ if [ $# -gt 0 ]; then
fi
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).
@ -214,10 +230,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
@@ -307,20 +187,6 @@ sage_setup() {
@@ -308,21 +173,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
@ -235,19 +252,7 @@ diff -up src/bin/sage.orig src/bin/sage
# Start an interactive Sage session, this function never returns.
interactive_sage() {
sage_setup
@@ -370,11 +236,6 @@ if [ "$1" = '-axiom' -o "$1" = '--axiom'
exec axiom "$@"
fi
-if [ "$1" = '-combinat' -o "$1" = '--combinat' ]; then
- shift
- exec sage-combinat "$@"
-fi
-
if [ "$1" = '-gap' -o "$1" = '--gap' ]; then
shift
exec gap "$@"
@@ -387,7 +248,7 @@ fi
@@ -384,7 +234,7 @@ fi
if [ "$1" = '-singular' -o "$1" = '--singular' ]; then
shift
@ -256,7 +261,7 @@ diff -up src/bin/sage.orig src/bin/sage
fi
if [ "$1" = '-sqlite3' -o "$1" = '--sqlite3' ]; then
@@ -415,16 +276,6 @@ if [ "$1" = '-lisp' -o "$1" = '--lisp' ]
@@ -412,16 +262,6 @@ if [ "$1" = '-lisp' -o "$1" = '--lisp' ]
exec ecl "$@"
fi
@ -273,7 +278,7 @@ diff -up src/bin/sage.orig src/bin/sage
if [ "$1" = '-maxima' -o "$1" = '--maxima' ]; then
shift
exec maxima "$@"
@@ -584,20 +435,6 @@ EOF
@@ -581,20 +421,6 @@ EOF
fi
#####################################################################
@ -294,7 +299,7 @@ diff -up src/bin/sage.orig src/bin/sage
# File conversion
#####################################################################
@@ -612,36 +449,15 @@ if [ "$1" = '-rst2sws' -o "$1" = '--rst2
@@ -609,36 +435,15 @@ if [ "$1" = '-rst2sws' -o "$1" = '--rst2
fi
#####################################################################
@ -331,7 +336,7 @@ diff -up src/bin/sage.orig src/bin/sage
if [ "$1" = "-inotebook" -o "$1" = '--inotebook' ]; then
shift
sage-cleaner &>/dev/null &
@@ -660,58 +476,12 @@ if [ "$1" = '-grepdoc' -o "$1" = "--grep
@@ -657,40 +462,19 @@ if [ "$1" = '-grepdoc' -o "$1" = "--grep
exit 0
fi
@ -352,37 +357,12 @@ diff -up src/bin/sage.orig src/bin/sage
interactive_sage
fi
-if [ "$1" = '-ba' ]; then
- shift
- echo " *** WARNING ***"
- echo " You are about to rebuild the entire Sage library."
- echo " This will take a significant amount of time."
- echo " (Use --ba-force instead of -ba to skip this prompt.)"
- echo -n " Do you want to proceed? [y/n] "
- read CHOICE
- while [ "$CHOICE" != "y" -a "$CHOICE" != "n" ]; do
- echo -n " Choose one of y, n: "
- read CHOICE
- done
- if [ $CHOICE = 'n' ]; then
- exit 0
- fi
- build_sage -b "$@"
- exit $?
-fi
-
-if [ "$1" = '-ba-force' -o "$1" = '--ba-force' ]; then
-if [ "$1" = '-ba' -o "$1" = '-ba-force' -o "$1" = '--ba-force' ]; then
- shift
- build_sage -b "$@"
- exit $?
-fi
-
-if [ "$1" = '-sync-build' -o "$1" = '--sync-build' ]; then
- shift
- cd "$SAGE_ROOT"
- exec sage-sync-build.py "$@"
-fi
-
-if [ "$1" = '-t' -o "$1" = '-bt' -o "$1" = '-tp' -o "$1" = '-btp' ]; then
- if [ "$1" = '-bt' -o "$1" = '-btp' ]; then
- build_sage
@ -391,7 +371,15 @@ diff -up src/bin/sage.orig src/bin/sage
if [ ! -f "$DOT_SAGE"/init.sage ]; then
echo >&2 "init.sage does not exist ... creating"
touch "$DOT_SAGE"/init.sage
@@ -727,10 +497,7 @@ if [ "$1" = '-t' -o "$1" = '-bt' -o "$1"
fi
SAGE_BANNER="no"
sage_setup
- if [ "$1" = '-tp' -o "$1" = '-btp' ]; then
+ if [ "$1" = '-tp' ]; then
shift
exec sage-runtests -p "$@"
else
@@ -699,10 +483,7 @@ if [ "$1" = '-t' -o "$1" = '-bt' -o "$1"
fi
fi
@ -403,20 +391,7 @@ diff -up src/bin/sage.orig src/bin/sage
shift
SAGE_BANNER="no"
sage_setup
@@ -744,12 +511,6 @@ if [ "$1" = '-testall' -o "$1" = "--test
exec sage-runtests -a "$@"
fi
-if [ "$1" = '-patchbot' -o "$1" = "--patchbot" ]; then
- shift
- cd "$SAGE_ROOT"
- exec "$SAGE_LOCAL/bin/patchbot/patchbot.py" "$@"
-fi
-
if [ "$1" = '-c' ]; then
shift
SAGE_BANNER="no"
@@ -758,124 +519,6 @@ if [ "$1" = '-c' ]; then
@@ -724,132 +505,6 @@ if [ "$1" = '-c' ]; then
exec sage-eval "$@"
fi
@ -458,6 +433,14 @@ diff -up src/bin/sage.orig src/bin/sage
- exit 1
- fi
- done
- # Display a message if we actually installed something (using this
- # file, generated by sage-spkg, is a bit of a hack though)
- if [ -f "$SAGE_LOCAL/lib/sage-force-relocate.txt" ]; then
- echo
- echo "Warning: it might be needed to update the Sage library before"
- echo "installed packages work: you should run 'make' from \$SAGE_ROOT"
- echo "before running Sage."
- fi
- exit 0
-}
-
@ -541,7 +524,7 @@ diff -up src/bin/sage.orig src/bin/sage
if [ "$1" = '-gdb' -o "$1" = "--gdb" ]; then
shift
sage_setup
@@ -924,12 +567,6 @@ if [ "$1" = '-callgrind' -o "$1" = "--ca
@@ -898,21 +553,10 @@ if [ "$1" = '-callgrind' -o "$1" = "--ca
exec sage-callgrind "$@"
fi
@ -554,9 +537,18 @@ diff -up src/bin/sage.orig src/bin/sage
if [ "$1" = '-startuptime' -o "$1" = '--startuptime' ]; then
exec sage-startuptime.py "$@"
fi
-if [ "$1" = '-gthread' -o "$1" = '-qthread' -o "$1" = '-q4thread' -o "$1" = '-wthread' -o "$1" = '-pylab' ]; then
- # Intentionally no "shift" here
- interactive_sage "$@"
-fi
-
if [ "$1" = '-dev' -o "$1" = "--dev" ]; then
shift
exec sage-dev "$@"
diff -up src/bin/sage-runtests.orig src/bin/sage-runtests
--- src/bin/sage-runtests.orig 2014-05-26 13:29:46.150773894 -0300
+++ src/bin/sage-runtests 2014-05-26 13:29:50.174774048 -0300
--- src/bin/sage-runtests.orig 2014-08-12 14:00:18.705932326 -0300
+++ src/bin/sage-runtests 2014-08-12 14:00:31.543932818 -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 " +
@ -569,8 +561,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-05-26 13:29:46.152773894 -0300
+++ src/bin/sage-valgrind 2014-05-26 13:29:50.174774048 -0300
--- src/bin/sage-valgrind.orig 2014-08-12 14:00:41.666933205 -0300
+++ src/bin/sage-valgrind 2014-08-12 14:01:14.983934481 -0300
@@ -11,7 +11,7 @@ fi
LOG="$DOT_SAGE"/valgrind/sage-memcheck.%p
echo "Log file is $LOG"