isort and black

Author: rocky

.isort.cfg

@@ -0,0 +1,4 @@
+[settings]
+# sort and black fight over the formatting of this file.
+# Remove when this issue is resolved.
+skip=pymathics/graph/base.py

.pre-commit-config.yaml

@@ -9,20 +9,20 @@ repos:
       stages: [commit]
     - id: end-of-file-fixer
       stages: [commit]
-# -   repo: https://github.com/pycqa/isort
-#     rev: 5.10.1
-#     hooks:
-#       - id: isort
-#         stages: [commit]
+-   repo: https://github.com/pycqa/isort
+    rev: 5.10.1
+    hooks:
+      - id: isort
+        stages: [commit]
 -   repo: https://github.com/psf/black
     rev: 22.3.0
     hooks:
     - id: black
       language_version: python3
       exclude: 'pymathics/graph/version.py'
       stages: [commit]
-# -   repo: https://github.com/pycqa/flake8
-#     rev: 3.9.2
-#     hooks:
-#       - id: flake8
-#         stages: [commit]
+-   repo: https://github.com/pycqa/flake8
+    rev: 3.9.2
+    hooks:
+      - id: flake8
+        stages: [commit]

pymathics/graph/__init__.py

@@ -15,13 +15,10 @@
 
 from pymathics.graph.base import (
     AdjacencyList,
-    AcyclicGraphQ,
     BetweennessCentrality,
     ClosenessCentrality,
-    ConnectedGraphQ,
     DegreeCentrality,
     DirectedEdge,
-    DirectedGraphQ,
     EdgeConnectivity,
     EdgeIndex,
     EdgeList,
@@ -32,37 +29,28 @@
     Graph,
     GraphAtom,
     GraphBox,
-    HITSCentrality,
     HighlightGraph,
+    HITSCentrality,
     KatzCentrality,
-    LoopFreeGraphQ,
-    MixedGraphQ,
-    MultigraphQ,
     PageRankCentrality,
-    PathGraphQ,
     Property,
     PropertyValue,
-    SimpleGraphQ,
     UndirectedEdge,
     VertexAdd,
     VertexConnectivity,
     VertexDelete,
     VertexIndex,
     VertexList,
 )
-
-from pymathics.graph.measures_and_metrics import EdgeCount, VertexCount, VertexDegree
-
-from pymathics.graph.algorithms import (
-    ConnectedComponents,
+from pymathics.graph.components import ConnectedComponents, WeaklyConnectedComponents
+from pymathics.graph.curated import GraphData
+from pymathics.graph.measures_and_metrics import (
+    EdgeCount,
     GraphDistance,
-    FindSpanningTree,
-    PlanarGraphQ,
-    WeaklyConnectedComponents,
+    VertexCount,
+    VertexDegree,
 )
-
-from pymathics.graph.curated import GraphData
-
+from pymathics.graph.operations import FindSpanningTree
 from pymathics.graph.parametric import (
     BalancedTree,
     BarbellGraph,
@@ -79,9 +67,18 @@
     RandomTree,
     StarGraph,
 )
-
+from pymathics.graph.properties import (
+    AcyclicGraphQ,
+    ConnectedGraphQ,
+    DirectedGraphQ,
+    LoopFreeGraphQ,
+    MixedGraphQ,
+    MultigraphQ,
+    PathGraphQ,
+    PlanarGraphQ,
+    SimpleGraphQ,
+)
 from pymathics.graph.random import RandomGraph
-
 from pymathics.graph.structured import PathGraph, TreeGraph
 from pymathics.graph.tree import TreeGraphAtom, TreeGraphQ
 from pymathics.graph.version import __version__