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

Browse source 
Also:
- Create the sagemath-data-combinatorial_designs subpackage.
- Create the sagemath-notebook-export subpackage.
- Unbundle the LaTeX makecmds style.
- Install LaTeX style files in a more canonical place.
This commit is contained in:
Jerry James 2018-06-03 07:13:30 -06:00
parent b46cd4759a
commit 925e91dade
28 changed files with 743 additions and 795 deletions
Download patch file Download diff file Expand all files Collapse all files

160
sagemath-scripts.patch
View file

@ -1,24 +1,7 @@
diff -up src/bin/sage.orig src/bin/sage
--- src/bin/sage.orig 2017-11-08 06:04:08.687887432 -0500
+++ src/bin/sage 2017-11-08 06:10:52.452902893 -0500
@@ -1,5 +1,16 @@
#!/usr/bin/env bash
+# Display the Sage startup banner, used in src/bin/sage
+sage_banner() {
+ if [ "$SAGE_BANNER" = "bare" ]; then
+ cat "$SAGE_ROOT/VERSION.txt"
+ elif [ "$SAGE_BANNER" != "no" ]; then
+ # This file sage-banner is not yet available during the build
+ # of Sage, so we ignore errors from cat.
+ cat "$SAGE_LOCAL/bin/sage-banner" 2>/dev/null
+ fi
+}
+
help_banner() {
sage_banner | grep -v 'Type'
echo
@@ -13,13 +24,10 @@ usage() {
--- 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() {
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"
@ -32,7 +15,7 @@ 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 +35,6 @@ usage() {
@@ -27,7 +24,6 @@ usage() {
echo " 'default', 'sagenb', 'jupyter', and 'export')"
echo " Current default is 'export' from sagenb to jupyter"
echo " -n, --notebook -- shortcut for --notebook=default"
@ -40,7 +23,7 @@ diff -up src/bin/sage.orig src/bin/sage
echo " -python [...] -- run the Python 2 interpreter"
echo " -python3 [...] -- run the Python 3 interpreter"
echo " -R [...] -- run Sage's R with given arguments"
@@ -44,10 +51,6 @@ usage() {
@@ -44,10 +40,6 @@ usage() {
echo " --optional - controls which optional tests are run"
echo " --sagenb - test all sagenb files"
echo " --help - show all testing options"
@ -51,7 +34,7 @@ diff -up src/bin/sage.orig src/bin/sage
echo " -v, -version -- display Sage version information"
exit 0
}
@@ -66,11 +69,8 @@ usage_advanced() {
@@ -66,11 +58,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"
@ -63,7 +46,7 @@ diff -up src/bin/sage.orig src/bin/sage
echo
#### 1.......................26..................................................78
@@ -82,8 +82,6 @@ usage_advanced() {
@@ -82,8 +71,6 @@ usage_advanced() {
echo " See the output of sage --notebook --help"
echo " for more details and examples of how to pass"
echo " optional arguments"
@ -72,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"
@@ -102,18 +100,11 @@ usage_advanced() {
echo " -gp [...] -- run Sage's PARI/GP calculator with given arguments"
@@ -103,18 +90,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"
- echo " -kash [...] -- run Sage's Kash with given arguments"
- command -v kash &>/dev/null || \
- echo " (not installed currently, run sage -i kash)"
@ -91,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"
@@ -125,55 +116,7 @@ usage_advanced() {
@@ -126,55 +106,7 @@ usage_advanced() {
echo
#### 1.......................26..................................................78
#### |.....................--.|...................................................|
@ -148,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"
@@ -203,7 +146,6 @@ usage_advanced() {
@@ -205,7 +137,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"
@ -156,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"
@@ -225,16 +167,6 @@ usage_advanced() {
@@ -227,16 +158,6 @@ usage_advanced() {
echo
#### 1.......................26..................................................78
#### |.....................--.|...................................................|
@ -173,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"
@@ -248,9 +180,6 @@ usage_advanced() {
@@ -250,9 +171,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"
@ -183,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'."
@@ -259,121 +188,6 @@ usage_advanced() {
@@ -261,128 +179,6 @@ usage_advanced() {
}
@ -251,40 +234,47 @@ diff -up src/bin/sage.orig src/bin/sage
- fi
-
- set -e
-
- cd "$SAGE_ROOT"
-
- # First of all, make sure that the toolchain is up-to-date
- # (which is a dependency of every package)
- ./sage --location
- $MAKE all-toolchain
- echo
-
- # Parse options
- PACKAGES="" # Packages to install
- INSTALL_OPTIONS="" # Options to sage-spkg
- for PKG in "$@"
- do
- case "$PKG" in
- for OPT in "$@"; do
- case "$OPT" in
- -info|--info)
- echo >&2 "Error: 'sage -i $PKG <package>' is no longer supported, use 'sage --info <package>' instead."
- echo >&2 "Error: 'sage -i $OPT <package>' is no longer supported, use 'sage --info <package>' instead."
- exit 2;;
- -f) FORCE_INSTALL=yes;;
- -*) INSTALL_OPTIONS="$INSTALL_OPTIONS $PKG";;
- *)
- # First check that $PKG is actually a Makefile target
- if ! grep "^$PKG: " build/make/Makefile >/dev/null; then
- echo >&2 "Error: package '$PKG' not found"
- echo >&2 "Assuming it is an old-style package... (this is deprecated: use -p instead of -i to install old-style packages)"
- echo >&2
- sleep 5
- ./sage -p $INSTALL_OPTIONS "$PKG"
- else
- if [ x$FORCE_INSTALL = xyes ]; then
- $MAKE "$PKG-clean"
- fi
- $MAKE SAGE_SPKG="sage-spkg $INSTALL_OPTIONS" "$PKG"
- fi;;
- -*) INSTALL_OPTIONS="$INSTALL_OPTIONS $OPT";;
- *) PACKAGES="$PACKAGES $OPT";;
- esac
- done
-
- # First, uninstall the packages if -f was given
- if [ "$FORCE_INSTALL" = yes ]; then
- for PKG in $PACKAGES; do
- $MAKE "$PKG-clean" || true # Ignore errors
- done
- fi
-
- # Make sure that the toolchain is up-to-date
- # (which is a dependency of every package)
- $MAKE all-toolchain
-
- ALL_TARGETS="$($MAKE list 2>/dev/null)"
-
- # Now install the packages
- for PKG in $PACKAGES; do
- echo
- # First check that $PKG is actually a Makefile target
- # See https://trac.sagemath.org/ticket/25078
- if ! echo "$ALL_TARGETS" | grep "^${PKG}$" >/dev/null; then
- echo >&2 "Error: package '$PKG' not found"
- echo >&2 "Note: if it is an old-style package, use -p instead of -i to install it"
- exit 1
- fi
- $MAKE SAGE_SPKG="sage-spkg $INSTALL_OPTIONS" "$PKG"
- done
- exit 0
-fi
-
@ -305,11 +295,8 @@ 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
@@ -383,25 +197,12 @@ if [ $# -gt 0 ]; then
fi
fi
@@ -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).
@ -324,15 +311,12 @@ diff -up src/bin/sage.orig src/bin/sage
- exit 1
- fi
-
# Display the startup banner (unless SAGE_BANNER is explicitly "no")
sage_banner
- maybe_sage_location
-
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
@@ -412,20 +213,6 @@ sage_setup() {
@@ -418,20 +200,6 @@ sage_setup() {
}
@ -353,7 +337,7 @@ diff -up src/bin/sage.orig src/bin/sage
# Start an interactive Sage session, this function never returns.
interactive_sage() {
sage_setup
@@ -530,16 +317,6 @@ if [ "$1" = '-lisp' -o "$1" = '--lisp' ]
@@ -536,16 +304,6 @@ if [ "$1" = '-lisp' -o "$1" = '--lisp' ]
exec ecl "$@"
fi
@ -370,7 +354,7 @@ diff -up src/bin/sage.orig src/bin/sage
if [ "$1" = '-maxima' -o "$1" = '--maxima' ]; then
shift
exec maxima "$@"
@@ -565,11 +342,6 @@ if [ "$1" = '-pip' -o "$1" = '--pip' ];
@@ -571,11 +329,6 @@ if [ "$1" = '-pip' -o "$1" = '--pip' ];
exec pip "$@"
fi
@ -382,8 +366,8 @@ diff -up src/bin/sage.orig src/bin/sage
if [ "$1" = '-python' -o "$1" = '--python' ]; then
shift
exec python "$@"
@@ -595,16 +367,6 @@ if [ "$1" = '-ipython' -o "$1" = '--ipyt
exec ipython "$@"
@@ -606,16 +359,6 @@ if [ "$1" = '-ipython3' -o "$1" = '--ipy
exec ipython3 "$@"
fi
-if [ "$1" = '-git' -o "$1" = '--git' ]; then
@ -399,7 +383,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
@@ -724,20 +486,6 @@ EOF
@@ -735,20 +478,6 @@ EOF
fi
#####################################################################
@ -420,7 +404,7 @@ diff -up src/bin/sage.orig src/bin/sage
# File conversion
#####################################################################
@@ -760,11 +508,6 @@ fi
@@ -771,11 +500,6 @@ fi
# Run Sage's versions of the standard Algebra/Geometry etc. software
#####################################################################
@ -432,7 +416,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 "$@"
@@ -775,13 +518,6 @@ if [ "$1" = "-notebook" -o "$1" = '--not
@@ -786,13 +510,6 @@ if [ "$1" = "-notebook" -o "$1" = '--not
exec sage-notebook "$@"
fi
@ -446,8 +430,8 @@ diff -up src/bin/sage.orig src/bin/sage
if [ "$1" = "-inotebook" -o "$1" = '--inotebook' ]; then
shift
sage-cleaner &>/dev/null &
@@ -800,34 +536,15 @@ if [ "$1" = '-grepdoc' -o "$1" = "--grep
exit 0
@@ -811,34 +528,15 @@ if [ "$1" = '-grepdoc' -o "$1" = "--grep
exit 0
fi
-if [ "$1" = '-b' ]; then
@ -461,8 +445,8 @@ diff -up src/bin/sage.orig src/bin/sage
-fi
-
if [ "$1" = '-r' ]; then
shift
interactive_sage
shift
interactive_sage
fi
-if [ "$1" = '-ba' -o "$1" = '-ba-force' -o "$1" = '--ba-force' ]; then
@ -476,14 +460,14 @@ diff -up src/bin/sage.orig src/bin/sage
- build_sage
- fi
+if [ "$1" = '-t' -o "$1" = '-tp' ]; then
SAGE_BANNER=no sage_setup
sage_setup
export PYTHONIOENCODING="utf-8" # Fix encoding for doctests
- if [ "$1" = '-tp' -o "$1" = '-btp' ]; then
+ if [ "$1" = '-tp' ]; then
shift
exec sage-runtests -p "$@"
else
@@ -836,10 +553,7 @@ if [ "$1" = '-t' -o "$1" = '-bt' -o "$1"
@@ -847,10 +545,7 @@ if [ "$1" = '-t' -o "$1" = '-bt' -o "$1"
fi
fi
@ -493,9 +477,9 @@ diff -up src/bin/sage.orig src/bin/sage
- fi
+if [ "$1" = '-tnew' ]; then
shift
SAGE_BANNER=no sage_setup
sage_setup
export PYTHONIOENCODING="utf-8" # Fix encoding for doctests
@@ -860,119 +574,6 @@ if [ "$1" = '-c' ]; then
@@ -871,119 +566,6 @@ if [ "$1" = '-c' ]; then
exec sage-eval "$@"
fi
@ -609,13 +593,13 @@ diff -up src/bin/sage.orig src/bin/sage
-
-if [ "$1" = "-docbuild" -o "$1" = "--docbuild" ]; then
- shift
- exec python -m "sage_setup.docbuild" "$@"
- exec sage-python23 -m "sage_setup.docbuild" "$@"
-fi
-
if [ "$1" = '-gdb' -o "$1" = "--gdb" ]; then
shift
sage_setup
@@ -1023,12 +624,6 @@ if [ "$1" = '-callgrind' -o "$1" = "--ca
@@ -1033,12 +615,6 @@ if [ "$1" = '-callgrind' -o "$1" = "--ca
exec sage-callgrind "$@"
fi
@ -628,10 +612,9 @@ diff -up src/bin/sage.orig src/bin/sage
if [ "$1" = '-startuptime' -o "$1" = '--startuptime' ]; then
exec sage-startuptime.py "$@"
fi
diff -up src/bin/sage-runtests.orig src/bin/sage-runtests
--- src/bin/sage-runtests.orig 2017-11-08 06:11:02.679903285 -0500
+++ src/bin/sage-runtests 2017-11-08 06:11:18.876903905 -0500
@@ -64,10 +64,6 @@ if __name__ == "__main__":
--- 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
@@ -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 " +
os.path.join(DOT_SAGE, "valgrind"))
@ -642,9 +625,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 2017-11-08 06:11:27.655904241 -0500
+++ src/bin/sage-valgrind 2017-11-08 06:11:40.964904751 -0500
--- 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
@@ -1,16 +1,6 @@
#!/usr/bin/env bash