From 0a054ee7fccce54b574ca09a2556db241d786b5a Mon Sep 17 00:00:00 2001 From: Mauko Quiroga Date: Tue, 9 Mar 2021 04:39:47 +0100 Subject: [PATCH 1/3] Fix test_variable_documentation failing test --- tests/web_api/test_variables.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/web_api/test_variables.py b/tests/web_api/test_variables.py index 3b44a98d6e..b47a14bf11 100644 --- a/tests/web_api/test_variables.py +++ b/tests/web_api/test_variables.py @@ -94,7 +94,7 @@ def test_variable_formula_github_link(): def test_variable_formula_content(): - formula_code = "def formula(person, period, parameters):\n return person('salary', period) * parameters(period).taxes.income_tax_rate\n" + formula_code = "def formula(person, period, parameters):\n \"\"\"\n Income tax.\n\n The formula to compute the income tax for a given person at a given period\n \"\"\"\n return person(\"salary\", period) * parameters(period).taxes.income_tax_rate\n" assert variable['formulas']['0001-01-01']['content'] == formula_code @@ -157,4 +157,4 @@ def test_variable_documentation(): variable = json.loads(response.data.decode('utf-8')) assert variable['documentation'] == "This allowance was introduced on the 1st of Jan 1980.\nIt disappeared in Dec 2016." - assert variable['formulas']['1980-01-01']['documentation'] == "\nTo compute this allowance, the 'rent' value must be provided for the same month, but 'housing_occupancy_status' is not necessary.\n" + assert variable['formulas']['1980-01-01']['documentation'] == "\nHousing allowance.\n\nThis allowance was introduced on the 1st of Jan 1980.\nCalculating it before this date will always return the variable default value, 0.\n\nTo compute this allowance, the 'rent' value must be provided for the same month,\nbut 'housing_occupancy_status' is not necessary.\n" From f0273e8ee03f13304f82b72d7b6818577b84950e Mon Sep 17 00:00:00 2001 From: Mauko Quiroga Date: Tue, 16 Mar 2021 15:04:56 +0100 Subject: [PATCH 2/3] Fix flake8 dependency --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index c27b808be4..70449480b9 100644 --- a/setup.py +++ b/setup.py @@ -26,7 +26,7 @@ dev_requirements = [ 'autopep8 >= 1.4.0, < 1.6.0', - 'flake8 >= 3.7.0, < 3.9.0', + 'flake8 >= 3.9.0, < 4.0.0', 'flake8-bugbear >= 19.3.0, < 20.0.0', 'flake8-print >= 3.1.0, < 4.0.0', 'pytest-cov >= 2.6.1, < 3.0.0', From 01cfa60319413a761e18982bc70c54943521c5cd Mon Sep 17 00:00:00 2001 From: Matti Schneider Date: Tue, 23 Mar 2021 08:52:53 +0000 Subject: [PATCH 3/3] Bump version number to 35.1.1 --- CHANGELOG.md | 7 +++++++ setup.py | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 723c31dac2..77ceffb780 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,10 +1,17 @@ # Changelog +### 35.1.1 [#981](https://github.com/openfisca/openfisca-core/pull/981) + +#### Technical changes + +- Fix false negative web API test following an update in the country template used for testing. + ### 35.1.0 [#973](https://github.com/openfisca/openfisca-core/pull/973) #### Technical changes - Extend assert_near so it is able to compare dates. + ### 35.0.5 [#974](https://github.com/openfisca/openfisca-core/pull/974) #### Technical changes diff --git a/setup.py b/setup.py index 70449480b9..a1ed4b3915 100644 --- a/setup.py +++ b/setup.py @@ -37,7 +37,7 @@ setup( name = 'OpenFisca-Core', - version = '35.1.0', + version = '35.1.1', author = 'OpenFisca Team', author_email = 'contact@openfisca.org', classifiers = [