Skip to content

Commit b429adf

Browse files
rockyrocky
authored
Get ready for release 9.0.0 (#98)
* Get ready for release 9.0.0; bump version number * Go over Changes. NEWS.md -> Changes.rst to match other repositories * Add f1 help as the bottom bar
1 parent 9771b24 commit b429adf

File tree

10 files changed

+195
-42
lines changed

10 files changed

+195
-42
lines changed

‎.github/workflows/macos.yaml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,10 @@ jobs:
2424
brew install asymptote
2525
python3 -m pip install --upgrade pip
2626
# Can comment out when next Mathics core and Mathics-scanner are released
27-
git clone https://github.com/Mathics3/mathics-scanner
28-
(cd mathics-scanner && pip install -e . && bash ./admin-tools/make-JSON-tables.sh)
29-
git clone https://github.com/Mathics3/mathics-core
30-
(cd mathics-core && bash ./admin-tools/make-JSON-tables.sh && pip install -e .[full])
27+
# git clone https://github.com/Mathics3/mathics-scanner
28+
# (cd mathics-scanner && pip install -e . && bash ./admin-tools/make-JSON-tables.sh)
29+
# git clone https://github.com/Mathics3/mathics-core
30+
# (cd mathics-core && bash ./admin-tools/make-JSON-tables.sh && pip install -e .[full])
3131
- name: Install mathicsscript
3232
run: |
3333
make

‎.github/workflows/ubuntu.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,10 @@ jobs:
2323
sudo apt-get update -qq && sudo apt-get install -qq liblapack-dev llvm-dev asymptote
2424
python3 -m pip install --upgrade pip
2525
# We can comment out when next Mathics core and Mathics-scanner are released
26-
git clone https://github.com/Mathics3/mathics-scanner
27-
(cd mathics-scanner && pip install -e . && bash ./admin-tools/make-JSON-tables.sh)
28-
git clone https://github.com/Mathics3/mathics-core
29-
(cd mathics-core && bash ./admin-tools/make-JSON-tables.sh && pip install -e .[full])
26+
# git clone https://github.com/Mathics3/mathics-scanner
27+
# (cd mathics-scanner && pip install -e . && bash ./admin-tools/make-JSON-tables.sh)
28+
# git clone https://github.com/Mathics3/mathics-core
29+
# (cd mathics-core && bash ./admin-tools/make-JSON-tables.sh && pip install -e .[full])
3030
- name: Install mathicsscript
3131
run: |
3232
make

‎.github/workflows/windows.yml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
strategy:
1313
matrix:
1414
os: [windows]
15-
python-version: ['3.11', '3.12']
15+
python-version: ['3.11', '3.13']
1616
steps:
1717
- uses: actions/checkout@v4
1818
- name: Set up Python ${{ matrix.python-version }}
@@ -25,11 +25,11 @@ jobs:
2525
python3 -m pip install wheel
2626
set LLVM_DIR="C:\Program Files\LLVM"
2727
# We can comment out when next Mathics core and Mathics-scanner are released
28-
git clone https://github.com/Mathics3/mathics-scanner
29-
bash -c '(cd mathics-scanner && python -m pip install -e . && bash ./admin-tools/make-JSON-tables.sh)'
30-
git clone https://github.com/Mathics3/mathics-core
31-
bash -c '(cd mathics-core && ./admin-tools/make-JSON-tables.sh && python -m pip install -e .)'
32-
python -m pip install -e .
28+
# git clone https://github.com/Mathics3/mathics-scanner
29+
# bash -c '(cd mathics-scanner && python -m pip install -e . && bash ./admin-tools/make-JSON-tables.sh)'
30+
# git clone https://github.com/Mathics3/mathics-core
31+
# bash -c '(cd mathics-core && ./admin-tools/make-JSON-tables.sh && python -m pip install -e .)'
32+
# python -m pip install -e .
3333
- name: Install mathicsscript
3434
run: |
3535
make

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@
3131
/.tox
3232
/.venv*/*
3333
/ChangeLog
34+
/ChangeLog-spell-corrected
3435
/ChangeLog.orig
3536
/ChangeLog.rej
3637
/ChangeLog.spell-corrected

‎CHANGES.rst‎

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,23 +4,25 @@ CHANGES
44
9.0.0
55
-----
66

7-
Supports Python 3.13. Python 3.8 support dropped.
7+
Supports Python 3.13. Python 3.8 and 3.9 support dropped.
88

99
Track API changes in Mathics3 Scanner 9.0.0
1010

1111
Make CLI options more like wolframscript. This is an incompatible change. Single-dash long options like ``-help``, ``-file``
1212
are now accepted. Short option ``-f`` is associated with ``-file`` rather than ``--fullform``; ``-F`` is is now used for Fullform.
1313
Option ``--read`` with alias ``-r`` is now ``-code`` and short option `-c`.
1414

15-
Toggling Autobrace using f4 was fixed.
16-
You can cycle now through pygments styles up using f5 (next style) and f6 (previous style). f1 (help) now show function key
17-
bindings in bottom bar.
15+
Toggling Autobrace using function key F4 was fixed; Function key F1 gives some rudimentary help in the bottom bar.
1816

17+
Match "\(" with "\)" in prompt-toolkit mode
1918

2019
Bugs
2120
++++
2221

23-
Fixed #82
22+
* #82 Work around a bug giving Set:setraw error
23+
* #87 Exception 'Rule' object has no attribute 'to_python'
24+
* #104 Respect environment variable ``NO_COLOR``
25+
* #105 Pygments-style ``None`` is not disabling pygments style.
2426

2527

2628
8.0.0
@@ -36,6 +38,7 @@ This release tracks the API changes in the Mathics3 Kernel, and to support enhan
3638
* Allow 2D rendering from asymptote
3739
* Add/update material in README's and screencast
3840

41+
* #85
3942

4043

4144
7.0.0

‎ChangeLog-spell-corrected.diff‎

Lines changed: 164 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,35 +1,185 @@
1-
--- ChangeLog 2024-08-09 19:09:43.824371249 -0400
2-
+++ ChangeLog-spell-corrected 2024-08-09 19:08:55.526614192 -0400
3-
@@ -53,7 +53,7 @@
1+
--- ChangeLog 2025-08-29 05:28:29.545046534 -0400
2+
+++ ChangeLog-spell-corrected 2025-08-29 05:31:47.748145274 -0400
3+
@@ -32,7 +32,7 @@
4+
2025-07-22 R. Bernstein <[email protected]>
5+
6+
* NEWS.md => CHANGES.rst, mathicsscript/bindkeys.py,
7+
- mathicsscript/termshell_prompt.py: Add f1 help (#101) * WIP - add f1 key * Addd f1 key and sync with release 9.0.0
8+
+ mathicsscript/termshell_prompt.py: Add f1 key and sync with release 9.0.0
9+
10+
2025-07-22 rocky <[email protected]>
11+
12+
@@ -233,7 +233,7 @@
413
2023-02-25 rocky <[email protected]>
5-
14+
615
* mathicsscript/__main__.py, mathicsscript/asymptote.py,
716
- mathicsscript/fake_psviewer.py, mathicsscript/format.py: Removce
817
+ mathicsscript/fake_psviewer.py, mathicsscript/format.py: Remove
918
flake8 things
10-
19+
1120
2023-02-25 rocky <[email protected]>
12-
@@ -1088,12 +1088,12 @@
21+
@@ -263,7 +263,7 @@
22+
23+
2022-12-10 rocky <[email protected]>
24+
25+
- * mathicsscript/termshell.py, mathicsscript/termshell_prompt.py:
26+
+ * mathicsscript/termshell.py, mathicsscript/termshell_prompt.py:
27+
black
28+
29+
2022-11-28 rocky <[email protected]>
30+
@@ -369,7 +369,7 @@
31+
2022-02-15 rocky <[email protected]>
32+
33+
* NEWS.md, mathicsscript/bindkeys.py,
34+
- mathicsscript/termshell_gnu.py, mathicsscript/termshell_prompt.py:
35+
+ mathicsscript/termshell_gnu.py, mathicsscript/termshell_prompt.py:
36+
Handle keybindings in GNU Readline
37+
38+
2022-02-15 R. Bernstein <[email protected]>
39+
@@ -407,7 +407,7 @@
40+
41+
2022-02-06 rocky <[email protected]>
42+
43+
- * mathicsscript/completion.py, mathicsscript/termshell_gnu.py:
44+
+ * mathicsscript/completion.py, mathicsscript/termshell_gnu.py:
45+
Imports in core have changed Specifically where strip_context is located
46+
47+
2021-12-19 rocky <[email protected]>
48+
@@ -433,7 +433,7 @@
49+
2021-09-04 rocky <[email protected]>
50+
51+
* mathicsscript/data/inputrc-no-unicode,
52+
- mathicsscript/data/inputrc-unicode, mathicsscript/termshell_gnu.py:
53+
+ mathicsscript/data/inputrc-unicode, mathicsscript/termshell_gnu.py:
54+
GNU readline was reading inputrc from wrong place Update readline tables. Warning: input-no-unicode is probably wrong
55+
56+
2021-09-04 rocky <[email protected]>
57+
@@ -595,7 +595,7 @@
58+
59+
2021-06-30 rocky <[email protected]>
60+
61+
- * .pre-commit-config.yaml, mathicsscript/asymptote.py, setup.py:
62+
+ * .pre-commit-config.yaml, mathicsscript/asymptote.py, setup.py:
63+
Start using Asymptote
64+
65+
2021-06-30 rocky <[email protected]>
66+
@@ -680,7 +680,7 @@
67+
68+
2021-06-15 rocky <[email protected]>
69+
70+
- * mathicsscript/bindkeys.py, requirements-extra.txt, setup.py:
71+
+ * mathicsscript/bindkeys.py, requirements-extra.txt, setup.py:
72+
PyQT5: extra module for matplotlib
73+
74+
2021-06-15 rocky <[email protected]>
75+
@@ -801,7 +801,7 @@
76+
77+
2021-05-27 rocky <[email protected]>
78+
79+
- * mathicsscript/mmalexer.py, mathicsscript/termshell.py, setup.py:
80+
+ * mathicsscript/mmalexer.py, mathicsscript/termshell.py, setup.py:
81+
WIP start using prompt-toolkit
82+
83+
2021-05-15 R. Bernstein <[email protected]>
84+
@@ -1139,7 +1139,7 @@
85+
86+
2021-01-09 rocky <[email protected]>
87+
88+
- * NEWS.md, mathicsscript/__main__.py, mathicsscript/termshell.py:
89+
+ * NEWS.md, mathicsscript/__main__.py, mathicsscript/termshell.py:
90+
`-e` `--execute` is better suited for embedded use This options adds `--quiet` and shows just evaluation output as
91+
text--execute
92+
93+
@@ -1168,7 +1168,7 @@
94+
95+
2021-01-03 rocky <[email protected]>
96+
97+
- * mathicsscript/termshell.py: Guard agains None eval returns
98+
+ * mathicsscript/termshell.py: Guard against "None" eval returns
99+
100+
2021-01-02 rocky <[email protected]>
101+
102+
@@ -1251,7 +1251,7 @@
103+
104+
2020-12-22 R. Bernstein <[email protected]>
105+
106+
- * : Merge pull request #7 from Mathics3/unicode-option Start to suport Unicode as a CLI option
107+
+ * : Merge pull request #7 from Mathics3/unicode-option Start to support Unicode as a CLI option
108+
109+
2020-12-22 rocky <[email protected]>
110+
111+
@@ -1268,13 +1268,13 @@
13112
* mathicsscript/__main__.py, mathicsscript/format.py,
14113
mathicsscript/inputrc, mathicsscript/inputrc-no-unicode,
15114
mathicsscript/inputrc-unicode, mathicsscript/termshell.py,
16115
- setup.py, test/test_completion.py: Start to suport Unicode as a CLI
17116
+ setup.py, test/test_completion.py: Start to support Unicode as a CLI
18117
option
19-
118+
20119
2020-12-12 rocky <[email protected]>
21-
120+
22121
* mathicsscript/__main__.py, mathicsscript/termshell.py: Handle
23122
- Unicode/WL charcter code mismatches
24123
+ Unicode/WL character code mismatches
25-
124+
26125
2020-12-12 rocky <[email protected]>
27-
28-
@@ -1154,6 +1154,6 @@
29-
126+
127+
@@ -1292,7 +1292,7 @@
128+
129+
2020-12-08 rocky <[email protected]>
130+
131+
- * mathicsscript/format.py: Use equal aspect ratio on ciruclar graphs
132+
+ * mathicsscript/format.py: Use equal aspect ratio on circular graphs
133+
134+
2020-12-07 rocky <[email protected]>
135+
136+
@@ -1300,7 +1300,7 @@
137+
138+
2020-12-07 rocky <[email protected]>
139+
140+
- * mathicsscript/__main__.py, mathicsscript/format.py:
141+
+ * mathicsscript/__main__.py, mathicsscript/format.py:
142+
FindSpannngTree: use layout style of parent graph
143+
144+
2020-12-07 rocky <[email protected]>
145+
@@ -1334,7 +1334,7 @@
146+
30147
2020-12-04 rocky <[email protected]>
31-
148+
32149
- * mathicsscript/format.py: Handel labeled nodes better Change color to white if we have node labels Change code slightly to facilitate expanding.
33150
+ * mathicsscript/format.py: Handle labeled nodes better Change color to white if we have node labels Change code slightly to facilitate expanding.
34-
151+
35152
2020-12-04 rocky <[email protected]>
153+
154+
@@ -1406,7 +1406,7 @@
155+
156+
2020-11-27 rocky <[email protected]>
157+
158+
- * mathicsscript/mmalexer.py, mathicsscript/termshell.py, setup.py:
159+
+ * mathicsscript/mmalexer.py, mathicsscript/termshell.py, setup.py:
160+
Can't use mathematica.lexer for now.. Sigh. It has promise. But recent Python gives now gives these... FutureWarning: Possible nested set at position ...
161+
162+
2020-11-27 rocky <[email protected]>
163+
@@ -1489,7 +1489,7 @@
164+
2020-11-18 rocky <[email protected]>
165+
166+
* mathicsscript/__main__.py, mathicsscript/settings.m,
167+
- mathicsscript/termshell.py, settings/settings.m, setup.py:
168+
+ mathicsscript/termshell.py, settings/settings.m, setup.py:
169+
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
170+
invalid. Also make sure to reset the Mathics variable to a the last
171+
valid value when an invalid one is set.
172+
@@ -1581,7 +1581,7 @@
173+
174+
* NEWS.md, admin-tools/git2cl, admin-tools/make-dist.sh,
175+
admin-tools/pyenv-versions, mathicsscript/term_background.py,
176+
- mathicsscript/version.py, setup.py, test/test_term_background.py:
177+
+ mathicsscript/version.py, setup.py, test/test_term_background.py:
178+
Get ready for release 1.1.0rc1
179+
180+
2020-10-21 R. Bernstein <[email protected]>
181+
@@ -1672,4 +1672,3 @@
182+
183+
* Cull code from Mathics/main and revise ... colorama is no longer optional. We'll be using click soon. Start
184+
to pull in my better terminal-detection script.
185+
-

‎MANIFEST.in‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
include README.rst
2-
include NEWS.md
2+
include CHANGES.rst
33
include ChangeLog
44
include COPYING.txt
55
include Makefile

‎mathicsscript/completion.py‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -33,12 +33,12 @@
3333

3434
SYMBOLS = rf"[`]?({Regex.IDENTIFIER}|{Regex.NAMED_CHARACTER})(`({Regex.IDENTIFIER}|{Regex.NAMED_CHARACTER}))+[`]?"
3535

36-
if False: # FIXME reinstate this
37-
NAMED_CHARACTER_START = rf"\\\[{Regex.IDENTIFIER}"
38-
FIND_MATHICS_WORD_RE = re.compile(
39-
rf"({NAMED_CHARACTER_START})|(?:.*[\[\(])?({SYMBOLS}$)"
40-
)
36+
# # The below is a more precise definition for a Mathics3 "word" or
37+
# # "identifier", but it is wrong somehow. NAMED_CHARACTER_START =
38+
# rf"\\\[{Regex.IDENTIFIER}" FIND_MATHICS_WORD_RE = re.compile(
39+
# rf"({NAMED_CHARACTER_START})|(?:.*[\[\(])?({SYMBOLS}$)" )
4140
FIND_MATHICS_WORD_RE = re.compile(r"((?:\[)?[^\s\[\(\{]+)")
41+
4242
CHARGROUP_START = frozenset(["(", "[", "{", ","])
4343

4444

‎mathicsscript/version.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,4 @@
44
# well as importing into Python. That's why there is no
55
# space around "=" below.
66
# fmt: off
7-
__version__="8.0.1.dev0" # noqa
7+
__version__="9.0.0" # noqa

‎pyproject.toml‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,15 +24,14 @@ dependencies = [
2424
]
2525
requires-python = ">=3.9"
2626
readme = "README.rst"
27-
license = {text = "GPL-3.0-only"}
27+
license = "GPL-3.0-or-later"
2828
keywords = ["Mathematica", "Wolfram", "Interpreter", "Shell", "Math", "CAS"]
2929
maintainers = [
3030
{name = "Mathics3 Group"},
3131
]
3232
classifiers = [
3333
"Intended Audience :: Developers",
3434
"Intended Audience :: Science/Research",
35-
"License :: OSI Approved :: GNU General Public License v3 (GPLv3)",
3635
"Programming Language :: Python",
3736
"Programming Language :: Python :: 3.10",
3837
"Programming Language :: Python :: 3.11",

0 commit comments

Comments
 (0)