Skip to content

Commit

Permalink
Fix pylint E1101 warnings
Browse files Browse the repository at this point in the history
  • Loading branch information
martinholmer committed Jan 5, 2025
1 parent fe46574 commit 94855e6
Show file tree
Hide file tree
Showing 4 changed files with 30 additions and 28 deletions.
6 changes: 3 additions & 3 deletions taxcalc/tests/test_consumption.py
Original file line number Diff line number Diff line change
Expand Up @@ -128,15 +128,15 @@ def test_consumption_response(cps_subsample):
consump.response([], 1)
# test correct call to response method
rec = Records.cps_constructor(data=cps_subsample)
pre = copy.deepcopy(rec.e20400)
pre = copy.deepcopy(getattr(rec, 'e20400'))
consump.response(rec, 1.0)
post = rec.e20400
post = getattr(rec, 'e20400')
actual_diff = post - pre
expected_diff = np.ones(rec.array_length) * mpc
assert np.allclose(actual_diff, expected_diff)
# compute earnings mtr with no consumption response
rec = Records.cps_constructor(data=cps_subsample)
ided0 = copy.deepcopy(rec.e20400)
ided0 = copy.deepcopy(getattr(rec, 'e20400'))
calc0 = Calculator(policy=Policy(), records=rec, consumption=None)
(mtr0_ptax, mtr0_itax, _) = calc0.mtr(variable_str='e00200p',
wrt_full_compensation=False)
Expand Down
38 changes: 20 additions & 18 deletions taxcalc/tests/test_data.py
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,10 @@ def __init__(self, data, start_year, gfactors, weights):
super().__init__(data, start_year, gfactors, weights)

def _extrapolate(self, year):
self.e00300 *= self.gfactors.factor_value('AINTS', year)
val = getattr(self, 'e00300')
setattr(
self, 'e00300', val* self.gfactors.factor_value('AINTS', year)
)

# test Recs class for incorrect instantiation
with pytest.raises(ValueError):
Expand All @@ -101,15 +104,14 @@ def _extrapolate(self, year):
syr = 2014
rec = Recs(data=cps_subsample, start_year=syr,
gfactors=None, weights=None)
assert isinstance(rec, Recs)
assert np.all(rec.MARS != 0)
assert rec.data_year == syr
assert rec.current_year == syr
sum_e00300_in_syr = rec.e00300.sum()
assert np.all(getattr(rec, 'MARS') != 0)
assert getattr(rec, 'data_year') == syr
assert getattr(rec, 'current_year') == syr
sum_e00300_in_syr = getattr(rec, 'e00300').sum()
rec.increment_year()
assert rec.data_year == syr
assert rec.current_year == syr + 1
sum_e00300_in_syr_plus_one = rec.e00300.sum()
assert getattr(rec, 'data_year') == syr
assert getattr(rec, 'current_year') == syr + 1
sum_e00300_in_syr_plus_one = getattr(rec, 'e00300').sum()
assert np.allclose([sum_e00300_in_syr], [sum_e00300_in_syr_plus_one])
del rec
# test Recs class for correct instantiation with aging of data
Expand All @@ -118,17 +120,17 @@ def _extrapolate(self, year):
rec = Recs(data=cps_subsample, start_year=syr,
gfactors=GrowFactors(), weights=wghts_df)
assert isinstance(rec, Recs)
assert np.all(rec.MARS != 0)
assert rec.data_year == syr
assert rec.current_year == syr
sum_s006_in_syr = rec.s006.sum()
sum_e00300_in_syr = rec.e00300.sum()
assert np.all(getattr(rec, 'MARS') != 0)
assert getattr(rec, 'data_year') == syr
assert getattr(rec, 'current_year') == syr
sum_s006_in_syr = getattr(rec, 's006').sum()
sum_e00300_in_syr = getattr(rec, 'e00300').sum()
rec.increment_year()
assert rec.data_year == syr
assert rec.current_year == syr + 1
sum_s006_in_syr_plus_one = rec.s006.sum()
assert getattr(rec, 'data_year') == syr
assert getattr(rec, 'current_year') == syr + 1
sum_s006_in_syr_plus_one = getattr(rec, 's006').sum()
assert sum_s006_in_syr_plus_one > sum_s006_in_syr
sum_e00300_in_syr_plus_one = rec.e00300.sum()
sum_e00300_in_syr_plus_one = getattr(rec, 'e00300').sum()
assert sum_e00300_in_syr_plus_one > sum_e00300_in_syr
# test private methods
rec._read_data(data=None)
Expand Down
12 changes: 6 additions & 6 deletions taxcalc/tests/test_records.py
Original file line number Diff line number Diff line change
Expand Up @@ -35,11 +35,11 @@ def test_correct_records_instantiation(cps_subsample):
"""Test docstring"""
rec1 = Records.cps_constructor(data=cps_subsample, gfactors=None)
assert rec1
assert np.all(rec1.MARS != 0)
assert rec1.current_year == rec1.data_year
sum_e00200_in_cps_year = rec1.e00200.sum()
assert np.all(getattr(rec1, 'MARS') != 0)
assert getattr(rec1, 'current_year') == getattr(rec1, 'data_year')
sum_e00200_in_cps_year = getattr(rec1, 'e00200').sum()
rec1.increment_year()
sum_e00200_in_cps_year_plus_one = rec1.e00200.sum()
sum_e00200_in_cps_year_plus_one = getattr(rec1, 'e00200').sum()
assert sum_e00200_in_cps_year_plus_one == sum_e00200_in_cps_year
wghts_path = os.path.join(Records.CODE_PATH, Records.CPS_WEIGHTS_FILENAME)
wghts_df = pd.read_csv(wghts_path)
Expand All @@ -52,8 +52,8 @@ def test_correct_records_instantiation(cps_subsample):
adjust_ratios=ratios_df,
exact_calculations=False)
assert rec2
assert np.all(rec2.MARS != 0)
assert rec2.current_year == rec2.data_year
assert np.all(getattr(rec2, 'MARS') != 0)
assert getattr(rec2, 'current_year') == getattr(rec2, 'data_year')a


def test_read_cps_data(cps_fullsample):
Expand Down
2 changes: 1 addition & 1 deletion taxcalc/tests/test_taxcalcio.py
Original file line number Diff line number Diff line change
Expand Up @@ -231,7 +231,7 @@ def fixture_assumpfile2():
"growdiff_response": {}
}
"""
with tempfile.NamedTemporaryFil(
with tempfile.NamedTemporaryFile(
suffix='.json', mode='a', delete=False
) as afile:
afile.write(assump2_contents)
Expand Down

0 comments on commit 94855e6

Please sign in to comment.