fixes

Author: mmatera

Makefile

@@ -61,7 +61,7 @@ pytest:
 
 #: Run tests that appear in docstring in the code.
 doctest:
-	MATHICS_CHARACTER_ENCODING="ASCII" $(PYTHON) -m mathics.docpipeline -l pymathics.graph -c  'Graphs - Vertices and Edges' $o
+	MATHICS_CHARACTER_ENCODING="ASCII" $(PYTHON) -m mathics.docpipeline -l pymathics.graph $o
 
 # #: Make Mathics PDF manual
 # doc mathics.pdf: mathics/doc/tex/data

pymathics/graph/base.py

@@ -10,7 +10,7 @@
 from inspect import isgenerator
 from typing import Callable, Optional, Union
 
-from mathics.builtin.base import AtomBuiltin, Builtin
+from mathics.core.builtin import AtomBuiltin, Builtin
 from mathics.core.atoms import Atom, Integer, Integer0, Integer1, Integer2, String
 from mathics.core.convert.expression import ListExpression, from_python, to_mathics_list
 from mathics.core.element import BaseElement
@@ -853,7 +853,7 @@ class AdjacencyList(_NetworkXBuiltin):
     summary_text = "list the adjacent vertices"
 
     def _retrieve(self, graph, what, neighbors, expression, evaluation):
-        from mathics.builtin import pattern_objects
+        from mathics.core.pattern import pattern_objects
 
         if what.get_head_name() in pattern_objects:
             collected = set()
@@ -1430,7 +1430,7 @@ def eval(self, graph, what, expression, evaluation, options) -> Optional[Graph]:
         "VertexDelete[graph_, what_, OptionsPattern[VertexDelete]]"
         graph = self._build_graph(graph, evaluation, options, expression)
         if graph:
-            from mathics.builtin import pattern_objects
+            from mathics.core.pattern import pattern_objects
 
             head_name = what.get_head_name()
             if head_name in pattern_objects:
@@ -1571,7 +1571,7 @@ def eval(self, graph, what, expression, evaluation, options) -> Optional[Graph]:
         "EdgeDelete[graph_, what_, OptionsPattern[EdgeDelete]]"
         graph = self._build_graph(graph, evaluation, options, expression)
         if graph:
-            from mathics.builtin import pattern_objects
+            from mathics.core.pattern import pattern_objects
 
             head_name = what.get_head_name()
             if head_name in pattern_objects:

pymathics/graph/tree.py

@@ -18,7 +18,7 @@
     **{"GraphLayout": '"tree"'},
 }
 
-from mathics.builtin.base import AtomBuiltin
+from mathics.core.builtin import AtomBuiltin
 
 
 # FIXME: do we need to have TreeGraphAtom and TreeGraph?

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__="6.0.0a0"  # noqa
+__version__="7.0.0a0"  # noqa

setup.py

@@ -31,7 +31,7 @@ def read(*rnames):
     name="pymathics-graph",
     version=__version__,  # noqa
     packages=find_namespace_packages(include=["pymathics.*"]),
-    install_requires=["Mathics3>5.1.0", "networkx>=2.8.0", "pydot", "matplotlib", "scipy>=1.10.0"],
+    install_requires=["Mathics3>=7.0.0", "networkx>=2.8.0", "pydot", "matplotlib", "scipy>=1.10.0"],
     # don't pack Mathics in egg because of media files, etc.
     zip_safe=False,
     maintainer="Mathics Group",

test/consistency-and-style/test_summary_text.py

@@ -7,8 +7,8 @@
 import pytest
 
 from pymathics.graph import __file__ as module_initfile_path
-from mathics.builtin import name_is_builtin_symbol
-from mathics.builtin.base import Builtin
+from mathics.core.load_builtin import name_is_builtin_symbol
+from mathics.core.builtin import Builtin
 from mathics.doc.common_doc import skip_doc
 
 

test/helper.py

@@ -3,13 +3,16 @@
 from typing import Optional
 
 from mathics.core.symbols import Symbol
+from mathics.core.load_builtin import import_and_load_builtins
 from mathics.session import MathicsSession
 
+import_and_load_builtins()
+
 # Set up a Mathics session with definitions.
 # For consistency set the character encoding ASCII which is
 # the lowest common denominator available on all systems.
 session = MathicsSession(
-    add_builtin=True, catch_interrupt=False, character_encoding="ASCII"
+    character_encoding="ASCII"
 )