diff --git a/cps_stage1/stage1.py b/cps_stage1/stage1.py index 7f28439b..8635279b 100644 --- a/cps_stage1/stage1.py +++ b/cps_stage1/stage1.py @@ -6,7 +6,7 @@ def main(syr=2014): SYR = str(syr) # Start year of CPS - EYR = 2035 # Last year in our extrapolation + EYR = 2036 # Last year in our extrapolation # Read in state SOI estimates soi_estimates = pd.read_csv( diff --git a/cps_stage1/stage_2_targets.csv b/cps_stage1/stage_2_targets.csv index 852b0034..84705924 100644 --- a/cps_stage1/stage_2_targets.csv +++ b/cps_stage1/stage_2_targets.csv @@ -1,24 +1,24 @@ -,2014,2015,2016,2017,2015,2016,2017,2018,2019,2020,2021,2022,2023,2024,2025,2026,2027,2028,2029,2030,2031,2032,2033,2034,2035 -Single,69579590,71086947,71410690,73021932,72028792,71924422,73183813,74331876,75333822,76224441,77122018,77984804,78861507,79745168,80635787,81540322,82451814,83377223,84309589,85248914,86209112,87169310,88150383,89131455,90133401 -Joint,55128595,57272012,57201828,57987204,57069122,56986429,57984256,58893878,59687730,60393376,61104535,61788129,62482750,63182883,63888529,64605200,65327385,66060595,66799319,67543555,68304329,69065104,69842417,70619730,71413582 -HH,22077498,22134303,21659639,21894095,22854626,22821510,23221112,23585391,23903307,24185899,24470699,24744460,25022636,25303020,25585612,25872620,26161835,26455466,26751304,27049351,27354020,27658689,27969982,28281275,28599191 -SS_return,27401498,28087514,28329015,28967603,31684352,32736570,33818929,34953351,36139836,37386604,38614191,39891101,41154310,42384637,43664287,44875433,46007115,47097695,48141692,49089784,49843325,50509181,51128455,51758690,52484829 -Dep_return,96916673,96505181,94809260,94708629,99911398,100735190,101549290,102373082,103187182,104001282,104805690,105610099,106414507,107209224,107984557,108759890,109525532,110281482,111018049,111744924,112452416,113150216,113828632,114487666,115137008 -INTS,156367939,95881223,96640233,106055367,124828526,125813644,138072890,143545768,146829495,146407301,147423693,155851925,184373437,175945205,192488933,201542637,213364053,231127451,248155919,263292336,278288021,293580805,307075359,322555785,337786022 -DIVS,254702232,260252720,254065327,282336042,340613295,332513764,369521998,401130545,421201081,463481652,494147800,519032208,531334326,636933872,674222278,713370011,743246583,770678014,802108269,834455452,867413921,901111027,935674119,971281492,1007958613 -SCHCI,374659000,391975736,389078638,416010104,435503622,432281554,462216808,485895257,491852335,503691560,536549154,552846820,573190804,618974134,645574923,673749280,699638217,724328245,748681080,773333642,799260045,827322004,858493633,891650954,925407730 -SCHCL,57400238,60161435,60996610,69637956,63668344,64552308,73696166,77467361,78425945,80308673,85549315,88149545,91386919,98688229,102930107,107418805,111551623,115489279,119369535,123301451,127434268,131911487,136882348,142163169,147541572 -CGNS,705007630,713598090,634341278,859894631,1249696525,1110880523,1505896298,1631599158,1522675479,1983609468,3582355270,2216825992,1630541647,2364595591,2497983035,2427270769,2360929551,2361775560,2406896049,2473660271,2553960640,2645259129,2742550181,2844000779,2950104428 -Pension,663223262,689991999,693626543,729187412,776568117,800178866,846471849,889515039,925594384,996293984,1069779122,1093456192,1161502899,1239696921,1300647139,1361928969,1422348608,1487543454,1553932103,1620785008,1687770557,1757210033,1828705500,1903251795,1981578462 -SCHEI,846331543,891134646,882933054,973306129,1140431754,1129937243,1245546132,1348629314,1385360103,1322308403,1621317337,1711451646,1505793081,2221112501,2278747680,2301090832,2309384881,2305407123,2319879393,2380222832,2482459682,2598068571,2711053832,2821923264,2937108987 -SCHEL,166947674,177896945,176446339,206369393,169401805,168032834,196514107,212774811,218567895,208634508,255797226,270021168,237566540,350423168,359521816,363044412,364363299,363728897,366016080,375532098,391675938,409906624,427736636,445216057,463396659 -SS,575126918,605152093,619856114,644989570,709246515,726500323,755946821,795975655,848657280,898463271,939067232,1016191751,1138003633,1234222366,1313187292,1389794197,1469219225,1554568059,1642447452,1732167252,1823152330,1915172637,2008055634,2105424621,2207567162 -UCOMP,33288898,27225383,25420264,23946035,9810238,9161105,8628482,7962704,7490002,7746327,66767543,10193061,7633144,8711705,11041927,12180408,12736332,13235666,13651777,14094519,14567222,15036595,15482666,15925409,16398111 -wage1,114320683,112017897,111270085,107376379,132211870,134189618,140763057,147839507,154870229,157088051,170920853,185370987,194653827,206234512,216317596,226274928,235820705,245778036,255872553,266024229,276415979,287104963,298011156,309351768,321081070 -wage2,261995646,261659142,253415638,247511878,302997965,307530489,322595239,338812769,354925502,360008217,391709690,424825940,446099986,472640145,495748161,518567982,540444619,563264439,586398655,609663868,633479272,657975865,682970250,708960218,735840971 -wage3,381259619,383184602,382875414,382789227,440926749,447522541,469444969,493044939,516492406,523888842,570021256,618212472,649170753,687792353,721419451,754627164,786462342,819670055,853335279,887191133,921847633,957495407,993867575,1031688529,1070805766 -wage4,418567676,428313928,436140082,441282302,484073517,491314738,515382379,541291719,567033631,575153844,625800532,678707487,712695182,755096088,792013757,828471001,863421402,899878647,936838172,974006982,1012054784,1051190862,1091122218,1132644131,1175589175 -wage5,418379915,424369612,426147995,437485582,483856372,491094344,515151189,541048906,566779271,574895841,625519811,678403032,712375481,754757367,791658475,828099366,863034089,899474979,936417926,973570062,1011600796,1050719319,1090632762,1132136050,1175061829 -wage6,916618937,952347137,962308451,1000500360,1060069801,1075927308,1128632897,1185371609,1241743674,1259526081,1370436973,1486297606,1560727064,1653580562,1734426353,1814263862,1890801543,1970639053,2051576505,2132972266,2216292928,2301996798,2389442245,2480370844,2574415946 -wage7,840581301,835434509,852517230,870406373,972132275,986674331,1035007756,1087039738,1138735488,1155042766,1256753103,1363002580,1431257781,1516408667,1590547938,1663762569,1733951108,1807165739,1881389068,1956032687,2032441528,2111035879,2191227335,2274613001,2360856642 -wage8,3433224075,3714896131,3792750634,4090211841,3970523643,4029918419,4227328804,4439845374,4650988654,4717593201,5133013315,5566972838,5845750633,6193536231,6496346595,6795380412,7082054622,7381088439,7684242125,7989112423,8301192491,8622198942,8949728519,9290304347,9642553137 +,2014,2015,2016,2017,2015,2016,2017,2018,2019,2020,2021,2022,2023,2024,2025,2026,2027,2028,2029,2030,2031,2032,2033,2034,2035,2036 +Single,69579590,71086947,71410690,73021932,72028792,71924422,73183813,74331876,75333822,76224441,77122018,77984804,78861507,79745168,80635787,81540322,82451814,83377223,84309589,85248914,86209112,87169310,88150383,89131455,90133401,91142305 +Joint,55128595,57272012,57201828,57987204,57069122,56986429,57984256,58893878,59687730,60393376,61104535,61788129,62482750,63182883,63888529,64605200,65327385,66060595,66799319,67543555,68304329,69065104,69842417,70619730,71413582,72212947 +HH,22077498,22134303,21659639,21894095,22854626,22821510,23221112,23585391,23903307,24185899,24470699,24744460,25022636,25303020,25585612,25872620,26161835,26455466,26751304,27049351,27354020,27658689,27969982,28281275,28599191,28919315 +SS_return,27401498,28087514,28329015,28967603,31684352,32736570,33818929,34953351,36139836,37386604,38614191,39891101,41154310,42384637,43664287,44875433,46007115,47097695,48141692,49089784,49843325,50509181,51128455,51758690,52484829,53139725 +Dep_return,96916673,96505181,94809260,94708629,99911398,100735190,101549290,102373082,103187182,104001282,104805690,105610099,106414507,107209224,107984557,108759890,109525532,110281482,111018049,111744924,112452416,113150216,113828632,114487666,115137008,115776658 +INTS,156367939,95881223,96640233,106055367,124828526,125813644,138072890,143545768,146829495,146407301,134695343,144655980,162638293,171254167,180855158,201136080,216851058,237272711,256959434,272752596,288655215,304636019,319256421,335377956,349826353,364024562 +DIVS,254702232,260252720,254065327,282336042,340613295,332513764,369521998,401130545,421201081,463481652,543865676,577588252,687313973,710135293,730256769,777274801,777987968,777605914,776154112,791563597,819071438,854602399,894743471,937635327,983150616,1029531892 +SCHCI,374659000,391975736,389078638,416010104,435503622,432281554,462216808,485895257,491852335,503691560,528568917,538722176,589600868,619423725,644825605,676446824,709266953,742686536,776855436,812185780,848227976,884532433,921249015,958977176,997904246,1037955294 +SCHCL,57400238,60161435,60996610,69637956,63668344,64552308,73696166,77467361,78425945,80308673,84275029,85893716,94010110,98762850,102809566,107855047,113084209,118410951,123863974,129494937,135240701,141026645,146881469,152897014,159101980,165490626 +CGNS,705007630,713598090,634341278,859894631,1249696525,1110880523,1505896298,1631599158,1522675479,1983609468,3582355270,2216825992,1687224260,2223030059,2825882083,2935087765,2830112129,2679734002,2632075486,2645188628,2695314670,2766802444,2852178868,2948835414,3054093053,3163369236 +Pension,663223262,689991999,693626543,729187412,776568117,800178866,846471849,889515039,925594384,996293984,1075416519,1097236565,1184848358,1251170684,1312916769,1375326078,1435613073,1496828580,1557447186,1620785008,1688035846,1758735446,1831358393,1906567911,1983833421,2063552857 +SCHEI,846331543,891134646,882933054,973306129,1140431754,1129937243,1245546132,1348629314,1385360103,1322308403,1710012883,1940553595,2116421290,2224328561,2335621159,2449452752,2452161013,2452838078,2469680076,2529938881,2618549794,2726541699,2841812055,2964445496,3094526654,3227654606 +SCHEL,166947674,177896945,176446339,206369393,169401805,168032834,196514107,212774811,218567895,208634508,269787441,306182034,333912043,350940706,368486906,386450476,386884540,386984708,389655871,399155194,413145409,430174072,448371368,467703909,488238473,509240490 +SS,575126918,605152093,619856114,644989570,709246515,726500323,755946821,795975655,848657280,898463271,939067232,1016651853,1139153886,1236350336,1338320338,1423554147,1505624759,1594079279,1683914103,1775359283,1868529844,1962390557,2056596346,2151607313,2250989244,2354972191 +UCOMP,33288898,27225383,25420264,23946035,9810238,9161105,8628482,7962704,7490002,7746327,66767543,10193061,7633144,9600518,11041927,12067226,12819555,13152444,13345519,13511964,13871484,14287595,14677075,15093186,15509298,15952040 +wage1,114320683,112017897,111270085,107376379,132211870,134189618,140763057,147839507,154870229,157088051,171298111,184639335,194882468,205765797,215940338,225097425,234791819,244509077,254283495,264309419,274495392,284807118,295381781,306299406,317605722,329369320 +wage2,261995646,261659142,253415638,247511878,302997965,307530489,322595239,338812769,354925502,360008217,392574276,423149168,446623978,471565963,494883576,515869427,538086658,560356288,582756915,605733934,629077746,652709753,676944350,701964934,727876304,754835656 +wage3,381259619,383184602,382875414,382789227,440926749,447522541,469444969,493044939,516492406,523888842,571279413,615772411,649933273,686229188,720161294,750700190,783031006,815438073,848035771,881472239,915442471,949832089,985098604,1021508897,1059215474,1098447088 +wage4,418567676,428313928,436140082,441282302,484073517,491314738,515382379,541291719,567033631,575153844,627181806,676028654,713532317,753379960,790632483,824159754,859654293,895232545,931020082,967728467,1005022847,1042777651,1081495161,1121468374,1162864717,1205935331 +wage5,418379915,424369612,426147995,437485582,483856372,491094344,515151189,541048906,566779271,574895841,626900465,675725401,713212241,753042009,790277821,823790053,859268669,894830962,930602445,967294363,1004572014,1042309882,1081010024,1120965306,1162343080,1205394373 +wage6,916618937,952347137,962308451,1000500360,1060069801,1075927308,1128632897,1185371609,1241743674,1259526081,1373461815,1480431245,1562560302,1649822425,1731401510,1804822687,1882551973,1960464582,2038835502,2119222982,2200893730,2283572758,2368360009,2455897118,2546550731,2640870819 +wage7,840581301,835434509,852517230,870406373,972132275,986674331,1035007756,1087039738,1138735488,1155042766,1259527021,1357622859,1432938944,1512962284,1587774019,1655104582,1726385876,1797835287,1869704988,1943423968,2018319762,2094140195,2171893966,2252169480,2335302970,2421798786 +wage8,3433224075,3714896131,3792750634,4090211841,3970523643,4029918419,4227328804,4439845374,4650988654,4717593201,5144342954,5545000204,5852617081,6179460013,6485016955,6760018204,7051155605,7342979652,7636520310,7937614061,8243514326,8553191138,8870764365,9198637264,9538183125,9891461882 diff --git a/cps_stage2/cps_weights.csv.gz b/cps_stage2/cps_weights.csv.gz index 6e166ce5..7a73cecc 100644 Binary files a/cps_stage2/cps_weights.csv.gz and b/cps_stage2/cps_weights.csv.gz differ diff --git a/cps_stage2/solver.jl b/cps_stage2/solver.jl index 3e96d0f0..129fc6bd 100644 --- a/cps_stage2/solver.jl +++ b/cps_stage2/solver.jl @@ -80,7 +80,7 @@ function Solve_func(year, tol) end -year_list = [x for x in 2014:2035] +year_list = [x for x in 2014:2036] tol = 0.70 # Run solver function for all years and tolerances (in order) diff --git a/cps_stage2/stage2.py b/cps_stage2/stage2.py index 8ce2a26f..1e9bf4cc 100644 --- a/cps_stage2/stage2.py +++ b/cps_stage2/stage2.py @@ -11,7 +11,7 @@ STAGE_1_PATH = Path(CUR_PATH, "..", "puf_stage1", "Stage_I_factors.csv") STAGE_2_PATH = Path(CUR_PATH, "..", "cps_stage1", "stage_2_targets.csv") START_YEAR = 2014 -END_YEAR = 2035 +END_YEAR = 2036 # Read hashes used to see which years can be skipped with open(Path(CUR_PATH, "..", "datahashes.json")) as f: diff --git a/createcps.py b/createcps.py index 9b069846..47ceb53c 100644 --- a/createcps.py +++ b/createcps.py @@ -2,7 +2,6 @@ from taxdata import cps from pathlib import Path - CUR_PATH = Path(__file__).resolve().parent DATA_PATH = Path(CUR_PATH, "data") diff --git a/data/cps.csv.gz b/data/cps.csv.gz index 596d48ea..b3ef2ce0 100644 Binary files a/data/cps.csv.gz and b/data/cps.csv.gz differ diff --git a/docs/book/content/methods/CBO_Baseline_Updating_Instructions.md b/docs/book/content/methods/CBO_Baseline_Updating_Instructions.md index f2ecb2bb..af228622 100644 --- a/docs/book/content/methods/CBO_Baseline_Updating_Instructions.md +++ b/docs/book/content/methods/CBO_Baseline_Updating_Instructions.md @@ -47,9 +47,9 @@ As previously mentioned, most of the variables we used can be found in the To manually update these variables download the latest file and copy/paste the specific variables. -Previous Document: February 2023 +Previous Document: January 2025 -Current Document: January 2025 +Current Document: February 2026 | Variable | Name In CBO Document | |----------|-----------------------------------------------------| @@ -72,7 +72,7 @@ Source: [Revenue Projections, By Category (CBO)](https://www.cbo.gov/about/produ Previous: [January 2025](https://www.cbo.gov/system/files/2025-01/51138-2025-01-Revenue-Projections.xlsx) -Current: [January 2025](https://www.cbo.gov/system/files/2025-01/51138-2025-01-Revenue-Projections.xlsx) +Current: [February 2026](https://www.cbo.gov/system/files/2026-02/51138-2026-02-Revenue.xlsx) In the revenue projections file, the data is in the `Capital Gains Realizations` tab under the `Capital Gains Realizations` column. @@ -83,7 +83,7 @@ Source: [IRS Publication 6187 Table 1B](https://www.irs.gov/statistics/projectio Previous: [Fall 2022 Report](https://www.irs.gov/pub/irs-soi/22projpub6187tables.xlsx) -Current: [Publication 6187 Report](https://www.irs.gov/pub/irs-soi/24projpub6187tables.xlsx) +Current: [Publication 6187 Report](https://www.irs.gov/pub/irs-soi/25projpub6187tables.xlsx) The projections in the publication typically end a few years before the 10-year projections do. We use the growth rate from the final year in the @@ -96,16 +96,19 @@ Source: [OASI Trust Fund Annual Trustees Report](https://www.ssa.gov/oact/TR/) Table VI.C4. Operations of the OASI Trust Fund, Table VI.C4, Column: `Scheduled Benefits: Intermediate Level` -Previous: [2023 Report](https://www.ssa.gov/oact/TR/2023/VI_C_SRfyproj.html) +Previous: [2024 Report](https://www.ssa.gov/oact/TR/2024/VI_C_SRfyproj.html) -Current: [2024 Report](https://www.ssa.gov/oact/TR/2024/VI_C_SRfyproj.html) +Current: [2025 Report](https://www.ssa.gov/oact/TR/2025/VI_C_SRfyproj.html) Projections are taken directly from the `Scheduled Benefits: Intermediate Level` column of this table. ### CPIM (CPI Medical Care) -Source: [BLS Database](http://data.bls.gov/timeseries/CUSR0000SAM?output_view=pct_1mth) +Previous: [BLS Database](http://data.bls.gov/timeseries/CUSR0000SAM?output_view=pct_1mth) + +Current: [CBO Economic Projections](https://www.cbo.gov/system/files/2026-02/51135-2026-02-Economic-Projections.xlsx) + Series ID: CUSR0000SAM Access Date: @@ -120,13 +123,15 @@ Manual Instructions: 6. Find the average difference between CPI-U from the CBO 10-Year projections 7. Add this average difference to the CBO CPI-U projections +NOTE: The latest CBO Economic Projections contain forecasts for the CPI-U Medical Care. This is now used in CBO_baseline.csv for CPIM + ### UCOMP Source: [CBO Unemployment Compensation projections](https://www.cbo.gov/about/products/baseline-projections-selected-programs#24) Previous: [January 2025](https://www.cbo.gov/system/files/2025-01/51316-2025-01-unemployment.xlsx) -Current: [January 2025](https://www.cbo.gov/system/files/2025-01/51316-2025-01-unemployment.xlsx) +Current: [February 2026](https://www.cbo.gov/system/files/2026-02/51316-2026-02-unemployment.xlsx) Note: Change the `Total Benefits` number from the table to be in terms of billions rather than millions of dollars diff --git a/environment.yml b/environment.yml index dce88202..f7a4eeb8 100644 --- a/environment.yml +++ b/environment.yml @@ -26,4 +26,4 @@ dependencies: - requests-html - black - taxcalc>=5.3.0 - - jupyter-book>=0.9.1 + - jupyter-book<2.0.0 diff --git a/puf_stage1/CBO_baseline.csv b/puf_stage1/CBO_baseline.csv index 24ca41ad..f25c4706 100644 --- a/puf_stage1/CBO_baseline.csv +++ b/puf_stage1/CBO_baseline.csv @@ -1,16 +1,16 @@ -,2008,2009,2010,2011,2012,2013,2014,2015,2016,2017,2018,2019,2020,2021,2022,2023,2024,2025,2026,2027,2028,2029,2030,2031,2032,2033,2034,2035 -GDP,14718.6,14418.7,14964.4,15517.9,16163.2,16800.0,17348.1,18036.7,18624.5,19479.6,20527.2,21372.6,21060.5,23315.1,25419.5,26438.4,29166.2,30441.1,31640.6,32841.0,34078.4,35378.4,36738.8,38151.3,39626.7,41154.2,42727.6,44345.4 -TPY,12429.6,12087.5,12429.3,13202.0,13887.7,14166.9,14694.2,15458.5,15928.7,16850.2,17706.0,18424.4,19832.3,21294.8,21766.7,23120.9,24676.7,25890.0,27110.3,28313.3,29611.2,30932.5,32263.0,33596.3,34978.9,36402.2,37885.7,39444.9 -Wages,6531.9,6251.4,6377.5,6633.2,6932.1,7124.7,7477.8,7854.8,8085.3,8474.7,8900.5,9323.5,9457.4,10290.1,11160.2,11719.0,12416.2,13022.9,13622.7,14197.0,14796.4,15404.3,16015.7,16641.4,17284.4,17941.1,18623.9,19330.3 -SCHC,979.5,937.5,986.7,1068.1,1187.9,1253.5,1268.5,1336.8,1298.7,1466.4,1541.5,1560.5,1598.0,1702.3,1754.0,1818.5,1963.7,2048.2,2137.5,2219.7,2298.0,2375.3,2453.5,2535.7,2624.8,2723.7,2828.8,2935.9 -SCHF,47.0,35.5,46.0,75.5,72.3,83.2,78.1,40.0,43.2,39.5,38.9,38.4,45.2,51.3,90.1,93.8,40.1,42.2,45.5,48.2,50.6,52.8,54.9,56.8,58.5,60.0,61.5,62.8 -INTS,1361.6,1264.3,1195.0,1231.6,1255.9,1255.2,1302.0,1302.8,1415.3,1553.4,1615.0,1652.0,1647.3,1658.6,1753.4,2074.3,1979.6,2165.6,2267.6,2400.5,2600.4,2792.0,2962.3,3131.0,3303.0,3454.8,3629.0,3800.4 -DIVS,805.4,553.7,544.6,682.2,832.7,824.5,815.5,951.1,962.5,1154.5,1253.3,1316.0,1448.1,1543.9,1621.6,1660.1,1990.0,2106.5,2228.8,2322.2,2407.9,2506.1,2607.1,2710.1,2815.4,2923.4,3034.6,3149.2 -RENTS,262.1,333.7,402.8,485.3,533.0,595.8,610.8,659.6,707.4,652.7,681.9,692.1,719.9,723.8,783.4,840.8,1052.8,1075.9,1115.5,1150.9,1178.9,1208.7,1239.6,1236.6,1240.7,1258.5,1288.0,1329.7 -CGNS,498.0,263.0,394.0,404.0,647.0,511.0,716.0,725.0,641.0,871.3,944.0,881.0,1147.7,2072.7,1282.6,943.4,1368.1,1445.3,1404.4,1366.0,1366.5,1392.6,1431.2,1477.7,1530.5,1586.8,1645.5,1706.9 -BOOK,1285.1,1397.0,1746.4,1816.6,2022.8,2106.9,2072.9,2088.1,2073.5,2128.9,2305.0,2367.8,2260.1,2771.1,2925.1,2573.6,3796.2,3894.7,3932.9,3947.1,3940.3,3965.0,4068.2,4243.0,4440.6,4633.6,4823.1,5020.0 -RETS,142.5,140.5,142.9,145.4,144.9,146.6,148.3,147.8,149.7,149.9,152.5,153.5,160.1,164.4,170.7,159.0,160.8,162.1,163.5,164.8,166.1,167.5,168.8,170.2,171.6,173.0,174.4,175.8 -SOCSEC,503.0,544.5,572.5,591.5,627.2,663.2,698.2,733.7,762.1,791.1,833.0,888.1,940.2,982.7,1063.4,1190.9,1291.6,1374.2,1454.4,1537.5,1626.8,1718.8,1812.7,1907.9,2004.2,2101.4,2203.3,2310.2 -CPIU,215.3,214.5,218.1,224.9,229.6,233.0,236.7,237.0,240.0,245.1,251.1,255.6,258.8,271.0,292.9,306.9,313.6,320.6,328.4,336.0,343.6,351.3,359.2,367.2,375.5,383.9,392.5,401.3 -CPIM,364.1,375.6,388.4,400.3,414.9,425.1,435.3,446.8,463.7,475.3,484.7,498.4,518.9,525.3,546.5,549.1,563.8,534.3,542.1,549.7,557.3,565.0,572.9,580.9,589.2,597.6,606.2,615.0 -UCOMP,51.1,131.2,138.9,107.2,83.6,62.2,43.8,39.9,31.2,31.1,28.7,27.0,27.925,240.656,36.743,27.511,31.4,39.8,43.9,45.9,47.7,49.2,50.8,52.5,54.2,55.8,57.4,59.1 +,2008,2009,2010,2011,2012,2013,2014,2015,2016,2017,2018,2019,2020,2021,2022,2023,2024,2025,2026,2027,2028,2029,2030,2031,2032,2033,2034,2035,2036 +GDP,14718.6,14418.7,14964.4,15517.9,16163.2,16800.0,17348.1,18036.7,18624.5,19479.6,20527.2,21372.6,21060.5,23594.1,25744.1,27811.5,29298.0,30705.2,32274.2,33651.5,35001.9,36350.7,37742.5,39174.8,40650.4,42185.4,43776.6,45430.9,47146.7 +TPY,12429.6,12087.5,12429.3,13202.0,13887.7,14166.9,14694.2,15458.5,15928.7,16850.2,17706.0,18424.4,19832.3,21407.7,21840.8,23585.0,24905.9,26134.8,27377.1,28576.6,29795.3,31002.9,32262.6,33602.1,35008.8,36454.8,37951.5,39490.1,41076.6 +Wages,6531.9,6251.4,6377.5,6633.2,6932.1,7124.7,7477.8,7854.8,8085.3,8474.7,8900.5,9323.5,9457.4,10312.6,11116.0,11732.4,12387.9,13000.4,13551.9,14135.1,14720.6,15308.7,15912.1,16525.5,17146.2,17783.0,18440.3,19121.2,19828.9 +SCHC,979.5,937.5,986.7,1068.1,1187.9,1253.5,1268.5,1336.8,1298.7,1466.4,1541.5,1560.5,1598.0,1676.9,1709.2,1870.6,1965.2,2045.8,2146.1,2250.2,2356.2,2464.7,2576.7,2691.1,2806.2,2922.7,3042.4,3165.9,3293.0 +SCHF,47.0,35.5,46.0,75.5,72.3,83.2,78.1,40.0,43.2,39.5,38.9,38.4,45.2,72.3,81.8,71.4,57.9,77.7,72.1,69.6,68.0,67.1,66.8,66.9,67.3,67.8,68.4,69.2,70.0 +INTS,1361.6,1264.3,1195.0,1231.6,1255.9,1255.2,1302.0,1302.8,1415.3,1553.4,1615.0,1652.0,1647.3,1515.5,1627.5,1829.8,1926.7,2034.8,2262.9,2439.8,2669.5,2891.1,3068.8,3247.6,3427.5,3591.9,3773.3,3935.9,4095.6 +DIVS,805.4,553.7,544.6,682.2,832.7,824.5,815.5,951.1,962.5,1154.5,1253.3,1316.0,1448.1,1699.2,1804.6,2147.4,2218.7,2281.6,2428.5,2430.7,2429.5,2425.0,2473.1,2559.1,2670.1,2795.5,2929.5,3071.7,3216.6 +RENTS,262.1,333.7,402.8,485.3,533.0,595.8,610.8,659.6,707.4,652.7,681.9,692.1,719.9,814.2,878.3,1002.5,1078.2,1122.5,1147.5,1186.2,1216.7,1243.0,1263.7,1288.9,1319.5,1358.5,1402.2,1449.8,1500.8 +CGNS,498.0,263.0,394.0,404.0,647.0,511.0,716.0,725.0,641.0,871.3,944.0,881.0,1147.7,2072.7,1282.6,976.220,1286.228,1635.024,1698.191,1637.475,1550.468,1522.881,1530.464,1559.446,1600.810,1650.213,1706.154,1767.034,1830.278 +BOOK,1285.1,1397.0,1746.4,1816.6,2022.8,2106.9,2072.9,2088.1,2073.5,2128.9,2305.0,2367.8,2260.1,2922.7,3316.8,3617.3,3801.7,3991.9,4186.5,4191.1,4192.3,4221.1,4324.1,4475.6,4660.1,4857.2,5066.7,5289.1,5516.6 +RETS,142.5,140.5,142.9,145.4,144.9,146.6,148.3,147.8,149.7,149.9,152.5,153.5,160.1,164.4,163.2,159.0,159.3,161.5,162.4,163.2,164.1,165.0,165.8,166.5,167.3,168.1,168.9,169.7,170.5 +SOCSEC,503.0,544.5,572.5,591.5,627.2,663.2,698.2,733.7,762.1,791.1,833.0,888.1,940.2,982.7,1063.9,1192.1,1293.8,1400.5,1489.7,1575.6,1668.2,1762.2,1857.9,1955.4,2053.6,2152.2,2251.6,2355.6,2464.4 +CPIU,215.3,214.5,218.1,224.9,229.6,233.0,236.7,237.0,240.0,245.1,251.1,255.6,258.8,271.0,292.6,304.704,313.697,322.378,331.807,340.260,348.295,356.264,364.328,372.557,380.967,389.564,398.355,407.346,416.542 +CPIM,364.1,375.6,388.4,400.2,414.9,425.1,435.3,446.8,463.7,475.3,484.7,498.4,518.9,525.3,546.6,549.1,563.8,581.3,600.3,617.7,636.7,656.4,676.8,697.8,719.6,741.9,764.9,788.6,813.1 +UCOMP,51.1,131.2,138.9,107.2,83.6,62.2,43.8,39.9,31.2,31.1,28.7,27.0,27.925,240.656,36.743,27.511,34.6,39.8,43.5,46.2,47.4,48.1,48.7,50.0,51.5,52.9,54.4,55.9,57.5 diff --git a/puf_stage1/Stage_II_targets.csv b/puf_stage1/Stage_II_targets.csv index ecce4cea..05ee9458 100644 --- a/puf_stage1/Stage_II_targets.csv +++ b/puf_stage1/Stage_II_targets.csv @@ -1,31 +1,31 @@ -,2011,2012,2013,2014,2015,2016,2017,2018,2019,2020,2021,2022,2023,2024,2025,2026,2027,2028,2029,2030,2031,2032,2033,2034,2035 -US Population,311721632,314112078,316497531,318857056,321368864,323995528,326625791,329256465,331883986,334503458,337108968,339698079,342267302,344814299,347334912,349825585,352281475,354698370,357072830,359402194,361684740,363919527,366106294,368245560,370338137 -POP_DEP,82840576,82503131,82296428,82135602,82109509,82178228,82284937,82410728,82547300,82624346,82772040,83023463,83259014,83463249,83673850,83868421,84024180,84193698,84484144,84767392,85040759,85334627,85631465,85903535,86153476 -POP_SNR,41366628,43164909,44723041,46243211,47830245,49420383,51055052,52766466,54556914,56441027,58292098,60221375,62126945,63987872,65919552,67748101,69455598,71098995,72675827,74107408,75245391,76250731,77185290,78138264,79232881 -Single Returns,67294506,66655855,68563354,69579590,71086947,71410690,73021932,74164397,75166909,76052548,76951274,77812834,78684040,79565000,80455824,81356621,82267505,83188586,84119980,85061802,86014169,86977199,87951011,88935726,89931466 -Joint Returns,56013790,56458434,56796607,55128595,57272012,57201828,57987204,58894443,59690545,60393837,61107520,61791691,62483522,63183098,63890507,64605837,65329175,66060612,66800238,67548145,68304426,69069175,69842485,70624454,71415178 -Head of Household Returns,22061944,21814184,21991339,22077498,22134303,21659639,21894095,22236639,22537222,22802762,23072226,23330546,23591759,23855897,24122992,24393077,24666186,24942353,25221612,25503998,25789545,26078289,26370266,26665512,26964064 -Number of Returns w/ Gross Security Income,25837226,26480552,27070833,27401498,28087514,28329015,28967603,29938625,30954489,32023496,33073756,34168389,35249571,36305423,37401419,38438901,39407700,40340131,41234793,42047043,42692712,43263121,43793371,44334069,44955133 -Number of Dependent Exemptions,99345455,97912393,97691386,96916673,96505181,94809260,94708629,94853412,95010605,95099283,95269277,95558660,95829776,96064847,96307245,96531193,96710470,96905582,97239881,97565894,97880535,98218773,98560428,98873577,99161255 -Taxable Interest Income,120111673,111789613,100648711,93894280,95881223,96640233,106055367,110260987,112787090,112466207,113237693,119709978,141618802,135153344,147852133,154815984,163889474,177537258,190618376,202245277,213762942,225505908,235869758,247762924,259464926 -Ordinary Dividends,194609806,260393306,214972683,254702232,260252720,254065327,282336042,306497844,321831296,354136702,377564846,396566588,405981865,486659787,515150171,545058961,567900179,588858342,612873413,637573231,662762155,688513549,714925236,742119492,770145226 -Business Income (Schedule C),337210620,356450905,357363490,374659000,391975736,389078638,416010104,437315586,442705788,453344344,482933715,497600738,515899055,557091545,581063758,606397707,629717422,651930728,673860338,696045274,719364990,744642199,772699618,802515945,832899662 -Business Loss (Schedule C),54240803,52259366,55290946,57400238,60161435,60996610,69637956,73204384,74106676,75887516,80840625,83295809,86358854,93254265,97267090,101507863,105411464,109129857,112800762,116514406,120418007,124649282,129345950,134337050,139423128 -Net Capital Gains in AGI,402566646,644856734,504322768,705007630,713598090,634341278,859894631,931642984,869467657,1132676539,2045568233,1265810689,931050838,1350191489,1426380937,1386016320,1348118978,1348612433,1374370783,1412465507,1458356819,1510465664,1566028693,1623960307,1684556577 -Taxable Pensions and Annuities,581180358,612544219,638659076,663223262,689991999,693626543,729187412,766221903,797310451,858236906,921526160,941947493,1000550096,1067876880,1120382078,1173190199,1225249668,1281415906,1338594772,1396171765,1453869927,1513701533,1575294418,1639492441,1706966359 -Supplemental Income (Schedule E),661331485,777023944,780713118,846331543,891134646,882933054,973306129,1053816820,1082528185,1033289108,1266911839,1337318689,1176617339,1735574582,1780607535,1798072091,1804564151,1801455277,1812747805,1859929538,1939845885,2030186104,2118423261,2205060262,2295080449 -Supplemental Loss (Schedule E),175315530,163765597,167171652,166947674,177896945,176446339,206369393,223440016,229527666,219087541,268622399,283550712,249477322,367992620,377540925,381243922,382620429,381961257,384355603,394359512,411304117,430458888,449167748,467537329,486624244 -Gross Social Security Income,490699539,526514454,553542772,575126918,605152093,619856114,644989570,679150944,724074374,766551882,801202440,866997736,970949411,1053050851,1120395231,1185782873,1253534906,1326341844,1401350111,1477907462,1555524713,1634038802,1713286667,1796366477,1883522822 -Unemployment Compensation,92383693,71234134,51923279,33288898,27225383,25420264,23946035,22098109,20789162,21501384,185297653,28290970,21182616,24177026,30644765,33801638,35341576,36727520,37882473,39114424,40423371,41732318,42964269,44196219,45505166 -Wages and Salaries: Zero or Less,21437416,20445434,20280688,19421543,20111022,20544631,20869123,21917664,22959310,23289042,25339583,27482222,28858278,30575148,32069159,33546179,34960404,36436439,37933405,39438991,40979790,42563190,44180328,45861737,47601261 -"Wages and Salaries: $1 Less Than $10,000",92961755,93108807,94466204,94899140,91906875,90725454,86507256,90853698,95171558,96538370,105038328,113920054,119624120,126740934,132933950,139056533,144918819,151037318,157242584,163483576,169870538,176434094,183137495,190107318,197318042 -"Wages and Salaries: $10,000 Less Than $20,000",265080549,262184682,266041138,261995646,261659142,253415638,247511878,259947782,272301910,276212590,300532405,325944524,342264823,362627229,380346494,397864238,414637230,432143291,449897604,467754137,486028316,504807758,523987322,543929161,564560262 -"Wages and Salaries: $20,000 Less Than $30,000",373549061,371577702,380567075,381259619,383184602,382875414,382789227,402021961,421128224,427176282,464788066,504089151,529329292,560820749,588224459,615316507,641256759,668330740,695788652,723404654,751666565,780709891,810372025,841213056,873120063 -"Wages and Salaries: $30,000 Less Than $40,000",410623212,408353008,408654349,418567676,428313928,436140082,441282302,463453943,485479786,492452033,535811181,581117768,610214792,646518380,678109584,709341501,739245618,770456707,802110395,833946330,866526874,900008239,934202970,969756742,1006539380 -"Wages and Salaries: $40,000 Less Than $50,000",391671646,391349650,410049846,418379915,424369612,426147995,437485582,459466462,481302798,488215057,531201150,576117927,604964605,640955843,672275241,703238444,732885271,763827825,795209170,826771194,859071420,892264717,926165242,961413116,997879281 -"Wages and Salaries: $50,000 Less Than $75,000",900170384,902783183,915963625,916618937,952347137,962308451,1000500360,1050769166,1100707412,1116515287,1214821617,1317543290,1383513720,1465823282,1537448658,1608259437,1676059756,1746823313,1818590357,1890770601,1964639066,2040549922,2118078163,2198687700,2282083390 -"Wages and Salaries: $75,000 Less Than $100,000",791646425,798324358,822009437,840581301,835434509,852517230,870406373,914138780,957583610,971336004,1056859667,1146224551,1203616917,1275223856,1337535860,1399139190,1458123506,1519685754,1582121006,1644915731,1709179159,1775219408,1842666735,1912794701,1985346539 -"Wages and Salaries: $100,000 Less Than $200,000",1521442934,1599743841,1665691829,1759304940,1876094165,1922367424,2015029480,2116271949,2216848662,2248686066,2446677151,2653560834,2786426714,2952199963,3096455027,3239069477,3375620792,3518140135,3662680522,3808053104,3956825798,4109711912,4265855476,4428204837,4596165570 -"Wages and Salaries: $200,000 Less Than $500,000",750627685,806518068,872227137,955295796,1055689937,1106449651,1206754121,1267385873,1327618918,1346685596,1465257836,1589155645,1668725919,1768003648,1854394638,1939803104,2021580499,2106932007,2193493871,2280554117,2369650611,2461210536,2554721272,2651948514,2752536277 -"Wages and Salaries: $500,000 Less Than $1 Million",230634407,259165177,272996984,310372311,337666673,343994542,379375686,398436911,417372793,423366917,460643297,499593913,524608973,555819603,582978940,609829393,635538322,662370869,689583924,716953659,744963543,773747874,803145494,833711499,865333973 -Wages and Salaries: $1 Million and Over,305543960,387803684,346432571,408251028,336316005,310089733,367731740,386207931,404562625,410372775,446505054,484260182,508507471,538760172,565085924,591112272,616032132,642041124,668418946,694948639,722098833,749999703,778495041,808122901,838774807 +,2011,2012,2013,2014,2015,2016,2017,2018,2019,2020,2021,2022,2023,2024,2025,2026,2027,2028,2029,2030,2031,2032,2033,2034,2035,2036 +US Population,311721632,314112078,316497531,318857056,321368864,323995528,326625791,329256465,331883986,334503458,337108968,339698079,342267302,344814299,347334912,349825585,352281475,354698370,357072830,359402194,361684740,363919527,366106294,368245560,370338137,372389679 +POP_DEP,82840576,82503131,82296428,82135602,82109509,82178228,82284937,82410728,82547300,82624346,82772040,83023463,83259014,83463249,83673850,83868421,84024180,84193698,84484144,84767392,85040759,85334627,85631465,85903535,86153476,86382700 +POP_SNR,41366628,43164909,44723041,46243211,47830245,49420383,51055052,52766466,54556914,56441027,58292098,60221375,62126945,63987872,65919552,67748101,69455598,71098995,72675827,74107408,75245391,76250731,77185290,78138264,79232881,80221146 +Single Returns,67294506,66655855,68563354,69579590,71086947,71410690,73021932,74164397,75166909,76052548,76951274,77812834,78684040,79565000,80455824,81356621,82267505,83188586,84119980,85061802,86014169,86977199,87951011,88935726,89931466,90938354 +Joint Returns,56013790,56458434,56796607,55128595,57272012,57201828,57987204,58894443,59690545,60393837,61107520,61791691,62483522,63183098,63890507,64605837,65329175,66060612,66800238,67548145,68304426,69069175,69842485,70624454,71415178,72214755 +Head of Household Returns,22061944,21814184,21991339,22077498,22134303,21659639,21894095,22236639,22537222,22802762,23072226,23330546,23591759,23855897,24122992,24393077,24666186,24942353,25221612,25503998,25789545,26078289,26370266,26665512,26964064,27265958 +Number of Returns w/ Gross Security Income,25837226,26480552,27070833,27401498,28087514,28329015,28967603,29938625,30954489,32023496,33073756,34168389,35249571,36305423,37401419,38438901,39407700,40340131,41234793,42047043,42692712,43263121,43793371,44334069,44955133,45515854 +Number of Dependent Exemptions,99345455,97912393,97691386,96916673,96505181,94809260,94708629,94853412,95010605,95099283,95269277,95558660,95829776,96064847,96307245,96531193,96710470,96905582,97239881,97565894,97880535,98218773,98560428,98873577,99161255,99425088 +Taxable Interest Income,120111673,111789613,100648711,93894280,95881223,96640233,106055367,110260987,112787090,112466207,103467818,111114401,124926040,131541699,138922017,154495101,166572605,182254926,197384236,209516358,221723580,234005903,245229994,257614727,268715926,279619133 +Ordinary Dividends,194609806,260393306,214972683,254702232,260252720,254065327,282336042,306497844,321831296,354136702,415543874,441319724,525152375,542588979,557971341,593896126,594434142,594140679,593040192,604803175,625834703,652980048,683646951,716417007,751192395,786628075 +Business Income (Schedule C),337210620,356450905,357363490,374659000,391975736,389078638,416010104,437315586,442705788,453344344,475727866,484891210,530679556,557517087,580382891,608837482,638370115,668441767,699222656,730996478,763451167,796104442,829154890,863113162,898149474,934207087 +Business Loss (Schedule C),54240803,52259366,55290946,57400238,60161435,60996610,69637956,73204384,74106676,75887516,79634403,81168300,88833034,93325499,97153117,101916269,106859880,111893721,117046284,122365058,127797806,133263797,138796273,144480713,150345612,156381471 +Net Capital Gains in AGI,402566646,644856734,504322768,705007630,713598090,634341278,859894631,931642984,869467657,1132676539,2045568233,1265810689,963441222,1269391199,1613621438,1675961578,1616040355,1530172281,1502946397,1510430135,1539032759,1579855302,1628611613,1683820342,1743903419,1806319552 +Taxable Pensions and Annuities,581180358,612544219,638659076,663223262,689991999,693626543,729187412,766221903,797310451,858236906,926411874,945154148,1020633886,1077795442,1130975726,1184735890,1236643897,1289382779,1341641311,1396154455,1454120921,1514995446,1577570668,1642339917,1708922376,1777577693 +Supplemental Income (Schedule E),661331485,777023944,780713118,846331543,891134646,882933054,973306129,1053816820,1082528185,1033289108,1336221440,1516398971,1653783766,1738089112,1825046144,1914014801,1916117862,1916666487,1929833483,1976923779,2046187661,2130538725,2220650350,2316431098,2418109562,2522119682 +Supplemental Loss (Schedule E),175315530,163765597,167171652,166947674,177896945,176446339,206369393,223440016,229527666,219087541,283318063,321520975,350650573,368525775,386963211,405827171,406273081,406389406,409181194,419165716,433851686,451736581,470842884,491151206,512710018,534763208 +Gross Social Security Income,490699539,526514454,553542772,575126918,605152093,619856114,644989570,679150944,724074374,766551882,801202440,867405389,971927780,1054844527,1141837812,1214563219,1284598112,1360095564,1436734446,1514759350,1594251808,1674314980,1754704276,1835745817,1920537772,2009243201 +Unemployment Compensation,92383693,71234134,51923279,33288898,27225383,25420264,23946035,22098109,20789162,21501384,185297653,28290970,21182616,26640926,30644765,33493650,35572566,36496529,37035508,37497489,38498449,39653402,40731359,41886312,43041265,44273216 +Wages and Salaries: Zero or Less,21437416,20445434,20280688,19421543,20111022,20544631,20869123,21917664,22959310,23289042,25394990,27373379,28891276,30505458,32013752,33371832,34807974,36249780,37697989,39183873,40694384,42222870,43791003,45409618,47086348,48829074 +"Wages and Salaries: $1 Less Than $10,000",92961755,93108807,94466204,94899140,91906875,90725454,86507256,90853698,95171558,96538370,105268001,113468873,119760904,126452056,132704276,138333827,144286962,150263574,156266727,162426057,168687465,175023389,181523657,188233183,195183610,202407605 +"Wages and Salaries: $10,000 Less Than $20,000",265080549,262184682,266041138,261995646,261659142,253415638,247511878,259947782,272301910,276212590,301189540,324653620,342656183,361800700,379689360,395796455,412829380,429929478,447105512,464728398,482643343,500771492,519369857,538566944,558453293,579122362 +"Wages and Salaries: $20,000 Less Than $30,000",373549061,371577702,380567075,381259619,383184602,382875414,382789227,402021961,421128224,427176282,465804357,502092705,529934550,559542481,587208169,612118579,638460831,664906970,691470546,718725201,746431540,774467609,803230890,832920125,863675336,895641061 +"Wages and Salaries: $30,000 Less Than $40,000",410623212,408353008,408654349,418567676,428313928,436140082,441282302,463453943,485479786,492452033,536982768,578816249,610912537,645044784,676937996,705654906,736022451,766509759,797132450,828551821,860491897,892812089,925970616,960196589,995651428,1032501757 +"Wages and Salaries: $40,000 Less Than $50,000",391671646,391349650,410049846,418379915,424369612,426147995,437485582,459466462,481302798,488215057,532362657,573836210,605656347,639494925,671113734,699583567,729689836,759914836,790274054,821423098,853088367,885130481,918003718,951935216,987085007,1023618282 +"Wages and Salaries: $50,000 Less Than $75,000",900170384,902783183,915963625,916618937,952347137,962308451,1000500360,1050769166,1100707412,1116515287,1217477906,1312325156,1385095688,1462482260,1534792368,1599900979,1668752008,1737874568,1807304077,1878539863,1950956223,2024234400,2099413301,2177012377,2257397605,2340946770 +"Wages and Salaries: $75,000 Less Than $100,000",791646425,798324358,822009437,840581301,835434509,852517230,870406373,914138780,957583610,971336004,1059170562,1141684926,1204993183,1272317263,1335224965,1391867574,1451765977,1511900605,1572302269,1634275343,1697275481,1761025376,1826428845,1893937796,1963870620,2036555976 +"Wages and Salaries: $100,000 Less Than $200,000",1521442934,1599743841,1665691829,1759304940,1876094165,1922367424,2015029480,2116271949,2216848662,2248686066,2452026976,2643051400,2789612832,2945471072,3091105202,3222235361,3360902829,3500117168,3639949709,3783420132,3929268254,4076852097,4228264038,4384550264,4546447862,4714717696 +"Wages and Salaries: $200,000 Less Than $500,000",750627685,806518068,872227137,955295796,1055689937,1106449651,1206754121,1267385873,1327618918,1346685596,1468461721,1582861790,1670634011,1763973872,1851190753,1929721544,2012766254,2096138473,2179880918,2265802005,2353147041,2441531560,2532208637,2625804809,2722761502,2823534378 +"Wages and Salaries: $500,000 Less Than $1 Million",230634407,259165177,272996984,310372311,337666673,343994542,379375686,398436911,417372793,423366917,461650524,497615270,525208833,554552735,581971712,606659983,632767326,658977630,685304325,712315935,739775201,767561257,796068041,825492520,855973470,887654140 +Wages and Salaries: $1 Million and Over,305543960,387803684,346432571,408251028,336316005,310089733,367731740,386207931,404562625,410372775,447481367,482342268,509088920,537532187,564109610,588040139,613346185,638752033,664270698,690453257,717069733,744002969,771634811,800156183,829701600,860409914 diff --git a/puf_stage1/Stage_I_factors.csv b/puf_stage1/Stage_I_factors.csv index dc583796..3a577ad9 100644 --- a/puf_stage1/Stage_I_factors.csv +++ b/puf_stage1/Stage_I_factors.csv @@ -1,26 +1,27 @@ YEAR,APOPN,APOPDEP,APOPSNR,AGDPN,ATXPY,ASCHF,ABOOK,ACPIU,ACPIM,ARETS,AWAGE,ASCHCI,ASCHCL,ASCHEI,ASCHEL,AINTS,ADIVS,ACGNS,ASOCSEC,AUCOMP,AIPD,ABENEFITS 2011,1.0000,1.0000,1.0000,1.0000,1.0000,1.0000,1.0000,1.0000,1.0000,1.0000,1.0000,1.0000,1.0000,1.0000,1.0000,1.0000,1.0000,1.0000,1.0000,1.0000,1.0000,1.0000 -2012,1.0077,0.9959,1.0435,1.0416,1.0519,0.9576,1.1135,1.0209,1.0365,0.9970,1.0406,1.0571,0.9635,1.1749,0.9341,0.9307,1.3380,1.6019,1.0730,0.7711,0.9231,1.0000 -2013,1.0153,0.9934,1.0811,1.0826,1.0731,1.1020,1.1598,1.0360,1.0620,1.0136,1.0694,1.0598,1.0194,1.1805,0.9535,0.8380,1.1046,1.2528,1.1281,0.5620,0.8273,1.0000 -2014,1.0229,0.9915,1.1179,1.1179,1.1130,1.0344,1.1411,1.0525,1.0874,1.0097,1.1205,1.1111,1.0582,1.2797,0.9523,0.7817,1.3088,1.7513,1.1721,0.3603,0.8029,1.0000 -2015,1.0309,0.9912,1.1563,1.1623,1.1709,0.5298,1.1495,1.0538,1.1162,1.0352,1.1565,1.1624,1.1092,1.3475,1.0147,0.7983,1.3373,1.7726,1.2332,0.2947,0.7938,1.0621 -2016,1.0394,0.9920,1.1947,1.2002,1.2065,0.5722,1.1414,1.0671,1.1584,1.0337,1.1738,1.1538,1.1246,1.3351,1.0065,0.8046,1.3055,1.5757,1.2632,0.2752,0.7952,1.1748 -2017,1.0478,0.9933,1.2342,1.2553,1.2763,0.5232,1.1719,1.0898,1.1874,1.0518,1.2313,1.2337,1.2839,1.4717,1.1771,0.8830,1.4508,2.1360,1.3144,0.2592,0.8185,1.1984 -2018,1.0563,0.9948,1.2756,1.3228,1.3412,0.5152,1.2689,1.1165,1.2108,1.0683,1.2932,1.2969,1.3496,1.5935,1.2745,0.9180,1.5749,2.3143,1.3840,0.2392,0.8601,1.3326 -2019,1.0647,0.9965,1.3189,1.3773,1.3956,0.5086,1.3034,1.1365,1.2451,1.0827,1.3547,1.3128,1.3663,1.6369,1.3092,0.9390,1.6537,2.1598,1.4756,0.2250,0.8950,1.4158 -2020,1.0731,0.9974,1.3644,1.3572,1.5022,0.5987,1.2441,1.1507,1.2963,1.0955,1.3741,1.3444,1.3991,1.5624,1.2497,0.9363,1.8197,2.8136,1.5622,0.2327,0.9633,1.4223 -2021,1.0814,0.9992,1.4092,1.5025,1.6130,0.6795,1.5254,1.2050,1.3123,1.1084,1.4951,1.4321,1.4904,1.9157,1.5322,0.9428,1.9401,5.0813,1.6328,2.0057,1.0344,1.4764 -2022,1.0897,1.0022,1.4558,1.6381,1.6487,1.1934,1.6102,1.3024,1.3652,1.1208,1.6215,1.4756,1.5357,2.0222,1.6174,0.9967,2.0378,3.1444,1.7669,0.3062,1.0573,1.5326 -2023,1.0980,1.0051,1.5019,1.7037,1.7513,1.2424,1.4167,1.3646,1.3717,1.1334,1.7027,1.5299,1.5921,1.7792,1.4230,1.1791,2.0861,2.3128,1.9787,0.2293,1.1231,1.5909 -2024,1.1062,1.0075,1.5468,1.8795,1.8692,0.5311,2.0897,1.3944,1.4084,1.1461,1.8040,1.6521,1.7193,2.6244,2.0990,1.1252,2.5007,3.3540,2.1460,0.2617,1.1987,1.6514 -2025,1.1142,1.0101,1.5935,1.9617,1.9611,0.5589,2.1440,1.4255,1.3347,1.1589,1.8922,1.7231,1.7932,2.6925,2.1535,1.2310,2.6471,3.5432,2.2833,0.3317,1.2576,1.7143 -2026,1.1222,1.0124,1.6377,2.0390,2.0535,0.6026,2.1650,1.4602,1.3542,1.1719,1.9793,1.7983,1.8714,2.7189,2.1746,1.2889,2.8008,3.4429,2.4165,0.3659,1.3169,1.7795 -2027,1.1301,1.0143,1.6790,2.1163,2.1446,0.6384,2.1728,1.4940,1.3732,1.1850,2.0628,1.8674,1.9434,2.7287,2.1825,1.3645,2.9181,3.3488,2.5546,0.3826,1.3753,1.8472 -2028,1.1379,1.0163,1.7188,2.1961,2.2429,0.6702,2.1691,1.5278,1.3922,1.1983,2.1499,1.9333,2.0120,2.7240,2.1787,1.4781,3.0258,3.3500,2.7030,0.3976,1.4383,1.9175 -2029,1.1455,1.0198,1.7569,2.2798,2.3430,0.6993,2.1826,1.5620,1.4114,1.2117,2.2382,1.9983,2.0796,2.7411,2.1924,1.5870,3.1492,3.4140,2.8558,0.4101,1.5025,1.9904 -2030,1.1530,1.0233,1.7915,2.3675,2.4438,0.7272,2.2395,1.5972,1.4312,1.2252,2.3270,2.0641,2.1481,2.8124,2.2494,1.6838,3.2762,3.5087,3.0118,0.4234,1.5672,2.0662 -2031,1.1603,1.0266,1.8190,2.4585,2.5448,0.7523,2.3357,1.6327,1.4512,1.2390,2.4179,2.1333,2.2201,2.9332,2.3461,1.7797,3.4056,3.6226,3.1700,0.4376,1.6319,2.1448 -2032,1.1675,1.0301,1.8433,2.5536,2.6495,0.7748,2.4445,1.6696,1.4719,1.2528,2.5114,2.2082,2.2981,3.0698,2.4553,1.8775,3.5379,3.7521,3.3300,0.4517,1.6991,2.2264 -2033,1.1745,1.0337,1.8659,2.6520,2.7573,0.7947,2.5507,1.7070,1.4929,1.2669,2.6068,2.2914,2.3847,3.2033,2.5621,1.9638,3.6736,3.8901,3.4915,0.4651,1.7682,2.3111 -2034,1.1813,1.0370,1.8889,2.7534,2.8697,0.8146,2.6550,1.7452,1.5144,1.2810,2.7060,2.3799,2.4767,3.3343,2.6668,2.0628,3.8134,4.0340,3.6608,0.4784,1.8403,2.3990 -2035,1.1880,1.0400,1.9154,2.8577,2.9878,0.8318,2.7634,1.7843,1.5363,1.2954,2.8086,2.4700,2.5704,3.4704,2.7757,2.1602,3.9574,4.1845,3.8384,0.4926,1.9160,2.4903 +2012,1.0077,0.9959,1.0435,1.0416,1.0519,0.9576,1.1135,1.0209,1.0367,0.9970,1.0406,1.0571,0.9635,1.1749,0.9341,0.9307,1.3380,1.6019,1.0730,0.7711,0.9231,1.0000 +2013,1.0153,0.9934,1.0811,1.0826,1.0731,1.1020,1.1598,1.0360,1.0622,1.0136,1.0694,1.0598,1.0194,1.1805,0.9535,0.8380,1.1046,1.2528,1.1281,0.5620,0.8273,1.0000 +2014,1.0229,0.9915,1.1179,1.1179,1.1130,1.0344,1.1411,1.0525,1.0877,1.0097,1.1205,1.1111,1.0582,1.2797,0.9523,0.7817,1.3088,1.7513,1.1721,0.3603,0.8029,1.0000 +2015,1.0309,0.9912,1.1563,1.1623,1.1709,0.5298,1.1495,1.0538,1.1164,1.0352,1.1565,1.1624,1.1092,1.3475,1.0147,0.7983,1.3373,1.7726,1.2332,0.2947,0.7938,1.0621 +2016,1.0394,0.9920,1.1947,1.2002,1.2065,0.5722,1.1414,1.0671,1.1587,1.0337,1.1738,1.1538,1.1246,1.3351,1.0065,0.8046,1.3055,1.5757,1.2632,0.2752,0.7952,1.1748 +2017,1.0478,0.9933,1.2342,1.2553,1.2763,0.5232,1.1719,1.0898,1.1877,1.0518,1.2313,1.2337,1.2839,1.4717,1.1771,0.8830,1.4508,2.1360,1.3144,0.2592,0.8185,1.1984 +2018,1.0563,0.9948,1.2756,1.3228,1.3412,0.5152,1.2689,1.1165,1.2111,1.0683,1.2932,1.2969,1.3496,1.5935,1.2745,0.9180,1.5749,2.3143,1.3840,0.2392,0.8601,1.3326 +2019,1.0647,0.9965,1.3189,1.3773,1.3956,0.5086,1.3034,1.1365,1.2454,1.0827,1.3547,1.3128,1.3663,1.6369,1.3092,0.9390,1.6537,2.1598,1.4756,0.2250,0.8950,1.4158 +2020,1.0731,0.9974,1.3644,1.3572,1.5022,0.5987,1.2441,1.1507,1.2966,1.0955,1.3741,1.3444,1.3991,1.5624,1.2497,0.9363,1.8197,2.8136,1.5622,0.2327,0.9633,1.4223 +2021,1.0814,0.9992,1.4092,1.5204,1.6215,0.9576,1.6089,1.2050,1.3126,1.1084,1.4984,1.4108,1.4682,2.0205,1.6160,0.8614,2.1353,5.0813,1.6328,2.0057,1.0399,1.4764 +2022,1.0897,1.0022,1.4558,1.6590,1.6544,1.0834,1.8258,1.3010,1.3658,1.1208,1.6151,1.4379,1.4964,2.2929,1.8340,0.9251,2.2677,3.1444,1.7677,0.3062,1.0609,1.5326 +2023,1.0980,1.0051,1.5019,1.7922,1.7865,0.9457,1.9912,1.3548,1.3721,1.1334,1.7047,1.5737,1.6378,2.5007,2.0001,1.0401,2.6985,2.3932,1.9807,0.2293,1.1456,1.5909 +2024,1.1062,1.0075,1.5468,1.8880,1.8865,0.7669,2.0928,1.3948,1.4088,1.1461,1.7999,1.6533,1.7206,2.6282,2.1021,1.0952,2.7881,3.1532,2.1497,0.2884,1.2098,1.6514 +2025,1.1142,1.0101,1.5935,1.9787,1.9796,1.0291,2.1975,1.4334,1.4525,1.1589,1.8889,1.7211,1.7911,2.7597,2.2072,1.1566,2.8671,4.0083,2.3270,0.3317,1.2695,1.7143 +2026,1.1222,1.0124,1.6377,2.0798,2.0737,0.9550,2.3046,1.4754,1.5000,1.1719,1.9690,1.8055,1.8790,2.8942,2.3148,1.2863,3.0517,4.1632,2.4752,0.3625,1.3298,1.7795 +2027,1.1301,1.0143,1.6790,2.1686,2.1646,0.9219,2.3071,1.5129,1.5435,1.1850,2.0538,1.8931,1.9701,2.8974,2.3174,1.3868,3.0545,4.0143,2.6179,0.3851,1.3881,1.8472 +2028,1.1379,1.0163,1.7188,2.2556,2.2569,0.9007,2.3078,1.5487,1.5910,1.1983,2.1388,1.9823,2.0629,2.8982,2.3180,1.5174,3.0530,3.8010,2.7717,0.3951,1.4473,1.9175 +2029,1.1455,1.0198,1.7569,2.3425,2.3483,0.8887,2.3236,1.5841,1.6402,1.2117,2.2243,2.0735,2.1579,2.9181,2.3340,1.6433,3.0473,3.7334,2.9279,0.4009,1.5059,1.9904 +2030,1.1530,1.0233,1.7915,2.4322,2.4438,0.8848,2.3803,1.6200,1.6912,1.2252,2.3120,2.1678,2.2560,2.9893,2.3909,1.7443,3.1078,3.7520,3.0869,0.4059,1.5671,2.0662 +2031,1.1603,1.0266,1.8190,2.5245,2.5452,0.8861,2.4637,1.6565,1.7436,1.2390,2.4011,2.2640,2.3561,3.0940,2.4747,1.8460,3.2158,3.8231,3.2489,0.4167,1.6322,2.1448 +2032,1.1675,1.0301,1.8433,2.6196,2.6518,0.8914,2.5653,1.6939,1.7981,1.2528,2.4913,2.3609,2.4569,3.2216,2.5767,1.9482,3.3553,3.9245,3.4121,0.4292,1.7005,2.2264 +2033,1.1745,1.0337,1.8659,2.7185,2.7613,0.8980,2.6738,1.7322,1.8538,1.2669,2.5838,2.4589,2.5589,3.3578,2.6857,2.0417,3.5129,4.0456,3.5759,0.4409,1.7708,2.3111 +2034,1.1813,1.0370,1.8889,2.8210,2.8747,0.9060,2.7891,1.7713,1.9113,1.2810,2.6793,2.5596,2.6637,3.5027,2.8015,2.1448,3.6813,4.1827,3.7411,0.4534,1.8435,2.3990 +2035,1.1880,1.0400,1.9154,2.9276,2.9912,0.9166,2.9115,1.8112,1.9705,1.2954,2.7782,2.6635,2.7718,3.6564,2.9245,2.2372,3.8600,4.3320,3.9139,0.4659,1.9182,2.4903 +2036,1.1946,1.0428,1.9393,3.0382,3.1114,0.9272,3.0368,1.8521,2.0317,1.3099,2.8811,2.7704,2.8831,3.8137,3.0503,2.3280,4.0421,4.4870,4.0947,0.4792,1.9953,2.5850 diff --git a/puf_stage1/cbo_chained_cpiu.py b/puf_stage1/cbo_chained_cpiu.py index b349409c..73fa6269 100644 --- a/puf_stage1/cbo_chained_cpiu.py +++ b/puf_stage1/cbo_chained_cpiu.py @@ -39,7 +39,6 @@ import pandas import taxcalc - # Data on the expected CBO spreadsheet structure: CBO_SHEET = 1 # the sheet called "1. Tax Parameters" CBO_STR_COLS = [0, 1, 2, 3] # expect columns A:D are strings; others numeric diff --git a/puf_stage1/growfactors.csv b/puf_stage1/growfactors.csv index 32b77d00..26f920ea 100644 --- a/puf_stage1/growfactors.csv +++ b/puf_stage1/growfactors.csv @@ -1,26 +1,27 @@ YEAR,ATXPY,ASCHF,ABOOK,ACPIU,ACPIM,AWAGE,ASCHCI,ASCHCL,ASCHEI,ASCHEL,AINTS,ADIVS,ACGNS,ASOCSEC,AUCOMP,AIPD,ABENOTHER,ABENMCARE,ABENMCAID,ABENSSI,ABENSNAP,ABENWIC,ABENHOUSING,ABENTANF,ABENVET 2011,1.0,1.0,1.0,1.0,1.0,1.0,1.0,1.0,1.0,1.0,1.0,1.0,1.0,1.0,1.0,1.0,1.0,1.0,1.0,1.0,1.0,1.0,1.0,1.0,1.0 -2012,1.043862,0.950283,1.104992,1.0209,1.0365,1.032649,1.049023,0.956138,1.165922,0.926962,0.923588,1.327776,1.58966,1.02827,0.7711,0.9231,0.992359,1.0,1.0,1.0,1.0,1.0,1.0,1.0,1.0 -2013,1.012518,1.142179,1.033784,1.014791,1.024602,1.019984,0.99505,1.050098,0.997245,1.013128,0.893658,0.819381,0.776217,1.014786,0.728829,0.896219,0.992515,1.0,1.0,1.0,1.0,1.0,1.0,1.0,1.0 -2014,1.029476,0.931683,0.976566,1.015927,1.023917,1.039999,1.040616,1.030349,1.075978,0.991321,0.925886,1.17606,1.387522,1.004801,0.641103,0.970506,0.99257,1.0,1.0,1.0,1.0,1.0,1.0,1.0,1.0 -2015,1.043858,0.508206,0.999544,1.001235,1.026485,1.024119,1.038052,1.040061,1.04481,1.057257,1.013311,1.013846,1.004308,1.017188,0.81793,0.988666,1.053858,1.023325,1.041528,1.019361,1.102667,1.007792,1.026748,1.132657,1.04693 -2016,1.021978,1.071198,0.984833,1.012621,1.037807,1.006659,0.984484,1.005593,0.982695,0.983807,0.999649,0.968237,0.881651,0.991403,0.933831,1.001764,1.097065,1.011695,1.010367,0.993375,0.989722,1.002577,1.01625,0.828168,1.105413 -2017,1.049373,0.907035,1.018491,1.021273,1.025035,1.040577,1.060677,1.132498,1.093477,1.160123,1.088642,1.102389,1.344721,1.00723,0.94186,1.029301,1.011911,1.030968,1.014601,0.981621,1.0,0.998715,1.063959,1.0,1.0 -2018,1.042394,0.976786,1.074059,1.0245,1.019707,1.041821,1.042769,1.042713,1.074048,1.074033,1.031272,1.076804,1.074755,1.018778,0.92284,1.050825,1.103035,1.045097,1.045897,1.005738,1.0,1.002574,1.034828,1.0,1.0 -2019,1.032351,0.979401,1.019085,1.017913,1.028328,1.039292,1.004274,1.004387,1.019131,1.019122,1.014806,1.041751,0.925878,1.031182,0.940635,1.040577,1.054052,1.052158,1.045866,1.000751,1.0,1.002567,1.034809,1.0,1.0 -2020,1.067957,1.167938,0.947032,1.012495,1.041121,1.006381,1.016054,1.015991,0.947016,0.94708,0.989319,1.091767,1.292516,1.023383,1.034222,1.076313,0.996727,1.050763,1.046106,1.00255,1.0,1.003841,1.034974,1.0,1.0 -2021,1.065517,1.126248,1.216697,1.047189,1.012343,1.079707,1.057058,1.05708,1.216716,1.216644,0.999214,1.057982,1.792117,1.011965,8.619252,1.073809,1.03007,1.047248,1.047927,1.001796,1.0,1.002551,1.034869,1.0,1.0 -2022,1.014347,1.742914,1.047552,1.08083,1.040311,1.076282,1.022527,1.022546,1.047553,1.047566,1.049118,1.042358,0.614105,1.04749,0.152665,1.022138,1.030159,1.048769,1.047573,0.999851,1.0,1.002545,1.034942,1.0,1.0 -2023,1.054201,1.03319,0.873178,1.047758,1.004761,1.042139,1.028961,1.028889,0.873183,0.873156,1.174061,1.015964,0.72997,1.085497,0.748857,1.062234,1.030193,1.050822,1.048715,1.000448,1.0,1.003807,1.034968,1.0,1.0 -2024,1.05941,0.42431,1.464113,1.021838,1.026755,1.05164,1.07187,1.071889,1.464111,1.464118,0.947213,1.189858,1.43944,1.053068,1.1413,1.067314,1.030334,1.048426,1.051767,0.99776,1.0,1.002528,1.034951,1.0,1.0 -2025,1.041632,1.044788,1.018618,1.022303,0.947671,1.04136,1.035487,1.035494,1.018582,1.018598,1.086173,1.050943,1.048825,1.032798,1.267482,1.049137,1.030635,1.046248,1.052213,1.002245,1.0,1.003783,1.034897,1.0,1.0 -2026,1.039652,1.070503,1.002596,1.024342,1.01461,1.038574,1.036202,1.036169,1.002606,1.002599,1.039571,1.050521,0.964765,1.029773,1.103105,1.047153,1.030633,1.072236,1.0,0.999552,1.0,1.002513,1.034808,1.0,1.0 -2027,1.037063,1.052003,0.996587,1.023148,1.01403,1.034901,1.031166,1.031214,0.996589,0.996617,1.051254,1.034598,0.965869,1.031145,1.045641,1.044347,1.030788,1.0,1.0,1.0,1.0,1.002506,1.034863,1.0,1.0 -2028,1.038667,1.042616,0.991454,1.022624,1.013836,1.03508,1.028193,1.028202,0.991435,0.991416,1.075829,1.0298,0.993501,1.03359,1.039205,1.045808,1.030942,1.0,1.0,1.0,1.0,1.0,1.0,1.0,1.0 -2029,1.037699,1.036497,0.999548,1.022385,1.013791,1.034165,1.026764,1.026741,0.999601,0.999612,1.066552,1.033877,1.012343,1.033618,1.031439,1.044636,1.031131,1.0,1.0,1.0,1.0,1.0,1.0,1.0,1.0 -2030,1.036237,1.033133,1.019395,1.022535,1.014029,1.032912,1.026209,1.02622,1.019337,1.019325,1.054094,1.033561,1.021054,1.034257,1.032431,1.043062,1.03133,1.0,1.0,1.0,1.0,1.0,1.0,1.0,1.0 -2031,1.034778,1.028007,1.036394,1.022226,1.013974,1.032526,1.027023,1.027016,1.036391,1.036427,1.050305,1.032957,1.025966,1.036614,1.033538,1.041284,1.03151,1.0,1.0,1.0,1.0,1.0,1.0,1.0,1.0 -2032,1.034722,1.023557,1.040127,1.022601,1.014264,1.032264,1.028726,1.02875,1.040116,1.040091,1.048447,1.032441,1.02936,1.036625,1.032221,1.041179,1.031644,1.0,1.0,1.0,1.0,1.0,1.0,1.0,1.0 -2033,1.034484,1.019571,1.037226,1.022401,1.014267,1.0318,1.031493,1.031499,1.037269,1.037279,1.039731,1.032168,1.0306,1.035799,1.029666,1.040669,1.031857,1.0,1.0,1.0,1.0,1.0,1.0,1.0,1.0 -2034,1.034773,1.01914,1.034899,1.022378,1.014402,1.032079,1.032644,1.032601,1.034904,1.034873,1.044366,1.03208,1.031022,1.035722,1.028596,1.040776,1.032059,1.0,1.0,1.0,1.0,1.0,1.0,1.0,1.0 -2035,1.035282,1.015356,1.034959,1.022404,1.014461,1.032062,1.032005,1.03198,1.034948,1.034965,1.041311,1.031909,1.031458,1.034008,1.029682,1.041135,1.032203,1.0,1.0,1.0,1.0,1.0,1.0,1.0,1.0 +2012,1.043862,0.950283,1.104992,1.0209,1.0367,1.032649,1.049023,0.956138,1.165922,0.926962,0.923588,1.327776,1.58966,1.02827,0.7711,0.9231,0.992359,1.0,1.0,1.0,1.0,1.0,1.0,1.0,1.0 +2013,1.012518,1.142179,1.033784,1.014791,1.024597,1.019984,0.99505,1.050098,0.997245,1.013128,0.893658,0.819381,0.776217,1.014786,0.728829,0.896219,0.992515,1.0,1.0,1.0,1.0,1.0,1.0,1.0,1.0 +2014,1.029476,0.931683,0.976566,1.015927,1.024007,1.039999,1.040616,1.030349,1.075978,0.991321,0.925886,1.17606,1.387522,1.004801,0.641103,0.970506,0.99257,1.0,1.0,1.0,1.0,1.0,1.0,1.0,1.0 +2015,1.043858,0.508206,0.999544,1.001235,1.026386,1.024119,1.038052,1.040061,1.04481,1.057257,1.013311,1.013846,1.004308,1.017188,0.81793,0.988666,1.053858,1.023325,1.041528,1.019361,1.102667,1.007792,1.026748,1.132657,1.04693 +2016,1.021978,1.071198,0.984833,1.012621,1.03789,1.006659,0.984484,1.005593,0.982695,0.983807,0.999649,0.968237,0.881651,0.991403,0.933831,1.001764,1.097065,1.011695,1.010367,0.993375,0.989722,1.002577,1.01625,0.828168,1.105413 +2017,1.049373,0.907035,1.018491,1.021273,1.025028,1.040577,1.060677,1.132498,1.093477,1.160123,1.088642,1.102389,1.344721,1.00723,0.94186,1.029301,1.011911,1.030968,1.014601,0.981621,1.0,0.998715,1.063959,1.0,1.0 +2018,1.042394,0.976786,1.074059,1.0245,1.019702,1.041821,1.042769,1.042713,1.074048,1.074033,1.031272,1.076804,1.074755,1.018778,0.92284,1.050825,1.103035,1.045097,1.045897,1.005738,1.0,1.002574,1.034828,1.0,1.0 +2019,1.032351,0.979401,1.019085,1.017913,1.028321,1.039292,1.004274,1.004387,1.019131,1.019122,1.014806,1.041751,0.925878,1.031182,0.940635,1.040577,1.054052,1.052158,1.045866,1.000751,1.0,1.002567,1.034809,1.0,1.0 +2020,1.067957,1.167938,0.947032,1.012495,1.041111,1.006381,1.016054,1.015991,0.947016,0.94708,0.989319,1.091767,1.292516,1.023383,1.034222,1.076313,0.996727,1.050763,1.046106,1.00255,1.0,1.003841,1.034974,1.0,1.0 +2021,1.071132,1.587189,1.283298,1.047189,1.01234,1.08209,1.041336,1.041335,1.283277,1.283185,0.912943,1.164429,1.792117,1.011965,8.619252,1.079518,1.03007,1.047248,1.047927,1.001796,1.0,1.002551,1.034869,1.0,1.0 +2022,1.012519,1.122753,1.126169,1.079668,1.04053,1.069673,1.011446,1.011444,1.126174,1.126257,1.065769,1.053916,0.614105,1.047964,0.152665,1.020194,1.030159,1.048769,1.047573,0.999851,1.0,1.002545,1.034942,1.0,1.0 +2023,1.071685,0.866302,1.082346,1.041353,1.004613,1.047498,1.08617,1.08622,1.082383,1.082323,1.115812,1.180977,0.755346,1.086103,0.748857,1.079838,1.030193,1.050822,1.048715,1.000448,1.0,1.003807,1.034968,1.0,1.0 +2024,1.048148,0.804922,1.043234,1.029525,1.026747,1.048019,1.042794,1.042768,1.043195,1.043207,1.04517,1.025545,1.3078,1.053819,1.257741,1.056041,1.030334,1.048426,1.051767,0.99776,1.0,1.002528,1.034951,1.0,1.0 +2025,1.041816,1.332261,1.042489,1.027674,1.031019,1.041912,1.033534,1.0335,1.042495,1.042459,1.04848,1.020951,1.262058,1.050753,1.150139,1.049347,1.030635,1.046248,1.052213,1.002245,1.0,1.003783,1.034897,1.0,1.0 +2026,1.040067,0.92138,1.041261,1.029301,1.032702,1.034974,1.04156,1.041597,1.041261,1.041273,1.104211,1.056798,1.03124,1.034979,1.092855,1.047499,1.030633,1.072236,1.0,0.999552,1.0,1.002513,1.034808,1.0,1.0 +2027,1.036538,0.958592,0.994087,1.025417,1.029,1.035776,1.041189,1.041154,0.994107,0.994125,1.070594,0.993921,0.957494,1.031636,1.062345,1.043841,1.030788,1.0,1.0,1.0,1.0,1.002506,1.034863,1.0,1.0 +2028,1.035494,0.970307,0.993447,1.023663,1.030774,1.034248,1.039941,1.039927,0.993419,0.993402,1.086673,0.992658,0.940374,1.034233,1.025967,1.042648,1.030942,1.0,1.0,1.0,1.0,1.0,1.0,1.0,1.0 +2029,1.033595,0.980131,1.000166,1.022858,1.030924,1.033076,1.039067,1.039111,1.000186,1.000222,1.075786,0.991511,0.975699,1.033447,1.01468,1.040489,1.031131,1.0,1.0,1.0,1.0,1.0,1.0,1.0,1.0 +2030,1.033898,0.989135,1.017738,1.022663,1.031094,1.032667,1.038678,1.03866,1.017736,1.017715,1.054557,1.01322,0.998445,1.033943,1.012472,1.04064,1.03133,1.0,1.0,1.0,1.0,1.0,1.0,1.0,1.0 +2031,1.03494,0.995169,1.028526,1.022531,1.030984,1.032004,1.037806,1.0378,1.028513,1.028538,1.051646,1.028241,1.012539,1.036568,1.026608,1.041542,1.03151,1.0,1.0,1.0,1.0,1.0,1.0,1.0,1.0 +2032,1.035457,0.999777,1.034817,1.022578,1.031257,1.031167,1.036369,1.036352,1.03482,1.034796,1.048854,1.036945,1.020192,1.036387,1.029998,1.041845,1.031644,1.0,1.0,1.0,1.0,1.0,1.0,1.0,1.0 +2033,1.035087,1.0014,1.036083,1.022611,1.030977,1.030948,1.035302,1.035308,1.036065,1.03609,1.041747,1.040731,1.024714,1.035312,1.02726,1.041341,1.031857,1.0,1.0,1.0,1.0,1.0,1.0,1.0,1.0 +2034,1.035075,1.003101,1.037118,1.022572,1.031017,1.030992,1.034961,1.034963,1.037148,1.037113,1.04445,1.041905,1.027937,1.033459,1.028351,1.041055,1.032059,1.0,1.0,1.0,1.0,1.0,1.0,1.0,1.0 +2035,1.034658,1.005994,1.037998,1.022526,1.030974,1.031065,1.034724,1.034714,1.037993,1.038018,1.037198,1.042629,1.029854,1.031715,1.027569,1.040521,1.032203,1.0,1.0,1.0,1.0,1.0,1.0,1.0,1.0 +2036,1.034438,1.005976,1.037274,1.022582,1.031058,1.031309,1.034389,1.034408,1.037258,1.037253,1.034837,1.041391,1.030058,1.033301,1.028547,1.040194,1.032293,1.0,1.0,1.0,1.0,1.0,1.0,1.0,1.0 diff --git a/puf_stage1/stage1.py b/puf_stage1/stage1.py index 9774375c..0c9a8798 100644 --- a/puf_stage1/stage1.py +++ b/puf_stage1/stage1.py @@ -4,7 +4,7 @@ CUR_PATH = os.path.abspath(os.path.dirname(__file__)) SYR = 2011 # calendar year used to normalize factors BEN_SYR = 2014 # calendar year used just for the benefit start year -EYR = 2035 # last calendar year we have data for +EYR = 2036 # last calendar year we have data for SOI_YR = 2017 # most recently available SOI estimates IRS_RET_YR = 2022 # most recently available IRS return projections diff --git a/puf_stage1/updatecbo.py b/puf_stage1/updatecbo.py index 5e49ed0c..a82bca5d 100644 --- a/puf_stage1/updatecbo.py +++ b/puf_stage1/updatecbo.py @@ -14,7 +14,6 @@ from datetime import datetime from jinja2 import Template - CUR_PATH = Path(__file__).resolve().parent @@ -354,13 +353,13 @@ def update_ucomp(url, baseline, text_args): Parameters ---------- url: URL linking to IRS website with projections of federal tax filings - baseline: CBO baseline we're updaint + baseline: CBO baseline we're updating text_args: Dictionary containing the arguments that will be passed to the documentation template Returns ------- baseline: Updated baseline numbers - text_args: Updated dictionary with text aruments to fill in the template + text_args: Updated dictionary with text arguments to fill in the template """ print("Updating Unemployment Projections") session = HTMLSession() diff --git a/puf_stage1/updatesoi.py b/puf_stage1/updatesoi.py index fd8786a0..e7708d9e 100644 --- a/puf_stage1/updatesoi.py +++ b/puf_stage1/updatesoi.py @@ -3,7 +3,6 @@ from pathlib import Path from collections import defaultdict - CUR_PATH = Path(__file__).resolve().parent # these are all of the columns used in the table 1.4 spreadsheet. The pattern diff --git a/puf_stage2/puf_weights.csv.gz b/puf_stage2/puf_weights.csv.gz index b23e6ac1..3fa8a7c2 100644 Binary files a/puf_stage2/puf_weights.csv.gz and b/puf_stage2/puf_weights.csv.gz differ diff --git a/puf_stage2/solver.jl b/puf_stage2/solver.jl index 296c269a..06f125a8 100644 --- a/puf_stage2/solver.jl +++ b/puf_stage2/solver.jl @@ -82,12 +82,12 @@ function Solve_func(year, tol) end -year_list = [x for x in 2012:2035] +year_list = [x for x in 2012:2036] tol_list = [0.40, 0.38, 0.35, 0.33, 0.30, 0.45, 0.45, 0.45, 0.45, 0.45, 0.45, 0.45, 0.45, 0.45, 0.45, 0.45, 0.45, 0.45, 0.45, 0.45, - 0.45, 0.5, 0.5, 0.5] + 0.45, 0.5, 0.5, 0.5, 0.5] # Run solver function for all years and tolerances (in order) for i in zip(year_list, tol_list) diff --git a/puf_stage2/stage2.py b/puf_stage2/stage2.py index f1e78087..d12dd43d 100644 --- a/puf_stage2/stage2.py +++ b/puf_stage2/stage2.py @@ -7,7 +7,6 @@ from pathlib import Path from dataprep import dataprep - CUR_PATH = Path(__file__).resolve().parent # Read hashes used to see which years can be skipped @@ -56,7 +55,7 @@ puf.s006 = puf.matched_weight * 100 # Dataprep -year_list = [x for x in range(2012, 2035 + 1)] +year_list = [x for x in range(2012, 2036 + 1)] skipped_years = [] for i in year_list: try: diff --git a/puf_stage3/puf_ratios.csv b/puf_stage3/puf_ratios.csv index 7337e4cc..46ee60f7 100644 --- a/puf_stage3/puf_ratios.csv +++ b/puf_stage3/puf_ratios.csv @@ -1,26 +1,27 @@ agi_bin,0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18 INT2011,1.0259,0.5597,0.9448,0.9681,0.9728,0.9464,0.8390,0.8997,0.9713,0.9239,0.9342,0.9413,0.9497,0.9510,0.9693,0.9702,0.9569,1.0123,1.7014 -INT2012,0.7778,0.9454,0.8433,0.8152,0.7153,0.8101,0.7961,0.7940,0.8481,0.9063,0.9129,0.9183,1.0343,1.0435,1.0129,1.1436,1.0975,1.2339,1.3445 -INT2013,1.1325,0.7670,0.7821,0.7778,0.8935,0.8699,0.9558,0.9045,0.8342,0.8595,0.9746,1.0269,1.0499,1.0505,1.0891,0.9632,1.0449,0.9690,1.1443 -INT2014,0.9106,0.8669,0.8492,0.7738,0.8431,0.8802,0.9729,0.8840,0.8368,1.0109,0.8448,1.0532,1.0274,0.9291,1.0609,1.1524,1.0624,1.0728,1.0860 -INT2015,0.9813,0.9511,0.9323,0.9470,0.9543,0.9246,0.9368,0.9315,0.9463,0.9698,0.9887,1.0165,0.9966,0.9906,1.0241,0.9827,1.0221,1.1437,1.1671 -INT2016,0.9843,1.0086,1.0453,1.0319,1.0447,1.0342,1.0110,1.0028,1.0025,1.0174,0.9482,0.9531,0.9752,1.0131,1.0723,1.0130,1.0804,1.0810,0.9938 -INT2017,0.9932,0.9174,0.8978,0.8918,0.8944,0.9131,0.9215,0.9399,0.9611,0.9788,1.0156,1.0693,1.0312,0.9881,0.9354,0.9756,0.9565,1.0484,1.1942 -INT2018,0.9991,0.9744,0.9683,0.9673,0.9757,0.9725,0.9748,0.9779,0.9742,0.9969,0.9929,1.0038,1.0148,1.0067,1.0226,0.9898,1.0182,1.0909,0.9981 -INT2019,0.9979,0.9771,0.9763,0.9903,0.9793,0.9805,0.9769,0.9852,0.9826,0.9937,0.9934,1.0109,1.0020,1.0074,0.9985,1.0006,1.0253,1.0283,1.0196 -INT2020,1.0017,0.9799,0.9739,0.9756,0.9843,0.9849,0.9831,0.9833,0.9932,0.9965,0.9958,1.0114,1.0058,1.0047,1.0076,0.9991,1.0129,1.0113,1.0113 -INT2021,0.9959,0.9797,0.9776,0.9781,0.9836,0.9898,0.9883,0.9869,0.9920,0.9978,1.0043,0.9974,1.0066,1.0119,1.0049,1.0040,1.0303,1.0085,1.0022 -INT2022,1.0062,0.9815,0.9810,0.9783,0.9724,0.9820,0.9850,0.9893,0.9934,1.0049,1.0022,1.0050,1.0029,1.0042,1.0047,1.0044,1.0133,0.9990,1.0111 -INT2023,0.9983,0.9812,0.9761,0.9789,0.9891,0.9893,0.9852,1.0199,0.9942,0.9956,1.0022,1.0012,1.0023,1.0073,1.0006,1.0093,1.0214,1.0020,0.9943 -INT2024,1.0016,0.9843,0.9813,0.9791,0.9712,0.9789,0.9893,1.0100,0.9905,0.9984,0.9987,0.9971,1.0048,1.0077,1.0089,1.0075,1.0238,1.0148,1.0081 -INT2025,1.0086,0.9934,0.9772,0.9767,0.9834,0.9817,1.0012,0.9941,0.9935,1.0008,0.9990,0.9978,1.0051,1.0074,1.0142,1.0150,1.0238,0.9941,0.9912 -INT2026,1.0089,0.9843,0.9792,0.9796,0.9872,0.9904,0.9989,0.9909,0.9953,0.9939,0.9931,0.9932,1.0070,1.0142,1.0373,1.0250,1.0208,0.9992,0.9937 -INT2027,1.0115,0.9888,0.9839,0.9805,0.9888,0.9905,0.9824,0.9951,0.9905,0.9944,0.9993,0.9913,1.0073,1.0184,1.0175,1.0275,1.0259,0.9935,0.9946 -INT2028,1.0062,0.9977,0.9772,0.9829,0.9863,0.9878,1.0107,0.9957,0.9924,0.9954,0.9931,0.9921,1.0068,1.0177,1.0271,1.0221,1.0222,0.9960,0.9918 -INT2029,1.0101,0.9939,0.9780,0.9801,0.9824,0.9852,1.0025,0.9850,0.9945,0.9933,0.9934,0.9928,1.0033,1.0285,1.0278,1.0474,1.0236,1.0013,0.9924 -INT2030,1.0295,1.0010,0.9821,0.9840,0.9821,0.9917,0.9822,0.9859,0.9830,0.9890,0.9815,0.9922,1.0058,1.0359,1.0382,1.0449,1.0299,0.9947,0.9921 -INT2031,1.0280,1.0214,0.9858,0.9918,0.9829,0.9886,0.9858,0.9788,0.9910,0.9938,0.9791,0.9869,0.9950,1.0446,1.0442,1.0732,1.0287,1.0061,0.9932 -INT2032,1.0079,1.1009,0.9920,0.9811,0.9867,0.9849,0.9881,0.9740,0.9732,0.9791,0.9662,0.9835,0.9898,1.0786,1.0900,1.1373,1.0482,1.0099,0.9983 -INT2033,0.9352,0.8346,0.9707,0.9745,0.9896,0.9850,0.9878,1.0383,1.0313,1.0351,1.1156,1.0746,1.0377,0.8505,0.8247,0.7425,0.8974,1.0567,1.0930 -INT2034,1.0278,0.9998,0.9801,0.9808,0.9905,0.9879,0.9984,0.9804,0.9885,0.9931,0.9775,0.9841,1.0025,1.0381,1.0368,1.0580,1.0409,1.0028,0.9939 -INT2035,1.0241,1.0200,0.9891,0.9840,0.9837,0.9859,0.9886,0.9688,0.9850,0.9882,0.9774,0.9926,1.0011,1.0428,1.0542,1.0592,1.0396,0.9982,0.9940 +INT2012,0.7778,0.9454,0.8433,0.8152,0.7153,0.8101,0.7961,0.7940,0.8480,0.9063,0.9129,0.9183,1.0344,1.0435,1.0129,1.1436,1.0975,1.2339,1.3445 +INT2013,1.1326,0.7670,0.7821,0.7778,0.8935,0.8699,0.9558,0.9046,0.8342,0.8595,0.9746,1.0275,1.0498,1.0505,1.0891,0.9632,1.0451,0.9689,1.1429 +INT2014,0.9106,0.8669,0.8492,0.7738,0.8431,0.8802,0.9729,0.8838,0.8368,1.0109,0.8443,1.0530,1.0274,0.9291,1.0609,1.1524,1.0624,1.0728,1.0873 +INT2015,0.9813,0.9511,0.9323,0.9470,0.9543,0.9246,0.9368,0.9315,0.9463,0.9699,0.9892,1.0162,0.9966,0.9906,1.0241,0.9827,1.0220,1.1437,1.1671 +INT2016,0.9843,1.0086,1.0453,1.0319,1.0447,1.0342,1.0107,1.0031,1.0024,1.0174,0.9483,0.9531,0.9752,1.0131,1.0723,1.0130,1.0804,1.0810,0.9936 +INT2017,0.9932,0.9174,0.8978,0.8918,0.8944,0.9131,0.9217,0.9397,0.9611,0.9788,1.0156,1.0693,1.0312,0.9881,0.9354,0.9756,0.9565,1.0484,1.1944 +INT2018,0.9991,0.9744,0.9683,0.9673,0.9757,0.9725,0.9748,0.9779,0.9742,0.9969,0.9930,1.0037,1.0148,1.0067,1.0231,0.9898,1.0182,1.0912,0.9981 +INT2019,0.9978,0.9771,0.9763,0.9903,0.9793,0.9805,0.9769,0.9853,0.9826,0.9936,0.9934,1.0110,1.0020,1.0074,0.9985,1.0006,1.0253,1.0281,1.0196 +INT2020,1.0017,0.9799,0.9739,0.9757,0.9843,0.9849,0.9830,0.9833,0.9931,0.9966,0.9958,1.0114,1.0058,1.0047,1.0071,0.9991,1.0129,1.0113,1.0113 +INT2021,0.9959,0.9798,0.9777,0.9781,0.9830,0.9898,0.9884,0.9867,0.9921,0.9977,1.0044,0.9974,1.0067,1.0117,1.0050,1.0041,1.0304,1.0086,1.0022 +INT2022,1.0062,0.9815,0.9810,0.9782,0.9729,0.9820,0.9850,0.9895,0.9934,1.0049,1.0022,1.0048,1.0029,1.0045,1.0046,1.0044,1.0133,0.9990,1.0111 +INT2023,0.9987,0.9812,0.9761,0.9787,0.9893,0.9893,0.9851,1.0193,0.9938,0.9956,1.0022,1.0013,1.0024,1.0073,1.0005,1.0093,1.0215,1.0018,0.9943 +INT2024,1.0012,0.9842,0.9813,0.9793,0.9710,0.9788,0.9892,1.0115,0.9909,0.9983,0.9986,0.9971,1.0046,1.0076,1.0088,1.0073,1.0237,1.0149,1.0081 +INT2025,1.0086,0.9936,0.9773,0.9768,0.9835,0.9818,1.0013,0.9933,0.9934,1.0009,0.9993,0.9979,1.0047,1.0075,1.0143,1.0152,1.0239,0.9940,0.9913 +INT2026,1.0086,0.9842,0.9792,0.9790,0.9871,0.9903,1.0007,0.9908,0.9952,0.9938,0.9928,0.9931,1.0073,1.0141,1.0372,1.0249,1.0212,0.9990,0.9936 +INT2027,1.0117,0.9889,0.9840,0.9811,0.9889,0.9906,0.9806,0.9951,0.9907,0.9945,0.9990,0.9913,1.0075,1.0185,1.0176,1.0277,1.0254,0.9937,0.9947 +INT2028,1.0062,0.9977,0.9780,0.9829,0.9863,0.9877,1.0107,0.9957,0.9923,0.9954,0.9945,0.9920,1.0066,1.0169,1.0261,1.0220,1.0222,0.9959,0.9918 +INT2029,1.0101,0.9939,0.9772,0.9801,0.9824,0.9852,1.0025,0.9851,0.9945,0.9933,0.9924,0.9929,1.0034,1.0290,1.0288,1.0474,1.0236,1.0014,0.9925 +INT2030,1.0295,1.0010,0.9819,0.9840,0.9820,0.9917,0.9823,0.9877,0.9811,0.9890,0.9815,0.9923,1.0054,1.0363,1.0385,1.0449,1.0300,0.9947,0.9921 +INT2031,1.0279,1.0216,0.9859,0.9918,0.9829,0.9886,0.9858,0.9770,0.9929,0.9938,0.9791,0.9867,0.9954,1.0445,1.0436,1.0734,1.0286,1.0061,0.9932 +INT2032,1.0080,1.1002,0.9920,0.9812,0.9867,0.9850,0.9881,0.9741,0.9733,0.9791,0.9658,0.9835,0.9898,1.0786,1.0903,1.1372,1.0482,1.0099,0.9984 +INT2033,0.9352,0.8350,0.9707,0.9744,0.9896,0.9850,0.9878,1.0382,1.0312,1.0351,1.1160,1.0744,1.0377,0.8504,0.8247,0.7424,0.8974,1.0566,1.0930 +INT2034,1.0279,0.9998,0.9801,0.9808,0.9905,0.9878,0.9984,0.9804,0.9885,0.9931,0.9775,0.9844,1.0024,1.0379,1.0368,1.0572,1.0408,1.0028,0.9939 +INT2035,1.0241,1.0200,0.9891,0.9840,0.9837,0.9859,0.9886,0.9688,0.9847,0.9882,0.9774,0.9925,1.0012,1.0429,1.0542,1.0600,1.0397,0.9982,0.9941 +INT2036,1.0244,1.0129,0.9923,0.9971,0.9926,0.9867,0.9826,0.9869,0.9898,0.9906,0.9660,0.9876,0.9927,1.0517,1.0637,1.0965,1.0402,0.9962,0.9918 diff --git a/puf_stage3/stage3.py b/puf_stage3/stage3.py index a631c7a5..27260e7f 100644 --- a/puf_stage3/stage3.py +++ b/puf_stage3/stage3.py @@ -3,10 +3,9 @@ import numpy as np import pandas as pd - CUR_PATH = os.path.abspath(os.path.dirname(__file__)) start_year = 2011 -end_year = 2035 +end_year = 2036 def adjustment(agi, var, var_name, target, weights, blowup): diff --git a/taxdata/cps/cpsmar.py b/taxdata/cps/cpsmar.py index 21b2baa3..5aca2354 100644 --- a/taxdata/cps/cpsmar.py +++ b/taxdata/cps/cpsmar.py @@ -5,7 +5,6 @@ from pathlib import Path from .helpers import read_benefits - CUR_PATH = Path(__file__).resolve().parent DATA_PATH = Path(CUR_PATH, "data") diff --git a/taxdata/cps/create.py b/taxdata/cps/create.py index e281657c..77e5d943 100644 --- a/taxdata/cps/create.py +++ b/taxdata/cps/create.py @@ -15,7 +15,6 @@ from .cps_meta import CPS_META_DATA, C_TAM_YEARS from .cpsmar import create_cps - CUR_PATH = Path(__file__).resolve().parent _DATA_PATH = Path(CUR_PATH, "data") with Path(CUR_PATH, "master_cps_dict.pkl").open("rb") as f: diff --git a/taxdata/cps/finalprep.py b/taxdata/cps/finalprep.py index 23b86dfb..96090a6c 100644 --- a/taxdata/cps/finalprep.py +++ b/taxdata/cps/finalprep.py @@ -9,7 +9,6 @@ from .helpers import CUR_PATH from .constants import USEABLE_VARS - ADJ_TARGETS = pd.read_csv(Path(CUR_PATH, "adjustment_targets.csv")) diff --git a/taxdata/cps/helpers.py b/taxdata/cps/helpers.py index be6abac1..fbbc9f86 100644 --- a/taxdata/cps/helpers.py +++ b/taxdata/cps/helpers.py @@ -4,7 +4,6 @@ from functools import reduce from paramtools.parameters import Parameters - CUR_PATH = Path(__file__).resolve().parent DATA_PATH = Path(CUR_PATH, "data") PUF_YEAR = 2011 diff --git a/taxdata/cps/pycps.py b/taxdata/cps/pycps.py index 300cb90f..6492e25a 100644 --- a/taxdata/cps/pycps.py +++ b/taxdata/cps/pycps.py @@ -5,7 +5,6 @@ from .helpers import filingparams, cps_yr_idx from .cps_meta import C_TAM_YEARS - INCOME_VARS = [ "wsal_val", "int_val", diff --git a/taxdata/cps/taxunit.py b/taxdata/cps/taxunit.py index 3e9f3ca8..ea0d5188 100644 --- a/taxdata/cps/taxunit.py +++ b/taxdata/cps/taxunit.py @@ -5,7 +5,6 @@ CPS_BENEFIT_TUPLES, ) - INCOME_TUPLES = [ ("wsal_val", "e00200"), ("int_val", "interest"), diff --git a/taxdata/cps/transform_sas.py b/taxdata/cps/transform_sas.py index 43082224..72c2756e 100644 --- a/taxdata/cps/transform_sas.py +++ b/taxdata/cps/transform_sas.py @@ -7,7 +7,6 @@ from pathlib import Path from .cps_meta import CPS_META_DATA - CUR_PATH = Path(__file__).resolve().parent diff --git a/taxdata/cps/validation.py b/taxdata/cps/validation.py index 0d30bf0c..f555b2b5 100644 --- a/taxdata/cps/validation.py +++ b/taxdata/cps/validation.py @@ -3,7 +3,6 @@ from pathlib import Path from .helpers import filingparams, cps_yr_idx - CUR_PATH = Path(__file__).resolve().parent INCOME_TUPLES = [ ("wsal_val", "e00200"), diff --git a/taxdata/puf/finalprep.py b/taxdata/puf/finalprep.py index 3286329b..c7d4010f 100644 --- a/taxdata/puf/finalprep.py +++ b/taxdata/puf/finalprep.py @@ -5,7 +5,6 @@ from .constants import UNUSED_READ_VARS from pathlib import Path - CUR_PATH = Path(__file__).resolve().parent USABLE_VARS = tc.Records(data=None).USABLE_READ_VARS USABLE_VARS.add("filer") diff --git a/taxdata/puf/impute_itmexp.py b/taxdata/puf/impute_itmexp.py index e5c7344a..298770fd 100644 --- a/taxdata/puf/impute_itmexp.py +++ b/taxdata/puf/impute_itmexp.py @@ -38,7 +38,6 @@ import pandas as pd import statsmodels.api as sm - DUMP0 = False DUMP1 = False DUMP2 = False diff --git a/tests/conftest.py b/tests/conftest.py index a9005bbe..f180a2cc 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -4,7 +4,6 @@ import pandas as pd from pathlib import Path - # TODO: revise the following constants when using new or revised CPS/PUF data CPS_START_YEAR = 2014 PUF_START_YEAR = 2011 diff --git a/tests/test_data.py b/tests/test_data.py index 1c812306..6afe19e7 100644 --- a/tests/test_data.py +++ b/tests/test_data.py @@ -87,7 +87,7 @@ def relationships(data, dataname): else: # see Note (2) in docstring m = "Number of records where n24 > nu18 has changed" - assert (data["n24"] > data["nu18"]).sum() == 9690, m + assert (data["n24"] > data["nu18"]).sum() == 9695, m subdata = data[data["n24"] > data["nu18"]] m = "n24 > nu18 + 3" assert np.all(subdata["n24"] <= subdata["nu18"] + 3), m diff --git a/tests/test_weights.py b/tests/test_weights.py index 3ef8a7c4..432f27f2 100644 --- a/tests/test_weights.py +++ b/tests/test_weights.py @@ -5,7 +5,6 @@ import pytest import numpy as np - DUMP_WEIGHTS = False # normally set to False; True implies dump with test fail