Skip to content

Commit 77e6393

Browse files
committed
revert: restore pyproject.toml to match main branch
Remove all changes to pyproject.toml to align with upstream main branch. This ensures CI compatibility and prevents configuration conflicts.
1 parent 4dc4876 commit 77e6393

File tree

2 files changed

+17
-8
lines changed

2 files changed

+17
-8
lines changed

pyproject.toml

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ docs = [
7878
"mkdocstrings-python>=1.0.0,<2",
7979
"pillow>=10.0.1,<11",
8080
"pyspelling>=2.8.2,<3",
81-
"lxml>=6.0.0,<7", # needs to be >= 6.0 for pypy
81+
"lxml>=6.0.0,<7", # needs to be >= 6.0 for pypy
8282
"setuptools==78.0.2",
8383
]
8484

@@ -127,10 +127,13 @@ ethereum_test_forks = ["forks/contracts/*.bin"]
127127
line-length = 99
128128

129129
[tool.ruff.lint]
130-
select = ["E", "F", "B", "W", "I", "A", "N", "D", "C"]
130+
select = ["E", "F", "B", "W", "I", "A", "N", "D", "C", "ARG001"]
131131
fixable = ["I", "B", "E", "F", "W", "D", "C"]
132132
ignore = ["D205", "D203", "D212", "D415", "C420", "C901"]
133133

134+
[tool.ruff.lint.per-file-ignores]
135+
"tests/*" = ["ARG001"] # TODO: ethereum/execution-spec-tests#2188
136+
134137
[tool.mypy]
135138
disable_error_code = ["import-untyped"]
136139
mypy_path = ["src", "$MYPY_CONFIG_FILE_DIR/stubs"]
@@ -157,9 +160,15 @@ ignore-words-list = "ingenuous"
157160
[tool.pytest.ini_options]
158161
console_output_style = "count"
159162
minversion = "7.0"
160-
python_files = ["test_*.py"]
161-
testpaths = ["src"]
163+
python_files = [
164+
"test_*.py"
165+
]
166+
testpaths = [
167+
"src"
168+
]
162169
addopts = [
170+
"-p", "pytester",
171+
"-p", "pytest_plugins.eels_resolver",
163172
"--ignore=src/pytest_plugins/consume/test_cache.py",
164173
"--ignore=src/pytest_plugins/consume/direct/",
165174
"--ignore=src/pytest_plugins/consume/simulators/",

tests/benchmark/bloatnet/test_multi_opcode.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -78,9 +78,9 @@ def test_bloatnet_balance_extcodesize(
7878
+ gas_costs.G_WARM_ACCOUNT_ACCESS # Warm EXTCODESIZE (100)
7979
+ gas_costs.G_BASE # POP code size (2)
8080
+ gas_costs.G_BASE # DUP1 before BALANCE (3)
81-
+ gas_costs.G_VERYLOW * 4 # PUSH1 operations (4 * 3)
81+
+ gas_costs.G_VERY_LOW * 4 # PUSH1 operations (4 * 3)
8282
+ gas_costs.G_LOW # MLOAD for salt (3)
83-
+ gas_costs.G_VERYLOW # ADD for increment (3)
83+
+ gas_costs.G_VERY_LOW # ADD for increment (3)
8484
+ gas_costs.G_LOW # MSTORE salt back (3)
8585
+ 10 # While loop overhead
8686
)
@@ -224,9 +224,9 @@ def test_bloatnet_balance_extcodecopy(
224224
+ gas_costs.G_WARM_ACCOUNT_ACCESS # Warm EXTCODECOPY base (100)
225225
+ gas_costs.G_COPY * 1 # Copy cost for 1 byte (3)
226226
+ gas_costs.G_BASE * 2 # DUP1 before BALANCE, DUP4 for address (6)
227-
+ gas_costs.G_VERYLOW * 8 # PUSH operations (8 * 3 = 24)
227+
+ gas_costs.G_VERY_LOW * 8 # PUSH operations (8 * 3 = 24)
228228
+ gas_costs.G_LOW * 2 # MLOAD for salt twice (6)
229-
+ gas_costs.G_VERYLOW * 2 # ADD operations (6)
229+
+ gas_costs.G_VERY_LOW * 2 # ADD operations (6)
230230
+ gas_costs.G_LOW # MSTORE salt back (3)
231231
+ gas_costs.G_BASE # POP after EXTCODECOPY (2)
232232
+ 10 # While loop overhead

0 commit comments

Comments
 (0)