Merge 9.0 release

rocky · rocky · commit d467da7f2c2b · 2025-09-02T12:36:53.000-04:00
diff --git a/.github/workflows/MSWindows.yml b/.github/workflows/MSWindows.yml
diff --git a/.github/workflows/MacOS.yml b/.github/workflows/MacOS.yml
diff --git a/.github/workflows/Ubuntu.yml b/.github/workflows/Ubuntu.yml
diff --git a/.gitignore b/.gitignore
@@ -6,4 +6,5 @@
 /Mathics3_Module_hello.egg-info
 /build
 /dist
+/tmp
 __pycache__
diff --git a/Makefile b/Makefile
@@ -25,10 +25,6 @@ all: develop
 build:
 	$(PYTHON) ./setup.py build
 
-#: Make PyPI distribution
-dist:
-	./admin-tools/make-dist.sh
-
 #: Check Python version, and install PyPI dependencies
 pypi-setup:
 	$(PIP) install -e .
@@ -37,6 +33,10 @@ pypi-setup:
 develop: pypi-setup
 	$(PIP) install -e .
 
+#: Install mathics
+install:
+	$(PYTHON) setup.py install
+
 # Run tests
 check: pytest
 
@@ -49,7 +49,7 @@ clean-pyc:
 
 #: Run py.test tests. Use environment variable "o" for pytest options
 pytest:
-	pytest test $o
+	py.test test $o
 
 
 # #: Make Mathics PDF manual
diff --git a/NEWS.md b/NEWS.md
@@ -1,15 +1,3 @@
-9.0.1
------
-
-Change module name to Mathics3-Module-hello. Revise documentation.
-
-
-9.0.0
------
-
-* Revise for 9.0.0 Mathics3 API.
-
-
 7.0.0
 -----
 
diff --git a/README.rst b/README.rst
@@ -19,15 +19,12 @@ Then the function ```Hello[]`` is available::
       In[1]:= LoadModule["pymathics.hello"]
       Out[1]= pymathics.hello
 
-      In[2]:= Hello[]
+      In[2]:= Hello["World"]
       Out[2]:= Hello, World!
 
-      In[2]:= Hello["everyone"]
-      Out[2]:= Hello, everyone!
+You can test with ``py.test``::
 
-You can test with ``pytest``::
-
-     $ pytest test
+     $ py.test test
 
 or simply::
 
diff --git a/admin-tools/make-dist.sh b/admin-tools/make-dist.sh
@@ -23,7 +23,7 @@ if ! pyenv local $pyversion ; then
     exit $?
 fi
 
-pyenv local 3.13
-pip wheel --wheel-dir=dist .
-python -m build --sdist
+python setup.py bdist_wheel --universal
+mv -v dist/pymathics_hello-${__version__}-{py2.,}py3-none-any.whl
+python ./setup.py sdist
 finish
diff --git a/admin-tools/pyenv-versions b/admin-tools/pyenv-versions
@@ -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.10 3.11 3.12 3.13'
+export PYVERSIONS='3.8 3.9 3.10 3.11'
diff --git a/pymathics/hello/__init__.py b/pymathics/hello/__init__.py
@@ -1,10 +1,10 @@
 # -*- coding: utf-8 -*-
 """
-Mathics3 Module hello module.
+PyMathics Hello test module.
 
-This is an example of an external Mathics3 module.
+This is an example of an external PyMathics module.
 
-A Mathics3 module is a Python module which can be loaded into Mathics using the
+A PyMathics module is a Python module which can be loaded into Mathics using the
 ``LoadModule[]`` method.
 
 In particular, to load this after installing this module as a Python module run inside
diff --git a/pymathics/hello/__main__.py b/pymathics/hello/__main__.py
@@ -12,8 +12,7 @@ class Hello(Builtin):
       <dd>An example function in a Python-importable Mathics3 module.
     </dl>
 
-    >> Hello["everyone"]
-    = "Hello, everyone!"
+    >> PyMathics`Hello["World"]
 
     See also the <url>
     :developer guide section:
@@ -27,10 +26,6 @@ class Hello(Builtin):
      = Hello, rocky!
     """
 
-    # Set checking that the number of arguments required is zero or one.
-    # eval_error = Builtin.generic_argument_error
-    # expected_args = (0, 1)
-
     summary_text = """classic "hello" demo"""
 
     # The function below should start with "apply"
@@ -39,15 +34,9 @@ def eval(self, evaluation: Evaluation):
         return String("Hello, World!")
 
     # The function below should start with "eval"
-    def eval_with_name(self, person, evaluation: Evaluation) -> String:
-        "Hello[person_]"
-        # The above pattern matches Hello with a argument.
+    def eval_with_name(self, person: String, evaluation: Evaluation) -> String:
+        "Hello[person_String]"
+        # The above pattern matches Hello with a single string argument.
         # See https://reference.wolfram.com/language/tutorial/Patterns.html#7301
         # and https://reference.wolfram.com/language/ref/Cases.html
-
-        # Check that "person" is a String.
-        if not isinstance(person, String):
-            evaluation.message("Hello", "string")
-            return
-
         return String(f"Hello, {person.value}!")
diff --git a/pymathics/hello/version.py b/pymathics/hello/version.py
@@ -5,4 +5,4 @@
 # well as importing into Python. That's why there is no
 # space around "=" below.
 # fmt: off
-__version__="9.0.2.dev0"  # noqa
+__version__="9.0.0"  # noqa
diff --git a/pyproject.toml b/pyproject.toml
@@ -1,27 +1,32 @@
 [build-system]
 requires = [
 	"setuptools",
-        "Mathics3>=9.0.0",
+        "mpmath>=1.2.0",
+        "numpy<1.27",
+        "matplotlib",
+        "scipy>=1.10.0",
+	"sympy>=1.11,<1.13",
 ]
 build-backend = "setuptools.build_meta"
 
 [project]
-name = "Mathics3-Module-hello"
+name = "Mathics3-hello"
 description = 'Mathics3 Hello, World! module'
 dependencies = [
         "Mathics3-Module-Base >= 9.0.0",
         "Mathics3 >= 9.0.0",
 ]
 requires-python = ">=3.10"
 readme = "README.rst"
-license = "GPL-3.0-or-later"
+license = {text = "GPL"}
 keywords = ["Mathematica", "Wolfram", "Interpreter", "Shell", "Math", "CAS"]
 maintainers = [
     {name = "Mathics Group", email = "mathics-devel@googlegroups.com"},
 ]
 classifiers = [
     "Intended Audience :: Developers",
     "Intended Audience :: Science/Research",
+    "License :: OSI Approved :: GNU General Public License v3 (GPLv3)",
     "Programming Language :: Python",
     "Programming Language :: Python :: 3.10",
     "Programming Language :: Python :: 3.11",
diff --git a/test/test_hello.py b/test/test_hello.py
@@ -8,24 +8,17 @@
 session = MathicsSession(character_encoding="ASCII")
 
 
-def check_evaluation(str_expr: str, expected: str, assert_message=""):
-    """Helper function to test that a Mathics3 expression against
+def check_evaluation(str_expr: str, expected: str, message=""):
+    """Helper function to test that a Mathics expression against
     its results"""
     result = session.evaluate(str_expr).value
 
-    if assert_message:
-        print(f"got: {result}, expect: {expected} -- {assert_message}")
-        assert result == expected, assert_message
-    else:
-        print(f"got: {result}, expect: {expected}")
-
-    if assert_message:
-        assert result == expected, f"{assert_message}: got: {result}"
+    if message:
+        assert result == expected, f"{message}: got: {result}"
     else:
         assert result == expected
 
 
 def test_hello():
     session.evaluate('LoadModule["pymathics.hello"]') == "pymathics.hello"
-    check_evaluation('Hello["everyone"]', "Hello, everyone!")
-    check_evaluation("Hello[]", "Hello, World!")
+    check_evaluation('Hello["World"]', "Hello, World!")

-Original file line number
+Diff line change
@@ @@ -1,15 +1,3 @@ @@
 -9.0.1
 ------
+-
 -Change module name to Mathics3-Module-hello. Revise documentation.
+-
+-
 -9.0.0
 ------
+-
 -* Revise for 9.0.0 Mathics3 API.
+-
+-
 .0.0
 -----