Update environment and several cookbook recipes

Makefile

@@ -71,6 +71,7 @@ tctest: package
 
 TAXCALC_JSON_FILES := $(shell ls -l ./taxcalc/*json | awk '{print $$9}')
 TESTS_JSON_FILES := $(shell ls -l ./taxcalc/tests/*json | awk '{print $$9}')
+PYLINT_OPTIONS = --disable=locally-disabled --score=no --jobs=4 
 PYLINT_FILES := $(shell grep -rl --include="*py" disable=locally-disabled .)
 
 .PHONY=cstest
@@ -79,7 +80,7 @@ cstest:
 	pycodestyle docs/cookbook
 	@pycodestyle --ignore=E501,E121 $(TAXCALC_JSON_FILES)
 	@pycodestyle --ignore=E501,E121 $(TESTS_JSON_FILES)
-	@pylint --disable=locally-disabled --score=no --jobs=4 $(PYLINT_FILES)
+	@pylint $(PYLINT_OPTIONS) $(PYLINT_FILES)
 
 define coverage-cleanup
 rm -f .coverage htmlcov/*

conda.recipe/meta.yaml

@@ -11,18 +11,17 @@ requirements:
     - python
     - numpy >=1.12.1
     - pandas >=0.22.0
+    - bokeh >=0.12.3
     - numba
     - toolz
-    - six
-    - bokeh >=0.12.3
+
   run:
     - python
     - numpy >=1.12.1
     - pandas >=0.22.0
+    - bokeh >=0.12.3
     - numba
     - toolz
-    - six
-    - bokeh >=0.12.3
 
 test:
   commands:

docs/cookbook.html

@@ -15,8 +15,8 @@ <h1 id="toc">Cookbook of Tested Recipes for Python Programming with
 <p>This document tells you how to use Tax-Calculator, an open-source
 federal income and payroll tax simulation model, in Python scripts
 that you can run on your own computer.  Note that these recipes
-require Tax-Calculator release 0.20.1 or higher.  For other ways of
-using Tax-Calculator, see the
+require Tax-Calculator release 0.21.0 or higher running on Python 3.6.
+For other ways of using Tax-Calculator, see the
 <a href="https://open-source-economics.github.io/Tax-Calculator/">
 user documentation</a>, which this Cookbook assumes you have read.</p>
 

docs/cookbook/recipe03.py

@@ -27,7 +27,7 @@
 tot_recips = 0.
 tot_amount = 0.
 idx = 0
-for gname, grp in gbydf:
+for grp_interval, grp in gbydf:
     recips = grp[grp['eitc'] > 0]['s006'].sum() * 1e-6
     tot_recips += recips
     amount = (grp['eitc'] * grp['s006']).sum() * 1e-9
@@ -36,7 +36,7 @@
         avg = amount / recips
     else:
         avg = np.nan
-    glabel = '[{:.8g}, {:.8g})'.format(gname.left, gname.right)
+    glabel = '[{:.8g}, {:.8g})'.format(grp_interval.left, grp_interval.right)
     print(results.format(glabel, recips, avg))
     idx += 1
 avg = tot_amount / tot_recips

docs/cookbook/recipe04.py

@@ -60,7 +60,7 @@
 tot_response = 0.
 tot_baseline = 0.
 idx = 0
-for gname, grp in gbydf:
+for grp_interval, grp in gbydf:
     funits = grp['s006'].sum() * 1e-6
     tot_funits += funits
     response = quantity_response(grp['e19800'],
@@ -75,7 +75,7 @@
     grp_baseline = (grp['e19800'] * grp['s006']).sum() * 1e-9
     tot_baseline += grp_baseline
     pct_response = 100. * grp_response / grp_baseline
-    glabel = '[{:.8g}, {:.8g})'.format(gname.left, gname.right)
+    glabel = '[{:.8g}, {:.8g})'.format(grp_interval.left, grp_interval.right)
     print(results.format(glabel, funits, grp_response, pct_response))
     idx += 1
 pct_response = 100. * tot_response / tot_baseline

docs/recipe03.py.html

@@ -28,7 +28,7 @@
 tot_recips = 0.
 tot_amount = 0.
 idx = 0
-for gname, grp in gbydf:
+for grp_interval, grp in gbydf:
     recips = grp[grp['eitc'] > 0]['s006'].sum() * 1e-6
     tot_recips += recips
     amount = (grp['eitc'] * grp['s006']).sum() * 1e-9
@@ -37,7 +37,7 @@
         avg = amount / recips
     else:
         avg = np.nan
-    glabel = '[{:.8g}, {:.8g})'.format(gname.left, gname.right)
+    glabel = '[{:.8g}, {:.8g})'.format(grp_interval.left, grp_interval.right)
     print(results.format(glabel, recips, avg))
     idx += 1
 avg = tot_amount / tot_recips

docs/recipe04.py.html

@@ -61,7 +61,7 @@
 tot_response = 0.
 tot_baseline = 0.
 idx = 0
-for gname, grp in gbydf:
+for grp_interval, grp in gbydf:
     funits = grp['s006'].sum() * 1e-6
     tot_funits += funits
     response = quantity_response(grp['e19800'],
@@ -76,7 +76,7 @@
     grp_baseline = (grp['e19800'] * grp['s006']).sum() * 1e-9
     tot_baseline += grp_baseline
     pct_response = 100. * grp_response / grp_baseline
-    glabel = '[{:.8g}, {:.8g})'.format(gname.left, gname.right)
+    glabel = '[{:.8g}, {:.8g})'.format(grp_interval.left, grp_interval.right)
     print(results.format(glabel, funits, grp_response, pct_response))
     idx += 1
 pct_response = 100. * tot_response / tot_baseline

environment.yml

@@ -2,10 +2,9 @@ name: taxcalc-dev
 dependencies:
 - numpy >=1.12.1
 - pandas >=0.22.0
+- bokeh >=0.12.3
 - numba
 - toolz
-- six
-- bokeh >=0.12.3
 - mock
 - pep8
 - pycodestyle

taxcalc/tests/test_compare.py

@@ -212,7 +212,7 @@ def comparison(cname, calc, cmpdata, ofile):
     txc_tot = 0.
     soi_tot = 0.
     idx = 0
-    for gname, grp in gbydf:
+    for grp_interval, grp in gbydf:
         txc = (grp['cvar'] * grp['s006']).sum() * 1e-9
         soi = cmpdata[cname]['SOI'][idx]
         txc_tot += txc
@@ -221,8 +221,9 @@ def comparison(cname, calc, cmpdata, ofile):
             pct_diff = 100. * ((txc / soi) - 1.)
         else:
             pct_diff = np.nan
-        grplabel = '[{:.8g}, {:.8g})'.format(gname.left, gname.right)
-        ofile.write(results.format(grplabel, txc, soi, pct_diff))
+        glabel = '[{:.8g}, {:.8g})'.format(grp_interval.left,
+                                           grp_interval.right)
+        ofile.write(results.format(glabel, txc, soi, pct_diff))
         idx += 1
     pct_diff = 100. * ((txc_tot / soi_tot) - 1.)
     ofile.write(results.format('ALL', txc_tot, soi_tot, pct_diff))