Skip to content
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.

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

Aides logement #2423

Open
wants to merge 37 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
37 commits
Select commit Hold shift + click to select a range
826e32a
fix label et order
b-michaud Jan 27, 2025
16406df
modifie les arrondis des aides logement crds
b-michaud Jan 27, 2025
7b47f1c
fix lint et import floor
b-michaud Jan 27, 2025
aaf2828
fix floor
b-michaud Jan 27, 2025
b371b13
modifie nom abattement parametre forfaitaire
b-michaud Feb 3, 2025
b74e6a7
revert les changements d'arrondis aides logement
b-michaud Feb 3, 2025
82ab942
retire import numpy floor
b-michaud Feb 3, 2025
36aff6d
modifie organisation du dossier al_loc2
b-michaud Feb 3, 2025
6296414
fix organisation al_loc2
b-michaud Feb 3, 2025
7092194
Supprime le dossier personne_isolee_ou_menage_seul et reorganise
b-michaud Feb 3, 2025
b956cba
Ajoute les taux de TF pour 5 et 6 enfants et cree un dossier metropole
b-michaud Feb 3, 2025
61473b8
fix reorganisation des taux tf dans la formule
b-michaud Feb 3, 2025
06d07da
cree un dossier cas_general pour le R0
b-michaud Feb 6, 2025
343ed89
fix modif orga dossier r0
b-michaud Feb 6, 2025
9cec8cb
modifie la valeur de E pour le secteur foyer (par enfant en plus)
b-michaud Feb 27, 2025
8c66f34
déplace les paramètres avant 2001 dans un dossier spécifique
b-michaud Mar 4, 2025
e9bf711
remplace le dossier loc_1 par avant_2001
b-michaud Mar 4, 2025
7a9bdf3
déplace les plafonds de loyer et coef chambre et coloc (secteur locatif)
b-michaud Mar 4, 2025
f53a39d
noms de dossiers en minuscules
b-michaud Mar 4, 2025
2fc1cf0
ajoute dossier spécifique par zone plafonds L secteur locatif
b-michaud Mar 4, 2025
17f23f2
Bump Ubuntu et Python en CI
b-michaud Mar 4, 2025
0acbce4
deplace le dossier des forfaits de charges (secteur locatif)
b-michaud Mar 4, 2025
82b21c3
lint fix
b-michaud Mar 4, 2025
73cfa39
fix lint
b-michaud Mar 4, 2025
75743a9
deplace les parametres de participation minimale p0 (secteur locatif)
b-michaud Mar 5, 2025
edc64d5
deplace les parametres tf et tl (secteur locatif)
b-michaud Mar 5, 2025
f413efb
fix paths formula tf
b-michaud Mar 5, 2025
056002b
deplace les parametres de r0 (secteur locatif)
b-michaud Mar 5, 2025
7dd3113
deplace les coefficients de degressivite et suppression (secteur loca…
b-michaud Mar 5, 2025
2fb5cdc
deplace et change le nom de la minoration forfaitaire (secteur locatif)
b-michaud Mar 5, 2025
c746d3a
supprime ancien dossier loc2
b-michaud Mar 5, 2025
30791c2
deplace les seuils minimums de versement (secteur locatif)
b-michaud Mar 5, 2025
6fcf64b
deplace les seuils minimum de versement (secteur locatif) et modifie …
b-michaud Mar 5, 2025
3933a34
deplace les plafonds de loyer 2001
b-michaud Mar 6, 2025
3146656
ajoute un dossier spécifique parametres de la formule (secteur locatif)
b-michaud Mar 6, 2025
7a65b08
ajoute dossier secteur foyer avec K, E et E0 (en cours)
b-michaud Mar 6, 2025
5cd038b
fix lint
b-michaud Mar 6, 2025
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
36 changes: 18 additions & 18 deletions .github/workflows/workflow.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,16 +6,16 @@ on:
types: [opened, reopened]

env:
DEFAULT_PYTHON_VERSION: '3.10.6'
DEFAULT_PYTHON_VERSION: '3.10.11'

jobs:
build:
runs-on: ${{ matrix.os }}
strategy:
fail-fast: true
matrix:
os: ["ubuntu-20.04"] # On peut ajouter "macos-latest" si besoin
python-version: ["3.9.9", "3.10.6"]
os: ["ubuntu-24.04"] # On peut ajouter "macos-latest" si besoin
python-version: ["3.9.12", "3.10.11"]
openfisca-dependencies: [minimal, maximal]
steps:
- name: Checkout
Expand Down Expand Up @@ -84,7 +84,7 @@ jobs:


lint-files:
runs-on: ubuntu-20.04
runs-on: ubuntu-24.04
strategy:
matrix:
dependencies-version: [maximal]
Expand All @@ -102,7 +102,7 @@ jobs:
uses: actions/cache@v4
with:
path: ${{ env.pythonLocation }}
key: build-${{ env.pythonLocation }}-${{ hashFiles('pyproject.toml') }}-${{ github.sha }}-ubuntu-20.04-${{ matrix.dependencies-version }}
key: build-${{ env.pythonLocation }}-${{ hashFiles('pyproject.toml') }}-${{ github.sha }}-ubuntu-24.04-${{ matrix.dependencies-version }}
- run: make check-syntax-errors
- run: make check-style
- name: Lint Python files
Expand All @@ -116,8 +116,8 @@ jobs:
strategy:
fail-fast: true
matrix:
os: [ "ubuntu-20.04" ] # On peut ajouter "macos-latest" si besoin
python-version: ["3.9.9", "3.10.6"]
os: [ "ubuntu-24.04" ] # On peut ajouter "macos-latest" si besoin
python-version: ["3.9.12", "3.10.11"]
openfisca-dependencies: [minimal, maximal]
steps:
- uses: actions/checkout@v4
Expand All @@ -134,10 +134,10 @@ jobs:
- run: |
shopt -s globstar
openfisca test --country-package openfisca_france tests/**/*.py
if: matrix.openfisca-dependencies != 'minimal' || matrix.python-version != '3.9.9'
if: matrix.openfisca-dependencies != 'minimal' || matrix.python-version != '3.9.12'

test-path-length:
runs-on: ubuntu-20.04
runs-on: ubuntu-24.04
steps:
- uses: actions/checkout@v4
- name: Set up Python
Expand All @@ -148,7 +148,7 @@ jobs:
run: make check-path-length

test-yaml:
runs-on: ubuntu-20.04
runs-on: ubuntu-24.04
needs: [ build ]
strategy:
fail-fast: false
Expand All @@ -170,7 +170,7 @@ jobs:
uses: actions/cache@v4
with:
path: ${{ env.pythonLocation }}
key: build-${{ env.pythonLocation }}-${{ hashFiles('pyproject.toml') }}-${{ github.sha }}-ubuntu-20.04-${{ matrix.openfisca-dependencies }}
key: build-${{ env.pythonLocation }}-${{ hashFiles('pyproject.toml') }}-${{ github.sha }}-ubuntu-24.04-${{ matrix.openfisca-dependencies }}
- name: Split YAML tests
id: yaml-test
env:
Expand All @@ -183,7 +183,7 @@ jobs:
openfisca test --country-package openfisca_france ${TEST_FILES_SUBLIST}

test-api:
runs-on: ubuntu-20.04
runs-on: ubuntu-24.04
strategy:
matrix:
dependencies-version: [maximal]
Expand All @@ -199,7 +199,7 @@ jobs:
uses: actions/cache@v4
with:
path: ${{ env.pythonLocation }}
key: build-${{ env.pythonLocation }}-${{ hashFiles('pyproject.toml') }}-${{ github.sha }}-ubuntu-20.04-${{ matrix.dependencies-version }}
key: build-${{ env.pythonLocation }}-${{ hashFiles('pyproject.toml') }}-${{ github.sha }}-ubuntu-24.04-${{ matrix.dependencies-version }}
- name: Test the Web API
run: "${GITHUB_WORKSPACE}/.github/test-api.sh"

Expand Down Expand Up @@ -234,7 +234,7 @@ jobs:
run: openfisca test tests/formulas/irpp.yaml

check-version-and-changelog:
runs-on: ubuntu-20.04
runs-on: ubuntu-24.04
needs: [ lint-files, test-python, test-yaml, test-api ] # Last job to run
steps:
- uses: actions/checkout@v4
Expand All @@ -251,7 +251,7 @@ jobs:
# We build a separate job to substitute the halt option.
# The `deploy` job is dependent on the output of the `check-for-functional-changes` job.
check-for-functional-changes:
runs-on: ubuntu-20.04
runs-on: ubuntu-24.04
if: github.ref == 'refs/heads/master' # Only triggered for the `master` branch
needs: [ check-version-and-changelog ]
outputs:
Expand All @@ -268,7 +268,7 @@ jobs:
run: if "${GITHUB_WORKSPACE}/.github/has-functional-changes.sh" ; then echo "::set-output name=status::success" ; fi

deploy:
runs-on: ubuntu-20.04
runs-on: ubuntu-24.04
strategy:
matrix:
dependencies-version: [maximal]
Expand All @@ -290,13 +290,13 @@ jobs:
uses: actions/cache@v4
with:
path: ${{ env.pythonLocation }}
key: build-${{ env.pythonLocation }}-${{ hashFiles('pyproject.toml') }}-${{ github.sha }}-ubuntu-20.04-${{ matrix.dependencies-version }}
key: build-${{ env.pythonLocation }}-${{ hashFiles('pyproject.toml') }}-${{ github.sha }}-ubuntu-24.04-${{ matrix.dependencies-version }}
- name: Cache release
id: restore-release
uses: actions/cache@v4
with:
path: dist
key: release-${{ env.pythonLocation }}-${{ hashFiles('pyproject.toml') }}-${{ github.sha }}-ubuntu-20.04-${{ matrix.dependencies-version }}
key: release-${{ env.pythonLocation }}-${{ hashFiles('pyproject.toml') }}-${{ github.sha }}-ubuntu-24.04-${{ matrix.dependencies-version }}
- name: Upload a Python package to PyPi
run: twine upload dist/* --username $PYPI_USERNAME --password $PYPI_TOKEN
- name: Publish a git tag
Expand Down
Loading
Loading