Merge pull request #377 from CCPBioSim/376-tidy-level-stage-package-exports

Tidy level package structure

Author: harryswift01

CodeEntropy/entropy/workflow.py

@@ -26,8 +26,8 @@
 from CodeEntropy.core.logging import LoggingConfig
 from CodeEntropy.entropy.graph import EntropyGraph
 from CodeEntropy.entropy.water import WaterEntropy
+from CodeEntropy.levels.graph.level_dag import LevelDAG
 from CodeEntropy.levels.hierarchy import HierarchyBuilder
-from CodeEntropy.levels.level_dag import LevelDAG
 from CodeEntropy.trajectory.frames import FrameSelection
 from CodeEntropy.trajectory.source import FrameSource
 

CodeEntropy/levels/execution/__init__.py

@@ -16,7 +16,7 @@
     execute_frame_map_output,
     make_frame_worker_shared_data,
 )
-from CodeEntropy.levels.frame_dag import FrameGraph
+from CodeEntropy.levels.graph.frame_dag import FrameGraph
 from CodeEntropy.levels.neighbors import Neighbors
 from CodeEntropy.results.reporter import _RichProgressSink
 

CodeEntropy/levels/execution/scheduler.py

@@ -5,7 +5,7 @@
 from dataclasses import dataclass, field
 from typing import Any
 
-from CodeEntropy.levels.frame_dag import FrameGraph
+from CodeEntropy.levels.graph.frame_dag import FrameGraph
 from CodeEntropy.levels.neighbors import Neighbors
 
 FRAME_WORKER_EXCLUDED_SHARED_KEYS = {

CodeEntropy/levels/execution/tasks.py

@@ -12,11 +12,11 @@
 import networkx as nx
 
 from CodeEntropy.levels.axes import AxesCalculator
-from CodeEntropy.levels.conformation_dag import ConformationDAG
 from CodeEntropy.levels.execution.policy import ExecutionPolicy
 from CodeEntropy.levels.execution.reducers import NeighborReducer
 from CodeEntropy.levels.execution.scheduler import FrameScheduler
-from CodeEntropy.levels.frame_dag import FrameGraph
+from CodeEntropy.levels.graph.conformation_dag import ConformationDAG
+from CodeEntropy.levels.graph.frame_dag import FrameGraph
 from CodeEntropy.levels.neighbors import Neighbors
 from CodeEntropy.levels.nodes.accumulators import InitCovarianceAccumulatorsNode
 from CodeEntropy.levels.nodes.axes_topology import BuildAxesTopologyNode

CodeEntropy/levels/graph/__init__.py

@@ -1,11 +1,6 @@
 CodeEntropy.config package
 ==========================
 
-.. automodule:: CodeEntropy.config
-   :members:
-   :show-inheritance:
-   :undoc-members:
-
 Submodules
 ----------
 
@@ -14,3 +9,11 @@ Submodules
 
    CodeEntropy.config.argparse
    CodeEntropy.config.runtime
+
+Module contents
+---------------
+
+.. automodule:: CodeEntropy.config
+   :members:
+   :show-inheritance:
+   :undoc-members:

CodeEntropy/levels/conformation_dag.py …Entropy/levels/graph/conformation_dag.pyCodeEntropy/levels/conformation_dag.py renamed to CodeEntropy/levels/graph/conformation_dag.py CodeEntropy/levels/conformation_dag.py renamed to CodeEntropy/levels/graph/conformation_dag.py

@@ -1,11 +1,6 @@
 CodeEntropy.core package
 ========================
 
-.. automodule:: CodeEntropy.core
-   :members:
-   :show-inheritance:
-   :undoc-members:
-
 Submodules
 ----------
 
@@ -14,3 +9,11 @@ Submodules
 
    CodeEntropy.core.dask_clusters
    CodeEntropy.core.logging
+
+Module contents
+---------------
+
+.. automodule:: CodeEntropy.core
+   :members:
+   :show-inheritance:
+   :undoc-members: