Update openfisca-core requirement from <26,>=25 to >=25,<27

notebooks/demo.ipynb

@@ -55,9 +55,11 @@
    },
    "outputs": [],
    "source": [
+    "from openfisca_tunisia.scenarios import init_single_entity\n",
+    "\n",
     "years = [2012, 2013, 2014, 2017, 2018]\n",
     "salaire_de_base_max = 20000\n",
-    "simulation = tax_benefit_system.new_scenario().init_single_entity(\n",
+    "simulation = init_single_entity(tax_benefit_system.new_scenario(),\n",
     "    period = 2014,\n",
     "    axes = [\n",
     "        [\n",
@@ -138,9 +140,11 @@
    },
    "outputs": [],
    "source": [
+    "from openfisca_tunisia.scenarios import init_single_entity\n",
+    "\n",
     "salaire_de_base_max = 20000\n",
     "simulations = [\n",
-    "    tax_benefit_system.new_scenario().init_single_entity(\n",
+    "    init_single_entity(tax_benefit_system.new_scenario(),\n",
     "        period = 2017,\n",
     "        parent1 = dict(age = 40, regime_securite_sociale = regime_securite_sociale, salaire_de_base = 20000),\n",
     "        ).new_simulation()\n",

openfisca_tunisia/tunisia_taxbenefitsystem.py

@@ -4,7 +4,7 @@
 import os
 
 from openfisca_core.taxbenefitsystems import TaxBenefitSystem
-from . import decompositions, entities, scenarios
+from openfisca_tunisia import decompositions, entities, scenarios
 
 
 COUNTRY_DIR = os.path.dirname(os.path.abspath(__file__))
@@ -23,7 +23,6 @@ class TunisiaTaxBenefitSystem(TaxBenefitSystem):
     def __init__(self):
         # We initialize our tax and benefit system with the general constructor
         super(TunisiaTaxBenefitSystem, self).__init__(entities.entities)
-        self.Scenario = scenarios.Scenario
 
         # We add to our tax and benefit system all the variables
         self.add_variables_from_directory(os.path.join(COUNTRY_DIR, 'model'))

setup.py

@@ -52,7 +52,7 @@
         ),
     include_package_data = True,  # Will read MANIFEST.in
     install_requires = [
-        'OpenFisca-Core >= 25, < 26',
+        'OpenFisca-Core >=25,<27',
         'PyYAML >= 3.10',
         'scipy >= 0.12',
         ],

tests/core_tests.py

@@ -4,18 +4,23 @@
 import datetime
 
 from openfisca_tunisia import TunisiaTaxBenefitSystem
+from openfisca_tunisia.scenarios import init_single_entity
+
 
 tax_benefit_system = TunisiaTaxBenefitSystem()
 
 
 def check_1_parent(year = 2011):
-    scenario = tax_benefit_system.new_scenario().init_single_entity(
-        axes = [dict(
-            count = 3,
-            name = 'salaire_imposable',
-            max = 100000,
-            min = 0,
-            )],
+    scenario = init_single_entity(
+        tax_benefit_system.new_scenario(),
+        axes = [[
+            dict(
+                count = 3,
+                name = 'salaire_imposable',
+                max = 100000,
+                min = 0,
+                )
+            ]],
         period = year,
         parent1 = dict(date_naissance = datetime.date(year - 40, 1, 1)),
         )

tests/test_basics.py

@@ -6,6 +6,7 @@
 
 from openfisca_tunisia.model.prelevements_obligatoires.cotisations_sociales import TypesRegimeSecuriteSociale
 from openfisca_tunisia.model.base import *
+from openfisca_tunisia.scenarios import init_single_entity
 from tests import base
 
 
@@ -34,8 +35,10 @@ def check_run(simulation, period):
 
 def test_basics():
     for scenario_arguments in scenarios_arguments:
-        scenario = base.tax_benefit_system.new_scenario()
-        scenario.init_single_entity(**scenario_arguments)
+        scenario = init_single_entity(
+            base.tax_benefit_system.new_scenario(),
+            **scenario_arguments
+            )
         simulation = scenario.new_simulation(debug = False)
         period = scenario_arguments['period']
         yield check_run, simulation, period

tests/test_prestations_familiales.py

@@ -1,6 +1,7 @@
 # -*- coding: utf-8 -*-
 
 from openfisca_tunisia.model.base import *
+from openfisca_tunisia.scenarios import init_single_entity
 from tests import base
 
 import datetime
@@ -14,23 +15,24 @@
 def test_contribution_frais_creche():
     year = 2011
     month = '2011-01'
-    simulation = base.tax_benefit_system.new_scenario().init_single_entity(
+    simulation = init_single_entity(
+        base.tax_benefit_system.new_scenario(),
         period = year,
         parent1 = dict(age = 40),
         parent2 = dict(
             date_naissance = datetime.date(1972, 1, 1),
             ),
         enfants = [
             dict(
-                id = 'Behija',
+                # id = 'Behija',
                 date_naissance = '1992-01-01',
                 ),
             dict(
-                id = 'Hassen',
+                # id = 'Hassen',
                 date_naissance = '2002-01-01',
                 ),
             dict(
-                id = 'Thoura',
+                # id = 'Thoura',
                 date_naissance = '2008-12-31',
                 )
             ]

tests/test_simple.py

@@ -2,11 +2,13 @@
 
 
 from tests.base import tax_benefit_system
+from openfisca_tunisia.scenarios import init_single_entity
 
 
 def test_simple():
     year = 2011
-    simulation = tax_benefit_system.new_scenario().init_single_entity(
+    simulation = init_single_entity(
+        tax_benefit_system.new_scenario(),
         period = year,
         parent1 = dict(age = 40),
         ).new_simulation(debug = True)