Skip to content

Commit 7f3d735

Browse files
cyberwcyberw
authored
Merge pull request #2619 from locustio/update-ruff
Update ruff to 0.3.0
2 parents 466d521 + b732877 commit 7f3d735

11 files changed

+40
-53
lines changed

Diff for: ‎.git-blame-ignore-revs

+2
Original file line numberDiff line numberDiff line change
@@ -11,3 +11,5 @@ b5324820b299b1fe7da0608f0cc8ec47f58b1e40
1111
60f3bceacc4ab9567433d40ae3ed280750f55ff1
1212
# sort imports using ruff
1313
f99e9df700a8020e4c1967eb42dcb37ddd26e296
14+
# apply ruff 0.3.0
15+
64428a0b4dfc75a00b175b4231db33704d8f5d36

Diff for: ‎examples/grpc/hello_pb2.py

+1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Diff for: ‎examples/grpc/hello_pb2_grpc.py

+1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
# Generated by the gRPC Python protocol compiler plugin. DO NOT EDIT!
22
"""Client and server classes corresponding to protobuf-defined services."""
3+
34
import grpc
45
import hello_pb2 as hello__pb2
56

Diff for: ‎examples/web_ui_auth.py

+1
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
77
For more information, see https://docs.locust.io/en/stable/extending-locust.html#authentication
88
"""
9+
910
from locust import HttpUser, events, task
1011

1112
import json

Diff for: ‎locust/runners.py

+2-4
Original file line numberDiff line numberDiff line change
@@ -311,12 +311,10 @@ def monitor_cpu_and_memory(self) -> NoReturn:
311311
@abstractmethod
312312
def start(
313313
self, user_count: int, spawn_rate: float, wait: bool = False, user_classes: list[type[User]] | None = None
314-
) -> None:
315-
...
314+
) -> None: ...
316315

317316
@abstractmethod
318-
def send_message(self, msg_type: str, data: Any | None = None, client_id: str | None = None) -> None:
319-
...
317+
def send_message(self, msg_type: str, data: Any | None = None, client_id: str | None = None) -> None: ...
320318

321319
def start_shape(self) -> None:
322320
"""

Diff for: ‎locust/stats.py

+1-2
Original file line numberDiff line numberDiff line change
@@ -53,8 +53,7 @@
5353

5454
class CSVWriter(Protocol):
5555
@abstractmethod
56-
def writerow(self, columns: Iterable[str | int | float]) -> None:
57-
...
56+
def writerow(self, columns: Iterable[str | int | float]) -> None: ...
5857

5958

6059
class StatsBaseDict(TypedDict):

Diff for: ‎locust/test/test_dispatch.py

+13-26
Original file line numberDiff line numberDiff line change
@@ -3417,14 +3417,11 @@ def case_handler(self, cases: list[RampUpCase], expected: list[dict[str, int]],
34173417
self.assertDictEqual(iterations[-1]["1"], expected[case_num], msg=f"Wrong case {case}")
34183418

34193419
def test_ramp_up_2_weigted_user_with_1_fixed_user(self):
3420-
class User1(User):
3421-
...
3420+
class User1(User): ...
34223421

3423-
class User2(User):
3424-
...
3422+
class User2(User): ...
34253423

3426-
class User3(User):
3427-
...
3424+
class User3(User): ...
34283425

34293426
self.case_handler(
34303427
cases=[
@@ -3451,20 +3448,15 @@ class User3(User):
34513448
)
34523449

34533450
def test_ramp_up_various_count_weigted_and_fixed_users(self):
3454-
class User1(User):
3455-
...
3451+
class User1(User): ...
34563452

3457-
class User2(User):
3458-
...
3453+
class User2(User): ...
34593454

3460-
class User3(User):
3461-
...
3455+
class User3(User): ...
34623456

3463-
class User4(User):
3464-
...
3457+
class User4(User): ...
34653458

3466-
class User5(User):
3467-
...
3459+
class User5(User): ...
34683460

34693461
self.case_handler(
34703462
cases=[
@@ -3491,20 +3483,15 @@ class User5(User):
34913483
)
34923484

34933485
def test_ramp_up_only_fixed_users(self):
3494-
class User1(User):
3495-
...
3486+
class User1(User): ...
34963487

3497-
class User2(User):
3498-
...
3488+
class User2(User): ...
34993489

3500-
class User3(User):
3501-
...
3490+
class User3(User): ...
35023491

3503-
class User4(User):
3504-
...
3492+
class User4(User): ...
35053493

3506-
class User5(User):
3507-
...
3494+
class User5(User): ...
35083495

35093496
self.case_handler(
35103497
cases=[

Diff for: ‎locust/user/task.py

+2-4
Original file line numberDiff line numberDiff line change
@@ -36,13 +36,11 @@ class TaskHolder(Protocol[TaskT]):
3636

3737

3838
@overload
39-
def task(weight: TaskT) -> TaskT:
40-
...
39+
def task(weight: TaskT) -> TaskT: ...
4140

4241

4342
@overload
44-
def task(weight: int) -> Callable[[TaskT], TaskT]:
45-
...
43+
def task(weight: int) -> Callable[[TaskT], TaskT]: ...
4644

4745

4846
def task(weight: TaskT | int = 1) -> TaskT | Callable[[TaskT], TaskT]:

Diff for: ‎locust/web.py

+11-11
Original file line numberDiff line numberDiff line change
@@ -329,9 +329,9 @@ def _download_csv_response(csv_data: str, filename_prefix: str) -> Response:
329329

330330
response = make_response(csv_data)
331331
response.headers["Content-type"] = "text/csv"
332-
response.headers[
333-
"Content-disposition"
334-
] = f"attachment;filename={_download_csv_suggest_file_name(filename_prefix)}"
332+
response.headers["Content-disposition"] = (
333+
f"attachment;filename={_download_csv_suggest_file_name(filename_prefix)}"
334+
)
335335
return response
336336

337337
@app.route("/stats/requests/csv")
@@ -425,15 +425,15 @@ def request_stats() -> Response:
425425
for percentile in stats_module.MODERN_UI_PERCENTILES_TO_CHART
426426
}
427427
else:
428-
report[
429-
"current_response_time_percentile_1"
430-
] = environment.runner.stats.total.get_current_response_time_percentile(
431-
stats_module.PERCENTILES_TO_CHART[0]
428+
report["current_response_time_percentile_1"] = (
429+
environment.runner.stats.total.get_current_response_time_percentile(
430+
stats_module.PERCENTILES_TO_CHART[0]
431+
)
432432
)
433-
report[
434-
"current_response_time_percentile_2"
435-
] = environment.runner.stats.total.get_current_response_time_percentile(
436-
stats_module.PERCENTILES_TO_CHART[1]
433+
report["current_response_time_percentile_2"] = (
434+
environment.runner.stats.total.get_current_response_time_percentile(
435+
stats_module.PERCENTILES_TO_CHART[1]
436+
)
437437
)
438438

439439
if isinstance(environment.runner, MasterRunner):

Diff for: ‎pyproject.toml

+5-5
Original file line numberDiff line numberDiff line change
@@ -68,18 +68,18 @@ extend-exclude = [
6868
"examples/issue_*.py",
6969
"src/readthedocs-sphinx-search/",
7070
]
71-
ignore = ["E402", "E501", "E713", "E731", "E741", "F401"]
72-
select = ["E", "F", "W", "UP", "FA102", "I001"]
71+
lint.ignore = ["E402", "E501", "E713", "E731", "E741", "F401"]
72+
lint.select = ["E", "F", "W", "UP", "FA102", "I001"]
7373

74-
[tool.ruff.per-file-ignores]
74+
[tool.ruff.lint.per-file-ignores]
7575
"examples/*" = ["F841"]
7676
"locust/test/*" = ["F841"]
7777

78-
[tool.ruff.isort]
78+
[tool.ruff.lint.isort]
7979
section-order = ["future", "locust", "standard-library", "third-party", "first-party", "local-folder"]
8080
# Custom selection-order: to ensure locust is imported as first in lucustfiles (for successful gevent monkey patching)
8181

82-
[tool.ruff.isort.sections]
82+
[tool.ruff.lint.isort.sections]
8383
locust = ["locust"]
8484

8585

Diff for: ‎tox.ini

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ commands =
3232
python -m unittest -f locust.test.test_main
3333

3434
[testenv:ruff]
35-
deps = ruff==0.1.13
35+
deps = ruff==0.3.0
3636
commands =
3737
ruff check .
3838
ruff format --check

0 commit comments

Comments
 (0)