Cas type

.github/workflows/tax-benefit.yml

@@ -0,0 +1,19 @@
+name: Validate, integrate & deploy to tax-benefit.org
+
+on:
+  - push
+  - workflow_dispatch
+
+jobs:
+  validate_yaml:
+    uses: tax-benefit/actions/.github/workflows/[email protected]
+    with:
+      parameters_path: "openfisca_france_indirect_taxation/parameters"
+    secrets:
+      token: ${{ secrets.CONTROL_CENTER_TOKEN }}
+  deploy:
+    uses: tax-benefit/actions/.github/workflows/[email protected]
+    with:
+      python_package: "openfisca_france_indirect_taxation"
+    secrets:
+      token: ${{ secrets.CONTROL_CENTER_TOKEN }}

.github/workflows/workflow.yml

@@ -0,0 +1,85 @@
+name: OpenFisca France Indirect Taxation
+
+on:
+  push:
+  pull_request:
+    types: [opened, reopened]
+
+jobs:
+  build:
+    runs-on: ${{ matrix.os }}
+    strategy:
+      fail-fast: true
+      matrix:
+        os: ["ubuntu-20.04"]
+        python-version: ["3.10.6"]
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+      - name: Set up Python
+        uses: actions/setup-python@v4
+        with:
+          python-version: ${{ matrix.python-version }}
+      - name: Cache build
+        id: restore-build
+        uses: actions/cache@v3
+        with:
+          path: ${{ env.pythonLocation }}
+          key: build-${{ env.pythonLocation }}-${{ hashFiles('setup.py') }}-${{ github.sha }}-${{ matrix.os }}
+          restore-keys: |  # in case of a cache miss (systematically unless the same commit is built repeatedly), the keys below will be used to restore dependencies from previous builds, and the cache will be stored at the end of the job, making up-to-date dependencies available for all jobs of the workflow; see more at https://docs.github.com/en/actions/advanced-guides/caching-dependencies-to-speed-up-workflows#example-using-the-cache-action
+            build-${{ env.pythonLocation }}-${{ hashFiles('setup.py') }}-${{ matrix.os }}
+            build-${{ env.pythonLocation }}-${{ matrix.os }}
+      - name: Build package
+        run: make build
+      - name: Cache release
+        id: restore-release
+        uses: actions/cache@v3
+        with:
+          path: dist
+          key: release-${{ env.pythonLocation }}-${{ hashFiles('setup.py') }}-${{ github.sha }}-${{ matrix.os }}
+
+  lint-files:
+    runs-on: ubuntu-20.04
+    needs: [ build ]
+    steps:
+      - uses: actions/checkout@v3
+        with:
+          fetch-depth: 0 # Fetch all the tags
+      - name: Set up Python
+        uses: actions/setup-python@v4
+        with:
+          python-version: 3.10.6
+      - name: Cache build
+        id: restore-build
+        uses: actions/cache@v3
+        with:
+          path: ${{ env.pythonLocation }}
+          key: build-${{ env.pythonLocation }}-${{ hashFiles('setup.py') }}-${{ github.sha }}-ubuntu-20.04
+      - name: check-syntax-errors
+        run: make check-syntax-errors
+      - name: format-style
+        run: make format-style
+      - name: check-style
+        run: make check-style
+
+  tests:
+    runs-on: ubuntu-20.04
+    needs: [ build ]
+    steps:
+      - uses: actions/checkout@v3
+        with:
+          fetch-depth: 0 # Fetch all the tags
+      - name: Set up Python
+        uses: actions/setup-python@v4
+        with:
+          python-version: 3.10.6
+      - name: Cache build
+        id: restore-build
+        uses: actions/cache@v3
+        with:
+          path: ${{ env.pythonLocation }}
+          key: build-${{ env.pythonLocation }}-${{ hashFiles('setup.py') }}-${{ github.sha }}-ubuntu-20.04
+      - name: Test carburants
+        run: openfisca test --country-package openfisca_france_indirect_taxation openfisca_france_indirect_taxation/tests/formulas/*carbu*
+      - name: Test TVA
+        run: openfisca test --country-package openfisca_france_indirect_taxation openfisca_france_indirect_taxation/tests/formulas/*carbu*

.gitignore

@@ -1,13 +1,9 @@
 
-openfisca_france_indirect_taxation/assets/matching/matching_entd/data_matched_final.csv
-openfisca_france_indirect_taxation/assets/matching/matching_entd/data_matched_rank.csv
-openfisca_france_indirect_taxation/assets/matching/matching_entd/data_matching_bdf.csv
-openfisca_france_indirect_taxation/assets/matching/matching_entd/data_matching_entd.csv
-openfisca_france_indirect_taxation/assets/matching/matching_erfs/data_matched_rank.csv
 
 openfisca_france_indirect_taxation/examples/notebooks/.ipynb_checkpoints/*.ipynb
 openfisca_france_indirect_taxation/assets/matching/*.csv
 openfisca_france_indirect_taxation/assets/quaids/*.csv
+openfisca_france_indirect_taxation/assets/matching/*/*.csv
 openfisca_france_indirect_taxation/assets/matching/*.csv
 openfisca_france_indirect_taxation/assets/legislation/nomenclature_coicop_by*.csv
 !openfisca_france_indirect_taxation/assets/quaids/data_elasticities_no_alime_all.csv
@@ -44,6 +40,7 @@ sdist/
 var/
 *.egg-info/
 .installed.cfg
+.venv/
 *.egg
 
 # PyInstaller
@@ -78,3 +75,4 @@ docs/_build/
 target/
 
 openfisca_france_indirect_taxation/elasticite_depense.csv
+openfisca_france_indirect_taxation/assets/matching/matching_enl/data_matching_bdf.csv

.gitlab-ci.yml

@@ -33,49 +33,68 @@ Build survey collections:
   stage: build_collections
   image: $CI_REGISTRY_IMAGE:latest
   tags:
-    - ipp
+    - data-in
   before_script:
     - mkdir -p ~/.config/openfisca-survey-manager
     - cp ./runner/openfisca_survey_manager_raw_data.ini ~/.config/openfisca-survey-manager/raw_data.ini
     - cp ./runner/openfisca_survey_manager_config.ini ~/.config/openfisca-survey-manager/config.ini
     - mkdir -p /root/ci-files/data_collections
-    - pip3 install -e .[dev,survey]
+    - pip3 install -e .[dev]
+    - cat ~/.config/openfisca-survey-manager/raw_data.ini
   script:
-    - build-collection -c budget_des_familles -d -m -s 2005 2011 2017
-    - build-collection -c aliss -m -d
-    - build-collection -c enquete_logement -d -m -s 2013
-    - build-collection -c enquete_transports -d -m -s 2008
-    - build-collection -c erfs_fpr -d -m -s 2013
-    - cp ~/.config/openfisca-survey-manager/config.ini  /home/ipp/data/openfisca-france-indirect-taxation/openfisca_survey_manager_config.ini
+    - cat ~/.config/openfisca-survey-manager/raw_data.ini
+    - build-collection -c budget_des_familles -d -m -s 2017 -p ~/.config/openfisca-survey-manager
+    - build-collection -c budget_des_familles -d -s 2011 -p ~/.config/openfisca-survey-manager
+    - build-collection -c budget_des_familles -d -s 2005 -p ~/.config/openfisca-survey-manager
+    # - build-collection -c aliss -m -d
+    - build-collection -c enquete_logement -d -m -s 2013 -p ~/.config/openfisca-survey-manager
+    - build-collection -c enquete_transports -d -m -s 2008 -p ~/.config/openfisca-survey-manager
+    - build-collection -c erfs_fpr -d -m -s 2013 -p ~/.config/openfisca-survey-manager
+    - cp ~/.config/openfisca-survey-manager/config.ini  /mnt/data-out/openfisca-france-indirect-taxation/openfisca_survey_manager_config.ini
   when: manual
 
 Build matched data:
   stage: build_matched_data
   image: $CI_REGISTRY_IMAGE:latest
   tags:
-    - ipp
+    - data-in
   before_script:
     - mkdir -p ~/.config/openfisca-survey-manager
-    - pip3 install -e .[dev,survey]
+    - pip3 install -e .[dev]
     - cp ./runner/openfisca_survey_manager_raw_data.ini ~/.config/openfisca-survey-manager/raw_data.ini
-    - cp /home/ipp/data/openfisca-france-indirect-taxation/openfisca_survey_manager_config.ini ~/.config/openfisca-survey-manager/config.ini
+    - cp /mnt/data-out/openfisca-france-indirect-taxation/openfisca_survey_manager_config.ini ~/.config/openfisca-survey-manager/config.ini
     - mkdir -p /root/ci-files/data_collections
   script:
-    - build-survey-data -v
-    - cp ~/.config/openfisca-survey-manager/config.ini /home/ipp/data/openfisca-france-indirect-taxation/openfisca_survey_manager_config_with_matched_data.ini
+    - build-survey-data -v -p ~/.config/openfisca-survey-manager
+    - cp ~/.config/openfisca-survey-manager/config.ini /mnt/data-out/openfisca-france-indirect-taxation/openfisca_survey_manager_config_with_matched_data.ini
 
   when: manual
 
-Test:
+Test_YAML_Carburants:
   stage: test
   image: $CI_REGISTRY_IMAGE:latest
   tags:
-    - ipp
+    - data-in
   before_script:
     - mkdir -p ~/.config/openfisca-survey-manager
-    - pip3 install -e .[dev,survey]
+    - pip3 install -e .[dev]
     - cp ./runner/openfisca_survey_manager_raw_data.ini ~/.config/openfisca-survey-manager/raw_data.ini
-    - cp /home/ipp/data/openfisca-france-indirect-taxation/openfisca_survey_manager_config_with_matched_data.ini ~/.config/openfisca-survey-manager/config.ini
+    - cp /mnt/data-out/openfisca-france-indirect-taxation/openfisca_survey_manager_config_with_matched_data.ini ~/.config/openfisca-survey-manager/config.ini
+    - mkdir -p /root/ci-files/data_collections
+  script:
+    - openfisca test --country-package openfisca_france_indirect_taxation openfisca_france_indirect_taxation/tests/formulas/*carbu*
+
+
+Test_All:
+  stage: test
+  image: $CI_REGISTRY_IMAGE:latest
+  tags:
+    - data-in
+  before_script:
+    - mkdir -p ~/.config/openfisca-survey-manager
+    - pip3 install -e .[dev]
+    - cp ./runner/openfisca_survey_manager_raw_data.ini ~/.config/openfisca-survey-manager/raw_data.ini
+    - cp /mnt/data-out/openfisca-france-indirect-taxation/openfisca_survey_manager_config_with_matched_data.ini ~/.config/openfisca-survey-manager/config.ini
     - mkdir -p /root/ci-files/data_collections
   script:
     - make test

Dockerfile.ci

@@ -1,4 +1,4 @@
-FROM python:3.8-buster
+FROM python:3.9-buster
 
 LABEL maintainer="[email protected]"
 

Makefile

@@ -40,7 +40,6 @@ check-style:
 test: clean check-syntax-errors check-style
 		@# Launch tests from openfisca_france_indirect_taxation/tests directory (and not .) because TaxBenefitSystem must be initialized
 		@# before parsing source files containing formulas.
-		pytest
 		openfisca test --country-package openfisca_france_indirect_taxation openfisca_france_indirect_taxation/tests
 
 

openfisca_france_indirect_taxation/almost_ideal_demand_system/aids_estimation_from_stata.py

@@ -81,7 +81,7 @@ def test():
         # weights are the share of the household in total consumption
         data_quaids['part_depenses_tot'] = data_quaids['depenses_tot'] / data_quaids['depenses_tot'].sum()
         data_quaids.fillna(0, inplace=True)
-        assert 0.999 < sum(data_quaids['part_depenses_tot']) < 1.001, "the sum of the shares is not equal to 1"
+        assert 0.999 < sum(data_quaids['part_depenses_tot']) < 1.001, 'the sum of the shares is not equal to 1'
 
         for i in range(1, 5):
             data_quaids['el_{}'.format(i)] = \
@@ -112,7 +112,7 @@ def test():
                 sum(data_quaids['el_uncomp_{}'.format(i)])
 
 
-if __name__ == "__main__":
+if __name__ == '__main__':
     year = 2011
     create_data_elasticities()
     df = get_elasticities(year)

openfisca_france_indirect_taxation/almost_ideal_demand_system/elasticites_aidsills.py

@@ -164,7 +164,7 @@ def get_elasticities_aidsills(data_year, non_positive):
     return dataframe
 
 
-if __name__ == "__main__":
+if __name__ == '__main__':
     year = 2011
     create_data_elasticities_aidsills()
     df = get_elasticities_aidsills(year, True)

openfisca_france_indirect_taxation/almost_ideal_demand_system/test_build_energy.py

@@ -7,7 +7,7 @@
 from openfisca_france_indirect_taxation.almost_ideal_demand_system.aids_price_index_builder import \
     df_indice_prix_produit
 
-""" Check if depenses_tot is equal to the sum of all expenses """
+''' Check if depenses_tot is equal to the sum of all expenses '''
 
 aggregates_data_frame['dep_tot'] = 0
 for i in range(1, 13):
@@ -17,7 +17,7 @@
     'Issue in depenses_tot calculation'
 
 
-""" Check that the sum of the share for the four categories is 1 """
+''' Check that the sum of the share for the four categories is 1 '''
 
 data_frame_for_reg['sum_shares'] = 0
 for i in range(1, 5):
@@ -26,14 +26,14 @@
 del data_frame_for_reg['sum_shares']
 
 
-""" Check that the prices do not take unlikely values """
+''' Check that the prices do not take unlikely values '''
 # This test is problematic, it does not achieves its goal
 for i in range(1, 5):
     assert (data_frame_for_reg['p{}'.format(i)] > 500).any(), 'Some prices seem too small'
     assert (data_frame_for_reg['p{}'.format(i)] < 200).any(), 'Some prices seem too big'
 
 
-""" Check period fixed effects sum to 1 """
+''' Check period fixed effects sum to 1 '''
 
 data_frame_for_reg['sum_vag'] = 0
 for i in range(0, 30):
@@ -44,8 +44,8 @@
 assert (data_frame_for_reg['sum_vag'] == 1).any(), 'Vag fixed effects do not sum to 1'
 
 
-""" Check if the price index of all goods in aggregate_data_frame is filled in indice_prix_mensuel_98_15
-If this was not the case, we would have issues in the calculation of the price index for some people """
+''' Check if the price index of all goods in aggregate_data_frame is filled in indice_prix_mensuel_98_15
+If this was not the case, we would have issues in the calculation of the price index for some people '''
 
 df_bien = df_indice_prix_produit[['bien']]
 df_bien = df_bien.drop_duplicates(subset = 'bien', take_last = True)
@@ -61,9 +61,9 @@
     'The price indexes is not filled for some goods in df_indice_prix_produit (or before)'
 
 
-""" Check if the goods that drop from the dataframe in the match with prices are meaningful goods or not. If the test
+''' Check if the goods that drop from the dataframe in the match with prices are meaningful goods or not. If the test
 fails, it means that some meaningful goods are not matched with any price. This test achieves the same goal as the
-previous one but in a later stage of the dataframe construction """
+previous one but in a later stage of the dataframe construction '''
 
 check = df.drop_duplicates(subset = ['indice_prix_produit'], keep = 'last')
 check = check['indice_prix_produit']
@@ -79,7 +79,7 @@
 del common, short_name
 
 
-""" Check if the shares of each poste in their broad category sum to 1 """
+''' Check if the shares of each poste in their broad category sum to 1 '''
 
 for i in range(0, 100):
     df_ident_men_0 = df_depenses_prix[df_depenses_prix['ident_men'] == '{}'.format(i)]

openfisca_france_indirect_taxation/almost_ideal_demand_system/test_build_energy_no_alime.py

@@ -31,7 +31,7 @@
 data_frame_for_reg_2011.set_index('Unnamed: 0', inplace = True)
 
 
-""" Check that the sum of the share for the four categories is 1 """
+''' Check that the sum of the share for the four categories is 1 '''
 
 data_frame_for_reg_2011['sum_shares'] = 0
 for i in range(1, 4):
@@ -40,13 +40,13 @@
 del data_frame_for_reg_2011['sum_shares']
 
 
-""" Check that the prices do not take unlikely values """
+''' Check that the prices do not take unlikely values '''
 for i in range(1, 4):
     assert max(data_frame_for_reg_2011['p{}'.format(i)]) < 400, 'Some prices seem too big'
     assert min(data_frame_for_reg_2011['p{}'.format(i)]) > 10, 'Some prices seem too small'
 
 
-""" Check period fixed effects sum to 1 """
+''' Check period fixed effects sum to 1 '''
 
 data_frame_for_reg_2011['sum_vag'] = 0
 for i in range(0, 30):

openfisca_france_indirect_taxation/assets/documentation.md

@@ -1,6 +1,6 @@
 Prix du sp_e10 : en 2009 le sp_e10 est introduit sur le marché, et représente en moyenne près de 6% des consommations d’essence dès sa
-première année. Toutefois, nos données de prix de l’e10 ne commencent qu’en 2013. Etant donné la proximité entre le prix de l’e10
-et celui du sp95 classique en 2013 et 2014, nous appliquons pour l’e10 les prix du sp95 entre 2009 et 2012 inclus.
+première année. Toutefois, nos données de prix de l'E10 ne commencent qu’en 2013. Etant donné la proximité entre le prix de l’e10
+et celui du SP95 classique en 2013 et 2014, nous appliquons pour l'E10 les prix du SP95 entre 2009 et 2012 inclus.
 
 Part des types de carburants : nos données ne commençant qu’en 2001, nous appliquons pour 2000 les mêmes parts qu’en 2001.
 De même, les parts de 2011 sont élargies jusqu’en 2015.