taxcalc 4.6.0__tar.gz → 4.6.1__tar.gz

{taxcalc-4.6.0/taxcalc.egg-info → taxcalc-4.6.1}/PKG-INFO

@@ -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 → taxcalc-4.6.1}/docs/about/releases.md

@@ -4,6 +4,29 @@ Go [here](https://github.com/PSLmodels/Tax-Calculator/pulls?q=is%3Apr+is%3Aclose
 for a complete commit history.
 
 
+2025-05-09 Release 4.6.1
+------------------------
+(last merged pull request is
+[#2900](https://github.com/PSLmodels/Tax-Calculator/pull/2900))
+
+**This is a minor enhancement and bug-fix release.**
+
+**API Changes**
+
+**New Features**
+- Add ability to specify compound reforms when using the CLI tool's
+`--baseline` option
+[[#2896](https://github.com/PSLmodels/Tax-Calculator/pull/2896) by Martin Holmer]
+- Improve documentation of the `parameter_indexing_CPI_offset` policy parameter
+[[#2897](https://github.com/PSLmodels/Tax-Calculator/pull/2897) by Martin Holmer]
+- Add CLI `--numyears N` option that allows faster multiple-year runs with `tc`
+[[#2900](https://github.com/PSLmodels/Tax-Calculator/pull/2900) by Martin Holmer]
+
+**Bug Fixes**
+- Remove redundant Parameters class property
+[[#2898](https://github.com/PSLmodels/Tax-Calculator/pull/2898) by Martin Holmer]
+
+
 2025-04-30 Release 4.6.0
 ------------------------
 (last merged pull request is

{taxcalc-4.6.0 → taxcalc-4.6.1}/docs/guide/cli.md

@@ -375,18 +375,11 @@ The `cps-24-#-ref3-#-mtr.html` file looks something like this:
 In all the examples in this section, we have executed one `tc` run at
 at time.  But **what if you want to execute many `tc` runs** because
 you want results for many years and/or for several different reforms.
-Unless you are asking for an enormous dump database, a single `tc` run
-should take no more than one minute on your computer.  The easiest way
-to speed up the execution of many `tc` runs is to split them into
-groups of runs and execute each group of runs in a different
-command-prompt window.  On most modern computers that have four or
-more CPU cores, at least eight gigabytes of memory, and fast disk
-storage, executing four or five runs in different windows will take
-only a little more time than executing a single `tc` run.  If you have
-more than one run in each group, put them in a Unix/Mac bash script or
-a Windows batch file, and execute one script in each command-prompt
-window.  If it still takes too long, consider splitting the `tc` runs
-across more than one computer.
+The best way to execute multiple-year runs (say, ten-year runs to
+generate budget-window estimates) is to use the `--numyears N` option
+as decribed
+[here](https://github.com/PSLmodels/Tax-Calculator/pull/2900#issue-3047043290)
+and below in the final section of this document.
 
 ## Tabulate reform results
 
@@ -529,3 +522,41 @@ Notice the -331.101 aggregate change in income tax liability induced
 by the reform is essentially the same as the -331.1 amount in the
 --tables output above, although the income subgroups amounts differ
 because the income groups are defined in different ways.
+
+## Generate budget-window results
+
+Sometimes ten-year results for a reform are needed.  The easiest way
+to generate such budget-window results is to use the CLI tool's
+`--numyears N` option.  If `ext.json` contains the
+extend-TCJA-beyond-2025 reform, then we can execute the following run:
+
+```
+% tc ../tmd.csv 2026 --numyears 10 --reform ext.json --tables
+Read input data for 2021; input data were extrapolated to 2026
+Write tabular output to file tmd-26-#-ext-#-tables.text
+Advance input data and policy to 2027
+Write tabular output to file tmd-27-#-ext-#-tables.text
+Advance input data and policy to 2028
+Write tabular output to file tmd-28-#-ext-#-tables.text
+Advance input data and policy to 2029
+Write tabular output to file tmd-29-#-ext-#-tables.text
+Advance input data and policy to 2030
+Write tabular output to file tmd-30-#-ext-#-tables.text
+Advance input data and policy to 2031
+Write tabular output to file tmd-31-#-ext-#-tables.text
+Advance input data and policy to 2032
+Write tabular output to file tmd-32-#-ext-#-tables.text
+Advance input data and policy to 2033
+Write tabular output to file tmd-33-#-ext-#-tables.text
+Advance input data and policy to 2034
+Write tabular output to file tmd-34-#-ext-#-tables.text
+Advance input data and policy to 2035
+Write tabular output to file tmd-35-#-ext-#-tables.text
+Execution time is 60.9 seconds
+```
+
+[PR
+#2900](https://github.com/PSLmodels/Tax-Calculator/pull/2900#issue-3047043290)
+discusses how much faster this is relative to executing ten separate
+`tc` runs, and also shows how to tabulate the ten-year aggregate
+reform result from the files generated by this run.

{taxcalc-4.6.0 → taxcalc-4.6.1}/docs/index.md

@@ -5,17 +5,14 @@ Tax-Calculator
 
 Tax-Calculator is an open-source microsimulation model for static analysis of
 USA federal income and payroll taxes.
-You can install it with [Anaconda](https://www.anaconda.com/products/individual)
-via:
-
+You can install it with [PyPI](https://pypi.org/project/taxcalc/) via:
 ```
-conda update taxcalc
+pip install taxcalc
 ```
-
-or with [PyPI](https://pypi.org/project/taxcalc/) via:
-
+or with [Anaconda](https://www.anaconda.com/products/individual)
+via:
 ```
-pip install taxcalc
+conda install conda-forge::taxcalc
 ```
 
 When using sample data that represent the USA population,
@@ -57,18 +54,15 @@ cross-model validation work with NBER's TAXSIM-35 model is described
 
 ## Latest release
 
-{doc}`4.5.0 (2025-03-11) <about/releases>`
+{doc}`4.6.1 (2025-05-09) <about/releases>`
 
 If you are already using Tax-Calculator, upgrade using the following command:
-
 ```
-conda update conda-forge::taxcalc
+pip install --upgrade taxcalc
 ```
-
 or
-
 ```
-pip install --upgrade taxcalc
+conda update conda-forge::taxcalc
 ```
 
 If you're a new user, read {doc}`usage/starting`.

{taxcalc-4.6.0 → taxcalc-4.6.1}/setup.py

@@ -7,7 +7,7 @@ from setuptools import setup
 with open("README.md", "r", encoding="utf-8") as f:
     longdesc = f.read()
 
-VERSION = "4.6.0"
+VERSION = "4.6.1"
 
 config = {
     "description": "Tax-Calculator",

{taxcalc-4.6.0 → taxcalc-4.6.1}/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-4.6.0 → taxcalc-4.6.1}/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-4.6.0 → taxcalc-4.6.1}/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-4.6.0 → taxcalc-4.6.1}/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-4.6.0 → taxcalc-4.6.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-4.6.0 → taxcalc-4.6.1}/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-4.6.0 → taxcalc-4.6.1}/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-4.6.0 → taxcalc-4.6.1}/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