Various bugs

MANIFEST.in

@@ -1,3 +1,3 @@
-recursive-include openfisca_survey_manager/config_templates *.ini
+recursive-include openfisca_survey_manager/config_files_templates *.ini
 include openfisca_survey_manager/tests/data_files/config_template.ini
 recursive-include openfisca_survey_manager/assets *.csv

openfisca_survey_manager/coicop.py

@@ -32,7 +32,7 @@ def build_coicop_level_nomenclature(level, keep_code = False, to_csv = False):
         log.info("Error when reading nomenclature coicop source data for level {}".format(level))
         raise e
 
-    data_frame.reset_index(inplace = True)
+    data_frame.reset_index(inplace = True, drop = True)
     data_frame.rename(columns = {0: 'code_coicop', 1: 'label_{}'.format(level[:-1])}, inplace = True)
     data_frame = data_frame.iloc[2:].copy()
 
@@ -75,7 +75,13 @@ def build_raw_coicop_nomenclature():
                 build_coicop_level_nomenclature(level), build_coicop_level_nomenclature(next_level),
                 on = on, left_index = False, right_index = False)
         else:
-            coicop_nomenclature = pd.merge(coicop_nomenclature, build_coicop_level_nomenclature(next_level), on = on)
+            coicop_nomenclature = pd.merge(
+                coicop_nomenclature,
+                build_coicop_level_nomenclature(next_level),
+                on = on,
+                left_index = False,
+                right_index = False,
+                )
 
     coicop_nomenclature = coicop_nomenclature[
         ['code_coicop']

setup.py

@@ -30,7 +30,7 @@
 
 setup(
     name = 'OpenFisca-Survey-Manager',
-    version = '1.1.7',
+    version = '1.1.8',
     author = 'OpenFisca Team',
     author_email = '[email protected]',
     classifiers = [classifier for classifier in classifiers.split('\n') if classifier],