taxcalc 4.3.5__py3-none-any.whl → 4.4.0__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.5'
+__version__ = '4.4.0'
 __min_python3_version__ = 10
 __max_python3_version__ = 12

taxcalc/consumption.py

@@ -20,7 +20,8 @@ class Consumption(Parameters):
 
     Parameters
     ----------
-    none
+    last_budget_year: integer
+        user-defined last parameter extrapolation year
 
     Returns
     -------
@@ -28,14 +29,13 @@ class Consumption(Parameters):
     """
 
     JSON_START_YEAR = Policy.JSON_START_YEAR
-    DEFAULT_NUM_YEARS = Policy.DEFAULT_NUM_YEARS
     DEFAULTS_FILE_NAME = 'consumption.json'
     DEFAULTS_FILE_PATH = os.path.abspath(os.path.dirname(__file__))
 
-    def __init__(self):
+    def __init__(self, last_budget_year=Policy.LAST_BUDGET_YEAR):
         super().__init__()
-        self.initialize(Consumption.JSON_START_YEAR,
-                        Consumption.DEFAULT_NUM_YEARS)
+        nyrs = Policy.number_of_years(last_budget_year)
+        self.initialize(Consumption.JSON_START_YEAR, nyrs)
 
     @staticmethod
     def read_json_update(obj):

taxcalc/growdiff.py

@@ -20,7 +20,8 @@ class GrowDiff(Parameters):
 
     Parameters
     ----------
-    none
+    last_budget_year: integer
+        user-defined last parameter extrapolation year
 
     Returns
     -------
@@ -28,14 +29,13 @@ class GrowDiff(Parameters):
     """
 
     JSON_START_YEAR = Policy.JSON_START_YEAR
-    DEFAULT_NUM_YEARS = Policy.DEFAULT_NUM_YEARS
     DEFAULTS_FILE_NAME = 'growdiff.json'
     DEFAULTS_FILE_PATH = os.path.abspath(os.path.dirname(__file__))
 
-    def __init__(self):
+    def __init__(self, last_budget_year=Policy.LAST_BUDGET_YEAR):
         super().__init__()
-        self.initialize(GrowDiff.JSON_START_YEAR,
-                        GrowDiff.DEFAULT_NUM_YEARS)
+        nyrs = Policy.number_of_years(last_budget_year)
+        self.initialize(GrowDiff.JSON_START_YEAR, nyrs)
 
     @staticmethod
     def read_json_update(obj, topkey):
@@ -81,8 +81,3 @@ class GrowDiff(Parameters):
                 cyr = i + self.start_year
                 diff_array = getattr(self, _gfvn)
                 growfactors.update(gfvn, cyr, diff_array[i])
-
-    def set_rates(self):
-        """
-        Unimplemented base class method that is not used here.
-        """

taxcalc/parameters.py

@@ -98,19 +98,16 @@ class Parameters(pt.Parameters):
                 self.DEFAULTS_FILE_PATH,
                 self.DEFAULTS_FILE_NAME
             )
-
+        last_budget_year = start_year + num_years - 1
         if last_known_year is None:
             self._last_known_year = start_year
         else:
             assert last_known_year >= start_year
-            assert last_known_year <= self.LAST_BUDGET_YEAR
+            assert last_known_year <= last_budget_year
             self._last_known_year = last_known_year
-
         self._removed_params = removed or self.REMOVED_PARAMS
         self._redefined_params = redefined or self.REDEFINED_PARAMS
-
         self._wage_indexed = wage_indexed or self.WAGE_INDEXED_PARAMS
-
         if (
             (start_year or self.JSON_START_YEAR) and
             "initial_state" not in kwargs
@@ -118,6 +115,10 @@ class Parameters(pt.Parameters):
             kwargs["initial_state"] = {
                 "year": start_year or self.JSON_START_YEAR
             }
+        # update defaults to correspond to user-defined parameter years
+        self.defaults = super().get_defaults()
+        label = self.defaults["schema"]["labels"]["year"]
+        label["validators"]["range"]["max"] = last_budget_year
         super().__init__(**kwargs)
 
     def adjust(
@@ -774,7 +775,7 @@ class Parameters(pt.Parameters):
                 attr[1:], year=list(range(self.start_year, self.end_year + 1))
             )
         else:
-            raise AttributeError(f"{attr} not definied.")
+            raise AttributeError(f"{attr} is not defined.")
 
 
 TaxcalcReform = Union[str, Mapping[int, Any]]

taxcalc/policy.py

@@ -24,6 +24,9 @@ class Policy(Parameters):
     gfactors: GrowFactors class instance
         containing price inflation rates and wage growth rates
 
+    last_budget_year: integer
+        user-defined last parameter extrapolation year
+
     Raises
     ------
     ValueError:
@@ -39,9 +42,16 @@ class Policy(Parameters):
     JSON_START_YEAR = 2013  # remains the same unless earlier data added
     LAST_KNOWN_YEAR = 2025  # 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
+    LAST_BUDGET_YEAR = 2034  # default value of last extrapolation year
     # should increase LAST_BUDGET_YEAR by one every calendar year
-    DEFAULT_NUM_YEARS = LAST_BUDGET_YEAR - JSON_START_YEAR + 1
+
+    @staticmethod
+    def number_of_years(last_budget_year=LAST_BUDGET_YEAR):
+        """
+        Static method returns number of policy parameters years given
+        user-defined last_budget_year.
+        """
+        return last_budget_year - Policy.JSON_START_YEAR + 1
 
     # NOTE: the following three data structures use internal parameter names:
     # (1) specify which Policy parameters have been removed or renamed
@@ -80,7 +90,10 @@ 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, **kwargs):
+    def __init__(self,
+                 gfactors=None,
+                 last_budget_year=LAST_BUDGET_YEAR,
+                 **kwargs):
         # put JSON contents of DEFAULTS_FILE_NAME into self._vals dictionary
         super().__init__()
         # handle gfactors argument
@@ -92,7 +105,7 @@ class Policy(Parameters):
             raise ValueError('gfactors is not None or a GrowFactors instance')
         # read default parameters and initialize
         syr = Policy.JSON_START_YEAR
-        nyrs = Policy.DEFAULT_NUM_YEARS
+        nyrs = Policy.number_of_years(last_budget_year)
         self._inflation_rates = None
         self._wage_growth_rates = None
         self.initialize(syr, nyrs, Policy.LAST_KNOWN_YEAR,
@@ -101,7 +114,10 @@ class Policy(Parameters):
                         Policy.WAGE_INDEXED_PARAMS, **kwargs)
 
     @staticmethod
-    def tmd_constructor(growfactors: Path | GrowFactors):  # pragma: no cover
+    def tmd_constructor(
+            growfactors: Path | GrowFactors,
+            last_budget_year=LAST_BUDGET_YEAR,
+    ):  # pragma: no cover
         """
         Static method returns a Policy object instantiated with TMD
         input data.  This convenience method works in a analogous way
@@ -112,7 +128,7 @@ class Policy(Parameters):
             growfactors = GrowFactors(growfactors_filename=str(growfactors))
         else:
             assert isinstance(growfactors, GrowFactors)
-        return Policy(gfactors=growfactors)
+        return Policy(gfactors=growfactors, last_budget_year=last_budget_year)
 
     @staticmethod
     def read_json_reform(obj):

taxcalc/reforms/ext.json

@@ -1,5 +1,5 @@
 // REFORM TO EXTEND TEMPORARY TCJA PROVISIONS BEYOND 2025
-// USING TAX-CALCULATOR 4.3.5
+// USING TAX-CALCULATOR 4.4.0
 // WITH 2025-to-2026 INDEXING FACTOR = 1.024900
 //  AND 2028-to-2029 INDEXING FACTOR = 1.021800
 {

taxcalc/taxcalcio.py

@@ -249,6 +249,35 @@ class TaxCalcIO():
         # pylint: disable=too-many-arguments,too-many-locals
         # pylint: disable=too-many-statements,too-many-branches
         self.errmsg = ''
+        # instantiate base and reform GrowFactors objects
+        if self.tmd_input_data:
+            gfactors_base = GrowFactors(self.tmd_gfactor)  # pragma: no cover
+            gfactors_ref = GrowFactors(self.tmd_gfactor)  # pragma: no cover
+        else:
+            gfactors_base = GrowFactors()
+            gfactors_ref = GrowFactors()
+        # check tax_year validity
+        max_tax_year = gfactors_base.last_year
+        if tax_year > max_tax_year:
+            msg = f'TAXYEAR={tax_year} is greater than {max_tax_year}'
+            self.errmsg += f'ERROR: {msg}\n'
+        if self.puf_input_data:
+            min_tax_year = max(  # pragma: no cover
+                Policy.JSON_START_YEAR, Records.PUFCSV_YEAR)
+        elif self.cps_input_data:
+            min_tax_year = max(
+                Policy.JSON_START_YEAR, Records.CPSCSV_YEAR)
+        elif self.tmd_input_data:
+            min_tax_year = max(  # pragma: no cover
+                Policy.JSON_START_YEAR, Records.TMDCSV_YEAR)
+        else:
+            min_tax_year = Policy.JSON_START_YEAR
+        if tax_year < min_tax_year:
+            msg = f'TAXYEAR={tax_year} is less than {min_tax_year}'
+            self.errmsg += f'ERROR: {msg}\n'
+        # tax_year out of valid range means cannot proceed with calculations
+        if self.errmsg:
+            return
         # get policy parameter dictionary from --baseline file
         basedict = Calculator.read_json_param_objects(baseline, None)
         # get assumption sub-dictionaries
@@ -264,35 +293,29 @@ class TaxCalcIO():
         # remember parameters for reform documentation
         self.param_dict = paramdict
         self.policy_dicts = policydicts
+        # set last_b_year
+        last_b_year = max(tax_year, Policy.LAST_BUDGET_YEAR)
         # create gdiff_baseline object
-        gdiff_baseline = GrowDiff()
+        gdiff_baseline = GrowDiff(last_budget_year=last_b_year)
         try:
             gdiff_baseline.update_growdiff(paramdict['growdiff_baseline'])
         except paramtools.ValidationError as valerr_msg:
             self.errmsg += valerr_msg.__str__()
-        # create GrowFactors base object that incorporates gdiff_baseline
-        if self.tmd_input_data:
-            gfactors_base = GrowFactors(self.tmd_gfactor)  # pragma: no cover
-        else:
-            gfactors_base = GrowFactors()
+        # apply gdiff_baseline to gfactor_base
         gdiff_baseline.apply_to(gfactors_base)
         # specify gdiff_response object
-        gdiff_response = GrowDiff()
+        gdiff_response = GrowDiff(last_budget_year=last_b_year)
         try:
             gdiff_response.update_growdiff(paramdict['growdiff_response'])
         except paramtools.ValidationError as valerr_msg:
             self.errmsg += valerr_msg.__str__()
-        # create GrowFactors ref object that has all gdiff objects applied
-        if self.tmd_input_data:
-            gfactors_ref = GrowFactors(self.tmd_gfactor)  # pragma: no cover
-        else:
-            gfactors_ref = GrowFactors()
+        # apply gdiff_baseline and gdiff_response to gfactor_ref
         gdiff_baseline.apply_to(gfactors_ref)
         gdiff_response.apply_to(gfactors_ref)
         self.gf_reform = copy.deepcopy(gfactors_ref)
         # create Policy objects:
         # ... the baseline Policy object
-        base = Policy(gfactors=gfactors_base)
+        base = Policy(gfactors=gfactors_base, last_budget_year=last_b_year)
         try:
             base.implement_reform(basedict['policy'],
                                   print_warnings=True,
@@ -303,7 +326,7 @@ class TaxCalcIO():
             self.errmsg += valerr_msg.__str__()
         # ... the reform Policy object
         if self.specified_reform:
-            pol = Policy(gfactors=gfactors_ref)
+            pol = Policy(gfactors=gfactors_ref, last_budget_year=last_b_year)
             for poldict in policydicts:
                 try:
                     pol.implement_reform(poldict,
@@ -316,22 +339,13 @@ class TaxCalcIO():
                 except paramtools.ValidationError as valerr_msg:
                     self.errmsg += valerr_msg.__str__()
         else:
-            pol = Policy(gfactors=gfactors_base)
+            pol = Policy(gfactors=gfactors_base, last_budget_year=last_b_year)
         # create Consumption object
-        con = Consumption()
+        con = Consumption(last_budget_year=last_b_year)
         try:
             con.update_consumption(paramdict['consumption'])
         except paramtools.ValidationError as valerr_msg:
             self.errmsg += valerr_msg.__str__()
-        # check for valid tax_year value
-        if tax_year < pol.start_year:
-            msg = 'tax_year {} less than policy.start_year {}'
-            msg = msg.format(tax_year, pol.start_year)
-            self.errmsg += 'ERROR: {}\n'.format(msg)
-        if tax_year > pol.end_year:
-            msg = 'tax_year {} greater than policy.end_year {}'
-            msg = msg.format(tax_year, pol.end_year)
-            self.errmsg += 'ERROR: {}\n'.format(msg)
         # any errors imply cannot proceed with calculations
         if self.errmsg:
             return
@@ -388,10 +402,6 @@ class TaxCalcIO():
                            adjust_ratios=None,
                            exact_calculations=exact_calculations)
             recs_base = copy.deepcopy(recs)
-        if tax_year < recs.data_year:
-            msg = 'tax_year {} less than records.data_year {}'
-            msg = msg.format(tax_year, recs.data_year)
-            self.errmsg += 'ERROR: {}\n'.format(msg)
         # create Calculator objects
         self.calc = Calculator(policy=pol, records=recs,
                                verbose=True,

taxcalc/tests/test_4package.py

@@ -10,6 +10,34 @@ import re
 import subprocess
 import yaml
 import pytest
+import ast
+
+
+def extract_install_requires(setup_py_content):
+    """
+    Extract the install_requires list from a setup.py file content.
+
+    Args:
+        setup_py_content (str): The full content of the setup.py file
+
+    Returns:
+        list: A list of package requirements
+    """
+    # Use regex to find the install_requires list
+    match = re.search(r'"install_requires"\s*:\s*\[([^\]]+)\]', setup_py_content, re.DOTALL)
+
+    if match:
+        # Extract the contents of the list and split into packages
+        packages_str = match.group(1)
+        # Use ast.literal_eval to safely parse the string representations
+        packages = [
+            ast.literal_eval(f'{pkg.strip()}')
+            for pkg in packages_str.split(',')
+            if pkg.strip()
+        ]
+        return packages
+
+    return []
 
 
 @pytest.mark.local
@@ -38,6 +66,7 @@ def test_for_consistency(tests_path):
         'coverage',
         "pip",
         "jupyter-book",
+        "setuptools"
     ])
     # read conda.recipe/meta.yaml requirements
     meta_file = os.path.join(tests_path, '..', '..',
@@ -65,3 +94,16 @@ def test_for_consistency(tests_path):
     # confirm that extras in env (relative to run) equal the dev_pkgs set
     extras = env - run
     assert extras == dev_pkgs
+    # Read the setup.py file and extract the install_requires list
+    setup_file = os.path.join(tests_path, '..', '..',
+                              'setup.py')
+    with open(setup_file, 'r') as f:
+        setup_py_content = f.read()
+    setup = set(extract_install_requires(setup_py_content))
+    # confirm that setup.py
+    print("Setup packages = ", setup)
+    print("Meta packages = ", bld)
+    # if package in both, confirm that the version is the same
+    for pkg in setup.intersection(bld):
+        assert pkg in setup
+        assert pkg in bld

taxcalc/tests/test_calculator.py

@@ -74,9 +74,9 @@ def test_make_calculator_with_policy_reform(cps_subsample):
     assert calc.current_year == year
     assert calc.policy_param('II_em') == 4000
     assert np.allclose(calc.policy_param('_II_em'),
-                       np.array([4000] * Policy.DEFAULT_NUM_YEARS))
+                       np.array([4000] * pol.num_years))
     exp_STD_Aged = [[1600, 1300, 1300,
-                     1600, 1600]] * Policy.DEFAULT_NUM_YEARS
+                     1600, 1600]] * pol.num_years
     assert np.allclose(calc.policy_param('_STD_Aged'),
                        np.array(exp_STD_Aged))
     assert np.allclose(calc.policy_param('STD_Aged'),
@@ -100,10 +100,9 @@ def test_make_calculator_with_multiyear_reform(cps_subsample):
     # create a Calculator object using this policy-reform
     calc = Calculator(policy=pol, records=rec)
     # check that Policy object embedded in Calculator object is correct
-    assert pol.num_years == Policy.DEFAULT_NUM_YEARS
     assert calc.current_year == year
     assert calc.policy_param('II_em') == 3950
-    exp_II_em = [3900, 3950, 5000] + [6000] * (Policy.DEFAULT_NUM_YEARS - 3)
+    exp_II_em = [3900, 3950, 5000] + [6000] * (pol.num_years - 3)
     assert np.allclose(calc.policy_param('_II_em'),
                        np.array(exp_II_em))
     calc.increment_year()

taxcalc/tests/test_consumption.py

@@ -8,9 +8,8 @@ import copy
 from taxcalc import Policy, Records, Calculator, Consumption
 
 
-def test_year_consistency():
+def test_start_year_consistency():
     assert Consumption.JSON_START_YEAR == Policy.JSON_START_YEAR
-    assert Consumption.DEFAULT_NUM_YEARS == Policy.DEFAULT_NUM_YEARS
 
 
 def test_validity_of_consumption_vars_set():
@@ -31,23 +30,23 @@ def test_update_consumption():
                             2015: 0.80}
     }
     consump.update_consumption(revision)
-    expected_mpc_e20400 = np.full((Consumption.DEFAULT_NUM_YEARS,), 0.06)
+    expected_mpc_e20400 = np.full((consump.num_years,), 0.06)
     expected_mpc_e20400[0] = 0.0
     expected_mpc_e20400[1] = 0.05
     assert np.allclose(consump._MPC_e20400,
                        expected_mpc_e20400,
                        rtol=0.0)
     assert np.allclose(consump._MPC_e17500,
-                       np.zeros((Consumption.DEFAULT_NUM_YEARS,)),
+                       np.zeros((consump.num_years,)),
                        rtol=0.0)
-    expected_ben_mcare_value = np.full((Consumption.DEFAULT_NUM_YEARS,), 0.80)
+    expected_ben_mcare_value = np.full((consump.num_years,), 0.80)
     expected_ben_mcare_value[0] = 1.0
     expected_ben_mcare_value[1] = 0.75
     assert np.allclose(consump._BEN_mcare_value,
                        expected_ben_mcare_value,
                        rtol=0.0)
     assert np.allclose(consump._BEN_snap_value,
-                       np.ones((Consumption.DEFAULT_NUM_YEARS,)),
+                       np.ones((consump.num_years,)),
                        rtol=0.0)
     consump.set_year(2015)
     assert consump.current_year == 2015

taxcalc/tests/test_cpscsv.py

@@ -18,7 +18,7 @@ import pytest
 import numpy as np
 import pandas as pd
 # pylint: disable=import-error
-from taxcalc import Policy, Records, Calculator
+from taxcalc import GrowFactors, GrowDiff, Policy, Records, Calculator
 
 
 START_YEAR = 2017
@@ -161,3 +161,51 @@ def nonsmall_diffs(linelist1, linelist2, small=0.0):
                 else:
                     return True
         return False
+
+
+def test_flexible_last_budget_year(cps_fullsample):
+    """
+    Test flexible LAST_BUDGET_YEAR logic using cps.csv file.
+    """
+    tax_calc_year = Policy.LAST_BUDGET_YEAR - 1
+    growdiff_year = tax_calc_year - 1
+    growdiff_dict = {'AWAGE': {growdiff_year: 0.01, tax_calc_year: 0.0}}
+
+    def default_calculator(growdiff_dictionary):
+        """
+        Return CPS-based Calculator object using default LAST_BUDGET_YEAR.
+        """
+        g_factors = GrowFactors()
+        gdiff = GrowDiff()
+        gdiff.update_growdiff(growdiff_dictionary)
+        gdiff.apply_to(g_factors)
+        pol = Policy(gfactors=g_factors)
+        rec = Records.cps_constructor(data=cps_fullsample, gfactors=g_factors)
+        calc = Calculator(policy=pol, records=rec)
+        return calc
+
+    def flexible_calculator(growdiff_dictionary, last_b_year):
+        """
+        Return CPS-based Calculator object using custom LAST_BUDGET_YEAR.
+        """
+        g_factors = GrowFactors()
+        gdiff = GrowDiff(last_budget_year=last_b_year)
+        gdiff.update_growdiff(growdiff_dictionary)
+        gdiff.apply_to(g_factors)
+        pol = Policy(gfactors=g_factors, last_budget_year=last_b_year)
+        rec = Records.cps_constructor(data=cps_fullsample, gfactors=g_factors)
+        calc = Calculator(policy=pol, records=rec)
+        return calc
+
+    # begin main test logic
+    cdef = default_calculator(growdiff_dict)
+    cdef.advance_to_year(tax_calc_year)
+    cdef.calc_all()
+    iitax_def = round(cdef.weighted_total('iitax'))
+
+    cflx = flexible_calculator(growdiff_dict, tax_calc_year)
+    cflx.advance_to_year(tax_calc_year)
+    cflx.calc_all()
+    iitax_flx = round(cflx.weighted_total('iitax'))
+
+    assert np.allclose([iitax_flx], [iitax_def])

taxcalc/tests/test_growdiff.py

@@ -8,9 +8,8 @@ import pytest
 from taxcalc import GrowDiff, GrowFactors, Policy
 
 
-def test_year_consistency():
+def test_start_year_consistency():
     assert GrowDiff.JSON_START_YEAR == Policy.JSON_START_YEAR
-    assert GrowDiff.DEFAULT_NUM_YEARS == Policy.DEFAULT_NUM_YEARS
 
 
 def test_update_and_apply_growdiff():
@@ -22,14 +21,13 @@ def test_update_and_apply_growdiff():
     }
     gdiff.update_growdiff(diffs)
     expected_wage_diffs = [0.00, 0.01, 0.01, 0.02, 0.02]
-    extra_years = GrowDiff.DEFAULT_NUM_YEARS - len(expected_wage_diffs)
+    extra_years = gdiff.num_years - len(expected_wage_diffs)
     expected_wage_diffs.extend([0.02] * extra_years)
     assert np.allclose(gdiff._AWAGE, expected_wage_diffs, atol=0.0, rtol=0.0)
     # apply growdiff to GrowFactors instance
     gf = GrowFactors()
-    syr = GrowDiff.JSON_START_YEAR
-    nyrs = GrowDiff.DEFAULT_NUM_YEARS
-    lyr = syr + nyrs - 1
+    syr = gdiff.start_year
+    lyr = gdiff.end_year
     pir_pre = gf.price_inflation_rates(syr, lyr)
     wgr_pre = gf.wage_growth_rates(syr, lyr)
     gfactors = GrowFactors()
@@ -37,7 +35,7 @@ def test_update_and_apply_growdiff():
     pir_pst = gfactors.price_inflation_rates(syr, lyr)
     wgr_pst = gfactors.wage_growth_rates(syr, lyr)
     expected_wgr_pst = [wgr_pre[i] + expected_wage_diffs[i]
-                        for i in range(0, nyrs)]
+                        for i in range(0, gdiff.num_years)]
     assert np.allclose(pir_pre, pir_pst, atol=0.0, rtol=0.0)
     assert np.allclose(wgr_pst, expected_wgr_pst, atol=1.0e-9, rtol=0.0)
 

taxcalc/tests/test_policy.py

@@ -247,9 +247,9 @@ def test_multi_year_reform():
     Test multi-year reform involving 1D and 2D parameters.
     """
     # specify dimensions of policy Policy object
-    syr = Policy.JSON_START_YEAR
-    nyrs = Policy.DEFAULT_NUM_YEARS
     pol = Policy()
+    syr = pol.start_year
+    nyrs = pol.num_years
     iratelist = pol.inflation_rates()
     ifactor = {}
     for i in range(0, nyrs):

{taxcalc-4.3.5.dist-info → taxcalc-4.4.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: taxcalc
-Version: 4.3.5
+Version: 4.4.0
 Summary: taxcalc
 Home-page: https://github.com/PSLmodels/Tax-Calculator
 Download-URL: https://github.com/PSLmodels/Tax-Calculator
@@ -18,13 +18,11 @@ Classifier: Programming Language :: Python :: 3.12
 Classifier: Topic :: Software Development :: Libraries :: Python Modules
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: setuptools
-Requires-Dist: numpy
-Requires-Dist: pandas
-Requires-Dist: bokeh
+Requires-Dist: numpy>=1.26
+Requires-Dist: pandas>=2.2
+Requires-Dist: bokeh>=2.4
 Requires-Dist: numba
-Requires-Dist: requests
-Requires-Dist: paramtools>=0.18.3
+Requires-Dist: paramtools>=0.19.0
 
 | | |
 | --- | --- |

{taxcalc-4.3.5.dist-info → taxcalc-4.4.0.dist-info}/RECORD

@@ -1,25 +1,25 @@
-taxcalc/__init__.py,sha256=-Qv6D66ofmfwQXpruyil0TsiELQv8463_65PVqxlWaU,536
+taxcalc/__init__.py,sha256=_y68pxnYle7BTdgF5NC4QW7aILRcv_R5AaCpXZ4-hjQ,536
 taxcalc/calcfunctions.py,sha256=VHQ3YgpyhkDIVclM_sR-fRoUJc8afYGjnzfVVx4mDEg,146595
 taxcalc/calculator.py,sha256=sl2YYR2QH9bEo7cQGhvpTIku1XUt7XdK9krBI8k6Rj8,63908
 taxcalc/conftest.py,sha256=nO4J7qu1sTHgjqrzhpRMvfMJUrNm6GP_IsSuuDt_MeQ,141
 taxcalc/consumption.json,sha256=D4Iz625yka_LSlq313hoy01qGtNrpN5QYAHqd9QQfVA,8102
-taxcalc/consumption.py,sha256=IS-pB2I0JW3pdXB0vHvqA14AVnkP-TDNYFMx8MmQYIg,3327
+taxcalc/consumption.py,sha256=oY6LifwGFkdEUCCLHrxXB2kTAGz1ymmw9r6mgm40cEw,3403
 taxcalc/cps.csv.gz,sha256=SS6tSduU_Eu0EJwzpslnmqMsQQQucVMzzITfH-SeV40,9851074
 taxcalc/cps_weights.csv.gz,sha256=qPkZmVpmVPiRgnTm22VzcfNFAVigcgKVqfm6vjJWR4s,13024268
 taxcalc/data.py,sha256=KnVxSbYUF-wn_ZKCo1EHOLOVVK6ldis8vL_EB8oSR2c,11723
 taxcalc/decorators.py,sha256=uCZGHrq90k5Gr5YA_1tuWkCMEiOPbqXp6wxCWp6cDfM,11332
 taxcalc/growdiff.json,sha256=im6mp7NZfpROismsNTjwLLAwIEltZsFfV6EKFEG3dKo,15037
-taxcalc/growdiff.py,sha256=lW0tvVh2WtOOznf1AdAyDzvB-WLb8sgyogCbAOUqXw0,2905
+taxcalc/growdiff.py,sha256=CaOhGwCihGtvesjkb0PDU98bnhdNult3XE5n5L4Ua8U,2871
 taxcalc/growfactors.csv,sha256=yAnRpyqckjbUDKYj0e6is_pL_3H0AVtH4-jf8yxlpI0,4681
 taxcalc/growfactors.py,sha256=MNb2XbAV_RbJDjbZp7iMvC6dHabAe97wdbXWEqdAmaQ,6534
-taxcalc/parameters.py,sha256=NTJeI6g_LDY0Q1q_paPpsumv4JuefyIJDp55l9uqyp0,31203
-taxcalc/policy.py,sha256=HfSlaHsEwFtMl10p9jvepKoBZtMTofHj-NajrpxrKt0,6559
+taxcalc/parameters.py,sha256=2U8Pc78qkgViCRAVrmyDJ3EsvAIwxNUgOzkNDJqrKYs,31490
+taxcalc/policy.py,sha256=tbQVJoKHb4CCWmgaHHFS6CU_Aiy3MsZkF-fFpY_Ws8w,7075
 taxcalc/policy_current_law.json,sha256=X_Q_gm58mZJRVBm9ABe91IUx7ajpJecZmA5jdq4iDXY,690298
 taxcalc/puf_ratios.csv,sha256=htfJvGM236MyFTGBHioy_XUL7_LOoFtMlvhyESqrrPE,3439
 taxcalc/puf_weights.csv.gz,sha256=Chkk3TosWJQjTI6Idpo705By_WyNpzen8J6dR8afVTE,12967455
 taxcalc/records.py,sha256=ZLgAyzb7lITb7p8Qpj-JO7H03byeIwwn171SmQdaxWs,18208
 taxcalc/records_variables.json,sha256=SXr0Vl09MS5efy6LbdXHuBH3DcEBwIoga52tyAv_Trk,42755
-taxcalc/taxcalcio.py,sha256=hqu69PE0YneeORn-wTnMFDJbkggQ7nNJxG-UcvyhfSw,35062
+taxcalc/taxcalcio.py,sha256=cuuMtP8GUJTKUEVEhO3brm1Qpxd37qa2xrGEICdBy0U,35618
 taxcalc/utils.py,sha256=aNIEYbm37pQoayt_rXrr9iKoodoE-DH8EFL2A0rSokk,62468
 taxcalc/utilsprvt.py,sha256=iIyWp9-N3_XWjQj2jV2CWnJy7vrNlKB2_vIMwYjgbWY,1323
 taxcalc/assumptions/ASSUMPTIONS.md,sha256=cFQqWn1nScaladVaQ7xNm1jDY8CsGdLmqZEzUZeRrb8,1917
@@ -54,7 +54,7 @@ taxcalc/reforms/Trump2017.json,sha256=DZjCJQZYe98Skyss7z_Jhj8HJld_FPZeQGxwzGgQIn
 taxcalc/reforms/Trump2017.out.csv,sha256=By1quzZONFLQGK5E76mbNNFuORZ8aCGHpD1BR5iwTS8,474
 taxcalc/reforms/cases.csv,sha256=JQ0LSnNeyl6xSgW5mimGUJMr7xwCWTOpiOpfwx2ETsg,570
 taxcalc/reforms/clp.out.csv,sha256=qSUdI0LoQFGG6h24eT-249pLEqmxmt7TvLrv1HX_y3Y,475
-taxcalc/reforms/ext.json,sha256=jgDUuo_v38MFijKuPWyf3xe1OU3v98hxJCeAMJ_lcaM,3033
+taxcalc/reforms/ext.json,sha256=9w59aWyDunGXaIXDFYPRqOAeITFDBp4DtyeS5nsWLPQ,3033
 taxcalc/reforms/growfactors_ext.csv,sha256=E0szWXtgV5jcpiyvREOz1yXw_poPIBC77bBQI1rlFxM,17733
 taxcalc/reforms/ptaxes0.json,sha256=QkvqCVkI23sF7FvTHqaUYNpEJYuHNChbKwH0mH7Otp4,1718
 taxcalc/reforms/ptaxes0.out.csv,sha256=DKGsyNWqo-ABUnjFjEGMpqqhmT2WDRGuU6sKTgH_obc,476
@@ -83,20 +83,20 @@ taxcalc/tests/pufcsv_agg_expect.csv,sha256=f7rfFW3et6ZZMLENJTuKx8y-3urx6H2JMY31z
 taxcalc/tests/pufcsv_mtr_expect.txt,sha256=xGsUfafzsZ04fFQw162ys-1Mf1CDC_PQ0QZNigS07VY,4265
 taxcalc/tests/reforms.json,sha256=vGJrvfKJ7h5iAWF-vV9NmY8Z9HP_iereiYiYNcfhBMo,19212
 taxcalc/tests/reforms_expect.csv,sha256=6m0bSH8S6ReMYdHoQC9iWYuJAof5sZ0OONVBi7zX8JE,1464
-taxcalc/tests/test_4package.py,sha256=xIZ0M9cIe9LVQ1AEgmqKfwiMTH9l4JP1d79Ky9p1mM8,2096
+taxcalc/tests/test_4package.py,sha256=Nwtv7xwoidAznt4PW2lhHtAneep4kI3Dm4dcLZV-Q0E,3484
 taxcalc/tests/test_benefits.py,sha256=cseQyLYxyjBBWJq1yLY0uXzS3FwhIM9oEP4DbZof81M,3387
 taxcalc/tests/test_calcfunctions.py,sha256=oP-tDlpnR4tkdDgPLue-shU3fWVaX-_BErEm5butDeM,31801
-taxcalc/tests/test_calculator.py,sha256=E_vQ3FOlI7XRaHLGaGszROL52tPsBEolwfnaTpQdN-A,36091
+taxcalc/tests/test_calculator.py,sha256=ZP9QAdDVlnCKAhsGCTPg7jSa4cF6FNMYVVEt1LpKGfQ,36005
 taxcalc/tests/test_compare.py,sha256=iYLxopqiKM3H1CHxAbzdi74oydkGb3vq6QgcYVr0qaI,10958
 taxcalc/tests/test_compatible_data.py,sha256=sG3REUSIL4_yO4JbX3s1pC7SWlvw1gvaswAibB5EiVY,13389
-taxcalc/tests/test_consumption.py,sha256=14EP69vsMYfLlpZ8UkpN3JSNS54Xp1KvIN5A1fO1k9g,6000
-taxcalc/tests/test_cpscsv.py,sha256=ymIIr9zo6DKXMXZsMgpR7vqaVtK2uMRK67bMjXS3WyQ,6696
+taxcalc/tests/test_consumption.py,sha256=Zn7_MYEcrIknVqhwrDPbDIAy9VLRNawwkSGRSgDprOM,5889
+taxcalc/tests/test_cpscsv.py,sha256=5r4XWhCnb8D-cii5GLVsIo_-zNWbcyy5NOz7YKJnNz8,8462
 taxcalc/tests/test_data.py,sha256=5xIH7wgT2puF29S0sf3w6kxKhdi6OUiIz0Gx8BLFmxI,4094
 taxcalc/tests/test_decorators.py,sha256=G-zmz78fZ8G6elCuRfe2KFBVOCUFNJHXnF228_FKhvk,8628
-taxcalc/tests/test_growdiff.py,sha256=3KVa0xVHr0bMtApWBCxyaAP3kSQu9_5e0lPb11CY5Ao,3388
+taxcalc/tests/test_growdiff.py,sha256=r5BV9PXGNiDflWt9PhnTNmSHITvKmAJr5TQXce5_AYA,3282
 taxcalc/tests/test_growfactors.py,sha256=8QhU7zk8An3pHUECW0pxbTmE0jzDUo3ayW5eQKKejMQ,2775
 taxcalc/tests/test_parameters.py,sha256=QtB2_Xtc0jjfDciLjGYJMsKEEqLG8ebT02auq6cMPmU,20536
-taxcalc/tests/test_policy.py,sha256=5SakpBvchBINOhHXI4jhw3WaoGdJx4HwgwEE7jP3Hig,52929
+taxcalc/tests/test_policy.py,sha256=yGtslbQ3MZhcAiEFiM1zYjTs7hcqI1_t6rRD32DG170,52910
 taxcalc/tests/test_puf_var_stats.py,sha256=wdJ6Gf3i_VhyLMqFURZdtvD1u8fepP8dsmxuM1H1GGE,7844
 taxcalc/tests/test_pufcsv.py,sha256=-1EFSlMj_0l5DtN-hUnKJI2q6-Zrq5W1kPiwW-NQIjk,16443
 taxcalc/tests/test_records.py,sha256=CmYLJOH63vlm4K96z6Q1nzb1bK_F_rPKehZ0MFKTI4o,8323
@@ -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.5.dist-info/LICENSE,sha256=m5epLdB-_NXiY7NsEDgcHP4jDtJ4vOlRf5S3Jb-jraY,1299
-taxcalc-4.3.5.dist-info/METADATA,sha256=DHSJttwTC6e_ebLdVe7WdawStjMbyRay-Klzcr0SDZo,3182
-taxcalc-4.3.5.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
-taxcalc-4.3.5.dist-info/entry_points.txt,sha256=a3ZE1piRv683p27fOLdWZvVJXESkoslTOp5iXV7uVco,50
-taxcalc-4.3.5.dist-info/top_level.txt,sha256=Wh8wTDHkA_cm4dn8IoUCviDyGgVQqwEQKPJnl8z6d4c,8
-taxcalc-4.3.5.dist-info/RECORD,,
+taxcalc-4.4.0.dist-info/LICENSE,sha256=m5epLdB-_NXiY7NsEDgcHP4jDtJ4vOlRf5S3Jb-jraY,1299
+taxcalc-4.4.0.dist-info/METADATA,sha256=_1nU08gaJWjhFpfHRAh9Jti8nIza6t6Xrs0wtz--UL8,3148
+taxcalc-4.4.0.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
+taxcalc-4.4.0.dist-info/entry_points.txt,sha256=a3ZE1piRv683p27fOLdWZvVJXESkoslTOp5iXV7uVco,50
+taxcalc-4.4.0.dist-info/top_level.txt,sha256=Wh8wTDHkA_cm4dn8IoUCviDyGgVQqwEQKPJnl8z6d4c,8
+taxcalc-4.4.0.dist-info/RECORD,,