taxcalc 4.4.0__py3-none-any.whl → 4.5.0__py3-none-any.whl

taxcalc/reforms/ext.json

@@ -1,32 +1,32 @@
 // REFORM TO EXTEND TEMPORARY TCJA PROVISIONS BEYOND 2025
-// USING TAX-CALCULATOR 4.4.0
-// WITH 2025-to-2026 INDEXING FACTOR = 1.024900
-//  AND 2028-to-2029 INDEXING FACTOR = 1.021800
+// USING TAX-CALCULATOR 4.4.1
+// WITH 2025-to-2026 INDEXING FACTOR = 1.022300
+//  AND 2028-to-2029 INDEXING FACTOR = 1.022600
 {
     "II_rt1": {"2026": 0.10},
-    "II_brk1": {"2026": [12221.93, 24443.86, 12221.93, 17423.3, 24443.86]},
+    "II_brk1": {"2026": [12190.93, 24381.86, 12190.93, 17379.1, 24381.86]},
     "PT_rt1": {"2026": 0.10},
-    "PT_brk1": {"2026": [12221.93, 24443.86, 12221.93, 17423.3, 24443.86]},
+    "PT_brk1": {"2026": [12190.93, 24381.86, 12190.93, 17379.1, 24381.86]},
     "II_rt2": {"2026": 0.12},
-    "II_brk2": {"2026": [49682.03, 99364.06, 49682.03, 66464.76, 99364.06]},
+    "II_brk2": {"2026": [49555.99, 99111.98, 49555.99, 66296.16, 99111.98]},
     "PT_rt2": {"2026": 0.12},
-    "PT_brk2": {"2026": [49682.03, 99364.06, 49682.03, 66464.76, 99364.06]},
+    "PT_brk2": {"2026": [49555.99, 99111.98, 49555.99, 66296.16, 99111.98]},
     "II_rt3": {"2026": 0.22},
-    "II_brk3": {"2026": [105923.42, 211846.83, 105923.42, 105923.42, 211846.83]},
+    "II_brk3": {"2026": [105654.7, 211309.41, 105654.7, 105654.7, 211309.41]},
     "PT_rt3": {"2026": 0.22},
-    "PT_brk3": {"2026": [105923.42, 211846.83, 105923.42, 105923.42, 211846.83]},
+    "PT_brk3": {"2026": [105654.7, 211309.41, 105654.7, 105654.7, 211309.41]},
     "II_rt4": {"2026": 0.24},
-    "II_brk4": {"2026": [202212.77, 404425.54, 202212.77, 202212.77, 404425.54]},
+    "II_brk4": {"2026": [201699.79, 403399.58, 201699.79, 201699.79, 403399.58]},
     "PT_rt4": {"2026": 0.24},
-    "PT_brk4": {"2026": [202212.77, 404425.54, 202212.77, 202212.77, 404425.54]},
+    "PT_brk4": {"2026": [201699.79, 403399.58, 201699.79, 201699.79, 403399.58]},
     "II_rt5": {"2026": 0.32},
-    "II_brk5": {"2026": [256763.07, 513526.14, 256763.07, 256737.45, 513526.14]},
+    "II_brk5": {"2026": [256111.71, 512223.42, 256111.71, 256086.15, 512223.42]},
     "PT_rt5": {"2026": 0.32},
-    "PT_brk5": {"2026": [256763.07, 513526.14, 256763.07, 256737.45, 513526.14]},
+    "PT_brk5": {"2026": [256111.71, 512223.42, 256111.71, 256086.15, 512223.42]},
     "II_rt6": {"2026": 0.35},
-    "II_brk6": {"2026": [641946.12, 770314.84, 385157.42, 641946.12, 770314.84]},
+    "II_brk6": {"2026": [640317.6, 768360.68, 384180.34, 640317.6, 768360.68]},
     "PT_rt6": {"2026": 0.35},
-    "PT_brk6": {"2026": [641946.12, 770314.84, 385157.42, 641946.12, 770314.84]},
+    "PT_brk6": {"2026": [640317.6, 768360.68, 384180.34, 640317.6, 768360.68]},
     "II_rt7": {"2026": 0.37},
     "II_brk7": {"2026": [9e+99, 9e+99, 9e+99, 9e+99, 9e+99]},
     "PT_rt7": {"2026": 0.37},
@@ -36,10 +36,10 @@
     "ODC_c": {"2026": 500.00},
     "CTC_ps": {"2026": [200000.0, 400000.0, 200000.0, 200000.0, 400000.0]},
     "ACTC_Income_thd": {"2026": 2500.00},
-    "AMT_em": {"2026": [90293.69, 140411.3, 70205.65, 90293.69, 140411.3]},
-    "AMT_em_ps": {"2026": [641946.12, 1283892.23, 641946.12, 641946.12, 1283892.23]},
-    "AMT_em_pe": {"2026": 945745.66},
-    "STD": {"2026": [15373.5, 30747.0, 15373.5, 23060.25, 30747.0]},
+    "AMT_em": {"2026": [90064.63, 140055.1, 70027.55, 90064.63, 140055.1]},
+    "AMT_em_ps": {"2026": [640317.6, 1280635.21, 640317.6, 640317.6, 1280635.21]},
+    "AMT_em_pe": {"2026": 940953.35},
+    "STD": {"2026": [15334.5, 30669.0, 15334.5, 23001.75, 30669.0]},
     "ID_AllTaxes_c": {"2026": [10000.0, 10000.0, 5000.0, 10000.0, 10000.0]},
     "ID_Charity_crt_cash": {"2026": 0.60},
     "ID_Casualty_hc": {"2026": 1.00},
@@ -50,10 +50,10 @@
     "II_em": {"2026": 0.00},
     "II_em_ps": {"2026": [9e+99, 9e+99, 9e+99, 9e+99, 9e+99]},
     "PT_qbid_rt": {"2026": 0.20},
-    "PT_qbid_taxinc_thd": {"2026": [202212.77, 404425.54, 202212.77, 202212.77, 202212.77]},
+    "PT_qbid_taxinc_thd": {"2026": [201699.79, 403399.58, 201699.79, 201699.79, 201699.79]},
     "PT_qbid_taxinc_gap": {"2026": [50000.0, 100000.0, 50000.0, 50000.0, 100000.0]},
     "PT_qbid_w2_wages_rt": {"2026": 0.50},
     "PT_qbid_alt_w2_wages_rt": {"2026": 0.25},
     "PT_qbid_alt_property_rt": {"2026": 0.03},
-    "ALD_BusinessLosses_c": {"2029": [342803.73, 685607.47, 342803.73, 342803.73, 685607.47]}
+    "ALD_BusinessLosses_c": {"2029": [342904.94, 685809.88, 342904.94, 342904.94, 685809.88]}
 }

taxcalc/taxcalcio.py

@@ -66,8 +66,8 @@ class TaxCalcIO():
 
     def __init__(self, input_data, tax_year, baseline, reform, assump,
                  outdir=None):
-        # pylint: disable=too-many-arguments,too-many-locals
-        # pylint: disable=too-many-branches,too-many-statements
+        # pylint: disable=too-many-arguments,too-many-positional-arguments
+        # pylint: disable=too-many-branches,too-many-statements,too-many-locals
         self.gf_reform = None
         self.errmsg = ''
         # check name and existence of INPUT file
@@ -82,17 +82,17 @@ class TaxCalcIO():
             fname = os.path.basename(input_data)
             # check if fname ends with ".csv"
             if fname.endswith('.csv'):
-                inp = '{}-{}'.format(fname[:-4], str(tax_year)[2:])
+                inp = f'{fname[:-4]}-{str(tax_year)[2:]}'
             else:
                 msg = 'INPUT file name does not end in .csv'
-                self.errmsg += 'ERROR: {}\n'.format(msg)
+                self.errmsg += f'ERROR: {msg}\n'
             # check existence of INPUT file
             self.puf_input_data = input_data.endswith('puf.csv')
             self.cps_input_data = input_data.endswith('cps.csv')
             self.tmd_input_data = input_data.endswith('tmd.csv')
             if not self.cps_input_data and not os.path.isfile(input_data):
                 msg = 'INPUT file could not be found'
-                self.errmsg += 'ERROR: {}\n'.format(msg)
+                self.errmsg += f'ERROR: {msg}\n'
             # if tmd_input_data is True, construct weights and gfactor paths
             if self.tmd_input_data:  # pragma: no cover
                 tmd_dir = os.path.dirname(input_data)
@@ -106,15 +106,15 @@ class TaxCalcIO():
                 self.tmd_gfactor = os.path.join(tmd_dir, 'tmd_growfactors.csv')
                 if not os.path.isfile(self.tmd_weights):
                     msg = f'weights file {self.tmd_weights} could not be found'
-                    self.errmsg += 'ERROR: {}\n'.format(msg)
+                    self.errmsg += f'ERROR: {msg}\n'
                 if not os.path.isfile(self.tmd_gfactor):
                     msg = f'gfactor file {self.tmd_gfactor} could not be found'
-                    self.errmsg += 'ERROR: {}\n'.format(msg)
+                    self.errmsg += f'ERROR: {msg}\n'
         elif isinstance(input_data, pd.DataFrame):
-            inp = 'df-{}'.format(str(tax_year)[2:])
+            inp = f'df-{str(tax_year)[2:]}'
         else:
             msg = 'INPUT is neither string nor Pandas DataFrame'
-            self.errmsg += 'ERROR: {}\n'.format(msg)
+            self.errmsg += f'ERROR: {msg}\n'
         # check name and existence of BASELINE file
         bas = '-x'
         if baseline is None:
@@ -124,17 +124,17 @@ class TaxCalcIO():
             fname = os.path.basename(baseline)
             # check if fname ends with ".json"
             if fname.endswith('.json'):
-                bas = '-{}'.format(fname[:-5])
+                bas = f'-{fname[:-5]}'
             else:
                 msg = 'BASELINE file name does not end in .json'
-                self.errmsg += 'ERROR: {}\n'.format(msg)
+                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 += 'ERROR: {}\n'.format(msg)
+                self.errmsg += f'ERROR: {msg}\n'
         else:
             msg = 'TaxCalcIO.ctor: baseline is neither None nor str'
-            self.errmsg += 'ERROR: {}\n'.format(msg)
+            self.errmsg += f'ERROR: {msg}\n'
         # check name(s) and existence of REFORM file(s)
         ref = '-x'
         if reform is None:
@@ -150,12 +150,12 @@ class TaxCalcIO():
                 fname = os.path.basename(rfm)
                 # check if fname ends with ".json"
                 if not fname.endswith('.json'):
-                    msg = '{} does not end in .json'.format(fname)
-                    self.errmsg += 'ERROR: REFORM file name {}\n'.format(msg)
+                    msg = f'{fname} does not end in .json'
+                    self.errmsg += f'ERROR: REFORM file name {msg}\n'
                 # check existence of REFORM file
                 if not os.path.isfile(rfm):
-                    msg = '{} could not be found'.format(rfm)
-                    self.errmsg += 'ERROR: REFORM file {}\n'.format(msg)
+                    msg = f'{rfm} could not be found'
+                    self.errmsg += f'ERROR: REFORM file {msg}\n'
                 # add fname to list of refnames used in output file names
                 refnames.append(fname)
             # create (possibly compound) reform name for output file names
@@ -165,10 +165,10 @@ class TaxCalcIO():
                 num_refnames += 1
                 if num_refnames > 1:
                     ref += '+'
-                ref += '{}'.format(refname[:-5])
+                ref += f'{refname[:-5]}'
         else:
             msg = 'TaxCalcIO.ctor: reform is neither None nor str'
-            self.errmsg += 'ERROR: {}\n'.format(msg)
+            self.errmsg += f'ERROR: {msg}\n'
         # check name and existence of ASSUMP file
         asm = '-x'
         if assump is None:
@@ -178,17 +178,17 @@ class TaxCalcIO():
             fname = os.path.basename(assump)
             # check if fname ends with ".json"
             if fname.endswith('.json'):
-                asm = '-{}'.format(fname[:-5])
+                asm = f'-{fname[:-5]}'
             else:
                 msg = 'ASSUMP file name does not end in .json'
-                self.errmsg += 'ERROR: {}\n'.format(msg)
+                self.errmsg += f'ERROR: {msg}\n'
             # check existence of ASSUMP file
             if not os.path.isfile(assump):
                 msg = 'ASSUMP file could not be found'
-                self.errmsg += 'ERROR: {}\n'.format(msg)
+                self.errmsg += f'ERROR: {msg}\n'
         else:
             msg = 'TaxCalcIO.ctor: assump is neither None nor str'
-            self.errmsg += 'ERROR: {}\n'.format(msg)
+            self.errmsg += f'ERROR: {msg}\n'
         # check name and existence of OUTDIR
         if outdir is None:
             valid_outdir = True
@@ -199,13 +199,13 @@ class TaxCalcIO():
             else:
                 valid_outdir = False
                 msg = 'OUTDIR could not be found'
-                self.errmsg += 'ERROR: {}\n'.format(msg)
+                self.errmsg += f'ERROR: {msg}\n'
         else:
             valid_outdir = False
             msg = 'TaxCalcIO.ctor: outdir is neither None nor str'
-            self.errmsg += 'ERROR: {}\n'.format(msg)
+            self.errmsg += f'ERROR: {msg}\n'
         # create OUTPUT file name and delete any existing output files
-        output_filename = '{}{}{}{}.csv'.format(inp, bas, ref, asm)
+        output_filename = f'{inp}{bas}{ref}{asm}.csv'
         if outdir is None:
             self._output_filename = output_filename
             delete_old_files = True
@@ -246,8 +246,8 @@ class TaxCalcIO():
             specifies whether or not exact tax calculations are done without
             any smoothing of "stair-step" provisions in the tax law.
         """
-        # pylint: disable=too-many-arguments,too-many-locals
-        # pylint: disable=too-many-statements,too-many-branches
+        # pylint: disable=too-many-arguments,too-many-positional-arguments
+        # pylint: disable=too-many-statements,too-many-branches,too-many-locals
         self.errmsg = ''
         # instantiate base and reform GrowFactors objects
         if self.tmd_input_data:
@@ -300,7 +300,7 @@ class TaxCalcIO():
         try:
             gdiff_baseline.update_growdiff(paramdict['growdiff_baseline'])
         except paramtools.ValidationError as valerr_msg:
-            self.errmsg += valerr_msg.__str__()
+            self.errmsg += str(valerr_msg)
         # apply gdiff_baseline to gfactor_base
         gdiff_baseline.apply_to(gfactors_base)
         # specify gdiff_response object
@@ -308,7 +308,7 @@ class TaxCalcIO():
         try:
             gdiff_response.update_growdiff(paramdict['growdiff_response'])
         except paramtools.ValidationError as valerr_msg:
-            self.errmsg += valerr_msg.__str__()
+            self.errmsg += str(valerr_msg)
         # apply gdiff_baseline and gdiff_response to gfactor_ref
         gdiff_baseline.apply_to(gfactors_ref)
         gdiff_response.apply_to(gfactors_ref)
@@ -323,7 +323,7 @@ class TaxCalcIO():
             for _, errors in base.parameter_errors.items():
                 self.errmsg += "\n".join(errors)
         except paramtools.ValidationError as valerr_msg:
-            self.errmsg += valerr_msg.__str__()
+            self.errmsg += str(valerr_msg)
         # ... the reform Policy object
         if self.specified_reform:
             pol = Policy(gfactors=gfactors_ref, last_budget_year=last_b_year)
@@ -337,7 +337,7 @@ class TaxCalcIO():
                     for _, errors in pol.parameter_errors.items():
                         self.errmsg += "\n".join(errors)
                 except paramtools.ValidationError as valerr_msg:
-                    self.errmsg += valerr_msg.__str__()
+                    self.errmsg += str(valerr_msg)
         else:
             pol = Policy(gfactors=gfactors_base, last_budget_year=last_b_year)
         # create Consumption object
@@ -345,7 +345,7 @@ class TaxCalcIO():
         try:
             con.update_consumption(paramdict['consumption'])
         except paramtools.ValidationError as valerr_msg:
-            self.errmsg += valerr_msg.__str__()
+            self.errmsg += str(valerr_msg)
         # any errors imply cannot proceed with calculations
         if self.errmsg:
             return
@@ -431,9 +431,8 @@ class TaxCalcIO():
         valid_set = recs_vinfo.USABLE_READ_VARS | recs_vinfo.CALCULATED_VARS
         for var in dump_vars_list:
             if var not in valid_set:
-                msg = 'invalid variable name in tcdumpvars file: {}'
-                msg = msg.format(var)
-                self.errmsg += 'ERROR: {}\n'.format(msg)
+                msg = f'invalid variable name in tcdumpvars file: {var}'
+                self.errmsg += f'ERROR: {msg}\n'
         # add essential variables even if not on custom list
         if 'RECID' not in dump_vars_list:
             dump_vars_list.append('RECID')
@@ -494,7 +493,8 @@ class TaxCalcIO():
         -------
         Nothing
         """
-        # pylint: disable=too-many-arguments,too-many-branches,too-many-locals
+        # 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.reform_warnings:
             warn = 'PARAMETER VALUE WARNING(S):  {}\n{}{}'  # pragma: no cover
             print(  # pragma: no cover
@@ -599,6 +599,7 @@ class TaxCalcIO():
         """
         Write dump output to SQLite3 database table dump.
         """
+        # pylint: disable=too-many-arguments,too-many-positional-arguments
         db_fname = self._output_filename.replace('.csv', '.db')
         dbcon = sqlite3.connect(db_fname)
         # write baseline table
@@ -685,8 +686,9 @@ class TaxCalcIO():
             weighted_sum, 'combined', include_groups=False
         ).values[:, 1]
         # write decile table to text file
-        row = 'Weighted Tax {} by Baseline Expanded-Income Decile\n'
-        tfile.write(row.format(tkind))
+        row = f'Weighted Tax {tkind} by Baseline Expanded-Income Decile\n'
+        tfile.write(row)
+        # pylint: disable=consider-using-f-string
         rowfmt = '{}{}{}{}{}{}\n'
         row = rowfmt.format('    Returns',
                             '    ExpInc',
@@ -704,7 +706,7 @@ class TaxCalcIO():
         tfile.write(row)
         rowfmt = '{:9.2f}{:10.1f}{:10.1f}{:10.1f}{:10.1f}{:10.1f}\n'
         for decile in range(0, 10):
-            row = '{:2d}'.format(decile)
+            row = f'{decile:2d}'
             row += rowfmt.format(rtns_series[decile] * 1e-6,
                                  xinc_series[decile] * 1e-9,
                                  itax_series[decile] * 1e-9,
@@ -720,6 +722,7 @@ class TaxCalcIO():
                              htax_series.sum() * 1e-9,
                              ctax_series.sum() * 1e-9)
         tfile.write(row)
+        # pylint: enable=consider-using-f-string
         del gdfx
         del rtns_series
         del xinc_series
@@ -776,10 +779,12 @@ class TaxCalcIO():
         """
         Write HTML graph file with title but no graph for specified reason.
         """
-        txt = ('<html>\n'
-               '<head><title>{}</title></head>\n'
-               '<body><center<h1>{}</h1></center></body>\n'
-               '</html>\n').format(title, reason)
+        txt = (
+            '<html>\n'
+            f'<head><title>{title}</title></head>\n'
+            f'<body><center<h1>{reason}</h1></center></body>\n'
+            '</html>\n'
+        )
         with open(fname, 'w', encoding='utf-8') as gfile:
             gfile.write(txt)
 

taxcalc/tests/cmpi_cps_expect.txt

@@ -1,5 +1,5 @@
 TABLE for EITC
-AGI category           	     T-C	     SOI	 %diff
+AGIcategory           	     T-C	     SOI	 %diff
 [-9e+99, 1)            	   0.014	   0.210	 -93.2
 [1, 5000)              	   1.555	   1.184	 +31.3
 [5000, 10000)          	   6.132	   7.156	 -14.3
@@ -21,7 +21,7 @@ AGI category           	     T-C	     SOI	 %diff
 [10000000, 9e+99)      	   0.000	   0.000	  +nan
 ALL                    	  54.894	  68.525	 -19.9
 TABLE for FCTC
-AGI category           	     T-C	     SOI	 %diff
+AGIcategory           	     T-C	     SOI	 %diff
 [-9e+99, 1)            	   0.005	   0.130	 -96.0
 [1, 5000)              	   0.083	   0.079	  +4.4
 [5000, 10000)          	   1.118	   1.474	 -24.2
@@ -43,7 +43,7 @@ AGI category           	     T-C	     SOI	 %diff
 [10000000, 9e+99)      	   0.000	   0.000	  +nan
 ALL                    	  56.073	  53.690	  +4.4
 TABLE for NIIT
-AGI category           	     T-C	     SOI	 %diff
+AGIcategory           	     T-C	     SOI	 %diff
 [-9e+99, 1)            	   0.000	   0.000	-100.0
 [1, 5000)              	   0.000	   0.000	  +nan
 [5000, 10000)          	   0.000	   0.000	  +nan
@@ -65,7 +65,7 @@ AGI category           	     T-C	     SOI	 %diff
 [10000000, 9e+99)      	   4.187	   8.273	 -49.4
 ALL                    	   6.179	  22.043	 -72.0
 TABLE for ITAX
-AGI category           	     T-C	     SOI	 %diff
+AGIcategory           	     T-C	     SOI	 %diff
 [-9e+99, 1)            	  -0.006	   0.242	-102.3
 [1, 5000)              	  -1.529	   0.041	-3838.6
 [5000, 10000)          	  -6.862	   0.368	-1964.8
@@ -87,7 +87,7 @@ AGI category           	     T-C	     SOI	 %diff
 [10000000, 9e+99)      	  49.547	 139.611	 -64.5
 ALL                    	 969.859	1457.891	 -33.5
 TABLE for SETAX
-AGI category           	     T-C	     SOI	 %diff
+AGIcategory           	     T-C	     SOI	 %diff
 [-9e+99, 1)            	   0.014	   0.656	 -97.9
 [1, 5000)              	   0.101	   0.555	 -81.8
 [5000, 10000)          	   0.319	   1.896	 -83.2
@@ -109,7 +109,7 @@ AGI category           	     T-C	     SOI	 %diff
 [10000000, 9e+99)      	   0.073	   0.638	 -88.6
 ALL                    	  48.503	  60.174	 -19.4
 TABLE for AMTAX
-AGI category           	     T-C	     SOI	 %diff
+AGIcategory           	     T-C	     SOI	 %diff
 [-9e+99, 1)            	   0.000	   0.022	-100.0
 [1, 5000)              	   0.000	   0.000	-100.0
 [5000, 10000)          	   0.000	   0.000	  +nan

taxcalc/tests/cmpi_puf_expect.txt

@@ -1,5 +1,5 @@
 TABLE for EITC
-AGI category           	     T-C	     SOI	 %diff
+AGIcategory           	     T-C	     SOI	 %diff
 [-9e+99, 1)            	   0.174	   0.210	 -17.5
 [1, 5000)              	   1.495	   1.184	 +26.2
 [5000, 10000)          	   5.880	   7.156	 -17.8
@@ -21,7 +21,7 @@ AGI category           	     T-C	     SOI	 %diff
 [10000000, 9e+99)      	   0.000	   0.000	  +nan
 ALL                    	  68.057	  68.525	  -0.7
 TABLE for FCTC
-AGI category           	     T-C	     SOI	 %diff
+AGIcategory           	     T-C	     SOI	 %diff
 [-9e+99, 1)            	   0.145	   0.130	 +11.2
 [1, 5000)              	   0.115	   0.079	 +44.7
 [5000, 10000)          	   1.084	   1.474	 -26.5
@@ -43,7 +43,7 @@ AGI category           	     T-C	     SOI	 %diff
 [10000000, 9e+99)      	   0.000	   0.000	  +nan
 ALL                    	  53.276	  53.690	  -0.8
 TABLE for NIIT
-AGI category           	     T-C	     SOI	 %diff
+AGIcategory           	     T-C	     SOI	 %diff
 [-9e+99, 1)            	   0.000	   0.000	-100.0
 [1, 5000)              	   0.000	   0.000	  +nan
 [5000, 10000)          	   0.000	   0.000	  +nan
@@ -65,7 +65,7 @@ AGI category           	     T-C	     SOI	 %diff
 [10000000, 9e+99)      	   8.112	   8.273	  -1.9
 ALL                    	  27.149	  22.043	 +23.2
 TABLE for ITAX
-AGI category           	     T-C	     SOI	 %diff
+AGIcategory           	     T-C	     SOI	 %diff
 [-9e+99, 1)            	   4.502	   0.242	+1756.7
 [1, 5000)              	  -1.776	   0.041	-4442.6
 [5000, 10000)          	  -5.779	   0.368	-1670.5
@@ -87,7 +87,7 @@ AGI category           	     T-C	     SOI	 %diff
 [10000000, 9e+99)      	  97.259	 139.611	 -30.3
 ALL                    	1462.385	1457.891	  +0.3
 TABLE for SETAX
-AGI category           	     T-C	     SOI	 %diff
+AGIcategory           	     T-C	     SOI	 %diff
 [-9e+99, 1)            	   0.761	   0.656	 +16.1
 [1, 5000)              	   0.626	   0.555	 +12.7
 [5000, 10000)          	   1.633	   1.896	 -13.8
@@ -109,7 +109,7 @@ AGI category           	     T-C	     SOI	 %diff
 [10000000, 9e+99)      	   0.033	   0.638	 -94.8
 ALL                    	  49.779	  60.174	 -17.3
 TABLE for AMTAX
-AGI category           	     T-C	     SOI	 %diff
+AGIcategory           	     T-C	     SOI	 %diff
 [-9e+99, 1)            	   0.012	   0.022	 -45.5
 [1, 5000)              	   0.000	   0.000	 -68.2
 [5000, 10000)          	   0.000	   0.000	  +nan

taxcalc/tests/conftest.py

@@ -1,3 +1,7 @@
+"""
+The pytest configuration file.
+"""
+
 import os
 import time
 import glob
@@ -12,63 +16,61 @@ numpy.seterr(all='raise')
 
 @pytest.fixture
 def skip_jit(monkeypatch):
+    """Fixture docstring"""
     monkeypatch.setenv("TESTING", "True")
     yield
 
 
-@pytest.fixture(scope='session')
-def tests_path():
+@pytest.fixture(scope='session', name='tests_path')
+def tests_path_fixture():
+    """Fixture docstring"""
     return os.path.abspath(os.path.dirname(__file__))
 
 
-@pytest.fixture(scope='session')
-def cps_path(tests_path):
+@pytest.fixture(scope='session', name='cps_path')
+def cps_path_fixture(tests_path):
+    """Fixture docstring"""
     return os.path.join(tests_path, '..', 'cps.csv.gz')
 
 
-@pytest.fixture(scope='session')
-def cps_fullsample(cps_path):
+@pytest.fixture(scope='session', name='cps_fullsample')
+def cps_fullsample_fixture(cps_path):
+    """Fixture docstring"""
     return pandas.read_csv(cps_path)
 
 
 @pytest.fixture(scope='session')
 def cps_subsample(cps_fullsample):
+    """Fixture docstring"""
     # draw smaller cps.csv subsample than in test_cpscsv.py
     return cps_fullsample.sample(frac=0.01, random_state=123456789)
 
 
-@pytest.fixture(scope='session')
-def puf_path(tests_path):
+@pytest.fixture(scope='session', name='puf_path')
+def puf_path_fixture(tests_path):
+    """Fixture docstring"""
     return os.path.join(tests_path, '..', '..', 'puf.csv')
 
 
-@pytest.fixture(scope='session')
-def puf_fullsample(puf_path):
+@pytest.fixture(scope='session', name='puf_fullsample')
+def puf_fullsample_fixture(puf_path):
+    """Fixture docstring"""
     return pandas.read_csv(puf_path)
 
 
 @pytest.fixture(scope='session')
 def puf_subsample(puf_fullsample):
+    """Fixture docstring"""
     # draw same puf.csv subsample as in test_pufcsv.py
     return puf_fullsample.sample(frac=0.05, random_state=2222)
 
 
-@pytest.fixture(scope='session')
-def tmd_path(tests_path):
-    return os.path.join(tests_path, '..', '..', 'tmd.csv')
-
-
-@pytest.fixture(scope='session')
-def tmd_fullsample(tmd_path):
-    return pandas.read_csv(tmd_path)
-
-
 @pytest.fixture(scope='session', name='test_reforms_init')
 def fixture_test_reforms(tests_path):
     """
     Execute logic only once rather than on each pytest-xdist node.
     """
-    # pylint: disable=too-many-locals
+    # pylint: disable=too-many-locals,too-many-statements
     num_reforms = 64  # must be same as NUM_REFORMS in test_reforms.py
     handling_logic = ('PYTEST_XDIST_WORKER' not in os.environ or
                       os.environ['PYTEST_XDIST_WORKER'] == 'gw0')
@@ -76,7 +78,7 @@ def fixture_test_reforms(tests_path):
     actfile_path = os.path.join(tests_path, 'reforms_actual.csv')
     afiles = os.path.join(tests_path, 'reform_actual_*.csv')
     wait_secs = 1
-    max_waits = 180
+    max_waits = 240
     # test_reforms setup
     if handling_logic:
         # remove reforms_actual.csv file if exists
@@ -86,7 +88,7 @@ def fixture_test_reforms(tests_path):
         for afile in glob.glob(afiles):
             os.remove(afile)
         # create reforms_actual_init file
-        with open(initfile, 'w') as ifile:
+        with open(initfile, 'w', encoding='utf-8') as ifile:
             ifile.write('test_reforms initialization done')
     else:
         num_waits = 0
@@ -107,26 +109,26 @@ def fixture_test_reforms(tests_path):
         # compare actual and expected results for each test
         # ... read expected results
         efile_path = os.path.join(tests_path, 'reforms_expect.csv')
-        with open(efile_path, 'r') as efile:
+        with open(efile_path, 'r', encoding='utf-8') as efile:
             expect_lines = efile.readlines()
         # ... compare actual and expected results for each test
         diffs = False
-        actfile = open(actfile_path, 'w')
-        actfile.write('rid,res1,res2,res3,res4\n')
-        idx = 1  # expect_lines list index
-        for rnum in range(1, num_reforms + 1):
-            afile_path = os.path.join(tests_path,
-                                      'reform_actual_{}.csv'.format(rnum))
-            with open(afile_path, 'r') as afile:
-                actual_lines = afile.readlines()
-            os.remove(afile_path)
-            actfile.write(actual_lines[1])
-            actual = [float(itm) for itm in actual_lines[1].split(',')]
-            expect = [float(itm) for itm in expect_lines[idx].split(',')]
-            if not numpy.allclose(actual, expect, atol=0.0, rtol=0.0):
-                diffs = True
-            idx += 1
-        actfile.close()
+        with open(actfile_path, 'w', encoding='utf-8') as actfile:
+            actfile.write('rid,res1,res2,res3,res4\n')
+            idx = 1  # expect_lines list index
+            for rnum in range(1, num_reforms + 1):
+                afile_path = os.path.join(
+                    tests_path, f'reform_actual_{rnum}.csv'
+                )
+                with open(afile_path, 'r', encoding='utf-8') as afile:
+                    actual_lines = afile.readlines()
+                os.remove(afile_path)
+                actfile.write(actual_lines[1])
+                actual = [float(itm) for itm in actual_lines[1].split(',')]
+                expect = [float(itm) for itm in expect_lines[idx].split(',')]
+                if not numpy.allclose(actual, expect, atol=0.0, rtol=0.0):
+                    diffs = True
+                idx += 1
         # remove init file
         os.remove(initfile)
         # remove 'reforms_actual.csv' file if no actual-vs-expect diffs
@@ -139,5 +141,4 @@ def fixture_test_reforms(tests_path):
             msg += '---               AND RERUN TEST.             ---\n'
             msg += '-------------------------------------------------\n'
             raise ValueError(msg)
-        else:
-            os.remove(actfile_path)
+        os.remove(actfile_path)