Skip to content

Commit 97d834b

Browse files
committed
Replace 'sage-python' with 'python3' in various scripts for Meson
1 parent 32d441a commit 97d834b

File tree

8 files changed

+9
-14
lines changed

8 files changed

+9
-14
lines changed

src/bin/sage

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -944,7 +944,7 @@ fi
944944

945945
if [ "$1" = '-fixdistributions' -o "$1" = '--fixdistributions' ]; then
946946
shift
947-
exec sage-python -m sage.misc.package_dir "$@"
947+
exec python3 -m sage.misc.package_dir "$@"
948948
fi
949949

950950
if [ "$1" = '-tox' -o "$1" = '--tox' ]; then
@@ -1012,7 +1012,7 @@ if [ "$1" = "-docbuild" -o "$1" = "--docbuild" ]; then
10121012
# Redirect stdin from /dev/null. This helps with running TeX which
10131013
# tends to ask interactive questions if something goes wrong. These
10141014
# cause the build to hang. If stdin is /dev/null, TeX just aborts.
1015-
exec sage-python -m sage_docbuild "$@" </dev/null
1015+
exec python3 -m sage_docbuild "$@" </dev/null
10161016
fi
10171017

10181018
#####################################################################
@@ -1047,7 +1047,7 @@ if [ "$1" = '-gdb' -o "$1" = "--gdb" ]; then
10471047
gdb --eval-command "run" \
10481048
-args python "${SELF}-ipython" "$@" -i
10491049
else
1050-
sage_dir=$(sage-python -c 'import os, sage; print(os.path.dirname(sage.__file__))')
1050+
sage_dir=$(python3 -c 'import os, sage; print(os.path.dirname(sage.__file__))')
10511051
cygdb "$sage_dir" "$SAGE_SRC/sage" \
10521052
-- --eval-command "run" \
10531053
-args python "${SELF}-ipython" "$@" -i

src/bin/sage-fixdoctests

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#!/usr/bin/env sage-python
1+
#!/usr/bin/env python3
22
"""
33
Given the output of doctest and a file, adjust the doctests so they won't fail.
44

src/bin/sage-list-packages

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#!/usr/bin/env sage-python
1+
#!/usr/bin/env python3
22
r"""
33
Script to list the Sage packages
44

src/bin/sage-runtests

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
1-
#!/usr/bin/env sage-python
1+
#!/usr/bin/env python3
22

33
import sys
44

55
from sage.doctest.__main__ import main
66

7-
87
if __name__ == "__main__":
98
sys.exit(main())

src/bin/sage-startuptime.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#!/usr/bin/env sage-python
1+
#!/usr/bin/env python3
22

33
########################################################################
44
# Originally based on a script by Andrew Dalke:

src/doc/en/developer/packaging.rst

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -347,10 +347,6 @@ Likewise for :envvar:`CXXFLAGS`, :envvar:`FCFLAGS`, and :envvar:`F77FLAGS`.
347347
python3. You should use this if you are installing a Python package
348348
to make sure that the libraries are installed in the right place.
349349

350-
By the way, there is also a script ``sage-python``. This should be
351-
used at runtime, for example in scripts in ``SAGE_LOCAL/bin`` which
352-
expect Sage's Python to already be built.
353-
354350
Many packages currently do not separate the build and install steps and only
355351
provide a ``spkg-install.in`` file that does both. The separation is useful in
356352
particular for root-owned install hierarchies, where something like ``sudo``

src/sage/categories/crystals.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -923,7 +923,7 @@ def latex_file(self, filename):
923923
Export a file, suitable for pdflatex, to ``filename``.
924924
925925
This requires
926-
a proper installation of ``dot2tex`` in sage-python. For more
926+
a proper installation of ``dot2tex``. For more
927927
information see the documentation for ``self.latex()``.
928928
929929
EXAMPLES::

src/sage/ext_data/nbconvert/postprocess.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#!/usr/bin/env sage-python
1+
#!/usr/bin/env python3
22

33
r"""
44
This postprocess script fixes some issues with .rst files returned by nbconvert:

0 commit comments

Comments
 (0)