Update {cps,puf}csv_agg_expect.csv files

taxcalc/tests/cpscsv_agg_expect.csv

@@ -7,18 +7,18 @@ Standard Deduction Filers (#m),124.3,175.3,176.8,176.8,175.0,178.4,182.8,184.7,1
 Standard Deduction ($b),1092.1,2949.5,3024.7,3075.5,3066.7,3229.8,3576.6,3750.4,3869.1,1607.9
 Personal Exemption ($b),1383.6,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,2077.6
 Taxable Income ($b),6230.6,7957.9,8321.4,8617.4,10058.6,10330.4,10934.4,11447.4,12016.4,11787.0
-Regular Tax ($b),1108.0,1379.8,1448.8,1505.3,1763.9,1837.0,1932.2,2025.3,2134.4,2341.9
+Regular Tax ($b),1108.0,1379.8,1448.8,1505.3,1764.0,1837.0,1932.2,2025.3,2134.4,2341.9
 AMT Income ($b),8319.8,10262.0,10680.4,11012.7,12516.1,12879.8,13723.1,14366.8,15032.2,15073.4
 AMT Liability ($b),8.1,0.8,0.7,0.6,1.9,1.1,1.1,1.0,1.0,17.4
 AMT Filers (#m),2.6,0.2,0.2,0.1,0.3,0.2,0.2,0.2,0.2,4.1
-Tax before Credits ($b),1116.0,1380.6,1449.5,1505.8,1765.8,1838.1,1933.2,2026.3,2135.4,2359.2
+Tax before Credits ($b),1116.0,1380.6,1449.5,1505.9,1765.9,1838.1,1933.2,2026.3,2135.4,2359.2
 Refundable Credits ($b),70.8,102.4,102.7,654.9,827.1,98.5,107.4,109.8,110.0,95.8
 Nonrefundable Credits ($b),32.7,97.2,99.1,99.4,0.0,107.7,108.1,109.7,111.6,30.0
 Reform Surtaxes ($b),0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
 Other Taxes ($b),5.5,10.7,11.3,12.6,13.9,14.4,16.5,17.6,18.8,19.9
-Ind Income Tax ($b),1018.1,1191.6,1259.0,764.2,952.5,1646.2,1734.3,1824.5,1932.6,2253.3
+Ind Income Tax ($b),1018.1,1191.6,1259.0,764.2,952.6,1646.2,1734.3,1824.5,1932.6,2253.3
 Payroll Taxes ($b),1040.8,1141.6,1194.9,1217.9,1318.7,1421.6,1506.7,1582.0,1656.7,1730.7
-Combined Liability ($b),2059.0,2333.2,2453.9,1982.1,2271.2,3067.8,3241.0,3406.4,3589.3,3984.1
+Combined Liability ($b),2059.0,2333.2,2453.9,1982.2,2271.3,3067.8,3241.0,3406.4,3589.3,3984.1
 With Income Tax <= 0 (#m),88.1,96.2,97.0,135.2,127.7,96.1,98.1,98.8,99.2,97.2
 With Combined Tax <= 0 (#m),62.8,65.4,66.4,98.2,97.7,67.9,69.4,70.3,71.1,70.6
 UBI Benefits ($b),0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0

taxcalc/tests/pufcsv_agg_expect.csv

@@ -7,18 +7,18 @@ Standard Deduction Filers (#m),145.2,174.7,177.1,178.9,179.5,182.7,186.9,189.6,1
 Standard Deduction ($b),1239.3,2862.1,2951.5,3034.7,3071.8,3231.2,3571.5,3761.2,3905.1,1851.1
 Personal Exemption ($b),1365.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,1955.4
 Taxable Income ($b),8112.4,9178.7,9519.8,9908.1,12011.8,11926.8,12679.3,13147.5,13725.9,13382.8
-Regular Tax ($b),1656.8,1712.3,1778.1,1862.1,2282.8,2282.6,2416.1,2498.4,2612.2,2795.2
+Regular Tax ($b),1656.8,1712.3,1778.1,1862.2,2283.3,2282.6,2416.1,2498.4,2612.2,2795.2
 AMT Income ($b),10512.6,11427.4,11835.3,12265.7,14419.0,14452.6,15428.0,16043.9,16734.2,16933.8
 AMT Liability ($b),51.3,23.2,24.1,25.1,29.0,28.6,30.0,31.5,33.1,85.4
 AMT Filers (#m),5.7,0.6,0.6,0.3,0.7,0.6,0.6,0.6,0.6,7.4
-Tax before Credits ($b),1708.1,1735.5,1802.2,1887.2,2311.8,2311.2,2446.1,2529.9,2645.3,2880.6
+Tax before Credits ($b),1708.1,1735.5,1802.2,1887.3,2312.3,2311.2,2446.1,2529.9,2645.3,2880.6
 Refundable Credits ($b),102.9,117.4,118.5,641.8,802.6,119.2,127.9,131.5,133.3,120.3
 Nonrefundable Credits ($b),67.0,127.3,129.2,128.7,47.6,140.8,143.1,144.4,146.3,78.0
 Reform Surtaxes ($b),0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
 Other Taxes ($b),40.0,44.8,43.6,52.9,84.9,61.5,66.5,65.2,66.0,64.2
-Ind Income Tax ($b),1578.3,1535.5,1598.1,1169.6,1546.4,2112.7,2241.6,2319.3,2431.6,2746.5
+Ind Income Tax ($b),1578.3,1535.5,1598.1,1169.7,1546.9,2112.7,2241.6,2319.3,2431.6,2746.5
 Payroll Taxes ($b),1083.8,1133.3,1185.4,1209.0,1306.0,1403.4,1489.3,1563.9,1637.9,1711.0
-Combined Liability ($b),2662.0,2668.8,2783.5,2378.5,2852.4,3516.2,3730.9,3883.3,4069.5,4457.5
+Combined Liability ($b),2662.0,2668.8,2783.5,2378.7,2852.8,3516.2,3730.9,3883.3,4069.5,4457.5
 With Income Tax <= 0 (#m),92.8,98.6,99.7,131.4,124.9,100.3,102.1,103.2,104.0,100.8
 With Combined Tax <= 0 (#m),63.4,65.6,66.8,102.0,94.5,68.9,70.3,71.4,72.4,72.2
 UBI Benefits ($b),0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0

taxcalc/tests/test_cpscsv.py

@@ -14,6 +14,7 @@
 
 import os
 import json
+import pytest
 import numpy as np
 import pandas as pd
 # pylint: disable=import-error
@@ -23,6 +24,7 @@
 START_YEAR = 2017
 
 
+@pytest.mark.cpscsv_agg
 def test_agg(tests_path, cps_fullsample):
     """
     Test current-law aggregate taxes using cps.csv file.

taxcalc/tests/test_pufcsv.py

@@ -27,6 +27,7 @@
 START_YEAR = 2017
 
 
+@pytest.mark.pufcsv_agg
 @pytest.mark.requires_pufcsv
 def test_agg(tests_path, puf_fullsample):
     """