Merge pull request #2729 from bodiyang/CBO-Feb-2024

CBO Feb 2024 update
PSLmodels · Mar 26, 2024 · ec0a4ef · ec0a4ef
2 parents 26378ac + 7a210be
commit ec0a4ef
Show file tree

Hide file tree

Showing 15 changed files with 552 additions and 542 deletions.
diff --git a/taxcalc/consumption.json b/taxcalc/consumption.json
@@ -6,7 +6,7 @@
                 "validators": {
                     "range": {
                         "min": 2013,
-                        "max": 2033
+                        "max": 2034
                     }
                 }
             },

diff --git a/taxcalc/cps_weights.csv.gz b/taxcalc/cps_weights.csv.gz
diff --git a/taxcalc/growdiff.json b/taxcalc/growdiff.json
@@ -6,7 +6,7 @@
                 "validators": {
                     "range": {
                         "min": 2013,
-                        "max": 2033
+                        "max": 2034
                     }
                 }
             },

diff --git a/taxcalc/growdiff.py b/taxcalc/growdiff.py
@@ -27,7 +27,7 @@ class instance: GrowDiff
     """
 
     JSON_START_YEAR = 2013  # must be same as Policy.JSON_START_YEAR
-    DEFAULT_NUM_YEARS = 21  # must be same as Policy.DEFAULT_NUM_YEARS
+    DEFAULT_NUM_YEARS = 22  # must be same as Policy.DEFAULT_NUM_YEARS
     DEFAULTS_FILE_NAME = 'growdiff.json'
     DEFAULTS_FILE_PATH = os.path.abspath(os.path.dirname(__file__))
 

diff --git a/taxcalc/growfactors.csv b/taxcalc/growfactors.csv
@@ -9,16 +9,17 @@ YEAR,ATXPY,ASCHF,ABOOK,ACPIU,ACPIM,AWAGE,ASCHCI,ASCHCL,ASCHEI,ASCHEL,AINTS,ADIVS
 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
+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,1.002551,1.034869,1,1
+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.631565,1.04749,0.152665,1.022138,1.030159,1.048769,1.047573,0.999851,1,1.002545,1.034942,1,1
+2023,1.050108,0.653145,1.091056,1.040233,1.004761,1.050035,1.013156,1.013121,1.091037,1.091047,1.026196,1.126711,1.0525,1.085497,0.748857,1.058072,1.030193,1.050822,1.048715,1.000448,1,1.003807,1.034968,1,1
+2024,1.046242,0.895528,1.007166,1.025982,1.01407,1.040377,1.0397,1.03963,1.007187,1.007157,1.156028,1.023049,0.932271,1.052921,1.337549,1.054081,1.030334,1.048426,1.051767,0.99776,1,1.002528,1.034951,1,1
+2025,1.040442,0.963117,1.020457,1.024892,0.958663,1.038977,1.037682,1.037745,1.020415,1.020444,1.091746,1.02538,0.97747,1.031721,1.154874,1.047914,1.030635,1.046248,1.052213,1.002245,1,1.003783,1.034897,1,1
+2026,1.039294,0.987094,1.014705,1.023445,1.014023,1.035978,1.037783,1.037762,1.014711,1.014716,1.098184,1.019802,0.970235,1.030992,1.035291,1.046856,1.030633,1.072236,1,0.999552,1,1.002513,1.034808,1,1
+2027,1.037119,0.998822,1.017535,1.021948,1.013312,1.033569,1.03414,1.034138,1.017568,1.017583,1.066606,1.013266,0.993714,1.031791,1.045541,1.044372,1.030788,1,1,1,1,1.002506,1.034863,1,1
+2028,1.036799,1.006582,1.023966,1.021812,1.013356,1.033042,1.031594,1.03158,1.023985,1.02393,1.050716,1.021542,1.009158,1.03344,1.043558,1.043967,1.030942,1,1,1,1,1,1,1,1
+2029,1.035913,1.010333,1.028149,1.022135,1.013612,1.033365,1.030869,1.030888,1.028085,1.028143,1.03013,1.032091,1.018962,1.033664,1.045739,1.042825,1.031131,1,1,1,1,1,1,1,1
+2030,1.036423,1.01018,1.024121,1.022298,1.013855,1.03321,1.030563,1.030595,1.02417,1.024128,1.036979,1.032934,1.024538,1.034401,1.043738,1.043174,1.03133,1,1,1,1,1,1,1,1
+2031,1.036362,1.010259,1.024733,1.022377,1.014016,1.032812,1.031233,1.03124,1.024699,1.024734,1.039197,1.032793,1.027842,1.036645,1.038241,1.042951,1.03151,1,1,1,1,1,1,1,1
+2032,1.036409,1.009979,1.028,1.022687,1.014306,1.032126,1.032334,1.032295,1.028004,1.027983,1.04014,1.03261,1.029719,1.036435,1.031319,1.042807,1.031644,1,1,1,1,1,1,1,1
+2033,1.035793,1.008195,1.02813,1.022484,1.014309,1.031481,1.033961,1.033991,1.028128,1.02811,1.031669,1.03246,1.030798,1.037554,1.028443,1.042009,1.031857,1,1,1,1,1,1,1,1
+2034,1.035385,1.008203,1.02971,1.02246,1.014443,1.030912,1.033294,1.033253,1.029705,1.029722,1.027096,1.032231,1.031308,1.03748,1.029528,1.041408,1.032059,1,1,1,1,1,1,1,1
diff --git a/taxcalc/policy.py b/taxcalc/policy.py
@@ -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 = 2020  # last year for which indexed param vals are known
+    LAST_KNOWN_YEAR = 2022  # last year for which indexed param vals are known
     # should increase LAST_KNOWN_YEAR by one every calendar year
-    LAST_BUDGET_YEAR = 2033  # last extrapolation year
+    LAST_BUDGET_YEAR = 2034  # last extrapolation year
     # should increase LAST_BUDGET_YEAR by one every calendar year
     DEFAULT_NUM_YEARS = LAST_BUDGET_YEAR - JSON_START_YEAR + 1