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 1.0.4 #8

Merged
merged 1 commit into from
Jan 28, 2025
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
22 changes: 20 additions & 2 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
@@ -1,13 +1,31 @@
default_language_version:
python: python
exclude: 'mathics_pygments/version.py'
repos:
- repo: https://github.com/pre-commit/pre-commit-hooks
rev: v2.3.0
rev: v4.5.0
hooks:
- id: check-merge-conflict
- id: check-yaml
- id: debug-statements
stages: [pre-commit]
- id: end-of-file-fixer
stages: [pre-commit]
exclude: ChangeLog-spell-corrected.diff
- id: trailing-whitespace
exclude: ChangeLog-spell-corrected.diff
- id: check-json
exclude: mathics_pygments/data/mma-tables.json
- repo: https://github.com/pycqa/isort
rev: 5.13.2
hooks:
- id: isort
stages: [pre-commit]
args: ["--profile", "black"]
- repo: https://github.com/psf/black
rev: 21.6b0
rev: 23.12.1
hooks:
- id: black
language_version: python3
stages: [pre-commit]
exclude: version.py
7 changes: 7 additions & 0 deletions CHANGES.rst
Original file line number Diff line number Diff line change
@@ -1,6 +1,13 @@
CHANGES
=======

1.0.4
-----

This is a Transitional release.

Although there is a dependency on mathics-scanner, we don't use it since tables have changed. There is some code for reading the YAML takes from the project though. With a newer and better mathics-scanner, we should be able to revise this code and use the tokenizer from mathics-scanner and simplify things greatly.

1.0.3
-----

Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ install:

#: Run py.test tests. Use environment variable "o" for pytest options
pytest:
py.test tests $o
$(PYTHON) -m pytest tests $o


#: Remove ChangeLog
Expand Down
5 changes: 3 additions & 2 deletions admin-tools/check-versions.sh
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
#!/bin/bash
function finish {
cd $owd
cd $mathics_pygments_owd
}

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

cd $(dirname ${BASH_SOURCE[0]})
Expand All @@ -24,3 +24,4 @@ for version in $PYVERSIONS; do
fi
echo === $version ===
done
finish
7 changes: 7 additions & 0 deletions admin-tools/make-JSON-tables.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
#!/bin/bash
bs=${BASH_SOURCE[0]}
json_tables_owd=$(pwd)
mydir=$(dirname $bs)
cd $mydir
python ../mathics_pygments/generate/build_pygments_tables.py -o $mydir/../mathics_pygments/data/mma-tables-new.json
cd $json_tables_owd
5 changes: 0 additions & 5 deletions admin-tools/make-tables.sh

This file was deleted.

2 changes: 1 addition & 1 deletion mathics_pygments/version.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,4 @@
# space around "=" below.

# fmt: off
__version__="1.0.3" # noqa
__version__="1.0.4" # noqa