Skip to content

Commit

Permalink
Merge pull request #132 from Mathics3/release-4.0.0
Browse files Browse the repository at this point in the history
Get ready for release 4.0.0
  • Loading branch information
rocky committed Aug 1, 2021
2 parents c7b868e + cce4eb5 commit 400465e
Show file tree
Hide file tree
Showing 10 changed files with 82 additions and 16 deletions.
3 changes: 2 additions & 1 deletion .github/workflows/osx.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,8 @@ jobs:
python -m pip install --upgrade pip
LLVM_CONFIG=/usr/local/Cellar/llvm@11/11.1.0/bin/llvm-config pip install llvmlite
# Can comment out when next Mathics is released
python -m pip install -e git://github.com/mathics/Mathics#egg=Mathics3[full]
# python -m pip install -e git://github.com/mathics/Mathics#egg=Mathics3[full]
pip install Mathics3[full]
npm install
pip install -e .[full]
- name: Install Mathics Django
Expand Down
3 changes: 2 additions & 1 deletion .github/workflows/ubuntu.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,8 @@ jobs:
sudo apt-get update -qq && sudo apt-get install -qq liblapack-dev llvm-dev remake nodejs npm
python -m pip install --upgrade pip
# Can comment out when next Mathics is released
python -m pip install -e git://github.com/mathics/Mathics#egg=Mathics3[full]
# python -m pip install -e git://github.com/mathics/Mathics#egg=Mathics3[full]
pip install Mathics3[full]
npm install
pip install -e .[full]
- name: Install Mathics Django
Expand Down
3 changes: 2 additions & 1 deletion .github/workflows/windows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,8 @@ jobs:
choco install llvm nodejs
set LLVM_DIR="C:\Program Files\LLVM"
# Can comment out when next Mathics is released
python -m pip install -e git://github.com/mathics/Mathics#egg=Mathics3[full]
# python -m pip install -e git://github.com/mathics/Mathics#egg=Mathics3[full]
pip install Mathics3[full]
pip install -e .[full]
- name: Install Mathics Django
run: |
Expand Down
63 changes: 63 additions & 0 deletions CHANGES.rst
Original file line number Diff line number Diff line change
@@ -1,6 +1,69 @@
CHANGES
=======

4.0.0
-----

The main thrust behind this API-breaking release is to be able to
support a protocol for Graphics3D.

It new Graphics3D protocol is currently expressed in JSON. There is an
independent `threejs-based module
<https://www.npmjs.com/package/@mathicsorg/mathics-threejs-backend>`_
to implement this. Tiago Cavalcante Trindade is responsible for this
code.

Previously, this Javascript code and library was embedded into this
code base. By separating the two, this library can be used more easily
outside of Django. And the library has gotten considerably better in
terms of being tested and documented.

The other main API-breaking change is more decentralization of the
Mathics Documentation. A lot more work needs to go on here, and so
there will be one or two more API breaking releases. After this
release, the documentation code will be split off into its own git
repository.

Enhancements
++++++++++++

* a Graphics3D protocol, mentioned above, has been started
* ``mathics_django.setting`` has been gone over to simplify.
* The "about" page now includes the Python version as well as the
mathics-threejs-backend version
* Some Image Gallery examples have been added. Some of the examples
have been reordered to put the slower examples towards the end.
* Much of the Javascript code that remains after pulling out the
Graphics3D code has been modernized.
* Use of the "scriptaculous" library has been reduced. It will be
eliminated totally in a future release.


Documentation
.............

* Document data used in producing HTML-rendered documents is now
stored in both the user space, where it can be extended, and in the
package install space -- which is useful when there is no user-space
data.
* Code duplication used in creating documentation has been reduced. It
will be moved more completely out in a future release
* Summary text for various built-in functions has been started. These
summaries are visible in Mathics Django when lists links are given
in Chapters, Guide Sections, or Sections. See the online
documentation of ``Associations`` for an example of a list with
additional summary information.

Regressions
+++++++++++

* Some of the test output for buitins inside a guide sections is not
automatically rendered. See the on-line documentation for ``Binarize`` for
an example of this.
* Density plot rendered in Mathics Django do not render as nice since we no longer
use the secret protocol handshake hack. We may fix this in a future release


3.2.0
-----

Expand Down
16 changes: 8 additions & 8 deletions admin-tools/make-dist.sh
Original file line number Diff line number Diff line change
Expand Up @@ -20,13 +20,13 @@ 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
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

python ./setup.py sdist
2 changes: 1 addition & 1 deletion admin-tools/pyenv-versions
Original file line number Diff line number Diff line change
Expand Up @@ -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.6.14 3.7.11 3.8.11 3.9.6'
export PYVERSIONS='3.6.14 3.8.11 pyston-2.3 pypy3.7-7.3.5 3.9.6 3.7.11'
2 changes: 1 addition & 1 deletion mathics_django/server.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
from mathics_django import server_version_string, license_string
from mathics_django import settings as mathics_settings # Prevents UnboundLocalError
from mathics_django.version import __version__ as django_frontend_version
from mathics.setting import DATA_DIR
from mathics.settings import DATA_DIR


def check_database():
Expand Down
2 changes: 1 addition & 1 deletion mathics_django/version.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@
# well as importing into Python. That's why there is no
# space around "=" below.
# fmt: off
__version__="4.0.0.dev0" # noqa
__version__="4.0.0" # noqa
2 changes: 1 addition & 1 deletion requirements-full.txt
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
# Optional packages which add functionality or speed things up
ujson
ujson
2 changes: 1 addition & 1 deletion setup.cfg
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
[metadata]
description-file = README.rst
description_file = README.rst

0 comments on commit 400465e

Please sign in to comment.