Skip to content

Commit a6861b6

Browse files
authored
Merge pull request #55 from Mathics3/release-1.3.0
Release 1.3.0
2 parents 1019397 + 09c914a commit a6861b6

File tree

12 files changed

+35
-21
lines changed

12 files changed

+35
-21
lines changed

.github/workflows/mathics.yml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,14 +18,17 @@ jobs:
1818
uses: actions/setup-python@v2
1919
with:
2020
python-version: ${{ matrix.python-version }}
21+
- name: Install OS dependencies
22+
run: |
23+
sudo apt-get update -qq && sudo apt-get install -qq liblapack-dev llvm-dev tesseract-ocr
2124
- name: Install dependencies
2225
run: |
2326
python -m pip install --upgrade pip
2427
pip install -e .
2528
- name: Install Mathics_Scanner
2629
run: |
2730
make
28-
- name: Test Mathics
31+
- name: Test Mathics3
2932
run: |
3033
# Until next Mathics3/mathics-core release is out...
3134
python -m pip install -e git+https://github.com/Mathics3/mathics-core#egg=Mathics3[full]

.github/workflows/osx.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,11 @@ jobs:
1212
strategy:
1313
matrix:
1414
os: [macOS]
15-
python-version: [3.6, 3.7, 3.8, 3.9]
15+
python-version: ['3.6', '3.7', '3.8', '3.9']
1616
steps:
17-
- uses: actions/checkout@v2
17+
- uses: actions/checkout@v3
1818
- name: Set up Python ${{ matrix.python-version }}
19-
uses: actions/setup-python@v2
19+
uses: actions/setup-python@v3
2020
with:
2121
python-version: ${{ matrix.python-version }}
2222
- name: Install dependencies
@@ -26,7 +26,7 @@ jobs:
2626
- name: Install Mathics Scanner
2727
run: |
2828
make
29-
- name: Test Mathics Scanner
29+
- name: Test Mathics3 Scanner
3030
run: |
3131
pip install -r requirements-dev.txt
3232
pip install -r requirements-full.txt

.github/workflows/ubuntu.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,11 @@ jobs:
1111
runs-on: ubuntu-latest
1212
strategy:
1313
matrix:
14-
python-version: [3.7, 3.8, 3.9]
14+
python-version: ['3.7', '3.8', '3.9', '3.10']
1515
steps:
16-
- uses: actions/checkout@v2
16+
- uses: actions/checkout@v3
1717
- name: Set up Python ${{ matrix.python-version }}
18-
uses: actions/setup-python@v2
18+
uses: actions/setup-python@v3
1919
with:
2020
python-version: ${{ matrix.python-version }}
2121
- name: Install dependencies
@@ -25,7 +25,7 @@ jobs:
2525
- name: Install Mathics_Scanner
2626
run: |
2727
make
28-
- name: Test Mathics Scanner
28+
- name: Test Mathics3 Scanner
2929
run: |
3030
pip install -r requirements-dev.txt
3131
pip install -r requirements-full.txt

.github/workflows/windows.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
strategy:
1313
matrix:
1414
os: [windows]
15-
python-version: [3.7, 3.8]
15+
python-version: ['3.8', '3.9']
1616
steps:
1717
- uses: actions/checkout@v2
1818
- name: Set up Python ${{ matrix.python-version }}

CHANGES.rst

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,25 @@
11
CHANGES
22
=======
33

4-
1.2.5.dev0
5-
----------
4+
Note: after the 1.3.0 release support for running on Python 3.6 will be dropped. Python
5+
3.7 support will be dropped soon as well.
66

7-
* Add escape-code sequence for 32-bit unicode. Issue #48.
7+
8+
1.3.0
9+
------
10+
11+
* Add escape-code sequence for 32-bit Unicode. Issue #48.
812
* Correct ``Infix`` and ``Tilde`` character symbols
913
* Support double backslash (``\\``) as a single backslash character (``\``).
1014
* Correct Unicode for ScriptN and ScriptCaptialN
1115
* Correct a number of is-letter-like entries.
1216
* Accept \u21A6 as symbol for Function.
13-
* Change the precedence of ``|->``(``Function`` symbol) to 800 so it isn't iterpreted as a ``|``
17+
* Change the precedence of ``|->``(``Function`` symbol) to 800 so it isn't interpreted as a ``|``
1418
followed by ``->``
19+
* ASCII operator tables can now be generated
20+
* Add DifferentialD and Integrate even though we don't have a full set of prefix operators.
21+
* more precedence values added to operators
22+
* Python 3.11 operation verified
1523

1624

1725
1.2.4

mathics_scanner/data/named-characters.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2970,6 +2970,7 @@ Epsilon:
29702970
wl-unicode-name: GREEK LUNATE EPSILON SYMBOL
29712971

29722972
Equal:
2973+
amslatex: "\\eqeq"
29732974
ascii: "=="
29742975
esc-alias: "=="
29752976
has-unicode-inverse: true
@@ -6326,7 +6327,7 @@ NumberSign:
63266327
esc-alias: '#'
63276328
has-unicode-inverse: false
63286329
is-letter-like: false
6329-
# Leave out equvalent here so scanner will match this as a Slot
6330+
# Leave out equivalent here so scanner will match this as a Slot
63306331
# unicode-equivalent: '#'
63316332
# unicode-equivalent-name: NUMBER SIGN
63326333
wl-unicode: "\uF724"
@@ -7359,6 +7360,7 @@ Rule:
73597360
wl-unicode: "\uF522"
73607361

73617362
RuleDelayed:
7363+
amslatex: "\\ruledelayed"
73627364
ascii: ":>"
73637365
esc-alias: ":>"
73647366
has-unicode-inverse: true

mathics_scanner/feed.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
class LineFeeder(metaclass=ABCMeta):
1111
"""An abstract representation for reading lines of characters, a
1212
"feeder". The purpose of a feeder is to mediate the consumption of
13-
characters between the tokeniser and the actual file being scaned,
13+
characters between the tokeniser and the actual file being scanned,
1414
as well to store messages regarding tokenization errors.
1515
"""
1616

mathics_scanner/generate/build_tables.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ def compile_tables(data: dict) -> dict:
7070
information.
7171
"""
7272

73-
# Multiple entries in the YAML table are redundant in the following sence:
73+
# Multiple entries in the YAML table are redundant in the following sense:
7474
# when a character has a plain-text equivalent but the plain-text
7575
# equivalent is equal to it's WL unicode representation (i.e. the
7676
# "wl-unicode" field is the same as the "unicode-equivalent" field) then it
@@ -284,7 +284,7 @@ def main(field, output, data_dir):
284284
if f not in field:
285285
del data[f]
286286

287-
# Dump the proprocessed dictionaries to disk as JSON.
287+
# Dump the preprocessed dictionaries to disk as JSON.
288288
json.dump(data, o)
289289

290290

mathics_scanner/generate/rl_inputrc.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313

1414

1515
def _escape(s: str) -> str:
16-
"""Escapes special chracters in inputrc strings"""
16+
"""Escapes special characters in inputrc strings"""
1717
return s.replace("\\", "\\\\").replace('"', '\\"')
1818

1919

mathics_scanner/tokeniser.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@
121121
("SetDelayed", r" \:\= "),
122122
("UpSet", r" \^\= "),
123123
("TagSet", r" \/\: "),
124-
("Unset", r" \=\s*\.(?!\d|\.) "), # allow whitspace but avoid e.g. x=.01
124+
("Unset", r" \=\s*\.(?!\d|\.) "), # allow whitespace but avoid e.g. x=.01
125125
("Set", r" \= "),
126126
("Condition", r" \/\; "),
127127
("Semicolon", r" \; "),

0 commit comments

Comments
 (0)