Merge pull request #33 from Mathics3/release-2.2.0

Adapt for Mathics 2.2.0 release

Author: rocky

.github/workflows/osx.yml

@@ -22,12 +22,13 @@ jobs:
     - name: Install dependencies
       run: |
         python -m pip install --upgrade pip
+        python -m pip install -e .
         # Can remove when next Mathics is released
-        python -m pip install -e git://github.com/mathics/Mathics#egg=Mathics3
+        # python -m pip install -e git://github.com/mathics/Mathics#egg=Mathics3
     - name: Install mathicsscript
       run: |
         make
     - name: Test mathicsscript
       run: |
-        pip install pytest
+        pip install -r requirements-dev.txt
         make check

.github/workflows/ubuntu.yml

@@ -22,8 +22,9 @@ 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 .
         # Can remove when next Mathics is released
-        python -m pip install -e git://github.com/mathics/Mathics#egg=Mathics3
+        # python -m pip install -e git://github.com/mathics/Mathics#egg=Mathics3
     - name: Install mathicsscript
       run: |
         make

.github/workflows/windows.yml

@@ -27,12 +27,11 @@ jobs:
         set LLVM_DIR="C:\Program Files\LLVM"
         pip install -e .
         # Can remove when next Mathics is released
-        python -m pip install -e git://github.com/mathics/Mathics#egg=Mathics3
+        # python -m pip install -e git://github.com/mathics/Mathics#egg=Mathics3
     - name: Install mathicsscript
       run: |
         python setup.py install
     - name: Test Mathics
       run: |
-        pip install pytest
         pip install -r requirements-dev.txt
         make check

NEWS.md

@@ -1,3 +1,18 @@
+2.2.0
+-----
+
+* There are now system setting and user settings. User settings take precedence over system settings.
+* String output is now shown in quotes to make it more distinguishable from symbol and unexpanded
+  expressssion output. This does not follow how `wolframscript` works. Option `strict-wl-output` wil
+  disable this.
+* Syntax and Highlighting is now done via the Python
+  [mathics-pygments](https://pypi.org/project/mathics-pygments/)
+  package.  I think you'll find colorization more complete and
+  useful. Expect more improvements as mathics-pygments improves.
+* Flag `--initfile` is now `--run` to have better conformance with `wolframscript`. In the future we hope
+  to support support conformance with `wolfram` if the` mathicsscript` (or code underneath) is called
+  using the name `mathics3`.
+
 2.1.2
 -----
 

mathicsscript/version.py

@@ -3,4 +3,4 @@
 # This file is suitable for sourcing inside POSIX shell as
 # well as importing into Python. That's why there is no
 # space around "=" below.
-__version__="2.1.3dev0"  # noqa
+__version__="2.2.0"  # noqa

requirements-dev.txt

@@ -0,0 +1 @@
+pytest

setup.py

@@ -73,7 +73,7 @@ def read(*rnames):
     },
     install_requires=[
         "Mathics_Scanner>=1.2.0",
-        "Mathics3 >= 2.1.0,<2.3.0",
+        "Mathics3 >= 2.2.0,<2.3.0",
         "click",
         "colorama",
         "columnize",