Skip to content

Commit 2b71db6

Browse files
rockyrocky
committed
Get ready for release 7.0.0 (#28)
1 parent 9783be2 commit 2b71db6

File tree

9 files changed

+99
-26
lines changed

9 files changed

+99
-26
lines changed

‎.github/workflows/ubuntu.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
strategy:
1313
matrix:
1414
# python-version: ['3.9', '3.10'] # Figure out what's wrong here.
15-
python-version: ['3.11']
15+
python-version: ['3.9', '3.10', '3.11']
1616
steps:
1717
- uses: actions/checkout@v4
1818
- name: Set up Python ${{ matrix.python-version }}
@@ -27,9 +27,9 @@ jobs:
2727
# python -m pip install -e git+https://github.com/Mathics3/mathics-scanner#egg=Mathics-Scanner[full]
2828
# python -m pip install -e git+https://github.com/Mathics3/mathics-core#egg=Mathics3[full]
2929
git clone https://github.com/Mathics3/mathics-core
30-
(cd mathics-core && pip3 install -e .[full])
31-
(cd mathics-core && bash ./admin-tools/make-op-tables.sh)
32-
# python -m pip install Mathics3[full]
30+
# (cd mathics-core && pip3 install -e .[full])
31+
# (cd mathics-core && bash ./admin-tools/make-op-tables.sh)
32+
python -m pip install Mathics3[full]
3333
- name: install pymathics natlang
3434
run: |
3535
make develop

‎.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
*~
22
/.python-version
33
/ChangeLog
4+
/ChangeLog.orig
5+
/ChangeLog.rej
46
/build
57
/dist
68
/pymathics_natlang.egg-info

‎.pre-commit-config.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ repos:
1010
- id: end-of-file-fixer
1111
stages: [commit]
1212
- id: trailing-whitespace
13+
exclude: 'ChangeLog-spell-corrected.diff'
1314
- repo: https://github.com/psf/black
1415
rev: 22.3.0
1516
hooks:

‎CHANGES.rst

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,16 @@
11
CHANGES
22
=======
33

4+
7.0.0
5+
-----
6+
7+
* Revise for 7.0.0 Mathics3 API; we need to explicilty load builtins
8+
9+
410
6.0.0
511
-----
612

7-
Revise for 6.0.0 Mathics3 API and current Mathics3 builtin standards described in `Guidelines for Writing
13+
Revise for 6.0.0 Mathics3 APIs and current Mathics3 builtin standards described in `Guidelines for Writing
814
Documentation <https://mathics-development-guide.readthedocs.io/en/latest/extending/developing-code/extending/documentation-markup.html#guidelines-for-writing-documentation>`_.
915

1016
This package has undergone a major overhaul. Modules have been split out along into logical groups following the documentation structure.

‎ChangeLog-spell-corrected.diff

Lines changed: 72 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,72 @@
1+
--- ChangeLog 2024-08-11 09:56:49.699104043 -0400
2+
+++ ChangeLog-spell-corrected 2024-08-11 09:56:29.505207062 -0400
3+
@@ -7,8 +7,8 @@
4+
5+
2024-08-11 R. Bernstein <rocky@users.noreply.github.com>
6+
7+
- * .github/workflows/{osx.yml => osx.yml-needs-enchant-fixup}:
8+
- Temorarily remove OSX CI (#27) * Attempt to get OSX CI working * Remove OSX CI testing for now... We need to figure out how to get C spelling libray enchant
9+
+ * .github/workflows/{osx.yml => osx.yml-needs-enchant-fixup}:
10+
+ Temporarily remove OSX CI (#27) * Attempt to get OSX CI working * Remove OSX CI testing for now... We need to figure out how to get C spelling library enchant
11+
installed... Or make that optional in mathics-core.
12+
13+
2024-08-08 rocky <rb@dustyfeet.com>
14+
@@ -24,7 +24,7 @@
15+
16+
2024-08-08 Juan Mauricio Matera <matera@fisica.unlp.edu.ar>
17+
18+
- * pymathics/natlang/textual_analysis.py: addiing blanklines between
19+
+ * pymathics/natlang/textual_analysis.py: adding blanklines between
20+
</dl> and the examples in docstrings (#25)
21+
22+
2024-08-06 rocky <rb@dustyfeet.com>
23+
@@ -132,7 +132,7 @@
24+
2023-02-19 R. Bernstein <rocky@users.noreply.github.com>
25+
26+
* .github/workflows/osx.yml, Makefile, README.rst,
27+
- pymathics/natlang/__init__.py, pymathics/natlang/main.py, setup.py:
28+
+ pymathics/natlang/__init__.py, pymathics/natlang/main.py, setup.py:
29+
Make a pass over setup, docs, and top-level things (#9) * README.rst: move customization from main.py here * Makefile: LoadModule name has changes * __init__.py: list imports, go over docstring which forms chapter
30+
information * main.py: numerous small doc changes; fix some type errors. * setup.py and spacy, langid, and pyenchant are no longer optional.
31+
Note pyenchant rather than enchant is now used.
32+
@@ -274,7 +274,7 @@
33+
34+
2020-12-22 rocky <rb@dustyfeet.com>
35+
36+
- * CHANGES.rst, README.rst, pymathics/natlang/__main__.py, setup.py:
37+
+ * CHANGES.rst, README.rst, pymathics/natlang/__main__.py, setup.py:
38+
Update README.rst, remove a deprecation warning
39+
40+
2020-12-22 rocky <rb@dustyfeet.com>
41+
@@ -296,7 +296,7 @@
42+
43+
2020-12-22 rocky <rb@dustyfeet.com>
44+
45+
- * CHANGES.rst, README.rst, pymathics/natlang/version.py, setup.py:
46+
+ * CHANGES.rst, README.rst, pymathics/natlang/version.py, setup.py:
47+
Get ready for release 1.1.0
48+
49+
2020-11-15 rocky <rb@dustyfeet.com>
50+
@@ -310,7 +310,7 @@
51+
52+
2020-11-14 rocky <rb@dustyfeet.com>
53+
54+
- * admin-tools/make-dist.sh, admin-tools/pyenv-versions:
55+
+ * admin-tools/make-dist.sh, admin-tools/pyenv-versions:
56+
Administrivia
57+
58+
2020-11-14 rocky <rb@dustyfeet.com>
59+
@@ -337,7 +337,7 @@
60+
61+
2020-10-31 rocky <rocky@gnu.org>
62+
63+
- * pymathics/__init__.py, pymathics/natlang/__main__.py, setup.py:
64+
+ * pymathics/__init__.py, pymathics/natlang/__main__.py, setup.py:
65+
Working better now... setup.py: Use namespace packages. Put this under namespace
66+
PyMathics. natlang/__main__.py: With next round of changes, we
67+
don't need to set "context".
68+
@@ -345,4 +345,3 @@
69+
2020-10-31 rocky <rocky@gnu.org>
70+
71+
* Initial natlang setup
72+
-

‎Makefile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -86,6 +86,7 @@ rmChangeLog:
8686
#: Create a ChangeLog from git via git log and git2cl
8787
ChangeLog: rmChangeLog
8888
git log --pretty --numstat --summary | $(GIT2CL) >$@
89+
patch ChangeLog < ChangeLog-spell-corrected.diff
8990

9091
#: Run pytest consistency and style checks
9192
check-consistency-and-style:

‎admin-tools/make-dist.sh

Lines changed: 10 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
#!/bin/bash
2-
PACKAGE=pymathics-natlang
2+
PACKAGE=pymathics_natlang
33

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

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

1313
if ! source ./pyenv-versions ; then
@@ -19,21 +19,12 @@ cd ..
1919
source pymathics/natlang/version.py
2020
echo $__version__
2121

22-
for pyversion in $PYVERSIONS; do
23-
if ! pyenv local $pyversion ; then
24-
exit $?
25-
fi
26-
# pip bdist_egg create too-general wheels. So
27-
# we narrow that by moving the generated wheel.
28-
29-
# Pick out first two number of version, e.g. 3.7.9 -> 37
30-
first_two=$(echo $pyversion | cut -d'.' -f 1-2 | sed -e 's/\.//')
31-
rm -fr build
32-
python setup.py develop
33-
python setup.py bdist_egg
34-
python setup.py bdist_wheel
35-
python setup.py bdist_wheel --universal
36-
mv -v dist/${PACKAGE}-$VERSION-{py2.py3,py$first_two}-none-any.whl
37-
done
22+
pyversion=3.11
23+
if ! pyenv local $pyversion ; then
24+
exit $?
25+
fi
3826

27+
python setup.py bdist_wheel --universal
28+
mv -v dist/${PACKAGE}-${__version__}-{py2.,}py3-none-any.whl
3929
python ./setup.py sdist
30+
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 pyston-2.3.5'
9+
export PYVERSIONS='3.8 3.9 3.10 3.11'

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

0 commit comments

Comments
 (0)