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

taxcalc/__init__.py

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

taxcalc/calculator.py

@@ -698,7 +698,8 @@ class Calculator():
                                   self.policy_param('FICA_ss_trt_employee') +
                                   self.policy_param('FICA_mc_trt_employer') +
                                   self.policy_param('FICA_mc_trt_employee')),
-                           0.5 * (self.policy_param('FICA_mc_trt_employer') + self.policy_param('FICA_mc_trt_employee')))
+                           0.5 * (self.policy_param('FICA_mc_trt_employer') +
+                                  self.policy_param('FICA_mc_trt_employee')))
         else:
             adj = 0.0
         # compute marginal tax rates
@@ -1189,11 +1190,10 @@ class Calculator():
                 for pname in baseline.keys():
                     upda_value = getattr(updated, pname)
                     base_value = getattr(baseline, pname)
+                    is_array = isinstance(upda_value, np.ndarray)
                     if (
-                        (isinstance(upda_value, np.ndarray) and
-                         np.allclose(upda_value, base_value)) or
-                        (not isinstance(upda_value, np.ndarray) and
-                         upda_value != base_value)
+                        (is_array and not np.allclose(upda_value, base_value))
+                        or (is_array == False and upda_value != base_value)
                     ):
                         params_with_diff.append(pname)
                 if params_with_diff:
@@ -1248,7 +1248,7 @@ class Calculator():
                         else:  # if baseline is GrowDiff object
                             # each GrowDiff parameter has zero as default value
                             doc += '  baseline_value: 0.0\n'
-            del mdata_base
+                    del mdata_base
             return doc
 
         # begin main logic of reform_documentation

taxcalc/growfactors.py

@@ -38,7 +38,7 @@ class GrowFactors():
     which is for use with puf and cps data from the taxdata repository.
     """
 
-    PACKAGE_FILE_NAMES = ['growfactors.csv', 'tmd_growfactors.csv']
+    PACKAGE_FILE_NAMES = ['growfactors.csv']
     FILE_PATH = os.path.abspath(os.path.dirname(__file__))
 
     VALID_NAMES = set(['ABOOK', 'ACGNS', 'ACPIM', 'ACPIU',

taxcalc/policy.py

@@ -7,6 +7,7 @@ Tax-Calculator federal tax policy Policy class.
 
 import os
 import json
+from pathlib import Path
 import numpy as np
 from taxcalc.parameters import Parameters
 from taxcalc.growfactors import GrowFactors
@@ -80,7 +81,7 @@ class Policy(Parameters):
     # (3) specify which Policy parameters are wage (rather than price) indexed
     WAGE_INDEXED_PARAMS = ['SS_Earnings_c', 'SS_Earnings_thd']
 
-    def __init__(self, gfactors=None, only_reading_defaults=False, **kwargs):
+    def __init__(self, gfactors=None, **kwargs):
         # put JSON contents of DEFAULTS_FILE_NAME into self._vals dictionary
         super().__init__()
         # handle gfactors argument
@@ -92,7 +93,6 @@ class Policy(Parameters):
             raise ValueError('gfactors is not None or a GrowFactors instance')
         # read default parameters and initialize
         syr = Policy.JSON_START_YEAR
-        lyr = Policy.LAST_BUDGET_YEAR
         nyrs = Policy.DEFAULT_NUM_YEARS
         self._inflation_rates = None
         self._wage_growth_rates = None
@@ -101,6 +101,19 @@ class Policy(Parameters):
                         Policy.REDEFINED_PARAMS,
                         Policy.WAGE_INDEXED_PARAMS, **kwargs)
 
+    @staticmethod
+    def tmd_constructor(growfactors_path):  # pragma: no cover
+        """
+        Static method returns a Policy object instantiated with TMD
+        input data.  This convenience method works in a analogous way
+        to Policy(), which returns a Policy object instantiated with
+        non-TMD input data.
+        """
+        assert isinstance(growfactors_path, Path)
+        gf_filename = str(growfactors_path)
+        tmd_growfactors = GrowFactors(growfactors_filename=gf_filename)
+        return Policy(gfactors=tmd_growfactors)
+
     @staticmethod
     def read_json_reform(obj):
         """
@@ -129,7 +142,7 @@ class Policy(Parameters):
             Policy.DEFAULTS_FILE_PATH,
             Policy.DEFAULTS_FILE_NAME
         )
-        with open(path) as f:
+        with open(path, 'r',  encoding='utf-8') as f:
             defaults = json.loads(f.read())  # pylint: disable=protected-access
         return [k for k in defaults if k != "schema"]
 

taxcalc/reforms/ext.json

@@ -1,5 +1,5 @@
 // REFORM TO EXTEND TEMPORARY TCJA PROVISIONS BEYOND 2025
-// USING TAX-CALCULATOR 4.3.1
+// USING TAX-CALCULATOR 4.3.2
 // WITH 2025-to-2026 INDEXING FACTOR = 1.022000
 //  AND 2028-to-2029 INDEXING FACTOR = 1.019400
 {

taxcalc/tests/test_taxcalcio.py

@@ -88,7 +88,7 @@ def fixture_reformfile1():
         "II_em": { // personal exemption amount (see indexing changes below)
           "2016": 6000,
           "2018": 7500,
-          "2020": 9000},
+          "2021": 9000},
         "II_em-indexed": { // personal exemption amount indexing status
           "2016": false, // values in future years are same as this year value
           "2018": true // values in future years indexed with this year as base

{taxcalc-4.3.1.dist-info → taxcalc-4.3.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: taxcalc
-Version: 4.3.1
+Version: 4.3.2
 Summary: taxcalc
 Home-page: https://github.com/PSLmodels/Tax-Calculator
 Download-URL: https://github.com/PSLmodels/Tax-Calculator

{taxcalc-4.3.1.dist-info → taxcalc-4.3.2.dist-info}/RECORD

@@ -1,6 +1,6 @@
-taxcalc/__init__.py,sha256=OIcjp1KVj4GPxBYcT7C9VtzhA1WzzJcjtbLxoGJhyuU,536
+taxcalc/__init__.py,sha256=Le7YP1qsAQ16R7VeiMWC2bpbsC6aiPiO2-a_Ce8gyUc,536
 taxcalc/calcfunctions.py,sha256=XrEHKMnjOQQHSryk8FXbRDo5Xd8grDgrTJ1q_7DDehQ,146696
-taxcalc/calculator.py,sha256=Ybk497LXzg5RSJEiFCEQPsM0odA7MT_mutqcXWe5d8o,63694
+taxcalc/calculator.py,sha256=6MTDHhXitefwKHwzAQ_7RgPbZDpCWWHTOqWX_bjeA_A,63709
 taxcalc/conftest.py,sha256=nO4J7qu1sTHgjqrzhpRMvfMJUrNm6GP_IsSuuDt_MeQ,141
 taxcalc/consumption.json,sha256=D4Iz625yka_LSlq313hoy01qGtNrpN5QYAHqd9QQfVA,8102
 taxcalc/consumption.py,sha256=IS-pB2I0JW3pdXB0vHvqA14AVnkP-TDNYFMx8MmQYIg,3327
@@ -11,9 +11,9 @@ taxcalc/decorators.py,sha256=uCZGHrq90k5Gr5YA_1tuWkCMEiOPbqXp6wxCWp6cDfM,11332
 taxcalc/growdiff.json,sha256=im6mp7NZfpROismsNTjwLLAwIEltZsFfV6EKFEG3dKo,15037
 taxcalc/growdiff.py,sha256=lW0tvVh2WtOOznf1AdAyDzvB-WLb8sgyogCbAOUqXw0,2905
 taxcalc/growfactors.csv,sha256=OQArKySPTSweIGV9v17WrenfcQa6ABrbTpIWZUqL2Uk,12281
-taxcalc/growfactors.py,sha256=IdxR6_ELJKJJHd82-gaGcQLVEYNxJpja0bYKNpVlG7A,6557
+taxcalc/growfactors.py,sha256=MNb2XbAV_RbJDjbZp7iMvC6dHabAe97wdbXWEqdAmaQ,6534
 taxcalc/parameters.py,sha256=57RVKpx0i4J0L6lqdgykakO9ASHx9JnkI2tK7yDmvto,31175
-taxcalc/policy.py,sha256=pM_q1R7EsSodNBtUoq3maF61flk6TMnADBbuIM3WUiY,6341
+taxcalc/policy.py,sha256=65xHrz5M7OJu7k3M4Zh9WUv6hpe6Qic3c-_OkbZmnEA,6878
 taxcalc/policy_current_law.json,sha256=eARPB7EpnQgNi5GMX94krF9ZHS_AyTEJjwQljCnkc_Y,658683
 taxcalc/puf_ratios.csv,sha256=FjEj41SyyW5Fp7JTVptQGKjnu43rfl3uOc9-019bE_s,3439
 taxcalc/puf_weights.csv.gz,sha256=LouhxTQJ0ow-Yn63PjMElB5ICXO9AybLXeEt3gP5AY4,12988069
@@ -54,7 +54,7 @@ taxcalc/reforms/Trump2017.json,sha256=DZjCJQZYe98Skyss7z_Jhj8HJld_FPZeQGxwzGgQIn
 taxcalc/reforms/Trump2017.out.csv,sha256=SQTnFgXOo2QldcSYourBPiK3GsqZa3S3PHkSXQ2MAsA,474
 taxcalc/reforms/cases.csv,sha256=JQ0LSnNeyl6xSgW5mimGUJMr7xwCWTOpiOpfwx2ETsg,570
 taxcalc/reforms/clp.out.csv,sha256=5wFsG1tFqGFLVwtL_jKJVC3uzA3auB_n-IAfb7XX96s,355
-taxcalc/reforms/ext.json,sha256=syu81FAi8JyD6S3S5Mm7e3JdA6cqm7ssVhKYbTNw0mI,3025
+taxcalc/reforms/ext.json,sha256=yj1HKhLZ93cXob0yoQlLotrKFwNiAHjdpKSi7nYuA_8,3025
 taxcalc/reforms/growfactors_ext.csv,sha256=E0szWXtgV5jcpiyvREOz1yXw_poPIBC77bBQI1rlFxM,17733
 taxcalc/reforms/ptaxes0.json,sha256=QkvqCVkI23sF7FvTHqaUYNpEJYuHNChbKwH0mH7Otp4,1718
 taxcalc/reforms/ptaxes0.out.csv,sha256=kGn0h67vBzgkEiEhuYjvpspQ-KnndN9gDVVnsIe7S7w,473
@@ -102,7 +102,7 @@ taxcalc/tests/test_pufcsv.py,sha256=FuNwf9dR6sPppuBAYI8EPedMGJ5UjCitpq6eJa9EKsA,
 taxcalc/tests/test_records.py,sha256=CmYLJOH63vlm4K96z6Q1nzb1bK_F_rPKehZ0MFKTI4o,8323
 taxcalc/tests/test_reforms.py,sha256=HEG8YA_F9lmHX4j_0vWzXtTJZc6l6vt8Nu8cjEIUYDo,15855
 taxcalc/tests/test_responses.py,sha256=-t0-Yr2X8Y1e1KZ4oF6dlt4Ze5jbn8_JQalAee3KPzk,1625
-taxcalc/tests/test_taxcalcio.py,sha256=f_utdl32H8jbk1ztqnUh_WA12WpxOF4xCNON_eyycm8,24979
+taxcalc/tests/test_taxcalcio.py,sha256=-O9uhV2spiUvBN2XUS4kVOUUFCsW6Ynl6XNw4dJSCVo,24979
 taxcalc/tests/test_utils.py,sha256=sA2ozKkMRbKyCsiXdeYU5K7w2a1us1Cf5pL9a2NmYpk,29139
 taxcalc/validation/CSV_INPUT_VARS.md,sha256=MqlZZGt_a1n8JAU-nY5MjnTmjz1pMOuhtpVYIGUgl38,1433
 taxcalc/validation/CSV_OUTPUT_VARS.md,sha256=wr8oyCJDXcxl4Lu0H_wMofUQYhEIyHDif6vkbas1FGE,3000
@@ -131,9 +131,9 @@ taxcalc/validation/taxsim35/expected_differences/b21-taxdiffs-expect.csv,sha256=
 taxcalc/validation/taxsim35/expected_differences/c17-taxdiffs-expect.csv,sha256=YhgojbLowH3yujdYu7SGkdvBZmTgpugu4wYc1Be069M,1125
 taxcalc/validation/taxsim35/expected_differences/c18-taxdiffs-expect.csv,sha256=g9J4BPbTySV-h-RcLvReJq9v1jscgiRSSZzi0taEA-k,1225
 taxcalc/validation/taxsim35/expected_differences/c19-taxdiffs-expect.csv,sha256=Ceh15N_Xr3L7cpYjzGa-8NLCV3obc8PNHEhE5ZxSPhI,1238
-taxcalc-4.3.1.dist-info/LICENSE,sha256=m5epLdB-_NXiY7NsEDgcHP4jDtJ4vOlRf5S3Jb-jraY,1299
-taxcalc-4.3.1.dist-info/METADATA,sha256=PLF1A_XY2XoMrpWGo-5nu_1YNXPWTDr_HlpvIBIhN2c,3183
-taxcalc-4.3.1.dist-info/WHEEL,sha256=OVMc5UfuAQiSplgO0_WdW7vXVGAt9Hdd6qtN4HotdyA,91
-taxcalc-4.3.1.dist-info/entry_points.txt,sha256=a3ZE1piRv683p27fOLdWZvVJXESkoslTOp5iXV7uVco,50
-taxcalc-4.3.1.dist-info/top_level.txt,sha256=Wh8wTDHkA_cm4dn8IoUCviDyGgVQqwEQKPJnl8z6d4c,8
-taxcalc-4.3.1.dist-info/RECORD,,
+taxcalc-4.3.2.dist-info/LICENSE,sha256=m5epLdB-_NXiY7NsEDgcHP4jDtJ4vOlRf5S3Jb-jraY,1299
+taxcalc-4.3.2.dist-info/METADATA,sha256=hT0IPjp6gznKRBIPPev8X5eIT3CiWMEWtb893zJnnlI,3183
+taxcalc-4.3.2.dist-info/WHEEL,sha256=a7TGlA-5DaHMRrarXjVbQagU3Man_dCnGIWMJr5kRWo,91
+taxcalc-4.3.2.dist-info/entry_points.txt,sha256=a3ZE1piRv683p27fOLdWZvVJXESkoslTOp5iXV7uVco,50
+taxcalc-4.3.2.dist-info/top_level.txt,sha256=Wh8wTDHkA_cm4dn8IoUCviDyGgVQqwEQKPJnl8z6d4c,8
+taxcalc-4.3.2.dist-info/RECORD,,

{taxcalc-4.3.1.dist-info → taxcalc-4.3.2.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (75.2.0)
+Generator: setuptools (75.4.0)
 Root-Is-Purelib: true
 Tag: py3-none-any