diff --git a/.gitignore b/.gitignore index bea9f1d..c4bda09 100644 --- a/.gitignore +++ b/.gitignore @@ -30,6 +30,8 @@ /.tox /.venv*/* /ChangeLog +/ChangeLog.orig +/ChangeLog.rej /PKG-INFO /README /README.html diff --git a/ChangeLog-spell-corrected.diff b/ChangeLog-spell-corrected.diff new file mode 100644 index 0000000..fff30ce --- /dev/null +++ b/ChangeLog-spell-corrected.diff @@ -0,0 +1,176 @@ +--- ChangeLog 2024-08-09 19:09:43.824371249 -0400 ++++ ChangeLog-spell-corrected 2024-08-09 19:08:55.526614192 -0400 +@@ -53,7 +53,7 @@ + 2023-02-25 rocky + + * mathicsscript/__main__.py, mathicsscript/asymptote.py, +- mathicsscript/fake_psviewer.py, mathicsscript/format.py: Removce ++ mathicsscript/fake_psviewer.py, mathicsscript/format.py: Remove + flake8 things + + 2023-02-25 rocky +@@ -83,7 +83,7 @@ + + 2022-12-10 rocky + +- * mathicsscript/termshell.py, mathicsscript/termshell_prompt.py: ++ * mathicsscript/termshell.py, mathicsscript/termshell_prompt.py: + black + + 2022-11-28 rocky +@@ -189,7 +189,7 @@ + 2022-02-15 rocky + + * NEWS.md, mathicsscript/bindkeys.py, +- mathicsscript/termshell_gnu.py, mathicsscript/termshell_prompt.py: ++ mathicsscript/termshell_gnu.py, mathicsscript/termshell_prompt.py: + Handle keybindings in GNU Readline + + 2022-02-15 R. Bernstein +@@ -227,7 +227,7 @@ + + 2022-02-06 rocky + +- * mathicsscript/completion.py, mathicsscript/termshell_gnu.py: ++ * mathicsscript/completion.py, mathicsscript/termshell_gnu.py: + Imports in core have changed Specifically where strip_context is located + + 2021-12-19 rocky +@@ -253,7 +253,7 @@ + 2021-09-04 rocky + + * mathicsscript/data/inputrc-no-unicode, +- mathicsscript/data/inputrc-unicode, mathicsscript/termshell_gnu.py: ++ mathicsscript/data/inputrc-unicode, mathicsscript/termshell_gnu.py: + GNU readline was reading inputrc from wrong place Update readline tables. Warning: input-no-unicode is probably wrong + + 2021-09-04 rocky +@@ -415,7 +415,7 @@ + + 2021-06-30 rocky + +- * .pre-commit-config.yaml, mathicsscript/asymptote.py, setup.py: ++ * .pre-commit-config.yaml, mathicsscript/asymptote.py, setup.py: + Start using Asymptote + + 2021-06-30 rocky +@@ -500,7 +500,7 @@ + + 2021-06-15 rocky + +- * mathicsscript/bindkeys.py, requirements-extra.txt, setup.py: ++ * mathicsscript/bindkeys.py, requirements-extra.txt, setup.py: + PyQT5: extra module for matplotlib + + 2021-06-15 rocky +@@ -621,7 +621,7 @@ + + 2021-05-27 rocky + +- * mathicsscript/mmalexer.py, mathicsscript/termshell.py, setup.py: ++ * mathicsscript/mmalexer.py, mathicsscript/termshell.py, setup.py: + WIP start using prompt-toolkit + + 2021-05-15 R. Bernstein +@@ -959,7 +959,7 @@ + + 2021-01-09 rocky + +- * NEWS.md, mathicsscript/__main__.py, mathicsscript/termshell.py: ++ * NEWS.md, mathicsscript/__main__.py, mathicsscript/termshell.py: + `-e` `--execute` is better suited for embedded use This options adds `--quiet` and shows just evaluation output as + text--execute + +@@ -988,7 +988,7 @@ + + 2021-01-03 rocky + +- * mathicsscript/termshell.py: Guard agains None eval returns ++ * mathicsscript/termshell.py: Guard against "None" eval returns + + 2021-01-02 rocky + +@@ -1071,7 +1071,7 @@ + + 2020-12-22 R. Bernstein + +- * : Merge pull request #7 from Mathics3/unicode-option Start to suport Unicode as a CLI option ++ * : Merge pull request #7 from Mathics3/unicode-option Start to support Unicode as a CLI option + + 2020-12-22 rocky + +@@ -1088,13 +1088,13 @@ + * mathicsscript/__main__.py, mathicsscript/format.py, + mathicsscript/inputrc, mathicsscript/inputrc-no-unicode, + mathicsscript/inputrc-unicode, mathicsscript/termshell.py, +- setup.py, test/test_completion.py: Start to suport Unicode as a CLI ++ setup.py, test/test_completion.py: Start to support Unicode as a CLI + option + + 2020-12-12 rocky + + * mathicsscript/__main__.py, mathicsscript/termshell.py: Handle +- Unicode/WL charcter code mismatches ++ Unicode/WL character code mismatches + + 2020-12-12 rocky + +@@ -1112,7 +1112,7 @@ + + 2020-12-08 rocky + +- * mathicsscript/format.py: Use equal aspect ratio on ciruclar graphs ++ * mathicsscript/format.py: Use equal aspect ratio on circular graphs + + 2020-12-07 rocky + +@@ -1120,7 +1120,7 @@ + + 2020-12-07 rocky + +- * mathicsscript/__main__.py, mathicsscript/format.py: ++ * mathicsscript/__main__.py, mathicsscript/format.py: + FindSpannngTree: use layout style of parent graph + + 2020-12-07 rocky +@@ -1154,7 +1154,7 @@ + + 2020-12-04 rocky + +- * mathicsscript/format.py: Handel labeled nodes better Change color to white if we have node labels Change code slightly to facilitate expanding. ++ * mathicsscript/format.py: Handle labeled nodes better Change color to white if we have node labels Change code slightly to facilitate expanding. + + 2020-12-04 rocky + +@@ -1226,7 +1226,7 @@ + + 2020-11-27 rocky + +- * mathicsscript/mmalexer.py, mathicsscript/termshell.py, setup.py: ++ * mathicsscript/mmalexer.py, mathicsscript/termshell.py, setup.py: + Can't use mathematica.lexer for now.. Sigh. It has promise. But recent Python gives now gives these... FutureWarning: Possible nested set at position ... + + 2020-11-27 rocky +@@ -1309,7 +1309,7 @@ + 2020-11-18 rocky + + * mathicsscript/__main__.py, mathicsscript/settings.m, +- mathicsscript/termshell.py, settings/settings.m, setup.py: ++ mathicsscript/termshell.py, settings/settings.m, setup.py: + Miscellaneous changes Settings`$ShowFullForm -> Settings`$ShowFullFormInput The old name has already caused too much confusion. Check Pygments style and give a columnized list when the name is + invalid. Also make sure to reset the Mathics variable to a the last + valid value when an invalid one is set. +@@ -1401,7 +1401,7 @@ + + * NEWS.md, admin-tools/git2cl, admin-tools/make-dist.sh, + admin-tools/pyenv-versions, mathicsscript/term_background.py, +- mathicsscript/version.py, setup.py, test/test_term_background.py: ++ mathicsscript/version.py, setup.py, test/test_term_background.py: + Get ready for release 1.1.0rc1 + + 2020-10-21 R. Bernstein +@@ -1492,4 +1492,3 @@ + + * Cull code from Mathics/main and revise ... colorama is no longer optional. We'll be using click soon. Start + to pull in my better terminal-detection script. +- diff --git a/Makefile b/Makefile index 880b59c..8d61f36 100644 --- a/Makefile +++ b/Makefile @@ -63,3 +63,4 @@ sdist: check-rst #: Create a ChangeLog from git via git log and git2cl ChangeLog: rmChangeLog git log --pretty --numstat --summary | $(GIT2CL) >$@ + patch ChangeLog < ChangeLog-spell-corrected.diff diff --git a/admin-tools/check-versions.sh b/admin-tools/check-versions.sh index 19b6793..f0b64ab 100755 --- a/admin-tools/check-versions.sh +++ b/admin-tools/check-versions.sh @@ -1,10 +1,10 @@ #!/bin/bash function finish { - cd $owd + cd $mathicsscript_owd } # FIXME put some of the below in a common routine -owd=$(pwd) +mathicsscript_owd=$(pwd) trap finish EXIT cd $(dirname ${BASH_SOURCE[0]}) @@ -24,3 +24,4 @@ for version in $PYVERSIONS; do fi echo === $version === done +finish diff --git a/admin-tools/make-dist.sh b/admin-tools/make-dist.sh index 1a3372a..babb343 100755 --- a/admin-tools/make-dist.sh +++ b/admin-tools/make-dist.sh @@ -3,11 +3,11 @@ PACKAGE=mathicsscript # FIXME put some of the below in a common routine function finish { - cd $owd + cd $mathicsscript_owd } cd $(dirname ${BASH_SOURCE[0]}) -owd=$(pwd) +mathicsscript_owd=$(pwd) trap finish EXIT if ! source ./pyenv-versions ; then @@ -19,13 +19,11 @@ cd .. source $PACKAGE/version.py echo $__version__ -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_wheel python ./setup.py sdist +finish diff --git a/admin-tools/pyenv-versions b/admin-tools/pyenv-versions index 05b0bd7..ed8818f 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' +export PYVERSIONS='3.8 3.9 3.10 3.11' diff --git a/mathicsscript/version.py b/mathicsscript/version.py index f571532..8219cb2 100644 --- a/mathicsscript/version.py +++ b/mathicsscript/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.0.dev0" # noqa +__version__="7.0.0" # noqa