taxcalc 4.2.2__tar.gz → 4.3.0__tar.gz

{taxcalc-4.2.2 → taxcalc-4.3.0}/.github/workflows/build_and_test.yml

@@ -34,7 +34,7 @@ jobs:
         shell: bash -l {0}
         working-directory: ./
         run: |
-          pytest -m 'not requires_pufcsv and not requires_tmdcsv and not pre_release and not local' --cov=./ --cov-report=xml
+          pytest -m 'not requires_pufcsv and not pre_release and not local' --cov=./ --cov-report=xml
       - name: Upload coverage to Codecov
         if: matrix.os == 'ubuntu-latest' && contains(github.repository, 'PSLmodels/Tax-Calculator')
         uses: codecov/codecov-action@v4

{taxcalc-4.2.2 → taxcalc-4.3.0}/MANIFEST.in

@@ -7,5 +7,3 @@ include taxcalc/policy_current_law.json
 include taxcalc/puf_weights.csv.gz
 include taxcalc/puf_ratios.csv
 include taxcalc/records_variables.json
-include taxcalc/tmd_weights.csv.gz
-include taxcalc/tmd_growfactors.csv

{taxcalc-4.2.2 → taxcalc-4.3.0}/Makefile

@@ -13,7 +13,7 @@ help:
 	@echo "clean      : remove .pyc files and local taxcalc package"
 	@echo "package    : build and install local package"
 	@echo "pytest-cps : generate report for and cleanup after"
-	@echo "             pytest -m 'not requires_pufcsv and not requires_tmdcsv and not pre_release'"
+	@echo "             pytest -m 'not requires_pufcsv and not pre_release'"
 	@echo "pytest     : generate report for and cleanup after"
 	@echo "             pytest -m 'not pre_release'"
 	@echo "pytest-all : generate report for and cleanup after"
@@ -51,7 +51,7 @@ endef
 .PHONY=pytest-cps
 pytest-cps:
 	@$(pytest-setup)
-	@cd taxcalc ; pytest -n4 --disable-warnings --durations=0 --durations-min=2 -m "not requires_pufcsv and not requires_tmdcsv and not pre_release"
+	@cd taxcalc ; pytest -n4 --disable-warnings --durations=0 --durations-min=2 -m "not requires_pufcsv and not pre_release"
 	@$(pytest-cleanup)
 
 .PHONY=pytest
@@ -103,7 +103,7 @@ define coverage-cleanup
 rm -f .coverage htmlcov/*
 endef
 
-COVMARK = "not requires_pufcsv and not requires_tmdcsv and not pre_release"
+COVMARK = "not requires_pufcsv and not pre_release"
 
 OS := $(shell uname -s)
 

{taxcalc-4.2.2 → taxcalc-4.3.0}/PKG-INFO

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

{taxcalc-4.2.2 → taxcalc-4.3.0}/codecov.yml

@@ -21,5 +21,6 @@ comment:
 
 ignore:
   - "setup.py"
+  - "update_pcl.py"
   - "ppp.py"
   - "extend_tcja.py"

{taxcalc-4.2.2 → taxcalc-4.3.0}/docs/about/releases.md

@@ -3,6 +3,29 @@ Release history
 Go [here](https://github.com/PSLmodels/Tax-Calculator/pulls?q=is%3Apr+is%3Aclosed)
 for a complete commit history.
 
+
+2024-10-02 Release 4.3.0
+------------------------
+(last merged pull request is
+[#2819](https://github.com/PSLmodels/Tax-Calculator/pull/2819))
+
+**This is an enhancement and bug-fix release.**
+
+**API Changes**
+
+**New Features**
+- Add known values of inflation-indexed policy parameters for 2023 [[#2806](https://github.com/PSLmodels/Tax-Calculator/pull/2806) by Martin Holmer]
+- Enhance `Records.tmd_constructor` static method [[#2809](https://github.com/PSLmodels/Tax-Calculator/pull/2809) by Martin Holmer]
+- Remove TMD data files from Tax-Calculator repository [[#2810](https://github.com/PSLmodels/Tax-Calculator/pull/2810) by Martin Holmer]
+- Add known values of inflation-indexed policy parameters for 2024 [[#2816](https://github.com/PSLmodels/Tax-Calculator/pull/2816) by Martin Holmer]
+- Enhance `extend_tcja.py` and update `reforms/ext.json` [[#2817](https://github.com/PSLmodels/Tax-Calculator/pull/2817) by Martin Holmer]
+- Enhance `ppp.py` script [[#2819](https://github.com/PSLmodels/Tax-Calculator/pull/2819) by Martin Holmer]
+
+**Bug Fixes**
+- Fix specification of domestic production deduction under TCJA [[#2807](https://github.com/PSLmodels/Tax-Calculator/pull/2807) by Martin Holmer]
+- Fix `ALD_BusinessLosses_c` parameter values after 2025 [[#2818](https://github.com/PSLmodels/Tax-Calculator/pull/2818) by Martin Holmer]
+
+
 2024-09-14 Release 4.2.2
 ------------------------
 (last merged pull request is
@@ -14,14 +37,14 @@ for a complete commit history.
 
 **New Features**
 - Non-substantive, cosmetic changes to `policy_current_law.json` file [[#2791](https://github.com/PSLmodels/Tax-Calculator/pull/2791) by Martin Holmer]
--Update `tmd_growfactors.csv` and `tmd_weights.csv.gz` files file [[#2797](https://github.com/PSLmodels/Tax-Calculator/pull/2797) by Martin Holmer]
-
+- Update `tmd_growfactors.csv` and `tmd_weights.csv.gz` files [[#2797](https://github.com/PSLmodels/Tax-Calculator/pull/2797) by Martin Holmer]
 
 **Bug Fixes**
 - Add missing pre-2022 values for indexed policy parameters [[#2789](https://github.com/PSLmodels/Tax-Calculator/pull/2789) by Martin Holmer]
 - Fix education tax credit phase-out parameters [[#2790](https://github.com/PSLmodels/Tax-Calculator/pull/2790) by Martin Holmer]
 - Several PRs with updates for dependency versions and other minor changes by Martin Holmer and Jason DeBacker
 
+
 2024-07-30 Release 4.2.1
 ------------------------
 (last merged pull request is

{taxcalc-4.2.2 → taxcalc-4.3.0}/docs/contributing/RELEASING.md

@@ -1,10 +1,12 @@
 Releasing Tax-Caclculator Packages
 ==================================
 
-The following outlines the process to release Tax-Calculator Packages on Conda-Forge and creating a new branch to fix a bug in a previous release.
+The following outlines the process to release Tax-Calculator Packages
+on Conda-Forge and creating a new branch to fix a bug in a previous
+release.
 
 Create new `taxcalc` packages
-===========================
+=============================
 ```
 
 --> on branch X-Y-Z, edit docs/about/releases.md to finalize X.Y.Z info
@@ -13,6 +15,12 @@ Create new `taxcalc` packages
 
 --> merge master branch into X-Y-Z branch
 
+--> run `python update_pcl.py`  [to update policy_current_law.json if needed]
+
+--> run `python ppp.py`  [to update policy_current_law.json if needed]
+
+--> run `python extend_tcja.py > ext.json`  [to update reforms/ext.json]
+
 --> run `make tctest-jit`  [to make sure JIT decorators are not hiding bugs]
 
 --> run `make pytest-all`  [or `pytest -m pre_release -n4` in taxcalc subdir]

{taxcalc-4.2.2 → taxcalc-4.3.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.2.2 (2024-09-14) <about/releases>`
+{doc}`4.3.0 (2024-10-02) <about/releases>`
 
 If you are already using Tax-Calculator, upgrade using the following command:
 

{taxcalc-4.2.2 → taxcalc-4.3.0}/docs/usage/data.md

@@ -61,13 +61,16 @@ file.
 
 The [tax-microdata
 repository](https://github.com/PSLmodels/tax-microdata-benchmarking)
-produces an input variables file (`tmd.csv`) and a
-`tmd_weights.csv.gz` file that is included in the Tax-Calculator
+produces an input variables file (`tmd.csv`), a national weights file
+(`tmd_weights.csv.gz`), and a variable growth factors file
+(`tmd_growfactors.csv`) that can be used with the Tax-Calculator
 package beginning with the 3.6.0 release.  The `tmd.csv` file is
 available only to Tax-Calculator users who have purchased their own
-version of the 2015 IRS-SOI PUF.  For those users, the
-`Records.tmd_constructor()` method creates a `Records` class object
-containing the `tmd` variables and weights.
+version of the 2015 IRS-SOI PUF.  For those users, those three files
+are avaiable from the tax-microdata repository.  These three tmd files
+can be used with the Tax-Calculator Python API (using the 
+`Records.tmd_constructor()` static method) or with the Tax-Calculator
+CLI tool, `tc`.
 
 ## Using other data with Tax-Calculator
 

{taxcalc-4.2.2 → taxcalc-4.3.0}/extend_tcja.py

@@ -3,10 +3,15 @@ This script generates a JSON reform file, which could be called
 extend_tcja.json, that can serve as an alternative baseline to
 current-law policy (which ends TCJA temporary provisions after 2025).
 
-USAGE: (taxcalc-dev) ~% python extend_tcja.py
+USAGE: (taxcalc-dev) Tax-Calculator% python extend_tcja.py > ext.json
+  THEN CHECK:                      % diff ext.json taxcalc/reforms/ext.json
+  IF DIFFS:                        % mv ext.json taxcalc/reforms/ext.json
 
-IMPORTANT NOTE: be sure to remove the trailing comma after the last item
-                in the reform JSON object generated by this script.
+WHEN TO USE: use this script to update reforms/ext.json in these situations:
+(a) whenever inflation rates in the growfactors.csv files are changed
+OR
+(b) whenever inflation-indexed parameters are updated (usually as part
+    of changes that increase the value of Policy.LAST_KNOWN_YEAR).
 """
 
 import sys
@@ -76,7 +81,6 @@ TCJA_PARAMETERS = {
     "PT_qbid_alt_property_rt": {"indexed": False, "category": 7},
     # category 8 ...
     "ALD_BusinessLosses_c": {"indexed": True, "category": 8},
-    "ALD_DomesticProduction_hc": {"indexed": False, "category": 8},
 }
 
 
@@ -84,10 +88,13 @@ def main():
     """
     High-level script logic.
     """
+    # identify last parameter name in TCJA_PARAMETERS
+    last_pname = list(TCJA_PARAMETERS.keys())[-1]
     # calculate 2025-to-2026 parameters indexing factor
     pol = taxcalc.Policy()
     pirates = pol.inflation_rates()
-    ifactor = 1.0 + pirates[2025-taxcalc.Policy.JSON_START_YEAR]
+    ifactor25 = 1.0 + pirates[2025-taxcalc.Policy.JSON_START_YEAR]
+    ifactor28 = 1.0 + pirates[2028-taxcalc.Policy.JSON_START_YEAR]
     # specify extend-TCJA-beyond-2025 reform
     # ... get 2025 parameter values
     pol.set_year(2025)
@@ -95,45 +102,61 @@ def main():
     # ... write reform header comments
     print( '// REFORM TO EXTEND TEMPORARY TCJA PROVISIONS BEYOND 2025')
     print(f'// USING TAX-CALCULATOR {taxcalc.__version__}')
-    print(f'// WITH 2025-to-2026 INDEXING FACTOR = {ifactor:.6f}')
+    print(f'// WITH 2025-to-2026 INDEXING FACTOR = {ifactor25:.6f}')
+    print(f'//  AND 2028-to-2029 INDEXING FACTOR = {ifactor28:.6f}')
     if TCJA_CATEGORY:
         print(f'// ONLY TCJA PROVISIONS IN CATEGORY {TCJA_CATEGORY}')
     print('{')
-    # ... set 2026 nonreverted values for the parameters set to revert
+    # ... set 2026/29 nonreverted values for the parameters set to revert
+    left_brace = '{'
+    right_brace = '}'
+    year = 2026
     for pname, pinfo in TCJA_PARAMETERS.items():
         if TCJA_CATEGORY and pinfo['category'] != TCJA_CATEGORY:
             continue  # skip this parameter
+        if pname == 'ALD_BusinessLosses_c':
+            ifactor = ifactor28
+            year = 2029
+            pol.set_year(2028)
+            pdata = dict(pol.items())
+        else:
+            if year != 2026:
+                pol.set_year(2025)
+                pdata = dict(pol.items())
+            ifactor = ifactor25
+            year = 2026
+        trailing_comma = '' if pname == last_pname else ','
         if pinfo['indexed']:
             pval = pdata[pname][0] * ifactor
             if isinstance(pval, numpy.ndarray):
                 # handle vector parameter
                 pval = numpy.minimum(9e99, pval.round(2))
                 sys.stdout.write(f'    "{pname}": ')
-                sys.stdout.write('{"2026": ')
+                sys.stdout.write(f'{left_brace}"{year}": ')
                 sys.stdout.write(f'{pval.tolist()}')
-                sys.stdout.write('},\n')
+                sys.stdout.write(f'{right_brace}{trailing_comma}\n')
             else:
                 # handle scalar parameter
                 pval = min(9e99, pval)
                 sys.stdout.write(f'    "{pname}": ')
-                sys.stdout.write('{"2026": ')
+                sys.stdout.write(f'{left_brace}"{year}": ')
                 sys.stdout.write(f'{pval*ifactor:.2f}')
-                sys.stdout.write('},\n')
+                sys.stdout.write(f'{right_brace}{trailing_comma}\n')
         else:  # if parameter is not indexed
             pval = pdata[pname][0]
             if isinstance(pval, numpy.ndarray):
                 # handle vector parameter
                 pval = numpy.minimum(9e99, pval.round(2))
                 sys.stdout.write(f'    "{pname}": ')
-                sys.stdout.write('{"2026": ')
+                sys.stdout.write(f'{left_brace}"{year}": ')
                 sys.stdout.write(f'{pval.tolist()}')
-                sys.stdout.write('},\n')
+                sys.stdout.write(f'{right_brace}{trailing_comma}\n')
             else:
                 # handle scalar parameter
                 sys.stdout.write(f'    "{pname}": ')
-                sys.stdout.write('{"2026": ')
+                sys.stdout.write(f'{left_brace}"{year}": ')
                 sys.stdout.write(f'{pval:.2f}')
-                sys.stdout.write('},\n')
+                sys.stdout.write(f'{right_brace}{trailing_comma}\n')
     print('}')
     return 0
 # end main function code

taxcalc-4.3.0/ppp.py

@@ -0,0 +1,138 @@
+"""
+This policy parameter projection script, which calculates policy
+parameter values that were changed by TCJA and will revert to
+their pre-TCJA values in 2026 (adjusted for inflation).
+
+USAGE: (taxcalc-dev) T-C% python ppp.py
+THEN CHECK:             % diff pcl.json taxcalc/policy_current_law.json
+IF DIFFS OK             % mv pcl.json taxcalc/policy_current_law.json
+
+WHEN TO USE: use this script to update taxcalc/policy_current_law.json
+whenever post-2016 inflation rates in the growfactors.csv files are changed.
+"""
+
+import sys
+import re
+from pathlib import Path
+from taxcalc import Policy
+
+REVERTING_PARAMS = {
+    'ALD_BusinessLosses_c': 2029,
+    'II_em': 2026,
+    'II_em_ps': 2026,
+    'STD': 2026,
+    'ID_AllTaxes_c': 2026,
+    'ID_ps': 2026,
+    'II_brk1': 2026,
+    'II_brk2': 2026,
+    'II_brk3': 2026,
+    'II_brk4': 2026,
+    'II_brk5': 2026,
+    'II_brk6': 2026,
+    'II_brk7': 2026,
+    'PT_brk1': 2026,
+    'PT_brk2': 2026,
+    'PT_brk3': 2026,
+    'PT_brk4': 2026,
+    'PT_brk5': 2026,
+    'PT_brk6': 2026,
+    'PT_brk7': 2026,
+    'PT_qbid_taxinc_thd': 2026,
+    'AMT_em': 2026,
+    'AMT_em_ps': 2026,
+    'AMT_em_pe': 2026,
+}
+MARS_VALUES = ['single', 'mjoint', 'mseparate', 'headhh', 'widow']
+PYEAR = 2017  # prior year before TCJA first implemented
+FYEAR = 2026  # final year in which parameter values revert
+
+
+def cumulative_ifactor():
+    """
+    Return PYEAR-to_FYEAR inflation factor.
+    """
+    pol = Policy()
+    # calculate the inflation factor used to calculate the
+    # inflation-adjusted 2026 reverting parameter values
+    # NOTE: pvalue[t+1] = pvalue[t] * ( 1 + irate[t] )
+    cum_ifactor = 1.0
+    for year in range(PYEAR, FYEAR):
+        # pylint: disable=protected-access
+        rate = pol._inflation_rates[year - pol.start_year]
+        cum_ifactor *= 1.0 + rate
+    return cum_ifactor
+
+
+def integrate_fragments(fragments):
+    """
+    Integrate specified fragments with the policy_current_law.json text.
+    """
+    p_c_l_path = Path('.') / 'taxcalc' / 'policy_current_law.json'
+    with open(p_c_l_path, 'r', encoding='utf-8') as ofile:
+        olines = ofile.readlines()
+    # pylint: disable=consider-using-with
+    nfile = open('pcl.json', 'w', encoding='utf-8')
+    re_param_line = re.compile(r'^\s{4}"(\w+)": {$')
+    re_ryear26_line = re.compile(r'^\s{16}"year": 2026,$')
+    re_ryear29_line = re.compile(r'^\s{16}"year": 2029,$')
+    re_value_line = re.compile(r'^\s{16}"value":')
+    writing_oline = True
+    pname_has_fragments = False
+    for oline in olines:
+        pmatch = re_param_line.search(oline)
+        if pmatch:
+            pname = pmatch.group(1)
+            pname_has_fragments = pname in fragments
+            if pname_has_fragments:
+                if fragments[pname][0]['year'] == 2026:
+                    re_ryear_line = re_ryear26_line
+                else:
+                    re_ryear_line = re_ryear29_line
+                idx = -1
+        elif pname_has_fragments:
+            ymatch = re_ryear_line.search(oline)
+            if ymatch:
+                idx += 1
+        if pname_has_fragments and idx >= 0:
+            if re_value_line.search(oline):
+                writing_oline = False
+            else:
+                writing_oline = True
+        if writing_oline:
+            nfile.write(oline)
+        else:
+            nfile.write(
+                f'                "value": {fragments[pname][idx]["value"]}\n'
+            )
+    nfile.close()
+    return 0
+
+
+def main():
+    """
+    High-level script logic.
+    """
+    ifactor = cumulative_ifactor()
+
+    # construct policy_current_law.json revert-year fragments
+    # for each reverting parameter in a fragments dictionary
+    fragments = {}
+    parameters = Policy()
+    for pname, ryear in REVERTING_PARAMS.items():
+        vos = parameters.select_eq(pname, year=PYEAR)
+        frag_list = []
+        for vo in vos:
+            rval = min(9e99, round(vo['value'] * ifactor, 0))
+            frag_list.append({'year': ryear, 'value': rval})
+        fragments[pname] = frag_list
+
+    # integrate fragment info into existing policy_current_law.json
+    rcode = integrate_fragments(fragments)
+
+    # return exit code returned by integrate_fragments function
+    return rcode
+# end main function code
+
+
+if __name__ == '__main__':
+    sys.exit(main())

{taxcalc-4.2.2 → taxcalc-4.3.0}/pytest.ini

@@ -3,14 +3,14 @@ testpaths =
     taxcalc
 markers =
     requires_pufcsv
-    requires_tmdcsv
     pre_release
-    compatible_data
     local
     benefits
-    itmded_vars
+    compatible_data
     cpscsv_agg
+    extend_tcja
+    itmded_vars
     pufcsv_agg
     reforms
     rtr
-    extend_tcja
+    stded

{taxcalc-4.2.2 → taxcalc-4.3.0}/setup.py

@@ -3,7 +3,7 @@ from setuptools import setup
 with open("README.md") as f:
     longdesc = f.read()
 
-version = "4.2.2"
+version = "4.3.0"
 
 config = {
     "description": "Tax Calculator",

{taxcalc-4.2.2 → taxcalc-4.3.0}/taxcalc/__init__.py

@@ -14,4 +14,4 @@ from taxcalc.taxcalcio import *
 from taxcalc.utils import *
 from taxcalc.cli import *
 
-__version__ = '4.2.2'
+__version__ = '4.3.0'

{taxcalc-4.2.2 → taxcalc-4.3.0}/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