Skip to content

Commit 400465e

Browse files
committed
Merge pull request #132 from Mathics3/release-4.0.0
Get ready for release 4.0.0
2 parents c7b868e + cce4eb5 commit 400465e

File tree

10 files changed

+82
-16
lines changed

10 files changed

+82
-16
lines changed

.github/workflows/osx.yaml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,8 @@ jobs:
2525
python -m pip install --upgrade pip
2626
LLVM_CONFIG=/usr/local/Cellar/llvm@11/11.1.0/bin/llvm-config pip install llvmlite
2727
# Can comment out when next Mathics is released
28-
python -m pip install -e git://github.com/mathics/Mathics#egg=Mathics3[full]
28+
# python -m pip install -e git://github.com/mathics/Mathics#egg=Mathics3[full]
29+
pip install Mathics3[full]
2930
npm install
3031
pip install -e .[full]
3132
- name: Install Mathics Django

.github/workflows/ubuntu.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,8 @@ jobs:
2323
sudo apt-get update -qq && sudo apt-get install -qq liblapack-dev llvm-dev remake nodejs npm
2424
python -m pip install --upgrade pip
2525
# Can comment out when next Mathics is released
26-
python -m pip install -e git://github.com/mathics/Mathics#egg=Mathics3[full]
26+
# python -m pip install -e git://github.com/mathics/Mathics#egg=Mathics3[full]
27+
pip install Mathics3[full]
2728
npm install
2829
pip install -e .[full]
2930
- name: Install Mathics Django

.github/workflows/windows.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,8 @@ jobs:
2626
choco install llvm nodejs
2727
set LLVM_DIR="C:\Program Files\LLVM"
2828
# Can comment out when next Mathics is released
29-
python -m pip install -e git://github.com/mathics/Mathics#egg=Mathics3[full]
29+
# python -m pip install -e git://github.com/mathics/Mathics#egg=Mathics3[full]
30+
pip install Mathics3[full]
3031
pip install -e .[full]
3132
- name: Install Mathics Django
3233
run: |

CHANGES.rst

Lines changed: 63 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,69 @@
11
CHANGES
22
=======
33

4+
4.0.0
5+
-----
6+
7+
The main thrust behind this API-breaking release is to be able to
8+
support a protocol for Graphics3D.
9+
10+
It new Graphics3D protocol is currently expressed in JSON. There is an
11+
independent `threejs-based module
12+
<https://www.npmjs.com/package/@mathicsorg/mathics-threejs-backend>`_
13+
to implement this. Tiago Cavalcante Trindade is responsible for this
14+
code.
15+
16+
Previously, this Javascript code and library was embedded into this
17+
code base. By separating the two, this library can be used more easily
18+
outside of Django. And the library has gotten considerably better in
19+
terms of being tested and documented.
20+
21+
The other main API-breaking change is more decentralization of the
22+
Mathics Documentation. A lot more work needs to go on here, and so
23+
there will be one or two more API breaking releases. After this
24+
release, the documentation code will be split off into its own git
25+
repository.
26+
27+
Enhancements
28+
++++++++++++
29+
30+
* a Graphics3D protocol, mentioned above, has been started
31+
* ``mathics_django.setting`` has been gone over to simplify.
32+
* The "about" page now includes the Python version as well as the
33+
mathics-threejs-backend version
34+
* Some Image Gallery examples have been added. Some of the examples
35+
have been reordered to put the slower examples towards the end.
36+
* Much of the Javascript code that remains after pulling out the
37+
Graphics3D code has been modernized.
38+
* Use of the "scriptaculous" library has been reduced. It will be
39+
eliminated totally in a future release.
40+
41+
42+
Documentation
43+
.............
44+
45+
* Document data used in producing HTML-rendered documents is now
46+
stored in both the user space, where it can be extended, and in the
47+
package install space -- which is useful when there is no user-space
48+
data.
49+
* Code duplication used in creating documentation has been reduced. It
50+
will be moved more completely out in a future release
51+
* Summary text for various built-in functions has been started. These
52+
summaries are visible in Mathics Django when lists links are given
53+
in Chapters, Guide Sections, or Sections. See the online
54+
documentation of ``Associations`` for an example of a list with
55+
additional summary information.
56+
57+
Regressions
58+
+++++++++++
59+
60+
* Some of the test output for buitins inside a guide sections is not
61+
automatically rendered. See the on-line documentation for ``Binarize`` for
62+
an example of this.
63+
* Density plot rendered in Mathics Django do not render as nice since we no longer
64+
use the secret protocol handshake hack. We may fix this in a future release
65+
66+
467
3.2.0
568
-----
669

admin-tools/make-dist.sh

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -20,13 +20,13 @@ source mathics_django/version.py
2020
echo $__version__
2121
cp -v ${HOME}/.local/var/mathics/doc_html_data.pcl mathics_django/doc/
2222

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
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
3131

3232
python ./setup.py sdist

admin-tools/pyenv-versions

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,4 @@ if [[ $0 == ${BASH_SOURCE[0]} ]] ; then
55
echo "This script should be *sourced* rather than run directly through bash"
66
exit 1
77
fi
8-
export PYVERSIONS='3.6.14 3.7.11 3.8.11 3.9.6'
8+
export PYVERSIONS='3.6.14 3.8.11 pyston-2.3 pypy3.7-7.3.5 3.9.6 3.7.11'

mathics_django/server.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
from mathics_django import server_version_string, license_string
1515
from mathics_django import settings as mathics_settings # Prevents UnboundLocalError
1616
from mathics_django.version import __version__ as django_frontend_version
17-
from mathics.setting import DATA_DIR
17+
from mathics.settings import DATA_DIR
1818

1919

2020
def check_database():

mathics_django/version.py

Lines changed: 1 addition & 1 deletion
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__="4.0.0.dev0" # noqa
7+
__version__="4.0.0" # noqa

requirements-full.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
# Optional packages which add functionality or speed things up
2-
ujson
2+
ujson

setup.cfg

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
[metadata]
2-
description-file = README.rst
2+
description_file = README.rst

0 commit comments

Comments
 (0)