git: 4da2988da935 - main - math/py-mathics-scanner: upgrade to 1.4.1

From: Thierry Thomas <thierry_at_FreeBSD.org>
Date: Tue, 28 Jan 2025 17:07:43 UTC
The branch main has been updated by thierry:

URL: https://cgit.FreeBSD.org/ports/commit/?id=4da2988da935cd580d64c3206e1e3b72508b95a7

commit 4da2988da935cd580d64c3206e1e3b72508b95a7
Author:     Thierry Thomas <thierry@FreeBSD.org>
AuthorDate: 2025-01-28 17:02:45 +0000
Commit:     Thierry Thomas <thierry@FreeBSD.org>
CommitDate: 2025-01-28 17:07:36 +0000

    math/py-mathics-scanner: upgrade to 1.4.1
    
    Releases notes at https://github.com/Mathics3/mathics-scanner/releases
---
 math/py-mathics-scanner/Makefile             | 10 ++++++----
 math/py-mathics-scanner/distinfo             |  6 +++---
 math/py-mathics-scanner/files/patch-Makefile | 10 +++++++---
 math/py-mathics-scanner/pkg-plist            | 21 +++++++++++++++++++--
 4 files changed, 35 insertions(+), 12 deletions(-)

diff --git a/math/py-mathics-scanner/Makefile b/math/py-mathics-scanner/Makefile
index 05068004895d..afad2ffdcb81 100644
--- a/math/py-mathics-scanner/Makefile
+++ b/math/py-mathics-scanner/Makefile
@@ -1,6 +1,5 @@
-PORTNAME=	Mathics_Scanner
-PORTVERSION=	1.3.0
-PORTREVISION=	1
+PORTNAME=	mathics_scanner
+PORTVERSION=	1.4.1
 CATEGORIES=	math python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -13,11 +12,14 @@ LICENSE=	GPLv3
 
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}ujson>0:devel/py-ujson@${PY_FLAVOR}	\
 		${PYTHON_PKGNAMEPREFIX}click>0:devel/py-click@${PY_FLAVOR}	\
+		${PYTHON_PKGNAMEPREFIX}pyyaml>0:devel/py-pyyaml@${PY_FLAVOR}	\
 		${PYTHON_PKGNAMEPREFIX}chardet>0:textproc/py-chardet@${PY_FLAVOR}
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}ujson>0:devel/py-ujson@${PY_FLAVOR}	\
 		${PYTHON_PKGNAMEPREFIX}click>0:devel/py-click@${PY_FLAVOR}	\
 		${PYTHON_PKGNAMEPREFIX}chardet>0:textproc/py-chardet@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}pyyaml>=0:devel/py-pyyaml@${PY_FLAVOR}
+		${PYTHON_PKGNAMEPREFIX}pyyaml>0:devel/py-pyyaml@${PY_FLAVOR}	\
+		${PYTHON_PKGNAMEPREFIX}types-ujson>0:devel/py-types-ujson@${PY_FLAVOR}	\
+		${PYTHON_PKGNAMEPREFIX}types-PyYAML>0:devel/py-types-PyYAML@${PY_FLAVOR}
 TEST_DEPENDS=	gmake:devel/gmake	\
 		${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR}
 
diff --git a/math/py-mathics-scanner/distinfo b/math/py-mathics-scanner/distinfo
index dd1e8b722fd5..5f36f7c37f0a 100644
--- a/math/py-mathics-scanner/distinfo
+++ b/math/py-mathics-scanner/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1678886730
-SHA256 (Mathics_Scanner-1.3.0.tar.gz) = 39751a2d28d40c88538cc03aa72a113dcae59fc49e8e7727f30219a6cc9ef997
-SIZE (Mathics_Scanner-1.3.0.tar.gz) = 125861
+TIMESTAMP = 1737918622
+SHA256 (mathics_scanner-1.4.1.tar.gz) = a98a5ee11815bf94edf8a6f665e788915c09b9cd4fd96ed4fc26583973dc6fb1
+SIZE (mathics_scanner-1.4.1.tar.gz) = 182389
diff --git a/math/py-mathics-scanner/files/patch-Makefile b/math/py-mathics-scanner/files/patch-Makefile
index 6241c44f354e..00d7154242d3 100644
--- a/math/py-mathics-scanner/files/patch-Makefile
+++ b/math/py-mathics-scanner/files/patch-Makefile
@@ -1,10 +1,14 @@
---- Makefile.orig	2021-02-06 10:47:39 UTC
+--- Makefile.orig	2025-01-26 16:27:42 UTC
 +++ Makefile
-@@ -20,7 +20,6 @@ RM  ?= rm
+@@ -23,11 +23,9 @@ mathics_scanner/data/character-tables.json: mathics_sc
  all: develop
  
- mathics_scanner/data/characters.json: mathics_scanner/data/named-characters.yml
+ mathics_scanner/data/character-tables.json: mathics_scanner/data/named-characters.yml
 -	$(PIP) install -r requirements-dev.txt
  	$(PYTHON) mathics_scanner/generate/build_tables.py
  
+ mathics_scanner/data/operators.json: mathics_scanner/data/operators.yml
+-	$(PIP) install -r requirements-dev.txt
+ 	$(PYTHON) mathics_scanner/generate/build_operator_tables.py
+ 
  #: build everything needed to install
diff --git a/math/py-mathics-scanner/pkg-plist b/math/py-mathics-scanner/pkg-plist
index 74c338400240..8a8b8ad363c4 100644
--- a/math/py-mathics-scanner/pkg-plist
+++ b/math/py-mathics-scanner/pkg-plist
@@ -1,4 +1,13 @@
-bin/mathics-generate-json-table
+bin/mathics3-generate-json-table
+bin/mathics3-generate-operator-json-table
+bin/mathics3-tokens
+%%PYTHON_SITELIBDIR%%/Mathics_Scanner-%%VER%%-py%%PYTHON_VER%%.egg-info/PKG-INFO
+%%PYTHON_SITELIBDIR%%/Mathics_Scanner-%%VER%%-py%%PYTHON_VER%%.egg-info/SOURCES.txt
+%%PYTHON_SITELIBDIR%%/Mathics_Scanner-%%VER%%-py%%PYTHON_VER%%.egg-info/dependency_links.txt
+%%PYTHON_SITELIBDIR%%/Mathics_Scanner-%%VER%%-py%%PYTHON_VER%%.egg-info/entry_points.txt
+%%PYTHON_SITELIBDIR%%/Mathics_Scanner-%%VER%%-py%%PYTHON_VER%%.egg-info/not-zip-safe
+%%PYTHON_SITELIBDIR%%/Mathics_Scanner-%%VER%%-py%%PYTHON_VER%%.egg-info/requires.txt
+%%PYTHON_SITELIBDIR%%/Mathics_Scanner-%%VER%%-py%%PYTHON_VER%%.egg-info/top_level.txt
 %%PYTHON_SITELIBDIR%%/mathics_scanner/__init__.py
 %%PYTHON_SITELIBDIR%%/mathics_scanner/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
 %%PYTHON_SITELIBDIR%%/mathics_scanner/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
@@ -10,6 +19,8 @@ bin/mathics-generate-json-table
 %%PYTHON_SITELIBDIR%%/mathics_scanner/__pycache__/feed.cpython-%%PYTHON_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/mathics_scanner/__pycache__/load.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
 %%PYTHON_SITELIBDIR%%/mathics_scanner/__pycache__/load.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/mathics_scanner/__pycache__/mathics3_tokens.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/mathics_scanner/__pycache__/mathics3_tokens.cpython-%%PYTHON_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/mathics_scanner/__pycache__/prescanner.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
 %%PYTHON_SITELIBDIR%%/mathics_scanner/__pycache__/prescanner.cpython-%%PYTHON_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/mathics_scanner/__pycache__/tokeniser.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
@@ -17,18 +28,24 @@ bin/mathics-generate-json-table
 %%PYTHON_SITELIBDIR%%/mathics_scanner/__pycache__/version.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
 %%PYTHON_SITELIBDIR%%/mathics_scanner/__pycache__/version.cpython-%%PYTHON_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/mathics_scanner/characters.py
-%%PYTHON_SITELIBDIR%%/mathics_scanner/data/characters.json
+%%PYTHON_SITELIBDIR%%/mathics_scanner/data/character-tables.json
 %%PYTHON_SITELIBDIR%%/mathics_scanner/data/element.csv
 %%PYTHON_SITELIBDIR%%/mathics_scanner/data/named-characters.yml
+%%PYTHON_SITELIBDIR%%/mathics_scanner/data/operators.json
+%%PYTHON_SITELIBDIR%%/mathics_scanner/data/operators.yml
 %%PYTHON_SITELIBDIR%%/mathics_scanner/errors.py
 %%PYTHON_SITELIBDIR%%/mathics_scanner/feed.py
+%%PYTHON_SITELIBDIR%%/mathics_scanner/generate/__pycache__/build_operator_tables.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/mathics_scanner/generate/__pycache__/build_operator_tables.cpython-%%PYTHON_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/mathics_scanner/generate/__pycache__/build_tables.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
 %%PYTHON_SITELIBDIR%%/mathics_scanner/generate/__pycache__/build_tables.cpython-%%PYTHON_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/mathics_scanner/generate/__pycache__/rl_inputrc.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
 %%PYTHON_SITELIBDIR%%/mathics_scanner/generate/__pycache__/rl_inputrc.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/mathics_scanner/generate/build_operator_tables.py
 %%PYTHON_SITELIBDIR%%/mathics_scanner/generate/build_tables.py
 %%PYTHON_SITELIBDIR%%/mathics_scanner/generate/rl_inputrc.py
 %%PYTHON_SITELIBDIR%%/mathics_scanner/load.py
+%%PYTHON_SITELIBDIR%%/mathics_scanner/mathics3_tokens.py
 %%PYTHON_SITELIBDIR%%/mathics_scanner/prescanner.py
 %%PYTHON_SITELIBDIR%%/mathics_scanner/tokeniser.py
 %%PYTHON_SITELIBDIR%%/mathics_scanner/version.py