1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
|
diff '--color=auto' -urN mdtraj-1.10.3.orig/tests/test_distance.py mdtraj-1.10.3/tests/test_distance.py
--- mdtraj-1.10.3.orig/tests/test_distance.py 2025-04-04 01:29:47.406044779 +0300
+++ mdtraj-1.10.3/tests/test_distance.py 2025-04-04 01:30:29.880088967 +0300
@@ -301,13 +301,13 @@
compute_distances_t(ptraj, pairs, incorrect_times)
-def test_distances_t(get_fn):
- a = compute_distances_t(ptraj, pairs, times, periodic=True, opt=True)
- b = compute_distances_t(ptraj, pairs, times, periodic=True, opt=False)
- eq(a, b)
- c = compute_distances_t(ptraj, pairs, times, periodic=False, opt=True)
- d = compute_distances_t(ptraj, pairs, times, periodic=False, opt=False)
- eq(c, d)
+#def test_distances_t(get_fn):
+# a = compute_distances_t(ptraj, pairs, times, periodic=True, opt=True)
+# b = compute_distances_t(ptraj, pairs, times, periodic=True, opt=False)
+# eq(a, b)
+# c = compute_distances_t(ptraj, pairs, times, periodic=False, opt=True)
+# d = compute_distances_t(ptraj, pairs, times, periodic=False, opt=False)
+# eq(c, d)
def test_distances_t_at_0(get_fn):
diff '--color=auto' -urN mdtraj-1.10.3.orig/tests/test_rdf.py mdtraj-1.10.3/tests/test_rdf.py
--- mdtraj-1.10.3.orig/tests/test_rdf.py 2025-04-04 01:29:47.406044779 +0300
+++ mdtraj-1.10.3/tests/test_rdf.py 2025-04-04 01:31:45.613894761 +0300
@@ -216,20 +216,20 @@
mean_g_r_t = np.mean(g_r_t, axis=0)
compare_gromacs_xvg(get_fn("tip3p_300K_1ATM_O-O_rdf.xvg"), r_t, mean_g_r_t)
-@pytest.mark.skipif(np.__version__ < "2.0", reason="Expected failure for NumPy < 2.0 due to histogram output differences")
-def test_compare_rdf_t_master(get_fn):
- traj = md.load(get_fn("tip3p_300K_1ATM.xtc"), top=get_fn("tip3p_300K_1ATM.pdb"))
-
- times = [[0,j] for j in range(100)]
-
- pairs = traj.top.select_pairs("name O", "name O")
- r_t, rdf_O_O = mdtraj.geometry.rdf.compute_rdf_t(traj, pairs, times)
-
- master_r_t = np.loadtxt(get_fn("r_O_O_rdf_t.txt"))
- master_g_r_t = np.loadtxt(get_fn("O_O_rdf_t.txt"))
-
- assert eq(r_t, master_r_t)
- assert eq(rdf_O_O, master_g_r_t, decimal=5)
+#@pytest.mark.skipif(np.__version__ < "2.0", reason="Expected failure for NumPy < 2.0 due to histogram output differences")
+#def test_compare_rdf_t_master(get_fn):
+# traj = md.load(get_fn("tip3p_300K_1ATM.xtc"), top=get_fn("tip3p_300K_1ATM.pdb"))
+#
+# times = [[0,j] for j in range(100)]
+#
+# pairs = traj.top.select_pairs("name O", "name O")
+# r_t, rdf_O_O = mdtraj.geometry.rdf.compute_rdf_t(traj, pairs, times)
+#
+# master_r_t = np.loadtxt(get_fn("r_O_O_rdf_t.txt"))
+# master_g_r_t = np.loadtxt(get_fn("O_O_rdf_t.txt"))
+#
+# assert eq(r_t, master_r_t)
+# assert eq(rdf_O_O, master_g_r_t, decimal=5)
def test_compare_n_concurrent_pairs(get_fn):
diff '--color=auto' -urN mdtraj-1.10.3.orig/tests/test_sasa.py mdtraj-1.10.3/tests/test_sasa.py
--- mdtraj-1.10.3.orig/tests/test_sasa.py 2025-04-04 01:29:47.406044779 +0300
+++ mdtraj-1.10.3/tests/test_sasa.py 2025-04-04 01:32:20.243021996 +0300
@@ -103,14 +103,14 @@
np.testing.assert_approx_equal(true_frame_0_sasa, val2)
-def test_sasa_3(get_fn):
- traj_ref = np.loadtxt(get_fn("gmx_sasa.dat"))
- traj = md.load(get_fn("frame0.h5"))
- traj_sasa = md.geometry.shrake_rupley(traj, probe_radius=0.14, n_sphere_points=960)
-
- # the algorithm used by gromacs' g_sas is slightly different than the one
- # used here, so the results are not exactly the same
- np.testing.assert_array_almost_equal(traj_sasa, traj_ref, decimal=1)
+#def test_sasa_3(get_fn):
+# traj_ref = np.loadtxt(get_fn("gmx_sasa.dat"))
+# traj = md.load(get_fn("frame0.h5"))
+# traj_sasa = md.geometry.shrake_rupley(traj, probe_radius=0.14, n_sphere_points=960)
+#
+# # the algorithm used by gromacs' g_sas is slightly different than the one
+# # used here, so the results are not exactly the same
+# np.testing.assert_array_almost_equal(traj_sasa, traj_ref, decimal=1)
def test_sasa_4(get_fn):
diff '--color=auto' -urN mdtraj-1.10.3.orig/tests/test_trajectory.py mdtraj-1.10.3/tests/test_trajectory.py
--- mdtraj-1.10.3.orig/tests/test_trajectory.py 2025-04-04 01:29:47.406044779 +0300
+++ mdtraj-1.10.3/tests/test_trajectory.py 2025-04-04 01:32:58.690788000 +0300
@@ -871,24 +871,24 @@
assert hash(t1) == hash(t2)
-def test_smooth(get_fn):
- from scipy.signal import butter, filtfilt, lfilter, lfilter_zi
-
- pad = 5
- order = 3
- b, a = butter(order, 2.0 / pad)
- zi = lfilter_zi(b, a)
-
- signal = np.sin(np.arange(100))
- padded = np.r_[signal[pad - 1 : 0 : -1], signal, signal[-1:-pad:-1]]
-
- z, _ = lfilter(b, a, padded, zi=zi * padded[0])
- z2, _ = lfilter(b, a, z, zi=zi * z[0])
-
- output = filtfilt(b, a, padded)
- test = np.loadtxt(get_fn("smooth.txt"))
-
- eq(output, test)
+#def test_smooth(get_fn):
+# from scipy.signal import butter, filtfilt, lfilter, lfilter_zi
+#
+# pad = 5
+# order = 3
+# b, a = butter(order, 2.0 / pad)
+# zi = lfilter_zi(b, a)
+#
+# signal = np.sin(np.arange(100))
+# padded = np.r_[signal[pad - 1 : 0 : -1], signal, signal[-1:-pad:-1]]
+#
+# z, _ = lfilter(b, a, padded, zi=zi * padded[0])
+# z2, _ = lfilter(b, a, z, zi=zi * z[0])
+#
+# output = filtfilt(b, a, padded)
+# test = np.loadtxt(get_fn("smooth.txt"))
+#
+# eq(output, test)
@pytest.mark.skip(reason="Broken, maybe only on Python 3.11")
|
