taxcalc 4.3.5__tar.gz → 4.4.0__tar.gz

{taxcalc-4.3.5 → taxcalc-4.4.0}/PKG-INFO

@@ -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 → taxcalc-4.4.0}/conda.recipe/meta.yaml

@@ -9,10 +9,10 @@ build:
 requirements:
   build:
     - "python>=3.10, <3.13"
-    - "numpy>=1.26,<1.27"
+    - "numpy>=1.26"
     - "pandas>=2.2"
     - "bokeh>=2.4"
-    - "paramtools>=0.18.3"
+    - "paramtools>=0.19.0"
     - numba
     - curl
     - openpyxl
@@ -20,10 +20,10 @@ requirements:
 
   run:
     - "python>=3.10, <3.13"
-    - "numpy>=1.26,<1.27"
+    - "numpy>=1.26"
     - "pandas>=2.2"
     - "bokeh>=2.4"
-    - "paramtools>=0.18.3"
+    - "paramtools>=0.19.0"
     - numba
     - curl
     - openpyxl

{taxcalc-4.3.5 → taxcalc-4.4.0}/docs/about/releases.md

@@ -4,6 +4,20 @@ Go [here](https://github.com/PSLmodels/Tax-Calculator/pulls?q=is%3Apr+is%3Aclose
 for a complete commit history.
 
 
+2024-12-19 Release 4.4.0
+------------------------
+(last merged pull request is
+[#2856](https://github.com/PSLmodels/Tax-Calculator/pull/2856))
+
+**This is an enhancement release.**
+
+**API Changes**
+
+**New Features**
+- Make a Policy object's last budget year be flexible
+[[#2856](https://github.com/PSLmodels/Tax-Calculator/pull/2856) by Jason DeBacker with minor assistance from Martin Holmer]
+
+
 2024-12-16 Release 4.3.5
 ------------------------
 (last merged pull request is
@@ -23,8 +37,8 @@ for a complete commit history.
 
 **Bug Fixes**
 - Fix several broken documentation links
-[[#2847](https://github.com/PSLmodels/Tax-Calculator/pull/2847) by Martin Holmer] and
-[[#2849](https://github.com/PSLmodels/Tax-Calculator/pull/2849) by Martin Holmer]
+[[#2847](https://github.com/PSLmodels/Tax-Calculator/pull/2847) by Martin Holmer and
+[#2849](https://github.com/PSLmodels/Tax-Calculator/pull/2849) by Martin Holmer]
 - Remove incorrect use of GrowFactors() in Policy and Parameters classes
 [[#2852](https://github.com/PSLmodels/Tax-Calculator/pull/2852) by Martin Holmer]
 

{taxcalc-4.3.5 → taxcalc-4.4.0}/docs/contributing/RELEASING.md

@@ -8,12 +8,11 @@ release.
 Create new `taxcalc` packages
 =============================
 ```
+--> merge master branch into X-Y-Z branch
 
 --> on branch X-Y-Z, edit docs/about/releases.md to finalize X.Y.Z info
 
---> specify release X.Y.Z in setup.py and taxcalc/__init__.py
-
---> merge master branch into X-Y-Z branch
+--> specify release X.Y.Z in setup.py and taxcalc/__init__.py and docs/index.md
 
 --> run `python update_pcl.py`  [to update policy_current_law.json if needed]
 
@@ -29,8 +28,6 @@ Create new `taxcalc` packages
 
 --> cd taxcalc/validation ; ./tests_35.sh ; .fix. ; cd ../..
 
---> specify release X.Y.Z in docs/index.md
-
 --> make clean  [to remove taxcalc package]
 
 --> commit X-Y-Z branch and push to origin
@@ -42,7 +39,8 @@ Create new `taxcalc` packages
 --> create release X.Y.Z on GitHub using master branch
 
 --> Create new package on Conda-Forge for release X.Y.Z
-    --> open a PR to github.com/conda-forge/taxcalc-feedstock where you change the `recipe/meta.yaml` file by updating (1) the version number to X.Y.Z and (2) the checksum to reflect the checksum for the tarball for release X.Y.Z in the Tax-Calculator GitHub repo
+
+--> open a PR to github.com/conda-forge/taxcalc-feedstock where you change the `recipe/meta.yaml` file by updating (1) the version number to X.Y.Z and (2) the checksum to reflect the checksum for the tarball for release X.Y.Z in the Tax-Calculator GitHub repo
 
 ====> ADD NEW DEPENDENCY OR UPDATE MINIMUM REQUIRED VERSION <====
 

{taxcalc-4.3.5 → taxcalc-4.4.0}/docs/index.md

@@ -57,7 +57,7 @@ The cross-model validation work with NBER's TAXSIM-27 model is described
 
 ## Latest release
 
-{doc}`4.3.5 (2024-12-16) <about/releases>`
+{doc}`4.4.0 (2024-12-19) <about/releases>`
 
 If you are already using Tax-Calculator, upgrade using the following command:
 

{taxcalc-4.3.5 → taxcalc-4.4.0}/environment.yml

@@ -3,11 +3,12 @@ channels:
   - conda-forge
 dependencies:
 - "python>=3.10, <3.13"
-- "numpy>=1.26,<1.27"
+- "numpy>=1.26"
 - "pandas>=2.2"
 - "bokeh>=2.4"
 - numba
 - curl
+- setuptools
 - pytest
 - pytest-xdist
 - pycodestyle
@@ -18,4 +19,4 @@ dependencies:
 - pip
 - pip:
     - jupyter-book
-    - "paramtools>=0.18.3"
+    - "paramtools>=0.19.0"

{taxcalc-4.3.5 → taxcalc-4.4.0}/setup.py

@@ -3,7 +3,7 @@ from setuptools import setup
 with open("README.md") as f:
     longdesc = f.read()
 
-version = "4.3.5"
+version = "4.4.0"
 
 config = {
     "description": "Tax Calculator",
@@ -18,13 +18,11 @@ config = {
     "include_package_data": True,
     "name": "taxcalc",
     "install_requires": [
-        "setuptools",
-        "numpy",
-        "pandas",
-        "bokeh",
+        "numpy>=1.26",
+        "pandas>=2.2",
+        "bokeh>=2.4",
         "numba",
-        "requests",
-        "paramtools>=0.18.3",
+        "paramtools>=0.19.0",
     ],
     "classifiers": [
         "Development Status :: 4 - Beta",

{taxcalc-4.3.5 → taxcalc-4.4.0}/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-4.3.5 → taxcalc-4.4.0}/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-4.3.5 → taxcalc-4.4.0}/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-4.3.5 → taxcalc-4.4.0}/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-4.3.5 → taxcalc-4.4.0}/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-4.3.5 → taxcalc-4.4.0}/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-4.3.5 → taxcalc-4.4.0}/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-4.3.5 → taxcalc-4.4.0}/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-4.3.5 → taxcalc-4.4.0}/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-4.3.5 → taxcalc-4.4.0}/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