Merge pull request #1228 from martinholmer/move-simtax-code

Move simtax code and test to taxcalc/validation/taxsim directory

.coveragerc

@@ -5,3 +5,4 @@ omit =
     taxcalc/_version.py
     taxcalc/functions.py
     taxcalc/*.json
+    taxcalc/validation/taxsim/*

taxcalc/__init__.py

@@ -1,18 +1,17 @@
-from .calculate import *
-from .policy import *
-from .behavior import *
-from .consumption import *
-from .filings import *
-from .growfactors import *
-from .growdiff import *
-from .records import *
-from .simpletaxio import *
-from .taxcalcio import *
-from .utils import *
-from .decorators import *
-from .macro_elasticity import *
-from .dropq import *
+from taxcalc.calculate import *
+from taxcalc.policy import *
+from taxcalc.behavior import *
+from taxcalc.consumption import *
+from taxcalc.filings import *
+from taxcalc.growfactors import *
+from taxcalc.growdiff import *
+from taxcalc.records import *
+from taxcalc.taxcalcio import *
+from taxcalc.utils import *
+from taxcalc.decorators import *
+from taxcalc.macro_elasticity import *
+from taxcalc.dropq import *
 
-from ._version import get_versions
+from taxcalc._version import get_versions
 __version__ = get_versions()['version']
 del get_versions

taxcalc/behavior.py

@@ -7,8 +7,8 @@
 
 import copy
 import numpy as np
-from .policy import Policy
-from .parameters import ParametersBase
+from taxcalc.policy import Policy
+from taxcalc.parameters import ParametersBase
 
 
 class Behavior(ParametersBase):

taxcalc/calculate.py

@@ -15,12 +15,12 @@
 import re
 import copy
 import numpy as np
-from .utils import *
-from .functions import *
-from .policy import Policy
-from .records import Records
-from .behavior import Behavior
-from .consumption import Consumption
+from taxcalc.utils import *
+from taxcalc.functions import *
+from taxcalc.policy import Policy
+from taxcalc.records import Records
+from taxcalc.behavior import Behavior
+from taxcalc.consumption import Consumption
 # import pdb
 
 

taxcalc/consumption.py

@@ -5,9 +5,9 @@
 # pep8 --ignore=E402 consumption.py
 # pylint --disable=locally-disabled consumption.py
 
-from .parameters import ParametersBase
-from .policy import Policy
-from .records import Records
+from taxcalc.parameters import ParametersBase
+from taxcalc.policy import Policy
+from taxcalc.records import Records
 
 
 class Consumption(ParametersBase):

taxcalc/decorators.py

@@ -9,7 +9,7 @@
 import inspect
 import toolz
 from six import StringIO
-from .policy import Policy
+from taxcalc.policy import Policy
 
 
 def id_wrapper(*dec_args, **dec_kwargs):  # pylint: disable=unused-argument

taxcalc/dropq/__init__.py

@@ -1,5 +1,8 @@
-from .dropq import (run_model, run_nth_year_model, check_user_mods,
-                    run_gdp_elast_model, run_nth_year_gdp_elast_model,
-                    calculate_baseline_and_reform,
-                    chooser, drop_records,
-                    format_macro_results, groupby_means_and_comparisons)
+from taxcalc.dropq.dropq import (run_model, check_user_mods,
+                                 run_nth_year_model,
+                                 run_gdp_elast_model,
+                                 run_nth_year_gdp_elast_model,
+                                 calculate_baseline_and_reform,
+                                 chooser, drop_records,
+                                 format_macro_results,
+                                 groupby_means_and_comparisons)

taxcalc/dropq/dropq.py

@@ -11,17 +11,19 @@
 import numpy as np
 from pandas import DataFrame
 import pandas as pd
-from .dropq_utils import create_dropq_difference_table as dropq_diff_table
-from .dropq_utils import create_dropq_distribution_table as dropq_dist_table
-from .dropq_utils import (WEBAPP_INCOME_BINS,
-                          add_income_bins,
-                          add_weighted_income_bins,
-                          create_distribution_table,
-                          create_json_table)
-from .. import (Calculator, Growfactors, Records,
-                Policy, Consumption, Behavior, Growdiff,
-                proportional_change_gdp,
-                TABLE_LABELS, TABLE_COLUMNS, STATS_COLUMNS)
+from taxcalc.dropq.dropq_utils import (create_dropq_difference_table as
+                                       dropq_diff_table)
+from taxcalc.dropq.dropq_utils import (create_dropq_distribution_table as
+                                       dropq_dist_table)
+from taxcalc.dropq.dropq_utils import (WEBAPP_INCOME_BINS,
+                                       add_income_bins,
+                                       add_weighted_income_bins,
+                                       create_distribution_table,
+                                       create_json_table)
+from taxcalc import (Calculator, Growfactors, Records,
+                     Policy, Consumption, Behavior, Growdiff,
+                     proportional_change_gdp,
+                     TABLE_LABELS, TABLE_COLUMNS, STATS_COLUMNS)
 
 
 # specify constants

taxcalc/filings/__init__.py

@@ -1 +1 @@
-from .forms import *
+from taxcalc.filings.forms import *

taxcalc/filings/forms/__init__.py

@@ -1,20 +1,20 @@
-from .errors import *
-from .tax_form import TaxForm
-from .us1040 import US1040
-from .us1040sa import US1040SA
-from .us1040sb import US1040SB
-from .us1040sc import US1040SC
-from .us1040sd import US1040SD
-from .us1040se import US1040SE
-from .us1040seic import US1040SEIC
-from .us1040sr import US1040SR
-from .us1040sse import US1040SSE
-from .us2441 import US2441
-from .us3800 import US3800
-from .us4137 import US4137
-from .us4255 import US4255
-from .us4952 import US4952
-from .us5695 import US5695
-from .us6251 import US6251
-from .us8801 import US8801
-from .us8863 import US8863
+from taxcalc.filings.forms.errors import *
+from taxcalc.filings.forms.tax_form import TaxForm
+from taxcalc.filings.forms.us1040 import US1040
+from taxcalc.filings.forms.us1040sa import US1040SA
+from taxcalc.filings.forms.us1040sb import US1040SB
+from taxcalc.filings.forms.us1040sc import US1040SC
+from taxcalc.filings.forms.us1040sd import US1040SD
+from taxcalc.filings.forms.us1040se import US1040SE
+from taxcalc.filings.forms.us1040seic import US1040SEIC
+from taxcalc.filings.forms.us1040sr import US1040SR
+from taxcalc.filings.forms.us1040sse import US1040SSE
+from taxcalc.filings.forms.us2441 import US2441
+from taxcalc.filings.forms.us3800 import US3800
+from taxcalc.filings.forms.us4137 import US4137
+from taxcalc.filings.forms.us4255 import US4255
+from taxcalc.filings.forms.us4952 import US4952
+from taxcalc.filings.forms.us5695 import US5695
+from taxcalc.filings.forms.us6251 import US6251
+from taxcalc.filings.forms.us8801 import US8801
+from taxcalc.filings.forms.us8863 import US8863

taxcalc/filings/forms/tax_form.py

@@ -1,6 +1,6 @@
 import six
 
-from .errors import UnsupportedFormYearError
+from taxcalc.filings.forms.errors import UnsupportedFormYearError
 from taxcalc.utils import string_to_number
 
 

taxcalc/filings/forms/us1040.py

@@ -1,4 +1,4 @@
-from .tax_form import TaxForm
+from taxcalc.filings.forms.tax_form import TaxForm
 from taxcalc.utils import string_to_number
 
 

taxcalc/filings/forms/us1040sa.py

@@ -1,4 +1,4 @@
-from .tax_form import TaxForm
+from taxcalc.filings.forms.tax_form import TaxForm
 from taxcalc.utils import string_to_number
 
 

taxcalc/filings/forms/us1040sb.py

@@ -1,4 +1,4 @@
-from .tax_form import TaxForm
+from taxcalc.filings.forms.tax_form import TaxForm
 
 
 class US1040SB(TaxForm):

taxcalc/filings/forms/us1040sc.py

@@ -1,4 +1,4 @@
-from .tax_form import TaxForm
+from taxcalc.filings.forms.tax_form import TaxForm
 
 
 class US1040SC(TaxForm):

taxcalc/filings/forms/us1040sd.py

@@ -1,4 +1,4 @@
-from .tax_form import TaxForm
+from taxcalc.filings.forms.tax_form import TaxForm
 
 
 class US1040SD(TaxForm):

taxcalc/filings/forms/us1040se.py

@@ -1,4 +1,4 @@
-from .tax_form import TaxForm
+from taxcalc.filings.forms.tax_form import TaxForm
 from taxcalc.utils import string_to_number
 
 

taxcalc/filings/forms/us1040seic.py

@@ -1,4 +1,4 @@
-from .tax_form import TaxForm
+from taxcalc.filings.forms.tax_form import TaxForm
 
 
 class US1040SEIC(TaxForm):

taxcalc/filings/forms/us1040sr.py

@@ -1,4 +1,4 @@
-from .tax_form import TaxForm
+from taxcalc.filings.forms.tax_form import TaxForm
 
 
 class US1040SR(TaxForm):

taxcalc/filings/forms/us1040sse.py

@@ -1,4 +1,4 @@
-from .tax_form import TaxForm
+from taxcalc.filings.forms.tax_form import TaxForm
 
 
 class US1040SSE(TaxForm):

taxcalc/filings/forms/us2441.py

@@ -1,4 +1,4 @@
-from .tax_form import TaxForm
+from taxcalc.filings.forms.tax_form import TaxForm
 
 
 class US2441(TaxForm):

taxcalc/filings/forms/us3800.py

@@ -1,4 +1,4 @@
-from .tax_form import TaxForm
+from taxcalc.filings.forms.tax_form import TaxForm
 
 
 class US3800(TaxForm):

taxcalc/filings/forms/us4137.py

@@ -1,4 +1,4 @@
-from .tax_form import TaxForm
+from taxcalc.filings.forms.tax_form import TaxForm
 
 
 class US4137(TaxForm):

taxcalc/filings/forms/us4255.py

@@ -1,4 +1,4 @@
-from .tax_form import TaxForm
+from taxcalc.filings.forms.tax_form import TaxForm
 
 
 class US4255(TaxForm):

taxcalc/filings/forms/us4952.py

@@ -1,4 +1,4 @@
-from .tax_form import TaxForm
+from taxcalc.filings.forms.tax_form import TaxForm
 
 
 class US4952(TaxForm):

taxcalc/filings/forms/us5695.py

@@ -1,4 +1,4 @@
-from .tax_form import TaxForm
+from taxcalc.filings.forms.tax_form import TaxForm
 
 
 class US5695(TaxForm):

taxcalc/filings/forms/us6251.py

@@ -1,4 +1,4 @@
-from .tax_form import TaxForm
+from taxcalc.filings.forms.tax_form import TaxForm
 
 
 class US6251(TaxForm):

taxcalc/filings/forms/us8801.py

@@ -1,4 +1,4 @@
-from .tax_form import TaxForm
+from taxcalc.filings.forms.tax_form import TaxForm
 
 
 class US8801(TaxForm):

taxcalc/filings/forms/us8863.py

@@ -1,4 +1,4 @@
-from .tax_form import TaxForm
+from taxcalc.filings.forms.tax_form import TaxForm
 
 
 class US8863(TaxForm):

taxcalc/functions.py

@@ -13,7 +13,7 @@
 import math
 import copy
 import numpy as np
-from .decorators import iterate_jit, jit
+from taxcalc.decorators import iterate_jit, jit
 
 
 @iterate_jit(nopython=True)

taxcalc/growdiff.py

@@ -6,8 +6,8 @@
 # pylint --disable=locally-disabled growdiff.py
 
 import numpy as np
-from .policy import Policy
-from .parameters import ParametersBase
+from taxcalc.policy import Policy
+from taxcalc.parameters import ParametersBase
 
 
 class Growdiff(ParametersBase):

taxcalc/growfactors.py

@@ -8,7 +8,7 @@
 import os
 import six
 import pandas as pd
-from .utils import read_egg_csv
+from taxcalc.utils import read_egg_csv
 
 
 class Growfactors(object):

taxcalc/policy.py

@@ -5,8 +5,8 @@
 # pep8 --ignore=E402 policy.py
 # pylint --disable=locally-disabled policy.py
 
-from .parameters import ParametersBase
-from .growfactors import Growfactors
+from taxcalc.parameters import ParametersBase
+from taxcalc.growfactors import Growfactors
 
 
 class Policy(ParametersBase):

taxcalc/records.py

@@ -9,8 +9,8 @@
 import six
 import numpy as np
 import pandas as pd
-from .growfactors import Growfactors
-from .utils import read_egg_csv
+from taxcalc.growfactors import Growfactors
+from taxcalc.utils import read_egg_csv
 
 
 PUFCSV_YEAR = 2009

taxcalc/taxcalcio.py

@@ -10,14 +10,14 @@
 import copy
 import six
 import pandas as pd
-from .policy import Policy
-from .records import Records
-from .consumption import Consumption
-from .behavior import Behavior
-from .growdiff import Growdiff
-from .growfactors import Growfactors
-from .calculate import Calculator
-from .utils import ce_aftertax_income
+from taxcalc.policy import Policy
+from taxcalc.records import Records
+from taxcalc.consumption import Consumption
+from taxcalc.behavior import Behavior
+from taxcalc.growdiff import Growdiff
+from taxcalc.growfactors import Growfactors
+from taxcalc.calculate import Calculator
+from taxcalc.utils import ce_aftertax_income
 
 
 class TaxCalcIO(object):

taxcalc/simpletaxio.py → taxcalc/validation/taxsim/simpletaxio.py

@@ -1,5 +1,5 @@
 """
-Tax-Calculator simple tax input-output class.
+Tax-Calculator simple tax input-output class used in TAXSIM validation work.
 """
 # CODING-STYLE CHECKS:
 # pep8 --ignore=E402 simpletaxio.py
@@ -10,9 +10,10 @@
 import re
 import six
 import pandas as pd
-from .policy import Policy
-from .records import Records
-from .calculate import Calculator
+CUR_PATH = os.path.abspath(os.path.dirname(__file__))
+sys.path.append(os.path.join(CUR_PATH, '..', '..', '..'))
+# pylint: disable=wrong-import-position,import-error
+from taxcalc import Policy, Records, Calculator
 
 
 class SimpleTaxIO(object):

simtax.py → taxcalc/validation/taxsim/simtax.py

@@ -7,7 +7,7 @@
 
 import argparse
 import sys
-from taxcalc import SimpleTaxIO
+from simpletaxio import SimpleTaxIO
 
 
 def main():