Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 9 additions & 9 deletions .github/workflows/consistency-checks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,17 +22,17 @@ jobs:
run: |
python -m pip install --upgrade pip
python -m pip install pytest setuptools
python -m pip install Mathics3-Module-Base
# python -m pip install Mathics3-Module-Base
# Until the next Mathics3-scanner release
git clone --depth 1 https://github.com/Mathics3/Mathics3-scanner.git
cd Mathics3-scanner/
pip install -e .
bash -x admin-tools/make-JSON-tables.sh
cd ..
# git clone --depth 1 https://github.com/Mathics3/Mathics3-scanner.git
# cd Mathics3-scanner/
# pip install -e .
# bash -x admin-tools/make-JSON-tables.sh
# cd ..
# Until the next mathics-core release
git clone https://github.com/Mathics3/mathics-core
(cd mathics-core && python -m pip install --no-build-isolation -e .[full])
(cd mathics-core && bash ./admin-tools/make-JSON-tables.sh)
# git clone https://github.com/Mathics3/mathics-core
# (cd mathics-core && python -m pip install --no-build-isolation -e .[full])
# (cd mathics-core && bash ./admin-tools/make-JSON-tables.sh)

- name: Install Mathics3-Module-Networkx.graph with minimum dependencies
run: |
Expand Down
14 changes: 7 additions & 7 deletions .github/workflows/ubuntu.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ on:
push:
branches: [ master ]
pull_request:
branches: '**'
branches: [ master ]

jobs:
build:
Expand All @@ -22,15 +22,15 @@ jobs:
run: |
python -m pip install --upgrade pip
python -m pip install pytest setuptools
python -m pip install Mathics3-Module-Base
# python -m pip install Mathics3-Module-Base
# Go over and comment out stuff when next Mathics core and Mathics3-scanner are released
git clone https://github.com/Mathics3/Mathics3-scanner
(cd Mathics3-scanner && pip3 install -e .[full] --no-build-isolation && bash -x ./admin-tools/make-JSON-tables.sh)
# git clone https://github.com/Mathics3/Mathics3-scanner
# (cd Mathics3-scanner && pip3 install -e .[full] --no-build-isolation && bash -x ./admin-tools/make-JSON-tables.sh)
# python -m pip install -e git+https://github.com/Mathics3/mathics-scanner#egg=Mathics-Scanner[full]
# Until the next mathics-core release
git clone https://github.com/Mathics3/mathics-core
(cd mathics-core && pip3 install -e .[full] --no-build-isolation)
(cd mathics-core && bash -x ./admin-tools/make-JSON-tables.sh)
# git clone https://github.com/Mathics3/mathics-core
# (cd mathics-core && pip3 install -e .[full] --no-build-isolation)
# (cd mathics-core && bash -x ./admin-tools/make-JSON-tables.sh)

- name: install Mathics3 Module networkx
run: |
Expand Down
23 changes: 14 additions & 9 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,10 @@ RM ?= rm


.PHONY: all build \
check clean \
ChangeLog-without-corrections \
check \
check-consistency-and-style \
clean \
develop dist doc doc-data \
pypi-setup \
pytest \
Expand Down Expand Up @@ -67,16 +70,18 @@ doctest:
# doc mathics.pdf: mathics/doc/tex/data
# (cd mathics/doc/tex && $(MAKE) mathics.pdf)

#: Run pytest consistency and style checks
check-consistency-and-style:
MATHICS_LINT=t $(PYTHON) -m pytest test/consistency-and-style

#: Create ChangeLog from version control without corrections
ChangeLog-without-corrections:
git log --pretty --numstat --summary | $(GIT2CL) >ChangeLog

#: Remove ChangeLog
rmChangeLog:
$(RM) ChangeLog || true

#: Create a ChangeLog from git via git log and git2cl
ChangeLog: rmChangeLog
git log --pretty --numstat --summary | $(GIT2CL) >$@
patch ChangeLog < ChangeLog-spell-corrected.diff


#: Run pytest consistency and style checks
check-consistency-and-style:
MATHICS_LINT=t $(PYTHON) -m pytest test/consistency-and-style
ChangeLog: rmChangeLog ChangeLog-without-corrections
patch -p0 ChangeLog < ChangeLog-spell-corrected.diff
41 changes: 22 additions & 19 deletions README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -5,22 +5,25 @@
Example Session
---------------

::
.. code-block:: mathematica

$ mathicsscript
Mathicscript: 5.0.0, Mathics 6.0.0
on CPython 3.10.4 (main, Jun 29 2022, 12:14:53) [GCC 11.2.0]
using SymPy 1.9, mpmath 1.2.1, numpy 1.21.5
matplotlib 3.5.2,
Asymptote version 2.81
Mathicscript: 10.0.0, Mathics3 10.0.0
on CPython 3.14.3 (main, Mar 30 2026, 06:42:16) [GCC 13.3.0]

Using:
SymPy 1.13.3, mpmath 1.3.0, numpy 2.4.4
cython 3.2.4, matplotlib 3.10.8,
Asymptote version 2.95

Copyright (C) 2011-2023 The Mathics3 Team.
Copyright (C) 2011-2026 The Mathics3 Team.
This program comes with ABSOLUTELY NO WARRANTY.
This is free software, and you are welcome to redistribute it
under certain conditions.
See the documentation for the full license.

Quit by pressing CONTROL-D
Quit by evaluating Quit[] or by pressing CONTROL-D.


In[1]:= LoadModule["pymathics.graph"]
Out[1]= pymathics.graph
Expand All @@ -33,9 +36,9 @@ Screenshots

|screenshot|

The above is the is the matplotlib graph for ``BinomialTree[3]`` in the session above.
The above is the matplotlib graph for ``BinomialTree[3]`` in the session above.

See the `screenshot directory <https://github.com/Mathics3/pymathics-graph/tree/master/screenshots>`_ the other graphs.
See the `screenshot directory <https://github.com/Mathics3/Mathics3-Module-networkx/tree/master/screenshots>`_ the other graphs.

Installation
-------------
Expand All @@ -44,7 +47,7 @@ From pip:

::

$ pip install mathics3-graph
$ pip install Mathics3-Module-networkx

From git:

Expand All @@ -55,13 +58,13 @@ From git:
Note:
-----

Currently this works well in `mathicsscript` but not in the Django interface, although graphs are created in a temporary directory, e.g. ``/tmp/``.
Currently, this works well in `mathicsscript` but not in the Django interface, although graphs are created in a temporary directory, e.g., ``/tmp/``.


.. |screenshot| image:: https://github.com/Mathics3/pymathics-graph/blob/master/screenshots/BinomialTree-3.png
.. |Latest Version| image:: https://badge.fury.io/py/pymathics-graph.svg
:target: https://badge.fury.io/py/pymathics-graph
.. |Pypi Installs| image:: https://pepy.tech/badge/pymathics-graph
.. |Supported Python Versions| image:: https://img.shields.io/pypi/pyversions/pymathics-graph.svg
.. |Packaging status| image:: https://repology.org/badge/vertical-allrepos/pymathics-graph.svg
:target: https://repology.org/project/pymathics-graph/versions
.. |screenshot| image:: https://github.com/Mathics3/Mathics3-Module-networkx/blob/master/screenshots/BinomialTree-3.png
.. |Latest Version| image:: https://badge.fury.io/py/Mathics3-Module-networkx.svg
:target: https://badge.fury.io/py/Mathics3-module-networkx
.. |PyPI Installs| image:: https://pepy.tech/badge/Mathics3-Module-networkx
.. |Supported Python Versions| image:: https://img.shields.io/pypi/pyversions/Mathics3-Moudle-networkx.svg
.. |Packaging status| image:: https://repology.org/badge/vertical-allrepos/Mathics3-module-networkx.svg
:target: https://repology.org/project/Mathics3-Module-networkx-/versions
2 changes: 1 addition & 1 deletion pymathics/graph/base.py
Original file line number Diff line number Diff line change
Expand Up @@ -251,7 +251,7 @@ def is_connected(G):


def _edge_weights(options):
expr = options.get("Pymathics`EdgeWeight")
expr = options.get("EdgeWeight")
if expr is None:
return []
if not expr.has_form("List", None):
Expand Down
2 changes: 1 addition & 1 deletion pymathics/graph/version.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,4 @@
# well as importing into Python. That's why there is no
# space around "=" below.
# fmt: off
__version__="9.0.1.dev0" # noqa
__version__="10.0.0" # noqa
2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -58,4 +58,4 @@ packages = [
]

[tool.setuptools.dynamic]
version = {attr = "pymathics.graph.__version__"}
version = {attr = "pymathics.graph.version.__version__"}