Merge pull request #22 from Mathics3/use-mathics-scanner-release

Use released Mathics-Scanner

Author: rocky

.github/workflows/osx.yml

@@ -24,7 +24,6 @@ jobs:
         brew install llvm@9
         python -m pip install --upgrade pip
         LLVM_CONFIG=/usr/local/Cellar/llvm@9/9.0.1_2/bin/llvm-config pip install llvmlite
-        python -m pip install -e git://github.com/Mathics3/mathics-scanner.git#egg=Mathics_Scanner
         python -m pip install -e git://github.com/mathics/Mathics.git#egg=Mathics3
     - name: Install mathicsscript
       run: |

.github/workflows/ubuntu.yml

@@ -22,7 +22,6 @@ jobs:
       run: |
         sudo apt-get update -qq && sudo apt-get install -qq liblapack-dev llvm-dev
         python -m pip install --upgrade pip
-        python -m pip install -e git://github.com/Mathics3/mathics-scanner.git#egg=Mathics_Scanner
         python -m pip install -e git://github.com/mathics/Mathics#egg=Mathics3
     - name: Install mathicsscript
       run: |

mathicsscript/__main__.py

@@ -13,7 +13,7 @@
 from mathicsscript.format import format_output
 
 from mathics_scanner import replace_wl_with_plain_text
-from mathics.core.parser import FileLineFeeder
+from mathics.core.parser import MathicsFileLineFeeder
 from mathics.core.definitions import Definitions
 from mathics.core.expression import Symbol, SymbolTrue, SymbolFalse
 from mathics.core.evaluation import Evaluation, Output
@@ -64,7 +64,7 @@ def load_settings(shell):
     if settings_file == "":
         return
     with open(settings_file, "r") as src:
-        feeder = FileLineFeeder(src)
+        feeder = MathicsFileLineFeeder(src)
         try:
             while not feeder.empty():
                 evaluation = Evaluation(

mathicsscript/termshell.py

@@ -76,7 +76,7 @@
 RL_COMPLETER_DELIMS = " \t\n_~!@#%^&*()-=+[{]}\\|;:'\",<>/?"
 
 
-from mathics.core.parser import LineFeeder
+from mathics.core.parser import MathicsLineFeeder
 
 
 def is_pygments_style(style):
@@ -92,7 +92,7 @@ def __init__(self, line):
         self.line = line
 
 
-class TerminalShell(LineFeeder):
+class TerminalShell(MathicsLineFeeder):
     def __init__(
         self,
         definitions,

setup.py

@@ -67,6 +67,7 @@ def read(*rnames):
         "": ["inputrc", "inputrc-no-unicode", "inputrc-unicode", "settings/settings.m"]
     },
     install_requires=[
+        "Mathics_Scanner>=1.0.0,<1.1.0",
         "Mathics3 >= 2.0.0dev",
         "click",
         "colorama",

test/helper.py

@@ -1,4 +1,3 @@
-from mathics.core.parser import parse, SingleLineFeeder
 from mathics.core.definitions import Definitions
 from mathics.core.evaluation import Evaluation
 from mathics.session import MathicsSession