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
7 changes: 5 additions & 2 deletions .github/workflows/consistency-checks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,11 @@ jobs:
python -m pip install pytest setuptools
python -m pip install Mathics3-Module-Base
# Until the next Mathics3-scanner release
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 --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])
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ubuntu.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: Mathic3 Module networkx (ubuntu)
name: Mathics3 Module networkx (ubuntu)

on:
push:
Expand Down
67 changes: 67 additions & 0 deletions pymathics/graph/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -117,6 +117,73 @@
"requires": ["networkx"],
}

_BUILTINS_ = (
"AcyclicGraphQ",
"AdjacencyList",
"BalancedTree",
"BarbellGraph",
"BetweennessCentrality",
"BinomialTree",
"ClosenessCentrality",
"CompleteGraph",
"CompleteKaryTree",
"ConnectedComponents",
"ConnectedGraphQ",
"CycleGraph",
"DegreeCentrality",
"DirectedEdge",
"DirectedGraphQ",
"EdgeConnectivity",
"EdgeCount",
"EdgeDelete",
"EdgeIndex",
"EdgeList",
"EdgeRules",
"EigenvectorCentrality",
"FindShortestPath",
"FindSpanningTree",
"FindVertexCut",
"Graph",
"GraphAtlas",
"GraphAtom",
"GraphBox",
"GraphData",
"GraphDistance",
"GraphQ",
"HITSCentrality",
"HighlightGraph",
"HknHararyGraph",
"HmnHararyGraph",
"KaryTree",
"KatzCentrality",
"LadderGraph",
"LoopFreeGraphQ",
"MixedGraphQ",
"MultigraphQ",
"PageRankCentrality",
"PathGraph",
"PathGraphQ",
"PlanarGraphQ",
"Property",
"PropertyValue",
"RandomGraph",
"RandomTree",
"SimpleGraphQ",
"StarGraph",
"TreeGraph",
"TreeGraphAtom",
"TreeGraphQ",
"UndirectedEdge",
"VertexAdd",
"VertexConnectivity",
"VertexCount",
"VertexDegree",
"VertexDelete",
"VertexIndex",
"VertexList",
"WeaklyConnectedComponents",
)

# These are the publicly exported names
__all__ = [
"AcyclicGraphQ",
Expand Down
2 changes: 1 addition & 1 deletion pymathics/graph/boxes.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
import tempfile
from typing import Tuple

from mathics.core.element import BaseElement, BoxElementMixin
from mathics.core.element import BoxElementMixin

from pymathics.graph.format import png_format_graph, svg_format_graph

Expand Down
4 changes: 2 additions & 2 deletions pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[build-system]
requires = [
"setuptools", # CVE-2024-38335 recommends this
"mathics-core >= 9.0.1",
"setuptools",
"mathics-core > 9.0.1",
"Mathics3-Module-Base",
"networkx>=3.0.0",
"matplotlib",
Expand Down