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

taxcalc/calculator.py

@@ -305,11 +305,11 @@ class Calculator():
         return self.__consumption.benval_params()
 
     @property
-    def reform_warnings(self):
+    def reform_errors(self):
         """
-        Calculator class embedded Policy object's parameter_warnings.
+        Calculator class embedded Policy object's parameter_errors.
         """
-        return self.__policy.parameter_warnings
+        return self.__policy.parameter_errors
 
     @property
     def current_year(self):

taxcalc/cli/tc.py

@@ -1,6 +1,6 @@
 """
 Command-line interface (CLI) to Tax-Calculator,
-which can be accessed as 'tc' from an installed taxcalc conda package.
+which can be accessed as 'tc' from an installed taxcalc package.
 """
 # CODING-STYLE CHECKS:
 # pycodestyle tc.py
@@ -30,7 +30,7 @@ def cli_tc_main():
 
     # parse command-line arguments:
     usage_str = 'tc INPUT TAXYEAR {}{}{}{}'.format(
-        '[--help]\n',
+        '[--help] [--numyears N]\n',
         (
             '          '
             '[--baseline BASELINE] [--reform REFORM] '
@@ -63,15 +63,26 @@ def cli_tc_main():
                               'are computed.'),
                         type=int,
                         default=0)
+    parser.add_argument('--numyears', metavar='N',
+                        help=('N is an integer indicating for how many '
+                              'years taxes are calculated. No --numyears '
+                              'implies calculations are done only for '
+                              'TAXYEAR. N greater than one implies output '
+                              'is written to separate files for each year '
+                              'beginning with TAXYEAR.'),
+                        type=int,
+                        default=1)
     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). '
                               '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 two '
-                              'file names separated by a plus (+) character. '
+                              'A compound reform can be specified using 2+ '
+                              'file names separated by plus (+) character(s). '
                               'No --reform implies reform policy is '
                               'current-law policy).'),
                         default=None)
@@ -167,11 +178,54 @@ def cli_tc_main():
         _write_test_files()
         inputfn = TEST_INPUT_FILENAME
         taxyear = TEST_TAXYEAR
+        args.numyears = 1
         args.dumpdb = True
     else:
         inputfn = args.INPUT
         taxyear = args.TAXYEAR
-    # instantiate TaxCalcIO object and do tax analysis
+    # 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')
+        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')
+        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')
+        return 1
+    # specify if aging input data
+    aging_data = (
+        inputfn.endswith('puf.csv') or
+        inputfn.endswith('cps.csv') or
+        inputfn.endswith('tmd.csv')
+    )
+    # 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
+    # specify dumpvars_str from args.dumpvars file
+    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 = f'ERROR: DUMPVARS file {args.dumpvars} does not exist\n'
+            sys.stderr.write(msg)
+            sys.stderr.write('USAGE: tc --help\n')
+            return 1
+    # do calculations for taxyear
+    # ... initialize TaxCalcIO object for taxyear
     tcio = tc.TaxCalcIO(
         input_data=inputfn,
         tax_year=taxyear,
@@ -187,17 +241,13 @@ def cli_tc_main():
             sys.stderr.write(tcio.errmsg + '\n')
         sys.stderr.write('USAGE: tc --help\n')
         return 1
-    aging = (
-        inputfn.endswith('puf.csv') or
-        inputfn.endswith('cps.csv') or
-        inputfn.endswith('tmd.csv')
-    )
     tcio.init(
         input_data=inputfn,
         tax_year=taxyear,
         baseline=args.baseline,
-        reform=args.reform, assump=args.assump,
-        aging_input_data=aging,
+        reform=args.reform,
+        assump=args.assump,
+        aging_input_data=aging_data,
         exact_calculations=args.exact,
     )
     if tcio.errmsg:
@@ -207,23 +257,7 @@ def cli_tc_main():
             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
-    # 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 = f'ERROR: DUMPVARS file {args.dumpvars} does not exist\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'):
@@ -232,7 +266,6 @@ def cli_tc_main():
             sys.stderr.write(tcio.errmsg + '\n')
             sys.stderr.write('USAGE: tc --help\n')
         return 1
-    # conduct tax analysis
     tcio.analyze(
         output_params=args.params,
         output_tables=args.tables,
@@ -244,6 +277,23 @@ def cli_tc_main():
     if args.test:
         retcode = _compare_test_output_files()
         return retcode
+    # quit if args.numyears is equal to one
+    if args.numyears == 1:
+        if not args.silent:
+            print(  # pragma: no cover
+                f'Execution time is {(time.time() - start_time):.1f} seconds'
+            )
+        return 0
+    # analyze years after taxyear if args.numyears is greater than one
+    for xyear in range(1, args.numyears):
+        tcio.advance_to_year(taxyear + xyear, aging_data)
+        tcio.analyze(
+            output_params=args.params,
+            output_tables=args.tables,
+            output_graphs=args.graphs,
+            output_dump=args.dumpdb,
+            dump_varlist=dumpvars_list,
+        )
     if not args.silent:
         print(  # pragma: no cover
             f'Execution time is {(time.time() - start_time):.1f} seconds'

taxcalc/data.py

@@ -147,8 +147,8 @@ class Data():
 
     def increment_year(self):
         """
-        Add one to current year; and also does
-        extrapolation & reweighting for new current year if aged_data is True.
+        Add one to current year; and also does extrapolation & reweighting
+        of data for the new current year if self._aging_data is True.
         """
         # move to next year
         self.__current_year += 1

taxcalc/parameters.py

@@ -706,11 +706,6 @@ class Parameters(pt.Parameters):
         """Propery docstring"""
         return self.end_year - self.start_year + 1
 
-    @property
-    def parameter_warnings(self):
-        """Propery docstring"""
-        return self.errors or {}
-
     @property
     def parameter_errors(self):
         """Propery docstring"""

taxcalc/policy_current_law.json

@@ -76,8 +76,8 @@
         }
     },
     "parameter_indexing_CPI_offset": {
-        "title": "OBSOLETE: Decimal offset ADDED to unchained CPI to get parameter indexing rate",
-        "description": "OBSOLETE policy parameter.",
+        "title": "Decimal offset added to chained CPI-U inflation rate to get policy parameter indexing rate",
+        "description": "Always zero in policy_current_law.json, but non-zero values are allowed in reforms.",
         "notes": "",
         "section_1": "Parameter Indexing",
         "section_2": "Offsets",
@@ -104,6 +104,10 @@
             {
                 "year": 2017,
                 "value": 0.0
+            },
+            {
+                "year": 2018,
+                "value": 0.0
             }
         ],
         "validators": {

taxcalc/taxcalcio.py

@@ -115,23 +115,37 @@ class TaxCalcIO():
         else:
             msg = 'INPUT is neither string nor Pandas DataFrame'
             self.errmsg += f'ERROR: {msg}\n'
-        # check name and existence of BASELINE file
+        # check name(s) and existence of BASELINE file(s)
         bas = '-x'
         if baseline is None:
+            self.specified_baseline = False
             bas = '-#'
         elif isinstance(baseline, str):
-            # remove any leading directory path from BASELINE filename
-            fname = os.path.basename(baseline)
-            # check if fname ends with ".json"
-            if fname.endswith('.json'):
-                bas = f'-{fname[:-5]}'
-            else:
-                msg = 'BASELINE file name does not end in .json'
-                self.errmsg += f'ERROR: {msg}\n'
-            # check existence of BASELINE file
-            if not os.path.isfile(baseline):
-                msg = 'BASELINE file could not be found'
-                self.errmsg += f'ERROR: {msg}\n'
+            self.specified_baseline = True
+            # split any compound baseline into list of simple reforms
+            basnames = []
+            baselines = baseline.split('+')
+            for bas in baselines:
+                # remove any leading directory path from bas filename
+                fname = os.path.basename(bas)
+                # check if fname ends with ".json"
+                if not fname.endswith('.json'):
+                    msg = f'{fname} does not end in .json'
+                    self.errmsg += f'ERROR: BASELINE file name {msg}\n'
+                # check existence of BASELINE file
+                if not os.path.isfile(bas):
+                    msg = f'{bas} could not be found'
+                    self.errmsg += f'ERROR: BASELINE file {msg}\n'
+                # add fname to list of basnames used in output file names
+                basnames.append(fname)
+            # create (possibly compound) baseline name for output file names
+            bas = '-'
+            num_basnames = 0
+            for basname in basnames:
+                num_basnames += 1
+                if num_basnames > 1:
+                    bas += '+'
+                bas += f'{basname[:-5]}'
         else:
             msg = 'TaxCalcIO.ctor: baseline is neither None nor str'
             self.errmsg += f'ERROR: {msg}\n'
@@ -191,6 +205,15 @@ class TaxCalcIO():
             self.errmsg += f'ERROR: {msg}\n'
         # create OUTPUT file name and delete any existing output files
         self.output_filename = f'{inp}{bas}{ref}{asm}.xxx'
+        self.delete_output_files()
+        # initialize variables whose values are set in init method
+        self.calc_ref = None
+        self.calc_bas = None
+
+    def delete_output_files(self):
+        """
+        Delete all output files derived from self.output_filename.
+        """
         extensions = [
             '-params.bas',
             '-params.ref',
@@ -202,9 +225,6 @@ class TaxCalcIO():
         ]
         for ext in extensions:
             delete_file(self.output_filename.replace('.xxx', ext))
-        # initialize variables whose values are set in init method
-        self.calc_ref = None
-        self.calc_bas = None
 
     def init(self, input_data, tax_year, baseline, reform, assump,
              aging_input_data, exact_calculations):
@@ -258,8 +278,12 @@ class TaxCalcIO():
             return
         # get assumption sub-dictionaries
         assumpdict = Calculator.read_json_param_objects(None, assump)
-        # get policy parameter dictionary from --baseline file
-        poldict_bas = Calculator.read_json_param_objects(baseline, None)
+        # get policy parameter dictionaries from --baseline file(s)
+        poldicts_bas = []
+        if self.specified_baseline:
+            for bas in baseline.split('+'):
+                pdict = Calculator.read_json_param_objects(bas, None)
+                poldicts_bas.append(pdict['policy'])
         # get policy parameter dictionaries from --reform file(s)
         poldicts_ref = []
         if self.specified_reform:
@@ -288,20 +312,29 @@ class TaxCalcIO():
         self.gf_reform = copy.deepcopy(gfactors_ref)
         # create Policy objects:
         # ... the baseline Policy object
-        pol_bas = Policy(
-            gfactors=gfactors_bas,
-            last_budget_year=last_b_year,
-        )
-        try:
-            pol_bas.implement_reform(
-                poldict_bas['policy'],
-                print_warnings=True,
-                raise_errors=False,
+        if self.specified_baseline:
+            pol_bas = Policy(
+                gfactors=gfactors_bas,
+                last_budget_year=last_b_year,
+            )
+            for poldict in poldicts_bas:
+                try:
+                    pol_bas.implement_reform(
+                        poldict,
+                        print_warnings=True,
+                        raise_errors=False,
+                    )
+                    if self.errmsg:
+                        self.errmsg += "\n"
+                    for _, errors in pol_bas.parameter_errors.items():
+                        self.errmsg += "\n".join(errors)
+                except paramtools.ValidationError as valerr_msg:
+                    self.errmsg += str(valerr_msg)
+        else:
+            pol_bas = Policy(
+                gfactors=gfactors_bas,
+                last_budget_year=last_b_year,
             )
-            for _, errors in pol_bas.parameter_errors.items():
-                self.errmsg += "\n".join(errors)
-        except paramtools.ValidationError as valerr_msg:
-            self.errmsg += str(valerr_msg)
         # ... the reform Policy object
         if self.specified_reform:
             pol_ref = Policy(
@@ -419,6 +452,22 @@ class TaxCalcIO():
         dirpath = os.path.abspath(os.path.dirname(__file__))
         return os.path.join(dirpath, self.output_filename)
 
+    def advance_to_year(self, year, aging_data):
+        """
+        Update self.output_filename and advance Calculator objects to year.
+        """
+        # update self.output_filename and delete output files
+        parts = self.output_filename.split('-')
+        parts[1] = str(year)[2:]
+        self.output_filename = '-'.join(parts)
+        self.delete_output_files()
+        # advance baseline and reform Calculator objects to specified year
+        self.calc_bas.advance_to_year(year)
+        self.calc_ref.advance_to_year(year)
+        idata = 'Advance input data and ' if aging_data else 'Advance'
+        if not self.silent:
+            print(f'{idata} policy to {year}')
+
     def analyze(
             self,
             output_params=False,
@@ -458,47 +507,36 @@ class TaxCalcIO():
         """
         # pylint: disable=too-many-arguments,too-many-positional-arguments
         # pylint: disable=too-many-branches,too-many-locals
-        if self.puf_input_data and self.calc_ref.reform_warnings:
-            print(  # pragma: no cover
-                'PARAMETER VALUE WARNING(S):  '
-                '(read documentation for each parameter)\n'
-                f'{self.calc_ref.reform_warnings}'
-                'CONTINUING WITH CALCULATIONS...'
-            )
-        calc_base_calculated = False
+        doing_calcs = output_tables or output_graphs or output_dump
+        # optionally write --params output to text files
+        if output_params:
+            self.write_policy_params_files()
+        if not doing_calcs:
+            return
+        # do output calculations
+        self.calc_bas.calc_all()
         self.calc_ref.calc_all()
         if output_dump:
             assert isinstance(dump_varlist, list)
             assert len(dump_varlist) > 0
-            # might need marginal tax rates
+            # might need marginal tax rates for dumpdb
             (mtr_ptax_ref, mtr_itax_ref,
              _) = self.calc_ref.mtr(wrt_full_compensation=False,
                                     calc_all_already_called=True)
-            self.calc_bas.calc_all()
-            calc_base_calculated = True
             (mtr_ptax_bas, mtr_itax_bas,
              _) = self.calc_bas.mtr(wrt_full_compensation=False,
                                     calc_all_already_called=True)
         else:
-            # definitely do not need marginal tax rates
+            # do not need marginal tax rates for dumpdb
             mtr_ptax_ref = None
             mtr_itax_ref = None
             mtr_ptax_bas = None
             mtr_itax_bas = None
-        # optionally write --params output to text files
-        if output_params:
-            self.write_policy_params_files()
         # optionally write --tables output to text file
         if output_tables:
-            if not calc_base_calculated:
-                self.calc_bas.calc_all()
-                calc_base_calculated = True
             self.write_tables_file()
         # optionally write --graphs output to HTML files
         if output_graphs:
-            if not calc_base_calculated:
-                self.calc_bas.calc_all()
-                calc_base_calculated = True
             self.write_graph_files()
         # optionally write --dumpdb output to SQLite database file
         if output_dump:
@@ -731,7 +769,7 @@ class TaxCalcIO():
 
     def dump_variables(self, dumpvars_str):
         """
-        Return set of variable names extracted from dumpvars_str, plus
+        Return list of variable names extracted from dumpvars_str, plus
         minimal baseline/reform variables even if not in dumpvars_str.
         Also, builds self.errmsg if any specified variables are not valid.
         """

taxcalc/tests/test_calculator.py

@@ -69,7 +69,7 @@ def test_make_calculator_with_policy_reform(cps_subsample):
     pol.implement_reform(reform)
     # create a Calculator object using this policy reform
     calc = Calculator(policy=pol, records=rec)
-    assert calc.reform_warnings == {}
+    assert calc.reform_errors == {}
     # check that Policy object embedded in Calculator object is correct
     assert calc.current_year == year
     assert calc.policy_param('II_em') == 4000

taxcalc/tests/test_reforms.py

@@ -28,7 +28,7 @@ def test_2017_law_reform(tests_path):
     with open(reform_file, 'r', encoding='utf-8') as rfile:
         rtext = rfile.read()
     pol.implement_reform(Policy.read_json_reform(rtext))
-    assert not pol.parameter_warnings
+    assert not pol.parameter_errors
     pol.set_year(2018)
     pre_mdata = dict(pol.items())
     # check some policy parameter values against expected values under 2017 law
@@ -102,14 +102,14 @@ def test_round_trip_reforms(fyear, tests_path):
     with open(reform_file, 'r', encoding='utf-8') as rfile:
         rtext = rfile.read()
     rtr_pol.implement_reform(Policy.read_json_reform(rtext))
-    assert not rtr_pol.parameter_warnings
+    assert not rtr_pol.parameter_errors
     assert not rtr_pol.errors
     # Layer on TCJA
     reform_file = os.path.join(tests_path, '..', 'reforms', 'TCJA.json')
     with open(reform_file, 'r', encoding='utf-8') as rfile:
         rtext = rfile.read()
     rtr_pol.implement_reform(Policy.read_json_reform(rtext))
-    assert not rtr_pol.parameter_warnings
+    assert not rtr_pol.parameter_errors
     assert not rtr_pol.errors
     # Layer on the CARES Act
     reform_file = os.path.join(tests_path, '..', 'reforms', 'CARES.json')
@@ -123,21 +123,21 @@ def test_round_trip_reforms(fyear, tests_path):
     with open(reform_file, 'r', encoding='utf-8') as rfile:
         rtext = rfile.read()
     rtr_pol.implement_reform(Policy.read_json_reform(rtext))
-    assert not rtr_pol.parameter_warnings
+    assert not rtr_pol.parameter_errors
     assert not rtr_pol.errors
     # Layer on ARPA
     reform_file = os.path.join(tests_path, '..', 'reforms', 'ARPA.json')
     with open(reform_file, 'r', encoding='utf-8') as rfile:
         rtext = rfile.read()
     rtr_pol.implement_reform(Policy.read_json_reform(rtext))
-    assert not rtr_pol.parameter_warnings
+    assert not rtr_pol.parameter_errors
     assert not rtr_pol.errors
     # Layer on rounding from IRS through Policy.LAST_KNOWN_YEAR
     reform_file = os.path.join(tests_path, '..', 'reforms', 'rounding.json')
     with open(reform_file, 'r', encoding='utf-8') as rfile:
         rtext = rfile.read()
     rtr_pol.implement_reform(Policy.read_json_reform(rtext))
-    assert not rtr_pol.parameter_warnings
+    assert not rtr_pol.parameter_errors
     assert not rtr_pol.errors
     rtr_pol.set_year(fyear)
     rtr_mdata = dict(rtr_pol.items())
@@ -371,7 +371,7 @@ def test_ext_reform(tests_path):
     with open(reform_file, 'r', encoding='utf-8') as rfile:
         rtext = rfile.read()
     ext.implement_reform(Policy.read_json_reform(rtext))
-    assert not ext.parameter_warnings
+    assert not ext.parameter_errors
     ext.set_year(2026)
     assert ext.II_em < end.II_em
     # test tax output generated by ext.json reform file using public CPS data

taxcalc/tests/test_taxcalcio.py

@@ -357,6 +357,10 @@ def test_ctor_init_with_cps_files():
               exact_calculations=False)
     assert not tcio.errmsg
     assert tcio.tax_year() == txyr
+    # test advance_to_year method
+    tcio.silent = False
+    tcio.advance_to_year(txyr + 1, True)
+    assert tcio.tax_year() == txyr + 1
     # specify invalid tax_year for cps.csv input data
     txyr = 2013
     tcio = TaxCalcIO('cps.csv', txyr, None, None, None)
@@ -484,14 +488,14 @@ def test_write_policy_param_files(reformfile1):
     tcio = TaxCalcIO(
         input_data=pd.read_csv(StringIO(RAWINPUT)),
         tax_year=taxyear,
-        baseline=None,
+        baseline=compound_reform,
         reform=compound_reform,
         assump=None,
     )
     assert not tcio.errmsg
     tcio.init(input_data=pd.read_csv(StringIO(RAWINPUT)),
               tax_year=taxyear,
-              baseline=None,
+              baseline=compound_reform,
               reform=compound_reform,
               assump=None,
               aging_input_data=False,
@@ -539,19 +543,7 @@ def test_no_tables_or_graphs(reformfile1):
                  output_tables=True,
                  output_graphs=True)
     # delete tables and graph files
-    output_filename = tcio.output_filepath()
-    extensions = [
-        '-params.bas',
-        '-params.ref',
-        '-tables.text',
-        '-atr.html',
-        '-mtr.html',
-        '-pch.html',
-    ]
-    for ext in extensions:
-        fname = output_filename.replace('.xxx', ext)
-        if os.path.isfile(fname):
-            os.remove(fname)
+    tcio.delete_output_files()
 
 
 def test_tables(reformfile1):
@@ -584,11 +576,7 @@ def test_tables(reformfile1):
     assert not tcio.errmsg
     # create TaxCalcIO tables file
     tcio.analyze(output_tables=True)
-    # delete tables file
-    output_filename = tcio.output_filepath()
-    fname = output_filename.replace('.xxx', '-tables.text')
-    if os.path.isfile(fname):
-        os.remove(fname)
+    tcio.delete_output_files()
 
 
 def test_graphs(reformfile1):
@@ -622,16 +610,7 @@ def test_graphs(reformfile1):
     assert not tcio.errmsg
     tcio.analyze(output_graphs=True)
     # delete graph files
-    output_filename = tcio.output_filepath()
-    fname = output_filename.replace('.xxx', '-atr.html')
-    if os.path.isfile(fname):
-        os.remove(fname)
-    fname = output_filename.replace('.xxx', '-mtr.html')
-    if os.path.isfile(fname):
-        os.remove(fname)
-    fname = output_filename.replace('.xxx', '-pch.html')
-    if os.path.isfile(fname):
-        os.remove(fname)
+    tcio.delete_output_files()
 
 
 @pytest.fixture(scope='session', name='warnreformfile')

{taxcalc-4.6.0.dist-info → taxcalc-4.6.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: taxcalc
-Version: 4.6.0
+Version: 4.6.1
 Summary: Tax-Calculator
 Home-page: https://github.com/PSLmodels/Tax-Calculator
 Download-URL: https://github.com/PSLmodels/Tax-Calculator

{taxcalc-4.6.0.dist-info → taxcalc-4.6.1.dist-info}/RECORD

@@ -1,32 +1,32 @@
-taxcalc/__init__.py,sha256=jQUxALCvW-PLnHIR91_Qjnd0_TULCiULAKJGbNrAc6c,536
+taxcalc/__init__.py,sha256=_SNXt6U2NMWDx1hqcUw-N6_SVHp4pydp4-U1VFEPldY,536
 taxcalc/calcfunctions.py,sha256=G62sQeW-YHJ2gvqOfidRKPBpufSHzXYIdI2PGcApOuU,148423
-taxcalc/calculator.py,sha256=otaljKtkO91uWH6QqChsR17xjLXcHJ2QEvyoMnYeung,63936
+taxcalc/calculator.py,sha256=cCsis9yQSyw4eXvYppk7Z70JEaPH8Kd1AADlIqnJhVw,63930
 taxcalc/conftest.py,sha256=nO4J7qu1sTHgjqrzhpRMvfMJUrNm6GP_IsSuuDt_MeQ,141
 taxcalc/consumption.json,sha256=FBgDd72AZnviQRhGz5rPgpGpOmaOzNYfGB9GdTCeKPI,8102
 taxcalc/consumption.py,sha256=pkXhFGpFqu7hW62KaTctfRSzR-pXzMB1ai8XCQRAgXk,3480
 taxcalc/cps.csv.gz,sha256=SS6tSduU_Eu0EJwzpslnmqMsQQQucVMzzITfH-SeV40,9851074
 taxcalc/cps_weights.csv.gz,sha256=-k31Swqss0WEGA3Zo8AoReLR_C7BRUk4PDmfh-oVVyo,13657706
-taxcalc/data.py,sha256=ERqmDQFi3yrl1uLvPs1C1tZN-711nsP8PyStVKU378g,11679
+taxcalc/data.py,sha256=QRyLsq250OsxUIjsuCFtREJsVyEOGaivwcON3teivMI,11698
 taxcalc/decorators.py,sha256=EwyVH4fSDf8x_BHzccf4-DRopo6KMVidYSYZFy_dJy0,11307
 taxcalc/growdiff.json,sha256=ReBAF6We9ZwTb0uDYQwbedPsQKdm6KSOERiddEYZbm0,15037
 taxcalc/growdiff.py,sha256=Q3St-KPIUN2I_l1S0jwN0yr8O4LuzkNIU-_qbXTkrZw,2977
 taxcalc/growfactors.csv,sha256=URIGSKApCY4McvdILkCaIm8EhCGEME2Du-ef5Q9c0uE,5134
 taxcalc/growfactors.py,sha256=dW71yYKhFDbFtGpBT-kZBqY4MV7IswKcNI3_c-X_Nfg,6525
-taxcalc/parameters.py,sha256=pvr3m4G-fA_d-LMqCNYdBtJDjkDcHLgOgw0kmchYhFk,33235
+taxcalc/parameters.py,sha256=pxW53fOJkW7yM7XxN04RDNs-f7CwKOjE4vMmMvPtZ8E,33121
 taxcalc/policy.py,sha256=4bY3beSYhLKk_X4CTgG7LGnVnILM0D4Invt7uCp8dlA,6725
-taxcalc/policy_current_law.json,sha256=dqfeSqdYe-XUAdZOS7dccUEA48d80JqwnI34nsHbt_g,689758
+taxcalc/policy_current_law.json,sha256=enemNPLg0ZlwNQVVK51XJru_YzDzPnV7ClNhdJHlhJQ,689915
 taxcalc/puf_ratios.csv,sha256=USMM79UEX8PnSKY_LYLxvACER_9NHyj4ipNEk2iyykQ,3580
 taxcalc/puf_weights.csv.gz,sha256=35iZhzFO0dHUI2zf4_liyk60E-3Sgr_AbxszGxw7LfM,13522484
 taxcalc/records.py,sha256=K5QgP6Pm9PtEVDVzM7tpHYPu554Wio0KnrU7YTTBKgQ,18264
 taxcalc/records_variables.json,sha256=_YKJiZQ1czp0VH9bkr5ZXmp9Mm1roHoHrt2XnLXAtfw,42975
-taxcalc/taxcalcio.py,sha256=F-MNNkIVYdOCfFBE1nKOajoS8c2MjkSQ0aKssyDXMh4,33188
+taxcalc/taxcalcio.py,sha256=1xZ17wZ0yqZeDDa5glEQpCG6xvXJ4wGxbUQPkmTLTD0,34752
 taxcalc/utils.py,sha256=noHnQ-tw0AXhEH-OgdTUiPedH8luVOJ5NdfpKI3_obw,62401
 taxcalc/utilsprvt.py,sha256=iIyWp9-N3_XWjQj2jV2CWnJy7vrNlKB2_vIMwYjgbWY,1323
 taxcalc/assumptions/ASSUMPTIONS.md,sha256=cFQqWn1nScaladVaQ7xNm1jDY8CsGdLmqZEzUZeRrb8,1917
 taxcalc/assumptions/README.md,sha256=Ww55r2zH1neoRSl_MawrPmX-ugaztIZ7_ALrquuatdQ,809
 taxcalc/assumptions/economic_assumptions_template.json,sha256=utMk38GwSQFrkOAtRrDVhMQLpfaZH3JmtTznKX7IouM,2610
 taxcalc/cli/__init__.py,sha256=cyZ0tdx41j_vV_B6GAkqJmNKKG-B0wUC0ThC75lJlk4,104
-taxcalc/cli/tc.py,sha256=rJ5VTxyqUn7CVG3fXmTIHKdvL7lEfCFw1xHlFtRDZv8,14400
+taxcalc/cli/tc.py,sha256=StZo-46v1c3ozP-64wQWz0uyHOEVqZPAzgTr1JuoFjU,16614
 taxcalc/reforms/2017_law.json,sha256=u-xaPSvt5ubfZw1Nb-jNhTNcOPBUJeAX2kJVoEyMgC4,5860
 taxcalc/reforms/2017_law.out.csv,sha256=nnNKXqY2kof8HC1nnU8srPsvNNepi6ISXQ9OJpQnT7M,473
 taxcalc/reforms/ARPA.json,sha256=1H9LuJ_QitXRO9e8R3PWizajJgdioIzbGFdvdlt9FVg,3119
@@ -86,7 +86,7 @@ taxcalc/tests/reforms_expect.csv,sha256=6m0bSH8S6ReMYdHoQC9iWYuJAof5sZ0OONVBi7zX
 taxcalc/tests/test_4package.py,sha256=I9i5rWFsg-VCtTLmUWIi9dnusieTZeodrgH8ba_Fbng,3681
 taxcalc/tests/test_benefits.py,sha256=oaui5mO0TuW8Ht-uxvUCBL5zM3iTENq3Whyf_gEpY1U,3392
 taxcalc/tests/test_calcfunctions.py,sha256=QtMgQg_WpCU8PZM3Hs8Pml4q6LnlLWV_blCzbpGN2sw,31939
-taxcalc/tests/test_calculator.py,sha256=dumYsleaKjW8zD1VUnmyQbuszf96QEqXAMf8dIvtelM,36087
+taxcalc/tests/test_calculator.py,sha256=lcnBli5giNFxqgCLW-MF4J_wsV3gSFqCjzJdCJkihek,36085
 taxcalc/tests/test_compare.py,sha256=WglH4ZJOEQnav_mAmnGjpb7dooXcQsB1m04hgQeoBUQ,10873
 taxcalc/tests/test_compatible_data.py,sha256=XpfnE96HDvlgJM_8KEasgufxeiePTFfNMBBVlfzHP9Y,13477
 taxcalc/tests/test_consumption.py,sha256=c6zi9GqNK54cgfzxiWmY10UxOMJZ9vd9fOTwUKU1zMk,6318
@@ -100,9 +100,9 @@ taxcalc/tests/test_policy.py,sha256=hJrFqqptMoUWk3abIJ2sdADQtCqvGaUeW5as1aNwhR8,
 taxcalc/tests/test_puf_var_stats.py,sha256=TG-sQtOkR6cBOw0am7MUsMSwjPxVdkvt0Xov342oii8,7786
 taxcalc/tests/test_pufcsv.py,sha256=kQPwpMcLNPwQDiO-23xvvZggtHYvRz-UYEDn6JjNfbw,16352
 taxcalc/tests/test_records.py,sha256=ncswnbCY7vZgJ_h6xwql4oFw-jZG2gWOMWvEJC2_jdc,8827
-taxcalc/tests/test_reforms.py,sha256=IGMAzVqAMJqdnDDRsMs3VZZOV9_o4gsBAyYgyPB2m2M,16047
+taxcalc/tests/test_reforms.py,sha256=djVxMOE2RytmDDYvzS55AnThRRBcVc_calPbfHuvQ-k,16033
 taxcalc/tests/test_responses.py,sha256=2CkVVdaDNCSALMoUcGgweRlS2tfsK3kXogHtDkZMqJU,1663
-taxcalc/tests/test_taxcalcio.py,sha256=Ee7qfUI-Gy_lbFPElOfOaFtIZ_0NboxVXK0Wrxl9BBw,23794
+taxcalc/tests/test_taxcalcio.py,sha256=PV7hCntwp_1LHQYlft7WelbzKSoi5aWzUZqhJAcC5AE,23135
 taxcalc/tests/test_utils.py,sha256=aUHVNxfSMdyyLAz3w98KLQa5D872rZxXqKbPkIqwLLA,29403
 taxcalc/validation/CSV_INPUT_VARS.md,sha256=MqlZZGt_a1n8JAU-nY5MjnTmjz1pMOuhtpVYIGUgl38,1433
 taxcalc/validation/CSV_OUTPUT_VARS.md,sha256=wr8oyCJDXcxl4Lu0H_wMofUQYhEIyHDif6vkbas1FGE,3000
@@ -131,9 +131,9 @@ taxcalc/validation/taxsim35/expected_differences/b21-taxdiffs-expect.csv,sha256=
 taxcalc/validation/taxsim35/expected_differences/c17-taxdiffs-expect.csv,sha256=YhgojbLowH3yujdYu7SGkdvBZmTgpugu4wYc1Be069M,1125
 taxcalc/validation/taxsim35/expected_differences/c18-taxdiffs-expect.csv,sha256=g9J4BPbTySV-h-RcLvReJq9v1jscgiRSSZzi0taEA-k,1225
 taxcalc/validation/taxsim35/expected_differences/c19-taxdiffs-expect.csv,sha256=Ceh15N_Xr3L7cpYjzGa-8NLCV3obc8PNHEhE5ZxSPhI,1238
-taxcalc-4.6.0.dist-info/licenses/LICENSE,sha256=m5epLdB-_NXiY7NsEDgcHP4jDtJ4vOlRf5S3Jb-jraY,1299
-taxcalc-4.6.0.dist-info/METADATA,sha256=3sgO2tiOEtszzhDVjXJgEqx97l3MGXWsKPUNjm1oSuY,3509
-taxcalc-4.6.0.dist-info/WHEEL,sha256=ck4Vq1_RXyvS4Jt6SI0Vz6fyVs4GWg7AINwpsaGEgPE,91
-taxcalc-4.6.0.dist-info/entry_points.txt,sha256=a3ZE1piRv683p27fOLdWZvVJXESkoslTOp5iXV7uVco,50
-taxcalc-4.6.0.dist-info/top_level.txt,sha256=Wh8wTDHkA_cm4dn8IoUCviDyGgVQqwEQKPJnl8z6d4c,8
-taxcalc-4.6.0.dist-info/RECORD,,
+taxcalc-4.6.1.dist-info/licenses/LICENSE,sha256=m5epLdB-_NXiY7NsEDgcHP4jDtJ4vOlRf5S3Jb-jraY,1299
+taxcalc-4.6.1.dist-info/METADATA,sha256=wvnDftJBQ7SKgJAF-hCYRKf_RJX3RNSPj2LLe-nL59s,3509
+taxcalc-4.6.1.dist-info/WHEEL,sha256=DnLRTWE75wApRYVsjgc6wsVswC54sMSJhAEd4xhDpBk,91
+taxcalc-4.6.1.dist-info/entry_points.txt,sha256=a3ZE1piRv683p27fOLdWZvVJXESkoslTOp5iXV7uVco,50
+taxcalc-4.6.1.dist-info/top_level.txt,sha256=Wh8wTDHkA_cm4dn8IoUCviDyGgVQqwEQKPJnl8z6d4c,8
+taxcalc-4.6.1.dist-info/RECORD,,

{taxcalc-4.6.0.dist-info → taxcalc-4.6.1.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (80.0.0)
+Generator: setuptools (80.4.0)
 Root-Is-Purelib: true
 Tag: py3-none-any