Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Get ready for release 7.0.0 #6

Merged
merged 1 commit into from
Aug 19, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 7 additions & 2 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,18 @@ repos:
stages: [commit]
- id: end-of-file-fixer
stages: [commit]
- id: trailing-whitespace
# - repo: https://github.com/pycqa/isort
# rev: 5.10.1
# hooks:
# - id: isort
# stages: [commit]
- repo: https://github.com/psf/black
rev: 22.3.0
hooks:
- id: black
language_version: python3
exclude: 'mathicsscript/version.py'
exclude: 'pymathics/hello/version.py'
stages: [commit]
- repo: https://github.com/pycqa/flake8
rev: 3.9.2
hooks:
Expand Down
16 changes: 16 additions & 0 deletions ChangeLog-spell-corrected.diff
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
--- ChangeLog 2024-08-19 13:00:26.144430865 -0400
+++ ChangeLog-spell-corrected 2024-08-19 12:59:33.866689400 -0400
@@ -10,7 +10,7 @@
2024-08-19 Juan Mauricio Matera <[email protected]>

* pymathics/hello/__main__.py: adding blanklines between </dl> and
- the examples in docstrings (#4) * addiing blanklines between </dl> and the examples in docstrings * Update __main__.py --------- Co-authored-by: R. Bernstein <[email protected]>
+ the examples in docstrings (#4) * adding blanklines between </dl> and the examples in docstrings * Update __main__.py --------- Co-authored-by: R. Bernstein <[email protected]>

2024-08-19 rocky <[email protected]>

@@ -95,4 +95,3 @@
2020-10-30 rocky <[email protected]>

* A simple PyMathics module A "Hello, World!" PyMathics Function and Symbol definition. Adapted from mmatera's PyMathics "testpymathicsmodule"
-
1 change: 1 addition & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -63,3 +63,4 @@ 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
10 changes: 10 additions & 0 deletions NEWS.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
7.0.0
-----

* Revise for 7.0.0 Mathics3 API; we need to explicilty load builtins


1.0.0
-----

* First release.
27 changes: 27 additions & 0 deletions admin-tools/check-versions.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
#!/bin/bash
function finish {
cd $mathics_hello_owd
}

# FIXME put some of the below in a common routine
mathics_hello_owd=$(pwd)
trap finish EXIT

cd $(dirname ${BASH_SOURCE[0]})
if ! source ./pyenv-versions ; then
exit $?
fi

cd ..
for version in $PYVERSIONS; do
echo --- $version ---
if ! pyenv local $version ; then
exit $?
fi
make clean && pip install -e .
if ! make check; then
exit $?
fi
echo === $version ===
done
finish
26 changes: 8 additions & 18 deletions admin-tools/make-dist.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@ PACKAGE=pymathics-hello

# FIXME put some of the below in a common routine
function finish {
cd $owd
cd $mathics_hello_owd
}

cd $(dirname ${BASH_SOURCE[0]})
owd=$(pwd)
mathics_hello_owd=$(pwd)
trap finish EXIT

if ! source ./pyenv-versions ; then
Expand All @@ -19,21 +19,11 @@ cd ..
source pymathics/hello/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
if ! pyenv local $pyversion ; then
exit $?
fi

python setup.py bdist_wheel --universal
mv -v dist/pymathics_graph-${__version__}-{py2.,}py3-none-any.whl
python ./setup.py sdist
finish
2 changes: 1 addition & 1 deletion admin-tools/pyenv-versions
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,4 @@ if [[ $0 == ${BASH_SOURCE[0]} ]] ; then
echo "This script should be *sourced* rather than run directly through bash"
exit 1
fi
export PYVERSIONS='3.6.13 3.7.10 3.8.10 3.9.5'
export PYVERSIONS='3.8 3.9 3.10 3.11'
2 changes: 1 addition & 1 deletion pymathics/hello/version.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,4 @@
# well as importing into Python. That's why there is no
# space around "=" below.
# fmt: off
__version__="7.0.0dev1" # noqa
__version__="7.0.0" # noqa