Get ready for release 7.0.0 (#210)

Mathics3 · Aug 9, 2024 · fa90f7e · fa90f7e
1 parent 98bb52f
commit fa90f7e
Show file tree

Hide file tree

Showing 9 changed files with 1,972 additions and 24 deletions.
diff --git a/CHANGES.rst b/CHANGES.rst
@@ -1,6 +1,21 @@
 CHANGES
 =======
 
+7.0.0
+-----
+
+* Adjust for Mathics3 core 7.0.0 API, e.g., add explicit call to load builtins
+* doctest refactored to use more routines common to mathics-core
+* Support newer matplotlib, e.g. 3.9.1
+* Update gallery examples
+* Add background and tooltips to Graphics3D
+* Expand information in /about:
+   - max digits in string
+   - system encoding
+   - time format
+
+
+
 6.0.0
 -----
 

diff --git a/ChangeLog-spell-corrected.diff b/ChangeLog-spell-corrected.diff
diff --git a/Makefile b/Makefile
@@ -98,6 +98,7 @@ testserver: $(THREEJS)
 #: Create a ChangeLog from git via git log and git2cl
 ChangeLog: rmChangeLog
 	git log --pretty --numstat --summary | $(GIT2CL) >$@
+	patch ChangeLog < ChangeLog-spell-corrected.diff
 
 node_modules/\@mathicsorg/mathics-threejs-backend/package.json node_modules/@mathicsorg/mathics-threejs-backend/package.json:
 	npm install @mathicsorg/mathics-threejs-backend --loglevel=error

diff --git a/admin-tools/check-versions.sh b/admin-tools/check-versions.sh
@@ -1,10 +1,10 @@
 #!/bin/bash
 function finish {
-	cd $owd
+	cd $mathics_django_owd
 }
 
 # FIXME put some of the below in a common routine
-owd=$(pwd)
+mathics_django_owd=$(pwd)
 trap finish EXIT
 
 cd $(dirname ${BASH_SOURCE[0]})
@@ -22,4 +22,5 @@ for version in $PYVERSIONS; do
 		exit $?
 	fi
 	echo === $version ===
-done
+done
+finish
diff --git a/admin-tools/make-dist.sh b/admin-tools/make-dist.sh
@@ -3,7 +3,7 @@ PACKAGE=Mathics-Django
 
 # FIXME put some of the below in a common routine
 function finish {
-	cd $owd
+	cd $mathics_django_owd
 }
 
 cd $(dirname ${BASH_SOURCE[0]})
@@ -19,14 +19,12 @@ cd ..
 source mathics_django/version.py
 echo $__version__
 cp -v ${HOME}/.local/var/mathics/doc_html_data.pcl mathics_django/doc/
-
-for pyversion in $PYVERSIONS; do
-	if ! pyenv local $pyversion ; then
-		exit $?
-	fi
-	rm -fr build
-	python setup.py bdist_egg
-	python setup.py bdist_wheel
-done
-
+pyversion=3.11
+if ! pyenv local $pyversion ; then
+    exit $?
+fi
+rm -fr build
+python setup.py bdist_egg
+python setup.py bdist_wheel
 python ./setup.py sdist
+finish
diff --git a/admin-tools/pyenv-versions b/admin-tools/pyenv-versions
@@ -6,4 +6,4 @@ if [[ $0 == ${BASH_SOURCE[0]} ]] ; then
 	exit 1
 fi
 
-export PYVERSIONS='3.6.15 3.7.16 3.8.16 3.9.16 3.10.10 pyston-2.3.5'
+export PYVERSIONS=3.8 3.9 3.10 3.11'
diff --git a/mathics_django/__init__.py b/mathics_django/__init__.py
@@ -2,11 +2,10 @@
 
 import django
 from mathics import version_info
-from mathics.version import __version__
 
 version_info["django"] = django.__version__
 
-version_string = """Mathics {mathics}
+version_string = """Mathics3 {mathics}
 on {python}
 using SymPy {sympy}, mpmath {mpmath}""".format(
     **version_info
@@ -20,7 +19,7 @@
     version_string += f", cython {version_info['cython']}"
 
 license_string = """\
-Copyright (C) 2011-2023 The Mathics Team.
+Copyright (C) 2011-2024 The Mathics Team.
 This program comes with ABSOLUTELY NO WARRANTY.
 This is free software, and you are welcome to redistribute it
 under certain conditions.

diff --git a/mathics_django/version.py b/mathics_django/version.py
@@ -4,4 +4,4 @@
 # well as importing into Python. That's why there is no
 # space around "=" below.
 # fmt: off
-__version__="7.0.0dev0"  # noqa
+__version__="7.0.0"  # noqa
diff --git a/setup.py b/setup.py
@@ -65,11 +65,11 @@ def read(*rnames):
 
 # General Requirements
 INSTALL_REQUIRES += [
-    "Mathics-Scanner >=1.2.2,<1.3.1",
+    "Mathics-Scanner >=1.2.2,<1.4",
     # "Mathics3 @ http://github.com/Mathics3/mathics-core/archive/master.zip",
-    "Mathics3 >=6.2.0,<7.1.0",
-    "django >= 3.2",  # After Python 3.7 is removed, we can bump min version to 4.1
-    "networkx >= 2.6",  # Used in format, should disappear though. After 3.7 can bump to 3.x
+    "Mathics3 >=7.0.0.dev0,<7.1.0",
+    "django >= 4.0",
+    "networkx >= 3.0",
     "pygments",  # For colorized Python tracebacks
     "requests",
 ]
@@ -191,7 +191,6 @@ def run(self):
         "Intended Audience :: Science/Research",
         "License :: OSI Approved :: GNU General Public License v3 (GPLv3)",
         "Programming Language :: Python",
-        "Programming Language :: Python :: 3.7",
         "Programming Language :: Python :: 3.8",
         "Programming Language :: Python :: 3.9",
         "Programming Language :: Python :: 3.10",
-Original file line number
+Diff line change
@@ Expand Up / @@ -6,4 +6,4 @@ if [[ $0 == ${BASH_SOURCE[0]} ]] ; then @@
     	exit 1
     fi
-    export PYVERSIONS='3.6.15 3.7.16 3.8.16 3.9.16 3.10.10 pyston-2.3.5'
+    export PYVERSIONS=3.8 3.9 3.10 3.11'