taxcalc 4.2.2__py3-none-any.whl → 4.3.1__py3-none-any.whl

taxcalc/__init__.py

@@ -14,4 +14,6 @@ from taxcalc.taxcalcio import *
 from taxcalc.utils import *
 from taxcalc.cli import *
 
-__version__ = '4.2.2'
+__version__ = '4.3.1'
+__min_python3_version__ = 10
+__max_python3_version__ = 12

taxcalc/calcfunctions.py

@@ -1217,7 +1217,7 @@ def TaxInc(c00100, standard, c04470, c04600, MARS, e00900, c03260, e26270,
            PT_binc_w2_wages, PT_ubia_property, PT_qbid_rt,
            PT_qbid_taxinc_thd, PT_qbid_taxinc_gap, PT_qbid_w2_wages_rt,
            PT_qbid_alt_w2_wages_rt, PT_qbid_alt_property_rt, c04800,
-           PT_qbid_ps, PT_qbid_prt, qbided, PT_qbid_limit_switch):
+           PT_qbid_ps, PT_qbid_prt, qbided):
     """
     Calculates taxable income, c04800, and
     qualified business income deduction, qbided.
@@ -1275,8 +1275,6 @@ def TaxInc(c00100, standard, c04470, c04600, MARS, e00900, c03260, e26270,
         QBID phaseout rate
     qbided: float
         Qualified Business Income (QBI) deduction
-    PT_qbid_limit_switch: bool
-        QBID wage and capital limitations switch
 
     Returns
     -------
@@ -1300,9 +1298,7 @@ def TaxInc(c00100, standard, c04470, c04600, MARS, e00900, c03260, e26270,
             upper_thd = lower_thd + pre_qbid_taxinc_gap
             if PT_SSTB_income == 1 and pre_qbid_taxinc >= upper_thd:
                 qbided = 0.
-            # if PT_qbid_limit_switch is True, apply wage/capital
-            # limitations.
-            elif PT_qbid_limit_switch:
+            else:
                 wage_cap = PT_binc_w2_wages * PT_qbid_w2_wages_rt
                 alt_cap = (PT_binc_w2_wages * PT_qbid_alt_w2_wages_rt +
                            PT_ubia_property * PT_qbid_alt_property_rt)
@@ -1323,12 +1319,8 @@ def TaxInc(c00100, standard, c04470, c04600, MARS, e00900, c03260, e26270,
                     prt = (pre_qbid_taxinc - lower_thd) / pre_qbid_taxinc_gap
                     adj = prt * (qbid_adjusted - cap_adjusted)
                     qbided = qbid_adjusted - adj
-            # if PT_qbid_limit_switch is False, assume all taxpayers
-            # have sufficient wage expenses and capital income to avoid
-            # QBID limitations.
-            else:
-                qbided = qbid_before_limits
-        # apply taxinc cap (assuning cap rate is equal to PT_qbid_rt)
+
+        # apply taxinc cap (assuming cap rate is equal to PT_qbid_rt)
         net_cg = e00650 + c01000  # per line 34 in 2018 Pub 535 Worksheet 12-A
         taxinc_cap = PT_qbid_rt * max(0., pre_qbid_taxinc - net_cg)
         qbided = min(qbided, taxinc_cap)

taxcalc/cli/tc.py

@@ -138,11 +138,23 @@ def cli_tc_main():
                         default=False,
                         action="store_true")
     args = parser.parse_args()
-    # show Tax-Calculator version and quit if --version option specified
+    # check Python version
+    pyv = sys.version_info
+    pymin = tc.__min_python3_version__
+    pymax = tc.__max_python3_version__
+    if pyv[0] != 3 or pyv[1] < pymin or pyv[1] > pymax:  # pragma: no cover
+        pyreq = f'at least Python 3.{pymin} and at most Python 3.{pymax}'
+        sys.stderr.write(
+            f'ERROR: Tax-Calculator requires {pyreq}\n'
+            f'       but Python {pyv[0]}.{pyv[1]} is installed\n'
+        )
+        return 1
+    # show Tax-Calculator version and quit if --version option is specified
     if args.version:
-        sys.stdout.write('Tax-Calculator {}\n'.format(tc.__version__))
+        pyver = f'Python 3.{pyv[1]}'
+        sys.stdout.write(f'Tax-Calculator {tc.__version__} on {pyver}\n')
         return 0
-    # write test input and expected output files if --test option specified
+    # write test input and expected output files if --test option is specified
     if args.test:
         _write_expected_test_output()
         inputfn = TEST_INPUT_FILENAME
@@ -181,7 +193,7 @@ def cli_tc_main():
     dumpvar_set = None
     if args.dvars and (args.dump or args.sqldb):
         if os.path.exists(args.dvars):
-            with open(args.dvars) as dfile:
+            with open(args.dvars, 'r', encoding='utf-8') as dfile:
                 dump_vars_str = dfile.read()
             dumpvar_set = tcio.custom_dump_variables(dump_vars_str)
             if tcio.errmsg:
@@ -213,8 +225,8 @@ def cli_tc_main():
 # end of cli_tc_main function code
 
 
-EXPECTED_TEST_OUTPUT_FILENAME = 'test-{}-out.csv'.format(str(TEST_TAXYEAR)[2:])
-ACTUAL_TEST_OUTPUT_FILENAME = 'test-{}-#-#-#.csv'.format(str(TEST_TAXYEAR)[2:])
+EXPECTED_TEST_OUTPUT_FILENAME = f'test-{str(TEST_TAXYEAR)[2:]}-out.csv'
+ACTUAL_TEST_OUTPUT_FILENAME = f'test-{str(TEST_TAXYEAR)[2:]}-#-#-#.csv'
 
 
 def _write_expected_test_output():
@@ -226,14 +238,14 @@ def _write_expected_test_output():
         '1,       2,   3,  1, 40000,  40000,      0,     0,  3000,  4000\n'
         '2,       2,   3,  1,200000, 200000,      0,     0, 15000, 20000\n'
     )
-    with open(TEST_INPUT_FILENAME, 'w') as ifile:
+    with open(TEST_INPUT_FILENAME, 'w', encoding='utf-8') as ifile:
         ifile.write(input_data)
     expected_output_data = (
         'RECID,YEAR,WEIGHT,INCTAX,LSTAX,PAYTAX\n'
         '1,2018,0.00,131.88,0.00,6120.00\n'
         '2,2018,0.00,28879.00,0.00,21721.60\n'
     )
-    with open(EXPECTED_TEST_OUTPUT_FILENAME, 'w') as ofile:
+    with open(EXPECTED_TEST_OUTPUT_FILENAME, 'w', encoding='utf-8') as ofile:
         ofile.write(expected_output_data)
 
 
@@ -242,8 +254,12 @@ def _compare_test_output_files():
     Private function that compares expected and actual tc --test output files;
     returns 0 if pass test, otherwise returns 1.
     """
-    explines = open(EXPECTED_TEST_OUTPUT_FILENAME, 'r').readlines()
-    actlines = open(ACTUAL_TEST_OUTPUT_FILENAME, 'r').readlines()
+    explines = open(
+        EXPECTED_TEST_OUTPUT_FILENAME, 'r', encoding='utf-8'
+    ).readlines()
+    actlines = open(
+        ACTUAL_TEST_OUTPUT_FILENAME, 'r', encoding='utf-8'
+    ).readlines()
     if ''.join(explines) == ''.join(actlines):
         sys.stdout.write('PASSED TEST\n')
         retcode = 0

taxcalc/data.py

@@ -42,6 +42,13 @@ class Data():
         NOTE: when using custom weights, set this argument to a DataFrame.
         NOTE: assumes weights are integers that are 100 times the real weights.
 
+    weights_scale: float
+        specifies the weights scaling factor used to convert contents
+        of weights file into the s006 variable.  PUF and CPS input data
+        generated in the taxdata repository use a weights_scale of 0.01,
+        while TMD input data generated in the tax-microdata repository
+        use a 1.0 weights_scale value.
+
     Raises
     ------
     ValueError:
@@ -66,7 +73,8 @@ class Data():
     VARINFO_FILE_NAME = None
     VARINFO_FILE_PATH = None
 
-    def __init__(self, data, start_year, gfactors=None, weights=None):
+    def __init__(self, data, start_year, gfactors=None,
+                 weights=None, weights_scale=0.01):
         # initialize data variable info sets and read variable information
         self.INTEGER_READ_VARS = set()
         self.MUST_READ_VARS = set()
@@ -97,6 +105,7 @@ class Data():
             self.gfactors = gfactors
             # read sample weights
             self.WT = None
+            self.weights_scale = weights_scale
             if self.__aging_data:
                 self._read_weights(weights)
                 # ... weights must be same size as data
@@ -114,7 +123,7 @@ class Data():
                 assert wt_colname in self.WT.columns, (
                     f'no weights for start year {self.current_year}'
                 )
-                self.s006 = self.WT[wt_colname] * 0.01
+                self.s006 = self.WT[wt_colname] * self.weights_scale
 
     @property
     def data_year(self):
@@ -152,7 +161,7 @@ class Data():
             assert wt_colname in self.WT.columns, (
                 f'no weights for new year {self.current_year}'
             )
-            self.s006 = self.WT[wt_colname] * 0.01
+            self.s006 = self.WT[wt_colname] * self.weights_scale
 
     # ----- begin private methods of Data class -----
 
@@ -260,7 +269,6 @@ class Data():
         Read sample weights from file or
         use specified DataFrame as weights or
         create empty DataFrame if None.
-        NOTE: assumes weights are integers equal to 100 times the real weight.
         """
         if weights is None:
             return
@@ -276,7 +284,7 @@ class Data():
             msg = 'weights is not None or a string or a Pandas DataFrame'
             raise ValueError(msg)
         assert isinstance(WT, pd.DataFrame)
-        setattr(self, 'WT', WT.astype(np.int32))
+        setattr(self, 'WT', WT.astype(np.float64))
         del WT
 
     def _extrapolate(self, year):

taxcalc/policy.py

@@ -37,7 +37,7 @@ class Policy(Parameters):
     DEFAULTS_FILE_NAME = 'policy_current_law.json'
     DEFAULTS_FILE_PATH = os.path.abspath(os.path.dirname(__file__))
     JSON_START_YEAR = 2013  # remains the same unless earlier data added
-    LAST_KNOWN_YEAR = 2022  # last year for which indexed param vals are known
+    LAST_KNOWN_YEAR = 2024  # last year for which indexed param vals are known
     # should increase LAST_KNOWN_YEAR by one every calendar year
     LAST_BUDGET_YEAR = 2034  # last extrapolation year
     # should increase LAST_BUDGET_YEAR by one every calendar year