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

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')
@@ -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)

taxcalc/tests/test_4package.py

@@ -7,10 +7,10 @@ Tests for package existence and dependencies consistency.
 
 import os
 import re
+import ast
 import subprocess
 import yaml
 import pytest
-import ast
 
 
 def extract_install_requires(setup_py_content):
@@ -24,8 +24,9 @@ def extract_install_requires(setup_py_content):
         list: A list of package requirements
     """
     # Use regex to find the install_requires list
-    match = re.search(r'"install_requires"\s*:\s*\[([^\]]+)\]', setup_py_content, re.DOTALL)
-
+    match = re.search(
+        r'"install_requires"\s*:\s*\[([^\]]+)\]', setup_py_content, re.DOTALL
+    )
     if match:
         # Extract the contents of the list and split into packages
         packages_str = match.group(1)
@@ -50,7 +51,7 @@ def test_for_package_existence():
     out = subprocess.check_output(['conda', 'list', 'taxcalc']).decode('ascii')
     envless_out = out.replace('taxcalc-dev', 'environment')
     if re.search('taxcalc', envless_out) is not None:
-        assert 'taxcalc package' == 'installed'
+        assert False, 'ERROR: taxcalc package is installed'
 
 
 def test_for_consistency(tests_path):
@@ -58,6 +59,7 @@ def test_for_consistency(tests_path):
     Ensure that there is consistency between environment.yml dependencies
     and conda.recipe/meta.yaml requirements.
     """
+    # pylint: disable=too-many-locals
     dev_pkgs = set([
         'pytest',
         'pytest-xdist',
@@ -71,7 +73,7 @@ def test_for_consistency(tests_path):
     # read conda.recipe/meta.yaml requirements
     meta_file = os.path.join(tests_path, '..', '..',
                              'conda.recipe', 'meta.yaml')
-    with open(meta_file, 'r') as stream:
+    with open(meta_file, 'r', encoding='utf-8') as stream:
         meta = yaml.safe_load(stream)
     bld = set(meta['requirements']['build'])
     run = set(meta['requirements']['run'])
@@ -80,7 +82,7 @@ def test_for_consistency(tests_path):
     # read environment.yml dependencies
     envr_file = os.path.join(tests_path, '..', '..',
                              'environment.yml')
-    with open(envr_file, 'r') as stream:
+    with open(envr_file, 'r', encoding='utf-8') as stream:
         envr = yaml.safe_load(stream)
 
     env = []
@@ -97,7 +99,7 @@ def test_for_consistency(tests_path):
     # Read the setup.py file and extract the install_requires list
     setup_file = os.path.join(tests_path, '..', '..',
                               'setup.py')
-    with open(setup_file, 'r') as f:
+    with open(setup_file, 'r', encoding='utf-8') as f:
         setup_py_content = f.read()
     setup = set(extract_install_requires(setup_py_content))
     # confirm that setup.py

taxcalc/tests/test_benefits.py

@@ -16,8 +16,9 @@ import os
 import pytest
 import numpy as np
 import pandas as pd
-# pylint: disable=import-error
-from taxcalc import Policy, Records, Calculator
+from taxcalc.policy import Policy
+from taxcalc.records import Records
+from taxcalc.calculator import Calculator
 
 
 @pytest.mark.benefits
@@ -33,11 +34,11 @@ def test_benefits(tests_path, cps_fullsample):
     start_year = recs.current_year
     calc = Calculator(policy=Policy(), records=recs, verbose=False)
     assert calc.current_year == start_year
-    year_list = list()
-    bname_list = list()
-    benamt_list = list()
-    bencnt_list = list()
-    benavg_list = list()
+    year_list = []
+    bname_list = []
+    benamt_list = []
+    bencnt_list = []
+    benavg_list = []
     for year in range(start_year, 2034 + 1):
         calc.advance_to_year(year)
         size = calc.array('XTOT')
@@ -46,7 +47,7 @@ def test_benefits(tests_path, cps_fullsample):
         # (head counts include all members of filing unit receiving a benefit,
         #  which means benavg is f.unit benefit amount divided by f.unit size)
         for bname in benefit_names:
-            ben = calc.array('{}_ben'.format(bname))
+            ben = calc.array(f'{bname}_ben')
             benamt = round((ben * wght).sum() * 1e-9, 3)
             bencnt = round((size[ben > 0] * wght[ben > 0]).sum() * 1e-6, 3)
             benavg = round(benamt / bencnt, 1)

taxcalc/tests/test_calcfunctions.py

@@ -8,10 +8,10 @@ Tests for Tax-Calculator calcfunctions.py logic.
 import os
 import re
 import ast
-from taxcalc import Records  # pylint: disable=import-error
-from taxcalc import calcfunctions
 import numpy as np
 import pytest
+from taxcalc.records import Records
+from taxcalc import calcfunctions
 
 
 class GetFuncDefs(ast.NodeVisitor):
@@ -23,10 +23,10 @@ class GetFuncDefs(ast.NodeVisitor):
         GetFuncDefs class constructor
         """
         self.fname = ''
-        self.fnames = list()  # function name (fname) list
-        self.fargs = dict()  # lists of function arguments indexed by fname
-        self.cvars = dict()  # lists of calc vars in function indexed by fname
-        self.rvars = dict()  # lists of function return vars indexed by fname
+        self.fnames = []  # function name (fname) list
+        self.fargs = {}  # lists of function arguments indexed by fname
+        self.cvars = {}  # lists of calc vars in function indexed by fname
+        self.rvars = {}  # lists of function return vars indexed by fname
 
     def visit_Module(self, node):  # pylint: disable=invalid-name
         """
@@ -41,10 +41,10 @@ class GetFuncDefs(ast.NodeVisitor):
         """
         self.fname = node.name
         self.fnames.append(self.fname)
-        self.fargs[self.fname] = list()
+        self.fargs[self.fname] = []
         for anode in ast.iter_child_nodes(node.args):
             self.fargs[self.fname].append(anode.arg)
-        self.cvars[self.fname] = list()
+        self.cvars[self.fname] = []
         for bodynode in node.body:
             if isinstance(bodynode, ast.Return):
                 continue  # skip function's Return node
@@ -84,8 +84,10 @@ def test_calc_and_used_vars(tests_path):
     """
     # pylint: disable=too-many-locals
     funcpath = os.path.join(tests_path, '..', 'calcfunctions.py')
+    with open(funcpath, 'r', encoding='utf-8') as funcfile:
+        funcfile_text = funcfile.read()
     gfd = GetFuncDefs()
-    fnames, fargs, cvars, rvars = gfd.visit(ast.parse(open(funcpath).read()))
+    fnames, fargs, cvars, rvars = gfd.visit(ast.parse(funcfile_text))
     # Test (1):
     # .. create set of vars that are actually calculated in calcfunctions.py
     all_cvars = set()
@@ -106,7 +108,7 @@ def test_calc_and_used_vars(tests_path):
                 'in calcfunctions.py\n')
         for var in records_varinfo.CALCULATED_VARS - all_cvars:
             found_error1 = True
-            msg1 += 'VAR NOT CALCULATED: {}\n'.format(var)
+            msg1 += f'VAR NOT CALCULATED: {var}\n'
     # Test (2):
     faux_functions = ['EITCamount', 'ComputeBenefit', 'BenefitPrograms',
                       'BenefitSurtax', 'BenefitLimitation']
@@ -119,10 +121,10 @@ def test_calc_and_used_vars(tests_path):
         if not crvars_set <= set(fargs[fname]):
             found_error2 = True
             for var in crvars_set - set(fargs[fname]):
-                msg2 += 'FUNCTION,VARIABLE: {} {}\n'.format(fname, var)
+                msg2 += f'FUNCTION,VARIABLE: {fname} {var}\n'
     # Report errors for the two tests:
     if found_error1 and found_error2:
-        raise ValueError('{}\n{}'.format(msg1, msg2))
+        raise ValueError(f'{msg1}\n{msg2}')
     if found_error1:
         raise ValueError(msg1)
     if found_error2:
@@ -135,7 +137,7 @@ def test_function_args_usage(tests_path):
     function body.
     """
     funcfilename = os.path.join(tests_path, '..', 'calcfunctions.py')
-    with open(funcfilename, 'r') as funcfile:
+    with open(funcfilename, 'r', encoding='utf-8') as funcfile:
         fcontent = funcfile.read()
     fcontent = re.sub('#.*', '', fcontent)  # remove all '#...' comments
     fcontent = re.sub('\n', ' ', fcontent)  # replace EOL character with space
@@ -149,7 +151,7 @@ def test_function_args_usage(tests_path):
             msg = ('Could not find function name, arguments, '
                    'and code portions in the following text:\n')
             msg += '--------------------------------------------------------\n'
-            msg += '{}\n'.format(fcode)
+            msg += f'{fcode}\n'
             msg += '--------------------------------------------------------\n'
             raise ValueError(msg)
         fname = match.group(1)
@@ -161,11 +163,14 @@ def test_function_args_usage(tests_path):
             arg = farg.strip()
             if fbody.find(arg) < 0:
                 found_error = True
-                msg += 'FUNCTION,ARGUMENT= {} {}\n'.format(fname, arg)
+                msg += f'FUNCTION,ARGUMENT= {fname} {arg}\n'
     if found_error:
         raise ValueError(msg)
 
 
+# pylint: disable=invalid-name,unused-argument
+
+
 def test_DependentCare(skip_jit):
     """
     Tests the DependentCare function
@@ -199,7 +204,7 @@ tuple7 = (0, 1000, STD_in, 44, 0, STD_Aged_in, 1000, 3, 1, 0, 0, 2,
 tuple8 = (1, 200, STD_in, 44, 0, STD_Aged_in, 1000, 3, 0, 0, 0, 2,
           True, 0, 100000, 1, Charity_max_in)
 tuple9 = (1, 1000, STD_in, 44, 0, STD_Aged_in, 1000, 3, 0, 0, 0, 2,
-          True, 0,100000, 1, Charity_max_in)
+          True, 0, 100000, 1, Charity_max_in)
 expected = [12000, 15800, 13800, 14400, 6000, 6000, 0, 1000, 1350]
 
 
@@ -224,22 +229,28 @@ def test_StdDed(test_tuple, expected_value, skip_jit):
     assert np.allclose(avalue, expected_value), f"{avalue} != {expected_value}"
 
 
-tuple1 = (120000, 10000, 15000, 100, 2000, 0.06, 0.06, 0.015, 0.015, 0, 99999999999, 
-          400, 0, 0, 0, 0, 0, 0, None, None, None, None, None, None, 
+tuple1 = (120000, 10000, 15000, 100, 2000,
+          0.06, 0.06, 0.015, 0.015, 0, 99999999999,
+          400, 0, 0, 0, 0, 0, 0, None, None, None, None, None, None,
           None, None, None, None, None)
-tuple2 = (120000, 10000, 15000, 100, 2000, 0.06, 0.06, 0.015, 0.015, 0, 99999999999,
+tuple2 = (120000, 10000, 15000, 100, 2000,
+          0.06, 0.06, 0.015, 0.015, 0, 99999999999,
           400, 2000, 0, 10000, 0, 0, 3000, None, None, None, None, None,
           None, None, None, None, None, None)
-tuple3 = (120000, 150000, 15000, 100, 2000, 0.06, 0.06, 0.015, 0.015, 0, 99999999999,
+tuple3 = (120000, 150000, 15000, 100, 2000,
+          0.06, 0.06, 0.015, 0.015, 0, 99999999999,
           400, 2000, 0, 10000, 0, 0, 3000, None, None, None, None, None,
           None, None, None, None, None, None)
-tuple4 = (120000, 500000, 15000, 100, 2000, 0.06, 0.06, 0.015, 0.015, 0, 400000,
+tuple4 = (120000, 500000, 15000, 100, 2000,
+          0.06, 0.06, 0.015, 0.015, 0, 400000,
           400, 2000, 0, 10000, 0, 0, 3000, None, None, None, None, None,
           None, None, None, None, None, None)
-tuple5 = (120000, 10000, 15000, 100, 2000, 0.06, 0.06, 0.015, 0.015, 0, 99999999999,
+tuple5 = (120000, 10000, 15000, 100, 2000,
+          0.06, 0.06, 0.015, 0.015, 0, 99999999999,
           400, 300, 0, 0, 0, 0, 0, None, None, None, None, None,
           None, None, None, None, None, None)
-tuple6 = (120000, 10000, 15000, 100, 2000, 0.06, 0.06, 0.015, 0.015, 0, 99999999999,
+tuple6 = (120000, 10000, 15000, 100, 2000,
+          0.06, 0.06, 0.015, 0.015, 0, 99999999999,
           400, 0, 0, 0, 0, -40000, 0, None, None, None, None, None,
           None, None, None, None, None, None)
 expected1 = (0, 4065, 4065, 0, 0, 3252, 25000, 10000, 15000, 10100,
@@ -254,6 +265,7 @@ expected5 = (300, 4065, 4065, 0, 0, 3285.3, 25300, 10279.1875, 15000,
              10382, 17000)
 expected6 = (-40000, 4065, 4065, 0, 0, 3252, 0, 0, 15000, 10100, 17000)
 
+
 @pytest.mark.parametrize(
     'test_input, expected_output', [
         (tuple1, expected1),
@@ -272,7 +284,8 @@ def test_EI_PayrollTax(test_input, expected_output, skip_jit):
         print('*INPUT:', test_input)
         print('ACTUAL:', actual_output)
         print('EXPECT:', expected_output)
-        assert 1 == 2, 'ACTUAL != EXPECT'
+        assert False, 'ERROR: ACTUAL != EXPECT'
+
 
 def test_AfterTaxIncome(skip_jit):
     '''
@@ -655,7 +668,7 @@ CTC_refundable = True
 CTC_include17 = True
 c07220 = 0  # actual value will be returned from function
 odc = 0  # actual value will be returned from function
-codtc_limited = 0 # actual value will be returned from function
+codtc_limited = 0  # actual value will be returned from function
 tuple0 = (
     age_head, age_spouse, nu18, n24, MARS, c00100, XTOT, num,
     c05800, e07260, CR_ResidentialEnergy_hc,
@@ -673,8 +686,8 @@ expected0 = (0, 1000, 0)
 
 
 @pytest.mark.parametrize(
-    'test_tuple,expected_value', [
-        (tuple0, expected0)])
+    'test_tuple,expected_value', [(tuple0, expected0)]
+)
 def test_ChildDepTaxCredit_2021(test_tuple, expected_value, skip_jit):
     """
     Tests the ChildDepTaxCredit function
@@ -682,6 +695,7 @@ def test_ChildDepTaxCredit_2021(test_tuple, expected_value, skip_jit):
     test_value = calcfunctions.ChildDepTaxCredit(*test_tuple)
     assert np.allclose(test_value, expected_value)
 
+
 # parameterization represents 2022 law
 age_head = 45
 age_spouse = 0
@@ -712,7 +726,7 @@ CTC_refundable = False
 CTC_include17 = False
 c07220 = 0  # actual value will be returned from function
 odc = 0  # actual value will be returned from function
-codtc_limited = 0 # actual value will be returned from function
+codtc_limited = 0  # actual value will be returned from function
 tuple0 = (
     age_head, age_spouse, nu18, n24, MARS, c00100, XTOT, num,
     c05800, e07260, CR_ResidentialEnergy_hc,
@@ -739,6 +753,7 @@ def test_ChildDepTaxCredit_2022(test_tuple, expected_value, skip_jit):
     test_value = calcfunctions.ChildDepTaxCredit(*test_tuple)
     assert np.allclose(test_value, expected_value)
 
+
 # parameterization represents 2021 law
 CTC_new_c = 1000
 CTC_new_rt = 0
@@ -762,7 +777,7 @@ c00100 = 1000
 MARS = 4
 ptax_oasdi = 0
 c09200 = 0
-ctc_new = 0 # actual value will be returned from function
+ctc_new = 0  # actual value will be returned from function
 tuple0 = (
     CTC_new_c, CTC_new_rt, CTC_new_c_under6_bonus,
     CTC_new_ps, CTC_new_prt, CTC_new_for_all, CTC_include17,
@@ -771,7 +786,8 @@ tuple0 = (
     n24, nu06, age_head, age_spouse, nu18, c00100, MARS, ptax_oasdi,
     c09200, ctc_new)
 # output tuple is : (ctc_new)
-expected0 = (0)
+expected0 = 0
+
 
 @pytest.mark.parametrize(
     'test_tuple,expected_value', [
@@ -783,6 +799,7 @@ def test_CTCnew_2021(test_tuple, expected_value, skip_jit):
     test_value = calcfunctions.CTC_new(*test_tuple)
     assert np.allclose(test_value, expected_value)
 
+
 # parameterization represents 2022 law
 CTC_new_c = 0
 CTC_new_rt = 0
@@ -806,7 +823,7 @@ c00100 = 1000
 MARS = 4
 ptax_oasdi = 0
 c09200 = 0
-ctc_new = 0 # actual value will be returned from function
+ctc_new = 0  # actual value will be returned from function
 tuple0 = (
     CTC_new_c, CTC_new_rt, CTC_new_c_under6_bonus,
     CTC_new_ps, CTC_new_prt, CTC_new_for_all, CTC_include17,
@@ -815,11 +832,12 @@ tuple0 = (
     n24, nu06, age_head, age_spouse, nu18, c00100, MARS, ptax_oasdi,
     c09200, ctc_new)
 # output tuple is : (ctc_new)
-expected0 = (0)
+expected0 = 0
+
 
 @pytest.mark.parametrize(
-    'test_tuple,expected_value', [
-        (tuple0, expected0)])
+    'test_tuple,expected_value', [(tuple0, expected0)]
+)
 def test_CTCnew_2022(test_tuple, expected_value, skip_jit):
     """
     Tests the CTCnew function
@@ -828,7 +846,7 @@ def test_CTCnew_2022(test_tuple, expected_value, skip_jit):
     assert np.allclose(test_value, expected_value)
 
 
-
+# parameters for next test
 ymod1 = 19330 + 10200
 c02500 = 0
 c02900 = 0
@@ -859,8 +877,8 @@ expected0 = (19330, 0, 0)
 
 
 @pytest.mark.parametrize(
-    'test_tuple,expected_value', [
-        (tuple0, expected0)])
+    'test_tuple,expected_value', [(tuple0, expected0)]
+)
 def test_AGI(test_tuple, expected_value, skip_jit):
     """
     Tests the TaxInc function
@@ -868,4 +886,3 @@ def test_AGI(test_tuple, expected_value, skip_jit):
     test_value = calcfunctions.AGI(*test_tuple)
     print('Returned from agi function: ', test_value)
     assert np.allclose(test_value, expected_value)
-