Skip to content

Commit 7caa82e

Browse files
committed
Run Ruff format to fix ci failures
1 parent 276a0ba commit 7caa82e

File tree

4 files changed

+33
-19
lines changed

4 files changed

+33
-19
lines changed

tests/constants.py

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,11 @@
2222

2323
# Update this with the ringmodes that pytac supports
2424
SUPPORTED_MODES = {
25-
"I04",
26-
"DIAD",
27-
"DIADSP",
28-
"DIADTHz",
29-
"I04SP",
30-
"I04THz",
31-
"48",
32-
}
25+
"I04",
26+
"DIAD",
27+
"DIADSP",
28+
"DIADTHz",
29+
"I04SP",
30+
"I04THz",
31+
"48",
32+
}

tests/test_element.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -156,13 +156,13 @@ def test_element_representation():
156156
assert str(elem) == "<Element 'bpm1', length 0.1 m, families fam1>"
157157
lat = Lattice("")
158158
lat.add_element(elem)
159-
assert str(elem) == ("<Element 'bpm1', index 1, length 0.1 m, families " "fam1>")
159+
assert str(elem) == ("<Element 'bpm1', index 1, length 0.1 m, families fam1>")
160160
lat.symmetry = 2
161161
assert str(elem) == (
162-
"<Element 'bpm1', index 1, length 0.1 m, cell 1, " "families fam1>"
162+
"<Element 'bpm1', index 1, length 0.1 m, cell 1, families fam1>"
163163
)
164164
elem.name = None
165-
assert str(elem) == ("<Element index 1, length 0.1 m, cell 1, families " "fam1>")
165+
assert str(elem) == ("<Element index 1, length 0.1 m, cell 1, families fam1>")
166166

167167

168168
def test_set_lattice_reference():

tests/test_load.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,12 @@
22
from unittest.mock import patch
33

44
import pytest
5+
from constants import SUPPORTED_MODES, TESTING_MODE
56
from testfixtures import LogCapture
67

78
import pytac
89
from pytac.load_csv import available_ringmodes, load, load_unitconv, resolve_unitconv
9-
from constants import TESTING_MODE, SUPPORTED_MODES
10+
1011

1112
@pytest.fixture
1213
def mock_cs_raises_ImportError():

tests/test_machine.py

Lines changed: 20 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@
88

99
import numpy
1010
import pytest
11+
from constants import TESTING_MODE, TESTING_MODE_RING
1112

1213
import pytac
13-
from constants import TESTING_MODE, TESTING_MODE_RING
1414

1515
EPS = 1e-8
1616

@@ -28,7 +28,10 @@ def test_load_lattice_using_default_dir():
2828

2929
@pytest.mark.parametrize(
3030
"lattice, name, n_elements, length",
31-
[(TESTING_MODE_RING, TESTING_MODE, 2190, 561.571), ("diad_ring", "DIAD", 2194, 561.571)],
31+
[
32+
(TESTING_MODE_RING, TESTING_MODE, 2190, 561.571),
33+
("diad_ring", "DIAD", 2194, 561.571),
34+
],
3235
)
3336
def test_load_lattice(lattice, name, n_elements, length, request):
3437
lattice = request.getfixturevalue(lattice)
@@ -37,7 +40,9 @@ def test_load_lattice(lattice, name, n_elements, length, request):
3740
assert (lattice.get_length() - length) < EPS
3841

3942

40-
@pytest.mark.parametrize("lattice, n_bpms", [(TESTING_MODE_RING, 173), ("diad_ring", 173)])
43+
@pytest.mark.parametrize(
44+
"lattice, n_bpms", [(TESTING_MODE_RING, 173), ("diad_ring", 173)]
45+
)
4146
def test_get_pv_names(lattice, n_bpms, request):
4247
lattice = request.getfixturevalue(lattice)
4348
bpm_x_pvs = lattice.get_element_pv_names("BPM", "x", handle="readback")
@@ -52,7 +57,9 @@ def test_get_pv_names(lattice, n_bpms, request):
5257
assert re.match("SR.*HBPM.*SLOW:DISABLED", pv)
5358

5459

55-
@pytest.mark.parametrize("lattice, n_bpms", [(TESTING_MODE_RING, 173), ("diad_ring", 173)])
60+
@pytest.mark.parametrize(
61+
"lattice, n_bpms", [(TESTING_MODE_RING, 173), ("diad_ring", 173)]
62+
)
5663
def test_load_bpms(lattice, n_bpms, request):
5764
lattice = request.getfixturevalue(lattice)
5865
bpms = lattice.get_elements("BPM")
@@ -75,14 +82,18 @@ def test_load_bpms(lattice, n_bpms, request):
7582
assert bpms[-1].cell == 24
7683

7784

78-
@pytest.mark.parametrize("lattice, n_drifts", [(TESTING_MODE_RING, 1341), ("diad_ring", 1346)])
85+
@pytest.mark.parametrize(
86+
"lattice, n_drifts", [(TESTING_MODE_RING, 1341), ("diad_ring", 1346)]
87+
)
7988
def test_load_drift_elements(lattice, n_drifts, request):
8089
lattice = request.getfixturevalue(lattice)
8190
drifts = lattice.get_elements("DRIFT")
8291
assert len(drifts) == n_drifts
8392

8493

85-
@pytest.mark.parametrize("lattice, n_quads", [(TESTING_MODE_RING, 248), ("diad_ring", 248)])
94+
@pytest.mark.parametrize(
95+
"lattice, n_quads", [(TESTING_MODE_RING, 248), ("diad_ring", 248)]
96+
)
8697
def test_load_quadrupoles(lattice, n_quads, request):
8798
lattice = request.getfixturevalue(lattice)
8899
quads = lattice.get_elements("Quadrupole")
@@ -126,7 +137,9 @@ def test_load_correctors(lattice, n_correctors, request):
126137
)
127138

128139

129-
@pytest.mark.parametrize("lattice, n_squads", [(TESTING_MODE_RING, 98), ("diad_ring", 98)])
140+
@pytest.mark.parametrize(
141+
"lattice, n_squads", [(TESTING_MODE_RING, 98), ("diad_ring", 98)]
142+
)
130143
def test_load_squads(lattice, n_squads, request):
131144
lattice = request.getfixturevalue(lattice)
132145
squads = lattice.get_elements("SQUAD")

0 commit comments

Comments
 (0)