Add VertexLabeling and matplotlib dependency

Author: rocky

pymathics/graph/__main__.py

@@ -152,6 +152,7 @@ class _NetworkXBuiltin(Builtin):
         "EdgeStyle": "{}",
         "EdgeWeight": "{}",
         "PlotTheme": "{}",
+        "VertexLabeling": "False",
     }
 
     messages = {
@@ -743,6 +744,7 @@ class GraphAtom(AtomBuiltin):
     options = {
         "VertexSize": "{}",
         "VertexStyle": "{}",
+        "VertexLabeling": "False",
         "EdgeStyle": "{}",
         "DirectedEdges": "True",
         "PlotTheme": "Null",

pymathics/graph/graph_generators.py

@@ -43,6 +43,7 @@ def apply(self, r, h, expression, evaluation, options):
 
 
         options["PlotTheme"] = options["System`PlotTheme"].get_string_value() or String("tree")
+        options["VertexLabeling"] = options["System`VertexLabeling"]
         g = Graph(G, options=options)
         g.r = r
         g.h = h
@@ -83,6 +84,7 @@ def apply(self, m1, m2, expression, evaluation, options):
         G = nx.barbell_graph(py_m1, py_m2)
 
         options["PlotTheme"] = options["System`PlotTheme"].get_string_value() or String("spring")
+        options["VertexLabeling"] = options["System`VertexLabeling"]
         g = Graph(G, options=options)
         g.m1 = m1
         g.m2 = m2
@@ -124,6 +126,7 @@ def apply(self, n, expression, evaluation, options):
         G = nx.binomial_tree(py_n)
 
         options["PlotTheme"] = options["System`PlotTheme"].get_string_value() or String("tree")
+        options["VertexLabeling"] = options["System`VertexLabeling"]
         g = Graph(G, options=options)
         g.n = n
         G.root = g.root = 0
@@ -160,6 +163,7 @@ def apply(self, n, expression, evaluation, options):
         G = nx.complete_graph(py_n)
 
         options["PlotTheme"] = options["System`PlotTheme"].get_string_value() or String("circular")
+        options["VertexLabeling"] = options["System`VertexLabeling"]
         g = Graph(G, options=options)
         g.n  = n
         return g
@@ -208,6 +212,7 @@ def apply(self, r, n, expression, evaluation, options):
         G = nx.full_rary_tree(py_r, py_n)
 
         options["PlotTheme"] = options["System`PlotTheme"].get_string_value() or String("tree")
+        options["VertexLabeling"] = options["System`VertexLabeling"]
         g = Graph(G, options=options)
         g.r = r
         g.n = n
@@ -271,6 +276,7 @@ def apply(self, n, expression, evaluation, options):
         G = nx.random_tree(py_n)
 
         options["PlotTheme"] = options["System`PlotTheme"].get_string_value() or String("tree")
+        options["VertexLabeling"] = options["System`VertexLabeling"]
         g = Graph(G, options=options)
         g.n = n
         G.root = g.root = 0
@@ -303,6 +309,7 @@ def apply(self, n, expression, evaluation, options):
         G = nx.star_graph(py_n)
 
         options["PlotTheme"] = options["System`PlotTheme"].get_string_value() or String("spring")
+        options["VertexLabeling"] = options["System`VertexLabeling"]
 
         g = Graph(G, options=options)
         g.n = n

setup.py

@@ -20,7 +20,7 @@
     name="pymathics-graph",
     version=__version__,
     packages=find_namespace_packages(include=["pymathics.*"]),
-    install_requires=["Mathics3>=1.1.0", "networkx", "pydot"],
+    install_requires=["Mathics3>=1.1.0", "networkx", "pydot", "matplotlib"],
     # don't pack Mathics in egg because of media files, etc.
     zip_safe=False,
     maintainer="Mathics Group",