Administrivia:

* add 1st pytest - command completion
* add Makefile "clean" target
* blacken some files
* Don't do default pymodules

Author: rocky

Makefile

@@ -36,10 +36,7 @@ check-rst:
 
 #: Remove derived files
 clean:
-	rm mathics/*/*.so; \
-	for dir in mathics/doc ; do \
-	   ($(MAKE) -C "$$dir" clean); \
-	done;
+	@find . -name "*.pyc" -type f -delete
 
 #: Remove ChangeLog
 rmChangeLog:

README.rst

@@ -32,8 +32,8 @@ To install from git shources so that you run from the git source tree:
     $ make develop
 
 
-Why not IPython via Jupyter
----------------------------
+Why not IPython via Jupyter?
+----------------------------
 
 There will always be a need for simple terminal-like
 interaction. Although there is IPython support via Jupyter all of this

mathicsscript/__main__.py

@@ -14,10 +14,12 @@
 
 from pygments import highlight
 from pygments.lexers import MathematicaLexer
+
 mma_lexer = MathematicaLexer()
 
 from mathicsscript.version import __version__
 
+
 def format_output(obj, expr, format=None):
     if format is None:
         format = obj.format
@@ -28,7 +30,7 @@ def format_output(obj, expr, format=None):
     from mathics.core.expression import Expression, BoxError
 
     expr_type = expr.get_head_name()
-    if  expr_type == "System`MathMLForm":
+    if expr_type == "System`MathMLForm":
         format = "xml"
         leaves = expr.get_leaves()
         if len(leaves) == 1:
@@ -39,21 +41,17 @@ def format_output(obj, expr, format=None):
         if len(leaves) == 1:
             expr = leaves[0]
     elif expr_type == "System`Graphics":
-        result = Expression(
-            'StandardForm', expr).format(obj, 'System`MathMLForm')
+        result = Expression("StandardForm", expr).format(obj, "System`MathMLForm")
         ml_str = result.leaves[0].leaves[0]
         # FIXME: not quite right. Need to parse out strings
         display_svg(str(ml_str))
 
-
-    if format == 'text':
-        result = expr.format(obj, 'System`OutputForm')
-    elif format == 'xml':
-        result = Expression(
-            'StandardForm', expr).format(obj, 'System`MathMLForm')
-    elif format == 'tex':
-        result = Expression('StandardForm', expr).format(
-            obj, 'System`TeXForm')
+    if format == "text":
+        result = expr.format(obj, "System`OutputForm")
+    elif format == "xml":
+        result = Expression("StandardForm", expr).format(obj, "System`MathMLForm")
+    elif format == "tex":
+        result = Expression("StandardForm", expr).format(obj, "System`TeXForm")
     else:
         raise ValueError
 
@@ -63,10 +61,12 @@ def format_output(obj, expr, format=None):
         boxes = None
         if not hasattr(obj, "seen_box_error"):
             obj.seen_box_error = True
-            obj.message('General', 'notboxes',
-                         Expression('FullForm', result).evaluate(obj))
+            obj.message(
+                "General", "notboxes", Expression("FullForm", result).evaluate(obj)
+            )
     return boxes
 
+
 Evaluation.format_output = format_output
 
 
@@ -96,14 +96,14 @@ def out(self, out):
     "--persist",
     default=False,
     required=False,
-    is_flag = True,
+    is_flag=True,
     help="go to interactive shell after evaluating FILE or -e",
 )
 @click.option(
     "--quiet",
     "-q",
     default=False,
-    is_flag = True,
+    is_flag=True,
     required=False,
     help="don't print message at startup",
 )
@@ -148,25 +148,16 @@ def out(self, out):
     "--style",
     metavar="PYGMENTS-STYLE",
     type=str,
-    help=(
-        "Set pygments style. Use 'None' if you do not want any pygments styling."
-    ),
+    help=("Set pygments style. Use 'None' if you do not want any pygments styling."),
     required=False,
 )
 @click.option(
     "--pygments-tokens/--no-pygments-tokens",
     default=False,
-    help=(
-        "Show pygments tokenization of output."
-    ),
-    required=False,
-)
-@click.argument(
-    "file",
-    nargs=1,
-    type=click.Path(readable=True),
+    help=("Show pygments tokenization of output."),
     required=False,
 )
+@click.argument("file", nargs=1, type=click.Path(readable=True), required=False)
 def main(
     full_form,
     persist,
@@ -192,20 +183,11 @@ def main(
     if pyextensions:
         for ext in pyextensions:
             extension_modules.append(ext)
-    else:
-        from mathics.settings import default_pymathics_modules
 
-        extension_modules = default_pymathics_modules
-
-    definitions = Definitions(add_builtin=True, extension_modules=extension_modules)
+    definitions = Definitions(add_builtin=True)
     definitions.set_line_no(0)
 
-    shell = TerminalShell(
-        definitions,
-        style,
-        readline,
-        completion,
-    )
+    shell = TerminalShell(definitions, style, readline, completion)
 
     if initfile:
         feeder = FileLineFeeder(initfile)
@@ -215,7 +197,7 @@ def main(
                     shell.definitions,
                     output=TerminalOutput(shell),
                     catch_interrupt=False,
-                    format = "text",
+                    format="text",
                 )
                 query = evaluation.parse_feeder(feeder)
                 if query is None:
@@ -229,8 +211,9 @@ def main(
     if execute:
         for expr in execute:
             print(shell.get_in_prompt() + expr)
-            evaluation = Evaluation(shell.definitions,
-                                    output=TerminalOutput(shell), format = "text")
+            evaluation = Evaluation(
+                shell.definitions, output=TerminalOutput(shell), format="text"
+            )
             result = evaluation.parse_evaluate(expr, timeout=settings.TIMEOUT)
             shell.print_result(result, debug_pygments=pygments_tokens)
 
@@ -245,7 +228,7 @@ def main(
                     shell.definitions,
                     output=TerminalOutput(shell),
                     catch_interrupt=False,
-                    format = "text",
+                    format="text",
                 )
                 query = evaluation.parse_feeder(feeder)
                 if query is None:
@@ -272,24 +255,23 @@ def main(
 
     TeXForm = Symbol("System`TeXForm")
 
-
     while True:
         try:
             if shell.using_readline:
                 import readline as GNU_readline
+
                 last_pos = GNU_readline.get_current_history_length()
             evaluation = Evaluation(shell.definitions, output=TerminalOutput(shell))
             query, source_code = evaluation.parse_feeder_returning_code(shell)
             if shell.using_readline:
                 current_pos = GNU_readline.get_current_history_length()
-                for pos in range(last_pos, current_pos-1):
+                for pos in range(last_pos, current_pos - 1):
                     GNU_readline.remove_history_item(pos)
                 GNU_readline.add_history(source_code.rstrip())
 
             if query is None:
                 continue
 
-
             if hasattr(query, "head") and query.head == TeXForm:
                 output_style = "//TeXForm"
             else:

mathicsscript/termshell.py

@@ -13,6 +13,7 @@
 
 from pygments import highlight
 from mathicsscript.mmalexer import MathematicaLexer
+
 mma_lexer = MathematicaLexer()
 
 from pygments.formatters.terminal import TERMINAL_COLORS
@@ -47,7 +48,6 @@
     set_completer_delims,
     set_history_length,
     write_history_file,
-    # parse_and_bind,
 )
 
 try:
@@ -57,15 +57,13 @@
 
 HISTFILE = osp.expanduser("~/.mathicsscript_hist")
 
-RL_COMPLETER_DELIMS_WITH_BRACE = (
-    " \t\n_~!@#%^&*()-=+{]}|;:'\",<>/?"
-    )
-RL_COMPLETER_DELIMS = (
-    " \t\n_~!@#%^&*()-=+[{]}\\|;:'\",<>/?"
-    )
+RL_COMPLETER_DELIMS_WITH_BRACE = " \t\n_~!@#%^&*()-=+{]}|;:'\",<>/?"
+RL_COMPLETER_DELIMS = " \t\n_~!@#%^&*()-=+[{]}\\|;:'\",<>/?"
 
 
 from mathics.core.parser import LineFeeder, FileLineFeeder
+
+
 class TerminalShell(LineFeeder):
     def __init__(
         self, definitions, style: str, want_readline: bool, want_completion: bool
@@ -74,7 +72,7 @@ def __init__(
         self.input_encoding = locale.getpreferredencoding()
         self.lineno = 0
         self.terminal_formatter = None
-        self.history_length = definitions.get_config_value('$HistoryLength', HISTSIZE)
+        self.history_length = definitions.get_config_value("$HistoryLength", HISTSIZE)
 
         # Try importing readline to enable arrow keys support etc.
         self.using_readline = False
@@ -90,7 +88,6 @@ def __init__(
 
                     self.named_character_names = set(named_characters.keys())
 
-
                     # Make _ a delimiter, but not $ or `
                     # set_completer_delims(RL_COMPLETER_DELIMS)
                     set_completer_delims(RL_COMPLETER_DELIMS_WITH_BRACE)
@@ -118,7 +115,7 @@ def __init__(
         colorama_init()
         if style == "None":
             self.terminal_formatter = None
-            self.incolors =  self.outcolors = ["", "", "", ""]
+            self.incolors = self.outcolors = ["", "", "", ""]
         else:
             # self.incolors = ["\033[34m", "\033[1m", "\033[22m", "\033[39m"]
             self.incolors = ["\033[32m", "\033[1m", "\033[22m", "\033[39m"]
@@ -132,7 +129,9 @@ def __init__(
             try:
                 self.terminal_formatter = Terminal256Formatter(style=style)
             except ClassNotFound:
-                print("Pygments style name '%s' not found; No pygments style set" % style)
+                print(
+                    "Pygments style name '%s' not found; No pygments style set" % style
+                )
 
         self.definitions = definitions
 
@@ -148,15 +147,17 @@ def get_in_prompt(self):
 
     def get_out_prompt(self, output_style=""):
         line_number = self.get_last_line_number()
-        return "{2}Out[{3}{0}{4}]{1}= {5}".format(line_number, output_style, *self.outcolors)
+        return "{2}Out[{3}{0}{4}]{1}= {5}".format(
+            line_number, output_style, *self.outcolors
+        )
 
     def to_output(self, text):
         line_number = self.get_last_line_number()
         newline = "\n" + " " * len("Out[{0}]= ".format(line_number))
         return newline.join(text.splitlines())
 
     def out_callback(self, out):
-        print(self.to_output(str(out)))\
+        print(self.to_output(str(out)))
 
     def read_line(self, prompt):
         if self.using_readline:
@@ -168,6 +169,7 @@ def print_result(self, result, output_style="", debug_pygments=False):
             out_str = str(result.result)
             if self.terminal_formatter:  # pygmentize
                 from pygments import lex
+
                 if debug_pygments:
                     print(list(lex(out_str, mma_lexer)))
                 out_str = highlight(out_str, mma_lexer, self.terminal_formatter)
@@ -185,7 +187,9 @@ def complete_symbol_name(self, text, state):
         try:
             match = re.match(r"^(.*\\\[)([A-Z][a-z]*)$", text)
             if match:
-                return self._complete_named_characters(match.group(1), match.group(2), state)
+                return self._complete_named_characters(
+                    match.group(1), match.group(2), state
+                )
             return self._complete_symbol_name(text, state)
 
         except Exception as e:
@@ -196,10 +200,13 @@ def complete_symbol_name(self, text, state):
             raise
 
     def _complete_named_characters(self, prefix, text, state):
-        """prefix is the text after \[. Return a list of named character names.
-        """
+        """prefix is the text after \[. Return a list of named character names."""
         if state == 0:
-            self.completion_candidates = [prefix + name + "]" for name in self.named_character_names if name.startswith(text)]
+            self.completion_candidates = [
+                prefix + name + "]"
+                for name in self.named_character_names
+                if name.startswith(text)
+            ]
             # self.completion_candidates = self.get_completion_symbol_candidates(prefix, text)
         try:
             return self.completion_candidates[state]
@@ -221,8 +228,8 @@ def get_completion_candidates(self, text):
 
         brace_pos = text.rfind("[")
         if brace_pos >= 0:
-            suffix = text[brace_pos+1:]
-            prefix = text[:brace_pos+1]
+            suffix = text[brace_pos + 1 :]
+            prefix = text[: brace_pos + 1]
         else:
             prefix = ""
             suffix = text

setup.py

@@ -38,9 +38,22 @@ def read(*rnames):
     print("mathicsscript does not support Python %d.%d" % sys.version_info[:2])
     sys.exit(-1)
 
-# stores VERSION in the current namespace
+
+def get_srcdir():
+    filename = osp.normcase(osp.dirname(osp.abspath(__file__)))
+    return osp.realpath(filename)
+
+
+def read(*rnames):
+    return open(osp.join(get_srcdir(), *rnames)).read()
+
+
+# stores __version__ in the current namespace
 exec(compile(read("mathicsscript/version.py"), "mathicsscript/version.py", "exec"))
 
+long_description = read("README.rst") + "\n"
+exec(read("mathicsscript/version.py"))
+
 is_PyPy = platform.python_implementation() == "PyPy"
 
 setup(
@@ -51,8 +64,16 @@ def read(*rnames):
     packages=find_packages(),
     include_package_data=True,
     package_data={"": ["inputrc"]},
-    install_requires=["mathics >= 1.0", "click", "colorama", "pygments", "term-background >= 1.0.1"],
-    entry_points={"console_scripts": ["mathicsscript = mathicsscript.__main__:main",],},
+    install_requires=[
+        "mathics >= 1.0",
+        "click",
+        "colorama",
+        "pygments",
+        "term-background >= 1.0.1",
+    ],
+    entry_points={"console_scripts": ["mathicsscript = mathicsscript.__main__:main"]},
+    long_description=long_description,
+    long_description_content_type="text/x-rst",
     # don't pack Mathics in egg because of media files, etc.
     zip_safe=False,
     # metadata for upload to PyPI