Further cut down on ruff exceptions.

Author: hmgaudecker

conftest.py

@@ -24,20 +24,17 @@ def pytest_addoption(parser):
 
 @pytest.fixture
 def backend(request) -> Literal["numpy", "jax"]:
-    backend = request.config.getoption("--backend")
-    return backend
+    return request.config.getoption("--backend")
 
 
 @pytest.fixture
 def xnp(request) -> ModuleType:
-    backend = request.config.getoption("--backend")
-    return ttsim_xnp(backend)
+    return ttsim_xnp(request.config.getoption("--backend"))
 
 
 @pytest.fixture
 def dnp(request) -> ModuleType:
-    backend = request.config.getoption("--backend")
-    return ttsim_dnp(backend)
+    return ttsim_dnp(request.config.getoption("--backend"))
 
 
 @pytest.fixture(autouse=True)

docs/conf.py

@@ -14,7 +14,7 @@
 # -- Project information -----------------------------------------------------
 
 project = "GETTSIM"
-copyright = f"2019-{datetime.today().year}, GETTSIM team"  # noqa: A001
+copyright = f"2019-{datetime.today().year}, GETTSIM team"  # noqa: A001, DTZ002
 author = "GETTSIM team"
 release = "0.7.0"
 version = ".".join(release.split(".")[:2])
@@ -122,7 +122,7 @@
     "**": [
         "relations.html",  # needs 'show_related': True theme option to display
         "searchbox.html",
-    ]
+    ],
 }
 
 # Napoleon settings

pixi.lock

@@ -197,48 +197,28 @@ unsafe-fixes = false
 [tool.ruff.lint]
 select = ["ALL"]
 extend-ignore = [
-    "ICN001", # numpy should be np, but different convention here.
-    # Docstrings
-    "D103", # missing docstring in public function
-    "D107",
-    "D203",
-    "D212",
-    "D213",
-    "D402",
-    "D413",
-    "D415",
-    "D416",
-    "D417",
+    "COM812", # Avoid conflicts with ruff-format
+    "EM101", # Exception must not use a string literal
+    "EM102", # Exception must not use an f-string literal
     "F722", # https://docs.kidger.site/jaxtyping/faq/#flake8-or-ruff-are-throwing-an-error
     "FBT001", # Boolean-typed positional argument in function definition
+    "FIX002", # Line contains TODO -- Use stuff from TD area.
+    "ICN001", # numpy should be np, but different convention here.
     "ISC001", # Avoid conflicts with ruff-format
     "N999", # Allow non-ASCII characters in file names.
     "PLC2401", # Allow non-ASCII characters in variable names.
     "PLC2403", # Allow non-ASCII function names for imports.
     "PLR0913", # Allow too many arguments in function definitions.
-    "FIX002", # Line contains TODO -- Use stuff from TD area.
-    "TRY003", # Avoid specifying long messages outside the exception class
     "PLR5501", # elif not supported by vectorization converter for Jax
-    "EM101", # Exception must not use a string literal
-    "EM102", # Exception must not use an f-string literal
-    # Others.
-
-    "E731", # do not assign a lambda expression, use a def
-    "RET", # unnecessary elif or else statements after return, raise, continue, ...
-    "S324", # Probable use of insecure hash function.
-    "COM812", # trailing comma missing, but black takes care of that
-    "PT007", # wrong type in parametrize, gave false positives
-    "DTZ001", # use of `datetime.datetime()` without `tzinfo` argument is not allowed
-    "DTZ002", # use of `datetime.datetime.today()` is not allowed
-    "PT012", # `pytest.raises()` block should contain a single simple statement
-
+    "TRY003", # Avoid specifying long messages outside the exception class
 
     # Ignored during transition phase
     # ======================================
     "D", # docstrings
-    "PLR2004", # Magic values used in comparison
     "INP001", # implicit namespace packages without init.
+    "PLR2004", # Magic values used in comparison
     "PT006", # Allows only lists of tuples in parametrize, even if single argument
+    "PT007", # wrong type in parametrize
     "S101", # use of asserts outside of tests
 
 ]
@@ -248,17 +228,17 @@ exclude = []
 "conftest.py" = ["ANN"]
 "docs/**/*.ipynb" = ["T201"]
 # Mostly things vectorization can't handle
-"src/_gettsim/*" = ["E501", "PLR1714", "PLR1716", "E721", "SIM108"]
+"src/_gettsim/*" = ["E501", "PLR1714", "PLR1716", "E721", "SIM108", "RET"]
 # All tests return None and use asserts
 "src/_gettsim_tests/**/*.py" = ["ANN", "S101"]
 "src/ttsim/interface_dag_elements/specialized_environment.py" = ["E501"]
 "src/ttsim/interface_dag_elements/fail_if.py" = ["E501"]
 "src/ttsim/interface_dag_elements/typing.py" = ["PGH", "PLR", "SIM114"]
 # Mostly things vectorization can't handle
-"tests/ttsim/mettsim/**/*.py" = ["PLR1714", "PLR1716", "E721", "SIM108"]
+"tests/ttsim/mettsim/**/*.py" = ["PLR1714", "PLR1716", "E721", "SIM108", "RET"]
+"tests/ttsim/tt_dag_elements/test_vectorization.py" = ["PLR1714", "PLR1716", "E721", "SIM108", "RET"]
 # All tests return None and use asserts
 "tests/ttsim/**/*.py" = ["ANN", "S101"]
-"tests/ttsim/tt_dag_elements/test_vectorization.py" = ["PLR1714", "PLR1716", "E721", "SIM108"]
 "tests/ttsim/test_failures.py" = ["E501"]
 # TODO: remove once ported nicely
 "src/ttsim/stale_code_storage.py" = ["ALL"]
@@ -298,20 +278,12 @@ disallow_untyped_defs = false
 ignore_errors = true
 
 [[tool.mypy.overrides]]
-module = [
-    "tests.*",
-]
-disable_error_code = [
-    "no-untyped-def",  # All tests return None, don't clutter source code.
-]
+module = ["tests.*",]
+disable_error_code = ["no-untyped-def"]  # All tests return None, don't clutter source code.
 
 [[tool.mypy.overrides]]
-module = [
-    "src._gettsim_tests.*",
-]
-disable_error_code = [
-    "no-untyped-def",  # All tests return None, don't clutter source code.
-]
+module = ["src._gettsim_tests.*",]
+disable_error_code = ["no-untyped-def"]  # All tests return None, don't clutter source code.
 
 [tool.check-manifest]
 ignore = ["src/_gettsim/_version.py"]

pyproject.toml

@@ -75,7 +75,9 @@ def vermögensfreibetrag_in_karenzzeit_bg(
 
 
 @policy_function(
-    start_date="2005-01-01", end_date="2022-12-31", leaf_name="vermögensfreibetrag_bg"
+    start_date="2005-01-01",
+    end_date="2022-12-31",
+    leaf_name="vermögensfreibetrag_bg",
 )
 def vermögensfreibetrag_bg_bis_2022(
     grundfreibetrag_vermögen_bg: float,

src/_gettsim/arbeitslosengeld_2/freibeträge_vermögen.py

@@ -14,13 +14,17 @@
 
 @agg_by_p_id_function(start_date="2005-01-01", agg_type=AggType.SUM)
 def kindergeldübertrag_m(
-    differenz_kindergeld_kindbedarf_m: float, kindergeld__p_id_empfänger: int, p_id: int
+    differenz_kindergeld_kindbedarf_m: float,
+    kindergeld__p_id_empfänger: int,
+    p_id: int,
 ) -> float:
     pass
 
 
 @policy_function(
-    start_date="2005-01-01", end_date="2022-12-31", leaf_name="kindergeld_pro_kind_m"
+    start_date="2005-01-01",
+    end_date="2022-12-31",
+    leaf_name="kindergeld_pro_kind_m",
 )
 def _mean_kindergeld_per_child_gestaffelt_m(
     kindergeld__betrag_m: float,

src/_gettsim/arbeitslosengeld_2/kindergeldübertrag.py

@@ -76,7 +76,9 @@ def mehrbedarf_alleinerziehend_m(
 
 
 @policy_function(
-    start_date="2005-01-01", end_date="2010-12-31", leaf_name="kindersatz_m"
+    start_date="2005-01-01",
+    end_date="2010-12-31",
+    leaf_name="kindersatz_m",
 )
 def kindersatz_m_anteilsbasiert(
     alter: int,

src/_gettsim/arbeitslosengeld_2/regelbedarf.py

@@ -7,7 +7,8 @@
 
 @policy_function(end_date="2014-12-31", leaf_name="alleinerziehend_betrag_y")
 def alleinerziehend_betrag_y_pauschal(
-    einkommensteuer__alleinerziehend_sn: bool, alleinerziehendenfreibetrag_basis: float
+    einkommensteuer__alleinerziehend_sn: bool,
+    alleinerziehendenfreibetrag_basis: float,
 ) -> float:
     """Calculate tax deduction allowance for single parents until 2014"""
     if einkommensteuer__alleinerziehend_sn:

src/_gettsim/einkommensteuer/abzüge/alleinerziehend.py

@@ -149,10 +149,12 @@ def get_consecutive_int_1d_lookup_table_with_filled_up_tails(
         "Dictionary keys must be consecutive integers."
     )
     consecutive_dict_start = dict.fromkeys(
-        range(left_tail_key, min_key_in_spec), raw[min_key_in_spec]
+        range(left_tail_key, min_key_in_spec),
+        raw[min_key_in_spec],
     )
     consecutive_dict_end = dict.fromkeys(
-        range(max_key_in_spec + 1, right_tail_key + 1), raw[max_key_in_spec]
+        range(max_key_in_spec + 1, right_tail_key + 1),
+        raw[max_key_in_spec],
     )
     return get_consecutive_int_1d_lookup_table_param_value(
         raw={**consecutive_dict_start, **raw, **consecutive_dict_end},

src/_gettsim/einkommensteuer/abzüge/alter.py

@@ -12,7 +12,9 @@
 
 @agg_by_p_id_function(agg_type=AggType.SUM)
 def kinderbetreuungskosten_elternteil_m(
-    kinderbetreuungskosten_m: float, p_id_kinderbetreuungskostenträger: int, p_id: int
+    kinderbetreuungskosten_m: float,
+    p_id_kinderbetreuungskostenträger: int,
+    p_id: int,
 ) -> float:
     pass