Skip to content

Commit 417401d

Browse files
rockyrocky
authored
Get ready for release 7.0.0 (#80)
1 parent 120ec11 commit 417401d

File tree

8 files changed

+195
-17
lines changed

8 files changed

+195
-17
lines changed

‎.gitignore‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,8 @@
3030
/.tox
3131
/.venv*/*
3232
/ChangeLog
33+
/ChangeLog.orig
34+
/ChangeLog.rej
3335
/PKG-INFO
3436
/README
3537
/README.html

‎ChangeLog-spell-corrected.diff‎

Lines changed: 176 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,176 @@
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 @@
4+
2023-02-25 rocky <[email protected]>
5+
6+
* mathicsscript/__main__.py, mathicsscript/asymptote.py,
7+
- mathicsscript/fake_psviewer.py, mathicsscript/format.py: Removce
8+
+ mathicsscript/fake_psviewer.py, mathicsscript/format.py: Remove
9+
flake8 things
10+
11+
2023-02-25 rocky <[email protected]>
12+
@@ -83,7 +83,7 @@
13+
14+
2022-12-10 rocky <[email protected]>
15+
16+
- * mathicsscript/termshell.py, mathicsscript/termshell_prompt.py:
17+
+ * mathicsscript/termshell.py, mathicsscript/termshell_prompt.py:
18+
black
19+
20+
2022-11-28 rocky <[email protected]>
21+
@@ -189,7 +189,7 @@
22+
2022-02-15 rocky <[email protected]>
23+
24+
* NEWS.md, mathicsscript/bindkeys.py,
25+
- mathicsscript/termshell_gnu.py, mathicsscript/termshell_prompt.py:
26+
+ mathicsscript/termshell_gnu.py, mathicsscript/termshell_prompt.py:
27+
Handle keybindings in GNU Readline
28+
29+
2022-02-15 R. Bernstein <[email protected]>
30+
@@ -227,7 +227,7 @@
31+
32+
2022-02-06 rocky <[email protected]>
33+
34+
- * mathicsscript/completion.py, mathicsscript/termshell_gnu.py:
35+
+ * mathicsscript/completion.py, mathicsscript/termshell_gnu.py:
36+
Imports in core have changed Specifically where strip_context is located
37+
38+
2021-12-19 rocky <[email protected]>
39+
@@ -253,7 +253,7 @@
40+
2021-09-04 rocky <[email protected]>
41+
42+
* mathicsscript/data/inputrc-no-unicode,
43+
- mathicsscript/data/inputrc-unicode, mathicsscript/termshell_gnu.py:
44+
+ mathicsscript/data/inputrc-unicode, mathicsscript/termshell_gnu.py:
45+
GNU readline was reading inputrc from wrong place Update readline tables. Warning: input-no-unicode is probably wrong
46+
47+
2021-09-04 rocky <[email protected]>
48+
@@ -415,7 +415,7 @@
49+
50+
2021-06-30 rocky <[email protected]>
51+
52+
- * .pre-commit-config.yaml, mathicsscript/asymptote.py, setup.py:
53+
+ * .pre-commit-config.yaml, mathicsscript/asymptote.py, setup.py:
54+
Start using Asymptote
55+
56+
2021-06-30 rocky <[email protected]>
57+
@@ -500,7 +500,7 @@
58+
59+
2021-06-15 rocky <[email protected]>
60+
61+
- * mathicsscript/bindkeys.py, requirements-extra.txt, setup.py:
62+
+ * mathicsscript/bindkeys.py, requirements-extra.txt, setup.py:
63+
PyQT5: extra module for matplotlib
64+
65+
2021-06-15 rocky <[email protected]>
66+
@@ -621,7 +621,7 @@
67+
68+
2021-05-27 rocky <[email protected]>
69+
70+
- * mathicsscript/mmalexer.py, mathicsscript/termshell.py, setup.py:
71+
+ * mathicsscript/mmalexer.py, mathicsscript/termshell.py, setup.py:
72+
WIP start using prompt-toolkit
73+
74+
2021-05-15 R. Bernstein <[email protected]>
75+
@@ -959,7 +959,7 @@
76+
77+
2021-01-09 rocky <[email protected]>
78+
79+
- * NEWS.md, mathicsscript/__main__.py, mathicsscript/termshell.py:
80+
+ * NEWS.md, mathicsscript/__main__.py, mathicsscript/termshell.py:
81+
`-e` `--execute` is better suited for embedded use This options adds `--quiet` and shows just evaluation output as
82+
text--execute
83+
84+
@@ -988,7 +988,7 @@
85+
86+
2021-01-03 rocky <[email protected]>
87+
88+
- * mathicsscript/termshell.py: Guard agains None eval returns
89+
+ * mathicsscript/termshell.py: Guard against "None" eval returns
90+
91+
2021-01-02 rocky <[email protected]>
92+
93+
@@ -1071,7 +1071,7 @@
94+
95+
2020-12-22 R. Bernstein <[email protected]>
96+
97+
- * : Merge pull request #7 from Mathics3/unicode-option Start to suport Unicode as a CLI option
98+
+ * : Merge pull request #7 from Mathics3/unicode-option Start to support Unicode as a CLI option
99+
100+
2020-12-22 rocky <[email protected]>
101+
102+
@@ -1088,13 +1088,13 @@
103+
* mathicsscript/__main__.py, mathicsscript/format.py,
104+
mathicsscript/inputrc, mathicsscript/inputrc-no-unicode,
105+
mathicsscript/inputrc-unicode, mathicsscript/termshell.py,
106+
- setup.py, test/test_completion.py: Start to suport Unicode as a CLI
107+
+ setup.py, test/test_completion.py: Start to support Unicode as a CLI
108+
option
109+
110+
2020-12-12 rocky <[email protected]>
111+
112+
* mathicsscript/__main__.py, mathicsscript/termshell.py: Handle
113+
- Unicode/WL charcter code mismatches
114+
+ Unicode/WL character code mismatches
115+
116+
2020-12-12 rocky <[email protected]>
117+
118+
@@ -1112,7 +1112,7 @@
119+
120+
2020-12-08 rocky <[email protected]>
121+
122+
- * mathicsscript/format.py: Use equal aspect ratio on ciruclar graphs
123+
+ * mathicsscript/format.py: Use equal aspect ratio on circular graphs
124+
125+
2020-12-07 rocky <[email protected]>
126+
127+
@@ -1120,7 +1120,7 @@
128+
129+
2020-12-07 rocky <[email protected]>
130+
131+
- * mathicsscript/__main__.py, mathicsscript/format.py:
132+
+ * mathicsscript/__main__.py, mathicsscript/format.py:
133+
FindSpannngTree: use layout style of parent graph
134+
135+
2020-12-07 rocky <[email protected]>
136+
@@ -1154,7 +1154,7 @@
137+
138+
2020-12-04 rocky <[email protected]>
139+
140+
- * mathicsscript/format.py: Handel labeled nodes better Change color to white if we have node labels Change code slightly to facilitate expanding.
141+
+ * mathicsscript/format.py: Handle labeled nodes better Change color to white if we have node labels Change code slightly to facilitate expanding.
142+
143+
2020-12-04 rocky <[email protected]>
144+
145+
@@ -1226,7 +1226,7 @@
146+
147+
2020-11-27 rocky <[email protected]>
148+
149+
- * mathicsscript/mmalexer.py, mathicsscript/termshell.py, setup.py:
150+
+ * mathicsscript/mmalexer.py, mathicsscript/termshell.py, setup.py:
151+
Can't use mathematica.lexer for now.. Sigh. It has promise. But recent Python gives now gives these... FutureWarning: Possible nested set at position ...
152+
153+
2020-11-27 rocky <[email protected]>
154+
@@ -1309,7 +1309,7 @@
155+
2020-11-18 rocky <[email protected]>
156+
157+
* mathicsscript/__main__.py, mathicsscript/settings.m,
158+
- mathicsscript/termshell.py, settings/settings.m, setup.py:
159+
+ mathicsscript/termshell.py, settings/settings.m, setup.py:
160+
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
161+
invalid. Also make sure to reset the Mathics variable to a the last
162+
valid value when an invalid one is set.
163+
@@ -1401,7 +1401,7 @@
164+
165+
* NEWS.md, admin-tools/git2cl, admin-tools/make-dist.sh,
166+
admin-tools/pyenv-versions, mathicsscript/term_background.py,
167+
- mathicsscript/version.py, setup.py, test/test_term_background.py:
168+
+ mathicsscript/version.py, setup.py, test/test_term_background.py:
169+
Get ready for release 1.1.0rc1
170+
171+
2020-10-21 R. Bernstein <[email protected]>
172+
@@ -1492,4 +1492,3 @@
173+
174+
* Cull code from Mathics/main and revise ... colorama is no longer optional. We'll be using click soon. Start
175+
to pull in my better terminal-detection script.
176+
-

‎Makefile‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,3 +63,4 @@ sdist: check-rst
6363
#: Create a ChangeLog from git via git log and git2cl
6464
ChangeLog: rmChangeLog
6565
git log --pretty --numstat --summary | $(GIT2CL) >$@
66+
patch ChangeLog < ChangeLog-spell-corrected.diff

‎admin-tools/check-versions.sh‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
#!/bin/bash
22
function finish {
3-
cd $owd
3+
cd $mathicsscript_owd
44
}
55

66
# FIXME put some of the below in a common routine
7-
owd=$(pwd)
7+
mathicsscript_owd=$(pwd)
88
trap finish EXIT
99

1010
cd $(dirname ${BASH_SOURCE[0]})
@@ -24,3 +24,4 @@ for version in $PYVERSIONS; do
2424
fi
2525
echo === $version ===
2626
done
27+
finish

‎admin-tools/make-dist.sh‎

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@ PACKAGE=mathicsscript
33

44
# FIXME put some of the below in a common routine
55
function finish {
6-
cd $owd
6+
cd $mathicsscript_owd
77
}
88

99
cd $(dirname ${BASH_SOURCE[0]})
10-
owd=$(pwd)
10+
mathicsscript_owd=$(pwd)
1111
trap finish EXIT
1212

1313
if ! source ./pyenv-versions ; then
@@ -19,13 +19,11 @@ cd ..
1919
source $PACKAGE/version.py
2020
echo $__version__
2121

22-
for pyversion in $PYVERSIONS; do
23-
if ! pyenv local $pyversion ; then
24-
exit $?
25-
fi
26-
rm -fr build
27-
python setup.py bdist_egg
28-
python setup.py bdist_wheel
29-
done
30-
22+
pyversion=3.11
23+
if ! pyenv local $pyversion ; then
24+
exit $?
25+
fi
26+
rm -fr build
27+
python setup.py bdist_wheel
3128
python ./setup.py sdist
29+
finish

‎admin-tools/pyenv-versions‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,4 @@ if [[ $0 == ${BASH_SOURCE[0]} ]] ; then
66
exit 1
77
fi
88

9-
export PYVERSIONS='3.6.15 3.7.16 3.8.16 3.9.16 3.10.10'
9+
export PYVERSIONS='3.8 3.9 3.10 3.11'

‎mathicsscript/bindkeys.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# -*- coding: utf-8 -*-
2-
# Copyright (C) 2021-2022 Rocky Bernstein <[email protected]>
2+
# Copyright (C) 2021-2022, 2024 Rocky Bernstein <[email protected]>
33
# This program is free software: you can redistribute it and/or modify
44
# it under the terms of the GNU General Public License as published by
55
# the Free Software Foundation, either version 3 of the License, or
@@ -143,7 +143,7 @@ def read_inputrc(read_init_file_fn: Callable, use_unicode: bool) -> None:
143143
inputrc = "inputrc-unicode" if use_unicode else "inputrc-no-unicode"
144144
try:
145145
read_init_file_fn(str(parent_dir / "data" / inputrc))
146-
except:
146+
except Exception:
147147
pass
148148

149149

‎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__="7.0.0.dev0" # noqa
7+
__version__="7.0.0" # noqa

0 commit comments

Comments
 (0)