taxcalc 4.4.1__py3-none-any.whl → 4.6.0__py3-none-any.whl

taxcalc/__init__.py

@@ -14,6 +14,6 @@ from taxcalc.taxcalcio import *
 from taxcalc.utils import *
 from taxcalc.cli import *
 
-__version__ = '4.4.1'
+__version__ = '4.6.0'
 __min_python3_version__ = 10
 __max_python3_version__ = 12

taxcalc/calcfunctions.py

@@ -3,11 +3,7 @@ Tax-Calculator functions that calculate payroll and individual income taxes.
 
 These functions are imported into the Calculator class.
 
-Note: the parameter_indexing_CPI_offset policy parameter is the only
-policy parameter that does not appear here; it is used in the policy.py
-file to possibly adjust the price inflation rate used to index policy
-parameters (as would be done in a reform that introduces chained-CPI
-indexing).
+Note: the parameter_indexing_CPI_offset parameter is no longer used.
 """
 # CODING-STYLE CHECKS:
 # pycodestyle calcfunctions.py
@@ -2059,7 +2055,7 @@ def AMT(e07300, dwks13, standard, f6251, c00100, c18300, taxbc,
     e62900: float
         Alternative Minimum Tax foreign tax credit from Form 6251
     e00700: float
-        Schedule C business net profit/loss for filing unit
+        Taxable refunds of state and local income taxes
     dwks10: float
         Sum of dwks6 + dwks9
     age_head: int

taxcalc/calculator.py

@@ -113,29 +113,29 @@ class Calculator():
             raise ValueError('consumption must be None or Consumption object')
         if self.__consumption.current_year < self.__policy.current_year:
             self.__consumption.set_year(self.__policy.current_year)
-        if verbose:
-            if self.__records.IGNORED_VARS:
-                print('Your data include the following unused ' +
-                      'variables that will be ignored:')
-                for var in self.__records.IGNORED_VARS:
-                    print('  ' +
-                          var)
         current_year_is_data_year = (
             self.__records.current_year == self.__records.data_year)
         if sync_years and current_year_is_data_year:
-            if verbose:
-                print('You loaded data for ' +
-                      str(self.__records.data_year) + '.')
             while self.__records.current_year < self.__policy.current_year:
                 self.__records.increment_year()
             if verbose:
-                print('Tax-Calculator startup automatically ' +
-                      'extrapolated your data to ' +
-                      str(self.__records.current_year) + '.')
+                print(
+                    f'Read input data for {self.__records.data_year}; '
+                    'input data were extrapolated to '
+                    f'{self.__records.current_year}'
+                )
         else:
             if verbose:
-                print('Tax-Calculator startup did not ' +
-                      'extrapolate your data.')
+                print(  # pragma: no cover
+                    'Read input data that were not extrapolated in any way'
+                )
+        if verbose and self.__records.IGNORED_VARS:  # pragma: no cover
+            print(
+                'Input data include the following unused '
+                'variables that will be ignored:'
+            )
+            for var in self.__records.IGNORED_VARS:
+                print(f'  {var}')
         assert self.__policy.current_year == self.__records.current_year
         assert self.__policy.current_year == self.__consumption.current_year
         self.__stored_records = None

taxcalc/cli/tc.py

@@ -9,6 +9,7 @@ which can be accessed as 'tc' from an installed taxcalc conda package.
 import os
 import sys
 import time
+import sqlite3
 import argparse
 import difflib
 import taxcalc as tc
@@ -25,26 +26,31 @@ def cli_tc_main():
     # pylint: disable=too-many-statements,too-many-branches
     # pylint: disable=too-many-return-statements,too-many-locals
 
+    start_time = time.time()
+
     # parse command-line arguments:
-    usage_str = 'tc INPUT TAXYEAR {}{}{}{}{}'.format(
+    usage_str = 'tc INPUT TAXYEAR {}{}{}{}'.format(
         '[--help]\n',
-        ('          '
-         '[--baseline BASELINE] [--reform REFORM] [--assump  ASSUMP]\n'),
-        ('          '
-         '[--exact] [--tables] [--graphs] [--timings]\n'),
-        ('          '
-         '[--dump] [--dvars DVARS] [--sqldb] [--outdir OUTDIR]\n'),
-        ('          '
-         '[--test] [--version]'))
+        (
+            '          '
+            '[--baseline BASELINE] [--reform REFORM] '
+            '[--assump ASSUMP] [--exact]\n'
+        ),
+        (
+            '          '
+            '[--params] [--tables] [--graphs] '
+            '[--dumpdb] [--dumpvars DUMPVARS]\n'
+        ),
+        (
+            '          '
+            '[--silent] [--test] [--version] [--usage]'
+        )
+    )
     parser = argparse.ArgumentParser(
         prog='',
         usage=usage_str,
-        description=('Writes to a file the federal income and payroll tax '
-                     'OUTPUT for each filing unit specified in the INPUT '
-                     'file, with the OUTPUT computed from the INPUT for the '
-                     'TAXYEAR using Tax-Calculator. The OUTPUT file is a '
-                     'CSV-formatted file that contains tax information for '
-                     'each INPUT filing unit under the reform(s).'))
+        description=('Writes several output files computed from the INPUT '
+                     'for the TAXYEAR using Tax-Calculator.'))
     parser.add_argument('INPUT', nargs='?',
                         help=('INPUT is name of CSV-formatted file that '
                               'contains for each filing unit variables used '
@@ -66,7 +72,7 @@ def cli_tc_main():
                         help=('REFORM is name of optional JSON reform file. '
                               'A compound reform can be specified using two '
                               'file names separated by a plus (+) character. '
-                              'No --reform implies a "null" reform (that is, '
+                              'No --reform implies reform policy is '
                               'current-law policy).'),
                         default=None)
     parser.add_argument('--assump',
@@ -80,6 +86,12 @@ def cli_tc_main():
                               'complicate marginal-tax-rate calculations.'),
                         default=False,
                         action="store_true")
+    parser.add_argument('--params',
+                        help=('optional flag that causes policy parameter '
+                              'values for baseline and reform to be written '
+                              'to separate text files.'),
+                        default=False,
+                        action="store_true")
     parser.add_argument('--tables',
                         help=('optional flag that causes distributional '
                               'tables to be written to a text file.'),
@@ -90,47 +102,33 @@ def cli_tc_main():
                               'to HTML files for viewing in browser.'),
                         default=False,
                         action="store_true")
-    parser.add_argument('--timings',
-                        help=('optional flag that causes execution times to '
-                              'be written to stdout.'),
-                        default=False,
-                        action="store_true")
-    parser.add_argument('--dump',
-                        help=('optional flag that causes OUTPUT to contain '
-                              'all INPUT variables (extrapolated to TAXYEAR) '
-                              'and all calculated tax variables for the '
-                              'reform, where all the variables are named '
-                              'using their internal Tax-Calculator names. '
-                              'No --dump option implies OUTPUT contains '
-                              'minimal tax output for the reform.  NOTE: '
-                              'use the --dvars option to point to a file '
-                              'containing a custom set of dump variables.'
-                              ''),
+    parser.add_argument('--dumpdb',
+                        help=('optional flag that causes TAXYEAR variable '
+                              'values for each tax-unit under both '
+                              'baseline and reform policies to be written '
+                              'to a SQLite database (where the variables '
+                              'included in the database are controlled by '
+                              'the --dumpvars option).'),
                         default=False,
                         action="store_true")
-    parser.add_argument('--dvars',
-                        help=('DVARS is name of optional file containing a '
+    parser.add_argument('--dumpvars',
+                        help=('DUMPVARS is name of optional file containing a '
                               'space-delimited list of variables to include '
-                              'in a partial dump OUTPUT file.  No --dvars '
-                              'implies a full dump containing all variables.'),
+                              'in the dump database.  No --dumpvars '
+                              'implies a minimal set of variables.  Valid '
+                              'variable names include all variables in the '
+                              'records_variables.json file plus mtr_itax and '
+                              'mtr_ptax (MTRs wrt taxpayer earnings).'),
                         default=None)
-    parser.add_argument('--sqldb',
-                        help=('optional flag that writes SQLite database '
-                              'with two tables (baseline and reform) each '
-                              'containing same output variables as '
-                              'produced by --dump option.'),
+    parser.add_argument('--silent',
+                        help=('optional flag that suppresses messages about '
+                              'input and output actions.'),
                         default=False,
                         action="store_true")
-    parser.add_argument('--outdir',
-                        help=('OUTDIR is name of optional output directory '
-                              'in which all output files are written. '
-                              'No --outdir implies output files are written '
-                              'in the current directory.'),
-                        default=None)
     parser.add_argument('--test',
                         help=('optional flag that conducts installation '
                               'test, writes test result to stdout, '
-                              'and quits.'),
+                              'and quits leaving the test-related files.'),
                         default=False,
                         action="store_true")
     parser.add_argument('--version',
@@ -138,6 +136,11 @@ def cli_tc_main():
                               'release version to stdout and quits.'),
                         default=False,
                         action="store_true")
+    parser.add_argument('--usage',
+                        help=('optional flag that writes short usage '
+                              'reminder to stdout and quits.'),
+                        default=False,
+                        action="store_true")
     args = parser.parse_args()
     # check Python version
     pyv = sys.version_info
@@ -155,21 +158,33 @@ def cli_tc_main():
         pyver = f'Python 3.{pyv[1]}'
         sys.stdout.write(f'Tax-Calculator {tc.__version__} on {pyver}\n')
         return 0
+    # show short usage reminder and quit if --usage option is specified
+    if args.usage:
+        sys.stdout.write(f'USAGE: {usage_str}\n')
+        return 0
     # write test input and expected output files if --test option is specified
     if args.test:
-        _write_expected_test_output()
+        _write_test_files()
         inputfn = TEST_INPUT_FILENAME
         taxyear = TEST_TAXYEAR
+        args.dumpdb = True
     else:
         inputfn = args.INPUT
         taxyear = args.TAXYEAR
     # instantiate TaxCalcIO object and do tax analysis
-    tcio = tc.TaxCalcIO(input_data=inputfn, tax_year=taxyear,
-                        baseline=args.baseline,
-                        reform=args.reform, assump=args.assump,
-                        outdir=args.outdir)
+    tcio = tc.TaxCalcIO(
+        input_data=inputfn,
+        tax_year=taxyear,
+        baseline=args.baseline,
+        reform=args.reform,
+        assump=args.assump,
+        silent=args.silent,
+    )
     if tcio.errmsg:
-        sys.stderr.write(tcio.errmsg)
+        if tcio.errmsg.endswith('\n'):
+            sys.stderr.write(tcio.errmsg)
+        else:
+            sys.stderr.write(tcio.errmsg + '\n')
         sys.stderr.write('USAGE: tc --help\n')
         return 1
     aging = (
@@ -177,87 +192,155 @@ def cli_tc_main():
         inputfn.endswith('cps.csv') or
         inputfn.endswith('tmd.csv')
     )
-    if args.timings:
-        stime = time.time()
-    tcio.init(input_data=inputfn, tax_year=taxyear,
-              baseline=args.baseline,
-              reform=args.reform, assump=args.assump,
-              aging_input_data=aging,
-              exact_calculations=args.exact)
-    if args.timings:
-        xtime = time.time() - stime
-        sys.stdout.write(f'TIMINGS: init time = {xtime:.2f} secs\n')
+    tcio.init(
+        input_data=inputfn,
+        tax_year=taxyear,
+        baseline=args.baseline,
+        reform=args.reform, assump=args.assump,
+        aging_input_data=aging,
+        exact_calculations=args.exact,
+    )
     if tcio.errmsg:
-        sys.stderr.write(tcio.errmsg)
+        if tcio.errmsg.endswith('\n'):
+            sys.stderr.write(tcio.errmsg)
+        else:
+            sys.stderr.write(tcio.errmsg + '\n')
+        sys.stderr.write('USAGE: tc --help\n')
+        return 1
+    # check args.dumpdb and args.dumpvars consistency
+    if not args.dumpdb and args.dumpvars:
+        msg = 'ERROR: DUMPVARS file specified without --dumpdb option\n'
+        sys.stderr.write(msg)
         sys.stderr.write('USAGE: tc --help\n')
         return 1
-    dumpvar_set = None
-    if args.dvars and (args.dump or args.sqldb):
-        if os.path.exists(args.dvars):
-            with open(args.dvars, 'r', encoding='utf-8') as dfile:
-                dump_vars_str = dfile.read()
-            dumpvar_set = tcio.custom_dump_variables(dump_vars_str)
-            if tcio.errmsg:
-                sys.stderr.write(tcio.errmsg)
-                sys.stderr.write('USAGE: tc --help\n')
-                return 1
+    # construct dumpvars set from dumpvars_str
+    dumpvars_str = ''
+    if args.dumpvars:
+        if os.path.exists(args.dumpvars):
+            with open(args.dumpvars, 'r', encoding='utf-8') as dfile:
+                dumpvars_str = dfile.read()
         else:
-            msg = 'ERROR: DVARS file {} does not exist\n'
-            sys.stderr.write(msg.format(args.dvars))
+            msg = f'ERROR: DUMPVARS file {args.dumpvars} does not exist\n'
+            sys.stderr.write(msg)
             sys.stderr.write('USAGE: tc --help\n')
             return 1
+    dumpvars_list = tcio.dump_variables(dumpvars_str)
+    if tcio.errmsg:
+        if tcio.errmsg.endswith('\n'):
+            sys.stderr.write(tcio.errmsg)
+        else:
+            sys.stderr.write(tcio.errmsg + '\n')
+            sys.stderr.write('USAGE: tc --help\n')
+        return 1
     # conduct tax analysis
-    if args.timings:
-        stime = time.time()
-    tcio.analyze(writing_output_file=True,
-                 output_tables=args.tables,
-                 output_graphs=args.graphs,
-                 dump_varset=dumpvar_set,
-                 output_dump=args.dump,
-                 output_sqldb=args.sqldb)
-    if args.timings:
-        xtime = time.time() - stime
-        sys.stdout.write(f'TIMINGS: calc time = {xtime:.2f} secs\n')
+    tcio.analyze(
+        output_params=args.params,
+        output_tables=args.tables,
+        output_graphs=args.graphs,
+        output_dump=args.dumpdb,
+        dump_varlist=dumpvars_list,
+    )
     # compare test output with expected test output if --test option specified
     if args.test:
         retcode = _compare_test_output_files()
         return retcode
+    if not args.silent:
+        print(  # pragma: no cover
+            f'Execution time is {(time.time() - start_time):.1f} seconds'
+        )
     return 0
 # end of cli_tc_main function code
 
 
-EXPECTED_TEST_OUTPUT_FILENAME = f'test-{str(TEST_TAXYEAR)[2:]}-out.csv'
-ACTUAL_TEST_OUTPUT_FILENAME = f'test-{str(TEST_TAXYEAR)[2:]}-#-#-#.csv'
+TEST_INPUT_DATA = (
+    'RECID,MARS,XTOT,EIC,e00200,e00200p,e00200s,p23250,e18400,e19800,s006\n'
+    '1,       2,   3,  1, 40000,  40000,      0,     0,  3000,  4000, 1e7\n'
+    '2,       2,   3,  1,200000, 200000,      0,     0, 15000, 20000, 1e7\n'
+)
+EXPECTED_TEST_FILENAME = f'test-{str(TEST_TAXYEAR)[2:]}.exp'
+EXPECTED_TEST_OUTPUT = (
+    'id|itax\n'
+    '1|131.88\n'
+    '2|28879.00\n'
+)
+TEST_DUMPDB_FILENAME = f'test-{str(TEST_TAXYEAR)[2:]}-#-#-#.db'
+TEST_SQLITE_QUERY = """
+SELECT
+  RECID           AS id,
+  ROUND(iitax, 2) AS itax
+FROM baseline;
+"""
+ACTUAL_TEST_FILENAME = f'test-{str(TEST_TAXYEAR)[2:]}.act'
+TEST_TABULATE_FILENAME = 'test-tabulate.sql'
+TEST_TABULATE_SQLCODE = (
+    f'-- USAGE: sqlite3 {TEST_DUMPDB_FILENAME} < {TEST_TABULATE_FILENAME}\n'
+    '\n'
+    '-- sepecify base.income_group values\n'
+    'UPDATE base SET income_group =\n'
+    '  CASE  -- specify the income_group brackets as desired\n'
+    '    WHEN expanded_income <   0.0   THEN 0\n'
+    '    WHEN expanded_income <  50.0e3 THEN 1\n'
+    '    WHEN expanded_income < 100.0e3 THEN 2\n'
+    '    WHEN expanded_income < 500.0e3 THEN 3\n'
+    '    WHEN expanded_income <   1.0e6 THEN 4\n'
+    '    ELSE                                5\n'
+    '  END;\n'
+    '\n'
+    '-- tabulate baseline and reform iitax for joint filers by income_group\n'
+    '.separator "\t"\n'
+    '.headers on\n'
+    'SELECT\n'
+    '  income_group                     AS g,\n'
+    '  COUNT(*)                         AS units,\n'
+    '  ROUND(SUM(b.iitax*s006)*1e-9, 3) AS b_iitax,\n'
+    '  ROUND(SUM(r.iitax*s006)*1e-9, 3) AS r_iitax\n'
+    'FROM base JOIN baseline AS b USING(RECID) JOIN reform AS r USING(RECID)\n'
+    'WHERE MARS == 2\n'
+    'GROUP BY income_group;\n'
+    '.headers off\n'
+    'SELECT\n'
+    "  'A'                              AS g,\n"
+    '  COUNT(*)                         AS units,\n'
+    '  ROUND(SUM(b.iitax*s006)*1e-9, 3) AS b_iitax,\n'
+    '  ROUND(SUM(r.iitax*s006)*1e-9, 3) AS r_iitax\n'
+    'FROM base JOIN baseline AS b USING(RECID) JOIN reform AS r USING(RECID)\n'
+    'WHERE MARS == 2;\n'
+    '\n'
+    '-- Documentation on the sqlite3 CLI program is available at\n'
+    '-- https://sqlite.org/cli.html\n'
+)
 
 
-def _write_expected_test_output():
+def _write_test_files():
     """
     Private function that writes tc --test input and expected output files.
     """
-    input_data = (
-        'RECID,MARS,XTOT,EIC,e00200,e00200p,e00200s,p23250,e18400,e19800\n'
-        '1,       2,   3,  1, 40000,  40000,      0,     0,  3000,  4000\n'
-        '2,       2,   3,  1,200000, 200000,      0,     0, 15000, 20000\n'
-    )
     with open(TEST_INPUT_FILENAME, 'w', encoding='utf-8') as ifile:
-        ifile.write(input_data)
-    expected_output_data = (
-        'RECID,YEAR,WEIGHT,INCTAX,LSTAX,PAYTAX\n'
-        '1,2018,0.00,131.88,0.00,6120.00\n'
-        '2,2018,0.00,28879.00,0.00,21721.60\n'
-    )
-    with open(EXPECTED_TEST_OUTPUT_FILENAME, 'w', encoding='utf-8') as ofile:
-        ofile.write(expected_output_data)
+        ifile.write(TEST_INPUT_DATA)
+    with open(EXPECTED_TEST_FILENAME, 'w', encoding='utf-8') as ofile:
+        ofile.write(EXPECTED_TEST_OUTPUT)
+    with open(TEST_TABULATE_FILENAME, 'w', encoding='utf-8') as tfile:
+        tfile.write(TEST_TABULATE_SQLCODE)
 
 
 def _compare_test_output_files():
     """
-    Private function that compares expected and actual tc --test output files;
+    Private function that compares expected and actual tc --test results;
     returns 0 if pass test, otherwise returns 1.
     """
-    with open(EXPECTED_TEST_OUTPUT_FILENAME, 'r', encoding='utf-8') as efile:
+    # use TEST_SQLITE_QUERY to extract results from TEST_DUMPDB_FILENAME
+    with sqlite3.connect(TEST_DUMPDB_FILENAME) as connection:
+        cursor = connection.cursor()
+        cursor.execute(TEST_SQLITE_QUERY)
+        results = cursor.fetchall()
+        with open(ACTUAL_TEST_FILENAME, 'w', encoding='utf-8') as afile:
+            afile.write('id|itax\n')
+            for row in results:
+                afile.write(f'{row[0]}|{row[1]:.2f}\n')
+    # compare results in ACTUAL_TEST_FILENAME and in EXPECTED_TEST_FILENAME
+    with open(EXPECTED_TEST_FILENAME, 'r', encoding='utf-8') as efile:
         explines = efile.readlines()
-    with open(ACTUAL_TEST_OUTPUT_FILENAME, 'r', encoding='utf-8') as afile:
+    with open(ACTUAL_TEST_FILENAME, 'r', encoding='utf-8') as afile:
         actlines = afile.readlines()
     if ''.join(explines) == ''.join(actlines):
         sys.stdout.write('PASSED TEST\n')
@@ -266,8 +349,8 @@ def _compare_test_output_files():
         retcode = 1
         sys.stdout.write('FAILED TEST\n')
         diff = difflib.unified_diff(explines, actlines,
-                                    fromfile=EXPECTED_TEST_OUTPUT_FILENAME,
-                                    tofile=ACTUAL_TEST_OUTPUT_FILENAME, n=0)
+                                    fromfile=EXPECTED_TEST_FILENAME,
+                                    tofile=ACTUAL_TEST_FILENAME, n=0)
         sys.stdout.writelines(diff)
     return retcode
 

taxcalc/consumption.json

@@ -6,7 +6,7 @@
                 "validators": {
                     "range": {
                         "min": 2013,
-                        "max": 2034
+                        "max": 2035
                     }
                 }
             },

taxcalc/growdiff.json

@@ -6,7 +6,7 @@
                 "validators": {
                     "range": {
                         "min": 2013,
-                        "max": 2034
+                        "max": 2035
                     }
                 }
             },

taxcalc/growfactors.csv

@@ -1,25 +1,26 @@
-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.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
+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

taxcalc/policy.py

@@ -42,7 +42,7 @@ class Policy(Parameters):
     JSON_START_YEAR = 2013  # remains the same unless earlier data added
     LAST_KNOWN_YEAR = 2025  # last year for which indexed param vals are known
     # should increase LAST_KNOWN_YEAR by one every calendar year
-    LAST_BUDGET_YEAR = 2034  # default value of last extrapolation year
+    LAST_BUDGET_YEAR = 2035  # default value of last extrapolation year
     # should increase LAST_BUDGET_YEAR by one every calendar year
 
     @staticmethod
@@ -62,15 +62,6 @@ class Policy(Parameters):
         'DependentCredit_before_CTC': 'is a removed parameter name',
         'FilerCredit_c': 'is a removed parameter name',
         'ALD_InvInc_ec_base_RyanBrady': 'is a removed parameter name',
-        # following parameter renamed in PR 2292 merged on 2019-04-15
-        "cpi_offset": (
-            "was renamed parameter_indexing_CPI_offset. "
-            "See documentation for change in usage."
-        ),
-        "CPI_offset": (
-            "was renamed parameter_indexing_CPI_offset. "
-            "See documentation for change in usage."
-        ),
         # following parameters renamed in PR 2345 merged on 2019-06-24
         'PT_excl_rt':
         'was renamed PT_qbid_rt in release 2.4.0',
@@ -170,9 +161,9 @@ class Policy(Parameters):
             vo["value"] for
             vo in self._data["parameter_indexing_CPI_offset"]["value"]
         ]
-        # policy_current_law.json should not specify any non-zero values
-        # for the parameter_indexing_CPI_offset parameter, so check this
-        assert any(cpi_vals) is False
+        # parameter_indexing_CPI_offset parameter is no longer used, so check:
+        assert any(cpi_vals) is False, \
+            'obsolete parameter_indexing_CPI_offset values must all be zero'
         syr = max(self.start_year, self._gfactors.first_year)
         self._inflation_rates = self._gfactors.price_inflation_rates(
             syr, self.end_year