diff --git a/environment.yml b/environment.yml index 16bab4d..f9bc737 100644 --- a/environment.yml +++ b/environment.yml @@ -4,7 +4,7 @@ channels: - conda-forge dependencies: - python>=3.6.5 -- taxcalc>=2.4.2 +- taxcalc<2.8.0 - behresp>=0.9.0 - pandas>=0.23 - numpy>=1.13 @@ -12,7 +12,7 @@ dependencies: - ipython - pytest - dask -- bokeh +- bokeh<2.0.0 - markdown - pip - pip: diff --git a/taxcrunch/multi_cruncher.py b/taxcrunch/multi_cruncher.py index 2d8a8ed..e9130f9 100644 --- a/taxcrunch/multi_cruncher.py +++ b/taxcrunch/multi_cruncher.py @@ -157,7 +157,8 @@ def create_table(self, reform_file=None, be_sub=0, be_inc=0, be_cg=0): """ year = self.invar['FLPDYR'][0] year = int(year.item()) - recs = tc.Records(data=self.invar, start_year=year) + recs = tc.Records(data=self.invar, start_year=year, + gfactors=None, weights=None, adjust_ratios=None) if reform_file == None: pol = tc.Policy() @@ -277,7 +278,8 @@ def calc_mtr(self, reform_file): """ year = self.invar['FLPDYR'][0] year = int(year.item()) - recs_base = tc.Records(data=self.invar, start_year=year) + recs_base = tc.Records(data=self.invar, start_year=year, + gfactors=None, weights=None, adjust_ratios=None) if reform_file == None: pol = tc.Policy() else: @@ -290,7 +292,8 @@ def calc_mtr(self, reform_file): incometax_base = calc_base.array('iitax') combined_taxes_base = incometax_base + payrolltax_base - recs_marg = tc.Records(data=self.invar_marg, start_year=year) + recs_marg = tc.Records(data=self.invar_marg, start_year=year, + gfactors=None, weights=None, adjust_ratios=None) calc_marg = tc.Calculator(policy=pol, records=recs_marg) calc_marg.advance_to_year(year) calc_marg.calc_all()