mirror of
https://src.fedoraproject.org/rpms/sagemath.git
synced 2025-04-22 11:45:56 -04:00
Version 9.4.
- Drop upstreamed -eclib patch. - Drop unnecessary -readonly patch. - Unbundle ipywidgets. - Bundle memory_allocator for now.
This commit is contained in:
Jerry James
parent
db8b5a20c1
commit
916819fe9b
11 changed files with 390 additions and 482 deletions
|
|
@ -1,6 +1,6 @@
|
|||
diff -up src/bin/sage.orig src/bin/sage
|
||||
--- src/bin/sage.orig 2021-05-09 16:00:11.000000000 -0600
|
||||
+++ src/bin/sage 2021-05-28 11:16:43.936440802 -0600
|
||||
--- src/bin/sage.orig 2021-08-22 02:44:33.000000000 -0600
|
||||
+++ src/bin/sage 2021-08-26 13:09:38.262699484 -0600
|
||||
@@ -109,7 +109,6 @@ usage() {
|
||||
echo " --gap [...] -- run Sage's Gap with given arguments"
|
||||
echo " --gp [...] -- run Sage's PARI/GP calculator with given arguments"
|
||||
|
|
@ -9,7 +9,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 " --notebook=[...] -- start the Sage notebook (valid options are"
|
||||
@@ -159,111 +158,6 @@ if [ -f "${SELF}-env-config" ]; then
|
||||
@@ -160,111 +159,6 @@ if [ -f "${SELF}-env-config" ]; then
|
||||
fi
|
||||
|
||||
#####################################################################
|
||||
|
|
@ -121,12 +121,12 @@ diff -up src/bin/sage.orig src/bin/sage
|
|||
# Report information about the Sage environment
|
||||
#####################################################################
|
||||
|
||||
@@ -308,20 +202,6 @@ fi
|
||||
@@ -309,20 +203,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).
|
||||
- if [ ! -z "$SAGE_LOCAL" ] && [ ! -x "$SAGE_LOCAL/bin/sage" ]; then
|
||||
- if [ "$SAGE_SRC_ENV_CONFIG" = 1 ] && [ ! -z "$SAGE_VENV" ] && [ ! -x "$SAGE_VENV/bin/sage" ]; then
|
||||
- echo >&2 '************************************************************************'
|
||||
- echo >&2 'It seems that you are attempting to run Sage from an unpacked source'
|
||||
- echo >&2 'tarball, but you have not compiled it yet (or maybe the build has not'
|
||||
|
|
@ -142,7 +142,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
|
||||
@@ -332,20 +212,6 @@ sage_setup() {
|
||||
@@ -333,20 +213,6 @@ sage_setup() {
|
||||
}
|
||||
|
||||
|
||||
|
|
@ -153,7 +153,7 @@ diff -up src/bin/sage.orig src/bin/sage
|
|||
-maybe_sage_location()
|
||||
-{
|
||||
- if [ -n "$SAGE_LOCAL" -a -w "$SAGE_LOCAL" ]; then
|
||||
- if [ -x "$SAGE_LOCAL/bin/python" ] && [ -x "$SAGE_LOCAL/bin/sage-location" ]; then
|
||||
- if [ -x "$SAGE_VENV/bin/python" ] && [ -x "$SAGE_VENV/bin/sage-location" ]; then
|
||||
- sage-location || exit $?
|
||||
- fi
|
||||
- fi
|
||||
|
|
@ -163,7 +163,7 @@ diff -up src/bin/sage.orig src/bin/sage
|
|||
# Start an interactive Sage session, this function never returns.
|
||||
interactive_sage() {
|
||||
sage_setup
|
||||
@@ -383,8 +249,6 @@ usage_advanced() {
|
||||
@@ -384,8 +250,6 @@ usage_advanced() {
|
||||
echo " --nodotsage -- run Sage without using the user's"
|
||||
echo " .sage directory: create and use a temporary"
|
||||
echo " .sage directory instead."
|
||||
|
|
@ -172,7 +172,7 @@ diff -up src/bin/sage.orig src/bin/sage
|
|||
echo " --simple-prompt -- pass the option through to IPython: use"
|
||||
echo " this option with sage-shell mode in emacs"
|
||||
if [ -n "$SAGE_SRC" -a -d "$SAGE_SRC" ]; then
|
||||
@@ -418,18 +282,9 @@ usage_advanced() {
|
||||
@@ -419,18 +283,9 @@ usage_advanced() {
|
||||
echo " environment (not Sage), passing additional"
|
||||
echo " additional options to IPython"
|
||||
echo " --jupyter [...] -- run Sage's Jupyter with given arguments"
|
||||
|
|
@ -191,7 +191,7 @@ diff -up src/bin/sage.orig src/bin/sage
|
|||
echo " --python [...], --python3 [...]"
|
||||
echo " -- run the Python 3 interpreter"
|
||||
echo " -R [...] -- run Sage's R with the given arguments"
|
||||
@@ -678,11 +533,6 @@ if [ "$1" = '-lisp' -o "$1" = '--lisp' ]
|
||||
@@ -677,11 +532,6 @@ if [ "$1" = '-lisp' -o "$1" = '--lisp' ]
|
||||
exec ecl "$@"
|
||||
fi
|
||||
|
||||
|
|
@ -203,7 +203,7 @@ diff -up src/bin/sage.orig src/bin/sage
|
|||
if [ "$1" = '-maxima' -o "$1" = '--maxima' ]; then
|
||||
shift
|
||||
maxima_cmd=$(sage-config MAXIMA 2>/dev/null)
|
||||
@@ -707,11 +557,6 @@ if [ "$1" = '-R' -o "$1" = '--R' ]; then
|
||||
@@ -706,11 +556,6 @@ if [ "$1" = '-R' -o "$1" = '--R' ]; then
|
||||
exec R "$@"
|
||||
fi
|
||||
|
||||
|
|
@ -215,7 +215,7 @@ diff -up src/bin/sage.orig src/bin/sage
|
|||
#####################################################################
|
||||
# sage --sh and sage --buildsh
|
||||
#####################################################################
|
||||
@@ -883,11 +728,6 @@ fi
|
||||
@@ -877,11 +722,6 @@ fi
|
||||
# build_sage, sage -b, sage -br, etc. could be moved to
|
||||
# build/bin/sage-site. See #29111.
|
||||
|
||||
|
|
@ -227,7 +227,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 "$@"
|
||||
@@ -898,13 +738,6 @@ if [ "$1" = "-notebook" -o "$1" = '--not
|
||||
@@ -892,13 +732,6 @@ if [ "$1" = "-notebook" -o "$1" = '--not
|
||||
exec sage-notebook "$@"
|
||||
fi
|
||||
|
||||
|
|
@ -241,7 +241,7 @@ diff -up src/bin/sage.orig src/bin/sage
|
|||
if [ -n "$SAGE_SRC" -a -d "$SAGE_SRC" ]; then
|
||||
# Source inspection facilities, supported on sage-the-distribution and on distributions
|
||||
# that package the Sage sources.
|
||||
@@ -921,36 +754,11 @@ if [ -n "$SAGE_SRC" -a -d "$SAGE_SRC" ];
|
||||
@@ -915,46 +748,18 @@ if [ -n "$SAGE_SRC" -a -d "$SAGE_SRC" ];
|
||||
fi
|
||||
fi
|
||||
|
||||
|
|
@ -278,7 +278,6 @@ diff -up src/bin/sage.orig src/bin/sage
|
|||
exec-runtests() {
|
||||
sage_setup
|
||||
export PYTHONIOENCODING="utf-8" # Fix encoding for doctests
|
||||
@@ -967,10 +775,7 @@ exec-runtests() {
|
||||
exec sage-runtests "$@"
|
||||
}
|
||||
|
||||
|
|
@ -290,7 +289,7 @@ diff -up src/bin/sage.orig src/bin/sage
|
|||
if [ "$1" = '-tp' -o "$1" = '-btp' ]; then
|
||||
shift
|
||||
exec-runtests -p "$@"
|
||||
@@ -980,34 +785,11 @@ if [ "$1" = '-t' -o "$1" = '-bt' -o "$1"
|
||||
@@ -964,34 +769,11 @@ if [ "$1" = '-t' -o "$1" = '-bt' -o "$1"
|
||||
fi
|
||||
fi
|
||||
|
||||
|
|
@ -325,7 +324,7 @@ diff -up src/bin/sage.orig src/bin/sage
|
|||
if [ "$1" = '-startuptime' -o "$1" = '--startuptime' ]; then
|
||||
exec sage-startuptime.py "$@"
|
||||
fi
|
||||
@@ -1030,59 +812,11 @@ fi
|
||||
@@ -1014,59 +796,11 @@ fi
|
||||
# Creating and handling Sage distributions
|
||||
#####################################################################
|
||||
|
||||
|
|
@ -385,7 +384,7 @@ diff -up src/bin/sage.orig src/bin/sage
|
|||
#####################################################################
|
||||
# Debugging tools
|
||||
#####################################################################
|
||||
@@ -1126,12 +860,6 @@ if [ "$1" = '-callgrind' -o "$1" = "--ca
|
||||
@@ -1110,12 +844,6 @@ if [ "$1" = '-callgrind' -o "$1" = "--ca
|
||||
exec sage-callgrind "$@"
|
||||
fi
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue