Skip to content

Commit fa90f7e

Browse files
authored
Get ready for release 7.0.0 (#210)
1 parent 98bb52f commit fa90f7e

9 files changed

+1972
-24
lines changed

CHANGES.rst

+15
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,21 @@
11
CHANGES
22
=======
33

4+
7.0.0
5+
-----
6+
7+
* Adjust for Mathics3 core 7.0.0 API, e.g., add explicit call to load builtins
8+
* doctest refactored to use more routines common to mathics-core
9+
* Support newer matplotlib, e.g. 3.9.1
10+
* Update gallery examples
11+
* Add background and tooltips to Graphics3D
12+
* Expand information in /about:
13+
- max digits in string
14+
- system encoding
15+
- time format
16+
17+
18+
419
6.0.0
520
-----
621

ChangeLog-spell-corrected.diff

+1,935
Large diffs are not rendered by default.

Makefile

+1
Original file line numberDiff line numberDiff line change
@@ -98,6 +98,7 @@ testserver: $(THREEJS)
9898
#: Create a ChangeLog from git via git log and git2cl
9999
ChangeLog: rmChangeLog
100100
git log --pretty --numstat --summary | $(GIT2CL) >$@
101+
patch ChangeLog < ChangeLog-spell-corrected.diff
101102

102103
node_modules/\@mathicsorg/mathics-threejs-backend/package.json node_modules/@mathicsorg/mathics-threejs-backend/package.json:
103104
npm install @mathicsorg/mathics-threejs-backend --loglevel=error

admin-tools/check-versions.sh

+4-3
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
#!/bin/bash
22
function finish {
3-
cd $owd
3+
cd $mathics_django_owd
44
}
55

66
# FIXME put some of the below in a common routine
7-
owd=$(pwd)
7+
mathics_django_owd=$(pwd)
88
trap finish EXIT
99

1010
cd $(dirname ${BASH_SOURCE[0]})
@@ -22,4 +22,5 @@ for version in $PYVERSIONS; do
2222
exit $?
2323
fi
2424
echo === $version ===
25-
done
25+
done
26+
finish

admin-tools/make-dist.sh

+9-11
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ PACKAGE=Mathics-Django
33

44
# FIXME put some of the below in a common routine
55
function finish {
6-
cd $owd
6+
cd $mathics_django_owd
77
}
88

99
cd $(dirname ${BASH_SOURCE[0]})
@@ -19,14 +19,12 @@ cd ..
1919
source mathics_django/version.py
2020
echo $__version__
2121
cp -v ${HOME}/.local/var/mathics/doc_html_data.pcl mathics_django/doc/
22-
23-
for pyversion in $PYVERSIONS; do
24-
if ! pyenv local $pyversion ; then
25-
exit $?
26-
fi
27-
rm -fr build
28-
python setup.py bdist_egg
29-
python setup.py bdist_wheel
30-
done
31-
22+
pyversion=3.11
23+
if ! pyenv local $pyversion ; then
24+
exit $?
25+
fi
26+
rm -fr build
27+
python setup.py bdist_egg
28+
python setup.py bdist_wheel
3229
python ./setup.py sdist
30+
finish

admin-tools/pyenv-versions

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,4 @@ if [[ $0 == ${BASH_SOURCE[0]} ]] ; then
66
exit 1
77
fi
88

9-
export PYVERSIONS='3.6.15 3.7.16 3.8.16 3.9.16 3.10.10 pyston-2.3.5'
9+
export PYVERSIONS=3.8 3.9 3.10 3.11'

mathics_django/__init__.py

+2-3
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,10 @@
22

33
import django
44
from mathics import version_info
5-
from mathics.version import __version__
65

76
version_info["django"] = django.__version__
87

9-
version_string = """Mathics {mathics}
8+
version_string = """Mathics3 {mathics}
109
on {python}
1110
using SymPy {sympy}, mpmath {mpmath}""".format(
1211
**version_info
@@ -20,7 +19,7 @@
2019
version_string += f", cython {version_info['cython']}"
2120

2221
license_string = """\
23-
Copyright (C) 2011-2023 The Mathics Team.
22+
Copyright (C) 2011-2024 The Mathics Team.
2423
This program comes with ABSOLUTELY NO WARRANTY.
2524
This is free software, and you are welcome to redistribute it
2625
under certain conditions.

mathics_django/version.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,4 @@
44
# well as importing into Python. That's why there is no
55
# space around "=" below.
66
# fmt: off
7-
__version__="7.0.0dev0" # noqa
7+
__version__="7.0.0" # noqa

setup.py

+4-5
Original file line numberDiff line numberDiff line change
@@ -65,11 +65,11 @@ def read(*rnames):
6565

6666
# General Requirements
6767
INSTALL_REQUIRES += [
68-
"Mathics-Scanner >=1.2.2,<1.3.1",
68+
"Mathics-Scanner >=1.2.2,<1.4",
6969
# "Mathics3 @ http://github.com/Mathics3/mathics-core/archive/master.zip",
70-
"Mathics3 >=6.2.0,<7.1.0",
71-
"django >= 3.2", # After Python 3.7 is removed, we can bump min version to 4.1
72-
"networkx >= 2.6", # Used in format, should disappear though. After 3.7 can bump to 3.x
70+
"Mathics3 >=7.0.0.dev0,<7.1.0",
71+
"django >= 4.0",
72+
"networkx >= 3.0",
7373
"pygments", # For colorized Python tracebacks
7474
"requests",
7575
]
@@ -191,7 +191,6 @@ def run(self):
191191
"Intended Audience :: Science/Research",
192192
"License :: OSI Approved :: GNU General Public License v3 (GPLv3)",
193193
"Programming Language :: Python",
194-
"Programming Language :: Python :: 3.7",
195194
"Programming Language :: Python :: 3.8",
196195
"Programming Language :: Python :: 3.9",
197196
"Programming Language :: Python :: 3.10",

0 commit comments

Comments
 (0)