merge

Author: mmatera

CHANGES.rst

@@ -7,4 +7,4 @@ include Makefile
 include mathics/Makefile
 include mathics/Makefile
 recursive-include mathics *.py
-recursive-include test *.py
+recursive-include test *.py *.m

MANIFEST.in

@@ -37,6 +37,10 @@ build:
 develop:
 	$(PIP) install -e .
 
+#: Make distirbution: wheels, eggs, tarball
+dist:
+	./admin-tools/make-dist.sh
+
 #: Install mathics
 install:
 	$(PYTHON) setup.py install

Makefile

@@ -46,8 +46,8 @@ Mathics is released under the GNU General Public License Version 3 (GPL3).
 .. |Travis| image:: https://secure.travis-ci.org/mathics/Mathics.svg?branch=master
 .. _Travis: https://travis-ci.org/mathics/Mathics
 .. _PyPI: https://pypi.org/project/Mathics/
-.. |mathicsscript| image:: https://mathics.org/screenshots/mathicsscript.png
-.. |mathicssserver| image:: https://mathics.org/screenshots/mathicsserver.png
+.. |mathicsscript| image:: https://github.com/Mathics3/mathicsscript/blob/master/screenshots/mathicsscript1.gif
+.. |mathicssserver| image:: https://mathics.org/images/mathicsserver.png
 .. |Latest Version| image:: https://badge.fury.io/py/Mathics3.svg
 		 :target: https://badge.fury.io/py/Mathics3
 .. |Pypi Installs| image:: https://pepy.tech/badge/Mathics3

README.rst

@@ -1,3 +1,4 @@
+#!/bin/bash
 PACKAGE=mathics3
 
 # FIXME put some of the below in a common routine
@@ -15,7 +16,7 @@ fi
 
 
 cd ..
-source $PACKAGE/version.py
+source mathics/version.py
 echo $__version__
 
 for pyversion in $PYVERSIONS; do

admin-tools/make-dist.sh

@@ -49,7 +49,7 @@
     version_string += f", cython {version_info['cython']}"
 
 license_string = """\
-Copyright (C) 2011-2020 The Mathics Team.
+Copyright (C) 2011-2021 The Mathics Team.
 This program comes with ABSOLUTELY NO WARRANTY.
 This is free software, and you are welcome to redistribute it
 under certain conditions.

mathics/__init__.py

@@ -11,7 +11,6 @@
 
 import sympy
 import mpmath
-import math
 
 from mathics.builtin.base import (
     Builtin,

mathics/builtin/arithmetic.py

@@ -5,7 +5,7 @@
 import mathics.builtin
 from mathics.builtin.base import (
     Builtin, BinaryOperator, PostfixOperator, PrefixOperator)
-from mathics.core.expression import (Expression, Symbol, SymbolFailed, valid_context_name,
+from mathics.core.expression import (Expression, Symbol, SymbolFailed, SymbolNull, valid_context_name,
                                      system_symbols, String)
 from mathics.core.rules import Rule, BuiltinRule
 from mathics.builtin.patterns import RuleDelayed
@@ -833,23 +833,34 @@ def _get_usage_string(symbol, evaluation, htmlout=False):
     definition = evaluation.definitions.get_definition(symbol.name)
     ruleusage = definition.get_values_list('messages')
     usagetext = None
-    from mathics.builtin import builtins
     import re
-    bio = builtins.get(definition.name)
-
+    # First look at user definitions:
+    for rulemsg in ruleusage:
+        if rulemsg.pattern.expr.leaves[1].__str__() == "\"usage\"":
+            usagetext = rulemsg.replace.value
+    if usagetext is not None:
+        # Maybe, if htmltout is True, we should convert
+        # the value to a HTML form...
+        return usagetext
+    # Otherwise, look at the pymathics, and builtin docstrings:
+    builtins = evaluation.definitions.builtin
+    pymathics = evaluation.definitions.pymathics
+    bio = pymathics.get(definition.name)
+    if bio is None:
+        bio = builtins.get(definition.name)
+    
     if bio is not None:
         from mathics.doc.doc import Doc
+        docstr = bio.builtin.__class__.__doc__
+        if docstr is None:
+            return None
         if htmlout:
-            usagetext = Doc(bio.__class__.__doc__).text(0)
+            usagetext = Doc(docstr).html()
         else:
-            usagetext = Doc(bio.__class__.__doc__).text(0)
+            usagetext = Doc(docstr).text(0)
         usagetext = re.sub(r'\$([0-9a-zA-Z]*)\$', r'\1', usagetext)
-    # For built-in symbols, looks for a docstring.
-    # Looks for the "usage" message. For built-in symbols, if there is an "usage" chain, overwrite the __doc__ information.
-    for rulemsg in ruleusage:
-        if rulemsg.pattern.expr.leaves[1].__str__() == "\"usage\"":
-            usagetext = rulemsg.replace.value
-    return usagetext
+        return usagetext
+    return None
 
 
 class Information(PrefixOperator):
@@ -919,7 +930,7 @@ class Information(PrefixOperator):
 
     def format_definition(self, symbol, evaluation, options, grid=True):
         'StandardForm,TraditionalForm,OutputForm: Information[symbol_, OptionsPattern[Information]]'
-        ret = Symbol('Null')
+        ret = SymbolNull
         lines = []
         if isinstance(symbol, String):
             evaluation.print_out(symbol)
@@ -1014,7 +1025,7 @@ def rhs(expr):
     def format_definition_input(self, symbol, evaluation, options):
         'InputForm: Information[symbol_, OptionsPattern[Information]]'
         self.format_definition(symbol, evaluation, options, grid=False)
-        ret = Symbol("Null")
+        ret = SymbolNull
         return ret
 
 
@@ -1757,17 +1768,19 @@ def apply(self, module, evaluation):
         except ImportError as e:
             evaluation.message(self.get_name(), 'notfound', module)
             return SymbolFailed
-
+        except PyMathicsLoadException as e:
+            evaluation.message(self.get_name(), 'notmathicslib', module)
+            return SymbolFailed
+        else:
         # Add Pymathics` to $ContextPath so that when user don't
         # have to qualify Pymathics variables and functions,
         # as the those in the module just loaded.
         # Following the example of $ContextPath in the WL
         # reference manual where PackletManager appears first in
         # the list, it seems to be preferable to add this PyMathics
         # at the beginning.
-        context_path = evaluation.definitions.get_context_path()
-        if "Pymathics`" not in context_path:
-            context_path.insert(0, "Pymathics`")
-        evaluation.definitions.set_context_path(context_path)
-        
+            context_path = evaluation.definitions.get_context_path()
+            if "Pymathics`" not in context_path:
+                context_path.insert(0, "Pymathics`")
+                evaluation.definitions.set_context_path(context_path)
         return module

mathics/builtin/assignment.py

@@ -1,14 +1,12 @@
 #!/usr/bin/env python3
 # -*- coding: utf-8 -*-
 
-import mpmath
 import re
 import sympy
 
 from functools import total_ordering
 import importlib
 from itertools import chain
-
 import typing
 from typing import Any, cast
 
@@ -270,6 +268,7 @@ def contextify_form_name(f):
             attributes=attributes,
             options=options,
             defaultvalues=defaults,
+            builtin=self
         )
         if is_pymodule:
             definitions.pymathics[name] = definition
@@ -532,7 +531,7 @@ def apply(self, expr, evaluation) -> Symbol:
 
 
 class SympyFunction(SympyObject):
-    def get_constant(self, precision, have_mpmath=False):
+    def get_constant(self, precision, evaluation, have_mpmath=False):
         try:
             d = get_precision(precision, evaluation)
         except PrecisionValueError:
@@ -855,4 +854,3 @@ def from_expression(expr):
                             return CountableInteger(0, upper_limit=True)
 
         return None  # leave original expression unevaluated
-

mathics/builtin/base.py

@@ -369,7 +369,7 @@ class Integrate(SympyFunction):
 
     Integration in TeX:
     >> Integrate[f[x], {x, a, b}] // TeXForm
-     = \int_a^bf\left[x\right] \, dx
+     = \int_a^b f\left[x\right] \, dx
 
     #> DownValues[Integrate]
      = {}
@@ -437,12 +437,12 @@ class Integrate(SympyFunction):
         'Integrate[list_List, x_]': 'Integrate[#, x]& /@ list',
 
         'MakeBoxes[Integrate[f_, x_], form:StandardForm|TraditionalForm]':
-        r'''RowBox[{"\[Integral]", MakeBoxes[f, form], "\[InvisibleTimes]",
+        r'''RowBox[{"\[Integral]","\[InvisibleTimes]", MakeBoxes[f, form], "\[InvisibleTimes]",
                 RowBox[{"\[DifferentialD]", MakeBoxes[x, form]}]}]''',
         'MakeBoxes[Integrate[f_, {x_, a_, b_}], '
         'form:StandardForm|TraditionalForm]':
         r'''RowBox[{SubsuperscriptBox["\[Integral]", MakeBoxes[a, form],
-                MakeBoxes[b, form]], MakeBoxes[f, form], "\[InvisibleTimes]",
+                MakeBoxes[b, form]], "\[InvisibleTimes]" , MakeBoxes[f, form], "\[InvisibleTimes]",
                 RowBox[{"\[DifferentialD]", MakeBoxes[x, form]}]}]''',
     }