Skip to content

Commit ed63fb5

Browse files
authored
Merge pull request #1277 from gsabinoo/feat/ruff-format
Add `ruff format --check` to CI
2 parents e3356c4 + 26887f7 commit ed63fb5

6 files changed

Lines changed: 33 additions & 27 deletions

File tree

.github/workflows/test.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,9 +36,10 @@ jobs:
3636
run: |
3737
pip install pytest
3838
pytest ross --cov=ross
39-
- name: Run Ruff
39+
- name: Run Ruff
4040
run: |
4141
ruff check ross
42+
ruff format --check ross
4243
if: success()
4344
- name: Coverage and Deployment
4445
run: codecov

ross/bearing_seal_element.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1487,7 +1487,6 @@ def __init__(
14871487
):
14881488
self.seal_leakage = seal_leakage
14891489

1490-
14911490
super().__init__(
14921491
n=n,
14931492
frequency=frequency,

ross/bearings/magnetic/controllers.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ def plot_frequency_response(*systems, **kwargs):
8585
]
8686

8787
if legends is None:
88-
legends = [f"System {i+1}" for i in range(len(systems))]
88+
legends = [f"System {i + 1}" for i in range(len(systems))]
8989
elif len(legends) != len(systems):
9090
raise ValueError("O número de legendas deve ser igual ao número de sistemas.")
9191

ross/bearings/plain_journal.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -287,8 +287,8 @@ def __init__(
287287
a, b = self._get_interp_coeffs(
288288
T_muI, T_muF, mu_I, mu_F
289289
) # Interpolation coefficients
290-
self.interpolate = lambda reference: a * (
291-
reference**b
290+
self.interpolate = lambda reference: (
291+
a * (reference**b)
292292
) # Interpolation function
293293
self.reference_viscosity = self.interpolate(self.reference_temperature)
294294

ross/rotor_assembly.py

Lines changed: 27 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -946,11 +946,11 @@ def run_critical_speed(self, speed_range=None, num_modes=12, rtol=0.005):
946946
wd = np.zeros_like(_wd)
947947

948948
for i in range(len(wn)):
949-
wn_func = lambda s: (s - self.run_modal(s, num_modes).wn[i])
949+
wn_func = lambda s: s - self.run_modal(s, num_modes).wn[i]
950950
wn[i] = newton(func=wn_func, x0=_wn[i], rtol=rtol)
951951

952952
for i in range(len(wd)):
953-
wd_func = lambda s: (s - self.run_modal(s, num_modes).wd[i])
953+
wd_func = lambda s: s - self.run_modal(s, num_modes).wd[i]
954954
wd[i] = newton(func=wd_func, x0=_wd[i], rtol=rtol)
955955

956956
log_dec = np.zeros_like(wn)
@@ -2577,26 +2577,32 @@ def integrate_system(self, speed, F, t, **kwargs):
25772577
add_to_RHS = kwargs.get("add_to_RHS")
25782578

25792579
if add_to_RHS is None:
2580-
forces = lambda step, **curr_state: F[step, :] + reduction[1](
2581-
magnetic_force(
2582-
step,
2583-
curr_state.get("dt"),
2584-
reduction[2](curr_state.get("y")),
2580+
forces = lambda step, **curr_state: (
2581+
F[step, :]
2582+
+ reduction[1](
2583+
magnetic_force(
2584+
step,
2585+
curr_state.get("dt"),
2586+
reduction[2](curr_state.get("y")),
2587+
)
25852588
)
25862589
)
25872590
else:
2588-
forces = lambda step, **curr_state: F[step, :] + reduction[1](
2589-
add_to_RHS(
2590-
step,
2591-
time_step=curr_state.get("dt"),
2592-
disp_resp=reduction[2](curr_state.get("y")),
2593-
velc_resp=reduction[2](curr_state.get("ydot")),
2594-
accl_resp=reduction[2](curr_state.get("y2dot")),
2595-
)
2596-
+ magnetic_force(
2597-
step,
2598-
curr_state.get("dt"),
2599-
reduction[2](curr_state.get("y")),
2591+
forces = lambda step, **curr_state: (
2592+
F[step, :]
2593+
+ reduction[1](
2594+
add_to_RHS(
2595+
step,
2596+
time_step=curr_state.get("dt"),
2597+
disp_resp=reduction[2](curr_state.get("y")),
2598+
velc_resp=reduction[2](curr_state.get("ydot")),
2599+
accl_resp=reduction[2](curr_state.get("y2dot")),
2600+
)
2601+
+ magnetic_force(
2602+
step,
2603+
curr_state.get("dt"),
2604+
reduction[2](curr_state.get("y")),
2605+
)
26002606
)
26012607
)
26022608

@@ -2723,8 +2729,8 @@ def _init_ambs_for_integrate(self, dt, **kwargs):
27232729
rotor = deepcopy(self)
27242730

27252731
if len(magnetic_bearings):
2726-
magnetic_force = (
2727-
lambda step, time_step, disp_resp: self.magnetic_bearing_controller(
2732+
magnetic_force = lambda step, time_step, disp_resp: (
2733+
self.magnetic_bearing_controller(
27282734
step, magnetic_bearings, time_step, disp_resp, **kwargs
27292735
)
27302736
)

ross/tests/test_gear_element.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,7 @@ def test_mesh_params(mesh):
140140
assert mesh.gear_ratio == 1.0
141141
assert mesh.contact_ratio == 1.7897798668330458
142142
assert mesh.hertzian_stiffness == 3555868607.9093266
143-
assert_allclose(mesh.stiffness, 4.096607e+08, rtol=1e-6, atol=1e-5)
143+
assert_allclose(mesh.stiffness, 4.096607e08, rtol=1e-6, atol=1e-5)
144144
assert_allclose(
145145
mesh.stiffness_range[:5],
146146
[

0 commit comments

Comments
 (0)