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

taxcalc/calculator.py

@@ -93,7 +93,8 @@ class Calculator():
 
     def __init__(self, policy=None, records=None, verbose=False,
                  sync_years=True, consumption=None):
-        # pylint: disable=too-many-arguments,too-many-branches
+        # pylint: disable=too-many-arguments,too-many-positional-arguments
+        # pylint: disable=too-many-branches
         if isinstance(policy, Policy):
             self.__policy = copy.deepcopy(policy)
         else:
@@ -286,8 +287,7 @@ class Calculator():
             val = getattr(self.__policy, param_name)
             if param_name.startswith("_"):
                 return val
-            else:
-                return val[0]  # drop down a dimension.
+            return val[0]  # drop down a dimension.
         setattr(self.__policy, param_name, param_value)
         return None
 
@@ -345,8 +345,8 @@ class Calculator():
         max_num_years = self.__policy.end_year - self.__policy.current_year + 1
         assert num_years <= max_num_years
         calc = copy.deepcopy(self)
-        yearlist = list()
-        varlist = list()
+        yearlist = []
+        varlist = []
         for iyr in range(1, num_years + 1):
             calc.calc_all()
             yearlist.append(calc.current_year)
@@ -626,8 +626,8 @@ class Calculator():
         'e20100',  Charity non-cash contributions;
         'k1bx14p', Partnership income (also included in e26270 and e02000).
         """
-        # pylint: disable=too-many-arguments,too-many-statements
-        # pylint: disable=too-many-locals,too-many-branches
+        # pylint: disable=too-many-arguments,too-many-positional-arguments
+        # pylint: disable=too-many-locals,too-many-branches,too-many-statements
         assert not zero_out_calculated_vars or not calc_all_already_called
         # check validity of variable_str parameter
         if variable_str not in Calculator.MTR_VALID_VARIABLES:
@@ -824,7 +824,9 @@ class Calculator():
         -------
         graph that is a bokeh.plotting figure object
         """
-        # pylint: disable=too-many-arguments,too-many-locals
+        # pylint: disable=too-many-arguments,too-many-positional-arguments
+        # pylint: disable=too-many-locals
+
         # check that two Calculator objects are comparable
         assert isinstance(calc, Calculator)
         assert calc.current_year == self.current_year
@@ -833,9 +835,8 @@ class Calculator():
         assert mars == 'ALL' or 1 <= mars <= 4
         # check validity of income_measure
         assert income_measure in ('expanded_income', 'agi', 'wages')
-        if income_measure == 'expanded_income':
-            income_variable = 'expanded_income'
-        elif income_measure == 'agi':
+        income_variable = 'expanded_income'
+        if income_measure == 'agi':
             income_variable = 'c00100'
         elif income_measure == 'wages':
             income_variable = 'e00200'
@@ -848,15 +849,15 @@ class Calculator():
         (mtr2_ptax, mtr2_itax,
          mtr2_combined) = calc.mtr(variable_str=mtr_variable,
                                    wrt_full_compensation=mtr_wrt_full_compen)
-        if mtr_measure == 'combined':
-            mtr1 = mtr1_combined
-            mtr2 = mtr2_combined
-        elif mtr_measure == 'itax':
+        if mtr_measure == 'itax':
             mtr1 = mtr1_itax
             mtr2 = mtr2_itax
         elif mtr_measure == 'ptax':
             mtr1 = mtr1_ptax
             mtr2 = mtr2_ptax
+        else:
+            mtr1 = mtr1_combined
+            mtr2 = mtr2_combined
         # extract datafames needed by mtr_graph_data utility function
         record_variables = ['s006', 'XTOT']
         if mars != 'ALL':
@@ -1042,17 +1043,15 @@ class Calculator():
         # construct data for graph
         data = pch_graph_data(vdf, year=self.current_year,
                               pop_quantiles=pop_quantiles)
-        del vdf
-        del vdf1
-        del vdf2
         # construct figure from data
-        fig = pch_graph_plot(data,
-                             width=850,
-                             height=500,
-                             xlabel='',
-                             ylabel='',
-                             title='')
-        del data
+        # (see comment at end of pch_graph_plot function in utils.py)
+        fig = pch_graph_plot(  # pylint: disable=assignment-from-no-return
+            data,
+            width=850,
+            height=500,
+            xlabel='',
+            ylabel='',
+            title='')
         return fig
 
     REQUIRED_REFORM_KEYS = set(['policy'])
@@ -1101,7 +1100,7 @@ class Calculator():
         suitable as input into the GrowDiff.update_growdiff method.
         """
         # construct the composite dictionary
-        param_dict = dict()
+        param_dict = {}
         param_dict['policy'] = Policy.read_json_reform(reform)
         param_dict['consumption'] = Consumption.read_json_update(assump)
         for topkey in ['growdiff_baseline', 'growdiff_response']:
@@ -1165,7 +1164,7 @@ class Calculator():
                     return [line]
                 # all text does not fix on one line
                 first_line = True
-                line_list = list()
+                line_list = []
                 words = text.split()
                 while words:
                     if first_line:
@@ -1189,20 +1188,20 @@ class Calculator():
                 baseline.set_year(year)
                 updated.set_year(year)
                 assert set(baseline.keys()) == set(updated.keys())
-                params_with_diff = list()
+                params_with_diff = []
                 for pname in baseline.keys():
                     upda_value = getattr(updated, pname)
                     base_value = getattr(baseline, pname)
                     is_array = isinstance(upda_value, np.ndarray)
                     if (
                         (is_array and not np.allclose(upda_value, base_value))
-                        or (is_array == False and upda_value != base_value)
+                        or (is_array is False and upda_value != base_value)
                     ):
                         params_with_diff.append(pname)
                 if params_with_diff:
                     mdata_base = baseline.specification(meta_data=True)
                     # write year
-                    doc += '{}:\n'.format(year)
+                    doc += f'{year}:\n'
                     for pname in sorted(params_with_diff):
                         # write updated value line
                         pval = getattr(updated, pname).tolist()[0]
@@ -1211,7 +1210,7 @@ class Calculator():
                                 pval = [bool(item) for item in pval]
                             else:
                                 pval = bool(pval)
-                        doc += ' {} : {}\n'.format(pname, pval)
+                        doc += f' {pname} : {pval}\n'
                         # ... write optional param-vector-index line
                         if isinstance(pval, list):
                             labels = paramtools.consistent_labels(
@@ -1223,13 +1222,15 @@ class Calculator():
                                     label = _label
                                     break
                             if label:
+                                # pylint: disable=protected-access
                                 lv = baseline._stateless_label_grid[label]
+                                # pylint: enable=protected-access
                                 lv = [
                                     str(item) for item in lv
                                 ]
                                 doc += ' ' * (
                                     4 + len(pname)
-                                ) + '{}\n'.format(lv)
+                                ) + f'{lv}\n'
                         # ... write param-name line
                         name = mdata_base[pname]['title']
                         for line in lines('name: ' + name, 6):
@@ -1247,7 +1248,7 @@ class Calculator():
                                     pval = [bool(item) for item in pval]
                             elif ptype == 'bool':
                                 pval = bool(pval)
-                            doc += '  baseline_value: {}\n'.format(pval)
+                            doc += f'  baseline_value: {pval}\n'
                         else:  # if baseline is GrowDiff object
                             # each GrowDiff parameter has zero as default value
                             doc += '  baseline_value: 0.0\n'
@@ -1399,7 +1400,7 @@ class Calculator():
         item_phaseout = self.array('c21040').copy()
         item_component_variable_names = ['c17000', 'c18300', 'c19200',
                                          'c19700', 'c20500', 'c20800']
-        item_cvar = dict()
+        item_cvar = {}
         for cvname in item_component_variable_names:
             item_cvar[cvname] = self.array(cvname).copy()
         self.zeroarray('c04470')

taxcalc/cli/tc.py

@@ -23,7 +23,8 @@ def cli_tc_main():
     Contains command-line interface (CLI) to Tax-Calculator TaxCalcIO class.
     """
     # pylint: disable=too-many-statements,too-many-branches
-    # pylint: disable=too-many-return-statements
+    # pylint: disable=too-many-return-statements,too-many-locals
+
     # parse command-line arguments:
     usage_str = 'tc INPUT TAXYEAR {}{}{}{}{}'.format(
         '[--help]\n',
@@ -254,12 +255,10 @@ def _compare_test_output_files():
     Private function that compares expected and actual tc --test output files;
     returns 0 if pass test, otherwise returns 1.
     """
-    explines = open(
-        EXPECTED_TEST_OUTPUT_FILENAME, 'r', encoding='utf-8'
-    ).readlines()
-    actlines = open(
-        ACTUAL_TEST_OUTPUT_FILENAME, 'r', encoding='utf-8'
-    ).readlines()
+    with open(EXPECTED_TEST_OUTPUT_FILENAME, 'r', encoding='utf-8') as efile:
+        explines = efile.readlines()
+    with open(ACTUAL_TEST_OUTPUT_FILENAME, 'r', encoding='utf-8') as afile:
+        actlines = afile.readlines()
     if ''.join(explines) == ''.join(actlines):
         sys.stdout.write('PASSED TEST\n')
         retcode = 0

taxcalc/consumption.py

@@ -20,7 +20,8 @@ class Consumption(Parameters):
 
     Parameters
     ----------
-    none
+    last_budget_year: integer
+        user-defined last parameter extrapolation year
 
     Returns
     -------
@@ -28,14 +29,13 @@ class Consumption(Parameters):
     """
 
     JSON_START_YEAR = Policy.JSON_START_YEAR
-    DEFAULT_NUM_YEARS = Policy.DEFAULT_NUM_YEARS
     DEFAULTS_FILE_NAME = 'consumption.json'
     DEFAULTS_FILE_PATH = os.path.abspath(os.path.dirname(__file__))
 
-    def __init__(self):
+    def __init__(self, last_budget_year=Policy.LAST_BUDGET_YEAR):
         super().__init__()
-        self.initialize(Consumption.JSON_START_YEAR,
-                        Consumption.DEFAULT_NUM_YEARS)
+        nyrs = Policy.number_of_years(last_budget_year)
+        self.initialize(Consumption.JSON_START_YEAR, nyrs)
 
     @staticmethod
     def read_json_update(obj):
@@ -68,10 +68,10 @@ class Consumption(Parameters):
         parameters are one
         """
         for var in Consumption.RESPONSE_VARS:
-            if getattr(self, 'MPC_{}'.format(var)) > 0.0:
+            if getattr(self, f'MPC_{var}') > 0.0:
                 return True
         for var in Consumption.BENEFIT_VARS:
-            if getattr(self, 'BEN_{}_value'.format(var)) < 1.0:
+            if getattr(self, f'BEN_{var}_value') < 1.0:
                 return True
         return False
 
@@ -84,12 +84,17 @@ class Consumption(Parameters):
             raise ValueError('records is not a Records object')
         for var in Consumption.RESPONSE_VARS:
             records_var = getattr(records, var)
-            mpc_var = getattr(self, 'MPC_{}'.format(var))
+            mpc_var = getattr(self, f'MPC_{var}')
             records_var[:] += mpc_var * income_change
 
     def benval_params(self):
         """
         Returns list of BEN_*_value parameter values
         """
-        return [getattr(self, 'BEN_{}_value'.format(var))
+        return [getattr(self, f'BEN_{var}_value')
                 for var in Consumption.BENEFIT_VARS]
+
+    def set_rates(self):
+        """
+        Consumption class has no parameter indexing rates.
+        """

taxcalc/data.py

@@ -63,10 +63,7 @@ class Data():
     -------
     class instance: Data
     """
-    # suppress pylint warnings about uppercase variable names:
-    # pylint: disable=invalid-name
-    # suppress pylint warnings about too many class instance attributes:
-    # pylint: disable=too-many-instance-attributes
+    # pylint: disable=too-many-instance-attributes,invalid-name
 
     __metaclass__ = abc.ABCMeta
 
@@ -75,6 +72,8 @@ class Data():
 
     def __init__(self, data, start_year, gfactors=None,
                  weights=None, weights_scale=0.01):
+        # pylint: disable=too-many-arguments,too-many-positional-arguments
+
         # initialize data variable info sets and read variable information
         self.INTEGER_READ_VARS = set()
         self.MUST_READ_VARS = set()
@@ -175,12 +174,13 @@ class Data():
         file_path = os.path.join(self.VARINFO_FILE_PATH,
                                  self.VARINFO_FILE_NAME)
         if os.path.isfile(file_path):
-            with open(file_path) as pfile:
+            with open(file_path, 'r', encoding='utf-8') as pfile:
                 json_text = pfile.read()
             vardict = json_to_dict(json_text)
-        else:  # find file in conda package
-            vardict = read_egg_json(
-                self.VARINFO_FILE_NAME)  # pragma: no cover
+        else:  # find file in taxcalc package
+            vardict = read_egg_json(  # pragma: no cover
+                self.VARINFO_FILE_NAME
+            )
         self.INTEGER_READ_VARS = set(k for k, v in vardict['read'].items()
                                      if v['type'] == 'int')
         FLOAT_READ_VARS = set(k for k, v in vardict['read'].items()

taxcalc/decorators.py

@@ -49,7 +49,7 @@ class GetReturnNode(ast.NodeVisitor):
     """
     A NodeVisitor to get the return tuple names from a calc-style function.
     """
-    def visit_Return(self, node):  # pylint: disable=invalid-name,no-self-use
+    def visit_Return(self, node):  # pylint: disable=invalid-name
         """
         visit_Return is used by NodeVisitor.visit method.
         """
@@ -89,7 +89,7 @@ def create_apply_function_string(sigout, sigin, parameters):
     out_args = ["x_" + str(i) for i in range(0, len(sigout))]
     in_args = ["x_" + str(i) for i in range(len(sigout), total_len)]
 
-    fstr.write("def ap_func({0}):\n".format(",".join(out_args + in_args)))
+    fstr.write(f"def ap_func({','.join(out_args + in_args)}):\n")
     fstr.write("  for i in range(len(x_0)):\n")
     out_index = [x + "[i]" for x in out_args]
     in_index = []
@@ -257,7 +257,7 @@ def iterate_jit(parameters=None, **kwargs):
         in_args = inspect.getfullargspec(func).args
         # Get the numba.jit arguments
         jit_args_list = inspect.getfullargspec(JIT).args + ['nopython']
-        kwargs_for_jit = dict()
+        kwargs_for_jit = {}
         for key, val in kwargs.items():
             if key in jit_args_list:
                 kwargs_for_jit[key] = val

taxcalc/growdiff.py

@@ -20,7 +20,8 @@ class GrowDiff(Parameters):
 
     Parameters
     ----------
-    none
+    last_budget_year: integer
+        user-defined last parameter extrapolation year
 
     Returns
     -------
@@ -28,14 +29,13 @@ class GrowDiff(Parameters):
     """
 
     JSON_START_YEAR = Policy.JSON_START_YEAR
-    DEFAULT_NUM_YEARS = Policy.DEFAULT_NUM_YEARS
     DEFAULTS_FILE_NAME = 'growdiff.json'
     DEFAULTS_FILE_PATH = os.path.abspath(os.path.dirname(__file__))
 
-    def __init__(self):
+    def __init__(self, last_budget_year=Policy.LAST_BUDGET_YEAR):
         super().__init__()
-        self.initialize(GrowDiff.JSON_START_YEAR,
-                        GrowDiff.DEFAULT_NUM_YEARS)
+        nyrs = Policy.number_of_years(last_budget_year)
+        self.initialize(GrowDiff.JSON_START_YEAR, nyrs)
 
     @staticmethod
     def read_json_update(obj, topkey):
@@ -84,5 +84,5 @@ class GrowDiff(Parameters):
 
     def set_rates(self):
         """
-        Unimplemented base class method that is not used here.
+        GrowDiff class has no parameter indexing rates.
         """

taxcalc/growfactors.py

@@ -165,6 +165,6 @@ class GrowFactors():
             msg = 'cannot update growfactors after they have been used'
             raise ValueError(msg)
         assert name in GrowFactors.VALID_NAMES
-        if year >= self.first_year and year <= self.last_year:
+        if self.first_year <= year <= self.last_year:
             assert isinstance(diff, float)
             self.gfdf.loc[year, name] += diff