Skip to content

Commit

Permalink
[pre-commit.ci] auto fixes from pre-commit.com hooks
Browse files Browse the repository at this point in the history
for more information, see https://pre-commit.ci
  • Loading branch information
pre-commit-ci[bot] committed Jan 7, 2025
1 parent 0a10e8f commit 6fb0834
Show file tree
Hide file tree
Showing 4 changed files with 32 additions and 51 deletions.
71 changes: 26 additions & 45 deletions CHANGES.md
Original file line number Diff line number Diff line change
Expand Up @@ -155,10 +155,8 @@ releases are available on [Anaconda.org](https://anaconda.org/conda-forge/gettsi
- {gh}`470` Execute notebooks as part of the documentation build on readthedocs
({ghuser}`hmgaudecker`).

- {gh}`440` Implement Bürgergeld, which reforms
<span
class="title-ref">arbeitsl_geld_2</span> from 01/01/2023
({ghuser}`LauraGergeleit`).
- {gh}`440` Implement Bürgergeld, which reforms <span
class="title-ref">arbeitsl_geld_2</span> from 01/01/2023 ({ghuser}`LauraGergeleit`).

- {gh}`399` Use dags package to create the DAG ({ghuser}`ChristianZimpelmann`).

Expand All @@ -179,8 +177,7 @@ releases are available on [Anaconda.org](https://anaconda.org/conda-forge/gettsi
cases in <span class="title-ref">test_interface.py</span> ({ghuser}`LauraGergeleit`,
{ghuser}`ChristianZimpelmann`).

- {gh}`403` Replace <span class="title-ref">Bokeh</span> with
<span
- {gh}`403` Replace <span class="title-ref">Bokeh</span> with <span
class="title-ref">plotly</span> for visualization.
({ghuser}`effieHAN`,{ghuser}`sofyaakimova`).

Expand All @@ -193,8 +190,7 @@ releases are available on [Anaconda.org](https://anaconda.org/conda-forge/gettsi
- {gh}`385` Make `altersentlastungsbetrag` dependent on age not on current date
({ghuser}`m-pannier`, {ghuser}`lillyfischer`).

- {gh}`392` Fix relative tolerance which was set too high for some tests. Rename
<span
- {gh}`392` Fix relative tolerance which was set too high for some tests. Rename <span
class="title-ref">vorsorge</span> to <span class="title-ref">vorsorgeaufw</span>
({ghuser}`LauraGergeleit`, {ghuser}`ChristianZimpelmann`).

Expand All @@ -219,18 +215,13 @@ releases are available on [Anaconda.org](https://anaconda.org/conda-forge/gettsi
when calling <span class="title-ref">set_up_policy_environment</span>
({ghuser}`ChristianZimpelmann`).

- {gh}`275` Implement Grundrente. Implement Grundsicherung im Alter. Remove
<span
class="title-ref">ges_rente_m</span> as input. Rename
<span
class="title-ref">gettsim.renten_anspr</span> to
<span
class="title-ref">gettsim.transfers.rente</span>. Rename
<span
class="title-ref">gettsim.social_insurance</span> to
<span
class="title-ref">gettsim.social_insurance_contributions</span>
({ghuser}`davpahl`, {ghuser}`ChristianZimpelmann`).
- {gh}`275` Implement Grundrente. Implement Grundsicherung im Alter. Remove <span
class="title-ref">ges_rente_m</span> as input. Rename <span
class="title-ref">gettsim.renten_anspr</span> to <span
class="title-ref">gettsim.transfers.rente</span>. Rename <span
class="title-ref">gettsim.social_insurance</span> to <span
class="title-ref">gettsim.social_insurance_contributions</span> ({ghuser}`davpahl`,
{ghuser}`ChristianZimpelmann`).

- {gh}`307` Allow to specify order up to which ancestors and descendants are shown when
plotting a dag ({ghuser}`ChristianZimpelmann`).
Expand All @@ -251,31 +242,25 @@ releases are available on [Anaconda.org](https://anaconda.org/conda-forge/gettsi
adjustments for DAG backend ({ghuser}`hmgaudecker`).

- {gh}`314` Enforce character limits from GEP-01 for all function names and input
variables. Make variable names more precise (e.g.,
<span
class="title-ref">ges\_</span> in front of all social insurance parameters that
have private counterparts, <span class="title-ref">eink_st</span> everywhere the
income tax is meant). Make variables consistent (e.g.
<span
class="title-ref">kinderfreibetrag</span> had different abbreviations, now
<span
variables. Make variable names more precise (e.g., <span
class="title-ref">ges\_</span> in front of all social insurance parameters that have
private counterparts, <span class="title-ref">eink_st</span> everywhere the income tax
is meant). Make variables consistent (e.g. <span
class="title-ref">kinderfreibetrag</span> had different abbreviations, now <span
class="title-ref">kinderfreib</span> everywhere). ({ghuser}`hmgaudecker`,
{ghuser}`ChristianZimpelmann`)

- {gh}`343` New argument for \`compute_taxes_and_transfers\`:
<span
class="title-ref">rounding</span>. If set to False, rounding of outputs is
disabled. Add rounding for <span class="title-ref">eink_st_tu</span>. Rounding for
other functions will be introduced in future PRs. ({ghuser}`ChristianZimpelmann`).
- {gh}`343` New argument for \`compute_taxes_and_transfers\`: <span
class="title-ref">rounding</span>. If set to False, rounding of outputs is disabled.
Add rounding for <span class="title-ref">eink_st_tu</span>. Rounding for other
functions will be introduced in future PRs. ({ghuser}`ChristianZimpelmann`).

- {gh}`349` Create parameters for several hard coded numbers in code.
({ghuser}`LauraGergeleit`).

- {gh}`355` Major renaming based on GEP 01, e.g.: correct use of `_m`-suffix;
`alleinerziehend` becomes `alleinerz`; rename
<span
class="title-ref">ges_rentenv.yaml</span> to
<span
`alleinerziehend` becomes `alleinerz`; rename <span
class="title-ref">ges_rentenv.yaml</span> to <span
class="title-ref">ges_rente.yaml</span> ({ghuser}`hmgaudecker`,
{ghuser}`ChristianZimpelmann`)

Expand Down Expand Up @@ -315,14 +300,10 @@ releases are available on [Anaconda.org](https://anaconda.org/conda-forge/gettsi
## v0.4.0 — 2020-11-11

- {gh}`241` Renaming of directories: <span class="title-ref">gettsim.benefits</span> to
<span class="title-ref">gettsim.transfers</span>;
<span
class="title-ref">gettsim.soz_vers</span> to
<span
class="title-ref">gettsim.social_insurance</span>;
<span
class="title-ref">gettsim.data</span> to
<span
<span class="title-ref">gettsim.transfers</span>; <span
class="title-ref">gettsim.soz_vers</span> to <span
class="title-ref">gettsim.social_insurance</span>; <span
class="title-ref">gettsim.data</span> to <span
class="title-ref">gettsim.parameters</span> ({ghuser}`MaxBlesch`,
{ghuser}`ChristianZimpelmann`).

Expand Down
2 changes: 1 addition & 1 deletion docs/geps/gep-00.md
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,7 @@ post a message with a first line like:

> \## Proposal to accept GEP #\<number>: \<title>
to the Zulip stream GEPs / GEP \[XY\].
to the Zulip stream GEPs / GEP [XY].

In the body of your message, you should:

Expand Down
8 changes: 4 additions & 4 deletions docs/geps/gep-03.md
Original file line number Diff line number Diff line change
Expand Up @@ -164,7 +164,7 @@ These work differently and they are

The remainder of this section explains this element in much more detail.

### The `reference` key of \[YYYY-MM-DD\]
### The `reference` key of [YYYY-MM-DD]

- cites the law (Gesetz "G. v."), decree (Verordnung "V. v.") or proclamation
(Bekanntmachung "B. v.") that changes the law
Expand All @@ -188,14 +188,14 @@ eink_anr_frei:
reference: Artikel 1. G. v. 24.12.2003 BGBl. I S. 2954.
```

### The `note` key of \[YYYY-MM-DD\]
### The `note` key of [YYYY-MM-DD]

This optional key may contain a free-form note holding any information that may be
relevant for the interpretation of the parameter, the implementer, user, ...

(gep-3-deviation_from)=

### The `deviation_from` key of \[YYYY-MM-DD\]
### The `deviation_from` key of [YYYY-MM-DD]

Often laws change only part of a parameter. To avoid error-prone code duplication, we
allow for such cases via the `deviation_from` key. This is the reason why lists are to
Expand Down Expand Up @@ -226,7 +226,7 @@ eink_anr_frei:
upper_threshold: 1000
```

### The values of \[YYYY-MM-DD\]
### The values of [YYYY-MM-DD]

The general idea is to make the replication of the laws very obvious. If the law
includes a table, we will have a dictionary with keys 0, 1, 2, .... If the law includes
Expand Down
2 changes: 1 addition & 1 deletion src/_gettsim_tests/test_vectorization.py
Original file line number Diff line number Diff line change
Expand Up @@ -210,7 +210,7 @@ def f14(x):
b = x > 0
c = x != 0
d = True
return a and b and c or d
return (a and b and c) or d


def f14_exp(x):
Expand Down

0 comments on commit 6fb0834

Please sign in to comment.