Skip to content

Commit

Permalink
Merge pull request #2676 from bodiyang/CBO-feb-2023
Browse files Browse the repository at this point in the history 
CBO Feb 2023 update
  • Loading branch information
@jdebacker
jdebacker authored Apr 14, 2023
2 parents 98a290b + f407cb5 commit fc8dd25
Show file tree
Hide file tree
Showing 16 changed files with 420 additions and 410 deletions.
2 changes: 1 addition & 1 deletion taxcalc/consumption.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"validators": {
"range": {
"min": 2013,
"max": 2031
"max": 2032
}
}
},
Expand Down
Binary file modified taxcalc/cps_weights.csv.gz
View file
Binary file not shown.
2 changes: 1 addition & 1 deletion taxcalc/growdiff.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"validators": {
"range": {
"min": 2013,
"max": 2031
"max": 2032
}
}
},
Expand Down
2 changes: 1 addition & 1 deletion taxcalc/growdiff.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ class instance: GrowDiff
"""

JSON_START_YEAR = 2013 # must be same as Policy.JSON_START_YEAR
DEFAULT_NUM_YEARS = 19 # must be same as Policy.DEFAULT_NUM_YEARS
DEFAULT_NUM_YEARS = 20 # must be same as Policy.DEFAULT_NUM_YEARS
DEFAULTS_FILE_NAME = 'growdiff.json'
DEFAULTS_FILE_PATH = os.path.abspath(os.path.dirname(__file__))

Expand Down
47 changes: 24 additions & 23 deletions taxcalc/growfactors.csv
View file
Original file line number Diff line number Diff line change
@@ -1,23 +1,24 @@
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.075127,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.925901,1.030133,0.940635,1.040577,1.054052,1.052158,1.045866,1.000751,1.0,1.002567,1.034809,1.0,1.0
2020,1.056938,1.813845,0.940257,1.012495,1.041121,1.004989,1.004567,1.004445,0.940227,0.94026,0.96956,0.978493,1.302967,1.025146,1.034222,1.065251,0.996727,1.050763,1.046106,1.00255,1.0,1.003841,1.034974,1.0,1.0
2021,1.065613,1.38251,1.243218,1.047189,1.012343,1.085107,1.08221,1.082288,1.243221,1.243145,1.00833,0.994333,1.139841,1.02525,8.619252,1.073841,1.03007,1.047248,1.047927,1.001796,1.0,1.002551,1.034869,1.0,1.0
2022,1.014264,0.67377,1.046443,1.06083,1.025451,1.079419,1.063033,1.063033,1.04646,1.046462,0.983656,1.078978,1.049901,1.033189,0.152665,1.022075,1.030159,1.048769,1.047573,0.999851,1.0,1.002545,1.034942,1.0,1.0
2023,1.044444,0.862335,1.008071,1.030979,0.938619,1.035918,1.036349,1.036351,1.008083,1.008124,1.097247,1.079631,0.962076,1.047041,0.748857,1.05237,1.030193,1.050822,1.048715,1.000448,1.0,1.003807,1.034968,1.0,1.0
2024,1.037847,0.885951,0.990312,1.023978,1.014013,1.026672,1.023684,1.023703,0.990298,0.990322,1.108768,1.053902,0.911757,1.036396,1.1413,1.045587,1.030334,1.048426,1.051767,0.99776,1.0,1.002528,1.034951,1.0,1.0
2025,1.03501,0.919607,1.008369,1.023046,1.013663,1.026626,1.026244,1.026192,1.008357,1.00836,1.083891,1.038874,0.946031,1.031398,1.080245,1.042557,1.030635,1.046248,1.052213,1.002245,1.0,1.003783,1.034897,1.0,1.0
2026,1.035253,0.946983,0.993581,1.023178,1.013864,1.029325,1.028253,1.02825,0.993624,0.993577,1.067689,1.023339,0.968743,1.03338,1.088079,1.042652,1.030633,1.072236,1.0,0.999552,1.0,1.002513,1.034808,1.0,1.0
2027,1.034018,0.977849,1.005239,1.02329,1.013979,1.031437,1.029508,1.029521,1.005193,1.005243,1.051108,1.01405,0.990435,1.034463,1.083875,1.041307,1.030788,1.0,1.0,1.0,1.0,1.002506,1.034863,1.0,1.0
2028,1.035905,0.995321,1.020695,1.023729,1.01446,1.031158,1.033385,1.033406,1.020707,1.020689,1.053992,1.015071,1.006854,1.036783,1.089982,1.043045,1.030942,1.0,1.0,1.0,1.0,1.0,1.0,1.0,1.0
2029,1.035025,1.0089,1.033243,1.023719,1.014549,1.030668,1.033693,1.033697,1.033216,1.033236,1.046554,1.020971,1.016148,1.036838,1.064942,1.04193,1.031131,1.0,1.0,1.0,1.0,1.0,1.0,1.0,1.0
2030,1.035867,1.010931,1.03173,1.0235,1.014559,1.030862,1.033243,1.033256,1.031727,1.031723,1.04925,1.026048,1.023206,1.03765,1.037984,1.042643,1.03133,1.0,1.0,1.0,1.0,1.0,1.0,1.0,1.0
2031,1.03509,1.015051,1.029587,1.023476,1.014709,1.031269,1.033219,1.033181,1.02961,1.029585,1.04574,1.028842,1.025765,1.04034,1.033856,1.041644,1.03151,1.0,1.0,1.0,1.0,1.0,1.0,1.0,1.0
2032,1.035678,1.014887,1.029938,1.023253,1.014637,1.031428,1.033072,1.033077,1.029942,1.02993,1.042493,1.031177,1.027994,0.986817,1.027932,1.042124,1.031644,1.0,1.0,1.0,1.0,1.0,1.0,1.0,1.0
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,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1
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,1,1,1,1,1,1,1
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,1,1,1,1,1,1,1
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,1,1,1,1,1,1,1
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.998715,1.063959,1,1
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,1.002574,1.034828,1,1
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,1.002567,1.034809,1,1
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,1.003841,1.034974,1,1
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.758329,1.011965,8.619252,1.073809,1.03007,1.047248,1.047927,1.001796,1,1.002551,1.034869,1,1
2022,1.014347,1.742914,1.047552,1.08083,1.04054,1.076282,1.022527,1.022546,1.047553,1.047566,1.049118,1.042358,0.82675,1.04749,0.152665,1.022138,1.030159,1.048769,1.047573,0.999851,1,1.002545,1.034942,1,1
2023,1.054201,1.03319,0.873178,1.047758,1.009154,1.042139,1.028961,1.028889,0.873183,0.873156,1.174061,1.015964,0.867089,1.047041,0.748857,1.062234,1.030193,1.050822,1.048715,1.000448,1,1.003807,1.034968,1,1
2024,1.038836,0.870911,1.000645,1.030339,0.956676,1.039748,1.040273,1.040343,1.000565,1.000609,1.081062,0.989209,0.915123,1.036396,1.1413,1.046568,1.030334,1.048426,1.051767,0.99776,1,1.002528,1.034951,1,1
2025,1.034907,0.87943,1.096815,1.021764,1.013047,1.041247,1.043718,1.04369,1.09689,1.096912,1.030393,1.011731,0.952165,1.031398,1.080245,1.042369,1.030635,1.046248,1.052213,1.002245,1,1.003783,1.034897,1,1
2026,1.039173,0.90835,1.060267,1.020465,1.012355,1.035864,1.045,1.044999,1.060215,1.060215,1.063716,1.028441,0.971613,1.03338,1.088079,1.046686,1.030633,1.072236,1,0.999552,1,1.002513,1.034808,1,1
2027,1.036609,0.935007,1.050354,1.0206,1.012574,1.031018,1.041202,1.0412,1.050406,1.050393,1.060188,1.035861,0.990163,1.034463,1.083875,1.043902,1.030788,1,1,1,1,1.002506,1.034863,1,1
2028,1.035916,0.956729,1.032098,1.021722,1.013294,1.031277,1.039487,1.039471,1.03206,1.032034,1.043698,1.036009,1.002091,1.036783,1.089982,1.043027,1.030942,1,1,1,1,1,1,1,1
2029,1.034972,0.970431,1.026404,1.022699,1.014057,1.031606,1.038467,1.038469,1.026422,1.026419,1.034908,1.032884,1.011698,1.036838,1.064942,1.041896,1.031131,1,1,1,1,1,1,1,1
2030,1.035143,0.981692,1.028019,1.022707,1.014218,1.031278,1.037083,1.037068,1.028013,1.028021,1.034625,1.032267,1.018569,1.03765,1.037984,1.04193,1.03133,1,1,1,1,1,1,1,1
2031,1.034656,0.98857,1.028686,1.022828,1.014369,1.030991,1.035848,1.035864,1.028713,1.028731,1.031897,1.031879,1.02287,1.04034,1.033856,1.041232,1.03151,1,1,1,1,1,1,1,1
2032,1.035547,0.993833,1.030388,1.022563,1.014303,1.030321,1.035026,1.035011,1.030391,1.03037,1.032375,1.031412,1.025532,0.986817,1.027932,1.041944,1.031644,1,1,1,1,1,1,1,1
2033,1.03478,0.997528,1.029259,1.022843,1.014647,1.029773,1.033903,1.033919,1.029271,1.029242,1.034438,1.031009,1.027149,0.987888,1,1.040985,1.031857,1,1,1,1,1,1,1,1
4 changes: 2 additions & 2 deletions taxcalc/policy.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,9 +37,9 @@ class instance: Policy
DEFAULTS_FILE_NAME = 'policy_current_law.json'
DEFAULTS_FILE_PATH = os.path.abspath(os.path.dirname(__file__))
JSON_START_YEAR = 2013 # remains the same unless earlier data added
LAST_KNOWN_YEAR = 2019 # last year for which indexed param vals are known
LAST_KNOWN_YEAR = 2020 # last year for which indexed param vals are known
# should increase LAST_KNOWN_YEAR by one every calendar year
LAST_BUDGET_YEAR = 2031 # last extrapolation year
LAST_BUDGET_YEAR = 2032 # last extrapolation year
# should increase LAST_BUDGET_YEAR by one every calendar year
DEFAULT_NUM_YEARS = LAST_BUDGET_YEAR - JSON_START_YEAR + 1

Expand Down
Loading

0 comments on commit fc8dd25

Please sign in to comment.