merge

Author: mmatera

.github/workflows/osx.yml

@@ -24,10 +24,9 @@ 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
     - name: Install Mathics
       run: |
-        make
+        make develop
     - name: Test Mathics
       run: |
         pip install pytest pexpect

.github/workflows/ubuntu.yml

@@ -22,11 +22,10 @@ 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
     - name: Install Mathics
       run: |
         sed -i "s/'sympy==[0-9]\.[0-9]\.[0-9]', //" setup.py
-        make
+        make develop
     - name: Test Mathics
       run: |
         pip install pytest pexpect

.travis.yml

@@ -19,7 +19,6 @@ before_install:
   - pip install ipywidgets ipykernel requests IPython==5.0.0 langid pycountry pyenchant lxml matplotlib unittest2 pexpect
   - python travis.py
   - pip install cython
-  - pip install -e git://github.com/Mathics3/mathics-scanner.git#egg=Mathics_Scanner
 install:
   - sed -i "s/'sympy==[0-9]\.[0-9]\.[0-9]', //" setup.py
   - make develop

CHANGES.rst

@@ -4,17 +4,81 @@ CHANGES
 2.0.0
 -----
 
-The Django front-end has been unbundled and is a separate `PyPI installable package <https://pypi.org/project/Mathics-Django/>`_.
+In order to accomdate growth and increase use pieces of Mathics inside other packages, some parts of
+Mathics have been split off and moved to separately installable packages. In particular:
+
+* The Django front-end `PyPI installable package <https://pypi.org/project/Mathics-Django/>`_.
+* Scanner routines and character translations tables to/from unicode and noting some character properties
+* Specific builtins involving heavy, non-standard routines were moved to pymathics modules.
+
+
+Incompatible changes:
++++++++++++++++++++++
+
+* `-e` `--execute` is better suited for embedded use. It shows just evaluation output as text.
+
 
 New builtins
-++++++++++++++
+++++++++++++
 
 - ``TimeRemaining`` and ``TimeConstrained``
 -``MathicsVersion`` (this is not in WL)
 - ``\[RadicalBox]``
-- ``FirstCase``, ``Lookup``
-- ``Catalan``, ``LerchPhi``
-- ``System`ConvertersDump`` context variables 
+- ``ContinuedFraction``
+- ``Insert`` and ``Delete``
+- ``FirstCase``, ``Lookup``, ``Key``, ``Lookup`` and ``Failure``
+- ``ConvertCommonDumpRemoveLinearSyntax`` and ``System`ConvertersDump`` context variables
+- ``PossibleZeroQ`` PR #1100
+- ``Run``
+- ``SympyObject``
+- ``NumberQ``
+- ``AnglePath``,  ``AnglePathFold``, ``AngleVector``
+- ``Haversine``, ``InverseHaversine``
+- ``Show``
+-  Improving support for options in the Plot module: ``Axes``, ``Filling``, ``ImageSize``, ``Joined``
+- ``BoxData``, ``TextData``, ``InterpretationBox``, ``StyleBox``, ``TagBox``, ``TemplateBox``, ``ButtonBox``, ``InterpretationBox``
+- ``LerchPhi``
+
+New Constants
++++++++++++++
+
+Mathematical Constants is now its own module/section. Contants have been filled out.
+These constants have been added:
+
+- ``Catalan``
+- ``Glaisher``
+- ``Khinchin``
+- ``Degree``
+- ``GoldenRatio``
+- ``Khinchin``
+
+
+Many of these and the existing constants are computable via mpmath, numpy, or sympy.
+
+
+Settings through WL variables
+-----------------------------
+
+Certain aspects of the configuration of the kernel are now controlled by variables, defined in /autoad/settings.m
+
+- ``$GetTrace`` (``False`` by default).  Defines if when a WL module is load through ``Get``, definitions will be traced (for debug).
+-  ``$PreferredBackendMethod`` Set this do whether to use mpmath, numpy or Sympy for numeric and symbolic constants and methods when there is s choice (``"sympy"`` by default) (see #1124)
+
+
+Enhancements
+------------
+
+- Add ``Method`` option "mpmath" to compute ``Eignevalues`` using mpmath (#1115).
+- Improving the support for OptionValue and OptionsPattern (#1113)
+
+
+Bug Fixes
+---------
+
+There have been numerous bug is driven by working on Combinatorica V0.9 and CellsToTeX.
+
+- ``Sum`` involving numeric integer bounds involving Mathics functions fixed.
+- ``Equal`` ``UnEqual`` testing on Strings (#1128).
 
 Document updates
 ----------------
@@ -33,6 +97,14 @@ Enhancements and Bug fixes:
 - Adding support in ``from_python()`` to convert dictionaries in list of rules.
 
 
+
+Miscelanea
+----------
+
+- Enlarge of the set of gries_schneider tests
+- Improvement in the way builtins modules are loaded at initialization time (#1138).
+
+
 1.1.1
 -----
 
@@ -52,7 +124,7 @@ Package Updates
 
 Mathics Packages added:
 
-- ``DiscreteMath`CombinatoricaV0.9`` (preferred) aand
+- ``DiscreteMath`CombinatoricaV0.9`` (preferred) and
   ``DiscreteMath`CombinatoricaV0.6``.
 
 Both of these correspond to Steven Skiena's *older* book: "Implementing Discrete Mathematics: Combinatorics and Graph Theory" book.
@@ -94,7 +166,7 @@ New builtins:
 - Adding support in ``from_python()`` to convert dictionaries in list of rules.
 - Fix OptionsPattern associated symbols.
 
-  
+
 1.1.0
 -----
 

examples/symbolic_logic/gries_schneider/test_gs.py

@@ -6,14 +6,12 @@
 from mathics.core.expression import Expression, Integer, Rational, Symbol
 from mathics.core.definitions import Definitions
 from mathics.core.evaluation import Evaluation
-from mathics.core.parser import SingleLineFeeder, parse
+from mathics.core.parser import MathicsSingleLineFeeder, parse
 
 definitions = Definitions(add_builtin=True)
 
 for i in range(1, 4):
   evaluation = Evaluation(definitions=definitions, catch_interrupt=False)
 
-  expr = parse(definitions, SingleLineFeeder(f"<< GS{i}.m"))
+  expr = parse(definitions, MathicsSingleLineFeeder(f"<< GS{i}.m"))
   expr.evaluate(evaluation)
-
-

mathics/autoload/settings.m

@@ -5,3 +5,8 @@
 Settings`$TraceGet::usage = "If this Boolean variable is set True, 'Get' traces the lines it reads that start a new expression";
 Settings`$TraceGet = False
 Unprotect[Settings`$TraceGet]
+
+
+Settings`$PreferredBackendMethod::usage = "Set this do whether to use mpmath, numpy or Sympy for numeric and symbolic constants and methods when there is s choice";
+Settings`$PreferredBackendMethod = "sympy"
+Unprotect[Settings`$PreferredBackendMethod]

mathics/benchmark.py

@@ -15,7 +15,7 @@
 
 
 import mathics
-from mathics.core.parser import parse, MultiLineFeeder, SingleLineFeeder
+from mathics.core.parser import parse, MathicsMultiLineFeeder, MathicsSingleLineFeeder
 from mathics.core.definitions import Definitions
 from mathics.core.evaluation import Evaluation
 
@@ -126,7 +126,7 @@ def truncate_line(string):
 
 def benchmark_parse(expression_string):
     print("  '{0}'".format(truncate_line(expression_string)))
-    timeit(lambda: parse(definitions, SingleLineFeeder(expression_string)))
+    timeit(lambda: parse(definitions, MathicsSingleLineFeeder(expression_string)))
 
 
 def benchmark_parse_file(fname):
@@ -140,7 +140,7 @@ def benchmark_parse_file(fname):
         code = f.read().decode('utf-8')
 
     def do_parse():
-        feeder = MultiLineFeeder(code)
+        feeder = MathicsMultiLineFeeder(code)
         while not feeder.empty():
             parse(definitions, feeder)
     timeit(do_parse)
@@ -156,13 +156,13 @@ def benchmark_parser():
 
 def benchmark_format(expression_string):
     print("  '{0}'".format(expression_string))
-    expr = parse(definitions, SingleLineFeeder(expression_string))
+    expr = parse(definitions, MathicsSingleLineFeeder(expression_string))
     timeit(lambda: expr.default_format(evaluation, "FullForm"))
 
 
 def benchmark_expression(expression_string):
     print("  '{0}'".format(expression_string))
-    expr = parse(definitions, SingleLineFeeder(expression_string))
+    expr = parse(definitions, MathicsSingleLineFeeder(expression_string))
     timeit(lambda: expr.evaluate(evaluation))