Skip to content

Commit 071fa9a

Browse files
committed
feat(mda): move mda.py to new trajectory folder
1 parent 7d28f9a commit 071fa9a

3 files changed

Lines changed: 9 additions & 9 deletions

File tree

CodeEntropy/config/runtime.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,9 +36,9 @@
3636
from CodeEntropy.core.logging import LoggingConfig
3737
from CodeEntropy.entropy.workflow import EntropyWorkflow
3838
from CodeEntropy.levels.dihedrals import ConformationStateBuilder
39-
from CodeEntropy.levels.mda import UniverseOperations
4039
from CodeEntropy.molecules.grouping import MoleculeGrouper
4140
from CodeEntropy.results.reporter import ResultsReporter
41+
from CodeEntropy.trajectory.mda import UniverseOperations
4242

4343
logger = logging.getLogger(__name__)
4444
console = LoggingConfig.get_console()

tests/unit/CodeEntropy/levels/test_mda_universe_operations.py

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
import pytest
55
from MDAnalysis.exceptions import NoDataError
66

7-
from CodeEntropy.levels.mda import UniverseOperations
7+
from CodeEntropy.trajectory.mda import UniverseOperations
88

99

1010
class _FakeAF:
@@ -88,7 +88,7 @@ def test_select_frames_defaults_start_end_and_slices(monkeypatch):
8888

8989
merged = MagicMock()
9090
merged.load_new = MagicMock()
91-
monkeypatch.setattr("CodeEntropy.levels.mda.mda.Merge", lambda ag: merged)
91+
monkeypatch.setattr("CodeEntropy.trajectory.mda.mda.Merge", lambda ag: merged)
9292

9393
out = ops.select_frames(u, start=None, end=None, step=2)
9494

@@ -107,7 +107,7 @@ def test_merge_forces_scales_kcal(monkeypatch):
107107
u_force.select_atoms.return_value = MagicMock()
108108

109109
monkeypatch.setattr(
110-
"CodeEntropy.levels.mda.mda.Universe", MagicMock(side_effect=[u, u_force])
110+
"CodeEntropy.trajectory.mda.mda.Universe", MagicMock(side_effect=[u, u_force])
111111
)
112112

113113
ops._extract_timeseries = MagicMock(
@@ -122,7 +122,7 @@ def test_merge_forces_scales_kcal(monkeypatch):
122122

123123
merged = MagicMock()
124124
merged.load_new = MagicMock()
125-
monkeypatch.setattr("CodeEntropy.levels.mda.mda.Merge", lambda ag: merged)
125+
monkeypatch.setattr("CodeEntropy.trajectory.mda.mda.Merge", lambda ag: merged)
126126

127127
out = ops.merge_forces(
128128
tprfile="tpr",
@@ -147,7 +147,7 @@ def capture_universe(*args, **kwargs):
147147
transformations_captured.extend(kwargs["transformations"])
148148
return mock_universe
149149

150-
monkeypatch.setattr("CodeEntropy.levels.mda.mda.Universe", capture_universe)
150+
monkeypatch.setattr("CodeEntropy.trajectory.mda.mda.Universe", capture_universe)
151151

152152
ops.convert_lammps("tpr", "trr", "LAMMPSDUMP")
153153

@@ -176,7 +176,7 @@ def mock_universe(*args, **kwargs):
176176
transformations_captured.extend(kwargs["transformations"])
177177
return MagicMock()
178178

179-
monkeypatch.setattr("CodeEntropy.levels.mda.mda.Universe", mock_universe)
179+
monkeypatch.setattr("CodeEntropy.trajectory.mda.mda.Universe", mock_universe)
180180

181181
ops.convert_lammps("tpr", "trr", "LAMMPSDUMP")
182182

@@ -206,7 +206,7 @@ def test_select_atoms_builds_merged_universe_and_loads_timeseries(monkeypatch):
206206
merged = MagicMock()
207207
merged.load_new = MagicMock()
208208

209-
monkeypatch.setattr("CodeEntropy.levels.mda.mda.Merge", lambda ag: merged)
209+
monkeypatch.setattr("CodeEntropy.trajectory.mda.mda.Merge", lambda ag: merged)
210210

211211
out = ops.select_atoms(u, "name CA")
212212

@@ -367,7 +367,7 @@ def forces(self):
367367
merged = MagicMock()
368368
merged.load_new = MagicMock()
369369

370-
monkeypatch.setattr("CodeEntropy.levels.mda.mda.Merge", lambda ag: merged)
370+
monkeypatch.setattr("CodeEntropy.trajectory.mda.mda.Merge", lambda ag: merged)
371371

372372
out = ops._build_memory_universe_from_atomgroup(atomgroup, frame_indices=[0, 2])
373373

0 commit comments

Comments
 (0)