Track changes in mathics-core

Author: rocky

pymathics/graph/base.py

@@ -16,14 +16,14 @@
 )
 from mathics.core.attributes import A_PROTECTED, A_READ_PROTECTED
 from mathics.core.builtin import AtomBuiltin, Builtin
-from mathics.core.atoms import Atom, Integer, Integer0, Integer1, Integer2, String
+from mathics.core.atoms import Integer, Integer0, Integer1, Integer2, String
 from mathics.core.convert.expression import ListExpression, from_python, to_mathics_list
 from mathics.core.element import BaseElement
 from mathics.core.evaluation import Evaluation
 from mathics.core.expression import Expression
-from mathics.core.keycomparable import IMAGE_EXPRESSION_SORT_KEY
+from mathics.core.keycomparable import IMAGE_EXPRESSION_ELT_ORDER
 from mathics.core.pattern import pattern_objects
-from mathics.core.symbols import Symbol, SymbolList, SymbolTrue
+from mathics.core.symbols import Atom, Symbol, SymbolList, SymbolTrue
 from mathics.core.systemsymbols import (
     SymbolBlank,
     SymbolCases,
@@ -43,7 +43,7 @@
     SymbolUndirectedEdge,
 )
 
-GRAPH_EXPRESSION_SORT_KEY = IMAGE_EXPRESSION_SORT_KEY + 1
+GRAPH_EXPRESSION_ELT_ORDER = IMAGE_EXPRESSION_ELT_ORDER + 1
 
 WL_MARKER_TO_NETWORKX = {
     "Circle": "o",
@@ -217,7 +217,7 @@ def element_order(self) -> tuple:
         # last for two graphs are structurally the same but different, so that
         # the same graph object will appear consecutively in a Sort[].
         return (
-            GRAPH_EXPRESSION_SORT_KEY,
+            GRAPH_EXPRESSION_ELT_ORDER,
             SymbolGraph,
             len(self.vertices),
             tuple(),
@@ -410,7 +410,7 @@ def element_order(self) -> tuple:
         # last for two graphs are structurally the same but different, so that
         # the same graph object will appear consecutively in a Sort[].
         return (
-            GRAPH_EXPRESSION_SORT_KEY,
+            GRAPH_EXPRESSION_ELT_ORDER,
             SymbolGraph,
             len(self.vertices),
             tuple(),

pymathics/graph/tree.py

@@ -1,10 +1,10 @@
 """
 Trees
 """
+
 import networkx as nx
-from mathics.core.atoms import Atom
 from mathics.core.evaluation import Evaluation
-from mathics.core.symbols import SymbolConstant
+from mathics.core.symbols import Atom, SymbolConstant
 
 from pymathics.graph.base import (
     DEFAULT_GRAPH_OPTIONS,

pyproject.toml

@@ -1,7 +1,7 @@
 [build-system]
 requires = [
 	"setuptools", # CVE-2024-38335 recommends this
-        "Mathics3>=9.0.0",
+        "Mathics3>9.0.0",
         "networkx>=3.0.0",
         "matplotlib",
         "Mathics3-Module-Base",