Skip to content

Commit c6cea2c

Browse files
authored
Get ready for release 6.0.0 (#16)
Administrivia
1 parent 5128810 commit c6cea2c

File tree

8 files changed

+43
-22
lines changed

8 files changed

+43
-22
lines changed

.github/workflows/autoblack.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
steps:
1212
- uses: actions/checkout@v3
1313
- name: Set up Python 3.9
14-
uses: actions/setup-python@v2
14+
uses: actions/setup-python@v3
1515
with:
1616
python-version: 3.9
1717
- name: Install click

.github/workflows/consistency-checks.yml

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,17 +15,19 @@ jobs:
1515
steps:
1616
- 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
2222
run: |
23-
python -m pip install --upgrade pip
23+
# python -m pip install --upgrade pip
2424
python -m pip install pytest
25-
python -m pip install -e git+https://github.com/Mathics3/mathics-scanner#egg=Mathics-Scanner[full]
26-
git clone https://github.com/Mathics3/mathics-core
27-
(cd mathics-core && make)
28-
(cd mathics-core && python -m pip install -e .[full])
25+
# Can comment out when next Mathics3 core and Mathics-scanner are released
26+
# python -m pip install -e git+https://github.com/Mathics3/mathics-scanner#egg=Mathics-Scanner[full]
27+
# git clone https://github.com/Mathics3/mathics-core
28+
# (cd mathics-core && make)
29+
# (cd mathics-core && python -m pip install -e .[full])
30+
python -m pip install Mathics
2931
- name: Install Pymathics.natlang
3032
run: |
3133
make develop

.github/workflows/osx.yml

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
steps:
2020
- uses: actions/checkout@v3
2121
- name: Set up Python ${{ matrix.python-version }}
22-
uses: actions/setup-python@v2
22+
uses: actions/setup-python@v3
2323
with:
2424
python-version: ${{ matrix.python-version }}
2525
- name: Install dependencies
@@ -30,11 +30,12 @@ jobs:
3030
brew install mariadb
3131
pip install pytest
3232
# Can comment out when next Mathics core and Mathics-scanner are released
33-
python -m pip install -e git+https://github.com/Mathics3/mathics-scanner#egg=Mathics-Scanner[full]
33+
# python -m pip install -e git+https://github.com/Mathics3/mathics-scanner#egg=Mathics-Scanner[full]
3434
# Can remove after next Mathics-core release
35-
python -m pip install -e git+https://github.com/Mathics3/mathics-core#egg=Mathics3[full]
36-
(cd src/mathics3 && bash ./admin-tools/make-op-tables.sh)
37-
# python -m pip install Mathics3[full]
35+
# python -m pip install -e git+https://github.com/Mathics3/mathics-core#egg=Mathics3[full]
36+
# (cd src/mathics3 && bash ./admin-tools/make-op-tables.sh)
37+
python -m pip install Mathics3
38+
3839
- name: Install pymathics.natlang
3940
run: |
4041
pip install -e .

.github/workflows/ubuntu.yml

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -15,19 +15,18 @@ jobs:
1515
steps:
1616
- 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
2222
run: |
23-
python -m pip install --upgrade pip
23+
# python -m pip install --upgrade pip
2424
python -m pip install pytest
2525
# Can comment out when next Mathics3 core and Mathics-scanner are released
26-
python -m pip install -e git+https://github.com/Mathics3/mathics-scanner#egg=Mathics-Scanner[full]
27-
python -m pip install -e git+https://github.com/Mathics3/mathics-core#egg=Mathics3[full]
28-
(cd src/mathics3 && bash ./admin-tools/make-op-tables.sh)
29-
# python -m pip install Mathics3[full]
30-
python -m pip install -e .
26+
# python -m pip install -e git+https://github.com/Mathics3/mathics-scanner#egg=Mathics-Scanner[full]
27+
# python -m pip install -e git+https://github.com/Mathics3/mathics-core#egg=Mathics3[full]
28+
# (cd src/mathics3 && bash ./admin-tools/make-op-tables.sh)
29+
python -m pip install Mathics3[full]
3130
- name: install pymathics natlang
3231
run: |
3332
make develop

CHANGES.rst

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,24 @@
11
CHANGES
22
=======
33

4+
6.0.0
5+
-----
6+
7+
Revise for 6.0.0 Mathics3 API and current Mathics3 builtin standards described in `Guidelines for Writing
8+
Documentation <https://mathics-development-guide.readthedocs.io/en/latest/extending/developing-code/extending/documentation-markup.html#guidelines-for-writing-documentation>`_.
9+
10+
This package has undergone a major overhaul. Modules have been split out along into logical groups following the documentation structure.
11+
12+
We have gradually been rolling in more Python type annotations and have been using current Python practices. Tools such as using ``isort``, ``black`` and ``flake8`` are used as well.
13+
14+
Evaluation methods of built-in functions start ``eval_`` not
15+
``apply_``.
16+
17+
There is more refactoring more to do here, bugs that remain, functions needing adding or filling out.
18+
19+
We should assess the landscape for changes in modules that might be used here; there is probably something better maintained than ``langid``.
20+
21+
422
5.0.0
523
-----
624

admin-tools/pyenv-versions

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,5 @@ if [[ $0 == ${BASH_SOURCE[0]} ]] ; then
55
echo "This script should be *sourced* rather than run directly through bash"
66
exit 1
77
fi
8-
export PYVERSIONS='3.6.13 3.7.13 3.8.13 3.9.13 3.10.5'
8+
9+
export PYVERSIONS='3.6.15 3.7.16 3.8.16 3.9.16 3.10.10 pyston-2.3.5'

pymathics/natlang/version.py

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

setup.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ def read(*rnames):
5353
version=__version__,
5454
packages=find_namespace_packages(include=["pymathics.*"]),
5555
install_requires=[
56-
"Mathics3 >5.0.2,<6.1.0",
56+
"Mathics3 >=6.0.0,<6.1.0",
5757
"click>=8.0",
5858
"joblib>=1.0.1",
5959
"langid", # replace with a supported newer package, e.g. via spacy

0 commit comments

Comments
 (0)