Merge pull request #689 from Mathics3/version-tweaking

Version tweaking

Author: rocky

CHANGES.rst

@@ -6,6 +6,20 @@ CHANGES
 5.0.3dev0
 ---------
 
+API
++++
+
+#. New function ``mathics.system_info.python_implementation()`` shows the Python Implementation, e.g. CPython, PyPy, Pyston that is running Python. This is included in the information ``mathics.system_info.mathics_system__system_info()`` returns and is used in ``$PythonImplementation``
+#. A list of optional software can be found in ``mathics.optional_software``. Versions of that software are included in ``mathics.version_info``.
+
+
+Package update
+..............
+
+#. SymPy 1.11.1 accepted
+#. Numpy 1.24.0 accepted
+
+
 New Builtins
 +++++++++++
 
@@ -35,18 +49,21 @@ Documentation
 #. "Exponential Functional" split out from "Trigonometry Functions"
 #. A new section on "Accuracy and Precision" was included in the manual.
 #. "Forms of Input and Output" is its own section
+#. All Builtins have links to WMA pages.
+#. More url links to Wiki pages added; more internal cross links added.
 
 Internals
 +++++++++
 
 #. ``boxes_to_`` methods are now optional for ``BoxElement`` subclasses. Most of the code is now moved to the ``mathics.format`` submodule, and implemented in a more scalable way.
 #. ``mathics.builtin.inout`` was splitted in several modules (``inout``, ``messages``, ``layout``, ``makeboxes``) in order to improve the documentation.
-#. `from_mpmath` conversion supports a new parameter ``acc`` to set the accuracy of the number.
+#. ``from_mpmath`` conversion supports a new parameter ``acc`` to set the accuracy of the number.
 #. Operator name to unicode or ASCII comes from Mathics scanner character tables.
-#. ``eval*`` methods in `Builtin` classes are considerer as synonyms of ``apply*`` methods.
-#. Modularize and improve the way in which `Builtin` classes are selected to have an associated `Definition`.
-#. `_SetOperator.assign_elementary` was renamed as `_SetOperator.assign`. All the special cases are not handled by the `_SetOperator.special_cases` dict.
-
+#. Builtin instance methods that start ``apply`` are considered rule matching and function application; the use of the name ``apply``is deprecated, when ``eval`` is intended.
+#. Modularize and improve the way in which ``Builtin`` classes are selected to have an associated ``Definition``.
+#. ``_SetOperator.assign_elementary`` was renamed as ``_SetOperator.assign``. All the special cases are not handled by the ``_SetOperator.special_cases`` dict.
+#. ``isort`` run over all Python files. More type annotations and docstrings on functions added.
+#. caching on immutable atoms like, ``String``, ``Integer``, ``Real``, etc. was improved; the ``__hash__()`` function was sped up. There is a small speedup overall from this at the expense of increased memory.
 
 
 Bugs

mathics/__init__.py

@@ -2,28 +2,49 @@
 
 import platform
 import sys
+from importlib import import_module
+from typing import Dict
 
 import mpmath
 import numpy
 import sympy
 
 from mathics.version import __version__
 
-version_info = {
+# version_info contains a list of Python packages
+# and the versions infsalled or "Not installed"
+# if the package is not installed and "No version information"
+# if we can't get version infomation.
+version_info: Dict[str, str] = {
     "mathics": __version__,
-    "sympy": sympy.__version__,
     "mpmath": mpmath.__version__,
     "numpy": numpy.__version__,
     "python": platform.python_implementation() + " " + sys.version.split("\n")[0],
+    "sympy": sympy.__version__,
 }
 
-try:
-    import cython
-except ImportError:
-    pass
-else:
-    version_info["cython"] = cython.__version__
 
+# optional_software contains a list of Python packages
+# that add functionality but are optional
+optional_software: Dict[str, str] = (
+    "cython",
+    "lxml",
+    "networkx",
+    "nltk",
+    "psutil",
+    "scikit-image",
+    "scipy",
+    "wordcloud",
+)
+
+for package in optional_software:
+    try:
+        mod = import_module(package)
+        package_version = mod.__dict__.get("__version__", "No version information")
+    except ImportError:
+        package_version = "Not installed"
+
+    version_info[package] = package_version
 
 version_string = """Mathics {mathics}
 on {python}

mathics/doc/common_doc.py

@@ -632,6 +632,11 @@ def post_sub(text, post_substitutions):
     return text
 
 
+def skip_doc(cls):
+    """Returns True if we should skip cls in docstring extraction."""
+    return cls.__name__.endswith("Box") or (hasattr(cls, "no_doc") and cls.no_doc)
+
+
 class Tests:
     # FIXME: add optional guide section
     def __init__(self, part: str, chapter: str, section: str, doctests):

mathics/main.py

@@ -345,7 +345,7 @@ def main() -> int:
     )
     args, script_args = argparser.parse_known_args()
 
-    quit_command = "CTRL-BREAK" if sys.platform == "win32" else "CONTROL-D"
+    quit_command = "CTRL-BREAK" if sys.platform in ("win32", "nt") else "CONTROL-D"
 
     extension_modules = []
     if args.pyextensions:

mathics/system_info.py

@@ -13,7 +13,7 @@
 
 def python_implementation() -> str:
     """
-    Returns the Python implemnetation, e.g Pyston, PyPy, CPython...
+    Returns the Python implementation, e.g Pyston, PyPy, CPython...
     """
     if hasattr(sys, "pyston_version_info"):
         custom_version_info = sys.pyston_version_info

setup.py

@@ -35,7 +35,9 @@
 
 from setuptools import Extension, setup
 
-is_PyPy = platform.python_implementation() == "PyPy"
+is_PyPy = platform.python_implementation() == "PyPy" or hasattr(
+    sys, "pypy_version_info"
+)
 
 INSTALL_REQUIRES = ["Mathics-Scanner >= 1.3.0.dev0"]
 
@@ -49,13 +51,13 @@
         "recordclass",
         "numpy",
         "llvmlite<0.37",
-        "sympy>=1.8,<1.9",
+        "sympy>=1.8,<1.12",
     ]
     if is_PyPy:
         print("Mathics does not support PyPy Python 3.6" % sys.version_info[:2])
         sys.exit(-1)
 else:
-    INSTALL_REQUIRES += ["numpy<=1.24", "llvmlite", "sympy>=1.8, < 1.11"]
+    INSTALL_REQUIRES += ["numpy<=1.24", "llvmlite", "sympy>=1.8, < 1.12"]
 
 if not is_PyPy:
     INSTALL_REQUIRES += ["recordclass"]