Misc small changes since 10.0.0

Author: rocky

Makefile

@@ -11,6 +11,7 @@ RM  ?= rm
 PIP_INSTALL_OPTS ?=
 
 .PHONY: all build \
+   ChangeLog-without-corrections \
    check check-full check-mathics3 clean \
    develop dist doc \
    inputrc-no-unicode \

README.rst

@@ -28,7 +28,7 @@ Uses
 The scanner and character tables are used inside `Mathics3 <https://mathics.org>`_. However information can
 also be used by other programs for tokenizing and formatting Wolfram Language code.
 
-For example, tables are used in `mathics-pygments <https://pypi.org/project/Mathics-Scanner/>`_, a Pygments-based
+For example, tables are used in `mathics-pygments <https://pypi.org/project/Mathics3-pygments/>`_, a Pygments-based
 lexer and highlighter for Mathematica/Wolfram Language source code.
 
 This library may be useful if you need to work with the Wolfram Language
@@ -64,7 +64,8 @@ Implementation
 --------------
 
 For notes on the implementation of the packages or details on the conversion
-scheme, please read `Scanning <https:/https://mathics-development-guide.readthedocs.io/en/latest/code-overview/scanning.html>`_.
+scheme, please read `Mathics3 scanner's documentation <https://mathics3-scanner-and-yaml-tables-for-characters-and-operators.readthedocs.io/en/latest/>`_ or
+`Scanning section <https://mathics-development-guide.readthedocs.io/en/latest/code-overview/scanning.html>`_ of the Mathics3 User and Developers Guide.
 
 Contributing
 ------------

mathics_scanner/__init__.py

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 """
-This is the tokeniser or scanner portion for the Wolfram Language.
+This is the tokenizer or scanner portion for the Wolfram Language.
 
 As such, it also contains a full set of translation between Wolfram Language
 named characters, their Unicode/ASCII equivalents and code-points.

mathics_scanner/generate/boxing_characters.py

@@ -13,6 +13,18 @@
 
 # Silence warnings about JSON tables not existing
 os.environ["MATHICS3_TABLE_GENERATION"] = "true"
+try:
+    from mathics_scanner.version import __version__  # noqa
+except ImportError:
+    import ast
+    from pathlib import Path
+
+    version_file = Path(__file__).parent.parent / "version.py"
+    version_content = version_file.read_text()
+    version_line = [
+        line for line in version_content.split("\n") if line.startswith("__version__")
+    ][0]
+    __version__ = ast.literal_eval(version_line.split("=")[1].strip().split("#")[0])
 from mathics_scanner.version import __version__  # noqa
 
 

mathics_scanner/generate/named_characters.py

@@ -1,5 +1,5 @@
 #!/usr/bin/env python
-# This scripts reads the data from named-characters and converts it to the
+# This script reads the data from named-characters and converts it to the
 # format used by the library internally
 
 import json
@@ -13,6 +13,18 @@
 
 # Silence warnings about JSON tables not existing
 os.environ["MATHICS3_TABLE_GENERATION"] = "true"
+
+try:
+    from mathics_scanner.version import __version__  # noqa
+except ImportError:
+    import ast
+
+    version_file = Path(__file__).parent.parent / "version.py"
+    version_content = version_file.read_text()
+    version_line = [
+        line for line in version_content.split("\n") if line.startswith("__version__")
+    ][0]
+    __version__ = ast.literal_eval(version_line.split("=")[1].strip().split("#")[0])
 from mathics_scanner.version import __version__  # noqa
 
 

mathics_scanner/generate/operators.py

@@ -15,6 +15,19 @@
 
 # Silence warnings about JSON tables not existing
 os.environ["MATHICS3_TABLE_GENERATION"] = "true"
+
+try:
+    from mathics_scanner.version import __version__  # noqa
+except ImportError:
+    import ast
+
+    version_file = Path(__file__).parent.parent / "version.py"
+    version_content = version_file.read_text()
+    version_line = [
+        line for line in version_content.split("\n") if line.startswith("__version__")
+    ][0]
+    __version__ = ast.literal_eval(version_line.split("=")[1].strip().split("#")[0])
+
 from mathics_scanner.version import __version__  # noqa
 
 OPERATOR_FIELDS = [

pyproject.toml

@@ -54,7 +54,7 @@ full = [
 mathics3-make-boxing-character-json = "mathics_scanner.generate.boxing_characters:main"
 mathics3-make-named-character-json = "mathics_scanner.generate.named_characters:main"
 mathics3-make-operator-json = "mathics_scanner.generate.operators:main"
-mathics3-code-tokenize = "mathics_scanner.mathics3_code_tokenize:main"
+mathics3-codeparser-tokenize = "mathics_scanner.mathics3_code_tokenize:main"
 
 [tool.setuptools]
 packages = [
@@ -67,7 +67,7 @@ packages = [
 "mathics_scanner" = [
     "data/boxing-characters.json",
     "data/boxing-characters.yml",
-    "daa/grouping-characters.yml",
+    "data/grouping-characters.yml",
     "data/named-characters.json",
     "data/named-characters.yml",
     "data/operators.yml",

setup.py

@@ -1,28 +1,13 @@
 #!/usr/bin/env python3
 # -*- coding: utf-8 -*-
 
-"""Setuptools based setup script for Mathics.
+"""Setuptools based setup script for Mathics3 Scanner.
 
 For the easiest installation just type the following command (you'll probably
 need root privileges):
 
-    python setup.py install
+    pip install -e .
 
-This will install the library in the default location. For instructions on
-how to customize the install procedure read the output of:
-
-    python setup.py --help install
-
-In addition, there are some other commands:
-
-    python setup.py clean -> will clean all trash (*.pyc and stuff)
-
-To get a full list of available commands, read the output of:
-
-    python setup.py --help-commands
-
-Or, if all else fails, feel free to write to the mathics users list at
-mathics-users@googlegroups.com and ask for help.
 """
 
 import os