taxcalc 5.1.0__tar.gz → 5.3.0__tar.gz

{taxcalc-5.1.0 → taxcalc-5.3.0}/.github/workflows/build_and_test.yml

@@ -1,4 +1,4 @@
-name: Build Package and Test Source Code [Python 3.10, 3.11, 3.12]
+name: Build Package and Test Source Code [Python 3.11, 3.12, 3.13]
 
 on: [push, pull_request]
 
@@ -8,7 +8,7 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest, windows-latest]
-        python-version: ['3.10', '3.11', '3.12']
+        python-version: ['3.11', '3.12', '3.13']
 
     steps:
       - name: Checkout

{taxcalc-5.1.0 → taxcalc-5.3.0}/Makefile

@@ -85,7 +85,8 @@ TOPLEVEL_JSON_FILES := $(shell ls -l ./*json | awk '{print $$9}')
 TAXCALC_JSON_FILES := $(shell ls -l ./taxcalc/*json | awk '{print $$9}')
 TESTS_JSON_FILES := $(shell ls -l ./taxcalc/tests/*json | awk '{print $$9}')
 PYLINT_DISABLE = locally-disabled,duplicate-code,cyclic-import
-PYLINT_OPTIONS = --disable=$(PYLINT_DISABLE) --score=no --jobs=4
+PYLINT_OPTIONS = --disable=$(PYLINT_DISABLE) --score=no --jobs=4 \
+                 --check-quote-consistency=yes
 EXCLUDED_PATHS = docs,taxcalc/validation
 
 .PHONY=cstest

{taxcalc-5.1.0/taxcalc.egg-info → taxcalc-5.3.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: taxcalc
-Version: 5.1.0
+Version: 5.3.0
 Summary: Tax-Calculator
 Home-page: https://github.com/PSLmodels/Tax-Calculator
 Download-URL: https://github.com/PSLmodels/Tax-Calculator
@@ -12,9 +12,9 @@ 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.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
+Classifier: Programming Language :: Python :: 3.13
 Classifier: Topic :: Software Development :: Libraries :: Python Modules
 Description-Content-Type: text/markdown
 License-File: LICENSE
@@ -36,7 +36,7 @@ Dynamic: summary
 | | |
 | --- | --- |
 | 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.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.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/) [![Python 3.13](https://img.shields.io/badge/python-3.13-blue.svg)](https://www.python.org/downloads/release/python-3131/)  [![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) |
 
 
@@ -57,6 +57,3 @@ explains the workflow involved in contributing model enhancements.
 
 Complete documentation is available
 [here](https://PSLmodels.github.io/Tax-Calculator/).
-This documentation includes
-[examples](https://taxcalc.pslmodels.org/usage/tcja_after_2025.html)
-of how to analyze different ways of extending TCJA policy beyond 2025.

{taxcalc-5.1.0 → taxcalc-5.3.0}/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.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.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/) [![Python 3.13](https://img.shields.io/badge/python-3.13-blue.svg)](https://www.python.org/downloads/release/python-3131/)  [![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) |
 
 
@@ -22,6 +22,3 @@ explains the workflow involved in contributing model enhancements.
 
 Complete documentation is available
 [here](https://PSLmodels.github.io/Tax-Calculator/).
-This documentation includes
-[examples](https://taxcalc.pslmodels.org/usage/tcja_after_2025.html)
-of how to analyze different ways of extending TCJA policy beyond 2025.

{taxcalc-5.1.0 → taxcalc-5.3.0}/conda.recipe/meta.yaml

@@ -8,7 +8,7 @@ build:
 
 requirements:
   build:
-    - "python>=3.10, <3.13"
+    - "python>=3.11, <3.14"
     - "numpy>=1.26"
     - "pandas>=2.2"
     - "bokeh>=3.7"
@@ -19,7 +19,7 @@ requirements:
     - behresp
 
   run:
-    - "python>=3.10, <3.13"
+    - "python>=3.11, <3.14"
     - "numpy>=1.26"
     - "pandas>=2.2"
     - "bokeh>=3.7"

{taxcalc-5.1.0 → taxcalc-5.3.0}/docs/about/releases.md

@@ -3,8 +3,66 @@ Release history
 Go [here](https://github.com/PSLmodels/Tax-Calculator/pulls?q=is%3Apr+is%3Aclosed)
 for a complete commit history.
 
+2025-09-19 Release 5.3.0
+------------------------
+(last merged pull request is
+[#2957](https://github.com/PSLmodels/Tax-Calculator/pull/2957))
+
+**This is an enhancement release.**
+
+**API Changes**
+
+**New Features**
+- Update new PUF weights and ratios files.
+  [[#2925](https://github.com/PSLmodels/Tax-Calculator/pull/2925) by
+  Bodi Yang], from the update in [[TaxData PR #452](https://github.com/PSLmodels/
+  taxdata/pull/452) by Bodi Yang]
+
+  Note: PUF users are required to produce new `puf.csv` file from TaxData repository and replace the old file in the Tax-Calculator directory.
+  Correct usage: Tax-Calculator >= 5.3.0 versions are compatible with the newly produced `puf.csv` file; Tax-Calculator <= 5.2.0 versions are compatible with the previous `puf.csv` file
+
+- Make `FST_AGI_thd` parameters to be non inflation-indexed
+  [[#2951](https://github.com/PSLmodels/Tax-Calculator/pull/2951) by
+  Martin Holmer]
+
+- Add support for Python 3.13
+  [[#2953](https://github.com/PSLmodels/Tax-Calculator/pull/2953) by
+  Martin Holmer]
+
+- Add tests for consistent quote style
+  [[#2954](https://github.com/PSLmodels/Tax-Calculator/pull/2954) by
+  Martin Holmer]
+
+- Allow CLI --dumpvars DUMPVARS to be the ALL string
+  [[#2956](https://github.com/PSLmodels/Tax-Calculator/pull/2956) by
+  Martin Holmer]
+
+- Add documentation on using sub-national TMD weights with CLI tool
+  [[#2957](https://github.com/PSLmodels/Tax-Calculator/pull/2957) by
+  Martin Holmer]
+
+
+
+2025-08-08 Release 5.2.0
+------------------------
+(last merged pull request is
+[#2944](https://github.com/PSLmodels/Tax-Calculator/pull/2944))
+
+**This is an enhancement release.**
+
+**API Changes**
+
+**New Features**
+- Make OBBBA reform be current-law policy in several PRs described in
+  [issue
+  2926](https://github.com/PSLmodels/Tax-Calculator/issues/2926) by
+  Martin Holmer
+- Extend CPS and PUF aggregate tests through 2035
+  [[#2944](https://github.com/PSLmodels/Tax-Calculator/pull/2944) by
+  Martin Holmer]
+
 
-2025-07-23 Release 5.1.0
+2025-07-22 Release 5.1.0
 ------------------------
 (last merged pull request is
 [#2933](https://github.com/PSLmodels/Tax-Calculator/pull/2933))

{taxcalc-5.1.0 → taxcalc-5.3.0}/docs/contributing/RELEASING.md

@@ -20,10 +20,6 @@ In the top-level Tax-Calculator directory, do the following:
 
 --> 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 cstest`  [to confirm project coding style is being followed]
 
 --> run `make pytest-all`  [or `pytest -m pre_release -n4` in taxcalc subdir]

{taxcalc-5.1.0 → taxcalc-5.3.0}/docs/index.md

@@ -54,7 +54,7 @@ cross-model validation work with NBER's TAXSIM-35 model is described
 
 ## Latest release
 
-{doc}`5.1.0 (2025-07-23) <about/releases>`
+{doc}`5.3.0 (2025-09-19) <about/releases>`
 
 If you are already using Tax-Calculator, upgrade using the following command:
 ```
@@ -83,4 +83,4 @@ If you wish to provide a link to Tax-Calculator, the preferred URL is:
 `https://PSLmodels.github.io/Tax-Calculator`.
 Additionally, we strongly recommend that you describe the input data used,
 and provide a link to the materials required to replicate your analysis or,
-at least, note that those materials are available upon request.
+at least, note that those materials are available upon request.

taxcalc-5.3.0/docs/recipes/_static/reformA.json

@@ -0,0 +1,10 @@
+{
+    "policy": {
+        // raise personal exemption amount and index in subsequent years
+        "II_em": {"2020": 1000},
+        // raise non-AMT tax rates in the top three brackets
+        "II_rt5": {"2020": 0.36},
+        "II_rt6": {"2020": 0.39},
+        "II_rt7": {"2020": 0.41}
+    }
+}

{taxcalc-5.1.0 → taxcalc-5.3.0}/docs/usage/data.md

@@ -61,7 +61,7 @@ file.
 
 The [tax-microdata
 repository](https://github.com/PSLmodels/tax-microdata-benchmarking)
-produces an input variables file (`tmd.csv.gz`), a national weights
+produces an input variables file (`tmd.csv.gz`), 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 files are available
@@ -77,6 +77,41 @@ Tax-Calculator in two ways:
   - with the **CLI tool**, `tc`, when the three TMD files are all in
     the same folder and the `tmd.csv.gz` file has been unzipped.
 
+The [tax-microdata
+repository](https://github.com/PSLmodels/tax-microdata-benchmarking)
+also produces state and Congressional district weights files that can
+be used to estimate federal taxes for various sub-national areas.  The
+easiest way to produce sub-national federal tax estimates is to supply
+the **CLI tool** with the value of an environmental variable
+(`TMD_AREA`) that indicates the sub-national area.  So, for example,
+if you have the New Mexico state weights in the
+`nm_tmd_weights.csv.gz` file, put that file in the folder that
+contains the three national TMD files described above.  Then, execute
+this command for tabular output under 2024 current-law policy:
+```
+(taxcalc-dev) myruns> TMD_AREA=nm tc tmd.csv 2024 --exact --tables
+Read input data for 2021; input data were extrapolated to 2024
+Write tabular output to file tmd_nm-24-#-#-#.tables
+Execution time is 8.2 seconds
+(taxcalc-dev) myruns> awk '$1~/Ret/||$1~/A/' tmd_nm-24-#-#-#.tables | head -2
+    Returns    ExpInc    IncTax    PayTax     LSTax    AllTax
+ A     1.17      87.0       7.2       6.9       0.0      14.1
+```
+
+Or for the first Congressional district in New Mexico, put the
+`nm01_tmd_weights.csv.gz` file in the folder with the other TMD
+files and execute this command:
+```
+(taxcalc-dev) myruns> TMD_AREA=nm01 tc tmd.csv 2024 --exact --tables
+Read input data for 2021; input data were extrapolated to 2024
+Write tabular output to file tmd_nm01-24-#-#-#.tables
+Execution time is 8.3 seconds
+(taxcalc-dev) myruns> awk '$1~/Ret/||$1~/A/' tmd_nm01-24-#-#-#.tables | head -2
+    Returns    ExpInc    IncTax    PayTax     LSTax    AllTax
+ A     0.40      31.9       2.8       2.5       0.0       5.3
+```
+
+
 ## Using other data with Tax-Calculator
 
 Using other data sources with Tax-Calculator is possible.  Users can

{taxcalc-5.1.0 → taxcalc-5.3.0}/docs/usage/tcja_after_2025.md

@@ -1,4 +1,14 @@
-# TCJA after 2025
+# OBBBA: TCJA after 2025
+
+TCJA was replaced by OBBBA when the latter was signed into law on July
+4, 2025.  Beginning with Tax-Calculator 5.2.0, OBBBA is current-law
+policy.  How the OBBBA changes were implemented as current-law policy
+is described in detail in closed [issue
+2926](https://github.com/PSLmodels/Tax-Calculator/issues/2926).
+
+----------------------------------------------------------------------
+
+**THE FOLLOWING TEXT IS OF HISTORICAL INTEREST ONLY:**
 
 Many provisions of the TCJA are temporary and are scheduled to end
 after 2025 under current-law policy.  Tax policy parameters that are
@@ -331,4 +341,3 @@ added to the `policy_current_law.json` file thereby changing the
 Beginning with the 4.5.0 version, Tax-Calculator incorporates the
 January 2025 CBO economic projection and contains historical tax
 policy parameter values through 2025.
-

{taxcalc-5.1.0 → taxcalc-5.3.0}/environment.yml

@@ -2,7 +2,7 @@ name: taxcalc-dev
 channels:
   - conda-forge
 dependencies:
-- "python>=3.10, <3.13"
+- "python>=3.11, <3.14"
 - "numpy>=1.26"
 - "pandas>=2.2"
 - "bokeh>=3.7"

{taxcalc-5.1.0 → taxcalc-5.3.0}/pytest.ini

@@ -7,8 +7,8 @@ markers =
     local
     benefits
     compatible_data
+    cps
     cpscsv_agg
-    extend_tcja
     itmded_vars
     pufcsv_agg
     qbid

{taxcalc-5.1.0 → taxcalc-5.3.0}/setup.py

@@ -7,7 +7,7 @@ from setuptools import setup
 with open("README.md", "r", encoding="utf-8") as f:
     longdesc = f.read()
 
-VERSION = "5.1.0"
+VERSION = "5.3.0"
 
 config = {
     "description": "Tax-Calculator",
@@ -35,9 +35,9 @@ config = {
         "Operating System :: OS Independent",
         "Programming Language :: Python",
         "Programming Language :: Python :: 3",
-        "Programming Language :: Python :: 3.10",
         "Programming Language :: Python :: 3.11",
         "Programming Language :: Python :: 3.12",
+        "Programming Language :: Python :: 3.13",
         "Topic :: Software Development :: Libraries :: Python Modules",
     ],
     "tests_require": ["pytest"],

{taxcalc-5.1.0 → taxcalc-5.3.0}/taxcalc/__init__.py

@@ -14,6 +14,6 @@ from taxcalc.taxcalcio import *
 from taxcalc.utils import *
 from taxcalc.cli import *
 
-__version__ = '5.1.0'
-__min_python3_version__ = 10
-__max_python3_version__ = 12
+__version__ = '5.3.0'
+__min_python3_version__ = 11
+__max_python3_version__ = 13

{taxcalc-5.1.0 → taxcalc-5.3.0}/taxcalc/calcfunctions.py

@@ -943,8 +943,9 @@ def ItemDed(e17500, e18400, e18500, e19200,
             ID_Medical_c, ID_StateLocalTax_c, ID_RealEstate_c,
             ID_InterestPaid_c, ID_Charity_c, ID_Casualty_c,
             ID_Miscellaneous_c, ID_AllTaxes_c, ID_AllTaxes_hc,
+            ID_AllTaxes_c_ps, ID_AllTaxes_c_po_rate, ID_AllTaxes_c_po_floor,
             ID_StateLocalTax_crt, ID_RealEstate_crt, ID_Charity_f,
-            ID_reduction_salt_rate, ID_reduction_other_rate):
+            ID_reduction_rate):
     """
     Calculates itemized deductions, Form 1040, Schedule A.
 
@@ -1057,10 +1058,16 @@ def ItemDed(e17500, e18400, e18500, e19200,
         Ceiling on the amount of miscellaneous expense deduction
         allowed (dollars)
     ID_AllTaxes_c: list
-        Ceiling on the amount of state and local income, stales, and
+        Cap on the amount of state and local income, sales, and
         real estate deductions allowed (dollars)
     ID_AllTaxes_hc: float
         State and local income, sales, and real estate tax deduciton haircut
+    ID_AllTaxes_c_ps: float
+        AGI level above which ID_AllTaxes_c is reduced
+    ID_AllTaxes_c_po_rate: float
+        ID_AllTaxes_c reduction rate when AGI is above ID_AllTaxes_c_ps
+    ID_AllTaxes_c_po_floor: float
+        Floor below which ID_AllTaxes_c cannot be reduced
     ID_StateLocalTax_crt: float
         Ceiling (as decimal fraction of AGI) for the combination of all
         state and local income and sales tax deductions
@@ -1069,10 +1076,8 @@ def ItemDed(e17500, e18400, e18500, e19200,
         state, local, and foreign real estate tax deductions
     ID_Charity_f: list
         Floor on the amount of charity expense deduction allowed (dollars)
-    ID_reduction_salt_rate: float
-        OBBBA reduction rate for SALT deductions
-    ID_reduction_other_rate: float
-        OBBBA reduction rate for other deductions
+    ID_reduction_rate: float
+        OBBBA reduction rate for all itemized deductions
 
     Returns
     -------
@@ -1115,7 +1120,12 @@ def ItemDed(e17500, e18400, e18500, e19200,
     c18400 = min(c18400, ID_StateLocalTax_crt * max(c00100, 0.0001))
     c18500 = min(c18500, ID_RealEstate_crt * max(c00100, 0.0001))
     c18300 = (c18400 + c18500) * (1. - ID_AllTaxes_hc)
-    c18300 = min(c18300, ID_AllTaxes_c[MARS - 1])
+    cap = ID_AllTaxes_c[MARS - 1]
+    if posagi > ID_AllTaxes_c_ps[MARS - 1]:
+        excess_agi = posagi - ID_AllTaxes_c_ps[MARS - 1]
+        cap = max(0., cap - excess_agi * ID_AllTaxes_c_po_rate)
+        cap = max(cap, ID_AllTaxes_c_po_floor[MARS - 1])
+    c18300 = min(c18300, cap)
     # Interest paid
     c19200 = e19200 * (1. - ID_InterestPaid_hc)
     c19200 = min(c19200, ID_InterestPaid_c[MARS - 1])
@@ -1154,16 +1164,11 @@ def ItemDed(e17500, e18400, e18500, e19200,
     # OBBBA limitation on total itemized deductions
     # (no attempt to adjust c04470 components for limitation)
     reduction = 0.
-    if ID_reduction_salt_rate > 0. or ID_reduction_other_rate > 0.:
-        assert c21040 <= 0.0, "Pease and OBBBA cannot both be in effect"
+    if ID_reduction_rate > 0.:
+        assert c21040 <= 0.0, 'Pease and OBBBA cannot both be in effect'
         tincome = max(0., c00100 - c04600)
         texcess = max(0., tincome - II_brk6[MARS - 1])
-        smaller_salt = min(c18300, texcess)
-        salt_reduction = ID_reduction_salt_rate * smaller_salt
-        other_deds = max(0, c04470 - c18300)
-        smaller_other = min(other_deds, texcess)
-        other_reduction = ID_reduction_other_rate * smaller_other
-        reduction = salt_reduction + other_reduction
+        reduction = ID_reduction_rate * texcess
     c04470 = max(0., c04470 - reduction)
     # Cap total itemized deductions
     # (no attempt to adjust c04470 components for limitation)
@@ -2197,7 +2202,7 @@ def F2441(MARS, earned_p, earned_s, f2441, CDCC_c, e32800, exact, c00100,
         )
         # ... second phase-down from CDCC_po1_rate_min to CDCC_po2_rate_min
         ps2 = CDCC_ps2[MARS - 1]
-        assert ps2 >= ps1, "CDCC_ps2 must be no less than CDCC_ps1"
+        assert ps2 >= ps1, 'CDCC_ps2 must be no less than CDCC_ps1'
         if c00100 > ps2:
             steps_fractional = (c00100 - ps2) / CDCC_po2_step_size[MARS - 1]
             if exact == 1:  # exact calculation as on tax forms

{taxcalc-5.1.0 → taxcalc-5.3.0}/taxcalc/calculator.py

@@ -282,7 +282,7 @@ class Calculator():
         """
         if param_value is None:
             val = getattr(self.__policy, param_name)
-            if param_name.startswith("_"):
+            if param_name.startswith('_'):
                 return val
             return val[0]  # drop down a dimension.
         setattr(self.__policy, param_name, param_value)
@@ -1214,11 +1214,11 @@ class Calculator():
                         # ... write optional param-vector-index line
                         if isinstance(pval, list):
                             labels = paramtools.consistent_labels(
-                                [mdata_base[pname]["value"][0]]
+                                [mdata_base[pname]['value'][0]]
                             )
                             label = None
                             for _label in labels:
-                                if _label not in ("value", "year"):
+                                if _label not in ('value', 'year'):
                                     label = _label
                                     break
                             if label:

{taxcalc-5.1.0 → taxcalc-5.3.0}/taxcalc/cli/tc.py

@@ -96,23 +96,23 @@ def cli_tc_main():
                               '"stair-step" provisions in the tax law that '
                               'complicate marginal-tax-rate calculations.'),
                         default=False,
-                        action="store_true")
+                        action='store_true')
     parser.add_argument('--params',
                         help=('optional flag that causes policy parameter '
                               'values for baseline and reform to be written '
                               'to separate text files.'),
                         default=False,
-                        action="store_true")
+                        action='store_true')
     parser.add_argument('--tables',
                         help=('optional flag that causes distributional '
                               'tables to be written to a text file.'),
                         default=False,
-                        action="store_true")
+                        action='store_true')
     parser.add_argument('--graphs',
                         help=('optional flag that causes graphs to be written '
                               'to HTML files for viewing in browser.'),
                         default=False,
-                        action="store_true")
+                        action='store_true')
     parser.add_argument('--dumpdb',
                         help=('optional flag that causes TAXYEAR variable '
                               'values for each tax-unit under both '
@@ -121,7 +121,7 @@ def cli_tc_main():
                               'included in the database are controlled by '
                               'the --dumpvars option).'),
                         default=False,
-                        action="store_true")
+                        action='store_true')
     parser.add_argument('--dumpvars',
                         help=('DUMPVARS is name of optional file containing a '
                               'space-delimited list of variables to include '
@@ -129,7 +129,9 @@ def cli_tc_main():
                               'a minimal set of variables.  Valid variable '
                               'names include all variables in the '
                               'records_variables.json file plus mtr_itax and '
-                              'mtr_ptax (MTRs wrt taxpayer earnings).'),
+                              'mtr_ptax (MTRs wrt taxpayer earnings).  If '
+                              'DUMPVARS is ALL, then all valid variable names '
+                              'are included in the dump database.'),
                         default=None)
     parser.add_argument('--runid', metavar='N',
                         help=('N is a positive integer run id that is used '
@@ -142,23 +144,23 @@ def cli_tc_main():
                         help=('optional flag that suppresses messages about '
                               'input and output actions.'),
                         default=False,
-                        action="store_true")
+                        action='store_true')
     parser.add_argument('--test',
                         help=('optional flag that conducts installation '
                               'test, writes test result to stdout, '
                               'and quits leaving the test-related files.'),
                         default=False,
-                        action="store_true")
+                        action='store_true')
     parser.add_argument('--version',
                         help=('optional flag that writes Tax-Calculator '
                               'release version to stdout and quits.'),
                         default=False,
-                        action="store_true")
+                        action='store_true')
     parser.add_argument('--usage',
                         help=('optional flag that writes short usage '
                               'reminder to stdout and quits.'),
                         default=False,
-                        action="store_true")
+                        action='store_true')
     args = parser.parse_args()
     using_error_file = args.silent and args.runid != 0
     efilename = f'run{args.runid}.errors'
@@ -246,7 +248,9 @@ def cli_tc_main():
     # specify dumpvars_str from args.dumpvars file
     dumpvars_str = ''
     if args.dumpvars:
-        if os.path.exists(args.dumpvars):
+        if args.dumpvars == 'ALL':
+            dumpvars_str = 'ALL'
+        elif os.path.exists(args.dumpvars):
             with open(args.dumpvars, 'r', encoding='utf-8') as dfile:
                 dumpvars_str = dfile.read()
         else:

{taxcalc-5.1.0 → taxcalc-5.3.0}/taxcalc/data.py

@@ -109,7 +109,7 @@ class Data():
                 self._read_weights(weights)
                 # ... weights must be same size as data
                 if self.array_length > len(self.WT.index):
-                    raise ValueError("Data has more records than weights.")
+                    raise ValueError('Data has more records than weights.')
                 if self.array_length < len(self.WT.index):
                     # scale-up sub-sample weights by year-specific factor
                     sum_full_weights = self.WT.sum()

{taxcalc-5.1.0 → taxcalc-5.3.0}/taxcalc/decorators.py

@@ -39,7 +39,7 @@ def id_wrapper(*dec_args, **dec_kwargs):  # pylint: disable=unused-argument
     return wrap
 
 
-if DO_JIT is False or 'NOTAXCALCJIT' in os.environ:
+if DO_JIT is False or "NOTAXCALCJIT" in os.environ:
     JIT = id_wrapper
 else:
     JIT = numba.jit
@@ -89,7 +89,8 @@ def create_apply_function_string(sigout, sigin, parameters):
     out_args = ["x_" + str(i) for i in range(0, len(sigout))]
     in_args = ["x_" + str(i) for i in range(len(sigout), total_len)]
 
-    fstr.write(f"def ap_func({','.join(out_args + in_args)}):\n")
+    all_args = ",".join(out_args + in_args)
+    fstr.write(f"def ap_func({all_args}):\n")
     fstr.write("  for i in range(len(x_0)):\n")
     out_index = [x + "[i]" for x in out_args]
     in_index = []
@@ -194,8 +195,8 @@ def make_apply_function(func, out_args, in_args, parameters,
     eval(func_code,  # pylint: disable=eval-used
          {"jitted_f": jitted_f}, fakeglobals)
     if do_jit:
-        return JIT(**kwargs)(fakeglobals['ap_func'])
-    return fakeglobals['ap_func']
+        return JIT(**kwargs)(fakeglobals["ap_func"])
+    return fakeglobals["ap_func"]
 
 
 def apply_jit(dtype_sig_out, dtype_sig_in, parameters=None, **kwargs):
@@ -256,7 +257,7 @@ def iterate_jit(parameters=None, **kwargs):
         # Get the input arguments from the function
         in_args = inspect.getfullargspec(func).args
         # Get the numba.jit arguments
-        jit_args_list = inspect.getfullargspec(JIT).args + ['nopython']
+        jit_args_list = inspect.getfullargspec(JIT).args + ["nopython"]
         kwargs_for_jit = {}
         for key, val in kwargs.items():
             if key in jit_args_list:
@@ -280,7 +281,7 @@ def iterate_jit(parameters=None, **kwargs):
         # the AST of the function
         grn = GetReturnNode()
         all_out_args = None
-        for node in ast.walk(ast.parse(''.join(src))):
+        for node in ast.walk(ast.parse("".join(src))):
             all_out_args = grn.visit(node)
             if all_out_args:
                 break
@@ -301,7 +302,7 @@ def iterate_jit(parameters=None, **kwargs):
             in iterate_jit decorator.
             """
             # os TESTING environment only accepts string arguments
-            if os.getenv('TESTING') == 'True':
+            if os.getenv("TESTING") == "True":
                 return func(*args, **kwargs)
 
             in_arrays = []
@@ -321,7 +322,7 @@ def iterate_jit(parameters=None, **kwargs):
             fakeglobals = {}
             eval(func_code,  # pylint: disable=eval-used
                  {"applied_f": applied_jitted_f}, fakeglobals)
-            high_level_fn = fakeglobals['hl_func']
+            high_level_fn = fakeglobals["hl_func"]
             ans = high_level_fn(*args, **kwargs)
             return ans
 

{taxcalc-5.1.0 → taxcalc-5.3.0}/taxcalc/growfactors.py

@@ -35,7 +35,8 @@ class GrowFactors():
     -----
     Typical usage is "gfactor = GrowFactors()", which produces an object
     containing baseline growth factors in the GrowFactors.FILE_NAME file,
-    which is for use with puf and cps data from the taxdata repository.
+    which is used to extrapolate cps and puf data from the taxdata repository,
+    and is used to index policy parameters.
     """
 
     PACKAGE_FILE_NAMES = ['growfactors.csv']