Skip to content

Commit 031bd8c

Browse files
committed
Update to Python 3.12, new API, new code and Ubuntu 24.10 (#16)
* Update to new API, code and Ubuntu 24.10 * mathicsdoc corretions for USER_HOME=/home/ubuntu * git pull Packages, set env var COLORFGBG... COLORFGBG is used to make sure we have a compatible display style in trepan when Breakpoint[] is used. * Bump version number * pip install PyQt6 * Spell correct ChangeLog. * Ignore mathics.pdf createdoutside * Go over pkginfo and NEWS.md * Go over README.rst
1 parent 8d588a8 commit 031bd8c

File tree

136 files changed

+432
-291
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

136 files changed

+432
-291
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
.vscode
99
/.cache
1010
/.python-version
11+
/ChangeLog-spell-corrected
1112
/Mathics_omnibus.egg-info
1213
/__pycache__
1314
/build

ChangeLog-spell-corrected.diff

Lines changed: 77 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,77 @@
1+
--- ChangeLog 2025-01-28 08:11:48.318713212 -0500
2+
+++ ChangeLog-spell-corrected 2025-01-28 08:12:51.006747114 -0500
3+
@@ -36,7 +36,7 @@
4+
5+
2025-01-17 rocky <[email protected]>
6+
7+
- * docker/entrypoint.sh, script/dmathicsserver: mathicsdoc corretions
8+
+ * docker/entrypoint.sh, script/dmathicsserver: mathicsdoc corrections
9+
for USER_HOME=/home/ubuntu
10+
11+
2025-01-16 rocky <[email protected]>
12+
@@ -76,7 +76,7 @@
13+
14+
2024-01-17 rocky <[email protected]>
15+
16+
- * docker/Dockerfile, docker/Dockerfile-dev, docker/Dockerfile-git:
17+
+ * docker/Dockerfile, docker/Dockerfile-dev, docker/Dockerfile-git:
18+
Use newer software versions in dev dockerfile
19+
20+
2024-01-15 rocky <[email protected]>
21+
@@ -163,7 +163,7 @@
22+
23+
2022-07-17 rocky <[email protected]>
24+
25+
- * docker/Dockerfile, docker/requirements.txt, script/dmathicsscript:
26+
+ * docker/Dockerfile, docker/requirements.txt, script/dmathicsscript:
27+
Everything roughly working again. * dmathicsscript * dmathicsserver * dmathicsdoc * dmathicsdoccopy However there are still some small rough edges
28+
29+
2022-07-16 rocky <[email protected]>
30+
@@ -251,7 +251,7 @@
31+
32+
2021-09-12 rocky <[email protected]>
33+
34+
- * : Add plots to Parital Diff Eqns 2.1
35+
+ * : Add plots to Partial Diff Eqns 2.1
36+
37+
2021-09-11 rocky <[email protected]>
38+
39+
@@ -300,7 +300,7 @@
40+
2021-08-08 rocky <[email protected]>
41+
42+
* script/dmathicsscript, script/dmathicsserver,
43+
- script/term-background.sh: Better persistance via setting Env
44+
+ script/term-background.sh: Better persistence via setting Env
45+
variables Better help for dmathicsscript and dmathicssserver Fix bug in term-background Revise symja example in mathics.sqlite
46+
47+
2021-08-03 rocky <[email protected]>
48+
@@ -336,7 +336,7 @@
49+
50+
* README.rst, __pkginfo__.py, docker/Dockerfile,
51+
docker/Dockerfile-dev, docker/Dockerfile-dev+debug,
52+
- docker/entrypoint.sh, script/dmathicsdoc, script/dmathicsdoccopy:
53+
+ docker/entrypoint.sh, script/dmathicsdoc, script/dmathicsdoccopy:
54+
Revise docker to allow PDF viewing and copy New scripts dmathicsdoc and dmathicsdoccopy perform the new
55+
functions Document this in README.rst, and add these scripts in PyPI
56+
packaging. entrypoint.sh needs to multiplex dmathicsdoccpy and
57+
@@ -647,7 +647,7 @@
58+
2021-02-20 rocky <[email protected]>
59+
60+
* .gitignore, README.rst, admin-tools/git2cl,
61+
- admin-tools/make-dist.sh, admin-tools/pyenv-versions, setup.py:
62+
+ admin-tools/make-dist.sh, admin-tools/pyenv-versions, setup.py:
63+
Administrivia
64+
65+
2021-02-20 R. Bernstein <[email protected]>
66+
@@ -1912,10 +1912,9 @@
67+
mathics/web/templates/base_html.html, mathics/web/urls.py,
68+
mathics/web/views.py, pymathics/natlang/natlang.py, setup.py,
69+
test/test_evaluation.py, test/test_file.py,
70+
- test/test_parser/test_tokeniser.py, tmp/README.rst, travis.py:
71+
+ test/test_parser/test_tokeniser.py, tmp/README.rst, travis.py:
72+
Squash unrelated Docker items
73+
74+
2020-12-25 rocky <[email protected]>
75+
76+
* Initial
77+
-

Makefile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -70,3 +70,4 @@ rmChangeLog:
7070
#: Create a ChangeLog from git via git log and git2cl
7171
ChangeLog: rmChangeLog
7272
git log --pretty --numstat --summary | $(GIT2CL) >$@
73+
patch ChangeLog < ChangeLog-spell-corrected.diff

NEWS.md

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,14 @@
1+
8.0.0
2+
-----
3+
4+
Jan 28, 2025
5+
6+
* Synchronize version number up with major API release in Mathics Kernel
7+
* Add `dmathics3-tokens` interface to `mathics3-tokens` (from mathics-scanner)
8+
* Use newer versions of everything, Ubuntu, Python, SymPy, etc.
9+
* Remove lots of copies of old wheels from source; we can now get everything resonably fast from inside docker
10+
11+
112
4.0.1
213
-----
314

README.rst

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
|Pypi Installs| |Latest Version| |Supported Python Versions|
22

3-
Mathics is a general-purpose computer algebra system (CAS). It is an open-source alternative to Mathematica. It is free both as in "freedom" and as in "free beer".
3+
Mathics3 is a general-purpose computer algebra system (CAS). It is an open-source alternative to Mathematica. It is free both as in "freedom" and as in "free beer".
44

5-
`Mathics <https://mathics.org>`_ consists of a number of separable components so that those pieces that are desired can be used without the burden of dependencies of the other parts.
5+
`Mathics3 <https://mathics.org>`_ consists of a number of separable components so that those pieces that are desired can be used without the burden of dependencies of the other parts.
66

77
For example if you are interested in just running a command-line interface, you might not be interested in having Django and what that entails and vice versa.
88
If you are just interested in the computational library, there is no need for either the Web parts or the command-line library parts.
@@ -11,6 +11,7 @@ But what if you want both command-line interface, Web interface, all of the Pyma
1111

1212
That's what this repository is about. Here we have a PyPI installable package that pull in the various components and offer commands:
1313

14+
* ``mathics3-tokens`` utility to show how an input stream is tokenized by Mathics3
1415
* ``mathicsscript`` to run the command-line interface,
1516
* ``mathicsserver`` to run the Django-Web server,
1617
* ``dmathicsscript`` and ``dmathicsserver`` which runs the docker version of these,
@@ -46,7 +47,7 @@ By default, we use a SQLite database that has examples that you can
4647
load and use. This data comes from
4748
`mathics-omnibus/django-db/mathics.sqlite <https://github.com/Mathics3/mathics-omnibus/tree/master/docker/django-db>`_.
4849

49-
Since this is tied to the docker image, any changes made won't survice
50+
Since this is tied to the docker image, any changes made won't survive
5051
across restarting the docker image.
5152

5253
If you would like to save your own you can set the environment

__pkginfo__.py

Lines changed: 15 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
author_email = "[email protected]"
66
scripts = [
77
"script/dmathics",
8+
"script/dmathics3-tokens",
89
"script/dmathicsdoc",
910
"script/dmathicsdoccopy",
1011
"script/dmathicsserver",
@@ -28,36 +29,36 @@ def read(*rnames):
2829

2930
# Setup in EXTRAS_REQUIRE various install options:
3031
# mathicsscript_full, etc.
31-
django_full = {"ujson",}
32-
mathics_core_full = {"psutil", "scikit-image", "lxml", "wordcloud", "cython",}
33-
mathicsscript_full = {"PyYAML", "PyQT5", "cairosvg", "ujson",}
34-
pymathics_full = {"pymathics-natlang >= 6.2.0", "pymathics-graph >= 6.2.0",}
35-
full = mathicsscript_full | django_full | pymathics_full
32+
django_full = {"ujson"}
33+
mathics_core_full = {"psutil", "scikit-image", "lxml", "wordcloud", "cython"}
34+
mathicsscript_full = {"PyYAML", "PyQT5", "cairosvg", "ujson"}
35+
full = mathicsscript_full | django_full
3636

3737
EXTRAS_REQUIRE = {}
38-
for field in "mathics_core_full mathicsscript_full pymathics_full full".split():
38+
for field in "mathics_core_full mathicsscript_full".split():
3939
EXTRAS_REQUIRE[field] = locals()[field]
4040

4141
IS_PYPY = "__pypy__" in sys.builtin_module_names
4242

4343
install_requires = [
44-
"Mathics3 >= 7.0.0.dev0,<7.1.0",
45-
"mathicsscript >= 6.2.0",
46-
"Mathics-Django >= 6.2.0",
47-
"pymathics-natlang >= 6.2.0",
48-
"pymathics-graph >= 6.2.0",
44+
"Mathics3 >= 8.0.0",
45+
"mathicsscript >= 8.0.0",
46+
"Mathics-Django >= 8.0.0",
47+
"Mathics3-Trepan >= 1.0.2",
48+
"pymathics-natlang >= 8.0.0",
49+
"pymathics-graph >= 8.0.0",
4950
]
5051

51-
packages=["mathics_omnibus", "script"]
52+
packages = ["mathics_omnibus", "script"]
5253
py_modules = None
53-
short_desc = "A Collection Mathics components to provide the full Mathics experience"
54+
short_desc = "A Collection Mathics components to provide the full Mathics3 experience"
5455
url = "http://github.com/Mathics3/mathics-omnibus"
5556

5657
classifiers = [
5758
"Operating System :: OS Independent",
58-
"Programming Language :: Python :: 3.7",
5959
"Programming Language :: Python :: 3.8",
6060
"Programming Language :: Python :: 3.9",
6161
"Programming Language :: Python :: 3.10",
6262
"Programming Language :: Python :: 3.11",
63+
"Programming Language :: Python :: 3.12",
6364
]

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.15 3.7.17 3.8.17 pyston-2.3.5 pypy3.10-7.3.12 3.9.17 3.10.12'
8+
export PYVERSIONS='3.8 3.9 3.10 3.11 3.12 3.13'

docker/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
Dockerfile-dev
1+
Dockerfile-release

0 commit comments

Comments
 (0)