diff --git a/CHANGES.rst b/CHANGES.rst index 9b2df398c..28b91dc21 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -1,6 +1,21 @@ CHANGES ======= +7.0.0 +----- + +* Adjust for Mathics3 core 7.0.0 API, e.g., add explicit call to load builtins +* doctest refactored to use more routines common to mathics-core +* Support newer matplotlib, e.g. 3.9.1 +* Update gallery examples +* Add background and tooltips to Graphics3D +* Expand information in /about: + - max digits in string + - system encoding + - time format + + + 6.0.0 ----- diff --git a/ChangeLog-spell-corrected.diff b/ChangeLog-spell-corrected.diff new file mode 100644 index 000000000..b1a4ca65a --- /dev/null +++ b/ChangeLog-spell-corrected.diff @@ -0,0 +1,1935 @@ +--- ChangeLog 2024-08-09 15:35:33.288228049 -0400 ++++ ChangeLog-spell-corrected 2024-08-09 15:28:37.606302244 -0400 +@@ -63,7 +63,7 @@ + + 2024-01-18 rocky + +- * .pre-commit-config.yaml, mathics_django/web/media/js/mathics.js: ++ * .pre-commit-config.yaml, mathics_django/web/media/js/mathics.js: + Don't interpret characters in createLine() as HTML In String output elision from Mathics3 this messes up + <> converting < into < for example. In this context we don't have HTML, we have text. HTML appears + outside and is handled outside of this. +@@ -79,7 +79,7 @@ + * .github/workflows/osx.yaml, .github/workflows/ubuntu.yml, + .github/workflows/windows.yml, Makefile, + mathics_django/doc/utils.py, mathics_django/docpipeline.py, +- mathics_django/version.py, mathics_django/web/models.py, setup.py: ++ mathics_django/version.py, mathics_django/web/models.py, setup.py: + Use Mathics-core v7 in testing (#197) * Use Mathics-core v7 in testing * Get CI running on V7.0.0 + + 2023-07-11 rocky +@@ -98,7 +98,7 @@ + mathics_django/web/controllers/about.py, + mathics_django/web/media/js/inout.js, + mathics_django/web/templates/about.html, setup.py: Show mathics-core +- setttings... (#195) * Show mathics-core setttings... * max digits in string, * system encoding * time format * More setting tweaks and bump version * Drop mention of 3.6 in setup.py, add mention of 3.11 * Improve formatting of time zone and max strings allowed in digits * We are no longer 6.0.0 ++ settings... (#195) * Show mathics-core settings... * max digits in string, * system encoding * time format * More setting tweaks and bump version * Drop mention of 3.6 in setup.py, add mention of 3.11 * Improve formatting of time zone and max strings allowed in digits * We are no longer 6.0.0 + + 2023-02-26 rocky + +@@ -137,7 +137,7 @@ + 2023-02-23 R. Bernstein + + * Makefile, mathics_django/__init__.py, +- mathics_django/docpipeline.py, mathics_django/web/media/js/inout.js: ++ mathics_django/docpipeline.py, mathics_django/web/media/js/inout.js: + Add natlang examples, docpipeline etc. (#191) Makefile: use UTF-8 for XML doc generation __init__.py make sure we + import __version__ inout.js: Add NLP examples, comment out + undirected edge use since that may have a problem using +@@ -191,7 +191,7 @@ + 2023-01-29 R. Bernstein + + * mathics_django/doc/django_doc.py, +- mathics_django/web/controllers/doc.py, mathics_django/web/format.py: ++ mathics_django/web/controllers/doc.py, mathics_django/web/format.py: + Reinstate PyMathics section in Documentation. (#181) * Reinstate PyMathics section in Documentation. We can't handle true guide sections yet though. See pymathics.graph (branch 6.0.0) for a module that has largely + been gone over. * graph SVG works now! Finally! The very small additional changes needed to get inline SVG's. Basically we just needed to decode the bytes, and extract off the + XML header line, keeping the ... tags. +@@ -225,7 +225,7 @@ + 2023-01-22 R. Bernstein + + * .github/workflows/osx.yaml, .github/workflows/ubuntu.yml, +- .github/workflows/windows.yml, mathics_django/version.py, setup.py: ++ .github/workflows/windows.yml, mathics_django/version.py, setup.py: + Master (#178) * Allow newer Mathics-core * Repair CI * Python 3.6 can't run Django 4.x * Another CI try * Bump version Also fix a typo in setup.py + + 2023-01-21 R. Bernstein +@@ -354,7 +354,7 @@ + + 2022-07-29 R. Bernstein + +- * mathics_django/doc/utils.py: two-arg URL enhancment for master ++ * mathics_django/doc/utils.py: two-arg URL enhancement for master + branch (#158) + + 2022-07-23 R. Bernstein +@@ -575,7 +575,7 @@ + + 2021-08-01 R. Bernstein + +- * : Merge pull request #133 from Mathics3/mathics-package-settings.m Packging woes - release 4.0.1 ++ * : Merge pull request #133 from Mathics3/mathics-package-settings.m Packaging woes - release 4.0.1 + + 2021-08-01 R. Bernstein + +@@ -694,7 +694,7 @@ + + 2021-07-22 rocky + +- * mathics_django/doc/django_doc.py, mathics_django/web/views.py: ++ * mathics_django/doc/django_doc.py, mathics_django/web/views.py: + Formatting for text sections needs escape_html.. More correct tagging for test output in guide sections Remove extraneous import + + 2021-07-22 rocky +@@ -843,7 +843,7 @@ + mathics_django/web/media/js/mathics-threejs-backend/index.js, + mathics_django/web/templates/about.html, + mathics_django/web/views.py, setup.py: Build threejs when needed... It should not be in git. Instead, build it when it is either needed +- or specificially requested. A number of Makefile and packaging updates. Some related to this, ++ or specifically requested. A number of Makefile and packaging updates. Some related to this, + but some not. + + 2021-07-11 Tiago Cavalcante Trindade +@@ -930,7 +930,7 @@ + mathics_django/web/templates/doc/part.html, + mathics_django/web/templates/doc/section.html, + mathics_django/web/urls.py, mathics_django/web/views.py: Reinstate +- section body. Tidy code a litle. ++ section body. Tidy code a little. + + 2021-06-29 rocky + +@@ -939,7 +939,7 @@ + mathics_django/web/templates/doc/section.html, + mathics_django/web/templates/doc/subsection.html, + mathics_django/web/urls.py, mathics_django/web/views.py: First cut +- at handling bultin subsections. ++ at handling builtin subsections. + + 2021-06-29 Tiago Cavalcante Trindade + +@@ -1076,7 +1076,7 @@ + + 2021-06-15 rocky + +- * mathics_django/autoload/settings.m, mathics_django/web/format.py: ++ * mathics_django/autoload/settings.m, mathics_django/web/format.py: + Surround Strings in quotes + + 2021-06-16 R. Bernstein +@@ -1094,7 +1094,7 @@ + + 2021-06-15 Tiago Cavalcante Trindade + +- * mathics_django/web/media/js/mathics.js: Remove uneccessary ++ * mathics_django/web/media/js/mathics.js: Remove unecessary + event.stop() + + 2021-06-15 Tiago Cavalcante Trindade +@@ -1110,7 +1110,7 @@ + 2021-06-15 Tiago Cavalcante Trindade + + * mathics_django/web/media/js/inout.js: Always create new popup, +- neccessary to reset the popup variable ++ necessary to reset the popup variable + + 2021-06-15 Tiago Cavalcante Trindade + +@@ -1257,7 +1257,7 @@ + + * mathics_django/web/format.py, + mathics_django/web/media/js/graphics3d.js, +- mathics_django/web/media/js/mathics.js, mathics_django/web/views.py: ++ mathics_django/web/media/js/mathics.js, mathics_django/web/views.py: + Detangle MathML from 3d graphics + + 2021-06-11 Tiago Cavalcante Trindade +@@ -1292,7 +1292,7 @@ + + 2021-06-10 Tiago Cavalcante Trindade + +- * .editorconfig, .github/workflows/{windows.yaml => windows.yml}: ++ * .editorconfig, .github/workflows/{windows.yaml => windows.yml}: + Rename windows.yaml to windows.yml + + 2021-06-10 Tiago Cavalcante Trindade +@@ -4006,7 +4006,7 @@ + mathics_django/web/media/js/mathjax/localization/zh-hant/MathML.js, + mathics_django/web/media/js/mathjax/localization/zh-hant/MathMenu.j + s, mathics_django/web/media/js/mathjax/localization/zh-hant/TeX.js, +- mathics_django/web/media/js/mathjax/localization/zh-hant/zh-hant.js: ++ mathics_django/web/media/js/mathjax/localization/zh-hant/zh-hant.js: + MathJax 2.7.9! With this we are up to the last 2.x release Circa 2020! + + 2021-05-14 R. Bernstein +@@ -7224,7 +7224,7 @@ + * test/test_combinatorica.py, test/test_console.py, + test/test_parser/test_convert.py, test/test_parser/test_parser.py, + test/test_parser/test_prescanner.py, +- test/test_parser/test_tokeniser.py, test/test_parser/test_util.py: ++ test/test_parser/test_tokeniser.py, test/test_parser/test_util.py: + Remove duplicate tests from Mathics3 + + 2021-02-19 rocky +@@ -7325,7 +7325,7 @@ + + 2020-12-30 rocky + +- * .github/workflows/ubuntu.yml: Workfows Administriva Use github git until we release Mathics 2.0.0 ++ * .github/workflows/ubuntu.yml: Workflows Administriva Use github git until we release Mathics 2.0.0 + + 2020-12-30 rocky + +@@ -7342,7 +7342,7 @@ + + 2020-12-29 rocky + +- * mathics_django/web/views.py: Guard agains WL replacement on None ++ * mathics_django/web/views.py: Guard against WL replacement on None + result + + 2020-12-29 R. Bernstein +@@ -7423,7 +7423,7 @@ + + 2020-12-04 rocky + +- * mathics_django/web/format.py: Handel labeled nodes better Use white background if we have (black) node labels. ++ * mathics_django/web/format.py: Handle labeled nodes better Use white background if we have (black) node labels. + + 2020-12-03 rocky + +@@ -7436,7 +7436,7 @@ + + 2020-12-01 rocky + +- * mathics_django/settings.py, mathics_django/web/views.py, tox.ini: ++ * mathics_django/settings.py, mathics_django/web/views.py, tox.ini: + inch closer + + 2020-12-01 rocky +@@ -8724,16 +8724,16 @@ + examples/combinatorica/test-c.sh, examples/test_driver.m, + examples/combinatorica/c-small.m => + mathics/autoload/combinatorica/CombinatoricaSmall.m, +- mathics/autoload/combinatorica/README.rst, test/test_evaluation.py: ++ mathics/autoload/combinatorica/README.rst, test/test_evaluation.py: + Add CombinatorcaSmall as an autoload package + + 2020-11-21 rocky + +- * examples/combinatorica/c-small.m: Try adding Paritions - fail. ++ * examples/combinatorica/c-small.m: Try adding Partitions - fail. + + 2020-11-21 rocky + +- * examples/combinatorica/c-small.m, examples/combinatorica/c-test.m: ++ * examples/combinatorica/c-small.m, examples/combinatorica/c-test.m: + Failed attempt at adding binary search + + 2020-11-21 rocky +@@ -8753,7 +8753,7 @@ + examples/symbolic_logic/gries_schneider/GS1.m, + examples/symbolic_logic/gries_schneider/GS2.m, + examples/symbolic_logic/gries_schneider/GS3.m, +- examples/{symbolic_logic/gries_schneider/GS0.m => test_driver.m}: ++ examples/{symbolic_logic/gries_schneider/GS0.m => test_driver.m}: + Start combinatorica examples Basically try the examples in the first page of the book. The test + harness has been move from GS0.m to test_driver.m so we can reuse + it. (It really doesn't have anything to do with Gries-Schneider +@@ -8832,7 +8832,7 @@ + + 2020-11-14 mmatera + +- * mathics/builtin/attributes.py, mathics/core/definitions.py: ++ * mathics/builtin/attributes.py, mathics/core/definitions.py: + protect + + 2020-11-14 mmatera +@@ -8863,7 +8863,7 @@ + + 2020-11-07 Juan Mauricio Matera + +- * : Merge pull request #1000 from weakit/minmax Symbolic comparisions. ++ * : Merge pull request #1000 from weakit/minmax Symbolic comparisons. + + 2020-11-05 weakit + +@@ -8924,7 +8924,7 @@ + + * Makefile, admin-tools/make-dist.sh, + app/requirements-mathicsscript.txt, mathics/builtin/patterns.py, +- mathics/core/expression.py, mathics/core/parser/tokeniser.py: ++ mathics/core/expression.py, mathics/core/parser/tokeniser.py: + Administrivia - lingering distribution stuff Go over Makefile to create docker image + + 2020-10-27 mmatera +@@ -8958,7 +8958,7 @@ + + 2020-10-26 mmatera + +- * mathics/core/expression.py, mathics/core/parser/tokeniser.py: ++ * mathics/core/expression.py, mathics/core/parser/tokeniser.py: + fixing ReplaceAll tokenizer with lookahead regexp + + 2020-10-26 mmatera +@@ -8995,7 +8995,7 @@ + * mathics/builtin/integer.py, mathics/builtin/numeric.py, + mathics/builtin/options.py, mathics/builtin/patterns.py, + mathics/builtin/strings.py, +- mathics/doc/documentation/1-Manual.mdoc, test/test_evaluation.py: ++ mathics/doc/documentation/1-Manual.mdoc, test/test_evaluation.py: + Title Capitalization; StringInsert examples + + 2020-10-18 R. Bernstein +@@ -9063,7 +9063,7 @@ + + 2020-10-15 rocky + +- * Makefile, mathics/builtin/inout.py, mathics/doc/tex/Makefile: ++ * Makefile, mathics/builtin/inout.py, mathics/doc/tex/Makefile: + Simplify doc building And try not to duplication running tests + + 2020-10-15 rocky +@@ -9077,7 +9077,7 @@ + + 2020-10-14 rocky + +- * mathics/builtin/inout.py, mathics/doc/documentation/1-Manual.mdoc: ++ * mathics/builtin/inout.py, mathics/doc/documentation/1-Manual.mdoc: + Don't be sensitive in testing to SansSerif.. + + 2020-10-14 rocky +@@ -9244,7 +9244,7 @@ + 2020-10-07 rocky + + * mathics/builtin/datentime.py, mathics/builtin/evaluation.py, +- mathics/builtin/plot.py, mathics/builtin/system.py, mathics/test.py: ++ mathics/builtin/plot.py, mathics/builtin/system.py, mathics/test.py: + Add --keep-going, and --doc-only... And also go over more test doc descriptions. Fixes #947 + + 2020-10-07 rocky +@@ -9345,7 +9345,7 @@ + + 2020-10-05 rocky + +- * mathics/doc/doc.py, mathics/test.py: Add test.py --count arg Also, Skip sandbox tests *only* if environemnt variable SANDBOX is ++ * mathics/doc/doc.py, mathics/test.py: Add test.py --count arg Also, Skip sandbox tests *only* if environment variable SANDBOX is + not set --count is expected to facilitate going over the docstrings for new + builtins + +@@ -9382,7 +9382,7 @@ + 2020-10-04 rocky + + * Makefile, mathics/web/urls.py, mathics/web/views.py, setup.py: 4 +- small tweaks: urls.py: blacken setup.py: remove not necessary decpendencies - colorama is optional as it was in 1.0 - pyplot was part of graphs. It will appear in a depencency in ++ small tweaks: urls.py: blacken setup.py: remove not necessary decpendencies - colorama is optional as it was in 1.0 - pyplot was part of graphs. It will appear in a dependency in + the corresponding graphs pymathics module views.py: remove some + unused imports Makefile: A better description of what "doc" is + about. +@@ -9439,7 +9439,7 @@ + 2020-10-02 rocky + + * mathics/core/pattern.py: Fix runtime bugs seen from GS3.m in +- per_expr() per_expr() needs to return a in interator return, not the default ++ per_expr() per_expr() needs to return a in iterator return, not the default + implied `return None` as can happen. In Python 3, // is used for truncated integer division. In Python 2 + it was /. That now returns float in Python 3. Note the brokenness of self.get_wrappings To reproduce brokenness before build, in `mathics` run: ``` + <<"https://raw.githubusercontent.com/rebcabin/Mathics/master/mathics/packages/GS3.m"``` +@@ -9520,7 +9520,7 @@ + + 2016-10-13 Bernhard Liebl + +- * mathics/core/definitions.py, mathics/core/expression.py: ++ * mathics/core/definitions.py, mathics/core/expression.py: + unification with _sequences + + 2016-10-13 Bernhard Liebl +@@ -9626,7 +9626,7 @@ + 2020-09-27 rocky + + * README.rst: Revise docker setup instructions https://hub.docker.com/repository/docker/rockyb/mathics has a more +- recent docker contrainer for 1.1-dev. The natlang module isnt' built, but I don't think right now that's ++ recent docker container for 1.1-dev. The natlang module isn't built, but I don't think right now that's + important. Never let perfection get in the way of progress. Issue #927 has been created to track remaining steps. + + 2020-09-27 R. Bernstein +@@ -11577,7 +11577,7 @@ + + 2020-09-27 rocky + +- * .github/FUNDING.yml: Add a github sponsers button Developers/Mainainers: feel free to add to/change this. ++ * .github/FUNDING.yml: Add a github sponsors button Developers/Maintainers: feel free to add to/change this. + + 2020-09-27 Pablo Emilio Escobar Gaviria + +@@ -11586,7 +11586,7 @@ + 2020-09-27 Pablo Emilio Escobar Gaviria + + * COPYING.txt, README.rst, mathics/doc/documentation/1-Manual.mdoc, +- mathics/web/templates/main.html, pymathics/setup.py, setup.py: ++ mathics/web/templates/main.html, pymathics/setup.py, setup.py: + Updated the links in the documentation to point to mathics.org + instead of mathics.github.io + +@@ -11694,20 +11694,20 @@ + + 2020-09-19 mmatera + +- * mathics/autoload/formats/SVG/Export.m, mathics/builtin/inout.py: ++ * mathics/autoload/formats/SVG/Export.m, mathics/builtin/inout.py: + fix export + + 2020-09-19 mmatera + +- * mathics/builtin/inout.py: Unprotect by defaut 2 ++ * mathics/builtin/inout.py: Unprotect by default + + 2020-09-19 mmatera + +- * mathics/builtin/__init__.py: Unprotect by defaukt ++ * mathics/builtin/__init__.py: Unprotect by default + + 2020-09-19 mmatera + +- * mathics/builtin/inout.py, mathics/doc/documentation/1-Manual.mdoc: ++ * mathics/builtin/inout.py, mathics/doc/documentation/1-Manual.mdoc: + fixing 1-Manual.doc and Format + + 2020-09-19 mmatera +@@ -11875,11 +11875,11 @@ + + 2020-09-16 Pablo Emilio Escobar Gaviria + +- * .travis.yml: Revert "Tryed using conda to install llvmlite" This reverts commit b3887d0bf6656b28c28a40f921c9ac99773d6215. ++ * .travis.yml: Revert "Tried using conda to install llvmlite" This reverts commit b3887d0bf6656b28c28a40f921c9ac99773d6215. + + 2020-09-16 Pablo Emilio Escobar Gaviria + +- * .travis.yml: Tryed using conda to install llvmlite ++ * .travis.yml: Tried using conda to install llvmlite + + 2020-09-16 Gark Garcia <37553739+GarkGarcia@users.noreply.github.com> + +@@ -12168,12 +12168,12 @@ + => admin-tools/release.sh, test/test_console.py, tox.ini: Build and + Doc tweaks .gitignore: There is a lot of stuff in mathics/doc/tex that is + derived and should be ignored Makefile: Add a top-level Makefile to simplify most of the routine +- tasks See remake --tasks for more detail README.rst: add section for running, simplfy install via Makefile admin-tools: put administrative code here. More may come. BTW ++ tasks See remake --tasks for more detail README.rst: add section for running, simplify install via Makefile admin-tools: put administrative code here. More may come. BTW + release.sh will probably get revised. test/test_console.py: remove a Python deprecation: \- -> \\- tox.ini: Revise - sympy and python versions. More is probably needed + + 2020-09-12 Gark Garcia <37553739+GarkGarcia@users.noreply.github.com> + +- * : Merge pull request #873 from GarkGarcia/sum-product-fix Added exemples to the documentation of `Sum` and `Product` ++ * : Merge pull request #873 from GarkGarcia/sum-product-fix Added examples to the documentation of `Sum` and `Product` + + 2019-06-06 mmatera + +@@ -12190,7 +12190,7 @@ + + 2020-09-12 Gark Garcia <37553739+GarkGarcia@users.noreply.github.com> + +- * : Merge pull request #873 from GarkGarcia/sum-product-fix Added exemples to the documentation of `Sum` and `Product` ++ * : Merge pull request #873 from GarkGarcia/sum-product-fix Added examples to the documentation of `Sum` and `Product` + + 2020-09-12 Gark Garcia <37553739+GarkGarcia@users.noreply.github.com> + +@@ -12230,7 +12230,7 @@ + + 2020-09-11 rocky + +- * mathics/builtin/graphs.py, setup.py: Use pydot for Graphs... mathics/builtin/graphs.py: Athough while ago there pydotplus was preferred, numpy wants pydot, not pydotplus. And pydot seems to be newer than pydotplus, and has more maintainers. So switch this code to use pydot, not pydotplus as previously desired. ++ * mathics/builtin/graphs.py, setup.py: Use pydot for Graphs... mathics/builtin/graphs.py: Although while ago there pydotplus was preferred, numpy wants pydot, not pydotplus. And pydot seems to be newer than pydotplus, and has more maintainers. So switch this code to use pydot, not pydotplus as previously desired. + + 2020-09-11 Gark Garcia <37553739+GarkGarcia@users.noreply.github.com> + +@@ -12302,7 +12302,7 @@ + 2020-09-11 Gark Garcia <37553739+GarkGarcia@users.noreply.github.com> + + * : Merge pull request #859 from +- rocky/add-system-byteordering-and-black Add System`Byteordering System`Environemnt and blacken system.py ++ rocky/add-system-byteordering-and-black Add System`Byteordering System`Environment and blacken system.py + + 2020-09-11 Gark Garcia <37553739+GarkGarcia@users.noreply.github.com> + +@@ -12317,7 +12317,7 @@ + + * .travis.yml, mathics/doc/doc.py, mathics/doc/images.sh, + mathics/doc/tex/Makefile: fixing dependencies "convert" from imagemagick produces an error due to new security +- features. As inkscape is also necesary, and the last version is also ++ features. As inkscape is also necessary, and the last version is also + able to make the conversion, I just removed imagemagick from the + dependencies, using here just inkscape adding escape characters to latex filter showing errors in documentation compiling + +@@ -12390,7 +12390,7 @@ + + 2020-09-08 Gark Garcia <37553739+GarkGarcia@users.noreply.github.com> + +- * : Merge pull request #839 from rocky/Python-3.8-posonlyargs Python 3.8, 3.9 and Pypy 3.6 compatability ++ * : Merge pull request #839 from rocky/Python-3.8-posonlyargs Python 3.8, 3.9 and Pypy 3.6 compatibility + + 2020-09-08 rocky + +@@ -12540,8 +12540,8 @@ + 2020-09-06 Pablo Emilio Escobar Gaviria + + * mathics/builtin/linalg.py: Reverted the decision to normalize the +- eigenvectors Althought there was a TODO stating that the eigenvectors should be +- normalized, aparently Mathematica does not do so ++ eigenvectors Although there was a TODO stating that the eigenvectors should be ++ normalized, apparently Mathematica does not do so + + 2020-09-06 Pablo Emilio Escobar Gaviria + +@@ -12549,21 +12549,21 @@ + + 2020-09-06 Pablo Emilio Escobar Gaviria + +- * mathics/builtin/linalg.py: Refactored the algorith that sorts the ++ * mathics/builtin/linalg.py: Refactored the algorithm that sorts the + results of Eigenvectors Also made it so that eigvectors are presented in their normalized + form + + 2020-09-06 Pablo Emilio Escobar Gaviria + +- * mathics/builtin/linalg.py: Refactored the algorith that sorts the ++ * mathics/builtin/linalg.py: Refactored the algorithm that sorts the + results of Eigenvalues + + 2020-09-06 rocky + +- * mathics/builtin/graphics.py, mathics/builtin/graphs.py, setup.py: ++ * mathics/builtin/graphics.py, mathics/builtin/graphs.py, setup.py: + Fix two `python mathics/test.py -o` errors graphics.py extent(): For EdgeConnectivity[Graph[{}]] total_extent + can return [None, None, None, None] for {x,y}m{in,max}. So check for +- this and dissallowing None *= 2 graphs.py _path_layout(): For PathGraph[{1, 2, 3}] neighbors is a ++ this and disallowing None *= 2 graphs.py _path_layout(): For PathGraph[{1, 2, 3}] neighbors is a + generator, so next(neighobors) is used instead of neighbors[0] An unused import and trailing blanks have been removed. (My editor + did the latter, my programming environment suggested removing the + unused import) +@@ -12673,7 +12673,7 @@ + 2020-09-03 Pablo Emilio Escobar Gaviria + + * mathics/builtin/functional.py, mathics/core/expression.py: Fixed +- the bahaviour of `Expression.apply_slots` Now `Expression.apply_slots` takes associations into account ++ the behaviour of `Expression.apply_slots` Now `Expression.apply_slots` takes associations into account + + 2020-09-03 Gark Garcia <37553739+GarkGarcia@users.noreply.github.com> + +@@ -12694,7 +12694,7 @@ + + 2020-09-01 Pablo Emilio Escobar Gaviria + +- * mathics/builtin/algebra.py: Impleted trigonometric identity ++ * mathics/builtin/algebra.py: Implemented trigonometric identity + expansion + + 2020-08-30 Gark Garcia <37553739+GarkGarcia@users.noreply.github.com> +@@ -12721,7 +12721,7 @@ + + 2020-08-29 Pablo Emilio Escobar Gaviria + +- * mathics/builtin/calculus.py: Clened up the code for the `Root` ++ * mathics/builtin/calculus.py: Cleaned up the code for the `Root` + implementation + + 2020-08-29 Bernhard Liebl +@@ -12890,12 +12890,12 @@ + 2020-08-26 Pablo Emilio Escobar Gaviria + + * mathics/builtin/calculus.py: Revert "Adjusted the index check to +- account for the fact that in Mathics indeces start from 1" This reverts commit de259062fbb2a00bad382f836a6d36d1d9999f07. ++ account for the fact that in Mathics indices start from 1. This reverts commit de259062fbb2a00bad382f836a6d36d1d9999f07. + + 2020-08-26 Pablo Emilio Escobar Gaviria + + * mathics/builtin/calculus.py: Adjusted the index check to account +- for the fact that in Mathics indeces start from 1 ++ for the fact that in Mathics indices start from 1 + + 2020-08-26 Pablo Emilio Escobar Gaviria + +@@ -13097,7 +13097,7 @@ + + 2019-05-26 Сухарик + +- * mathics/builtin/pymimesniffer/magic.py, mathics/core/convert.py: ++ * mathics/builtin/pymimesniffer/magic.py, mathics/core/convert.py: + Add big O conversion + + 2019-05-25 Сухарик +@@ -13374,7 +13374,7 @@ + + 2017-03-20 Long Nguyen + +- * mathics/builtin/algebra.py, mathics/builtin/arithmetic.py: ++ * mathics/builtin/algebra.py, mathics/builtin/arithmetic.py: + to_sympy errors handling + + 2017-03-20 Long Nguyen +@@ -13518,7 +13518,7 @@ + + 2016-12-28 Angus Griffith <16sn6uv@gmail.com> + +- * mathics/core/parser/convert.py, mathics/core/parser/parser.py: ++ * mathics/core/parser/convert.py, mathics/core/parser/parser.py: + cleanup parser code + + 2016-12-28 Angus Griffith <16sn6uv@gmail.com> +@@ -13531,7 +13531,7 @@ + mathics/core/parser/ast.py, mathics/core/parser/convert.py, + mathics/core/parser/feed.py, mathics/core/parser/parser.py, + mathics/core/parser/prescanner.py, +- mathics/core/parser/tokeniser.py, test/test_parser/test_parser.py: ++ mathics/core/parser/tokeniser.py, test/test_parser/test_parser.py: + fix #654 + + 2016-12-28 Angus Griffith <16sn6uv@gmail.com> +@@ -14316,7 +14316,7 @@ + + 2016-09-26 Bernhard Liebl + +- * mathics/builtin/inout.py, mathics/doc/documentation/1-Manual.mdoc: ++ * mathics/builtin/inout.py, mathics/doc/documentation/1-Manual.mdoc: + added display="block" to fix Jupyter display problems + + 2016-09-25 Angus Griffith <16sn6uv@gmail.com> +@@ -14325,7 +14325,7 @@ + + 2016-09-25 Bernhard Liebl + +- * mathics/builtin/inout.py, mathics/doc/documentation/1-Manual.mdoc: ++ * mathics/builtin/inout.py, mathics/doc/documentation/1-Manual.mdoc: + fixes test cases + + 2016-09-25 Bernhard Liebl +@@ -14449,7 +14449,7 @@ + 2016-09-21 Bernhard Liebl + + * mathics/builtin/strings.py: unicode, support for multiple +- occurences of symbol ++ occurrences of symbol + + 2016-09-21 Bernhard Liebl + +@@ -14541,7 +14541,7 @@ + * mathics/builtin/__init__.py, mathics/builtin/compilation.py, + mathics/builtin/compile/__init__.py, + mathics/builtin/compile/base.py, mathics/builtin/compile/ir.py, +- mathics/core/evaluation.py, setup.py, test/test_compile.py: ++ mathics/core/evaluation.py, setup.py, test/test_compile.py: + implement Compile and CompiledFunction + + 2016-09-14 Angus Griffith <16sn6uv@gmail.com> +@@ -14599,7 +14599,7 @@ + 2016-09-14 Angus Griffith <16sn6uv@gmail.com> + + * mathics/builtin/compile.py, test/test_compile.py: implement Equal, +- Unequal and other comparisions ++ Unequal and other comparisons + + 2016-09-14 Angus Griffith <16sn6uv@gmail.com> + +@@ -14661,7 +14661,7 @@ + + 2016-09-20 Bernhard Liebl + +- * mathics/builtin/patterns.py, mathics/builtin/strings.py: ++ * mathics/builtin/patterns.py, mathics/builtin/strings.py: + StringCases, Shortest, Longest + + 2016-09-20 Angus Griffith <16sn6uv@gmail.com> +@@ -14670,7 +14670,7 @@ + + 2016-09-20 Angus Griffith <16sn6uv@gmail.com> + +- * : Merge pull request #563 from poke1024/pick an implemenation of Pick[] ++ * : Merge pull request #563 from poke1024/pick an implementation of Pick[] + + 2016-09-20 Angus Griffith <16sn6uv@gmail.com> + +@@ -14744,7 +14744,7 @@ + + 2016-09-17 Bernhard Liebl + +- * mathics/builtin/lists.py: an implemenation of Pick ++ * mathics/builtin/lists.py: an implementation of Pick + + 2016-09-17 Angus Griffith <16sn6uv@gmail.com> + +@@ -14963,12 +14963,12 @@ + + 2016-05-19 Bernhard Liebl + +- * mathics/builtin/inout.py, mathics/core/evaluation.py: ++ * mathics/builtin/inout.py, mathics/core/evaluation.py: + $OutputSizeLimit support for Grid[] + + 2016-05-18 Bernhard Liebl + +- * mathics/builtin/evaluation.py, mathics/core/evaluation.py: ++ * mathics/builtin/evaluation.py, mathics/core/evaluation.py: + $OutputSizeLimit support for OutputForm + + 2016-05-18 Bernhard Liebl +@@ -15145,7 +15145,7 @@ + 2016-09-11 Josh Chen + + * mathics/web/media/css/styles.css, +- mathics/web/media/js/mathics.js, mathics/web/templates/main.html: ++ mathics/web/media/js/mathics.js, mathics/web/templates/main.html: + Checkpoint commit before starting rewrite of undo-redo + + 2016-09-11 Piruzzolo +@@ -15210,7 +15210,7 @@ + 2016-09-10 Josh Chen + + * mathics/web/media/css/styles.css, +- mathics/web/media/js/mathics.js, mathics/web/templates/base.html: ++ mathics/web/media/js/mathics.js, mathics/web/templates/base.html: + Animate logo when working + + 2016-09-10 Josh Chen +@@ -15635,7 +15635,7 @@ + + 2016-06-23 Bernhard Liebl + +- * mathics/builtin/colors.py: fixes identation ++ * mathics/builtin/colors.py: fixes indentation + + 2016-06-23 Bernhard Liebl + +@@ -15653,7 +15653,7 @@ + + * mathics/builtin/colors.py, + mathics/builtin/numpy_utils/with_numpy.py, +- mathics/builtin/numpy_utils/without_numpy.py, test/test_color.py: ++ mathics/builtin/numpy_utils/without_numpy.py, test/test_color.py: + work in progress: bug fixes, test cases + + 2016-06-16 Bernhard Liebl +@@ -15666,7 +15666,7 @@ + numpy_utils}/__init__.py, mathics/builtin/{numpy => + numpy_utils}/with_numpy.py, mathics/builtin/{numpy => + numpy_utils}/without_numpy.py, mathics/builtin/randomnumbers.py, +- test/test_color.py, test/{test_numpy.py => test_numpy_utils.py}: ++ test/test_color.py, test/{test_numpy.py => test_numpy_utils.py}: + renamed package "numpy" back to "numpy_utils" + + 2016-06-16 Bernhard Liebl +@@ -15675,7 +15675,7 @@ + mathics/builtin/numpy/with_numpy.py, + mathics/builtin/numpy/without_numpy.py, + mathics/builtin/numpy_utils.py, mathics/builtin/randomnumbers.py, +- test/test_color.py, test/{test_numpy_utils.py => test_numpy.py}: ++ test/test_color.py, test/{test_numpy_utils.py => test_numpy.py}: + moved numpy_utils into a new "numpy" package + + 2016-06-15 Bernhard Liebl +@@ -15712,13 +15712,13 @@ + 2016-06-14 Bernhard Liebl + + * mathics/builtin/colors.py, mathics/builtin/graphics.py, +- mathics/builtin/numpy_utils.py, mathics/builtin/randomnumbers.py: ++ mathics/builtin/numpy_utils.py, mathics/builtin/randomnumbers.py: + work in progress: color conversion with and without numpy + + 2016-06-05 Bernhard Liebl + + * mathics/builtin/graphics.py, test/test_color.py: bug fixes and +- better accurary in the LAB conversions ++ better accuracy in the LAB conversions + + 2016-06-04 Bernhard Liebl + +@@ -15916,7 +15916,7 @@ + + 2016-08-22 Bernhard Liebl + +- * mathics/builtin/arithmetic.py, mathics/builtin/comparison.py: ++ * mathics/builtin/arithmetic.py, mathics/builtin/comparison.py: + fixes for to_sympy in non-binary comparisons, fixes for Piecewise[] + + 2016-08-19 Bernhard Liebl +@@ -16011,7 +16011,7 @@ + + 2016-07-17 Bernhard Liebl + +- * mathics/algorithm/clusters.py, mathics/builtin/lists.py: ++ * mathics/algorithm/clusters.py, mathics/builtin/lists.py: + silhouette and dunn as default k criteria; use fsum where possible; + major cleanup + +@@ -16075,7 +16075,7 @@ + + 2016-07-09 Bernhard Liebl + +- * mathics/algorithm/clusters.py, mathics/builtin/lists.py: ++ * mathics/algorithm/clusters.py, mathics/builtin/lists.py: + ClusteringComponents[]: better test cases, fixes a bug with + Agglomerate + +@@ -16090,7 +16090,7 @@ + + 2016-07-09 Bernhard Liebl + +- * mathics/builtin/base.py, mathics/builtin/lists.py: ++ * mathics/builtin/base.py, mathics/builtin/lists.py: + DistanceFunction option for FindClusters[] + + 2016-07-09 Bernhard Liebl +@@ -16246,7 +16246,7 @@ + + 2016-05-05 Angus Griffith <16sn6uv@gmail.com> + +- * mathics/builtin/image.py: cleanp image arith ++ * mathics/builtin/image.py: clean up image arithmetic + + 2016-05-05 Angus Griffith <16sn6uv@gmail.com> + +@@ -16382,7 +16382,7 @@ + + 2016-04-27 Bernhard Liebl + +- * mathics/autoload/formats/JPEG/Import.m, mathics/builtin/image.py: ++ * mathics/autoload/formats/JPEG/Import.m, mathics/builtin/image.py: + basic support for images (python 3 version) + + 2016-08-16 Bernhard Liebl +@@ -16597,7 +16597,7 @@ + + 2016-08-09 Bernhard Liebl + +- * mathics/builtin/arithmetic.py, mathics/builtin/calculus.py: ++ * mathics/builtin/arithmetic.py, mathics/builtin/calculus.py: + cleanup + + 2016-08-09 Bernhard Liebl +@@ -16675,7 +16675,7 @@ + + 2016-08-06 Angus Griffith <16sn6uv@gmail.com> + +- * mathics/__init__.py, test/test_convert.py, test/test_hash.py: ++ * mathics/__init__.py, test/test_convert.py, test/test_hash.py: + MachineReal unittests + + 2016-08-05 Angus Griffith <16sn6uv@gmail.com> +@@ -16864,7 +16864,7 @@ + + 2016-07-29 Angus Griffith <16sn6uv@gmail.com> + +- * mathics/builtin/arithmetic.py, mathics/core/expression.py: ++ * mathics/builtin/arithmetic.py, mathics/core/expression.py: + implement mpmath machine precision workaround + + 2016-07-29 Angus Griffith <16sn6uv@gmail.com> +@@ -16893,7 +16893,7 @@ + + * mathics/builtin/arithmetic.py, mathics/builtin/files.py, + mathics/builtin/numeric.py, mathics/builtin/randomnumbers.py, +- mathics/core/convert.py: fix Complex construtor calls ++ mathics/core/convert.py: fix Complex constructor calls + + 2016-07-26 Angus Griffith <16sn6uv@gmail.com> + +@@ -16927,7 +16927,7 @@ + 2016-07-21 Angus Griffith <16sn6uv@gmail.com> + + * mathics/builtin/exptrig.py, mathics/builtin/numeric.py, +- mathics/builtin/specialfunctions.py, mathics/core/expression.py: ++ mathics/builtin/specialfunctions.py, mathics/core/expression.py: + MachineReal support for N + + 2016-07-21 Angus Griffith <16sn6uv@gmail.com> +@@ -17420,7 +17420,7 @@ + + 2016-07-06 Angus Griffith <16sn6uv@gmail.com> + +- * mathics/core/parser/parser.py, test/test_parser/test_parser.py: ++ * mathics/core/parser/parser.py, test/test_parser/test_parser.py: + fix #431 and #274 + + 2016-07-05 Angus Griffith <16sn6uv@gmail.com> +@@ -17437,7 +17437,7 @@ + * mathics/builtin/arithmetic.py, mathics/builtin/calculus.py, + mathics/builtin/control.py, mathics/builtin/exptrig.py, + mathics/builtin/graphics3d.py, mathics/builtin/linalg.py, +- mathics/core/expression.py, mathics/doc/documentation/1-Manual.mdoc: ++ mathics/core/expression.py, mathics/doc/documentation/1-Manual.mdoc: + fix some precision tests + + 2016-07-04 Angus Griffith <16sn6uv@gmail.com> +@@ -17646,12 +17646,12 @@ + + 2016-06-23 Angus Griffith <16sn6uv@gmail.com> + +- * mathics/builtin/inout.py, mathics/core/parser/parser.py: ++ * mathics/builtin/inout.py, mathics/core/parser/parser.py: + Syntax::com warning + + 2016-06-23 Angus Griffith <16sn6uv@gmail.com> + +- * mathics/core/parser/__init__.py, mathics/core/parser/util.py: ++ * mathics/core/parser/__init__.py, mathics/core/parser/util.py: + remove ExpressionGenerator + + 2016-06-22 Angus Griffith <16sn6uv@gmail.com> +@@ -17667,7 +17667,7 @@ + + 2016-06-22 Angus Griffith <16sn6uv@gmail.com> + +- * mathics/core/parser/parser.py, test/test_parser/test_parser.py: ++ * mathics/core/parser/parser.py, test/test_parser/test_parser.py: + flatten unary plus too + + 2016-06-22 Angus Griffith <16sn6uv@gmail.com> +@@ -17681,7 +17681,7 @@ + + 2016-06-22 Angus Griffith <16sn6uv@gmail.com> + +- * mathics/core/parser/operators.py, test/test_parser/test_parser.py: ++ * mathics/core/parser/operators.py, test/test_parser/test_parser.py: + fix operator precedences + + 2016-06-21 Angus Griffith <16sn6uv@gmail.com> +@@ -17792,7 +17792,7 @@ + + 2016-06-18 Angus Griffith <16sn6uv@gmail.com> + +- * mathics/core/parser/parser.py, mathics/core/parser/tokeniser.py: ++ * mathics/core/parser/parser.py, mathics/core/parser/tokeniser.py: + tokeniser modes + + 2016-06-18 Angus Griffith <16sn6uv@gmail.com> +@@ -17829,7 +17829,7 @@ + + 2016-06-16 Angus Griffith <16sn6uv@gmail.com> + +- * mathics/core/parser/tokeniser.py, test/parser/test_tokeniser.py: ++ * mathics/core/parser/tokeniser.py, test/parser/test_tokeniser.py: + add Backslash token (different to RawBackslash) + + 2016-06-16 Angus Griffith <16sn6uv@gmail.com> +@@ -17846,12 +17846,12 @@ + + 2016-06-16 Angus Griffith <16sn6uv@gmail.com> + +- * mathics/core/parser/__init__.py, mathics/core/parser/tokeniser.py: ++ * mathics/core/parser/__init__.py, mathics/core/parser/tokeniser.py: + implement is_symbol_name function + + 2016-06-16 Angus Griffith <16sn6uv@gmail.com> + +- * mathics/core/parser/parser.py, mathics/core/parser/tokeniser.py: ++ * mathics/core/parser/parser.py, mathics/core/parser/tokeniser.py: + tokenise slot symb + + 2016-06-16 Angus Griffith <16sn6uv@gmail.com> +@@ -17980,7 +17980,7 @@ + + 2016-06-12 Angus Griffith <16sn6uv@gmail.com> + +- * mathics/core/parser/operators.py, test/parser/test_parser.py: ++ * mathics/core/parser/operators.py, test/parser/test_parser.py: + boolean op parsing + + 2016-06-12 Angus Griffith <16sn6uv@gmail.com> +@@ -17990,7 +17990,7 @@ + 2016-06-12 Angus Griffith <16sn6uv@gmail.com> + + * mathics/core/parser/ast.py, mathics/core/parser/operators.py, +- mathics/core/parser/parser.py, test/parser/test_parser.py: ++ mathics/core/parser/parser.py, test/parser/test_parser.py: + inequality parsing + + 2016-06-12 Angus Griffith <16sn6uv@gmail.com> +@@ -18021,7 +18021,7 @@ + + 2016-06-10 Angus Griffith <16sn6uv@gmail.com> + +- * mathics/core/parser/operators.py, mathics/core/parser/parser.py: ++ * mathics/core/parser/operators.py, mathics/core/parser/parser.py: + fix Postfix parsing + + 2016-06-10 Angus Griffith <16sn6uv@gmail.com> +@@ -18128,12 +18128,12 @@ + + 2016-06-06 Angus Griffith <16sn6uv@gmail.com> + +- * mathics/core/parser/convert.py, test/parser/test_convert.py: ++ * mathics/core/parser/convert.py, test/parser/test_convert.py: + String convert bug + + 2016-06-06 Angus Griffith <16sn6uv@gmail.com> + +- * mathics/core/parser/__init__.py, mathics/core/parser/operators.py: ++ * mathics/core/parser/__init__.py, mathics/core/parser/operators.py: + implement all_operator_names + + 2016-06-06 Angus Griffith <16sn6uv@gmail.com> +@@ -18188,7 +18188,7 @@ + + 2016-06-05 Angus Griffith <16sn6uv@gmail.com> + +- * mathics/core/parser/parser.py, test/parser/test_tokeniser.py: ++ * mathics/core/parser/parser.py, test/parser/test_tokeniser.py: + Prefix @ parsing + + 2016-06-05 Angus Griffith <16sn6uv@gmail.com> +@@ -18202,7 +18202,7 @@ + + 2016-06-05 Angus Griffith <16sn6uv@gmail.com> + +- * mathics/core/parser/parser.py, test/parser/test_tokeniser.py: ++ * mathics/core/parser/parser.py, test/parser/test_tokeniser.py: + postfix parsing + + 2016-06-05 Angus Griffith <16sn6uv@gmail.com> +@@ -18227,7 +18227,7 @@ + + 2016-06-05 Angus Griffith <16sn6uv@gmail.com> + +- * mathics/core/parser/operators.py, mathics/core/parser/parser.py: ++ * mathics/core/parser/operators.py, mathics/core/parser/parser.py: + fix integral parsing + + 2016-06-05 Angus Griffith <16sn6uv@gmail.com> +@@ -18240,7 +18240,7 @@ + + 2016-06-05 Angus Griffith <16sn6uv@gmail.com> + +- * mathics/core/parser/tokeniser.py, test/parser/test_tokeniser.py: ++ * mathics/core/parser/tokeniser.py, test/parser/test_tokeniser.py: + fix repreated int bug + + 2016-06-05 Angus Griffith <16sn6uv@gmail.com> +@@ -18260,12 +18260,12 @@ + + 2016-06-05 Angus Griffith <16sn6uv@gmail.com> + +- * mathics/core/parser/convert.py, test/parser/test_convert.py: ++ * mathics/core/parser/convert.py, test/parser/test_convert.py: + refactor parser converter + + 2016-06-05 Angus Griffith <16sn6uv@gmail.com> + +- * mathics/core/parser/operators.py, test/parser/test_parser.py: ++ * mathics/core/parser/operators.py, test/parser/test_parser.py: + defaultdict for all_ops + + 2016-06-05 Angus Griffith <16sn6uv@gmail.com> +@@ -18300,7 +18300,7 @@ + + 2016-06-04 Angus Griffith <16sn6uv@gmail.com> + +- * mathics/core/parser/tokeniser.py, test/parser/test_parser.py: ++ * mathics/core/parser/tokeniser.py, test/parser/test_parser.py: + cleanup parser tests + + 2016-06-04 Angus Griffith <16sn6uv@gmail.com> +@@ -18355,7 +18355,7 @@ + + 2016-06-04 Angus Griffith <16sn6uv@gmail.com> + +- * mathics/core/parser/__init__.py, mathics/core/parser/errors.py: ++ * mathics/core/parser/__init__.py, mathics/core/parser/errors.py: + rename ParseError to TranslateError + + 2016-06-04 Angus Griffith <16sn6uv@gmail.com> +@@ -18372,7 +18372,7 @@ + mathics/core/parser/ast.py, mathics/core/parser/convert.py, + mathics/core/parser/errors.py, mathics/core/parser/operators.py, + mathics/core/parser/parser.py, mathics/core/parser/prescanner.py, +- mathics/core/parser/tokeniser.py, mathics/core/parser/util.py: ++ mathics/core/parser/tokeniser.py, mathics/core/parser/util.py: + recursive descent parser + + 2016-06-12 Angus Griffith <16sn6uv@gmail.com> +@@ -18658,7 +18658,7 @@ + + 2016-05-21 Bernhard Liebl + +- * .travis.yml: added pypy4 to Travis exlude list since it's ++ * .travis.yml: added pypy4 to Travis exclude list since it's + currently not supported + + 2016-05-21 Bernhard Liebl +@@ -18798,7 +18798,7 @@ + + 2016-05-10 Bernhard Liebl + +- * mathics/builtin/lists.py, mathics/builtin/structure.py: ++ * mathics/builtin/lists.py, mathics/builtin/structure.py: + reorganization with existing DeleteDuplicates, Complement (work in + progress) + +@@ -19395,7 +19395,7 @@ + + 2016-02-14 Angus Griffith <16sn6uv@gmail.com> + +- * test/test_console.py, test/test_convert.py, test/test_parser.py: ++ * test/test_console.py, test/test_convert.py, test/test_parser.py: + patch unittest encoding + + 2016-02-14 Angus Griffith <16sn6uv@gmail.com> +@@ -19462,7 +19462,7 @@ + + 2016-02-12 Angus Griffith <16sn6uv@gmail.com> + +- * mathics/core/definitions.py, mathics/doc/doc.py, mathics/test.py: ++ * mathics/core/definitions.py, mathics/doc/doc.py, mathics/test.py: + fixup pickle binary read/write + + 2016-02-12 Angus Griffith <16sn6uv@gmail.com> +@@ -19510,7 +19510,7 @@ + + 2016-02-11 Angus Griffith <16sn6uv@gmail.com> + +- * mathics/builtin/files.py, mathics/builtin/pymimesniffer/magic.py: ++ * mathics/builtin/files.py, mathics/builtin/pymimesniffer/magic.py: + fix failed byte tests + + 2016-02-11 Angus Griffith <16sn6uv@gmail.com> +@@ -19630,7 +19630,7 @@ + mathics/web/media/js/authentication.js, + mathics/web/media/js/doc.js, mathics/web/media/js/inout.js, + mathics/web/media/js/mathics.js, mathics/web/media/js/utils.js, +- mathics/web/models.py, mathics/web/urls.py, mathics/web/views.py: ++ mathics/web/models.py, mathics/web/urls.py, mathics/web/views.py: + update license headers + + 2015-08-03 Angus Griffith <16sn6uv@gmail.com> +@@ -19686,7 +19686,7 @@ + + * mathics/benchmark.py, mathics/builtin/arithmetic.py, + mathics/builtin/calculus.py, mathics/core/evaluation.py, +- mathics/core/expression.py, mathics/test.py, mathics/web/views.py: ++ mathics/core/expression.py, mathics/test.py, mathics/web/views.py: + remove old style exceptions + + 2015-08-03 Angus Griffith <16sn6uv@gmail.com> +@@ -19704,11 +19704,11 @@ + + 2016-02-12 Angus Griffith <16sn6uv@gmail.com> + +- * : Merge pull request #316 from sn6uv/packagedata cleaup data,autoload,packages in setup.py ++ * : Merge pull request #316 from sn6uv/packagedata clea up data,autoload,packages in setup.py + + 2016-02-12 Angus Griffith <16sn6uv@gmail.com> + +- * setup.py: cleaup data,autoload,packages in setup.py ++ * setup.py: clea up data,autoload,packages in setup.py + + 2016-02-12 Angus Griffith <16sn6uv@gmail.com> + +@@ -19757,7 +19757,7 @@ + + 2016-01-31 Angus Griffith <16sn6uv@gmail.com> + +- * : Merge pull request #261 from sn6uv/initialize remove initalize.py ++ * : Merge pull request #261 from sn6uv/initialize remove initialize.py + + 2016-01-31 Angus Griffith <16sn6uv@gmail.com> + +@@ -19801,7 +19801,7 @@ + + 2015-10-14 Angus Griffith <16sn6uv@gmail.com> + +- * : Merge pull request #298 from sn6uv/Issue288 add main funciton to server.py - fixes #288 ++ * : Merge pull request #298 from sn6uv/Issue288 add main function to server.py - fixes #288 + + 2015-10-14 Angus Griffith <16sn6uv@gmail.com> + +@@ -19833,7 +19833,7 @@ + + 2015-09-12 mauricio + +- * mathics/autoload/formats/SVG/Export.m, mathics/builtin/strings.py: ++ * mathics/autoload/formats/SVG/Export.m, mathics/builtin/strings.py: + Removing tabs from the code. modified: mathics/builtin/strings.py + + 2015-09-11 Juan Mauricio Matera +@@ -19861,7 +19861,7 @@ + + 2015-09-10 Juan Mauricio Matera + +- * mathics/autoload/formats/SVG/Export.m: Assing support for Export ++ * mathics/autoload/formats/SVG/Export.m: Assign support for Export + Plots to svg new file: autoload/formats/SVG/Export.m + + 2015-09-10 Juan Mauricio Matera +@@ -20000,7 +20000,7 @@ + + * mathics/builtin/importexport.py, + mathics/doc/documentation/1-Manual.mdoc, setup.py, +- test/test_console.py, test/test_convert.py, test/test_parser.py: ++ test/test_console.py, test/test_convert.py, test/test_parser.py: + drop python 2.6 support + + 2015-06-22 Angus Griffith <16sn6uv@gmail.com> +@@ -20084,7 +20084,7 @@ + + 2015-07-06 Wolf Vollprecht + +- * mathics/builtin/lists.py: some more quick experimetns ++ * mathics/builtin/lists.py: some more quick experiments + + 2015-07-05 Wolf Vollprecht + +@@ -20164,7 +20164,7 @@ + + 2015-06-20 Angus Griffith <16sn6uv@gmail.com> + +- * initialize.py: remove initalize.py ++ * initialize.py: remove initialize.py + + 2015-06-20 Angus Griffith <16sn6uv@gmail.com> + +@@ -20230,7 +20230,7 @@ + + 2015-05-28 Angus Griffith <16sn6uv@gmail.com> + +- * mathics/builtin/arithmetic.py: sympy regresion on Product[1 + 1 / ++ * mathics/builtin/arithmetic.py: sympy regression on Product[1 + 1 / + i ^ 2, {i, Infinity}] + + 2015-05-22 Angus Griffith <16sn6uv@gmail.com> +@@ -20275,7 +20275,7 @@ + * mathics/__init__.py, mathics/builtin/algebra.py, + mathics/builtin/arithmetic.py, mathics/builtin/exptrig.py, + mathics/builtin/numeric.py, mathics/builtin/specialfunctions.py, +- mathics/core/expression.py, mathics/core/numbers.py, setup.py: ++ mathics/core/expression.py, mathics/core/numbers.py, setup.py: + prepare for sympy/mpmath unbundle + + 2015-05-16 Ben Jones +@@ -20409,7 +20409,7 @@ + + 2014-12-09 Ben Jones + +- * mathics/doc/doc.py, mathics/doc/utils.py, mathics/web/urls.py: ++ * mathics/doc/doc.py, mathics/doc/utils.py, mathics/web/urls.py: + doc: disambiguate Context and $Context Django's default slugify function removes all non-alphanumeric + characters, including ones that are significant in symbol names, + like $ and `. This meant that although Context and $Context both +@@ -20680,7 +20680,7 @@ + + 2014-03-25 Angus Griffith <16sn6uv@gmail.com> + +- * .travis.yml: allow documentaion builds to fail ++ * .travis.yml: allow documentation builds to fail + + 2014-03-25 Angus Griffith <16sn6uv@gmail.com> + +@@ -20727,12 +20727,12 @@ + + 2013-09-28 Angus Griffith <16sn6uv@gmail.com> + +- * test/test_console.py, test/test_convert.py, test/test_parser.py: ++ * test/test_console.py, test/test_convert.py, test/test_parser.py: + only import unittest2 for python2.6 + + 2013-09-24 Angus Griffith <16sn6uv@gmail.com> + +- * test/test_console.py, test/test_convert.py, test/test_parser.py: ++ * test/test_console.py, test/test_convert.py, test/test_parser.py: + replace unittest with unittest2 + + 2013-09-24 Angus Griffith <16sn6uv@gmail.com> +@@ -21030,7 +21030,7 @@ + + 2014-02-21 Ben Jones + +- * mathics/core/definitions.py, mathics/main.py, mathics/settings.py: ++ * mathics/core/definitions.py, mathics/main.py, mathics/settings.py: + Replace --show-contexts option with DEBUG_CONTEXTS setting + + 2014-02-21 Ben Jones +@@ -21608,7 +21608,7 @@ + 2013-10-20 Angus Griffith <16sn6uv@gmail.com> + + * mathics/doc/images.sh, mathics/doc/tex/Makefile, +- mathics/doc/tex/latexmkrc, mathics/doc/tex/mathics.tex: ++ mathics/doc/tex/latexmkrc, mathics/doc/tex/mathics.tex: + documentation tweaks + + 2013-10-21 Angus Griffith <16sn6uv@gmail.com> +@@ -21811,7 +21811,7 @@ + 2013-08-02 Angus Griffith <16sn6uv@gmail.com> + + * mathics/builtin/calculus.py, mathics/builtin/specialfunctions.py, +- setup.py: Upgrade to Sympy 0.7.3 incompatability changes: sympy.Ylm -> sympy.Ynm sympy.Expr.as_coeff_terms -> sympy.Expr.as_coeff_mul sympy.Symbol('x', dummy=True) -> sympy.Dummy('x') improvements: sympy.solve ++ setup.py: Upgrade to Sympy 0.7.3 incompatibility changes: sympy.Ylm -> sympy.Ynm sympy.Expr.as_coeff_terms -> sympy.Expr.as_coeff_mul sympy.Symbol('x', dummy=True) -> sympy.Dummy('x') improvements: sympy.solve + + 2013-09-14 Angus Griffith <16sn6uv@gmail.com> + +@@ -21897,7 +21897,7 @@ + + 2013-06-21 Angus Griffith <16sn6uv@gmail.com> + +- * mathics/builtin/arithmetic.py: improve DirectedInfinity formating ++ * mathics/builtin/arithmetic.py: improve DirectedInfinity formatting + and fix Abs bug + + 2013-06-21 Angus Griffith <16sn6uv@gmail.com> +@@ -23311,7 +23311,7 @@ + mathics/web/media/js/authentication.js, + mathics/web/media/js/doc.js, mathics/web/media/js/inout.js, + mathics/web/media/js/mathics.js, mathics/web/media/js/utils.js, +- mathics/web/models.py, mathics/web/urls.py, mathics/web/views.py: ++ mathics/web/models.py, mathics/web/urls.py, mathics/web/views.py: + Copyright is 2011-2013 The Mathics Team + + 2013-04-29 Angus Griffith <16sn6uv@gmail.com> +@@ -23458,7 +23458,7 @@ + + 2013-04-24 Angus Griffith <16sn6uv@gmail.com> + +- * mathics/core/parser.py: implement filname tokenizing ++ * mathics/core/parser.py: implement filename tokenizing + + 2013-04-23 Angus Griffith <16sn6uv@gmail.com> + +@@ -23494,7 +23494,7 @@ + + 2013-04-21 Angus Griffith <16sn6uv@gmail.com> + +- * mathics/builtin/patterns.py: evalute items during match ++ * mathics/builtin/patterns.py: evaluate items during match + + 2013-04-19 Angus Griffith <16sn6uv@gmail.com> + +@@ -23508,7 +23508,7 @@ + + 2013-04-17 Angus Griffith <16sn6uv@gmail.com> + +- * mathics/builtin/combinatorial.py: cleanup Binomial defintion using ++ * mathics/builtin/combinatorial.py: cleanup Binomial definition using + _MPMathFunction + + 2013-04-17 Angus Griffith <16sn6uv@gmail.com> +@@ -23614,7 +23614,7 @@ + 2013-04-08 Angus Griffith <16sn6uv@gmail.com> + + * mathics/core/expression.py, mathics/core/parser.py: fix bug force +- machine precision with arbitary base ++ machine precision with arbitrary base + + 2013-04-08 Angus Griffith <16sn6uv@gmail.com> + +@@ -23676,14 +23676,14 @@ + + 2013-04-03 Angus Griffith <16sn6uv@gmail.com> + +- * mathics/core/parser.py: add misssing rule token ++ * mathics/core/parser.py: add missing rule token + + 2013-04-02 Angus Griffith <16sn6uv@gmail.com> + + * mathics/builtin/arithmetic.py, mathics/builtin/datentime.py, + mathics/builtin/exptrig.py, mathics/builtin/inout.py, + mathics/builtin/linalg.py, mathics/builtin/lists.py, +- mathics/builtin/numeric.py, mathics/builtin/specialfunctions.py: ++ mathics/builtin/numeric.py, mathics/builtin/specialfunctions.py: + correct some tests + + 2013-04-02 Angus Griffith <16sn6uv@gmail.com> +@@ -23730,7 +23730,7 @@ + + * mathics/builtin/arithmetic.py, mathics/core/expression.py, + mathics/core/parser.py: implement automatic precision determination +- for numbers given in arbitary bases ++ for numbers given in arbitrary bases + + 2013-03-30 Angus Griffith <16sn6uv@gmail.com> + +@@ -24033,7 +24033,7 @@ + + 2013-04-21 Angus Griffith <16sn6uv@gmail.com> + +- * mathics/builtin/assignment.py, mathics/builtin/evaluation.py: ++ * mathics/builtin/assignment.py, mathics/builtin/evaluation.py: + cleanup setting python recursion limit + + 2013-04-21 Angus Griffith <16sn6uv@gmail.com> +@@ -24057,7 +24057,7 @@ + + 2013-04-08 Jan Pöschko + +- * : Merge pull request #122 from sn6uv/IPythonInput add IPython syle input ++ * : Merge pull request #122 from sn6uv/IPythonInput add IPython style input + + 2013-04-09 Angus Griffith <16sn6uv@gmail.com> + +@@ -24082,7 +24082,7 @@ + + 2013-04-05 Angus Griffith <16sn6uv@gmail.com> + +- * mathics/main.py: cleanup Ipython style propmpt ++ * mathics/main.py: cleanup Ipython style prompt + + 2013-04-03 Angus Griffith <16sn6uv@gmail.com> + +@@ -24098,7 +24098,7 @@ + + 2013-04-02 Angus Griffith <16sn6uv@gmail.com> + +- * mathics/main.py: enable IPython syle input ++ * mathics/main.py: enable IPython style input + + 2013-04-07 Jan Pöschko + +@@ -24152,7 +24152,7 @@ + 2013-03-08 Angus Griffith <16sn6uv@gmail.com> + + * mathics/builtin/files.py, mathics/builtin/scoping.py, +- mathics/main.py: cleanup code determining whether intepreter waits ++ mathics/main.py: cleanup code determining whether interpreter waits + for another line of input which fixes issues with Get command + + 2013-03-07 Angus Griffith <16sn6uv@gmail.com> +@@ -24181,8 +24181,8 @@ + + 2013-03-07 Angus Griffith <16sn6uv@gmail.com> + +- * mathics/autoload/packages/VectorAnalysis/VectorAnalysis.m: +- implement Coordinates, Paramaters, CoordinatRanges and ++ * mathics/autoload/packages/VectorAnalysis/VectorAnalysis.m: ++ implement Coordinates, Parameters, CoordinatRanges and + ParamaterRanges + + 2013-03-07 Angus Griffith <16sn6uv@gmail.com> +@@ -24196,7 +24196,7 @@ + + 2013-03-06 Angus Griffith <16sn6uv@gmail.com> + +- * mathics/autoload/packages/VectorAnalysis/VectorAnalysis.m: ++ * mathics/autoload/packages/VectorAnalysis/VectorAnalysis.m: + Implement CrossProduct DotProduct and ScalarTripleProduct + + 2013-03-20 Jan Pöschko +@@ -24262,7 +24262,7 @@ + + 2013-02-26 Angus Griffith <16sn6uv@gmail.com> + +- * mathics/builtin/arithmetic.py, mathics/builtin/structure.py: ++ * mathics/builtin/arithmetic.py, mathics/builtin/structure.py: + MPMathFunctions should use sympy on symbolic arguments not just + exact numbers + +@@ -24330,7 +24330,7 @@ + + * mathics/builtin/arithmetic.py, mathics/builtin/exptrig.py, + mathics/builtin/specialfunctions.py: cleanup of _MPMathFunction by +- adding mpmath_name analagous to sympy_name ++ adding mpmath_name analogous to sympy_name + + 2013-03-12 Jan Pöschko + +@@ -24374,7 +24374,7 @@ + + 2013-03-08 mr.Shu + +- * mathics/web/media/css/styles.css, mathics/web/media/js/doc.js: ++ * mathics/web/media/css/styles.css, mathics/web/media/js/doc.js: + added CSS + + 2013-03-08 mr.Shu +@@ -24557,7 +24557,7 @@ + + 2012-12-26 Angus Griffith <16sn6uv@gmail.com> + +- * mathics/autoload/format/Text/Import.m, mathics/builtin/files.py: ++ * mathics/autoload/format/Text/Import.m, mathics/builtin/files.py: + fix bug in ReadList: graceful fail + + 2012-12-25 Angus Griffith <16sn6uv@gmail.com> +@@ -24569,13 +24569,13 @@ + 2012-12-26 Angus Griffith <16sn6uv@gmail.com> + + * mathics/builtin/importexport.py, +- mathics/data/ExampleData/{ExampleData1.txt => ExampleData.txt}: ++ mathics/data/ExampleData/{ExampleData1.txt => ExampleData.txt}: + cleanup Import tests + + 2012-12-26 Angus Griffith <16sn6uv@gmail.com> + + * mathics/builtin/importexport.py: Post importers are actually +- optional and occur seperately to defalt/conditional importers ++ optional and occur separately to default/conditional importers + + 2012-12-26 Angus Griffith <16sn6uv@gmail.com> + +@@ -24628,7 +24628,7 @@ + + 2013-02-28 Angus Griffith <16sn6uv@gmail.com> + +- * mathics/builtin/attributes.py, mathics/builtin/evaluation.py: ++ * mathics/builtin/attributes.py, mathics/builtin/evaluation.py: + correct $RecursionLimit tests + + 2013-02-26 Jan Pöschko +@@ -24803,7 +24803,7 @@ + 2012-12-22 mr.Shu + + * mathics/builtin/numeric.py, mathics/core/expression.py: removed +- boxes funcion for Symbol ++ boxes function for Symbol + + 2012-12-21 mr.Shu + +@@ -24992,7 +24992,7 @@ + + 2012-12-06 Angus Griffith <16sn6uv@gmail.com> + +- * mathics/builtin/files.py: fix OpenRead OpenAppend on Non-existant ++ * mathics/builtin/files.py: fix OpenRead OpenAppend on Non-existent + files + + 2012-12-05 Angus Griffith <16sn6uv@gmail.com> +@@ -25309,7 +25309,7 @@ + + 2012-09-11 Angus Griffith <16sn6uv@gmail.com> + +- * mathics/builtin/files.py: cleanup file opperation module docs ++ * mathics/builtin/files.py: cleanup file operation module docs + + 2012-09-11 Angus Griffith <16sn6uv@gmail.com> + +@@ -25440,7 +25440,7 @@ + + 2012-12-08 mr.Shu + +- * mathics/main.py: add execute argumet ++ * mathics/main.py: add execute argument + + 2012-12-08 mr.Shu + +@@ -25588,7 +25588,7 @@ + + 2012-11-15 Angus Griffith <16sn6uv@gmail.com> + +- * mathics/builtin/numbertheory.py: RandomPrime can now genrate ++ * mathics/builtin/numbertheory.py: RandomPrime can now generate + arrays + + 2012-08-30 Angus Griffith <16sn6uv@gmail.com> +@@ -25811,7 +25811,7 @@ + + 2012-11-05 Angus Griffith <16sn6uv@gmail.com> + +- * mathics/server.py: check sqlite database existance upon launching ++ * mathics/server.py: check sqlite database existence upon launching + mathicsserver + + 2012-11-05 Angus Griffith <16sn6uv@gmail.com> +@@ -25847,7 +25847,7 @@ + + 2012-10-26 Angus Griffith <16sn6uv@gmail.com> + +- * mathics/benchmark/Random.m, mathics/builtin/randomnumbers.py: ++ * mathics/benchmark/Random.m, mathics/builtin/randomnumbers.py: + optimise RandomReal 100x + + 2012-10-26 Angus Griffith <16sn6uv@gmail.com> +@@ -26053,7 +26053,7 @@ + + 2012-10-13 Angus Griffith <16sn6uv@gmail.com> + +- * mathics/builtin/arithmetic.py, mathics/core/expression.py: ++ * mathics/builtin/arithmetic.py, mathics/core/expression.py: + formatting for Real, 1772 passed, 28 failed + + 2012-10-13 Angus Griffith <16sn6uv@gmail.com> +@@ -26077,7 +26077,7 @@ + + 2012-10-13 Angus Griffith <16sn6uv@gmail.com> + +- * mathics/builtin/arithmetic.py, mathics/core/expression.py: ++ * mathics/builtin/arithmetic.py, mathics/core/expression.py: + precision handling for Plus, fix precision bug in Real, fix + formatting bug in Complex, 1756 passed, 39 failed + +@@ -26108,7 +26108,7 @@ + + 2012-10-12 Angus Griffith <16sn6uv@gmail.com> + +- * mathics/builtin/calculus.py, mathics/builtin/linalg.py: ++ * mathics/builtin/calculus.py, mathics/builtin/linalg.py: + improvements to sympy (0.7.2) fix some issues, 1750 passed, 43 + failed + +@@ -26125,7 +26125,7 @@ + + 2012-10-11 Angus Griffith <16sn6uv@gmail.com> + +- * mathics/builtin/arithmetic.py, mathics/builtin/combinatorial.py: ++ * mathics/builtin/arithmetic.py, mathics/builtin/combinatorial.py: + fix Binomial precision + + 2012-10-11 Angus Griffith <16sn6uv@gmail.com> +@@ -26146,7 +26146,7 @@ + + 2012-10-10 Angus Griffith <16sn6uv@gmail.com> + +- * mathics/builtin/arithmetic.py, mathics/builtin/calculus.py: ++ * mathics/builtin/arithmetic.py, mathics/builtin/calculus.py: + Changed failed tests in which the new result is more accurate, 1650 + passed, 140 failed + +@@ -26217,7 +26217,7 @@ + + 2012-10-08 Angus Griffith <16sn6uv@gmail.com> + +- * mathics/builtin/arithmetic.py, mathics/core/convert.py, setup.py: ++ * mathics/builtin/arithmetic.py, mathics/core/convert.py, setup.py: + fix some complex arithmetic bugs, 1627 passed, 160 failed + + 2012-10-07 Angus Griffith <16sn6uv@gmail.com> +@@ -26240,7 +26240,7 @@ + mathics/builtin/numbertheory.py, mathics/builtin/numeric.py, + mathics/core/convert.py, mathics/core/evaluation.py, + mathics/core/expression.py, mathics/core/numbers.py, +- mathics/core/rules.py: Tests complete withought raising Exceptions: ++ mathics/core/rules.py: Tests complete without raising Exceptions: + 1787 Tests for 389 built-in symbols, 1540 passed, 247 failed. + + 2012-10-05 Angus Griffith <16sn6uv@gmail.com> +@@ -26250,7 +26250,7 @@ + + 2012-10-05 Angus Griffith <16sn6uv@gmail.com> + +- * mathics/builtin/algebra.py, mathics/builtin/combinatorial.py: ++ * mathics/builtin/algebra.py, mathics/builtin/combinatorial.py: + Replace gmpy.bincoef with mpmath.binomial + + 2012-10-05 Angus Griffith <16sn6uv@gmail.com> +@@ -26328,7 +26328,7 @@ + + 2012-09-10 Angus Griffith <16sn6uv@gmail.com> + +- * mathics/builtin/datentime.py: AbsoluteTime messges ++ * mathics/builtin/datentime.py: AbsoluteTime messages + + 2012-09-10 Angus Griffith <16sn6uv@gmail.com> + +@@ -26386,7 +26386,7 @@ + 2012-09-09 Angus Griffith <16sn6uv@gmail.com> + + * mathics/builtin/diffeqns.py, mathics/core/convert.py: Added some +- generated paramater tests to DSolve ++ generated parameter tests to DSolve + + 2012-09-09 Angus Griffith <16sn6uv@gmail.com> + +@@ -26429,7 +26429,7 @@ + 2012-09-09 Angus Griffith <16sn6uv@gmail.com> + + * mathics/builtin/datentime.py: date parsing for uniform implied +- seperators ++ separators + + 2012-09-09 Angus Griffith <16sn6uv@gmail.com> + +@@ -26498,12 +26498,12 @@ + + 2012-09-08 Angus Griffith <16sn6uv@gmail.com> + +- * mathics/builtin/physchemdata.py, mathics/data/element.csv: ++ * mathics/builtin/physchemdata.py, mathics/data/element.csv: + DiscoveryYear for ElementData + + 2012-09-08 Angus Griffith <16sn6uv@gmail.com> + +- * mathics/data/element.csv, mathics/data/element.txt: ++ * mathics/data/element.csv, mathics/data/element.txt: + ThermalConductivity for ElementData + + 2012-09-08 Angus Griffith <16sn6uv@gmail.com> +@@ -26523,7 +26523,7 @@ + + 2012-09-07 Angus Griffith <16sn6uv@gmail.com> + +- * mathics/builtin/physchemdata.py, mathics/data/element.csv: ++ * mathics/builtin/physchemdata.py, mathics/data/element.csv: + ElectronAffinity + + 2012-09-07 Angus Griffith <16sn6uv@gmail.com> +@@ -26687,7 +26687,7 @@ + 2012-08-24 Angus Griffith <16sn6uv@gmail.com> + + * mathics/builtin/calculus.py, mathics/builtin/diffeqns.py, +- mathics/core/convert.py: C[i] paramaters for to_sympy ++ mathics/core/convert.py: C[i] parameters for to_sympy + + 2012-08-24 Angus Griffith <16sn6uv@gmail.com> + +@@ -26702,7 +26702,7 @@ + 2012-08-24 Angus Griffith <16sn6uv@gmail.com> + + * mathics/builtin/calculus.py, mathics/builtin/diffeqns.py: Started +- on to_sympy for Derivative opperator ++ on to_sympy for Derivative operator + + 2012-08-23 Angus Griffith <16sn6uv@gmail.com> + +@@ -26912,7 +26912,7 @@ + 2012-08-04 Jan Pöschko + + * mathics/builtin/graphics.py, mathics/builtin/graphics3d.py, +- mathics/builtin/plot.py, mathics/doc/documentation/1-Manual.mdoc: ++ mathics/builtin/plot.py, mathics/doc/documentation/1-Manual.mdoc: + documentation + + 2012-08-04 Jan Pöschko +@@ -26941,7 +26941,7 @@ + + 2012-08-03 Jan Pöschko + +- * mathics/core/parser.py, mathics/doc/documentation/1-Manual.mdoc: ++ * mathics/core/parser.py, mathics/doc/documentation/1-Manual.mdoc: + handle parser exception + + 2012-08-04 Angus Griffith <16sn6uv@gmail.com> +@@ -26983,7 +26983,7 @@ + + 2012-08-02 Angus Griffith <16sn6uv@gmail.com> + +- * mathics/builtin/graphics3d.py, mathics/web/media/js/graphics3d.js: ++ * mathics/builtin/graphics3d.py, mathics/web/media/js/graphics3d.js: + Add ViewPoint option to client-side graphics + + 2012-08-02 Angus Griffith <16sn6uv@gmail.com> +@@ -27006,12 +27006,12 @@ + + 2012-08-02 Angus Griffith <16sn6uv@gmail.com> + +- * mathics/builtin/graphics.py, mathics/builtin/graphics3d.py: ++ * mathics/builtin/graphics.py, mathics/builtin/graphics3d.py: + Asymptote output for 2D Point primitive + + 2012-08-02 Angus Griffith <16sn6uv@gmail.com> + +- * mathics/builtin/graphics3d.py, mathics/web/media/js/graphics3d.js: ++ * mathics/builtin/graphics3d.py, mathics/web/media/js/graphics3d.js: + Move default Point color bug fix to server-side + + 2012-08-02 Angus Griffith <16sn6uv@gmail.com> +@@ -27036,7 +27036,7 @@ + + 2012-07-31 Angus Griffith <16sn6uv@gmail.com> + +- * mathics/builtin/graphics3d.py, mathics/web/media/js/graphics3d.js: ++ * mathics/builtin/graphics3d.py, mathics/web/media/js/graphics3d.js: + Move graphics box scaling from client-side to server-side + + 2012-07-31 Angus Griffith <16sn6uv@gmail.com> +@@ -27089,7 +27089,7 @@ + + 2012-07-29 Angus Griffith <16sn6uv@gmail.com> + +- * mathics/web/media/js/graphics3d.js: Fix axes bug occuring with ++ * mathics/web/media/js/graphics3d.js: Fix axes bug occurring with + multiple graphics in the same notebook + + 2012-07-29 Angus Griffith <16sn6uv@gmail.com> +@@ -27098,7 +27098,7 @@ + + 2012-07-29 Angus Griffith <16sn6uv@gmail.com> + +- * mathics/builtin/graphics3d.py, mathics/web/media/js/graphics3d.js: ++ * mathics/builtin/graphics3d.py, mathics/web/media/js/graphics3d.js: + Add sphere rendering method to client-side + + 2012-07-28 Angus Griffith <16sn6uv@gmail.com> +@@ -27107,7 +27107,7 @@ + + 2012-07-28 Angus Griffith <16sn6uv@gmail.com> + +- * mathics/builtin/graphics3d.py, mathics/web/media/js/graphics3d.js: ++ * mathics/builtin/graphics3d.py, mathics/web/media/js/graphics3d.js: + Fix Spot light angle + + 2012-07-28 Angus Griffith <16sn6uv@gmail.com> +@@ -27136,7 +27136,7 @@ + + 2012-07-27 Angus Griffith <16sn6uv@gmail.com> + +- * mathics/builtin/graphics3d.py, mathics/web/media/js/graphics3d.js: ++ * mathics/builtin/graphics3d.py, mathics/web/media/js/graphics3d.js: + Fix Spot light angle TODO: Convert degrees input to radians. E.g. + 15Degree becomes 0.2618. + +@@ -27147,12 +27147,12 @@ + + 2012-07-27 Angus Griffith <16sn6uv@gmail.com> + +- * mathics/builtin/graphics3d.py, mathics/web/media/js/graphics3d.js: ++ * mathics/builtin/graphics3d.py, mathics/web/media/js/graphics3d.js: + Add Point and Spot lights + + 2012-07-27 Angus Griffith <16sn6uv@gmail.com> + +- * mathics/builtin/graphics3d.py: Add Arbitary lighting Known Bug: ++ * mathics/builtin/graphics3d.py: Add Arbitrary lighting Known Bug: + All Directional lights move when camera moves since this is required + for Lighing->Automatic. Fixing this bug requires implementing + ImageScaled[] and Scaled[]. +@@ -27185,7 +27185,7 @@ + + 2012-07-26 Jan Pöschko + +- * mathics/builtin/graphics.py, mathics/builtin/graphics3d.py: ++ * mathics/builtin/graphics.py, mathics/builtin/graphics3d.py: + default face color in 3D is white + + 2012-07-26 Jan Pöschko +@@ -27210,7 +27210,7 @@ + + 2012-07-25 Angus Griffith <16sn6uv@gmail.com> + +- * mathics/builtin/graphics3d.py, mathics/web/media/js/graphics3d.js: ++ * mathics/builtin/graphics3d.py, mathics/web/media/js/graphics3d.js: + Replace tick label hack + + 2012-07-25 Angus Griffith <16sn6uv@gmail.com> +@@ -27277,7 +27277,7 @@ + + 2012-07-23 Angus Griffith <16sn6uv@gmail.com> + +- * mathics/builtin/graphics3d.py, mathics/web/media/js/graphics3d.js: ++ * mathics/builtin/graphics3d.py, mathics/web/media/js/graphics3d.js: + Use inbult methods to format axis tick labels + + 2012-07-20 Angus Griffith <16sn6uv@gmail.com> +@@ -27287,7 +27287,7 @@ + + 2012-07-20 Angus Griffith <16sn6uv@gmail.com> + +- * mathics/web/media/js/graphics3d.js: Found indicies for x,y and z ++ * mathics/web/media/js/graphics3d.js: Found indices for x,y and z + axes (bounding box edges). + + 2012-07-18 Angus Griffith <16sn6uv@gmail.com> +@@ -27316,7 +27316,7 @@ + + 2012-07-17 Angus Griffith <16sn6uv@gmail.com> + +- * mathics/builtin/graphics3d.py, mathics/web/media/js/graphics3d.js: ++ * mathics/builtin/graphics3d.py, mathics/web/media/js/graphics3d.js: + Tick lines handled by server. + + 2012-07-16 Angus Griffith <16sn6uv@gmail.com> +@@ -27343,7 +27343,7 @@ + + 2012-07-15 Angus Griffith <16sn6uv@gmail.com> + +- * mathics/builtin/graphics3d.py, mathics/web/media/js/graphics3d.js: ++ * mathics/builtin/graphics3d.py, mathics/web/media/js/graphics3d.js: + Axes lines for Graphics3D. + + 2012-07-14 Angus Griffith <16sn6uv@gmail.com> +@@ -27477,7 +27477,7 @@ + + 2012-07-04 Angus Griffith <16sn6uv@gmail.com> + +- * mathics/builtin/plot.py, mathics/web/media/js/graphics3d.js: ++ * mathics/builtin/plot.py, mathics/web/media/js/graphics3d.js: + Accuracy of Plot3D grids is now the same as the plot itself. + + 2012-07-03 Angus Griffith <16sn6uv@gmail.com> +@@ -27585,7 +27585,7 @@ + + 2012-06-30 Angus Griffith <16sn6uv@gmail.com> + +- * mathics/web/media/js/graphics3d.js: Arbitary primative extent ++ * mathics/web/media/js/graphics3d.js: Arbitrary primitive extent + partially implemented + + 2012-06-29 Angus Griffith <16sn6uv@gmail.com> +@@ -27596,7 +27596,7 @@ + 2012-06-29 Angus Griffith <16sn6uv@gmail.com> + + * mathics/web/media/js/graphics3d.js: Started implemented graphics3d +- Polygon primative. ++ Polygon primitive. + + 2012-06-29 Angus Griffith <16sn6uv@gmail.com> + +@@ -27770,7 +27770,7 @@ + + 2012-06-16 Jan Pöschko + +- * mathics/settings.py: fixed authenatication backend ++ * mathics/settings.py: fixed authentication backend + + 2012-06-15 Jan Pöschko + +@@ -27912,7 +27912,7 @@ + + 2012-06-11 Angus Griffith <16sn6uv@gmail.com> + +- * mathics/builtin/plot.py: Improved general consistancy with the ++ * mathics/builtin/plot.py: Improved general consistency with the + rest of the code base + + 2012-06-11 Angus Griffith <16sn6uv@gmail.com> +@@ -27968,7 +27968,7 @@ + + * mathics/builtin/plot.py: Implemented Mesh->All and Mesh->Full + along with default Mesh->None something strange is happening with +- aspect ratios (dots drawn as elipses rather than circles with custom ++ aspect ratios (dots drawn as ellipses rather than circles with custom + PlotRange . + + 2012-06-11 Angus Griffith <16sn6uv@gmail.com> +@@ -28025,7 +28025,7 @@ + + 2012-06-09 Jan Pöschko + +- * mathics/builtin/graphics.py, mathics/core/expression.py: ++ * mathics/builtin/graphics.py, mathics/core/expression.py: + PlotRange, to_python + + 2012-06-10 Angus Griffith <16sn6uv@gmail.com> +@@ -28078,7 +28078,7 @@ + + * mathics/builtin/plot.py: Added x-scaling to the sampling algorithm + so that angles are independent of x-range. All line segments of +- same funcion now have the same maxrecursion depth (typo). ++ same function now have the same maxrecursion depth (typo). + + 2012-06-09 Angus Griffith <16sn6uv@gmail.com> + +@@ -28210,7 +28210,7 @@ + + 2012-04-19 Jan Pöschko + +- * mathics/web/media/js/mathics.js, mathics/web/templates/main.html: ++ * mathics/web/media/js/mathics.js, mathics/web/templates/main.html: + MathJax config in document:loaded, minor interface text changes + + 2011-04-18 Jan Pöschko +@@ -29699,7 +29699,7 @@ + 2011-03-09 Jan Pöschko + + * mathics/builtin/arithmetic.py, mathics/core/evaluation.py, +- mathics/core/parser.py, mathics/server.py, mathics/settings.py: ++ mathics/core/parser.py, mathics/server.py, mathics/settings.py: + parser issue, threaded exception traceback + + 2011-03-09 Jan Pöschko +@@ -29732,7 +29732,7 @@ + * mathics/doc/doc.py, mathics/doc/documentation/1-Manual.mdoc, + mathics/doc/tex/Makefile, mathics/doc/tex/logo.pdf, + mathics/doc/tex/mathics.tex, mathics/doc/tex/prepare_latex.py, +- mathics/settings.py, mathics/web/views.py, release.sh, setup.py: ++ mathics/settings.py, mathics/web/views.py, release.sh, setup.py: + small changes to doc and setup + + 2011-03-07 Jan Pöschko +@@ -29760,4 +29760,3 @@ + 2011-03-07 Jan + + * initial version +- diff --git a/Makefile b/Makefile index de650ea66..59b0bda3c 100644 --- a/Makefile +++ b/Makefile @@ -98,6 +98,7 @@ testserver: $(THREEJS) #: Create a ChangeLog from git via git log and git2cl ChangeLog: rmChangeLog git log --pretty --numstat --summary | $(GIT2CL) >$@ + patch ChangeLog < ChangeLog-spell-corrected.diff node_modules/\@mathicsorg/mathics-threejs-backend/package.json node_modules/@mathicsorg/mathics-threejs-backend/package.json: npm install @mathicsorg/mathics-threejs-backend --loglevel=error diff --git a/admin-tools/check-versions.sh b/admin-tools/check-versions.sh index 93b91a2f0..0aa4042b6 100644 --- a/admin-tools/check-versions.sh +++ b/admin-tools/check-versions.sh @@ -1,10 +1,10 @@ #!/bin/bash function finish { - cd $owd + cd $mathics_django_owd } # FIXME put some of the below in a common routine -owd=$(pwd) +mathics_django_owd=$(pwd) trap finish EXIT cd $(dirname ${BASH_SOURCE[0]}) @@ -22,4 +22,5 @@ for version in $PYVERSIONS; do exit $? fi echo === $version === -done \ No newline at end of file +done +finish diff --git a/admin-tools/make-dist.sh b/admin-tools/make-dist.sh index b4a2bbd78..572714268 100755 --- a/admin-tools/make-dist.sh +++ b/admin-tools/make-dist.sh @@ -3,7 +3,7 @@ PACKAGE=Mathics-Django # FIXME put some of the below in a common routine function finish { - cd $owd + cd $mathics_django_owd } cd $(dirname ${BASH_SOURCE[0]}) @@ -19,14 +19,12 @@ cd .. source mathics_django/version.py echo $__version__ cp -v ${HOME}/.local/var/mathics/doc_html_data.pcl mathics_django/doc/ - -for pyversion in $PYVERSIONS; do - if ! pyenv local $pyversion ; then - exit $? - fi - rm -fr build - python setup.py bdist_egg - python setup.py bdist_wheel -done - +pyversion=3.11 +if ! pyenv local $pyversion ; then + exit $? +fi +rm -fr build +python setup.py bdist_egg +python setup.py bdist_wheel python ./setup.py sdist +finish diff --git a/admin-tools/pyenv-versions b/admin-tools/pyenv-versions index dc88db816..ad4a3476e 100644 --- a/admin-tools/pyenv-versions +++ b/admin-tools/pyenv-versions @@ -6,4 +6,4 @@ if [[ $0 == ${BASH_SOURCE[0]} ]] ; then exit 1 fi -export PYVERSIONS='3.6.15 3.7.16 3.8.16 3.9.16 3.10.10 pyston-2.3.5' +export PYVERSIONS=3.8 3.9 3.10 3.11' diff --git a/mathics_django/__init__.py b/mathics_django/__init__.py index 1c909015f..2c74e3102 100644 --- a/mathics_django/__init__.py +++ b/mathics_django/__init__.py @@ -2,11 +2,10 @@ import django from mathics import version_info -from mathics.version import __version__ version_info["django"] = django.__version__ -version_string = """Mathics {mathics} +version_string = """Mathics3 {mathics} on {python} using SymPy {sympy}, mpmath {mpmath}""".format( **version_info @@ -20,7 +19,7 @@ version_string += f", cython {version_info['cython']}" license_string = """\ -Copyright (C) 2011-2023 The Mathics Team. +Copyright (C) 2011-2024 The Mathics Team. This program comes with ABSOLUTELY NO WARRANTY. This is free software, and you are welcome to redistribute it under certain conditions. diff --git a/mathics_django/version.py b/mathics_django/version.py index 92f4b8d2d..8219cb231 100644 --- a/mathics_django/version.py +++ b/mathics_django/version.py @@ -4,4 +4,4 @@ # well as importing into Python. That's why there is no # space around "=" below. # fmt: off -__version__="7.0.0dev0" # noqa +__version__="7.0.0" # noqa diff --git a/setup.py b/setup.py index 8d294756f..d789a0313 100644 --- a/setup.py +++ b/setup.py @@ -65,11 +65,11 @@ def read(*rnames): # General Requirements INSTALL_REQUIRES += [ - "Mathics-Scanner >=1.2.2,<1.3.1", + "Mathics-Scanner >=1.2.2,<1.4", # "Mathics3 @ http://github.com/Mathics3/mathics-core/archive/master.zip", - "Mathics3 >=6.2.0,<7.1.0", - "django >= 3.2", # After Python 3.7 is removed, we can bump min version to 4.1 - "networkx >= 2.6", # Used in format, should disappear though. After 3.7 can bump to 3.x + "Mathics3 >=7.0.0.dev0,<7.1.0", + "django >= 4.0", + "networkx >= 3.0", "pygments", # For colorized Python tracebacks "requests", ] @@ -191,7 +191,6 @@ def run(self): "Intended Audience :: Science/Research", "License :: OSI Approved :: GNU General Public License v3 (GPLv3)", "Programming Language :: Python", - "Programming Language :: Python :: 3.7", "Programming Language :: Python :: 3.8", "Programming Language :: Python :: 3.9", "Programming Language :: Python :: 3.10",