Merge pull request #29 from Mathics3/update_Mathics7

Update mathics7

Author: rocky

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
@@ -854,7 +854,6 @@ class AdjacencyList(_NetworkXBuiltin):
     summary_text = "list the adjacent vertices"
 
     def _retrieve(self, graph, what, neighbors, expression, evaluation):
-
         if what.get_head_name() in pattern_objects:
             collected = set()
             match = Matcher(what).match
@@ -1426,7 +1425,6 @@ 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:
-
             head_name = what.get_head_name()
             if head_name in pattern_objects:
                 cases = Expression(
@@ -1566,7 +1564,6 @@ 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:
-
             head_name = what.get_head_name()
             if head_name in pattern_objects:
                 cases = Expression(

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?

setup.py

@@ -32,7 +32,7 @@ def read(*rnames):
     version=__version__,  # noqa
     packages=find_namespace_packages(include=["pymathics.*"]),
     install_requires=[
-        "Mathics3>=6.0.1",
+        "Mathics3>=7.0.0dev",
         "networkx>=3.0.0",
         "pydot",
         "matplotlib",

test/consistency-and-style/test_summary_text.py

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

test/helper.py

@@ -4,6 +4,7 @@
 
 from mathics.core.load_builtin import import_and_load_builtins
 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()
@@ -12,7 +13,7 @@
 # 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"
 )