From 53aceb895b6f6baf099b48fc0db3d7538409858b Mon Sep 17 00:00:00 2001 From: Thomas Guillet <thomas@palya.fr> Date: Fri, 15 Nov 2024 17:59:51 +0100 Subject: [PATCH] =?UTF-8?q?V0=20=C3=A0=20z=C3=A9ro?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 2 +- first-time-setup.sh | 4 +- .../__init__.py | 4 +- .../entities.py | 0 .../parameters/benefits/basic_income.yaml | 0 .../benefits/housing_allowance.yaml | 2 - .../parameters/benefits/index.yaml | 0 .../benefits/parenting_allowance/amount.yaml | 0 .../parenting_allowance/income_threshold.yaml | 0 .../parameters/general/age_of_majority.yaml | 0 .../parameters/general/age_of_retirement.yaml | 0 .../parameters/taxes/housing_tax.yaml | 0 .../parameters/taxes/income_tax_rate.yaml | 0 .../taxes/social_security_contribution.yaml | 0 .../reforms/__init__.py | 0 .../reforms/add_dynamic_variable.py | 2 +- .../reforms/add_new_tax.py | 2 +- .../flat_social_security_contribution.py | 0 .../modify_social_security_taxation.py | 0 .../reforms/removal_basic_income.py | 0 .../situation_examples/__init__.py | 0 .../situation_examples/couple.json | 0 .../situation_examples/housing.json | 0 .../situation_examples/single.json | 0 .../tests/age.yaml | 0 .../tests/basic_income.yaml | 0 .../tests/disposable_income.yaml | 0 .../tests/housing_allowance.yaml | 0 .../tests/housing_tax.yaml | 0 .../tests/income_tax.yaml | 0 .../tests/reforms/add_dynamic_variable.yaml | 2 +- .../tests/reforms/add_new_tax.yaml | 4 +- .../modify_social_security_taxation.yaml | 6 +-- .../tests/situations/income_tax.yaml | 0 .../tests/situations/parenting_allowance.yaml | 0 .../tests/social_security_contribution.yaml | 0 .../variables/__init__.py | 0 .../variables/aide_logement.py | 38 +++++++++++++++++++ .../variables/benefits.py | 3 +- .../variables/demographics.py | 2 +- .../variables/housing.py | 2 +- .../variables/income.py | 2 +- .../variables/stats.py | 2 +- .../variables/taxes.py | 2 +- pyproject.toml | 20 +++++----- 45 files changed, 67 insertions(+), 32 deletions(-) rename {openfisca_country_template => openfisca_nouvelle_caledonie}/__init__.py (93%) rename {openfisca_country_template => openfisca_nouvelle_caledonie}/entities.py (100%) rename {openfisca_country_template => openfisca_nouvelle_caledonie}/parameters/benefits/basic_income.yaml (100%) rename {openfisca_country_template => openfisca_nouvelle_caledonie}/parameters/benefits/housing_allowance.yaml (92%) rename {openfisca_country_template => openfisca_nouvelle_caledonie}/parameters/benefits/index.yaml (100%) rename {openfisca_country_template => openfisca_nouvelle_caledonie}/parameters/benefits/parenting_allowance/amount.yaml (100%) rename {openfisca_country_template => openfisca_nouvelle_caledonie}/parameters/benefits/parenting_allowance/income_threshold.yaml (100%) rename {openfisca_country_template => openfisca_nouvelle_caledonie}/parameters/general/age_of_majority.yaml (100%) rename {openfisca_country_template => openfisca_nouvelle_caledonie}/parameters/general/age_of_retirement.yaml (100%) rename {openfisca_country_template => openfisca_nouvelle_caledonie}/parameters/taxes/housing_tax.yaml (100%) rename {openfisca_country_template => openfisca_nouvelle_caledonie}/parameters/taxes/income_tax_rate.yaml (100%) rename {openfisca_country_template => openfisca_nouvelle_caledonie}/parameters/taxes/social_security_contribution.yaml (100%) rename {openfisca_country_template => openfisca_nouvelle_caledonie}/reforms/__init__.py (100%) rename {openfisca_country_template => openfisca_nouvelle_caledonie}/reforms/add_dynamic_variable.py (96%) rename {openfisca_country_template => openfisca_nouvelle_caledonie}/reforms/add_new_tax.py (96%) rename {openfisca_country_template => openfisca_nouvelle_caledonie}/reforms/flat_social_security_contribution.py (100%) rename {openfisca_country_template => openfisca_nouvelle_caledonie}/reforms/modify_social_security_taxation.py (100%) rename {openfisca_country_template => openfisca_nouvelle_caledonie}/reforms/removal_basic_income.py (100%) rename {openfisca_country_template => openfisca_nouvelle_caledonie}/situation_examples/__init__.py (100%) rename {openfisca_country_template => openfisca_nouvelle_caledonie}/situation_examples/couple.json (100%) rename {openfisca_country_template => openfisca_nouvelle_caledonie}/situation_examples/housing.json (100%) rename {openfisca_country_template => openfisca_nouvelle_caledonie}/situation_examples/single.json (100%) rename {openfisca_country_template => openfisca_nouvelle_caledonie}/tests/age.yaml (100%) rename {openfisca_country_template => openfisca_nouvelle_caledonie}/tests/basic_income.yaml (100%) rename {openfisca_country_template => openfisca_nouvelle_caledonie}/tests/disposable_income.yaml (100%) rename {openfisca_country_template => openfisca_nouvelle_caledonie}/tests/housing_allowance.yaml (100%) rename {openfisca_country_template => openfisca_nouvelle_caledonie}/tests/housing_tax.yaml (100%) rename {openfisca_country_template => openfisca_nouvelle_caledonie}/tests/income_tax.yaml (100%) rename {openfisca_country_template => openfisca_nouvelle_caledonie}/tests/reforms/add_dynamic_variable.yaml (80%) rename {openfisca_country_template => openfisca_nouvelle_caledonie}/tests/reforms/add_new_tax.yaml (78%) rename {openfisca_country_template => openfisca_nouvelle_caledonie}/tests/reforms/modify_social_security_taxation.yaml (71%) rename {openfisca_country_template => openfisca_nouvelle_caledonie}/tests/situations/income_tax.yaml (100%) rename {openfisca_country_template => openfisca_nouvelle_caledonie}/tests/situations/parenting_allowance.yaml (100%) rename {openfisca_country_template => openfisca_nouvelle_caledonie}/tests/social_security_contribution.yaml (100%) rename {openfisca_country_template => openfisca_nouvelle_caledonie}/variables/__init__.py (100%) create mode 100644 openfisca_nouvelle_caledonie/variables/aide_logement.py rename {openfisca_country_template => openfisca_nouvelle_caledonie}/variables/benefits.py (98%) rename {openfisca_country_template => openfisca_nouvelle_caledonie}/variables/demographics.py (97%) rename {openfisca_country_template => openfisca_nouvelle_caledonie}/variables/housing.py (96%) rename {openfisca_country_template => openfisca_nouvelle_caledonie}/variables/income.py (96%) rename {openfisca_country_template => openfisca_nouvelle_caledonie}/variables/stats.py (96%) rename {openfisca_country_template => openfisca_nouvelle_caledonie}/variables/taxes.py (98%) diff --git a/README.md b/README.md index 315a8fa..6e2c74d 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# OpenFisca Country-Template +# OpenFisca Nouvelle Calédonie This repository helps you quickly set up and use your own OpenFisca country package. diff --git a/first-time-setup.sh b/first-time-setup.sh index a64b3b3..fe5099e 100755 --- a/first-time-setup.sh +++ b/first-time-setup.sh @@ -17,7 +17,7 @@ then echo 'It seems you cloned this repository, or already initialised it.' echo 'Refusing to go further as you might lose work.' echo "If you are certain this is a new repository, run 'cd $(dirname $0) && rm -rf .git' to erase the history." - exit 2 + #exit 2 fi while [[ ! "$JURISDICTION_NAME" ]] @@ -81,7 +81,7 @@ all_module_files=`find openfisca_country_template -type f ! -name "*.DS_Store"` echo -e "${PURPLE}* ${PURPLE}Replace default country_template references\033[0m" # Use intermediate backup files (`-i`) with a weird syntax due to lack of portable 'no backup' option. See https://stackoverflow.com/q/5694228/594053. sed -i.template "s|openfisca-country_template|openfisca-$NO_SPACES_JURISDICTION_LABEL|g" README.md Makefile pyproject.toml CONTRIBUTING.md -sed -i.template "s|country_template|$SNAKE_CASE_JURISDICTION|g" README.md pyproject.toml .flake8 Makefile MANIFEST.in $all_module_files +sed -i.template "s|country_template|$SNAKE_CASE_JURISDICTION|g" README.md pyproject.toml Makefile MANIFEST.in $all_module_files sed -i.template "s|Country-Template|$JURISDICTION_NAME|g" README.md pyproject.toml .github/PULL_REQUEST_TEMPLATE.md CONTRIBUTING.md echo -e "${PURPLE}* ${PURPLE}Remove bootstrap instructions\033[0m" diff --git a/openfisca_country_template/__init__.py b/openfisca_nouvelle_caledonie/__init__.py similarity index 93% rename from openfisca_country_template/__init__.py rename to openfisca_nouvelle_caledonie/__init__.py index d8fc243..aa78e71 100644 --- a/openfisca_country_template/__init__.py +++ b/openfisca_nouvelle_caledonie/__init__.py @@ -14,8 +14,8 @@ from openfisca_core.taxbenefitsystems import TaxBenefitSystem -from openfisca_country_template import entities -from openfisca_country_template.situation_examples import couple +from openfisca_nouvelle_caledonie import entities +from openfisca_nouvelle_caledonie.situation_examples import couple COUNTRY_DIR = os.path.dirname(os.path.abspath(__file__)) diff --git a/openfisca_country_template/entities.py b/openfisca_nouvelle_caledonie/entities.py similarity index 100% rename from openfisca_country_template/entities.py rename to openfisca_nouvelle_caledonie/entities.py diff --git a/openfisca_country_template/parameters/benefits/basic_income.yaml b/openfisca_nouvelle_caledonie/parameters/benefits/basic_income.yaml similarity index 100% rename from openfisca_country_template/parameters/benefits/basic_income.yaml rename to openfisca_nouvelle_caledonie/parameters/benefits/basic_income.yaml diff --git a/openfisca_country_template/parameters/benefits/housing_allowance.yaml b/openfisca_nouvelle_caledonie/parameters/benefits/housing_allowance.yaml similarity index 92% rename from openfisca_country_template/parameters/benefits/housing_allowance.yaml rename to openfisca_nouvelle_caledonie/parameters/benefits/housing_allowance.yaml index 88af989..07c3e3e 100644 --- a/openfisca_country_template/parameters/benefits/housing_allowance.yaml +++ b/openfisca_nouvelle_caledonie/parameters/benefits/housing_allowance.yaml @@ -9,5 +9,3 @@ values: # This parameter is only defined from the 1st of Jan 2010 to the 3Oth of Nov 2016. 2010-01-01: value: 0.25 - 2016-12-01: - value: null diff --git a/openfisca_country_template/parameters/benefits/index.yaml b/openfisca_nouvelle_caledonie/parameters/benefits/index.yaml similarity index 100% rename from openfisca_country_template/parameters/benefits/index.yaml rename to openfisca_nouvelle_caledonie/parameters/benefits/index.yaml diff --git a/openfisca_country_template/parameters/benefits/parenting_allowance/amount.yaml b/openfisca_nouvelle_caledonie/parameters/benefits/parenting_allowance/amount.yaml similarity index 100% rename from openfisca_country_template/parameters/benefits/parenting_allowance/amount.yaml rename to openfisca_nouvelle_caledonie/parameters/benefits/parenting_allowance/amount.yaml diff --git a/openfisca_country_template/parameters/benefits/parenting_allowance/income_threshold.yaml b/openfisca_nouvelle_caledonie/parameters/benefits/parenting_allowance/income_threshold.yaml similarity index 100% rename from openfisca_country_template/parameters/benefits/parenting_allowance/income_threshold.yaml rename to openfisca_nouvelle_caledonie/parameters/benefits/parenting_allowance/income_threshold.yaml diff --git a/openfisca_country_template/parameters/general/age_of_majority.yaml b/openfisca_nouvelle_caledonie/parameters/general/age_of_majority.yaml similarity index 100% rename from openfisca_country_template/parameters/general/age_of_majority.yaml rename to openfisca_nouvelle_caledonie/parameters/general/age_of_majority.yaml diff --git a/openfisca_country_template/parameters/general/age_of_retirement.yaml b/openfisca_nouvelle_caledonie/parameters/general/age_of_retirement.yaml similarity index 100% rename from openfisca_country_template/parameters/general/age_of_retirement.yaml rename to openfisca_nouvelle_caledonie/parameters/general/age_of_retirement.yaml diff --git a/openfisca_country_template/parameters/taxes/housing_tax.yaml b/openfisca_nouvelle_caledonie/parameters/taxes/housing_tax.yaml similarity index 100% rename from openfisca_country_template/parameters/taxes/housing_tax.yaml rename to openfisca_nouvelle_caledonie/parameters/taxes/housing_tax.yaml diff --git a/openfisca_country_template/parameters/taxes/income_tax_rate.yaml b/openfisca_nouvelle_caledonie/parameters/taxes/income_tax_rate.yaml similarity index 100% rename from openfisca_country_template/parameters/taxes/income_tax_rate.yaml rename to openfisca_nouvelle_caledonie/parameters/taxes/income_tax_rate.yaml diff --git a/openfisca_country_template/parameters/taxes/social_security_contribution.yaml b/openfisca_nouvelle_caledonie/parameters/taxes/social_security_contribution.yaml similarity index 100% rename from openfisca_country_template/parameters/taxes/social_security_contribution.yaml rename to openfisca_nouvelle_caledonie/parameters/taxes/social_security_contribution.yaml diff --git a/openfisca_country_template/reforms/__init__.py b/openfisca_nouvelle_caledonie/reforms/__init__.py similarity index 100% rename from openfisca_country_template/reforms/__init__.py rename to openfisca_nouvelle_caledonie/reforms/__init__.py diff --git a/openfisca_country_template/reforms/add_dynamic_variable.py b/openfisca_nouvelle_caledonie/reforms/add_dynamic_variable.py similarity index 96% rename from openfisca_country_template/reforms/add_dynamic_variable.py rename to openfisca_nouvelle_caledonie/reforms/add_dynamic_variable.py index 60d2841..789bbfc 100644 --- a/openfisca_country_template/reforms/add_dynamic_variable.py +++ b/openfisca_nouvelle_caledonie/reforms/add_dynamic_variable.py @@ -12,7 +12,7 @@ from openfisca_core.variables import Variable # Import the Entities specifically defined for this tax and benefit system -from openfisca_country_template.entities import Person +from openfisca_nouvelle_caledonie.entities import Person def create_dynamic_variable(name, **variable): diff --git a/openfisca_country_template/reforms/add_new_tax.py b/openfisca_nouvelle_caledonie/reforms/add_new_tax.py similarity index 96% rename from openfisca_country_template/reforms/add_new_tax.py rename to openfisca_nouvelle_caledonie/reforms/add_new_tax.py index b9a5ac5..2c98e67 100644 --- a/openfisca_country_template/reforms/add_new_tax.py +++ b/openfisca_nouvelle_caledonie/reforms/add_new_tax.py @@ -12,7 +12,7 @@ from openfisca_core.variables import Variable # Import the Entities specifically defined for this tax and benefit system -from openfisca_country_template.entities import Person +from openfisca_nouvelle_caledonie.entities import Person class has_car(Variable): diff --git a/openfisca_country_template/reforms/flat_social_security_contribution.py b/openfisca_nouvelle_caledonie/reforms/flat_social_security_contribution.py similarity index 100% rename from openfisca_country_template/reforms/flat_social_security_contribution.py rename to openfisca_nouvelle_caledonie/reforms/flat_social_security_contribution.py diff --git a/openfisca_country_template/reforms/modify_social_security_taxation.py b/openfisca_nouvelle_caledonie/reforms/modify_social_security_taxation.py similarity index 100% rename from openfisca_country_template/reforms/modify_social_security_taxation.py rename to openfisca_nouvelle_caledonie/reforms/modify_social_security_taxation.py diff --git a/openfisca_country_template/reforms/removal_basic_income.py b/openfisca_nouvelle_caledonie/reforms/removal_basic_income.py similarity index 100% rename from openfisca_country_template/reforms/removal_basic_income.py rename to openfisca_nouvelle_caledonie/reforms/removal_basic_income.py diff --git a/openfisca_country_template/situation_examples/__init__.py b/openfisca_nouvelle_caledonie/situation_examples/__init__.py similarity index 100% rename from openfisca_country_template/situation_examples/__init__.py rename to openfisca_nouvelle_caledonie/situation_examples/__init__.py diff --git a/openfisca_country_template/situation_examples/couple.json b/openfisca_nouvelle_caledonie/situation_examples/couple.json similarity index 100% rename from openfisca_country_template/situation_examples/couple.json rename to openfisca_nouvelle_caledonie/situation_examples/couple.json diff --git a/openfisca_country_template/situation_examples/housing.json b/openfisca_nouvelle_caledonie/situation_examples/housing.json similarity index 100% rename from openfisca_country_template/situation_examples/housing.json rename to openfisca_nouvelle_caledonie/situation_examples/housing.json diff --git a/openfisca_country_template/situation_examples/single.json b/openfisca_nouvelle_caledonie/situation_examples/single.json similarity index 100% rename from openfisca_country_template/situation_examples/single.json rename to openfisca_nouvelle_caledonie/situation_examples/single.json diff --git a/openfisca_country_template/tests/age.yaml b/openfisca_nouvelle_caledonie/tests/age.yaml similarity index 100% rename from openfisca_country_template/tests/age.yaml rename to openfisca_nouvelle_caledonie/tests/age.yaml diff --git a/openfisca_country_template/tests/basic_income.yaml b/openfisca_nouvelle_caledonie/tests/basic_income.yaml similarity index 100% rename from openfisca_country_template/tests/basic_income.yaml rename to openfisca_nouvelle_caledonie/tests/basic_income.yaml diff --git a/openfisca_country_template/tests/disposable_income.yaml b/openfisca_nouvelle_caledonie/tests/disposable_income.yaml similarity index 100% rename from openfisca_country_template/tests/disposable_income.yaml rename to openfisca_nouvelle_caledonie/tests/disposable_income.yaml diff --git a/openfisca_country_template/tests/housing_allowance.yaml b/openfisca_nouvelle_caledonie/tests/housing_allowance.yaml similarity index 100% rename from openfisca_country_template/tests/housing_allowance.yaml rename to openfisca_nouvelle_caledonie/tests/housing_allowance.yaml diff --git a/openfisca_country_template/tests/housing_tax.yaml b/openfisca_nouvelle_caledonie/tests/housing_tax.yaml similarity index 100% rename from openfisca_country_template/tests/housing_tax.yaml rename to openfisca_nouvelle_caledonie/tests/housing_tax.yaml diff --git a/openfisca_country_template/tests/income_tax.yaml b/openfisca_nouvelle_caledonie/tests/income_tax.yaml similarity index 100% rename from openfisca_country_template/tests/income_tax.yaml rename to openfisca_nouvelle_caledonie/tests/income_tax.yaml diff --git a/openfisca_country_template/tests/reforms/add_dynamic_variable.yaml b/openfisca_nouvelle_caledonie/tests/reforms/add_dynamic_variable.yaml similarity index 80% rename from openfisca_country_template/tests/reforms/add_dynamic_variable.yaml rename to openfisca_nouvelle_caledonie/tests/reforms/add_dynamic_variable.yaml index 25c75dd..281d34e 100644 --- a/openfisca_country_template/tests/reforms/add_dynamic_variable.yaml +++ b/openfisca_nouvelle_caledonie/tests/reforms/add_dynamic_variable.yaml @@ -6,7 +6,7 @@ # Note the `reforms: ` key in the below YAML blocks. - name: We will dynamically add a new variable "goes_to_school" thanks to a reform - reforms: openfisca_country_template.reforms.add_dynamic_variable.add_dynamic_variable + reforms: openfisca_nouvelle_caledonie.reforms.add_dynamic_variable.add_dynamic_variable period: 2017-01 output: goes_to_school: true diff --git a/openfisca_country_template/tests/reforms/add_new_tax.yaml b/openfisca_nouvelle_caledonie/tests/reforms/add_new_tax.yaml similarity index 78% rename from openfisca_country_template/tests/reforms/add_new_tax.yaml rename to openfisca_nouvelle_caledonie/tests/reforms/add_new_tax.yaml index 18ae17e..9f0219c 100644 --- a/openfisca_country_template/tests/reforms/add_new_tax.yaml +++ b/openfisca_nouvelle_caledonie/tests/reforms/add_new_tax.yaml @@ -6,7 +6,7 @@ # Note the `reforms: ` key in the below YAML blocks. - name: The new tax applies to car-holding people - reforms: openfisca_country_template.reforms.add_new_tax.add_new_tax + reforms: openfisca_nouvelle_caledonie.reforms.add_new_tax.add_new_tax period: 2017-01 input: salary: 2000 @@ -16,7 +16,7 @@ new_tax: 400 - name: The new tax does not apply otherwise - reforms: openfisca_country_template.reforms.add_new_tax.add_new_tax + reforms: openfisca_nouvelle_caledonie.reforms.add_new_tax.add_new_tax period: 2017-01 input: salary: 2000 diff --git a/openfisca_country_template/tests/reforms/modify_social_security_taxation.yaml b/openfisca_nouvelle_caledonie/tests/reforms/modify_social_security_taxation.yaml similarity index 71% rename from openfisca_country_template/tests/reforms/modify_social_security_taxation.yaml rename to openfisca_nouvelle_caledonie/tests/reforms/modify_social_security_taxation.yaml index ff7f2fd..5a2f5c2 100644 --- a/openfisca_country_template/tests/reforms/modify_social_security_taxation.yaml +++ b/openfisca_nouvelle_caledonie/tests/reforms/modify_social_security_taxation.yaml @@ -6,7 +6,7 @@ # Note the `reforms: ` key in the below YAML blocks. - name: No social security contribution on small salaries - reforms: openfisca_country_template.reforms.modify_social_security_taxation.modify_social_security_taxation + reforms: openfisca_nouvelle_caledonie.reforms.modify_social_security_taxation.modify_social_security_taxation period: 2017-01 input: salary: 2000 @@ -14,7 +14,7 @@ social_security_contribution: 0 - name: Increased social security contribution on medium salaries - reforms: openfisca_country_template.reforms.modify_social_security_taxation.modify_social_security_taxation + reforms: openfisca_nouvelle_caledonie.reforms.modify_social_security_taxation.modify_social_security_taxation period: 2017-01 input: salary: 15000 @@ -22,7 +22,7 @@ social_security_contribution: 1336 - name: High social security contribution on high salaries - reforms: openfisca_country_template.reforms.modify_social_security_taxation.modify_social_security_taxation + reforms: openfisca_nouvelle_caledonie.reforms.modify_social_security_taxation.modify_social_security_taxation period: 2017-01 input: salary: 50000 diff --git a/openfisca_country_template/tests/situations/income_tax.yaml b/openfisca_nouvelle_caledonie/tests/situations/income_tax.yaml similarity index 100% rename from openfisca_country_template/tests/situations/income_tax.yaml rename to openfisca_nouvelle_caledonie/tests/situations/income_tax.yaml diff --git a/openfisca_country_template/tests/situations/parenting_allowance.yaml b/openfisca_nouvelle_caledonie/tests/situations/parenting_allowance.yaml similarity index 100% rename from openfisca_country_template/tests/situations/parenting_allowance.yaml rename to openfisca_nouvelle_caledonie/tests/situations/parenting_allowance.yaml diff --git a/openfisca_country_template/tests/social_security_contribution.yaml b/openfisca_nouvelle_caledonie/tests/social_security_contribution.yaml similarity index 100% rename from openfisca_country_template/tests/social_security_contribution.yaml rename to openfisca_nouvelle_caledonie/tests/social_security_contribution.yaml diff --git a/openfisca_country_template/variables/__init__.py b/openfisca_nouvelle_caledonie/variables/__init__.py similarity index 100% rename from openfisca_country_template/variables/__init__.py rename to openfisca_nouvelle_caledonie/variables/__init__.py diff --git a/openfisca_nouvelle_caledonie/variables/aide_logement.py b/openfisca_nouvelle_caledonie/variables/aide_logement.py new file mode 100644 index 0000000..b51e795 --- /dev/null +++ b/openfisca_nouvelle_caledonie/variables/aide_logement.py @@ -0,0 +1,38 @@ +from openfisca_core.indexed_enums import Enum +from openfisca_core.periods import MONTH +from openfisca_core.variables import Variable +from openfisca_nouvelle_caledonie.entities import Household + + +class TypologieLogement(Enum): + __order__ = "chambre f1 f2 f3 f4 f5p maisonderetraite" + chambre = "Chambre" + f1 = "F1" + f2 = "F2" + f3 = "F3" + f4 = "F4" + f5p = "F5 et plus" + maisonderetraite = "Maison de retraite" + + +class typologie_logement(Variable): + value_type = Enum + possible_values = TypologieLogement + default_value = TypologieLogement.chambre + entity = Household + definition_period = MONTH + label = "Legal housing situation of the household concerning their main residence" + + +class aide_logement(Variable): + value_type = float + entity = Household + definition_period = MONTH + label = "Aide au logement" + + +class loyer(Variable): + value_type = float + entity = Household + definition_period = MONTH + label = "Aide au sogement" diff --git a/openfisca_country_template/variables/benefits.py b/openfisca_nouvelle_caledonie/variables/benefits.py similarity index 98% rename from openfisca_country_template/variables/benefits.py rename to openfisca_nouvelle_caledonie/variables/benefits.py index 13319be..c8567ea 100644 --- a/openfisca_country_template/variables/benefits.py +++ b/openfisca_nouvelle_caledonie/variables/benefits.py @@ -10,7 +10,7 @@ from openfisca_core.variables import Variable # Import the Entities specifically defined for this tax and benefit system -from openfisca_country_template.entities import Household, Person +from openfisca_nouvelle_caledonie.entities import Household, Person class basic_income(Variable): @@ -62,7 +62,6 @@ class housing_allowance(Variable): reference = "https://law.gov.example/housing_allowance" # This allowance was removed on the 1st of Dec 2016. Calculating it before # this date will always return the variable default value, 0. - end = "2016-11-30" unit = "currency-EUR" documentation = """ This allowance was introduced on the 1st of Jan 1980. diff --git a/openfisca_country_template/variables/demographics.py b/openfisca_nouvelle_caledonie/variables/demographics.py similarity index 97% rename from openfisca_country_template/variables/demographics.py rename to openfisca_nouvelle_caledonie/variables/demographics.py index 406d9e4..e6a6ec4 100644 --- a/openfisca_country_template/variables/demographics.py +++ b/openfisca_nouvelle_caledonie/variables/demographics.py @@ -15,7 +15,7 @@ from openfisca_core.variables import Variable # Import the Entities specifically defined for this tax and benefit system -from openfisca_country_template.entities import Person +from openfisca_nouvelle_caledonie.entities import Person # This variable is a pure input: it doesn't have a formula diff --git a/openfisca_country_template/variables/housing.py b/openfisca_nouvelle_caledonie/variables/housing.py similarity index 96% rename from openfisca_country_template/variables/housing.py rename to openfisca_nouvelle_caledonie/variables/housing.py index eec53fd..1ce4321 100644 --- a/openfisca_country_template/variables/housing.py +++ b/openfisca_nouvelle_caledonie/variables/housing.py @@ -11,7 +11,7 @@ from openfisca_core.variables import Variable # Import the Entities specifically defined for this tax and benefit system -from openfisca_country_template.entities import Household +from openfisca_nouvelle_caledonie.entities import Household # This variable is a pure input: it doesn't have a formula diff --git a/openfisca_country_template/variables/income.py b/openfisca_nouvelle_caledonie/variables/income.py similarity index 96% rename from openfisca_country_template/variables/income.py rename to openfisca_nouvelle_caledonie/variables/income.py index 1479471..b15edd4 100644 --- a/openfisca_country_template/variables/income.py +++ b/openfisca_nouvelle_caledonie/variables/income.py @@ -11,7 +11,7 @@ from openfisca_core.variables import Variable # Import the Entities specifically defined for this tax and benefit system -from openfisca_country_template.entities import Person +from openfisca_nouvelle_caledonie.entities import Person # This variable is a pure input: it doesn't have a formula diff --git a/openfisca_country_template/variables/stats.py b/openfisca_nouvelle_caledonie/variables/stats.py similarity index 96% rename from openfisca_country_template/variables/stats.py rename to openfisca_nouvelle_caledonie/variables/stats.py index 361f1c4..7709f8c 100644 --- a/openfisca_country_template/variables/stats.py +++ b/openfisca_nouvelle_caledonie/variables/stats.py @@ -10,7 +10,7 @@ from openfisca_core.variables import Variable # Import the Entities specifically defined for this tax and benefit system -from openfisca_country_template.entities import Household +from openfisca_nouvelle_caledonie.entities import Household class total_benefits(Variable): diff --git a/openfisca_country_template/variables/taxes.py b/openfisca_nouvelle_caledonie/variables/taxes.py similarity index 98% rename from openfisca_country_template/variables/taxes.py rename to openfisca_nouvelle_caledonie/variables/taxes.py index b6dd6a6..ad88b81 100644 --- a/openfisca_country_template/variables/taxes.py +++ b/openfisca_nouvelle_caledonie/variables/taxes.py @@ -13,7 +13,7 @@ from openfisca_core.variables import Variable # Import the Entities specifically defined for this tax and benefit system -from openfisca_country_template.entities import Household, Person +from openfisca_nouvelle_caledonie.entities import Household, Person class income_tax(Variable): diff --git a/pyproject.toml b/pyproject.toml index fb73faf..b9addb6 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -3,9 +3,9 @@ build-backend = "setuptools.build_meta" requires = [ "setuptools>=61" ] [project] -name = "openfisca-country_template" +name = "openfisca-nouvelle_caledonie" version = "7.1.8" -description = "OpenFisca Rules as Code model for Country-Template." +description = "OpenFisca Rules as Code model for Nouvelle Calédonie." readme = "README.md" keywords = [ "benefit", "microsimulation", "rac", "rules-as-code", "tax" ] maintainers = [ ] @@ -32,11 +32,11 @@ optional-dependencies.dev = [ "ruff-lsp>=0.0.57,<1", "yamllint>=1.35.1", ] -urls.Changelog = "https://github.com/openfisca/country-template/blob/main/CHANGELOG.md" +urls.Changelog = "https://github.com/openfisca/openfisca-nouvelle_caledonie/blob/main/CHANGELOG.md" urls.Documentation = "https://openfisca.org/doc" -urls.Homepage = "https://github.com/openfisca/country-template" -urls.Issues = "https://github.com/openfisca/country-template/issues" -urls.Repository = "https://github.com/openfisca/country-template" +urls.Homepage = "https://github.com/openfisca/openfisca-nouvelle_caledonie" +urls.Issues = "https://github.com/openfisca/openfisca-nouvelle_caledonie/issues" +urls.Repository = "https://github.com/openfisca/openfisca-nouvelle_caledonie" [tool.ruff] target-version = "py39" @@ -68,7 +68,7 @@ force_alphabetical_sort_within_sections = false group_by_package = true honor_noqa = true include_trailing_comma = true -known_first_party = [ "openfisca_country_template" ] +known_first_party = [ "openfisca-nouvelle_caledonie" ] known_openfisca = [ "openfisca_core", "openfisca_extension_template" ] known_typing = [ "*collections.abc*", "*typing*", "*typing_extensions*" ] known_types = [ "*types*" ] @@ -93,7 +93,7 @@ max_supported_python = "3.11" [tool.pytest.ini_options] addopts = "--exitfirst --showlocals --doctest-modules --disable-warnings --import-mode importlib" -testpaths = [ "openfisca_country_template/tests" ] +testpaths = [ "openfisca_nouvelle_caledonie/tests" ] python_files = "**/*.py" [tool.tox] @@ -109,7 +109,7 @@ commands_pre = [ "install", "--find-links", ".", - "openfisca-country_template", + "openfisca-nouvelle_caledonie", ], ] @@ -123,7 +123,7 @@ commands_pre = [ "install", "--find-links", ".", - "openfisca-country_template[dev]", + "openfisca-nouvelle_caledonie[dev]", ], ]