taxcalc 4.2.0__tar.gz → 4.2.2__tar.gz

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

@@ -1,4 +1,4 @@
-name: Build Package and Test Source Code [Python 3.9, 3.10, 3.11, 3.12]
+name: Build Package and Test Source Code [Python 3.10, 3.11, 3.12]
 
 on: [push, pull_request]
 
@@ -8,7 +8,7 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest, windows-latest]
-        python-version: [3.9, '3.10', '3.11', '3.12']
+        python-version: ['3.10', '3.11', '3.12']
 
     steps:
       - name: Checkout
@@ -36,7 +36,7 @@ jobs:
         run: |
           pytest -m 'not requires_pufcsv and not requires_tmdcsv and not pre_release and not local' --cov=./ --cov-report=xml
       - name: Upload coverage to Codecov
-        if: matrix.os == 'ubuntu-latest'
+        if: matrix.os == 'ubuntu-latest' && contains(github.repository, 'PSLmodels/Tax-Calculator')
         uses: codecov/codecov-action@v4
         with:
           token: ${{ secrets.CODECOV_TOKEN }} # not required for public repos

{taxcalc-4.2.0 → taxcalc-4.2.2}/.github/workflows/check_jupyterbook.yml

@@ -26,4 +26,4 @@ jobs:
           pip install -e .
           python docs/guide/make/make_uguide.py
           cd docs
-          jb build .
+          jb build .

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: taxcalc
-Version: 4.2.0
+Version: 4.2.2
 Summary: taxcalc
 Home-page: https://github.com/PSLmodels/Tax-Calculator
 Download-URL: https://github.com/PSLmodels/Tax-Calculator
@@ -12,7 +12,6 @@ Classifier: License :: CC0 1.0 Universal (CC0 1.0) Public Domain Dedication
 Classifier: Operating System :: OS Independent
 Classifier: Programming Language :: Python
 Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
@@ -25,12 +24,12 @@ Requires-Dist: pandas
 Requires-Dist: bokeh
 Requires-Dist: numba
 Requires-Dist: requests
-Requires-Dist: paramtools
+Requires-Dist: paramtools>=0.18.3
 
 | | |
 | --- | --- |
 | Org | [![PSL cataloged](https://img.shields.io/badge/PSL-cataloged-a0a0a0.svg)](https://www.PSLmodels.org) [![OS License: CCO-1.0](https://img.shields.io/badge/OS%20License-CCO%201.0-yellow)](https://github.com/PSLmodels/Tax-Calculator/blob/master/LICENSE) [![Jupyter Book Badge](https://jupyterbook.org/badge.svg)](https://pslmodels.github.io/Tax-Calculator/) |
-| Package | [![Python 3.9](https://img.shields.io/badge/python-3.9-blue.svg)](https://www.python.org/downloads/release/python-3916/) [![Python 3.10](https://img.shields.io/badge/python-3.10-blue.svg)](https://www.python.org/downloads/release/python-3108/)  [![Python 3.11](https://img.shields.io/badge/python-3.11-blue.svg)](https://www.python.org/downloads/release/python-3118/) [![Python 3.12](https://img.shields.io/badge/python-3.12-blue.svg)](https://www.python.org/downloads/release/python-3121/) [![PyPI Latest Release](https://img.shields.io/pypi/v/taxcalc.svg)](https://pypi.org/project/taxcalc/) [![PyPI Downloads](https://img.shields.io/pypi/dm/taxcalc.svg?label=PyPI%20downloads)](https://pypi.org/project/taxcalc/) [![Anaconda](https://img.shields.io/conda/dn/conda-forge/taxcalc?color=brightgreen&label=downloads&logo=conda-forge)](https://anaconda.org/conda-forge/taxcalc)|
+| Package | [![Python 3.10](https://img.shields.io/badge/python-3.10-blue.svg)](https://www.python.org/downloads/release/python-3108/)  [![Python 3.11](https://img.shields.io/badge/python-3.11-blue.svg)](https://www.python.org/downloads/release/python-3118/) [![Python 3.12](https://img.shields.io/badge/python-3.12-blue.svg)](https://www.python.org/downloads/release/python-3121/) [![PyPI Latest Release](https://img.shields.io/pypi/v/taxcalc.svg)](https://pypi.org/project/taxcalc/) [![PyPI Downloads](https://img.shields.io/pypi/dm/taxcalc.svg?label=PyPI%20downloads)](https://pypi.org/project/taxcalc/) [![Anaconda](https://img.shields.io/conda/dn/conda-forge/taxcalc?color=brightgreen&label=downloads&logo=conda-forge)](https://anaconda.org/conda-forge/taxcalc)|
 | Testing | ![example event parameter](https://github.com/PSLmodels/Tax-Calculator/actions/workflows/build_and_test.yml/badge.svg?branch=master) ![example event parameter](https://github.com/PSLmodels/Tax-Calculator/actions/workflows/deploy_jupyterbook.yml/badge.svg?branch=master)  [![Codecov](https://codecov.io/gh/PSLmodels/Tax-Calculator/branch/master/graph/badge.svg)](https://codecov.io/gh/PSLmodels/Tax-Calculator) |
 
 

{taxcalc-4.2.0 → taxcalc-4.2.2}/README.md

@@ -1,7 +1,7 @@
 | | |
 | --- | --- |
 | Org | [![PSL cataloged](https://img.shields.io/badge/PSL-cataloged-a0a0a0.svg)](https://www.PSLmodels.org) [![OS License: CCO-1.0](https://img.shields.io/badge/OS%20License-CCO%201.0-yellow)](https://github.com/PSLmodels/Tax-Calculator/blob/master/LICENSE) [![Jupyter Book Badge](https://jupyterbook.org/badge.svg)](https://pslmodels.github.io/Tax-Calculator/) |
-| Package | [![Python 3.9](https://img.shields.io/badge/python-3.9-blue.svg)](https://www.python.org/downloads/release/python-3916/) [![Python 3.10](https://img.shields.io/badge/python-3.10-blue.svg)](https://www.python.org/downloads/release/python-3108/)  [![Python 3.11](https://img.shields.io/badge/python-3.11-blue.svg)](https://www.python.org/downloads/release/python-3118/) [![Python 3.12](https://img.shields.io/badge/python-3.12-blue.svg)](https://www.python.org/downloads/release/python-3121/) [![PyPI Latest Release](https://img.shields.io/pypi/v/taxcalc.svg)](https://pypi.org/project/taxcalc/) [![PyPI Downloads](https://img.shields.io/pypi/dm/taxcalc.svg?label=PyPI%20downloads)](https://pypi.org/project/taxcalc/) [![Anaconda](https://img.shields.io/conda/dn/conda-forge/taxcalc?color=brightgreen&label=downloads&logo=conda-forge)](https://anaconda.org/conda-forge/taxcalc)|
+| Package | [![Python 3.10](https://img.shields.io/badge/python-3.10-blue.svg)](https://www.python.org/downloads/release/python-3108/)  [![Python 3.11](https://img.shields.io/badge/python-3.11-blue.svg)](https://www.python.org/downloads/release/python-3118/) [![Python 3.12](https://img.shields.io/badge/python-3.12-blue.svg)](https://www.python.org/downloads/release/python-3121/) [![PyPI Latest Release](https://img.shields.io/pypi/v/taxcalc.svg)](https://pypi.org/project/taxcalc/) [![PyPI Downloads](https://img.shields.io/pypi/dm/taxcalc.svg?label=PyPI%20downloads)](https://pypi.org/project/taxcalc/) [![Anaconda](https://img.shields.io/conda/dn/conda-forge/taxcalc?color=brightgreen&label=downloads&logo=conda-forge)](https://anaconda.org/conda-forge/taxcalc)|
 | Testing | ![example event parameter](https://github.com/PSLmodels/Tax-Calculator/actions/workflows/build_and_test.yml/badge.svg?branch=master) ![example event parameter](https://github.com/PSLmodels/Tax-Calculator/actions/workflows/deploy_jupyterbook.yml/badge.svg?branch=master)  [![Codecov](https://codecov.io/gh/PSLmodels/Tax-Calculator/branch/master/graph/badge.svg)](https://codecov.io/gh/PSLmodels/Tax-Calculator) |
 
 

{taxcalc-4.2.0 → taxcalc-4.2.2}/conda.recipe/meta.yaml

@@ -8,22 +8,22 @@ build:
 
 requirements:
   build:
-    - "python>=3.9, <3.13"
-    - "numpy>=1.20"
+    - "python>=3.10, <3.13"
+    - "numpy>=1.26,<1.27"
     - "pandas>=2.2"
     - "bokeh>=2.4"
-    - "paramtools>=0.18.2"
+    - "paramtools>=0.18.3"
     - numba
     - curl
     - openpyxl
     - behresp
 
   run:
-    - "python>=3.9, <3.13"
-    - "numpy>=1.20"
+    - "python>=3.10, <3.13"
+    - "numpy>=1.26,<1.27"
     - "pandas>=2.2"
     - "bokeh>=2.4"
-    - "paramtools>=0.18.2"
+    - "paramtools>=0.18.3"
     - numba
     - curl
     - openpyxl

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

@@ -3,6 +3,45 @@ Release history
 Go [here](https://github.com/PSLmodels/Tax-Calculator/pulls?q=is%3Apr+is%3Aclosed)
 for a complete commit history.
 
+2024-09-14 Release 4.2.2
+------------------------
+(last merged pull request is
+[#2801](https://github.com/PSLmodels/Tax-Calculator/pull/2801))
+
+**This is a bug-fix release.**
+
+**API Changes**
+
+**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]
+
+
+**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
+[#2786](https://github.com/PSLmodels/Tax-Calculator/pull/2786))
+
+**This is a bug-fix release.**
+
+**API Changes**
+
+**New Features**
+
+**Bug Fixes**
+- Add custom `reforms/growfactors_ext.json` file to use in dynamic analysis of the `reforms/ext.json` extend-TCJA-beyond-2025 reform [[#2770](https://github.com/PSLmodels/Tax-Calculator/pull/2777) by Jason DeBacker]
+- Fix CDCC phase-out calculations [[#2779](https://github.com/PSLmodels/Tax-Calculator/pull/2779) by Martin Holmer]
+- Fix CARES charity deduction for nonitemizers [[#2781](https://github.com/PSLmodels/Tax-Calculator/pull/2781) by Martin Holmer]
+- Fix four 2020 PT_rt? parameter values [[#2783](https://github.com/PSLmodels/Tax-Calculator/pull/2783) by Martin Holmer]
+- Correct AMT taxable income calculation to handle QBID correctly [[#2784](https://github.com/PSLmodels/Tax-Calculator/pull/2784) by Martin Holmer]
+- Fix qualified business income calculation [[#2785](https://github.com/PSLmodels/Tax-Calculator/pull/2785) by Martin Holmer]
+- Add `ctc_nonrefundable` variable [[#2786](https://github.com/PSLmodels/Tax-Calculator/pull/2786) by Martin Holmer]
+
 
 2024-07-21 Release 4.2.0
 ------------------------

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

{taxcalc-4.2.0 → taxcalc-4.2.2}/environment.yml

@@ -2,11 +2,10 @@ name: taxcalc-dev
 channels:
   - conda-forge
 dependencies:
-- "python>=3.9, <3.13"
-- "numpy>=1.20"
+- "python>=3.10, <3.13"
+- "numpy>=1.26,<1.27"
 - "pandas>=2.2"
 - "bokeh>=2.4"
-- "paramtools>=0.18.2"
 - numba
 - curl
 - pytest
@@ -19,3 +18,4 @@ dependencies:
 - pip
 - pip:
     - jupyter-book
+    - "paramtools>=0.18.3"

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

@@ -58,7 +58,7 @@ TCJA_PARAMETERS = {
     "STD": {"indexed": True, "category": 4},
     # category 5 ...
     "ID_AllTaxes_c": {"indexed": False, "category": 5},
-    "ID_Charity_crt_all": {"indexed": False, "category": 5},
+    "ID_Charity_crt_cash": {"indexed": False, "category": 5},
     "ID_Casualty_hc": {"indexed": False, "category": 5},
     "ID_Miscellaneous_hc": {"indexed": False, "category": 5},
     "ID_ps": {"indexed": True, "category": 5},

{taxcalc-4.2.0 → taxcalc-4.2.2}/ppp.py

@@ -74,3 +74,4 @@ for param in param_data:
 # write new pcl dictionary to policy_current_law.json
 with open('taxcalc/policy_current_law.json', 'w', encoding='utf-8') as pcl_new:
     json.dump(pcl, pcl_new, indent=4)
+    pcl_new.write('\n')

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

@@ -3,7 +3,7 @@ from setuptools import setup
 with open("README.md") as f:
     longdesc = f.read()
 
-version = "4.2.0"
+version = "4.2.2"
 
 config = {
     "description": "Tax Calculator",
@@ -24,7 +24,7 @@ config = {
         "bokeh",
         "numba",
         "requests",
-        "paramtools",
+        "paramtools>=0.18.3",
     ],
     "classifiers": [
         "Development Status :: 4 - Beta",
@@ -34,7 +34,6 @@ config = {
         "Operating System :: OS Independent",
         "Programming Language :: Python",
         "Programming Language :: Python :: 3",
-        "Programming Language :: Python :: 3.9",
         "Programming Language :: Python :: 3.10",
         "Programming Language :: Python :: 3.11",
         "Programming Language :: Python :: 3.12",

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

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

{taxcalc-4.2.0 → taxcalc-4.2.2}/taxcalc/calcfunctions.py

@@ -781,7 +781,7 @@ def ItemDedCap(e17500, e18400, e18500, e19200, e19800, e20100, e20400, g20500,
     e19800: float
         Itemizable charitable giving: cash/check contributions
     e20100: float
-        Itemizable charitalb giving: other than cash/check contributions
+        Itemizable charitable giving: other than cash/check contributions
     e20400: float
         Itemizable gross (before 10% AGI disregard) casualty or theft loss
     g20500: float
@@ -887,7 +887,7 @@ def ItemDed(e17500_capped, e18400_capped, e18500_capped, e19200_capped,
             c17000, c18300, c19200, c19700, c20500, c20800,
             ID_ps, ID_Medical_frt, ID_Medical_frt_add4aged, ID_Medical_hc,
             ID_Casualty_frt, ID_Casualty_hc, ID_Miscellaneous_frt,
-            ID_Miscellaneous_hc, ID_Charity_crt_all, ID_Charity_crt_noncash,
+            ID_Miscellaneous_hc, ID_Charity_crt_cash, ID_Charity_crt_noncash,
             ID_prt, ID_crt, ID_c, ID_StateLocalTax_hc, ID_Charity_frt,
             ID_Charity_hc, ID_InterestPaid_hc, ID_RealEstate_hc,
             ID_Medical_c, ID_StateLocalTax_c, ID_RealEstate_c,
@@ -957,8 +957,8 @@ def ItemDed(e17500_capped, e18400_capped, e18500_capped, e19200_capped,
         Floor (as decimal fraction of AGI) for deductible miscellaneous expenses
     ID_Miscellaneous_hc: float
         Miscellaneous expense deduction haircut
-    ID_Charity_crt_all: float
-        Ceiling (as decimal fraction of AGI) for all charitable contribution deductions
+    ID_Charity_crt_cash: float
+        Ceiling (as decimal fraction of AGI) for cash charitable contribution deductions
     ID_Charity_crt_noncash: float
         Ceiling (as decimal fraction of AGI) for noncash charitable contribution deductions
     ID_prt: float
@@ -1047,8 +1047,9 @@ def ItemDed(e17500_capped, e18400_capped, e18500_capped, e19200_capped,
     c19200 = e19200_capped * (1. - ID_InterestPaid_hc)
     c19200 = min(c19200, ID_InterestPaid_c[MARS - 1])
     # Charity
-    lim30 = min(ID_Charity_crt_noncash * posagi, e20100_capped)
-    c19700 = min(ID_Charity_crt_all * posagi, lim30 + e19800_capped)
+    charity_ded_cash = min(ID_Charity_crt_cash * posagi, e19800_capped)
+    charity_ded_noncash = min(ID_Charity_crt_noncash * posagi, e20100_capped)
+    c19700 = charity_ded_cash + charity_ded_noncash
     # charity floor is zero in present law
     charity_floor = max(ID_Charity_frt * posagi, ID_Charity_f[MARS - 1])
     c19700 = max(0., c19700 - charity_floor) * (1. - ID_Charity_hc)
@@ -1133,9 +1134,9 @@ def AdditionalMedicareTax(e00200, MARS,
 
 @iterate_jit(nopython=True)
 def StdDed(DSI, earned, STD, age_head, age_spouse, STD_Aged, STD_Dep,
-           MARS, MIDR, blind_head, blind_spouse, standard, c19700,
-           STD_allow_charity_ded_nonitemizers,
-           STD_charity_ded_nonitemizers_max):
+           MARS, MIDR, blind_head, blind_spouse, standard,
+           STD_allow_charity_ded_nonitemizers, e19800, ID_Charity_crt_cash,
+           c00100, STD_charity_ded_nonitemizers_max):
     """
     Calculates standard deduction, including standard deduction for
     dependents, aged and bind.
@@ -1166,12 +1167,16 @@ def StdDed(DSI, earned, STD, age_head, age_spouse, STD_Aged, STD_Dep,
         1 if spouse is blind, 0 otherwise
     standard: float
         Standard deduction (zero for itemizers)
-    c19700: float
-        Schedule A: charity contributions deducted
     STD_allow_charity_ded_nonitemizers: bool
         Allow standard deduction filers to take the charitable contributions deduction
+    e19800: float
+        Schedule A: cash charitable contributions
+    ID_Charity_crt_cash: float
+        Fraction of AGI cap on cash charitable deductions
+    c00100: float
+        Federal AGI
     STD_charity_ded_nonitemizers_max: float
-        Ceiling amount (in dollars) for charitable deductions for non-itemizers
+        Ceiling amount (in dollars) for charitable deductions for nonitemizers
 
     Returns
     -------
@@ -1199,13 +1204,15 @@ def StdDed(DSI, earned, STD, age_head, age_spouse, STD_Aged, STD_Dep,
     standard = basic_stded + extra_stded
     if MARS == 3 and MIDR == 1:
         standard = 0.
+    # calculate CARES cash charity deduction for nonitemizers
     if STD_allow_charity_ded_nonitemizers:
-        standard += min(c19700, STD_charity_ded_nonitemizers_max)
+        capped_ded = min(e19800, ID_Charity_crt_cash * c00100)
+        standard += min(capped_ded, STD_charity_ded_nonitemizers_max[MARS - 1])
     return standard
 
 
 @iterate_jit(nopython=True)
-def TaxInc(c00100, standard, c04470, c04600, MARS, e00900, e26270,
+def TaxInc(c00100, standard, c04470, c04600, MARS, e00900, c03260, e26270,
            e02100, e27200, e00650, c01000, PT_SSTB_income,
            PT_binc_w2_wages, PT_ubia_property, PT_qbid_rt,
            PT_qbid_taxinc_thd, PT_qbid_taxinc_gap, PT_qbid_w2_wages_rt,
@@ -1229,6 +1236,8 @@ def TaxInc(c00100, standard, c04470, c04600, MARS, e00900, e26270,
         Filing (marital) status. (1=single, 2=joint, 3=separate, 4=household-head, 5=widow(er))
     e00900: float
         Schedule C business net profit/loss for filing unit
+    c03260: float
+        Self-employment (SECA) tax above-the-line deduction
     e26270: float
         Schedule E: combined partnership and S-corporation net income/loss
     e02100: float
@@ -1280,7 +1289,7 @@ def TaxInc(c00100, standard, c04470, c04600, MARS, e00900, e26270,
     pre_qbid_taxinc = max(0., c00100 - max(c04470, standard) - c04600)
     # calculate qualified business income deduction
     qbided = 0.
-    qbinc = max(0., e00900 + e26270 + e02100 + e27200)
+    qbinc = max(0., e00900 - c03260 + e26270 + e02100 + e27200)
     if qbinc > 0. and PT_qbid_rt > 0.:
         qbid_before_limits = qbinc * PT_qbid_rt
         lower_thd = PT_qbid_taxinc_thd[MARS - 1]
@@ -1899,7 +1908,7 @@ def AGIsurtax(c00100, MARS, AGI_surtax_trt, AGI_surtax_thd, taxbc, surtax):
 def AMT(e07300, dwks13, standard, f6251, c00100, c18300, taxbc,
         c04470, c17000, c20800, c21040, e24515, MARS, sep, dwks19,
         dwks14, c05700, e62900, e00700, dwks10, age_head, age_spouse,
-        earned, cmbtp,
+        earned, cmbtp, qbided,
         AMT_child_em_c_age, AMT_brk1,
         AMT_em, AMT_prt, AMT_rt1, AMT_rt2,
         AMT_child_em, AMT_em_ps, AMT_em_pe,
@@ -1936,7 +1945,7 @@ def AMT(e07300, dwks13, standard, f6251, c00100, c18300, taxbc,
     c20800: float
         Schedule A: net limited miscellaneous deductions deducted
     c21040: float
-        Itemized deductiosn that are phased out
+        Itemized deductions that are phased out
     e24515: float
         Schedule D: Un-Recaptured Section 1250 Gain
     MARS: int
@@ -1963,6 +1972,8 @@ def AMT(e07300, dwks13, standard, f6251, c00100, c18300, taxbc,
         Earned income for filing unit
     cmbtp: float
         Estimate of income on (AMT) Form 6251 but not in AGI
+    qbided: float
+        Qualified business income deduction
     AMT_child_em_c_age: float
         Age ceiling for special AMT exemption
     AMT_brk1: float
@@ -2014,11 +2025,11 @@ def AMT(e07300, dwks13, standard, f6251, c00100, c18300, taxbc,
     # pylint: disable=too-many-statements,too-many-branches
     # Form 6251, Part I
     if standard == 0.0:
-        c62100 = (c00100 - e00700 - c04470 +
+        c62100 = (c00100 - e00700 - qbided - c04470 +
                   max(0., min(c17000, 0.025 * c00100)) +
                   c18300 + c20800 - c21040)
     if standard > 0.0:
-        c62100 = c00100 - e00700
+        c62100 = c00100 - e00700 - qbided
     c62100 += cmbtp  # add income not in AGI but considered income for AMT
     if MARS == 3:
         amtsepadd = max(0.,
@@ -2136,7 +2147,8 @@ def NetInvIncTax(e00300, e00600, e02000, e26270, c01000,
 @iterate_jit(nopython=True)
 def F2441(MARS, earned_p, earned_s, f2441, CDCC_c, e32800,
           exact, c00100, CDCC_ps, CDCC_ps2, CDCC_crt, CDCC_frt,
-          CDCC_prt, CDCC_refundable, c05800, e07300, c07180, CDCC_refund):
+          CDCC_po_step_size, CDCC_po_rate_per_step, CDCC_refundable,
+          c05800, e07300, c07180, CDCC_refund):
     """
     Calculates Form 2441 child and dependent care expense credit, c07180.
 
@@ -2166,16 +2178,18 @@ def F2441(MARS, earned_p, earned_s, f2441, CDCC_c, e32800,
         Child/dependent care credit phaseout rate ceiling
     CDCC_frt: float
         Child/dependent care credit phaseout rate floor
-    CDCC_prt: float
-        Child/dependent care credit phaseout rate
+    CDCC_po_step_size: float
+        Child/dependent care credit phaseout AGI step size
+    CDCC_po_rate_per_step: float
+        Child/dependent care credit phaseout rate per step size
+    CDCC_refund: bool
+        Indicator for whether CDCC is refundable
     c05800: float
         Total (regular + AMT) income tax liability before credits
     e07300: float
         Foreign tax credit from Form 1116
     c07180: float
         Credit for child and dependent care expenses from Form 2441
-    CDCC_refund: bool
-        Indicator for whether CDCC is refundable
 
     Returns
     -------
@@ -2192,22 +2206,22 @@ def F2441(MARS, earned_p, earned_s, f2441, CDCC_c, e32800,
     else:
         c32890 = earned_p
     c33000 = max(0., min(c32800, min(c32880, c32890)))
-    # credit is limited by AGI-related fraction
+    # credit rate is limited at high AGI
+    # ... first phase-down from CDCC_crt to CDCC_frt
+    steps_fractional = max(0., c00100 - CDCC_ps) / CDCC_po_step_size
     if exact == 1:  # exact calculation as on tax forms
-        # first phase-down from 35 to 20 percent
-        tratio1 = math.ceil(max(((c00100 - CDCC_ps) * CDCC_prt), 0.))
-        crate = max(CDCC_frt, CDCC_crt - min(CDCC_crt - CDCC_frt, tratio1))
-        # second phase-down from 20 percent to zero
-        if c00100 > CDCC_ps2:
-            tratio2 = math.ceil(max(((c00100 - CDCC_ps2) * CDCC_prt), 0.))
-            crate = max(0., CDCC_frt - min(CDCC_frt, tratio2))
+        steps = math.ceil(steps_fractional)
     else:
-        crate = max(CDCC_frt, CDCC_crt -
-                    max(((c00100 - CDCC_ps) * CDCC_prt), 0.))
-        if c00100 > CDCC_ps2:
-            crate = max(0., CDCC_frt -
-                        max(((c00100 - CDCC_ps2) * CDCC_prt), 0.))
-
+        steps = steps_fractional
+    crate = max(CDCC_frt, CDCC_crt - steps * CDCC_po_rate_per_step)
+    # ... second phase-down from CDCC_frt to zero
+    if c00100 > CDCC_ps2:
+        steps_fractional = (c00100 - CDCC_ps2) / CDCC_po_step_size
+        if exact == 1:  # exact calculation as on tax forms
+            steps = math.ceil(steps_fractional)
+        else:
+            steps = steps_fractional
+        crate = max(0., CDCC_frt - steps * CDCC_po_rate_per_step)
     c33200 = c33000 * crate
     # credit is limited by tax liability if not refundable
     if CDCC_refundable:
@@ -2441,7 +2455,7 @@ def ChildDepTaxCredit(age_head, age_spouse, nu18, n24, MARS, c00100, XTOT, num,
                       c07200,
                       CTC_c, CTC_ps, CTC_prt, exact, ODC_c,
                       CTC_c_under6_bonus, nu06,
-                      CTC_refundable, CTC_include17,
+                      CTC_is_refundable, CTC_include17,
                       c07220, odc, codtc_limited):
     """
     Computes amounts on "Child Tax Credit and Credit for Other Dependents
@@ -2540,7 +2554,7 @@ def ChildDepTaxCredit(age_head, age_spouse, nu18, n24, MARS, c00100, XTOT, num,
         line13 = line11 - line12
         line14 = 0.
         line15 = max(0., line13 - line14)
-        if CTC_refundable:
+        if CTC_is_refundable:
             c07220 = line10 * line1 / line3
             odc = max(0., line10 - c07220)
             codtc_limited = max(0., line10 - c07220 - odc)
@@ -2795,7 +2809,7 @@ def SchR(age_head, age_spouse, MARS, c00100,
 
 
 @iterate_jit(nopython=True)
-def EducationTaxCredit(exact, e87530, MARS, c00100, num, c05800,
+def EducationTaxCredit(exact, e87530, MARS, c00100, c05800,
                        e07300, c07180, c07200, c87668,
                        LLC_Expense_c, ETC_pe_Single, ETC_pe_Married,
                        CR_Education_hc,
@@ -2814,8 +2828,6 @@ def EducationTaxCredit(exact, e87530, MARS, c00100, num, c05800,
         Filing (marital) status. (1=single, 2=joint, 3=separate, 4=household-head, 5=widow(er))
     c00100: float
         Adjusted Gross Income (AGI)
-    num: int
-        2 when MARS is 2 (married filing jointly), otherwise 1
     c05800: float
         Total (regular + AMT) income tax liability before credits
     e07300: float
@@ -2846,14 +2858,19 @@ def EducationTaxCredit(exact, e87530, MARS, c00100, num, c05800,
     -----
     Tax Law Parameters that are not parameterized:
         0.2: Lifetime Learning Credit ratio against expense
+        10000.0: AGI range bewteen ETC_pe_Single and single phase-out start;
+                 twice this amount for ETC_pe_Married
     """
     c87560 = 0.2 * min(e87530, LLC_Expense_c)
+    # on the following credit phase-out law see:
+    # https://www.law.cornell.edu/uscode/text/26/25A#d_1
     if MARS == 2:
         c87570 = ETC_pe_Married * 1000.
+        c87600 = 20000.
     else:
         c87570 = ETC_pe_Single * 1000.
+        c87600 = 10000.
     c87590 = max(0., c87570 - c00100)
-    c87600 = 10000. * num
     if exact == 1:  # exact calculation as on tax forms
         c87610 = min(1., round(c87590 / c87600, 3))
     else:
@@ -2910,7 +2927,7 @@ def CharityCredit(e19800, e20100, c00100, CR_Charity_rt, CR_Charity_f,
 def NonrefundableCredits(c05800, e07240, e07260, e07300, e07400,
                          e07600, p08000, odc,
                          personal_nonrefundable_credit,
-                         CTC_refundable,
+                         CTC_is_refundable,
                          CR_RetirementSavings_hc, CR_ForeignTax_hc,
                          CR_ResidentialEnergy_hc, CR_GeneralBusiness_hc,
                          CR_MinimumTax_hc, CR_OtherCredits_hc, charity_credit,
@@ -2939,7 +2956,7 @@ def NonrefundableCredits(c05800, e07240, e07260, e07300, e07400,
         Other Dependent Credit
     personal_nonrefundable_credit: float
         Personal nonrefundable credit
-    CTC_refundable: bool
+    CTC_is_refundable: bool
         Whether the child tax credit is fully refundable
     CR_RetirementSavings_hc: float
         Credit for retirement savings haircut
@@ -3019,7 +3036,7 @@ def NonrefundableCredits(c05800, e07240, e07260, e07300, e07400,
     c07240 = min(e07240 * (1. - CR_RetirementSavings_hc), avail)
     avail = avail - c07240
     # Child tax credit
-    if not CTC_refundable:
+    if not CTC_is_refundable:
         c07220 = min(c07220, avail)
         avail = avail - c07220
         # Other dependent credit
@@ -3053,7 +3070,8 @@ def NonrefundableCredits(c05800, e07240, e07260, e07300, e07400,
 @iterate_jit(nopython=True)
 def AdditionalCTC(codtc_limited, ACTC_c, n24, earned, ACTC_Income_thd,
                   ACTC_rt, nu06, ACTC_rt_bonus_under6family, ACTC_ChildNum,
-                  CTC_refundable, CTC_include17, age_head, age_spouse, MARS, nu18,
+                  CTC_is_refundable, CTC_include17,
+                  age_head, age_spouse, MARS, nu18,
                   ptax_was, c03260, e09800, c59660, e11200,
                   c11070):
     """
@@ -3101,7 +3119,7 @@ def AdditionalCTC(codtc_limited, ACTC_c, n24, earned, ACTC_Income_thd,
     # Part I
     line3 = codtc_limited
 
-    if CTC_refundable:
+    if CTC_is_refundable:
         line4 = 0.
     else:
         if CTC_include17:
@@ -3142,7 +3160,8 @@ def AdditionalCTC(codtc_limited, ACTC_c, n24, earned, ACTC_Income_thd,
 def C1040(c05800, c07180, c07200, c07220, c07230, c07240, c07260, c07300,
           c07400, c07600, c08000, e09700, e09800, e09900, niit, othertaxes,
           c07100, c09200, odc, charity_credit,
-          personal_nonrefundable_credit, CTC_refundable, ODC_refundable):
+          personal_nonrefundable_credit,
+          CTC_is_refundable, ODC_is_refundable):
     """
     Computes total used nonrefundable credits, c07100, othertaxes, and
     income tax before refundable credits, c09200.
@@ -3203,8 +3222,9 @@ def C1040(c05800, c07180, c07200, c07220, c07230, c07240, c07260, c07300,
     """
     # total used nonrefundable credits (as computed in NonrefundableCredits)
     c07100 = (c07180 + c07200 + c07600 + c07300 + c07400 +
-              c07220 * (1. - CTC_refundable) + c08000 +
-              c07230 + c07240 + c07260 + odc * (1. - ODC_refundable) + charity_credit +
+              c07220 * (1. - CTC_is_refundable) + c08000 +
+              c07230 + c07240 + c07260 +
+              odc * (1. - ODC_is_refundable) + charity_credit +
               personal_nonrefundable_credit)
     # tax after credits (2016 Form 1040, line 56)
     tax_net_nonrefundable_credits = max(0., c05800 - c07100)
@@ -3305,8 +3325,8 @@ def CTC_new(CTC_new_c, CTC_new_rt, CTC_new_c_under6_bonus,
 @iterate_jit(nopython=True)
 def IITAX(c59660, c11070, c10960, personal_refundable_credit, ctc_new, rptc,
           c09200, payrolltax, CDCC_refund, recovery_rebate_credit,
-          eitc, c07220, odc, CTC_refundable, ODC_refundable, refund,
-          ctc_total, ctc_refundable, iitax, combined):
+          eitc, c07220, odc, CTC_is_refundable, ODC_is_refundable, refund,
+          ctc_total, ctc_refundable, ctc_nonrefundable, iitax, combined):
     """
     Computes final taxes.
 
@@ -3352,17 +3372,19 @@ def IITAX(c59660, c11070, c10960, personal_refundable_credit, ctc_new, rptc,
         Total CTC amount (c07220 + c11070 + odc + ctc_new)
     ctc_refundable: float
         Portion of total CTC amount that is refundable
+    ctc_nonrefundable: float
+        Portion of total CTC amount that is nonrefundable
     iitax: float
         Total federal individual income tax liability
     combined: float
         Sum of iitax and payrolltax and lumpsum_tax
     """
     eitc = c59660
-    if CTC_refundable:
+    if CTC_is_refundable:
         ctc_refund = c07220
     else:
         ctc_refund = 0.
-    if ODC_refundable:
+    if ODC_is_refundable:
         odc_refund = odc
     else:
         odc_refund = 0.
@@ -3371,9 +3393,11 @@ def IITAX(c59660, c11070, c10960, personal_refundable_credit, ctc_new, rptc,
               odc_refund)
     ctc_total = c07220 + c11070 + odc + ctc_new
     ctc_refundable = ctc_refund + c11070 + odc_refund + ctc_new
+    ctc_nonrefundable = max(0., ctc_total - ctc_refundable)
     iitax = c09200 - refund
     combined = iitax + payrolltax
-    return (eitc, refund, ctc_total, ctc_refundable, iitax, combined)
+    return (eitc, refund, ctc_total, ctc_refundable, ctc_nonrefundable,
+            iitax, combined)
 
 
 @JIT(nopython=True)

{taxcalc-4.2.0 → taxcalc-4.2.2}/taxcalc/data.py

@@ -102,7 +102,7 @@ class Data():
                 # ... weights must be same size as data
                 if self.array_length > len(self.WT.index):
                     raise ValueError("Data has more records than weights.")
-                elif self.array_length < len(self.WT.index):
+                if self.array_length < len(self.WT.index):
                     # scale-up sub-sample weights by year-specific factor
                     sum_full_weights = self.WT.sum()
                     self.WT = self.WT.iloc[self.__index]
@@ -110,9 +110,11 @@ class Data():
                     factor = sum_full_weights / sum_sub_weights
                     self.WT *= factor
                 # ... construct sample weights for current_year
-                wt_colname = 'WT{}'.format(self.current_year)
-                if wt_colname in self.WT.columns:
-                    self.s006 = self.WT[wt_colname] * 0.01
+                wt_colname = f'WT{self.current_year}'
+                assert wt_colname in self.WT.columns, (
+                    f'no weights for start year {self.current_year}'
+                )
+                self.s006 = self.WT[wt_colname] * 0.01
 
     @property
     def data_year(self):
@@ -146,7 +148,10 @@ class Data():
             # ... apply variable extrapolation growth factors
             self._extrapolate(self.__current_year)
             # ... specify current-year sample weights
-            wt_colname = 'WT{}'.format(self.__current_year)
+            wt_colname = f'WT{self.__current_year}'
+            assert wt_colname in self.WT.columns, (
+                f'no weights for new year {self.current_year}'
+            )
             self.s006 = self.WT[wt_colname] * 0.01
 
     # ----- begin private methods of Data class -----