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

Browse source 
- Drop upstreamed -giac patch.
- Add -sagetex patch to fix a python indentation error.
- Add -rubiks patch to fix compilation of the rubiks library.
- Add -random patch to fix a non-random random bit generator.
- Drop pip3 workaround; the binary is now named just pip again.
This commit is contained in:
Jerry James 2019-04-28 15:12:00 -06:00
parent b6408b9313
commit 05337076b6
21 changed files with 898 additions and 442 deletions
Download patch file Download diff file Expand all files Collapse all files

56
sagemath-scripts.patch
View file

@ -1,6 +1,6 @@
diff -up src/bin/sage.orig src/bin/sage
--- src/bin/sage.orig 2018-12-22 16:37:06.000000000 -0700
+++ src/bin/sage 2019-01-16 09:42:10.064567132 -0700
--- src/bin/sage.orig 2019-03-23 16:20:31.000000000 -0600
+++ src/bin/sage 2019-04-08 11:42:38.305818631 -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"
@ -55,10 +55,10 @@ 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"
@@ -118,18 +105,11 @@ usage_advanced() {
echo " -ipython [...] -- run Sage's IPython using the default environment (not"
@@ -119,18 +106,11 @@ usage_advanced() {
echo " Sage), passing additional options to IPython"
echo " -ipython3 [...] -- same as above, but using Python 3"
echo " -jupyter [...] -- run Sage's Jupyter with given arguments"
- echo " -kash [...] -- run Sage's Kash with given arguments"
- command -v kash &>/dev/null || \
- echo " (not installed currently, run sage -i kash)"
@ -72,9 +72,9 @@ diff -up src/bin/sage.orig src/bin/sage
- command -v polymake &>/dev/null || \
- echo " (not installed currently, run sage -i polymake)"
echo " -python [...] -- run the Python interpreter"
echo " -R [...] -- run Sage's R with given arguments"
echo " -scons [...] -- run Sage's scons"
@@ -141,55 +121,7 @@ usage_advanced() {
echo " -python2 [...] -- run the Python 2 interpreter"
echo " -python3 [...] -- run the Python 3 interpreter"
@@ -144,55 +124,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"
@@ -223,7 +155,6 @@ usage_advanced() {
@@ -226,7 +158,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"
@@ -249,16 +180,6 @@ usage_advanced() {
@@ -252,16 +183,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"
@@ -272,9 +193,6 @@ usage_advanced() {
@@ -275,9 +196,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 +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'."
@@ -284,115 +202,6 @@ usage_advanced() {
@@ -287,115 +205,6 @@ usage_advanced() {
#####################################################################
@ -282,7 +282,7 @@ diff -up src/bin/sage.orig src/bin/sage
# Report information about the Sage environment
#####################################################################
@@ -421,35 +230,8 @@ if [ $# -gt 0 ]; then
@@ -424,35 +233,8 @@ if [ $# -gt 0 ]; then
fi
@ -318,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
@@ -460,20 +242,6 @@ sage_setup() {
@@ -463,20 +245,6 @@ sage_setup() {
}
@ -339,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
@@ -557,16 +325,6 @@ if [ "$1" = '-lisp' -o "$1" = '--lisp' ]
@@ -560,16 +328,6 @@ if [ "$1" = '-lisp' -o "$1" = '--lisp' ]
exec ecl "$@"
fi
@ -356,7 +356,7 @@ diff -up src/bin/sage.orig src/bin/sage
if [ "$1" = '-maxima' -o "$1" = '--maxima' ]; then
shift
exec maxima "$@"
@@ -592,11 +350,6 @@ if [ "$1" = '-pip' -o "$1" = '--pip' ];
@@ -595,11 +353,6 @@ if [ "$1" = '-pip' -o "$1" = '--pip' ];
exec sage-python23 -m pip "$@"
fi
@ -368,8 +368,8 @@ diff -up src/bin/sage.orig src/bin/sage
if [ "$1" = '-python' -o "$1" = '--python' ]; then
shift
if [ "$SAGE_PYTHON3" = 'yes' ]; then
@@ -631,16 +384,6 @@ if [ "$1" = '-ipython3' -o "$1" = '--ipy
exec ipython3 "$@"
@@ -639,16 +392,6 @@ if [ "$1" = '-jupyter' -o "$1" = '--jupy
exec jupyter "$@"
fi
-if [ "$1" = '-git' -o "$1" = '--git' ]; then
@ -385,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
@@ -760,20 +503,6 @@ EOF
@@ -768,20 +511,6 @@ EOF
fi
#####################################################################
@ -406,7 +406,7 @@ diff -up src/bin/sage.orig src/bin/sage
# File conversion
#####################################################################
@@ -804,11 +533,6 @@ fi
@@ -812,11 +541,6 @@ fi
# Run Sage's versions of the standard Algebra/Geometry etc. software
#####################################################################
@ -418,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 "$@"
@@ -819,13 +543,6 @@ if [ "$1" = "-notebook" -o "$1" = '--not
@@ -827,13 +551,6 @@ if [ "$1" = "-notebook" -o "$1" = '--not
exec sage-notebook "$@"
fi
@ -432,7 +432,7 @@ diff -up src/bin/sage.orig src/bin/sage
if [ "$1" = "-inotebook" -o "$1" = '--inotebook' ]; then
shift
sage-cleaner &>/dev/null &
@@ -844,34 +561,15 @@ if [ "$1" = '-grepdoc' -o "$1" = "--grep
@@ -852,34 +569,15 @@ if [ "$1" = '-grepdoc' -o "$1" = "--grep
exit 0
fi
@ -469,7 +469,7 @@ diff -up src/bin/sage.orig src/bin/sage
shift
exec sage-runtests -p "$@"
else
@@ -880,10 +578,7 @@ if [ "$1" = '-t' -o "$1" = '-bt' -o "$1"
@@ -888,10 +586,7 @@ if [ "$1" = '-t' -o "$1" = '-bt' -o "$1"
fi
fi
@ -481,7 +481,7 @@ diff -up src/bin/sage.orig src/bin/sage
shift
sage_setup
export PYTHONIOENCODING="utf-8" # Fix encoding for doctests
@@ -904,122 +599,6 @@ if [ "$1" = '-c' ]; then
@@ -912,122 +607,6 @@ if [ "$1" = '-c' ]; then
exec sage-eval "$@"
fi
@ -604,7 +604,7 @@ diff -up src/bin/sage.orig src/bin/sage
if [ "$1" = '-gdb' -o "$1" = "--gdb" ]; then
shift
sage_setup
@@ -1069,12 +648,6 @@ if [ "$1" = '-callgrind' -o "$1" = "--ca
@@ -1077,12 +656,6 @@ if [ "$1" = '-callgrind' -o "$1" = "--ca
exec sage-callgrind "$@"
fi
@ -618,8 +618,8 @@ 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 2018-12-22 16:37:06.000000000 -0700
+++ src/bin/sage-runtests 2019-01-16 09:42:10.065567115 -0700
--- 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__":
help="run doctests using Valgrind's cachegrind tool. The log "
"files are named sage-cachegrind.PID and can be found in " +
@ -632,8 +632,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 2018-12-22 16:37:06.000000000 -0700
+++ src/bin/sage-valgrind 2019-01-16 09:42:10.065567115 -0700
--- 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
@@ -1,16 +1,6 @@
#!/usr/bin/env bash