taxcalc 4.6.1__py3-none-any.whl → 4.6.3__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.6.1'
+__version__ = '4.6.3'
 __min_python3_version__ = 10
 __max_python3_version__ = 12

taxcalc/calcfunctions.py

@@ -3190,7 +3190,7 @@ def NonrefundableCredits(c05800, e07240, e07260, e07300, e07400,
 @iterate_jit(nopython=True)
 def AdditionalCTC(codtc_limited, ACTC_c, n24, earned, ACTC_Income_thd,
                   ACTC_rt, nu06, ACTC_rt_bonus_under6family, ACTC_ChildNum,
-                  CTC_is_refundable, CTC_include17,
+                  CTC_is_refundable, CTC_include17, CTC_c,
                   age_head, age_spouse, MARS, nu18,
                   ptax_was, c03260, e09800, c59660, e11200,
                   c11070):
@@ -3251,7 +3251,7 @@ def AdditionalCTC(codtc_limited, ACTC_c, n24, earned, ACTC_Income_thd,
             childnum = n24 + max(0, nu18 - tu18 - su18 - n24)
         else:
             childnum = n24
-        line4 = ACTC_c * childnum
+        line4 = min(ACTC_c, CTC_c) * childnum
     c11070 = 0.  # line15
     if line3 > 0. and line4 > 0.:
         line5 = min(line3, line4)

taxcalc/cli/tc.py

@@ -43,7 +43,7 @@ def cli_tc_main():
         ),
         (
             '          '
-            '[--silent] [--test] [--version] [--usage]'
+            '[--runid N] [--silent] [--test] [--version] [--usage]'
         )
     )
     parser = argparse.ArgumentParser(
@@ -75,20 +75,20 @@ def cli_tc_main():
     parser.add_argument('--baseline',
                         help=('BASELINE is name of optional JSON reform file. '
                               'A compound reform can be specified using 2+ '
-                              'file names separated by plus (+) character(s). '
+                              'file names connected by plus (+) character(s). '
                               'No --baseline implies baseline policy is '
                               'current-law policy.'),
                         default=None)
     parser.add_argument('--reform',
                         help=('REFORM is name of optional JSON reform file. '
                               'A compound reform can be specified using 2+ '
-                              'file names separated by plus (+) character(s). '
+                              'file names connected by plus (+) character(s). '
                               'No --reform implies reform policy is '
                               'current-law policy).'),
                         default=None)
     parser.add_argument('--assump',
                         help=('ASSUMP is name of optional JSON economic '
-                              'assumptions file.  No --assump implies use '
+                              'assumptions file. No --assump implies use '
                               'of no customized assumptions.'),
                         default=None)
     parser.add_argument('--exact',
@@ -125,12 +125,19 @@ def cli_tc_main():
     parser.add_argument('--dumpvars',
                         help=('DUMPVARS is name of optional file containing a '
                               'space-delimited list of variables to include '
-                              'in the dump database.  No --dumpvars '
-                              'implies a minimal set of variables.  Valid '
-                              'variable names include all variables in the '
+                              '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('--runid', metavar='N',
+                        help=('N is a positive integer run id that is used '
+                              'to construct simpler output file names. '
+                              'No --runid implies legacy output file names '
+                              'are used.'),
+                        type=int,
+                        default=0)
     parser.add_argument('--silent',
                         help=('optional flag that suppresses messages about '
                               'input and output actions.'),
@@ -153,16 +160,23 @@ def cli_tc_main():
                         default=False,
                         action="store_true")
     args = parser.parse_args()
+    using_error_file = args.silent and args.runid != 0
+    efilename = f'run{args.runid}.errors'
     # check Python version
     pyv = sys.version_info
     pymin = tc.__min_python3_version__
     pymax = tc.__max_python3_version__
     if pyv[0] != 3 or pyv[1] < pymin or pyv[1] > pymax:  # pragma: no cover
         pyreq = f'at least Python 3.{pymin} and at most Python 3.{pymax}'
-        sys.stderr.write(
+        msg = (
             f'ERROR: Tax-Calculator requires {pyreq}\n'
             f'       but Python {pyv[0]}.{pyv[1]} is installed\n'
         )
+        if using_error_file:
+            with open(efilename, 'w', encoding='utf-8') as efile:
+                efile.write(msg)
+        else:
+            sys.stderr.write(msg)
         return 1
     # show Tax-Calculator version and quit if --version option is specified
     if args.version:
@@ -186,20 +200,32 @@ def cli_tc_main():
     # check taxyear value
     if taxyear > tc.Policy.LAST_BUDGET_YEAR:
         msg = f'ERROR: TAXYEAR is greater than {tc.Policy.LAST_BUDGET_YEAR}\n'
-        sys.stderr.write(msg)
-        sys.stderr.write('USAGE: tc --help\n')
+        if using_error_file:
+            with open(efilename, 'w', encoding='utf-8') as efile:
+                efile.write(msg)
+        else:
+            sys.stderr.write(msg)
+            sys.stderr.write('USAGE: tc --help\n')
         return 1
     # check numyears value
     if args.numyears < 1:
         msg = 'ERROR: --numyears parameter N is less than one\n'
-        sys.stderr.write(msg)
-        sys.stderr.write('USAGE: tc --help\n')
+        if using_error_file:
+            with open(efilename, 'w', encoding='utf-8') as efile:
+                efile.write(msg)
+        else:
+            sys.stderr.write(msg)
+            sys.stderr.write('USAGE: tc --help\n')
         return 1
     max_numyears = tc.Policy.LAST_BUDGET_YEAR - taxyear + 1
     if args.numyears > max_numyears:
         msg = f'ERROR: --numyears parameter N is greater than {max_numyears}\n'
-        sys.stderr.write(msg)
-        sys.stderr.write('USAGE: tc --help\n')
+        if using_error_file:
+            with open(efilename, 'w', encoding='utf-8') as efile:
+                efile.write(msg)
+        else:
+            sys.stderr.write(msg)
+            sys.stderr.write('USAGE: tc --help\n')
         return 1
     # specify if aging input data
     aging_data = (
@@ -210,8 +236,12 @@ def cli_tc_main():
     # 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')
+        if using_error_file:
+            with open(efilename, 'w', encoding='utf-8') as efile:
+                efile.write(msg)
+        else:
+            sys.stderr.write(msg)
+            sys.stderr.write('USAGE: tc --help\n')
         return 1
     # specify dumpvars_str from args.dumpvars file
     dumpvars_str = ''
@@ -221,9 +251,22 @@ def cli_tc_main():
                 dumpvars_str = dfile.read()
         else:
             msg = f'ERROR: DUMPVARS file {args.dumpvars} does not exist\n'
+            if using_error_file:
+                with open(efilename, 'w', encoding='utf-8') as efile:
+                    efile.write(msg)
+            else:
+                sys.stderr.write(msg)
+                sys.stderr.write('USAGE: tc --help\n')
+            return 1
+    if args.runid < 0:
+        msg = 'ERROR: --runid parameter N is less than zero\n'
+        if using_error_file:
+            with open(efilename, 'w', encoding='utf-8') as efile:
+                efile.write(msg)
+        else:
             sys.stderr.write(msg)
             sys.stderr.write('USAGE: tc --help\n')
-            return 1
+        return 1
     # do calculations for taxyear
     # ... initialize TaxCalcIO object for taxyear
     tcio = tc.TaxCalcIO(
@@ -232,14 +275,19 @@ def cli_tc_main():
         baseline=args.baseline,
         reform=args.reform,
         assump=args.assump,
+        runid=args.runid,
         silent=args.silent,
     )
     if tcio.errmsg:
-        if tcio.errmsg.endswith('\n'):
-            sys.stderr.write(tcio.errmsg)
+        msg = tcio.errmsg
+        if not msg.endswith('\n'):
+            msg += '\n'
+        if using_error_file:
+            with open(efilename, 'w', encoding='utf-8') as efile:
+                efile.write(msg)
         else:
-            sys.stderr.write(tcio.errmsg + '\n')
-        sys.stderr.write('USAGE: tc --help\n')
+            sys.stderr.write(msg)
+            sys.stderr.write('USAGE: tc --help\n')
         return 1
     tcio.init(
         input_data=inputfn,
@@ -251,19 +299,27 @@ def cli_tc_main():
         exact_calculations=args.exact,
     )
     if tcio.errmsg:
-        if tcio.errmsg.endswith('\n'):
-            sys.stderr.write(tcio.errmsg)
+        msg = tcio.errmsg
+        if not msg.endswith('\n'):
+            msg += '\n'
+        if using_error_file:
+            with open(efilename, 'w', encoding='utf-8') as efile:
+                efile.write(msg)
         else:
-            sys.stderr.write(tcio.errmsg + '\n')
-        sys.stderr.write('USAGE: tc --help\n')
+            sys.stderr.write(msg)
+            sys.stderr.write('USAGE: tc --help\n')
         return 1
     # ... conduct tax analysis for taxyear
     dumpvars_list = tcio.dump_variables(dumpvars_str)
     if tcio.errmsg:
-        if tcio.errmsg.endswith('\n'):
-            sys.stderr.write(tcio.errmsg)
+        msg = tcio.errmsg
+        if not msg.endswith('\n'):
+            msg += '\n'
+        if using_error_file:
+            with open(efilename, 'w', encoding='utf-8') as efile:
+                efile.write(msg)
         else:
-            sys.stderr.write(tcio.errmsg + '\n')
+            sys.stderr.write(msg)
             sys.stderr.write('USAGE: tc --help\n')
         return 1
     tcio.analyze(
@@ -313,7 +369,7 @@ EXPECTED_TEST_OUTPUT = (
     '1|131.88\n'
     '2|28879.00\n'
 )
-TEST_DUMPDB_FILENAME = f'test-{str(TEST_TAXYEAR)[2:]}-#-#-#.db'
+TEST_DUMPDB_FILENAME = f'test-{str(TEST_TAXYEAR)[2:]}-#-#-#.dumpdb'
 TEST_SQLITE_QUERY = """
 SELECT
   RECID           AS id,