diff --git a/.github/workflows/consistency-checks.yml b/.github/workflows/consistency-checks.yml index ed12b47..f5e440b 100644 --- a/.github/workflows/consistency-checks.yml +++ b/.github/workflows/consistency-checks.yml @@ -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: | diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml index 616efe4..a72f1bd 100644 --- a/.github/workflows/ubuntu.yml +++ b/.github/workflows/ubuntu.yml @@ -4,7 +4,7 @@ on: push: branches: [ master ] pull_request: - branches: '**' + branches: [ master ] jobs: build: @@ -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: | diff --git a/Makefile b/Makefile index 7e3a67f..00ada83 100644 --- a/Makefile +++ b/Makefile @@ -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 \ @@ -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 diff --git a/README.rst b/README.rst index 4cfabe6..4b55051 100644 --- a/README.rst +++ b/README.rst @@ -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 @@ -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 `_ the other graphs. +See the `screenshot directory `_ the other graphs. Installation ------------- @@ -44,7 +47,7 @@ From pip: :: - $ pip install mathics3-graph + $ pip install Mathics3-Module-networkx From git: @@ -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 diff --git a/pymathics/graph/base.py b/pymathics/graph/base.py index b467255..ccfbba5 100644 --- a/pymathics/graph/base.py +++ b/pymathics/graph/base.py @@ -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): diff --git a/pymathics/graph/version.py b/pymathics/graph/version.py index 9888765..e2fcf46 100644 --- a/pymathics/graph/version.py +++ b/pymathics/graph/version.py @@ -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 diff --git a/pyproject.toml b/pyproject.toml index 12496fa..bbc1f0c 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -58,4 +58,4 @@ packages = [ ] [tool.setuptools.dynamic] -version = {attr = "pymathics.graph.__version__"} +version = {attr = "pymathics.graph.version.__version__"}