Merge pull request #17 from Mathics3/mathics-scanner-import-dup

Scanner import fixes (dup)

Author: rocky

.github/workflows/osx.yml

@@ -1,4 +1,4 @@
-name: Mathics (OSX)
+name: mathicsscript (OSX)
 
 on:
   push:
@@ -8,11 +8,11 @@ on:
 
 jobs:
   build:
-    runs-on: osx-latest
+    runs-on: macos-latest
     strategy:
       matrix:
         os: [macOS]
-        python-version: [3.6, 3.7, 3.8]
+        python-version: [3.6, 3.7, 3.8, 3.9]
     steps:
     - uses: actions/checkout@v2
     - name: Set up Python ${{ matrix.python-version }}
@@ -21,11 +21,15 @@ jobs:
         python-version: ${{ matrix.python-version }}
     - name: Install dependencies
       run: |
+        brew install llvm@9
         python -m pip install --upgrade pip
-    - name: Install Mathics Scanner
+        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: |
         make
-    - name: Test Mathics Scanner
+    - name: Test mathicsscript
       run: |
         pip install pytest
         make check

.github/workflows/ubuntu.yaml

@@ -8,10 +8,10 @@ on:
 
 jobs:
   build:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-20.04
     strategy:
       matrix:
-        python-version: [3.6, 3.7, 3.8]
+        python-version: [3.6, 3.7, 3.8, 3.9]
     steps:
     - uses: actions/checkout@v2
     - name: Set up Python ${{ matrix.python-version }}
@@ -22,6 +22,7 @@ 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: |

.github/workflows/ubuntu.yml

@@ -12,7 +12,7 @@
 
 from mathicsscript.format import format_output
 
-from mathics import replace_wl_with_unicode
+from mathics_scanner import replace_wl_with_plain_text
 from mathics.core.parser import FileLineFeeder
 from mathics.core.definitions import Definitions
 from mathics.core.expression import Symbol, SymbolTrue, SymbolFalse
@@ -327,7 +327,9 @@ def main(
                 current_pos = GNU_readline.get_current_history_length()
                 for pos in range(last_pos, current_pos - 1):
                     GNU_readline.remove_history_item(pos)
-                wl_input = replace_wl_with_unicode(source_code.rstrip())
+                wl_input = source_code.rstrip()
+                if unicode:
+                    wl_input = replace_wl_with_plain_text(wl_input)
                 GNU_readline.add_history(wl_input)
 
             if query is None: