Skip to content

Remove dead SIM108 ignore for middle_earth; showcase ternaries in mettsim #129

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
MImmesberger merged 5 commits into from
Jun 7, 2026
Merged

Remove dead SIM108 ignore for middle_earth; showcase ternaries in mettsim #129

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
57e0061
Remove dead SIM108 ignore for middle_earth
MImmesberger Jun 6, 2026
efc29b5
Convert simple return-style if/else in mettsim to ternaries
MImmesberger Jun 6, 2026
19180a4
Keep statement-style if/else where the ternary would not fit on one line
MImmesberger Jun 6, 2026
93660e3
Narrow mettsim RET ignore to RET505
MImmesberger Jun 6, 2026
e3a21de
Remove dead E721/PLR1714/PLR1716 ignores; narrow RET to RET504/RET505
MImmesberger Jun 7, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 4 additions & 10 deletions pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -209,12 +209,8 @@ per-file-ignores."src/ttsim/typing.py" = [
"PYI051", # Redundant literal union
]
per-file-ignores."src_mettsim/mettsim/middle_earth/**/*.py" = [
"E721", # Type comparison using ==
"PLR1714", # Repeated equality comparison
"PLR1716", # Boolean chained comparison
"PLR2004", # Magic value comparison
"RET", # Unnecessary return logic
"SIM108", # Use ternary operator
"RET505", # Vectorizer requires both if/else branches; it rejects the early-return form
]
per-file-ignores."src_mettsim/tests_middle_earth/*.py" = [
"ANN", # Missing type annotations
Expand All @@ -236,11 +232,9 @@ per-file-ignores."tests/interface_dag_elements/test_failures.py" = [
"E501", # Line too long
]
per-file-ignores."tests/tt/test_vectorization.py" = [
"E721", # Type comparison using ==
"PLR1714", # Repeated equality comparison
"PLR1716", # Boolean chained comparison
"RET", # Unnecessary return logic
"SIM108", # Use ternary operator
"RET504", # `out = ...; return out` fixtures mirror the vectorizer's output
"RET505", # Vectorizer requires both if/else branches; it rejects the early-return form
"SIM108", # Statement-style if/else blocks are intentional fixtures for the vectorizer
]
pydocstyle.convention = "google"

Expand Down
5 changes: 1 addition & 4 deletions src_mettsim/mettsim/middle_earth/payroll_tax/child_tax_credit/child_tax_credit.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,10 +29,7 @@ def claim_of_child_y(
child_eligible: bool,
schedule: dict[str, float],
) -> float:
if child_eligible:
return schedule["child_amount_y"]
else:
return 0
return schedule["child_amount_y"] if child_eligible else 0


@policy_function()
Expand Down
5 changes: 1 addition & 4 deletions src_mettsim/mettsim/middle_earth/wealth_tax/wealth_tax.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,7 @@ def amount_y(
tax_rate: float,
exempt_from_wealth_tax: bool,
) -> float:
if exempt_from_wealth_tax:
return 0.0
else:
return wealth * tax_rate
return 0.0 if exempt_from_wealth_tax else wealth * tax_rate


@policy_function()
Expand Down
Loading