Merge pull request #3079 from locustio/update-ruff

Update ruff to 0.10.0

Author: cyberw

Diff for: .git-blame-ignore-revs

@@ -13,3 +13,6 @@ b5324820b299b1fe7da0608f0cc8ec47f58b1e40
 f99e9df700a8020e4c1967eb42dcb37ddd26e296
 # apply ruff 0.3.0
 64428a0b4dfc75a00b175b4231db33704d8f5d36
+# apply ruff 0.10.0
+92268e16d5666d429ccea1742ecb90475f284c89
+496c5bd40347b97f917ccacfaf57ceed8f6690b5

Diff for: .pre-commit-config.yaml

@@ -1,7 +1,7 @@
 repos:
   - repo: https://github.com/astral-sh/ruff-pre-commit
     # Ruff version.
-    rev: v0.7.3  # Pin the same version in the pyproject.toml file
+    rev: v0.10.0  # Pin the same version in the pyproject.toml file
     hooks:
       # Run the linter.
       - id: ruff

Diff for: examples/extend_web_ui.py

@@ -138,7 +138,7 @@ def content_length_csv():
 
             if stats:
                 for url, inner_stats in stats.items():
-                    rows.append(f"\"{url}\",{inner_stats['content-length']:.2f}")
+                    rows.append(f'"{url}",{inner_stats["content-length"]:.2f}')
             return "\n".join(rows)
 
         # register our new routes and extended UI with the Locust web UI

Diff for: locust/contrib/fasthttp.py

@@ -471,7 +471,7 @@ def rest_(self, method, url, name=None, **kwargs) -> Generator[RestResponseConte
         separator = "&" if "?" in url else "?"
         if name is None:
             name = url + separator + "_=..."
-        with self.rest(method, f"{url}{separator}_={int(time.time()*1000)}", name=name, **kwargs) as resp:
+        with self.rest(method, f"{url}{separator}_={int(time.time() * 1000)}", name=name, **kwargs) as resp:
             yield resp
 
 

Diff for: locust/runners.py

@@ -209,9 +209,9 @@ def spawn(user_class: str, spawn_count: int) -> list[User]:
             new_users: list[User] = []
             while n < spawn_count:
                 new_user = self.user_classes_by_name[user_class](self.environment)
-                assert hasattr(
-                    new_user, "environment"
-                ), f"Attribute 'environment' is missing on user {user_class}. Perhaps you defined your own __init__ and forgot to call the base constructor? (super().__init__(*args, **kwargs))"
+                assert hasattr(new_user, "environment"), (
+                    f"Attribute 'environment' is missing on user {user_class}. Perhaps you defined your own __init__ and forgot to call the base constructor? (super().__init__(*args, **kwargs))"
+                )
                 new_user.start(self.user_greenlets)
                 new_users.append(new_user)
                 n += 1

Diff for: locust/stats.py

@@ -827,7 +827,7 @@ def get_stats_summary(stats: RequestStats, current=True) -> list[str]:
         ("%-" + str(STATS_TYPE_WIDTH) + "s %-" + str(name_column_width) + "s %7s %12s |%7s %7s %7s%7s | %7s %11s")
         % ("Type", "Name", "# reqs", "# fails", "Avg", "Min", "Max", "Med", "req/s", "failures/s")
     )
-    separator = f'{"-" * STATS_TYPE_WIDTH}|{"-" * (name_column_width)}|{"-" * 7}|{"-" * 13}|{"-" * 7}|{"-" * 7}|{"-" * 7}|{"-" * 7}|{"-" * 8}|{"-" * 11}'
+    separator = f"{'-' * STATS_TYPE_WIDTH}|{'-' * (name_column_width)}|{'-' * 7}|{'-' * 13}|{'-' * 7}|{'-' * 7}|{'-' * 7}|{'-' * 7}|{'-' * 8}|{'-' * 11}"
     summary.append(separator)
     for key in sorted(stats.entries.keys()):
         r = stats.entries[key]
@@ -850,14 +850,11 @@ def get_percentile_stats_summary(stats: RequestStats) -> list[str]:
     summary = ["Response time percentiles (approximated)"]
     headers = ("Type", "Name") + tuple(get_readable_percentiles(PERCENTILES_TO_REPORT)) + ("# reqs",)
     summary.append(
-        (
-            f"%-{str(STATS_TYPE_WIDTH)}s %-{str(STATS_NAME_WIDTH)}s %8s "
-            f"{' '.join(['%6s'] * len(PERCENTILES_TO_REPORT))}"
-        )
+        (f"%-{str(STATS_TYPE_WIDTH)}s %-{str(STATS_NAME_WIDTH)}s %8s {' '.join(['%6s'] * len(PERCENTILES_TO_REPORT))}")
         % headers
     )
     separator = (
-        f'{"-" * STATS_TYPE_WIDTH}|{"-" * STATS_NAME_WIDTH}|{"-" * 8}|{("-" * 6 + "|") * len(PERCENTILES_TO_REPORT)}'
+        f"{'-' * STATS_TYPE_WIDTH}|{'-' * STATS_NAME_WIDTH}|{'-' * 8}|{('-' * 6 + '|') * len(PERCENTILES_TO_REPORT)}"
     )[:-1]
     summary.append(separator)
     for key in sorted(stats.entries.keys()):
@@ -880,7 +877,7 @@ def print_error_report(stats: RequestStats) -> None:
 def get_error_report_summary(stats) -> list[str]:
     summary = ["Error report"]
     summary.append("%-18s %-100s" % ("# occurrences", "Error"))
-    separator = f'{"-" * 18}|{"-" * ((80 + STATS_NAME_WIDTH) - 19)}'
+    separator = f"{'-' * 18}|{'-' * ((80 + STATS_NAME_WIDTH) - 19)}"
     summary.append(separator)
     for error in stats.errors.values():
         summary.append("%-18i %-100s" % (error.occurrences, error.to_name()))

Diff for: pyproject.toml

@@ -74,7 +74,7 @@ test = [
 ]
 lint = [
     "pre-commit>=3.7.1,<4.0.0",
-    "ruff==0.7.3",
+    "ruff==0.10.0",
     "mypy>=1.13.0,<2.0.0",
     "types-requests>=2.32.0.20240622,<3.0.0",
 ]
@@ -132,8 +132,9 @@ extend-exclude = [
     "examples/issue_*.py",
     "src/readthedocs-sphinx-search/",
 ]
-lint.ignore = ["E402", "E501", "E713", "E731", "E741"]
+lint.ignore = ["E402", "E501", "E713", "E731", "E741", "UP031"]
 lint.select = ["E", "F", "W", "UP", "FA102", "I001"]
+lint.dummy-variable-rgx = "^(_+|(_+[a-zA-Z0-9_]*[a-zA-Z0-9]+?)|resp)$"
 
 [tool.ruff.lint.per-file-ignores]
 "examples/*" = ["F841"]
@@ -233,7 +234,7 @@ python = ["3.12"]
 [tool.hatch.envs.lint]
 detached = true
 dependencies = [
-    "ruff==0.7.3",
+    "ruff==0.10.0",
     "mypy>=1.13.0,<2.0.0",
     "types-requests>=2.32.0.20240622,<3.0.0",
 ]