Skip to content

Commit

Permalink
Merge pull request #55 from Mathics3/release-1.3.0
Browse files Browse the repository at this point in the history
Release 1.3.0
  • Loading branch information
rocky authored Feb 25, 2023
2 parents 1019397 + 09c914a commit a6861b6
Show file tree
Hide file tree
Showing 12 changed files with 35 additions and 21 deletions.
5 changes: 4 additions & 1 deletion .github/workflows/mathics.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,14 +18,17 @@ jobs:
uses: actions/setup-python@v2
with:
python-version: ${{ matrix.python-version }}
- name: Install OS dependencies
run: |
sudo apt-get update -qq && sudo apt-get install -qq liblapack-dev llvm-dev tesseract-ocr
- name: Install dependencies
run: |
python -m pip install --upgrade pip
pip install -e .
- name: Install Mathics_Scanner
run: |
make
- name: Test Mathics
- name: Test Mathics3
run: |
# Until next Mathics3/mathics-core release is out...
python -m pip install -e git+https://github.com/Mathics3/mathics-core#egg=Mathics3[full]
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/osx.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,11 @@ jobs:
strategy:
matrix:
os: [macOS]
python-version: [3.6, 3.7, 3.8, 3.9]
python-version: ['3.6', '3.7', '3.8', '3.9']
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v2
uses: actions/setup-python@v3
with:
python-version: ${{ matrix.python-version }}
- name: Install dependencies
Expand All @@ -26,7 +26,7 @@ jobs:
- name: Install Mathics Scanner
run: |
make
- name: Test Mathics Scanner
- name: Test Mathics3 Scanner
run: |
pip install -r requirements-dev.txt
pip install -r requirements-full.txt
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/ubuntu.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,11 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
python-version: [3.7, 3.8, 3.9]
python-version: ['3.7', '3.8', '3.9', '3.10']
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v2
uses: actions/setup-python@v3
with:
python-version: ${{ matrix.python-version }}
- name: Install dependencies
Expand All @@ -25,7 +25,7 @@ jobs:
- name: Install Mathics_Scanner
run: |
make
- name: Test Mathics Scanner
- name: Test Mathics3 Scanner
run: |
pip install -r requirements-dev.txt
pip install -r requirements-full.txt
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/windows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
strategy:
matrix:
os: [windows]
python-version: [3.7, 3.8]
python-version: ['3.8', '3.9']
steps:
- uses: actions/checkout@v2
- name: Set up Python ${{ matrix.python-version }}
Expand Down
16 changes: 12 additions & 4 deletions CHANGES.rst
Original file line number Diff line number Diff line change
@@ -1,17 +1,25 @@
CHANGES
=======

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

* Add escape-code sequence for 32-bit unicode. Issue #48.

1.3.0
------

* Add escape-code sequence for 32-bit Unicode. Issue #48.
* Correct ``Infix`` and ``Tilde`` character symbols
* Support double backslash (``\\``) as a single backslash character (``\``).
* Correct Unicode for ScriptN and ScriptCaptialN
* Correct a number of is-letter-like entries.
* Accept \u21A6 as symbol for Function.
* Change the precedence of ``|->``(``Function`` symbol) to 800 so it isn't iterpreted as a ``|``
* Change the precedence of ``|->``(``Function`` symbol) to 800 so it isn't interpreted as a ``|``
followed by ``->``
* ASCII operator tables can now be generated
* Add DifferentialD and Integrate even though we don't have a full set of prefix operators.
* more precedence values added to operators
* Python 3.11 operation verified


1.2.4
Expand Down
4 changes: 3 additions & 1 deletion mathics_scanner/data/named-characters.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2970,6 +2970,7 @@ Epsilon:
wl-unicode-name: GREEK LUNATE EPSILON SYMBOL

Equal:
amslatex: "\\eqeq"
ascii: "=="
esc-alias: "=="
has-unicode-inverse: true
Expand Down Expand Up @@ -6326,7 +6327,7 @@ NumberSign:
esc-alias: '#'
has-unicode-inverse: false
is-letter-like: false
# Leave out equvalent here so scanner will match this as a Slot
# Leave out equivalent here so scanner will match this as a Slot
# unicode-equivalent: '#'
# unicode-equivalent-name: NUMBER SIGN
wl-unicode: "\uF724"
Expand Down Expand Up @@ -7359,6 +7360,7 @@ Rule:
wl-unicode: "\uF522"

RuleDelayed:
amslatex: "\\ruledelayed"
ascii: ":>"
esc-alias: ":>"
has-unicode-inverse: true
Expand Down
2 changes: 1 addition & 1 deletion mathics_scanner/feed.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
class LineFeeder(metaclass=ABCMeta):
"""An abstract representation for reading lines of characters, a
"feeder". The purpose of a feeder is to mediate the consumption of
characters between the tokeniser and the actual file being scaned,
characters between the tokeniser and the actual file being scanned,
as well to store messages regarding tokenization errors.
"""

Expand Down
4 changes: 2 additions & 2 deletions mathics_scanner/generate/build_tables.py
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ def compile_tables(data: dict) -> dict:
information.
"""

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

# Dump the proprocessed dictionaries to disk as JSON.
# Dump the preprocessed dictionaries to disk as JSON.
json.dump(data, o)


Expand Down
2 changes: 1 addition & 1 deletion mathics_scanner/generate/rl_inputrc.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@


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


Expand Down
2 changes: 1 addition & 1 deletion mathics_scanner/tokeniser.py
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@
("SetDelayed", r" \:\= "),
("UpSet", r" \^\= "),
("TagSet", r" \/\: "),
("Unset", r" \=\s*\.(?!\d|\.) "), # allow whitspace but avoid e.g. x=.01
("Unset", r" \=\s*\.(?!\d|\.) "), # allow whitespace but avoid e.g. x=.01
("Set", r" \= "),
("Condition", r" \/\; "),
("Semicolon", r" \; "),
Expand Down
2 changes: 1 addition & 1 deletion mathics_scanner/version.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@
# well as importing into Python. That's why there is no
# space around "=" below.
# fmt: off
__version__="1.3.0.dev0" # noqa
__version__="1.3.0" # noqa
1 change: 1 addition & 0 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -124,6 +124,7 @@ def subdirs(root, file="*.*", depth=10):
"Programming Language :: Python :: 3.8",
"Programming Language :: Python :: 3.9",
"Programming Language :: Python :: 3.10",
"Programming Language :: Python :: 3.11",
"Programming Language :: Python :: Implementation :: CPython",
"Programming Language :: Python :: Implementation :: PyPy",
"Topic :: Scientific/Engineering",
Expand Down

0 comments on commit a6861b6

Please sign in to comment.