Merge branch 'master' into addCatchThrow

Author: rocky

.github/workflows/basic.yml

@@ -1,4 +1,4 @@
-name: Mathics (basic)
+name: Mathics (ubuntu)
 
 on:
   push:
@@ -29,4 +29,4 @@ jobs:
     - name: Test Mathics
       run: |
         pip install pytest pexpect
-        make check
+        make -j3 check

.github/workflows/osx.yml

@@ -0,0 +1,33 @@
+name: Mathics (OSX)
+
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+    branches: [ master ]
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        os: [macOS]
+        python-version: [3.6, 3.7, 3.8]
+    steps:
+    - uses: actions/checkout@v2
+    - name: Set up Python ${{ matrix.python-version }}
+      uses: actions/setup-python@v2
+      with:
+        python-version: ${{ matrix.python-version }}
+    - name: Install dependencies
+      run: |
+        # brew install liblapack-dev llvm-dev
+        python -m pip install --upgrade pip
+    - name: Install Mathics
+      run: |
+        sed -i "s/'sympy==[0-9]\.[0-9]\.[0-9]', //" setup.py
+        make
+    - name: Test Mathics
+      run: |
+        pip install pytest pexpect
+        make -j3 check

.travis.yml

@@ -2,7 +2,7 @@ dist: bionic
 language: python
 python:
   - 3.8
-  - pypy3.6-7.3.1
+#  - pypy3.6-7.3.1
 matrix:
   fast_finish: true
   include:
@@ -14,18 +14,16 @@ services:
   - xvfb
 before_install:
   - sudo apt-get update -qq && sudo apt-get install -qq liblapack-dev llvm-10 llvm-10-dev
-  - sudo apt-get install -qq gfortran
-  - sudo apt-get install -qq texlive-font-utils latexmk texlive-xetex lmodern inkscape
-  - sudo apt-get install -qq texlive-latex-extra texlive-fonts-recommended asymptote
+  - sudo apt-get install -qq gfortran texlive-font-utils latexmk texlive-xetex lmodern inkscape texlive-latex-extra texlive-fonts-recommended asymptote
   - LLVM_CONFIG=/usr/bin/llvm-config-10  CXXFLAGS=-fPIC python -m pip install llvmlite
-  - pip install ipywidgets ipykernel requests IPython==5.0.0 langid pycountry pyenchant lxml matplotlib
+  - pip install ipywidgets ipykernel requests IPython==5.0.0 langid pycountry pyenchant lxml matplotlib unittest2 pexpect
   - python travis.py
-  - pip install cython unittest2 pexpect scikit-image
+  - pip install cython
 install:
   - sed -i "s/'sympy==[0-9]\.[0-9]\.[0-9]', //" setup.py
   - make develop
 script:
-  - make doc
+  - make -j3 doc
 notifications:
     email: false
     slack: mathics:VIjdkcZPlA79sOtVOtyjdOcT

CHANGES.rst

@@ -1,8 +1,53 @@
 CHANGES
 =======
 
-So we can get onto PyPI, the PyPI install name has changed from Mathics to Mathics3.
+1.1.1
+-----
+
+This is the last update before some major refactoring and interface changing occurs.
+
+After this relase, Django will no longer be bundled here. See `mathics-django <https://github.com/Mathics3/mathics-django>` for the unbundled replacement.
+
+Some changes were made to support `Pymathics Graph <https://github.com/Mathics3/pymathics-graph>`_, a new graph package bundled separately,
+and to support the ability for front-ends to handle rendering on their own.
+
+
+Package Updates
+++++++++++++++++
+
+- sympy 1.7.1
+
+Mathics Packages added:
+
+- ``DiscreteMath`CombinatoricaV0.9`` and
+  ``DiscreteMath`CombinatoricaV0.6``. V0.9 covers Steven Skiena's older "Implementing Discrete Mathematics: Combinatorics and Graph Theory" book.
+
+If you have a package that you would like included in the distribution, and it works with Mathics, please contact us.
+
+
+
+New builtins:
+++++++++++++++++++++++++++++
+
+- ``StirlingS1``, ``StirlingS2`` (not all WL variations handled)
+- ``MapAt`` (not all WL variations handled)
+- ``PythonForm``, ``SympyForm`` these is not in WL. It simply will show a crude translation to ``sympy`` or ``python``. Expect more and better translation later
+- ``Throw`` and ``Catch``
+- ``With``
+- Start ``FileNameTake``
+
+  Enhancements and Bug fixes:
++++++++++++++++++++++++++++
 
+- Workaround for ``Compile`` so it accepts functions ##1026
+- Add ``Trace`` option to ``Get``. ``Get["fn", Trace->True]`` will show lines as they are read.
+- Add bool for ``from_python``
+- Extend ``DeleteCases`` to accept a levelspec parameter.
+- Set Evaluation#exc_result to capture ``Aborted``, ``Timeout``, ``Overflow1``, etc.
+- ``ImageData`` changed to get bits {0,1} not bools.
+- add tokenizer symbols for <-> and -> and the unicode versions of those.
+- fix ``Needs``
+- ``System`$InputFileName`` is now set inside ``Needs`` and ``Get``
 
 1.1.0
 -----

README.rst

@@ -3,6 +3,9 @@ Welcome to Mathics!
 
 |Pypi Installs| |Latest Version| |Supported Python Versions| |Travis|_ |SlackStatus|_
 
+|Packaging status|
+
+
 Mathics is a general-purpose computer algebra system (CAS). It is an open-source alternative to Mathematica. It is free both as in "free beer" and as in "freedom".
 
 The home page of Mathics is https://mathics.org.
@@ -49,3 +52,5 @@ Mathics is released under the GNU General Public License Version 3 (GPL3).
 		 :target: https://badge.fury.io/py/Mathics3
 .. |Pypi Installs| image:: https://pepy.tech/badge/Mathics3
 .. |Supported Python Versions| image:: https://img.shields.io/pypi/pyversions/Mathics3.svg
+.. |Packaging status| image:: https://repology.org/badge/vertical-allrepos/mathics.svg
+			    :target: https://repology.org/project/mathics/versions

docker/Dockerfile

@@ -1,4 +1,4 @@
-FROM python:3.7-buster
+FROM python:3.8-buster
 
 ENV MATHICS_HOME=/usr/src/app
 ENV ENTRYPOINT_COMMAND="docker run -it {MATHICS_IMAGE}"
@@ -10,12 +10,13 @@ RUN chmod +x /entrypoint.sh
 
 COPY requirements.txt ./
 RUN apt-get update
-RUN apt-get install -qq liblapack-dev llvm-dev gfortran
+RUN apt-get install -qq liblapack-dev llvm-dev gfortran maria
 RUN pip install --no-cache-dir -r requirements.txt
 COPY requirements-mathicsscript.txt ./
 RUN pip install --no-cache-dir -r requirements-mathicsscript.txt
 
 RUN pip install pymathics-natlang
+RUN pip install mathicsscript
 RUN python -m nltk.downloader wordnet omw
 RUN python -m spacy download en
 

docker/entrypoint.sh

@@ -17,7 +17,7 @@ Arg:
                                  mathics src = /usr/src/app/mathics
                                  --pythonpaht /usr/src/app
 
-    -m | --mode {cli|ui}      Start mathics in web-ui mode (ui), or in cli mode (cli). Default is cli.
+    -m | --mode {cli|ui|gui|minimal}  Start mathics in web-ui mode (ui or gui), cli mode (cli) or minimal. Default is cli.
                               See: https://github.com/mathics/Mathics/wiki/Installing#running-mathics
 
 Params:
@@ -48,7 +48,8 @@ echo
 
 case $mathics_mode in
     cli) mathicsscript $@ ;;
-    ui)  mathicsserver -e $@ ;;
+    minimal)  mathics $@ ;;
+    ui | gui)  mathicsserver -e $@ ;;
     shell)  /bin/bash ;;
     *)   echo "unknown mathics_mode=$mathics_mode. See '$script_cmd --help'" ; exit 2 ;;
 esac

docker/requirements-mathicsscript.txt

@@ -1,4 +1,6 @@
-mathics
+click
 colorama
+columnize
+networkx
 pygments
-mathicsscript
+term-background >= 1.0.1

docker/requirements.txt

@@ -1,4 +1,4 @@
-sympy>=1.6, < 1.7
+sympy>=1.6, <= 1.8dev
 django >= 3.1.2, < 3.2
 mpmath>=1.1.0
 numpy

mathics/builtin/__init__.py

@@ -61,7 +61,8 @@ def is_builtin(var):
 
 # builtins = dict(builtins)
 
-mathics_to_sympy = {}
+mathics_to_sympy = {} # here we have: name -> sympy object
+mathics_to_python = {} # here we have: name -> string
 sympy_to_mathics = {}
 
 box_constructs = {}
@@ -72,6 +73,10 @@ def is_builtin(var):
 def add_builtins(new_builtins):
     for var_name, builtin in new_builtins:
         name = builtin.get_name()
+        if hasattr(builtin, "python_equivalent"):
+            # print("XXX", builtin.python_equivalent)
+            mathics_to_python[name] = builtin.python_equivalent
+
         if isinstance(builtin, SympyObject):
             mathics_to_sympy[name] = builtin
             for sympy_name in builtin.get_sympy_names():