diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml index ccba994..bb8ea94 100644 --- a/.github/workflows/ubuntu.yml +++ b/.github/workflows/ubuntu.yml @@ -12,7 +12,7 @@ jobs: strategy: matrix: # python-version: ['3.9', '3.10'] # Figure out what's wrong here. - python-version: ['3.11'] + python-version: ['3.9', '3.10', '3.11'] steps: - uses: actions/checkout@v4 - name: Set up Python ${{ matrix.python-version }} @@ -27,9 +27,9 @@ jobs: # python -m pip install -e git+https://github.com/Mathics3/mathics-scanner#egg=Mathics-Scanner[full] # python -m pip install -e git+https://github.com/Mathics3/mathics-core#egg=Mathics3[full] git clone https://github.com/Mathics3/mathics-core - (cd mathics-core && pip3 install -e .[full]) - (cd mathics-core && bash ./admin-tools/make-op-tables.sh) - # python -m pip install Mathics3[full] + # (cd mathics-core && pip3 install -e .[full]) + # (cd mathics-core && bash ./admin-tools/make-op-tables.sh) + python -m pip install Mathics3[full] - name: install pymathics natlang run: | make develop diff --git a/.gitignore b/.gitignore index d846b2a..8f03b1a 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,8 @@ *~ /.python-version /ChangeLog +/ChangeLog.orig +/ChangeLog.rej /build /dist /pymathics_natlang.egg-info diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index d463052..e1a7141 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -10,6 +10,7 @@ repos: - id: end-of-file-fixer stages: [commit] - id: trailing-whitespace + exclude: 'ChangeLog-spell-corrected.diff' - repo: https://github.com/psf/black rev: 22.3.0 hooks: diff --git a/CHANGES.rst b/CHANGES.rst index 7f78c0b..e42ca6e 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -1,10 +1,16 @@ CHANGES ======= +7.0.0 +----- + +* Revise for 7.0.0 Mathics3 API; we need to explicilty load builtins + + 6.0.0 ----- -Revise for 6.0.0 Mathics3 API and current Mathics3 builtin standards described in `Guidelines for Writing +Revise for 6.0.0 Mathics3 APIs and current Mathics3 builtin standards described in `Guidelines for Writing Documentation `_. This package has undergone a major overhaul. Modules have been split out along into logical groups following the documentation structure. diff --git a/ChangeLog-spell-corrected.diff b/ChangeLog-spell-corrected.diff new file mode 100644 index 0000000..101779a --- /dev/null +++ b/ChangeLog-spell-corrected.diff @@ -0,0 +1,72 @@ +--- ChangeLog 2024-08-11 09:56:49.699104043 -0400 ++++ ChangeLog-spell-corrected 2024-08-11 09:56:29.505207062 -0400 +@@ -7,8 +7,8 @@ + + 2024-08-11 R. Bernstein + +- * .github/workflows/{osx.yml => osx.yml-needs-enchant-fixup}: +- 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 ++ * .github/workflows/{osx.yml => osx.yml-needs-enchant-fixup}: ++ 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 + installed... Or make that optional in mathics-core. + + 2024-08-08 rocky +@@ -24,7 +24,7 @@ + + 2024-08-08 Juan Mauricio Matera + +- * pymathics/natlang/textual_analysis.py: addiing blanklines between ++ * pymathics/natlang/textual_analysis.py: adding blanklines between + and the examples in docstrings (#25) + + 2024-08-06 rocky +@@ -132,7 +132,7 @@ + 2023-02-19 R. Bernstein + + * .github/workflows/osx.yml, Makefile, README.rst, +- pymathics/natlang/__init__.py, pymathics/natlang/main.py, setup.py: ++ pymathics/natlang/__init__.py, pymathics/natlang/main.py, setup.py: + 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 + information * main.py: numerous small doc changes; fix some type errors. * setup.py and spacy, langid, and pyenchant are no longer optional. + Note pyenchant rather than enchant is now used. +@@ -274,7 +274,7 @@ + + 2020-12-22 rocky + +- * CHANGES.rst, README.rst, pymathics/natlang/__main__.py, setup.py: ++ * CHANGES.rst, README.rst, pymathics/natlang/__main__.py, setup.py: + Update README.rst, remove a deprecation warning + + 2020-12-22 rocky +@@ -296,7 +296,7 @@ + + 2020-12-22 rocky + +- * CHANGES.rst, README.rst, pymathics/natlang/version.py, setup.py: ++ * CHANGES.rst, README.rst, pymathics/natlang/version.py, setup.py: + Get ready for release 1.1.0 + + 2020-11-15 rocky +@@ -310,7 +310,7 @@ + + 2020-11-14 rocky + +- * admin-tools/make-dist.sh, admin-tools/pyenv-versions: ++ * admin-tools/make-dist.sh, admin-tools/pyenv-versions: + Administrivia + + 2020-11-14 rocky +@@ -337,7 +337,7 @@ + + 2020-10-31 rocky + +- * pymathics/__init__.py, pymathics/natlang/__main__.py, setup.py: ++ * pymathics/__init__.py, pymathics/natlang/__main__.py, setup.py: + Working better now... setup.py: Use namespace packages. Put this under namespace + PyMathics. natlang/__main__.py: With next round of changes, we + don't need to set "context". +@@ -345,4 +345,3 @@ + 2020-10-31 rocky + + * Initial natlang setup +- diff --git a/Makefile b/Makefile index a1b5f17..849aae9 100644 --- a/Makefile +++ b/Makefile @@ -86,6 +86,7 @@ rmChangeLog: #: Create a ChangeLog from git via git log and git2cl ChangeLog: rmChangeLog git log --pretty --numstat --summary | $(GIT2CL) >$@ + patch ChangeLog < ChangeLog-spell-corrected.diff #: Run pytest consistency and style checks check-consistency-and-style: diff --git a/admin-tools/make-dist.sh b/admin-tools/make-dist.sh index a0604c7..015d2a9 100755 --- a/admin-tools/make-dist.sh +++ b/admin-tools/make-dist.sh @@ -3,11 +3,11 @@ PACKAGE=pymathics-natlang # FIXME put some of the below in a common routine function finish { - cd $owd + cd $mathics_natlang_owd } cd $(dirname ${BASH_SOURCE[0]}) -owd=$(pwd) +mathics_natlang_owd=$(pwd) trap finish EXIT if ! source ./pyenv-versions ; then @@ -19,21 +19,13 @@ cd .. source pymathics/natlang/version.py echo $__version__ -for pyversion in $PYVERSIONS; do - if ! pyenv local $pyversion ; then - exit $? - fi - # pip bdist_egg create too-general wheels. So - # we narrow that by moving the generated wheel. - - # Pick out first two number of version, e.g. 3.7.9 -> 37 - first_two=$(echo $pyversion | cut -d'.' -f 1-2 | sed -e 's/\.//') - rm -fr build - python setup.py develop - python setup.py bdist_egg - python setup.py bdist_wheel - python setup.py bdist_wheel --universal - mv -v dist/${PACKAGE}-$VERSION-{py2.py3,py$first_two}-none-any.whl -done +pyversion=3.11 +if ! pyenv local $pyversion ; then + exit $? +fi +python setup.py bdist_wheel +python setup.py bdist_wheel --universal +mv -v dist/${PACKAGE}-$VERSION-{py2.py3,py3}-none-any.whl python ./setup.py sdist +finish diff --git a/admin-tools/pyenv-versions b/admin-tools/pyenv-versions index c0bf052..ed8818f 100644 --- a/admin-tools/pyenv-versions +++ b/admin-tools/pyenv-versions @@ -6,4 +6,4 @@ if [[ $0 == ${BASH_SOURCE[0]} ]] ; then exit 1 fi -export PYVERSIONS='3.6.15 3.7.16 3.8.16 3.9.16 3.10.10 pyston-2.3.5' +export PYVERSIONS='3.8 3.9 3.10 3.11' diff --git a/pymathics/natlang/version.py b/pymathics/natlang/version.py index ccd2d4a..cc1f721 100644 --- a/pymathics/natlang/version.py +++ b/pymathics/natlang/version.py @@ -5,4 +5,4 @@ # well as importing into Python. That's why there is no # space around "=" below. # fmt: off -__version__="7.0.0.dev0" # noqa +__version__="7.0.0" # noqa