Skip to content
Merged
Show file tree
Hide file tree
Changes from 32 commits
Commits
Show all changes
36 commits
Select commit Hold shift + click to select a range
8ac4443
First draft of GEP 8.
hmgaudecker Jan 16, 2026
f9aa519
Improve readability.
hmgaudecker Jan 17, 2026
b0e0997
Merge branch 'main' into gep-08
hmgaudecker Jan 19, 2026
78fdb63
Review comments.
hmgaudecker Jan 19, 2026
65831c8
More clarifications.
hmgaudecker Jan 19, 2026
2eff43c
Incorporate discussion from TTSIM #5.
hmgaudecker Jan 20, 2026
29af58c
Review comments.
hmgaudecker Jan 20, 2026
7514a42
Merge branch 'main' into gep-08
hmgaudecker Jan 20, 2026
c40f229
Refactor piecewise polynomial YAML and code for GEP-08, twin to [TTSI…
hmgaudecker Jan 30, 2026
955fb8a
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Jan 30, 2026
87205d0
Merge branch 'main' into refactor-piecewise-polynomial
MImmesberger Mar 4, 2026
474511f
Remove only usage of rates_multiplier.
MImmesberger Mar 4, 2026
767bab6
rates -> coefficients
MImmesberger Mar 4, 2026
7263127
Access coefficients by name.
MImmesberger Mar 4, 2026
8efa5a9
Update GEPS; support reference, note, and update_previous.
MImmesberger Mar 5, 2026
73b3c33
Move all piecewise params to list-based spec.
MImmesberger Mar 5, 2026
1a82da9
Reference intervals when converting to param.
MImmesberger Mar 5, 2026
53f9fbf
Update to new piecewise format.
MImmesberger Mar 7, 2026
048c4e3
Update GEP 8.
MImmesberger Mar 7, 2026
85477ed
Update notebook.
MImmesberger Mar 7, 2026
6cde743
Pass SGBII anrechnungsfreies Einkommen as piecewise parameter directl…
MImmesberger Mar 7, 2026
a8cf9fd
Simplify parameter_einkommensteuertarif func.
MImmesberger Mar 7, 2026
247f51b
Update hooks and run them.
hmgaudecker Mar 11, 2026
35358a1
Fix for dags 0.5.0
hmgaudecker Mar 11, 2026
968d8a5
Fix remaining ty issues.
hmgaudecker Mar 11, 2026
058a909
Update boilerplate, ty not fixed yet.
hmgaudecker Mar 11, 2026
199bda4
Allow running ty and ty-jax.
hmgaudecker Mar 11, 2026
0bbe9af
Require Pandas 3, move to AGENTS.md and update boilerplate.
hmgaudecker Mar 14, 2026
e4a2628
Merge branch 'main' into refactor-piecewise-polynomial
MImmesberger Mar 18, 2026
095a47f
Harmonize infrastructure with TTSIM.
MImmesberger Mar 18, 2026
001f1b5
Use boilerplate branch of gettsim-personas.
MImmesberger Mar 18, 2026
8be76b6
Use https instead of ssh for submodule.
MImmesberger Mar 18, 2026
35ac774
Rebuild pixi lock
MImmesberger Mar 18, 2026
f7edb14
Another boilerplate round.
hmgaudecker Mar 19, 2026
8f9c8aa
Merge branch 'refactor-piecewise-polynomial' of github.com:ttsim-dev/…
hmgaudecker Mar 19, 2026
2c849bf
Use ttsim, gettsim-personas main.
hmgaudecker Mar 19, 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
1 change: 1 addition & 0 deletions .ai-instructions
Submodule .ai-instructions added at 59ccc0
45 changes: 24 additions & 21 deletions .github/workflows/main.yaml → .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,21 +12,6 @@ on:
branches:
- '*'
jobs:
run-ty:
name: Run ty
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v6
- uses: prefix-dev/setup-pixi@v0.9.4
with:
pixi-version: v0.63.2
cache: true
cache-write: ${{ github.event_name == 'push' && github.ref_name == 'main' }}
frozen: true
environments: py314
- name: Run ty
run: pixi run -e py314 ty
shell: bash -el {0}
run-tests:
name: Run tests for ${{ matrix.os }} on ${{ matrix.environment }}
runs-on: ${{ matrix.os }}
Expand Down Expand Up @@ -60,7 +45,7 @@ jobs:
- uses: actions/checkout@v6
- uses: prefix-dev/setup-pixi@v0.9.4
with:
pixi-version: v0.62.2
pixi-version: v0.66.0
cache: true
cache-write: ${{ github.event_name == 'push' && github.ref_name == 'main' }}
frozen: true
Expand All @@ -70,22 +55,40 @@ jobs:
matrix.environment == 'py311' ||
matrix.environment == 'py312' ||
matrix.environment == 'py313'
run: pixi run -e ${{ matrix.environment }} tests
run: pixi run --locked -e ${{ matrix.environment }} tests
shell: bash -el {0}
- name: Run tests on Linux (with NumPy backend and coverage)
if: runner.os == 'Linux' && matrix.environment == 'py314'
run: pixi run -e ${{ matrix.environment }} tests --cov --cov-report=xml
run: pixi run --locked -e ${{ matrix.environment }} tests-with-cov
shell: bash -el {0}
- name: Run tests on MacOS / Windows (with NumPy backend and without coverage)
if: runner.os != 'Linux'
run: pixi run -e ${{ matrix.environment }} tests
run: pixi run --locked -e ${{ matrix.environment }} tests
shell: bash -el {0}
- name: Run tests with JAX backend
if: matrix.environment == 'py314-jax'
run: pixi run -e ${{ matrix.environment }} tests-jax
run: pixi run --locked -e ${{ matrix.environment }} tests-jax
shell: bash -el {0}
- name: Upload coverage reports
if: runner.os == 'Linux' && matrix.environment == 'py314'
uses: codecov/codecov-action@v5
uses: codecov/codecov-action@v5.5.2
with:
token: ${{ secrets.CODECOV_TOKEN }}
run-ty:
name: Run ty
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v6
- uses: prefix-dev/setup-pixi@v0.9.4
with:
pixi-version: v0.66.0
cache: true
cache-write: ${{ github.event_name == 'push' && github.ref_name == 'main' }}
frozen: true
environments: type-checking type-checking-jax
- name: Run ty
run: pixi run --locked ty
shell: bash -el {0}
- name: Run ty-jax
run: pixi run --locked ty-jax
shell: bash -el {0}
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,6 @@ jobs:
--outdir dist/
- name: Publish distribution 📦 to PyPI
if: startsWith(github.ref, 'refs/tags')
uses: pypa/gh-action-pypi-publish@release/v1
uses: pypa/gh-action-pypi-publish@v1.13.0
with:
attestations: true
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ docs/_build/

# pixi
.pixi/
node_modules/

# Python
__pycache__/
Expand Down
4 changes: 4 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
[submodule ".ai-instructions"]
path = .ai-instructions
url = https://github.com/OpenSourceEconomics/ai-instructions.git
branch = make-submodule
36 changes: 18 additions & 18 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,30 +6,42 @@ repos:
- id: check-useless-excludes
# - id: identity # Prints all files passed to pre-commits. Debugging.
- repo: https://github.com/tox-dev/pyproject-fmt
rev: v2.12.1
rev: v2.18.1
hooks:
- id: pyproject-fmt
- repo: https://github.com/lyz-code/yamlfix
rev: 1.19.1
hooks:
- id: yamlfix
- repo: https://github.com/python-jsonschema/check-jsonschema
rev: 0.37.0
hooks:
- id: check-github-workflows
- id: check-jsonschema
name: Validate JSON/YAML files against schema
entry: check-jsonschema
language: python
files: ^src/gettsim/germany/.*\.(yaml|yml)$
args:
- --schemafile=docs/geps/params-schema.json
- repo: https://github.com/pre-commit/pre-commit-hooks
rev: v6.0.0
hooks:
- id: check-added-large-files
args:
- --maxkb=10000
- id: check-ast
- id: check-case-conflict
- id: check-docstring-first
- id: check-merge-conflict
- id: check-toml
- id: check-vcs-permalinks
- id: check-yaml
- id: check-toml
- id: debug-statements
- id: end-of-file-fixer
- id: fix-byte-order-marker
types:
- text
- id: forbid-submodules
- id: mixed-line-ending
args:
- --fix=lf
Expand All @@ -39,14 +51,12 @@ repos:
- --branch
- main
- id: trailing-whitespace
- id: check-ast
- id: check-docstring-first
- repo: https://github.com/adrienverge/yamllint.git
rev: v1.38.0
hooks:
- id: yamllint
- repo: https://github.com/astral-sh/ruff-pre-commit
rev: v0.15.0
rev: v0.15.6
hooks:
- id: ruff-check
args:
Expand All @@ -61,7 +71,7 @@ repos:
- pyi
- python
- repo: https://github.com/kynan/nbstripout
rev: 0.9.0
rev: 0.9.1
hooks:
- id: nbstripout
args:
Expand All @@ -78,7 +88,7 @@ repos:
args:
- --wrap
- '88'
files: (CLAUDE\.md|README\.md)
files: (AGENTS\.md|CLAUDE\.md|README\.md|CHANGES\.md|CODE_OF_CONDUCT\.md|modules/.*\.md|profiles/.*\.md)
- repo: https://github.com/executablebooks/mdformat
rev: 1.0.0
hooks:
Expand All @@ -90,15 +100,5 @@ repos:
- --wrap
- '88'
files: (docs/.|CHANGES.md|CODE_OF_CONDUCT.md)
- repo: https://github.com/python-jsonschema/check-jsonschema
rev: 0.36.1
hooks:
- id: check-jsonschema
name: Validate JSON/YAML files against schema
entry: check-jsonschema
language: python
files: ^src/gettsim/germany/.*\.(yaml|yml)$
args:
- --schemafile=docs/geps/params-schema.json
ci:
autoupdate_schedule: monthly
Loading
Loading