Merge pull request #2328 from martinholmer/2-2-0

Update RELEASES/CHANGES info for release 2.2.0
PSLmodels · May 20, 2019 · 7f1fd1f · 7f1fd1f
2 parents 879ea82 + 9ef6524
commit 7f1fd1f
Show file tree

Hide file tree

Showing 12 changed files with 71 additions and 29 deletions.
diff --git a/CHANGES.md b/CHANGES.md
@@ -2,6 +2,20 @@ TAX-CALCULATOR CHANGE HISTORY
 =============================
 
 
+Changes in release 2.2.0 on 2019-05-20
+--------------------------------------
+
+**This is an enhancement and bug-fix release.**
+
+- Add "Analyzing a Non-Parametric Reform" cookbook recipe that shows how analyze reforms that cannot be represented using existing policy parameters
+
+- Add option to specify table and graph quantiles that have equal numbers of people rather than equal numbers of filing units
+
+- Add "Redefining Expanded Income" cookbook recipe
+
+- Correct treatment of tuition and fees deduction in 2018 and subsequent years
+
+
 Changes in release 2.1.0 on 2019-05-09
 --------------------------------------
 

diff --git a/Makefile b/Makefile
@@ -80,15 +80,15 @@ tctest: package
 .PHONY=tctest-jit
 tctest-jit:
 	@./tctest-nojit.sh
-	@$(tctest-cleanup)
 
 TOPLEVEL_JSON_FILES := $(shell ls -l ./*json | awk '{print $$9}')
 TAXCALC_JSON_FILES := $(shell ls -l ./taxcalc/*json | awk '{print $$9}')
 TESTS_JSON_FILES := $(shell ls -l ./taxcalc/tests/*json | awk '{print $$9}')
 PYLINT_FILES := $(shell grep -rl --include="*py" disable=locally-disabled .)
 PYLINT_OPTIONS = --disable=locally-disabled --score=no --jobs=4
 RECIPE_FILES := $(shell ls -l ./docs/cookbook/recipe*py | awk '{print $$9}')
-RECIPE_OPTIONS = --disable=C0103,C0111,W0401,W0614,E0401 --score=no --jobs=4
+PYLINT_IGNORE = C0103,C0111,E0401,E1120,R0913,R0914,W0401,W0614
+RECIPE_OPTIONS = --disable=$(PYLINT_IGNORE) --score=no --jobs=4
 
 .PHONY=cstest
 cstest:

diff --git a/RELEASES.md b/RELEASES.md
@@ -4,6 +4,33 @@ Go [here](https://github.com/PSLmodels/Tax-Calculator/pulls?q=is%3Apr+is%3Aclose
 for a complete commit history.
 
 
+2019-05-20 Release 2.2.0
+------------------------
+(last merged pull request is
+[#2327](https://github.com/PSLmodels/Tax-Calculator/pull/2327))
+
+**This is an enhancement and bug-fix release.**
+
+**API Changes**
+- None
+
+**New Features**
+- Add "Redefining Expanded Income" cookbook recipe
+  [[#2321](https://github.com/PSLmodels/Tax-Calculator/pull/2321)
+  by Martin Holmer responding to request by Max Ghenis]
+- Add option to specify table and graph quantiles that have equal numbers of people (rather than filing units)
+  [[#2322](https://github.com/PSLmodels/Tax-Calculator/pull/2322)
+  by Martin Holmer responding to request by Max Ghenis]
+- Add "Analyzing a Non-Parametric Reform" cookbook recipe
+  [[#2327](https://github.com/PSLmodels/Tax-Calculator/pull/2327)
+  by Martin Holmer]
+
+**Bug Fixes**
+- Correct treatment of tuition and fees deduction in 2018 and subsequent years
+  [[#2319](https://github.com/PSLmodels/Tax-Calculator/pull/2319)
+  by Anderson Frailey with bug reported by Alan Viard and Erin Melly]
+
+
 2019-05-09 Release 2.1.0
 ------------------------
 (last merged pull request is

diff --git a/docs/atr.png b/docs/atr.png
diff --git a/docs/cookbook/recipe01.res b/docs/cookbook/recipe01.res
@@ -5,19 +5,19 @@ Extract of 2018 income-tax difference table by expanded-income decile
 (taxfall is count of funits with cut in income tax in reform 2 vs 1)
 (taxrise is count of funits with rise in income tax in reform 2 vs 1)
         funits(#m)  taxfall(#m)  taxrise(#m)  agg_diff($b)  mean_diff($)  aftertax_income_diff(%)
-0-10n         0.05        0.000        0.000         0.005         108.5                      0.0
-0-10z         0.91        0.000        0.000         0.000           0.0                      NaN
-0-10p        15.33        0.005        0.002        -0.669         -43.6                      0.4
-10-20        16.29        0.009        0.002        -2.017        -123.8                      0.5
-20-30        16.29        0.009        0.001        -3.606        -221.4                      0.7
-30-40        16.29        0.010        0.002        -5.346        -328.3                      0.9
-40-50        16.29        0.011        0.002        -6.912        -424.4                      0.9
-50-60        16.29        0.011        0.002        -8.278        -508.3                      0.9
-60-70        16.29        0.012        0.002       -10.845        -665.9                      0.9
-70-80        16.29        0.013        0.002       -15.457        -949.1                      1.1
-80-90        16.29        0.014        0.002       -23.037       -1414.5                      1.2
-90-100       16.29        0.015        0.002       -77.071       -4732.1                      2.0
-ALL         162.86        0.108        0.018      -153.233        -940.9                      1.3
-90-95         8.14        0.007        0.001       -17.949       -2204.3                      1.4
-95-99         6.52        0.006        0.001       -34.986       -5369.6                      2.3
-Top 1%        1.63        0.001        0.000       -24.136      -14819.8                      2.2
+0-10n         0.05         0.00         0.00         0.005         108.5                      0.0
+0-10z         0.91         0.00         0.00         0.000           0.0                      NaN
+0-10p        15.33         4.86         1.68        -0.669         -43.6                      0.4
+10-20        16.29         9.20         1.79        -2.017        -123.8                      0.5
+20-30        16.29         8.68         1.49        -3.606        -221.4                      0.7
+30-40        16.29         9.71         1.77        -5.346        -328.3                      0.9
+40-50        16.29        10.89         1.68        -6.912        -424.4                      0.9
+50-60        16.29        10.90         1.99        -8.278        -508.3                      0.9
+60-70        16.29        11.97         1.92       -10.845        -665.9                      0.9
+70-80        16.29        13.29         1.70       -15.457        -949.1                      1.1
+80-90        16.29        13.56         2.22       -23.037       -1414.5                      1.2
+90-100       16.29        14.50         1.68       -77.071       -4732.1                      2.0
+ALL         162.86       107.55        17.91      -153.233        -940.9                      1.3
+90-95         8.14         7.11         0.95       -17.949       -2204.3                      1.4
+95-99         6.52         5.97         0.52       -34.986       -5369.6                      2.3
+Top 1%        1.63         1.42         0.21       -24.136      -14819.8                      2.2
diff --git a/docs/cookbook/recipe06.py b/docs/cookbook/recipe06.py
@@ -36,6 +36,8 @@ def __init__(self, policy=None, records=None, verbose=False,
                          consumption=consumption)
         # remember whether pseudo_COLR policy is active or not
         self.colr_active = colr_active
+        # declare colr_param dictionary that will contain pseudo COLR policy
+        self.colr_param = dict()
 
     def specify_pseudo_colr_policy(self):
         """
@@ -139,9 +141,9 @@ def calc_all(self, zero_out_calc_vars=False):
 # specify customized Calculator objects for baseline and reform:
 #   baseline calc1 uses policy1 (current-law) and colr_active=False
 #   reform calc2 uses policy2 (no EITC) and colr_active=True
-records = tc.Records.cps_constructor()
-calc1 = Calculator(policy=policy1, records=records, colr_active=False)
-calc2 = Calculator(policy=policy2, records=records, colr_active=True)
+cps_records = tc.Records.cps_constructor()
+calc1 = Calculator(policy=policy1, records=cps_records, colr_active=False)
+calc2 = Calculator(policy=policy2, records=cps_records, colr_active=True)
 
 # calculate tax liabilities for years around the reform year
 cyr_first = 2019

diff --git a/docs/index.html b/docs/index.html
@@ -98,8 +98,8 @@ <h3>What is Tax-Calculator?</h3>
 <h3>Latest Release</h3>
 
 <p>
-  <a href="https://github.com/PSLmodels/Tax-Calculator/blob/master/RELEASES.md#2019-05-09-release-210" target="_blank">
-    2.1.0 (2019-05-09)
+  <a href="https://github.com/PSLmodels/Tax-Calculator/blob/master/RELEASES.md#2019-05-20-release-220" target="_blank">
+    2.2.0 (2019-05-20)
   </a>    
 </p>
 

diff --git a/docs/index.htmx b/docs/index.htmx
@@ -77,8 +77,8 @@
 <h3>Latest Release</h3>
 
 <p>
-  <a href="https://github.com/PSLmodels/Tax-Calculator/blob/master/RELEASES.md#2019-05-09-release-210" target="_blank">
-    2.1.0 (2019-05-09)
+  <a href="https://github.com/PSLmodels/Tax-Calculator/blob/master/RELEASES.md#2019-05-20-release-220" target="_blank">
+    2.2.0 (2019-05-20)
   </a>    
 </p>
 

diff --git a/docs/mtr.png b/docs/mtr.png
diff --git a/docs/pch.png b/docs/pch.png
diff --git a/docs/uguide.html b/docs/uguide.html
diff --git a/tctest-nojit.sh b/tctest-nojit.sh
@@ -1,4 +1,3 @@
 #!/bin/bash
 export NOTAXCALCJIT="NOJIT"
 make tctest
-make clean