Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add cpi_inflatable field for each parameter in the four JSON parameters files #1838

Merged
merged 2 commits into from
Jan 20, 2018
Merged

Add cpi_inflatable field for each parameter in the four JSON parameters files #1838

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a0a645a
Add cpi_inflatable field to each JSON parameters file
martinholmer Jan 20, 2018
4ae9fe5
Update RELEASES.md info for 0.15.1
martinholmer Jan 20, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 18 additions & 1 deletion RELEASES.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ Go [here](https://github.com/open-source-economics/Tax-Calculator/pulls?q=is%3Ap
for a complete commit history.


2018-01-?? Release 0.15.1
2018-01-?? Release 0.15.2
-------------------------
(last merged pull request is
[#18xx](https://github.com/open-source-economics/Tax-Calculator/pull/18xx))
Expand All @@ -21,6 +21,23 @@ for a complete commit history.
- None


2018-01-20 Release 0.15.1
-------------------------
(last merged pull request is
[#1838](https://github.com/open-source-economics/Tax-Calculator/pull/1838))

**API Changes**
- None

**New Features**
- Add `cpi_inflatable` field for each parameter in the four JSON parameter files
[[#1838](https://github.com/open-source-economics/Tax-Calculator/pull/1838)
by Martin Holmer as requested by Hank Doupe]

**Bug Fixes**
- None


2018-01-18 Release 0.15.0
-------------------------
(last merged pull request is
Expand Down
92 changes: 46 additions & 46 deletions docs/index.html
View file
Open in desktop

Large diffs are not rendered by default.

14 changes: 9 additions & 5 deletions docs/make_index.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ def policy_param_text(pname, param):
"""
Extract info from param for pname and return as HTML string.
"""
# pylint: disable=too-many-branches,len-as-condition
# pylint: disable=too-many-statements,too-many-branches,len-as-condition
sec1 = param['section_1']
if len(sec1) > 0:
txt = '<p><b>{} &mdash; {}</b>'.format(sec1, param['section_2'])
Expand All @@ -81,14 +81,18 @@ def policy_param_text(pname, param):
txt += '<br><i>Description:</i> {}'.format(param['description'])
if len(param['notes']) > 0:
txt += '<br><i>Notes:</i> {}'.format(param['notes'])
if param['cpi_inflatable']:
txt += '<br><i>Can Be Inflation Indexed:</i> True'
else:
txt += '<br><i>Can Be Inflation Indexed:</i> False'
if param['cpi_inflated']:
txt += '<br><i>Inflation Indexed:</i> True'
txt += '&nbsp;&nbsp;&nbsp;&nbsp; <i>Is Inflation Indexed:</i> True'
else:
txt += '<br><i>Inflation Indexed:</i> False'
txt += '&nbsp;&nbsp;&nbsp;&nbsp; <i>Is Inflation Indexed:</i> False'
if param['integer_value']:
txt += '&nbsp;&nbsp;&nbsp;&nbsp; <i>Integer Value:</i> True'
txt += '<br><i>Integer Value:</i> True'
else:
txt += '&nbsp;&nbsp;&nbsp;&nbsp; <i>Integer Value:</i> False'
txt += '<br><i>Integer Value:</i> False'
if param['boolean_value']:
txt += '&nbsp;&nbsp;&nbsp;&nbsp; <i>Boolean Value:</i> True'
else:
Expand Down
5 changes: 5 additions & 0 deletions taxcalc/behavior.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
"row_var": "FLPDYR",
"row_label": ["2013"],
"start_year": 2013,
"cpi_inflatable": false,
"cpi_inflated": false,
"col_var": "",
"col_label": "",
Expand All @@ -26,6 +27,7 @@
"row_var": "FLPDYR",
"row_label": ["2013"],
"start_year": 2013,
"cpi_inflatable": false,
"cpi_inflated": false,
"col_var": "",
"col_label": "",
Expand All @@ -44,6 +46,7 @@
"row_var": "FLPDYR",
"row_label": ["2013"],
"start_year": 2013,
"cpi_inflatable": false,
"cpi_inflated": false,
"col_var": "",
"col_label": "",
Expand All @@ -62,6 +65,7 @@
"row_var": "FLPDYR",
"row_label": ["2013"],
"start_year": 2013,
"cpi_inflatable": false,
"cpi_inflated": false,
"col_var": "",
"col_label": "",
Expand All @@ -80,6 +84,7 @@
"row_var": "FLPDYR",
"row_label": ["2013"],
"start_year": 2013,
"cpi_inflatable": false,
"cpi_inflated": false,
"col_var": "c00100",
"col_label": ["AGI < 50k", "50k <= AGI < 100k", "100k <= AGI"],
Expand Down
4 changes: 4 additions & 0 deletions taxcalc/consumption.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
"row_var": "FLPDYR",
"row_label": ["2013"],
"start_year": 2013,
"cpi_inflatable": false,
"cpi_inflated": false,
"col_var": "",
"col_label": "",
Expand All @@ -26,6 +27,7 @@
"row_var": "FLPDYR",
"row_label": ["2013"],
"start_year": 2013,
"cpi_inflatable": false,
"cpi_inflated": false,
"col_var": "",
"col_label": "",
Expand All @@ -44,6 +46,7 @@
"row_var": "FLPDYR",
"row_label": ["2013"],
"start_year": 2013,
"cpi_inflatable": false,
"cpi_inflated": false,
"col_var": "",
"col_label": "",
Expand All @@ -62,6 +65,7 @@
"row_var": "FLPDYR",
"row_label": ["2013"],
"start_year": 2013,
"cpi_inflatable": false,
"cpi_inflated": false,
"col_var": "",
"col_label": "",
Expand Down
Loading