From 9c2b4528392fa2fbf2bb11e0edcb4a7f0cad94c7 Mon Sep 17 00:00:00 2001 From: rocky Date: Thu, 17 Jul 2025 20:03:20 -0400 Subject: [PATCH 1/5] Get ready for release 9.0.0 Go over Changes. NEWS.md -> Changes.rst to match other repositories --- CHANGES.rst | 1 + MANIFEST.in | 2 +- mathicsscript/version.py | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/CHANGES.rst b/CHANGES.rst index b8d9b91..5dfa67c 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -13,6 +13,7 @@ are now accepted. Short option ``-f`` is associated with ``-file`` rather than ` Option ``--read`` with alias ``-r`` is now ``-code`` and short option `-c`. Toggling Autobrace using f4 was fixed. + You can cycle now through pygments styles up using f5 (next style) and f6 (previous style). f1 (help) now show function key bindings in bottom bar. diff --git a/MANIFEST.in b/MANIFEST.in index bd3e0f2..ac58d1b 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -1,5 +1,5 @@ include README.rst -include NEWS.md +include CHANGES.rst include ChangeLog include COPYING.txt include Makefile diff --git a/mathicsscript/version.py b/mathicsscript/version.py index 57739da..f00a9bb 100644 --- a/mathicsscript/version.py +++ b/mathicsscript/version.py @@ -4,4 +4,4 @@ # well as importing into Python. That's why there is no # space around "=" below. # fmt: off -__version__="8.0.1.dev0" # noqa +__version__="9.0.0.dev0" # noqa From 6fefaf76efad2d9f3902d0284fc5ef10b672ead5 Mon Sep 17 00:00:00 2001 From: rocky Date: Sat, 19 Jul 2025 18:58:59 -0400 Subject: [PATCH 2/5] Cope with Python developer harassment --- pyproject.toml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index 3efcab3..34e841a 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -24,7 +24,7 @@ dependencies = [ ] requires-python = ">=3.9" readme = "README.rst" -license = {text = "GPL-3.0-only"} +license = "GPL-3.0-or-later" keywords = ["Mathematica", "Wolfram", "Interpreter", "Shell", "Math", "CAS"] maintainers = [ {name = "Mathics3 Group"}, @@ -32,7 +32,6 @@ maintainers = [ classifiers = [ "Intended Audience :: Developers", "Intended Audience :: Science/Research", - "License :: OSI Approved :: GNU General Public License v3 (GPLv3)", "Programming Language :: Python", "Programming Language :: Python :: 3.9", "Programming Language :: Python :: 3.10", From bcef70d20a1a3766520d59ebaa388acd6fe2fab9 Mon Sep 17 00:00:00 2001 From: rocky Date: Mon, 21 Jul 2025 19:04:07 -0400 Subject: [PATCH 3/5] Update --- CHANGES.rst | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGES.rst b/CHANGES.rst index 5dfa67c..7b812a2 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -14,10 +14,11 @@ Option ``--read`` with alias ``-r`` is now ``-code`` and short option `-c`. Toggling Autobrace using f4 was fixed. -You can cycle now through pygments styles up using f5 (next style) and f6 (previous style). f1 (help) now show function key +You can cycle now through pygments styles up using f5 (next style) and f6 (previous style). f1 (help) now shows function key bindings in bottom bar. + Bugs ++++ From 58283d5ca2494268eaccee41524bff9c493eacb2 Mon Sep 17 00:00:00 2001 From: rocky Date: Tue, 22 Jul 2025 06:59:24 -0400 Subject: [PATCH 4/5] Don't use "if False"... And tidy code a little. --- mathicsscript/completion.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/mathicsscript/completion.py b/mathicsscript/completion.py index c70cc4a..e0e1ef1 100644 --- a/mathicsscript/completion.py +++ b/mathicsscript/completion.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2021-2022, 2024 Rocky Bernstein +# Copyright (C) 2021-2022, 2024-2025 Rocky Bernstein # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation, either version 3 of the License, or @@ -28,12 +28,12 @@ SYMBOLS = rf"[`]?({Regex.IDENTIFIER}|{Regex.NAMED_CHARACTER})(`({Regex.IDENTIFIER}|{Regex.NAMED_CHARACTER}))+[`]?" -if False: # FIXME reinstate this - NAMED_CHARACTER_START = rf"\\\[{Regex.IDENTIFIER}" - FIND_MATHICS_WORD_RE = re.compile( - rf"({NAMED_CHARACTER_START})|(?:.*[\[\(])?({SYMBOLS}$)" - ) +# # The below is a more precise definition for a Mathics3 "word" or +# # "identifier", but it is wrong somehow. NAMED_CHARACTER_START = +# rf"\\\[{Regex.IDENTIFIER}" FIND_MATHICS_WORD_RE = re.compile( +# rf"({NAMED_CHARACTER_START})|(?:.*[\[\(])?({SYMBOLS}$)" ) FIND_MATHICS_WORD_RE = re.compile(r"((?:\[)?[^\s\[\(\{]+)") + CHARGROUP_START = frozenset(["(", "[", "{", ","]) From 87e53aba70fbf578b924dd5eb9de2de1b04bea46 Mon Sep 17 00:00:00 2001 From: rocky Date: Tue, 22 Jul 2025 08:04:17 -0400 Subject: [PATCH 5/5] Add f1 help as bottom bar --- CHANGES.rst | 1 - 1 file changed, 1 deletion(-) diff --git a/CHANGES.rst b/CHANGES.rst index 7b812a2..1592fde 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -18,7 +18,6 @@ You can cycle now through pygments styles up using f5 (next style) and f6 (previ bindings in bottom bar. - Bugs ++++