Add cylinders

.coveragerc

@@ -12,4 +12,4 @@ omit =
     mathics/doc/*
     mathics/builtin/pymimesniffer/*
     mathics/manage.py
-    mathics/test.py
+    mathics/docpipeline.py

.github/workflows/osx.yml

@@ -21,13 +21,13 @@ jobs:
         python-version: ${{ matrix.python-version }}
     - name: Install dependencies
       run: |
-        brew install llvm@9
+        brew install llvm@11
         python -m pip install --upgrade pip
-        LLVM_CONFIG=/usr/local/Cellar/llvm@9/9.0.1_2/bin/llvm-config pip install llvmlite
-    - name: Install Mathics
+        LLVM_CONFIG=/usr/local/Cellar/llvm@11/11.1.0/bin/llvm-config pip install llvmlite
+    - name: Install Mathics with full dependencies
       run: |
-        make develop
+        make develop-full
     - name: Test Mathics
       run: |
-        pip install pytest pexpect
+        pip install -r requirements-dev.txt
         make -j3 check

.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
-    - name: Install Mathics
+    - name: Install Mathics with full dependencies
       run: |
-        sed -i "s/'sympy==[0-9]\.[0-9]\.[0-9]', //" setup.py
-        make develop
+        make develop-full
     - name: Test Mathics
       run: |
-        pip install pytest pexpect
+        pip install -r requirements-dev.txt
         make -j3 check

.github/workflows/windows.yml

@@ -31,6 +31,7 @@ jobs:
         python setup.py install
     - name: Test Mathics
       run: |
-        pip install pytest
-        py.test test
-        python mathics/test.py
+        pip install -r requirements-extra.txt
+        pip install -r requirements-dev.txt
+        set PYTEST_WORKERS="-n3"
+        make check

.gitignore

@@ -1,5 +1,6 @@
 *.c
 *.cpp
+*.dll
 *.egg
 *.gz
 *.nix
@@ -25,7 +26,7 @@ _Database_/
 build/
 dist/
 mathics/Makefile
-mathics/doc/tex/data
+mathics/doc/tex/doc_tex_data.pcl
 mathics/doc/tex/documentation.tex
 mathics/doc/tex/images/
 mathics/doc/tex/logo-heptatom.pdf

.pre-commit-config.yaml

@@ -0,0 +1,12 @@
+repos:
+-   repo: https://github.com/pre-commit/pre-commit-hooks
+    rev: v2.0.0
+    hooks:
+    - id: debug-statements
+    - id: end-of-file-fixer
+-   repo: https://github.com/psf/black
+    rev: 20.8b1
+    hooks:
+    - id: black
+      language_version: python3
+      exclude: 'mathicsscript/version.py'

.travis.yml

@@ -20,8 +20,7 @@ before_install:
   - python travis.py
   - pip install cython
 install:
-  - sed -i "s/'sympy==[0-9]\.[0-9]\.[0-9]', //" setup.py
-  - make develop
+  - make develop-full
 script:
   - make -j3 doc
 notifications:

CHANGES.rst

@@ -2,38 +2,92 @@ CHANGES
 =======
 
 
-2.1.1
+2.2.0
 -----
 
-New builtins
-++++++++++++
+Package update
+++++++++++++++
 
+- SymPy 1.8
+
+New variables and builtins
+++++++++++++++++++++++++++
+
+* ``Arg``
+* ``CoefficientArrays`` and ``Collect`` (#1174, #1194)
 * ``Dispatch``
+* ``FullSimplify``
+* ``LetterNumber`` #1298. The ``alphabet`` parameter supports only a minimal number of languages.
+* ``MemoryAvailable``
+* ``MemoryInUse``
+* ``Nand`` and ``Nor`` logical functions.
 * ``Series``,  ``O`` and ``SeriesData``
-* All of the named colors, e.g. ``Brown`` or ``LighterMagenta``
+* ``StringReverse``
+* ``$SystemMemory``
+* Add all of the named colors, e.g. ``Brown`` or ``LighterMagenta``.
 
 
 
 Enhancements
 ++++++++++++
 
+* a function `evaluate_predicate` allows for a basic predicate evaluation using `$Assumptions`.
+* ``Attributes`` accepts a string parameter.
+* ``Cases`` accepts Heads option. Issue #1302.
 * ``ColorNegate`` for colors is supported.
 * ``D`` and ``Derivative`` improvements.
+* ``Expand`` and ``ExpandAll`` now support a second parameter ``patt`` Issue #1301.
+* ``Expand`` and ``ExpandAll`` works with hyperbolic functions (`Sinh`, `Cosh`, `Tanh`, `Coth`).
 * ``FileNames`` returns a sorted list (#1250).
-* ``FindRoot`` now receives several optional parameters like ``Method`` and ``MaxIterations``.
+* ``FindRoot`` now accepts several optional parameters like ``Method`` and ``MaxIterations``. See Issue #1235.
 * ``FixedPoint`` now supports the ``SameTest`` option.
-* ``ReplaceRepeated`` and ``FixedPoint`` now supports the ``MaxIteration`` option (#1260).
+* ``mathics`` CLI now uses its own Mathics ``settings.m`` file
+* ``Prepend`` works with ``DownValues`` Issue #1251
+* ``Prime`` and ``PrimePi`` now accept a list parameter and have the ``NumericFunction`` attribute.
+* ``Read`` with ``Hold[Expression]`` now supported. (#1242)
+* ``ReplaceRepeated`` and ``FixedPoint`` now supports the ``MaxIteration`` option. See Issue #1260.
+* ``Simplify`` performs a more sophisticated set of simplifications.
+* ``Simplify`` accepts a second parameter that temporarily overwrites ``$Assumptions``.
+* ``StringTake`` now accepts form containing a list of strings and specification. See Issue #1297.
 * ``Table`` [*expr*, *n*] is supported.
+* ``ToExpression`` handles multi-line string input.
 * ``ToString`` accepts an optional *form* parameter.
-* ``ToExpression`` handles multi-line string input
-* The implementation of Streams was redone
+* ``ToExpression`` handles multi-line string input.
+* ``$VersionNumber`` now set to 10.0 (was 6.0).
+* The implementation of Streams was redone.
+* Function ``mathics.core.definitions.autoload_files`` was added and
+  exposed to allow front-ends to provide their own custom Mathics.
+  settings.
+* String output in the ``mathics`` terminal has surrounding quotes to make it more visually distinct from unexpanded and symbol output.
+  To disable this behavior use ``--strict-wl-output``.
+
 
 Bug fixes
 +++++++++
 
-* ``SetTagDelayed`` does not evaluate now the rhs before assignment.
-* ``$InstallationDirectory`` starts out Unprotected
+* ``SetTagDelayed`` now does not evaluate the RHS before assignment.
+* ``$InstallationDirectory`` starts out ``Unprotected``.
 * ``FindRoot`` now handles equations.
+* Malformed Patterns are detected and an error message is given for them.
+* Functions gone over to ensure the ``Listable`` and ``NumericFunction`` properties are correct.
+
+
+Incompatible changes
+--------------------
+
+* ``System`$UseSansSerif`` moved from core and is sent front-ends using ``Settings`$UseSansSerif``.
+
+
+Internal changes
+----------------
+
+* doctest  accepts the option ``-d`` to show how long it takes to parse, evaluate and compare each individual test.
+  ``-x`` option (akin to ``pytests -x`` is a short-hand for stop on first error
+* Some builtin functions have been grouped together in a module
+  underneath the top-level builtin directory.  As a result, in the
+  documents you will list some builtins listed under an overarching
+  categery like ``Specific Functions`` or ``Graphics, Drawing, and
+  Images``. More work is expected in the future to improve document sectioning.
 
 
 2.1.0
@@ -82,7 +136,7 @@ Pymathics Modules
 +++++++++++++++++
 
 * Pymathics modules now can run initialization code when are loaded.
-* The ``builtins`` list is not hardliked to the library anymore. This simplifies
+* The ``builtins`` list is not hard-linked to the library anymore. This simplifies
   the loading and reloading of pymathics modules.
 * Decoupling of BoxConstructors from the library. Now are defined at the
   level of the definition objects. This is useful for customizing the
@@ -92,10 +146,10 @@ Pymathics Modules
 Miscellanea
 +++++++++++
 
-* A pass was made to improve Microsoft Windows compatability and testing Windows under MSYS.
+* A pass was made to improve Microsoft Windows compatibility and testing Windows under MSYS.
 * Include numpy version in version string. Show in CLI
 * Small CLI tweaks ``--colors=None`` added to match mathicsscript.
-* In the ``BaseExpression`` and derivated classes, the method ``boxes_to_xml`` now are called ``boxes_to_mathml``.
+* In the ``BaseExpression`` and derived classes, the method ``boxes_to_xml`` now are called ``boxes_to_mathml``.
 * In the ``format`` method of the class ``Evaluation``,  the builtin ``ToString`` is called instead of  ``boxes_to_text``
 * In order to control the final form of boxes from the user space in specific symbols and contexts.
 * ``GraphicsBox`` now have two methods:  ``to_svg`` and  ``to_mathml``. The first produces SVG plain text while the second produces ``<mglyph ...>`` tags with base64 encoded SVGs.
@@ -118,7 +172,7 @@ What's to expect in a Future Release
 To accommodate growth and increased use of pieces of Mathics inside other packages, parts of Mathics have been split off and moved to separate packages. In particular:
 
 * The Django front-end is now a PyPI installable package called `Mathics-Django <https://pypi.org/project/Mathics-Django/>`_.
-* Scanner routines, character translation tables to/from unicode, and character properties are now `mathics-scanner https://github.com/Mathics3/mathics-scanner`_.
+* Scanner routines, character translation tables to/from Unicode, and character properties are now `mathics-scanner https://github.com/Mathics3/mathics-scanner`_.
 * Specific builtins involving heavy, non-standard routines were moved to pymathics modules `pymathics-graph https://github.com/Mathics3/pymathics-graph`_, `pymathics-natlang https://github.com/Mathics3/pymathics-natlang`_.
 
 Incompatible changes:
@@ -211,7 +265,7 @@ Future
 * Work is also being done on asymptote. See `PR #1145 <https://github.com/mathics/Mathics/pull/1145>`_.
 * Makeboxes is being decoupled from a renderer. See `PR #1140 <https://github.com/mathics/Mathics/pull/1140>`_.
 * Inline SVG will be supported (right now SVG is binary).
-* Better support integrating unicode in output (such as for Rule arrows) is in the works. These properties will be in the scanner package.
+* Better support integrating Unicode in output (such as for Rule arrows) is in the works. These properties will be in the scanner package.
 * A method option ("mpmath", "sympy", or "numpy") will be added to the ``N[]``. See `PR #1144 <https://github.com/mathics/Mathics/pull/1144>`_.
 
 
@@ -261,7 +315,7 @@ Enhancements and bug fixes
 - 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 booleans as previously
-- Add tokenizer symbols for ``<->`` and ``->`` and the unicode versions of those
+- Add tokenizer symbols for ``<->`` and ``->`` and the Unicode versions of those
 - Small corrections to ``Needs``, e.g check if already loaded, correct a typo, etc.
 - ``System`$InputFileName`` is now set inside ``Needs`` and ``Get``
 - Install shell scripts ``dmathicserver``, ``dmathicsscript``, and ``dmathics`` to simplify running docker
@@ -365,7 +419,7 @@ Enhancements and bug fixes
 - proper sympolic expantion for ``Re`` and ``Im``
 - fixes a bug in the evaluation of ``SympyPrime`` #827
 - clean up ``ColorData``
-- fixes unicode characters in TeX document
+- fixes Unicode characters in TeX document
 - update Django gallery examples
 - fixes ``Sum`` and ``Product`` #869, #873
 - warn when using options not supported by a Builtin #898, #645

MANIFEST.in

@@ -4,7 +4,5 @@ include ChangeLog
 include COPYING.txt
 include FUTURE.rst
 include Makefile
-include mathics/Makefile
-include mathics/Makefile
 recursive-include mathics *.py
 recursive-include test *.py *.m

Makefile

@@ -11,7 +11,7 @@ RM  ?= rm
 
 .PHONY: all build \
    check clean \
-   develop dist doc doc-data djangotest \
+   develop dist doctest doc-data djangotest \
    gstest pytest \
    rmChangeLog \
    test
@@ -37,11 +37,17 @@ build:
 develop:
 	$(PIP) install -e .
 
+#: Set up to run from the source tree with full dependencies
+develop-full:
+	$(PIP) install -e .
+	$(PIP) install -r requirements-extra.txt
+
+
 #: Make distirbution: wheels, eggs, tarball
 dist:
 	./admin-tools/make-dist.sh
 
-#: Install mathics
+#: Install Mathics
 install:
 	$(PYTHON) setup.py install
 
@@ -57,7 +63,7 @@ clean:
 
 #: Run py.test tests. Use environment variable "o" for pytest options
 pytest:
-	py.test test $o
+	py.test $(PYTEST_WORKERS) test $o
 
 
 #: Run a more extensive pattern-matching test
@@ -66,15 +72,20 @@ gstest:
 
 
 #: Create data that is used to in Django docs and to build TeX PDF
-doc-data mathics/doc/tex/data: mathics/builtin/*.py mathics/doc/documentation/*.mdoc mathics/doc/documentation/images/*
-	$(PYTHON) mathics/test.py -ot -k
+doc-data mathics/doc/tex/doc_tex_data.pcl: mathics/builtin/*.py mathics/doc/documentation/*.mdoc mathics/doc/documentation/images/*
+	$(PYTHON) mathics/docpipeline.py -ot -k
+
+#: Run tests that appear in docstring in the code.
+doctest-workaround:
+	SANDBOX=$(SANDBOX) $(PYTHON) mathics/docpipeline.py --exclude=NIntegrate,MaxRecursion
+	SANDBOX=$(SANDBOX) $(PYTHON) mathics/docpipeline.py --sections=NIntegrate,MaxRecursion
 
 #: Run tests that appear in docstring in the code.
 doctest:
-	SANDBOX=$(SANDBOX) $(PYTHON) mathics/test.py $o
+	SANDBOX=$(SANDBOX) $(PYTHON) mathics/docpipeline.py $o
 
 #: Make Mathics PDF manual
-doc mathics.pdf: mathics/doc/tex/data
+doc mathics.pdf: mathics/doc/tex/doc_tex_data.pcl
 	(cd mathics/doc/tex && $(MAKE) mathics.pdf)
 
 #: Remove ChangeLog

admin-tools/pyenv-versions

@@ -5,4 +5,4 @@ if [[ $0 == ${BASH_SOURCE[0]} ]] ; then
     echo "This script should be *sourced* rather than run directly through bash"
     exit 1
 fi
-export PYVERSIONS='3.6.13 3.7.10 3.8.8 3.9.3'
+export PYVERSIONS='3.6.13 3.7.10 3.8.10 3.9.5'

admin-tools/release.sh

@@ -5,8 +5,8 @@
 # Clear directory build/
 # python setup.py develop
 # mathics/
-#   python test.py -o
-#   python test.py -t
+#   python docpipeline.py -o
+#   python docpipeline.py -t
 # mathics/doc/tex/
 #   make latex
 # Then run this file.

admin-tools/time-mathmp-sympy-fns.py

@@ -14,6 +14,7 @@
 
 # print(mpmath.pi, "\n")
 
+
 def math_pi():
     return math.pi
 

examples/symbolic_logic/gries_schneider/test_gs.py

@@ -11,7 +11,7 @@
 definitions = Definitions(add_builtin=True)
 
 for i in range(1, 4):
-  evaluation = Evaluation(definitions=definitions, catch_interrupt=False)
+    evaluation = Evaluation(definitions=definitions, catch_interrupt=False)
 
-  expr = parse(definitions, MathicsSingleLineFeeder(f"<< GS{i}.m"))
-  expr.evaluate(evaluation)
+    expr = parse(definitions, MathicsSingleLineFeeder(f"<< GS{i}.m"))
+    expr.evaluate(evaluation)

mathics/__init__.py

@@ -50,6 +50,18 @@
 if "cython" in version_info:
     version_string += f", cython {version_info['cython']}"
 
+
+def load_default_settings_files(definitions, load_cli_settings: bool = True):
+    import os.path as osp
+    from mathics.core.definitions import autoload_files
+
+    root_dir = osp.realpath(osp.dirname(__file__))
+
+    autoload_files(definitions, root_dir, "autoload", False)
+    if load_cli_settings:
+        autoload_files(definitions, root_dir, "autoload-cli", False)
+
+
 license_string = """\
 Copyright (C) 2011-2021 The Mathics Team.
 This program comes with ABSOLUTELY NO WARRANTY.