Merge pull request #1525 from felix314159/tooling-bumps

chore(tooling): bump ruff and questionary and fix vsc ruff warning and remove non-existent rule SC200

Author: felix314159

.vscode/settings.json

@@ -54,6 +54,7 @@
     ],
     "ruff.enable": true,
     "ruff.lineLength": 99,
+    "ruff.logLevel": "error",
     "extensions.ignoreRecommendations": false,
     "search.exclude": {
       "tests/legacy": true

pyproject.toml

@@ -45,12 +45,7 @@ dependencies = [
     "types-pyyaml>=6.0.12.20240917,<7",
     "pytest-json-report>=1.5.0,<2",
     "typing-extensions>=4.12.2,<5",
-    # TODO: bump questionary to a newer release, when it becomes available.
-    # The current release questionary 2.0.1 requires `prompt_toolkit = ">=2.0,<=3.0.36"`.
-    # This conflicts with ipython; while not an EEST dependency, ipython is a very useful tool:
-    # https://eest.ethereum.org/main/dev/interactive_usage/
-    "questionary @ git+https://github.com/tmbo/questionary@ff22aeae1cd9c1c734f14329934e349bec7873bc",
-    "prompt_toolkit>=3.0.48,<4", # ensure we have a new enough version for ipython
+    "questionary>=2.1.0,<3",
     "ethereum-rlp>=0.1.3,<0.2",
     "pytest-regex>=0.2.0,<0.3",
     "eth-abi>=5.2.0",
@@ -67,7 +62,7 @@ Changelog = "https://eest.ethereum.org/main/CHANGELOG/"
 [project.optional-dependencies]
 test = ["pytest-cov>=4.1.0,<5"]
 lint = [
-    "ruff==0.9.4",
+    "ruff==0.11.8",
     "mypy>=1.15.0,<1.16",
     "types-requests>=2.31,<2.33",
 ]
@@ -126,7 +121,7 @@ line-length = 99
 [tool.ruff.lint]
 select = ["E", "F", "B", "W", "I", "A", "N", "D", "C"]
 fixable = ["I", "B", "E", "F", "W", "D", "C"]
-ignore = ["D205", "D203", "D212", "D415", "C901", "A005"]
+ignore = ["D205", "D203", "D212", "D415", "C901", "A005", "C420"]
 
 
 [tool.mypy]

src/ethereum_test_base_types/composite_types.py

@@ -135,7 +135,7 @@ def __setitem__(
         self,
         key: StorageKeyValueTypeConvertible | StorageKeyValueType,
         value: StorageKeyValueTypeConvertible | StorageKeyValueType,
-    ):  # noqa: SC200
+    ):
         """Set an item in the storage."""
         self.root[StorageKeyValueTypeAdapter.validate_python(key)] = (
             StorageKeyValueTypeAdapter.validate_python(value)

src/ethereum_test_specs/static_state/expect_section.py

@@ -83,7 +83,7 @@ def parse_networks(fork_with_operand: str) -> List[str]:
         return parsed_forks
 
     try:
-        print(all_forks_by_name)
+        # print(all_forks_by_name)
         idx = all_forks_by_name.index(fork)
         # ['Frontier', 'Homestead', 'Byzantium', 'Constantinople', 'ConstantinopleFix',
         #  'Istanbul', 'MuirGlacier', 'Berlin', 'London', 'ArrowGlacier', 'GrayGlacier',

src/pytest_plugins/concurrency.py

@@ -11,23 +11,23 @@
 import os
 import shutil
 from pathlib import Path
-from tempfile import gettempdir as get_temp_dir  # noqa: SC200
+from tempfile import gettempdir as get_temp_dir
 from typing import Generator
 
 import pytest
 from filelock import FileLock
 
 
 @pytest.fixture(scope="session")
-def session_temp_folder_name(testrun_uid: str) -> str:  # noqa: SC200
+def session_temp_folder_name(testrun_uid: str) -> str:
     """
     Define the name of the temporary folder that will be shared among all the
     xdist workers to coordinate the tests.
 
     "testrun_uid" is a fixture provided by the xdist plugin, and is unique for each test run,
     so it is used to create the unique folder name.
     """
-    return f"pytest-{testrun_uid}"  # noqa: SC200
+    return f"pytest-{testrun_uid}"
 
 
 @pytest.fixture(scope="session")

src/pytest_plugins/execute/rpc/hive.py

@@ -357,7 +357,7 @@ def base_hive_test(
 
     test_pass = True
     test_details = "All tests have completed"
-    if request.session.testsfailed > 0:  # noqa: SC200
+    if request.session.testsfailed > 0:
         test_pass = False
         test_details = "One or more tests have failed"
 

src/pytest_plugins/execute/sender.py

@@ -194,6 +194,6 @@ def sender_key(
     eth_rpc.send_wait_transaction(refund_tx)
 
 
-def pytest_sessionstart(session):  # noqa: SC200
+def pytest_sessionstart(session):
     """Reset the sender info before the session starts."""
     session.config.stash[metadata_key]["Senders"] = {}