From da05b3c2df4f2c98cef3ba392187505abd763dd4 Mon Sep 17 00:00:00 2001 From: Matthias Koeppe Date: Fri, 3 Jul 2020 23:00:11 -0700 Subject: [PATCH] src/bin/sage-maxima.lisp: Move inside package, install as package_data --- src/sage/interfaces/maxima.py | 6 +++--- src/{bin => sage/interfaces}/sage-maxima.lisp | 0 src/setup.py | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) rename src/{bin => sage/interfaces}/sage-maxima.lisp (100%) diff --git a/src/sage/interfaces/maxima.py b/src/sage/interfaces/maxima.py index 9ab456ed36f..cfb393edc7c 100644 --- a/src/sage/interfaces/maxima.py +++ b/src/sage/interfaces/maxima.py @@ -522,10 +522,10 @@ def __init__(self, script_subdirectory=None, logfile=None, server=None, # setting inchar and outchar.. eval_using_file_cutoff = 256 self.__eval_using_file_cutoff = eval_using_file_cutoff - STARTUP = os.path.join(SAGE_LOCAL,'bin','sage-maxima.lisp') + STARTUP = os.path.join(os.path.dirname(__file__), 'sage-maxima.lisp') if not os.path.exists(STARTUP): - raise RuntimeError('You must get the file local/bin/sage-maxima.lisp') + raise RuntimeError('You must get the file sage-maxima.lisp') #self.__init_code = init_code if init_code is None: @@ -553,7 +553,7 @@ def __init__(self, script_subdirectory=None, logfile=None, server=None, init_code = init_code, logfile = logfile, eval_using_file_cutoff=eval_using_file_cutoff) - # Must match what is in the file local/bin/sage-maxima.lisp + # Must match what is in the file sage-maxima.lisp self._display_prompt = '' # See #15440 for the importance of the trailing space self._output_prompt_re = re.compile(r'\(\%o[0-9]+\) ') diff --git a/src/bin/sage-maxima.lisp b/src/sage/interfaces/sage-maxima.lisp similarity index 100% rename from src/bin/sage-maxima.lisp rename to src/sage/interfaces/sage-maxima.lisp diff --git a/src/setup.py b/src/setup.py index 85a32a59626..7cc83362069 100755 --- a/src/setup.py +++ b/src/setup.py @@ -87,6 +87,7 @@ packages = python_packages, package_data = { 'sage.libs.gap': ['sage.gaprc'], + 'sage.interfaces': ['sage-maxima.lisp'], 'sage.doctest': ['tests/*'], 'sage': ['ext_data/*', 'ext_data/kenzo/*', @@ -148,7 +149,6 @@ 'bin/sage-inline-fortran', 'bin/sage-ipynb2rst', 'bin/sage-ipython', - 'bin/sage-maxima.lisp', 'bin/sage-native-execute', 'bin/sage-notebook', 'bin/sage-num-threads.py',