Skip to content

Commit 48db8e7

Browse files
committed
bump ruff and fix vsc ruff warning
1 parent 453cf09 commit 48db8e7

File tree

7 files changed

+40
-39
lines changed

7 files changed

+40
-39
lines changed

.vscode/settings.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,7 @@
5454
],
5555
"ruff.enable": true,
5656
"ruff.lineLength": 99,
57+
"ruff.logLevel": "error",
5758
"extensions.ignoreRecommendations": false,
5859
"search.exclude": {
5960
"tests/legacy": true

pyproject.toml

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -45,12 +45,8 @@ dependencies = [
4545
"types-pyyaml>=6.0.12.20240917,<7",
4646
"pytest-json-report>=1.5.0,<2",
4747
"typing-extensions>=4.12.2,<5",
48-
# TODO: bump questionary to a newer release, when it becomes available.
49-
# The current release questionary 2.0.1 requires `prompt_toolkit = ">=2.0,<=3.0.36"`.
50-
# This conflicts with ipython; while not an EEST dependency, ipython is a very useful tool:
51-
# https://eest.ethereum.org/main/dev/interactive_usage/
52-
"questionary @ git+https://github.com/tmbo/questionary@ff22aeae1cd9c1c734f14329934e349bec7873bc",
53-
"prompt_toolkit>=3.0.48,<4", # ensure we have a new enough version for ipython
48+
"questionary>=2.1.0",
49+
"prompt_toolkit>=3.0.48,<4", # ensure we have a new enough version for jupyter
5450
"ethereum-rlp>=0.1.3,<0.2",
5551
"pytest-regex>=0.2.0,<0.3",
5652
"eth-abi>=5.2.0",
@@ -67,7 +63,7 @@ Changelog = "https://eest.ethereum.org/main/CHANGELOG/"
6763
[project.optional-dependencies]
6864
test = ["pytest-cov>=4.1.0,<5"]
6965
lint = [
70-
"ruff==0.9.4",
66+
"ruff==0.11.8",
7167
"mypy>=1.15.0,<1.16",
7268
"types-requests>=2.31,<2.33",
7369
]
@@ -125,7 +121,7 @@ line-length = 99
125121
[tool.ruff.lint]
126122
select = ["E", "F", "B", "W", "I", "A", "N", "D", "C"]
127123
fixable = ["I", "B", "E", "F", "W", "D", "C"]
128-
ignore = ["D205", "D203", "D212", "D415", "C901", "A005"]
124+
ignore = ["D205", "D203", "D212", "D415", "C901", "A005", "C420"]
129125

130126

131127
[tool.mypy]

src/ethereum_test_base_types/composite_types.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@ def __setitem__(
135135
self,
136136
key: StorageKeyValueTypeConvertible | StorageKeyValueType,
137137
value: StorageKeyValueTypeConvertible | StorageKeyValueType,
138-
): # noqa: SC200
138+
):
139139
"""Set an item in the storage."""
140140
self.root[StorageKeyValueTypeAdapter.validate_python(key)] = (
141141
StorageKeyValueTypeAdapter.validate_python(value)

src/pytest_plugins/concurrency.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,23 +11,23 @@
1111
import os
1212
import shutil
1313
from pathlib import Path
14-
from tempfile import gettempdir as get_temp_dir # noqa: SC200
14+
from tempfile import gettempdir as get_temp_dir
1515
from typing import Generator
1616

1717
import pytest
1818
from filelock import FileLock
1919

2020

2121
@pytest.fixture(scope="session")
22-
def session_temp_folder_name(testrun_uid: str) -> str: # noqa: SC200
22+
def session_temp_folder_name(testrun_uid: str) -> str:
2323
"""
2424
Define the name of the temporary folder that will be shared among all the
2525
xdist workers to coordinate the tests.
2626
2727
"testrun_uid" is a fixture provided by the xdist plugin, and is unique for each test run,
2828
so it is used to create the unique folder name.
2929
"""
30-
return f"pytest-{testrun_uid}" # noqa: SC200
30+
return f"pytest-{testrun_uid}"
3131

3232

3333
@pytest.fixture(scope="session")

src/pytest_plugins/execute/rpc/hive.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -357,7 +357,7 @@ def base_hive_test(
357357

358358
test_pass = True
359359
test_details = "All tests have completed"
360-
if request.session.testsfailed > 0: # noqa: SC200
360+
if request.session.testsfailed > 0:
361361
test_pass = False
362362
test_details = "One or more tests have failed"
363363

src/pytest_plugins/execute/sender.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -194,6 +194,6 @@ def sender_key(
194194
eth_rpc.send_wait_transaction(refund_tx)
195195

196196

197-
def pytest_sessionstart(session): # noqa: SC200
197+
def pytest_sessionstart(session):
198198
"""Reset the sender info before the session starts."""
199199
session.config.stash[metadata_key]["Senders"] = {}

uv.lock

Lines changed: 29 additions & 25 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)