taxcalc 4.6.1__tar.gz → 4.6.2__tar.gz

{taxcalc-4.6.1/taxcalc.egg-info → taxcalc-4.6.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: taxcalc
-Version: 4.6.1
+Version: 4.6.2
 Summary: Tax-Calculator
 Home-page: https://github.com/PSLmodels/Tax-Calculator
 Download-URL: https://github.com/PSLmodels/Tax-Calculator
@@ -22,7 +22,7 @@ Requires-Dist: numpy>=1.26
 Requires-Dist: pandas>=2.2
 Requires-Dist: bokeh>=2.4
 Requires-Dist: numba
-Requires-Dist: paramtools>=0.19.0
+Requires-Dist: paramtools>=0.20.0
 Dynamic: classifier
 Dynamic: description
 Dynamic: description-content-type
@@ -57,3 +57,6 @@ 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-4.6.1 → taxcalc-4.6.2}/README.md

@@ -22,3 +22,6 @@ 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-4.6.1 → taxcalc-4.6.2}/conda.recipe/meta.yaml

@@ -12,7 +12,7 @@ requirements:
     - "numpy>=1.26"
     - "pandas>=2.2"
     - "bokeh>=3.7"
-    - "paramtools>=0.19.0"
+    - "paramtools>=0.20.0"
     - numba
     - curl
     - openpyxl
@@ -23,7 +23,7 @@ requirements:
     - "numpy>=1.26"
     - "pandas>=2.2"
     - "bokeh>=3.7"
-    - "paramtools>=0.19.0"
+    - "paramtools>=0.20.0"
     - numba
     - curl
     - openpyxl

{taxcalc-4.6.1 → taxcalc-4.6.2}/docs/about/releases.md

@@ -4,6 +4,24 @@ Go [here](https://github.com/PSLmodels/Tax-Calculator/pulls?q=is%3Apr+is%3Aclose
 for a complete commit history.
 
 
+2025-05-16 Release 4.6.2
+------------------------
+(last merged pull request is
+[#2905](https://github.com/PSLmodels/Tax-Calculator/pull/2905))
+
+**This is a bug-fix release.**
+
+**API Changes**
+
+**New Features**
+
+**Bug Fixes**
+- Work around multiple-indexing-change limitations in `parameters.py` code
+[[#2904](https://github.com/PSLmodels/Tax-Calculator/pull/2904) by Martin Holmer]
+- Require `paramtools` 0.20.0 that works with the current `marshmallow` 4.0.0
+[[#2905](https://github.com/PSLmodels/Tax-Calculator/pull/2905) by Martin Holmer]
+
+
 2025-05-09 Release 4.6.1
 ------------------------
 (last merged pull request is

{taxcalc-4.6.1 → taxcalc-4.6.2}/docs/guide/cli.md

@@ -560,3 +560,7 @@ Execution time is 60.9 seconds
 discusses how much faster this is relative to executing ten separate
 `tc` runs, and also shows how to tabulate the ten-year aggregate
 reform result from the files generated by this run.
+
+More examples of analyzing different versions of the TCJA after 2025
+are available in this
+[document](https://taxcalc.pslmodels.org/usage/tcja_after_2025.html).

{taxcalc-4.6.1 → taxcalc-4.6.2}/docs/index.md

@@ -54,7 +54,7 @@ cross-model validation work with NBER's TAXSIM-35 model is described
 
 ## Latest release
 
-{doc}`4.6.1 (2025-05-09) <about/releases>`
+{doc}`4.6.2 (2025-05-16) <about/releases>`
 
 If you are already using Tax-Calculator, upgrade using the following command:
 ```

taxcalc-4.6.2/docs/usage/tcja_after_2025.md

@@ -0,0 +1,333 @@
+# TCJA after 2025
+
+Many provisions of the TCJA are temporary and are scheduled to end
+after 2025 under current-law policy.  Tax policy parameters that are
+associated with expiring provisions and that are not inflation indexed
+will revert to their 2017 values in 2026.  Tax policy parameters that
+are associated with expiring provisions and that are inflation indexed
+will revert to their 2017 values indexed to 2026 using a chained CPI-U
+inflation factor.  For a list of the ending TCJA provisions, see this
+Congressional Research Service document: [Reference Table: Expiring
+Provisions in the "Tax Cuts and Jobs Act" (TCJA, P.L. 115-97)](
+https://crsreports.congress.gov/product/pdf/R/R47846), which is dated
+November 21, 2023.
+
+This document provides examples of using the PSLmodels Tax-Calculator
+command-line-interface tool
+[tc](https://taxcalc.pslmodels.org/guide/cli.html) with the newer
+`tmd.csv` file generated in the PSLmodels
+[tax-microdata](https://github.com/PSLmodels/tax-microdata-benchmarking)
+repository.  The `tmd` data and weights are based on the 2015 IRS/SOI
+PUF data and on recent CPS data, and therefore, are the best data to
+use with Tax-Calculator.  All the examples assume you have the [three
+`tmd` data
+files](https://taxcalc.pslmodels.org/usage/data.html#irs-public-use-data-tmd-csv)
+in the parent directory of your working directory.  The `tmd` data
+contain information on 225,256 tax filing units.
+
+Before reading the rest of this document, be sure you understand how
+to use the Tax-Calculator command-line tool
+[tc](https://taxcalc.pslmodels.org/guide/cli.html), particularly the
+`--baseline` and `--reform` command-line options.  For complete and
+up-to-date `tc` documentation, enter `tc --help` at the command
+prompt.  Omitting the `--baseline` option means the baseline policy is
+current-law policy.  Omitting the `--reform` option means the reform
+policy is current-law policy.  The `--tables` option produces two
+tables in one file: the top table contains aggregate and income decile
+estimates under the reform and the bottom table contains estimates of
+reform-minus-baseline differences by income decile and in aggregate.
+
+Nobody knows how the 2025 tax legislation will turn out, so the idea
+of this document is to illustrate how to use the Tax-Calculator CLI
+tool to analyze some of the TCJA revisions that are being reported in
+the press in early May 2025.  The basic legislative goal is to extend
+TCJA beyond 2025, but there is discussion of a number of **revisions**
+to the basic extension.  The revisions being discussed include, but
+are not limited to, raising the SALT deduction cap, making social
+security benefits nontaxable, and liberalizing the child tax credit.
+(Given the nature of the rules under which the legislation is being
+developed, no changes in social security financing can be made, so
+there is discussion of a higher elderly/disability standard deduction
+amount to proxy the nontaxable social security benefits revision.)
+These revisions all cause reductions in income tax revenue, so there
+is also discussion about **enhancements** to the extended-TCJA policy
+that would raise revenue to pay for revisions.  The enhancement
+considered here is the one that adds a new top income tax bracket with
+a 39.6 percent marginal tax rate.
+
+The analysis examples below focus on the following policy scenarios:
+
+1. a strict extension of TCJA without any revisions or enhancements
+2. a TCJA extension with the nontaxable social security benefits revision
+3. a TCJA extension with the higher elderly/disabled standard deduction revision
+4. a TCJA extension with the higher elderly/disabled standard deduction revision and the new top tax bracket enhancement
+
+All the examples use Tax-Calculator 4.6.1 version.
+```
+% tc --version
+Tax-Calculator 4.6.1 on Python 3.12
+```
+
+The examples below were done on an ancient Mac with an old Intel
+processor with four CPU cores.  The execution times on newer computers
+should be substantially less than shown below.  In all the examples,
+each `tc` run is using just one CPU core.
+
+The
+[`ext.json`](https://github.com/PSLmodels/Tax-Calculator/blob/master/taxcalc/reforms/ext.json)
+reform file is used all the examples.  See the section at the end of
+this document for more information on `ext.json` contents.
+
+
+## 1. TCJA extension without any revisions or enhancements
+
+```
+% tc ../tmd.csv 2026 --numyears 10 --reform ext.json --exact --tables
+Read input data for 2021; input data were extrapolated to 2026
+Write tabular output to file tmd-26-#-ext-#-tables.text
+Advance input data and  policy to 2027
+Write tabular output to file tmd-27-#-ext-#-tables.text
+Advance input data and  policy to 2028
+Write tabular output to file tmd-28-#-ext-#-tables.text
+Advance input data and  policy to 2029
+Write tabular output to file tmd-29-#-ext-#-tables.text
+Advance input data and  policy to 2030
+Write tabular output to file tmd-30-#-ext-#-tables.text
+Advance input data and  policy to 2031
+Write tabular output to file tmd-31-#-ext-#-tables.text
+Advance input data and  policy to 2032
+Write tabular output to file tmd-32-#-ext-#-tables.text
+Advance input data and  policy to 2033
+Write tabular output to file tmd-33-#-ext-#-tables.text
+Advance input data and  policy to 2034
+Write tabular output to file tmd-34-#-ext-#-tables.text
+Advance input data and  policy to 2035
+Write tabular output to file tmd-35-#-ext-#-tables.text
+Execution time is 58.4 seconds
+```
+
+Because the aggregate change in taxes is displayed on the last line of
+the tables file (in column four), we can look at the ten changes like
+this:
+
+```
+% tail -1 tmd-??-#-ext-#-tables.text
+==> tmd-26-#-ext-#-tables.text <==
+ A   192.41   20828.3    -273.1       0.0       0.0    -273.1
+
+==> tmd-27-#-ext-#-tables.text <==
+ A   193.77   21613.4    -280.5       0.0       0.0    -280.5
+
+==> tmd-28-#-ext-#-tables.text <==
+ A   194.72   22404.7    -288.1       0.0       0.0    -288.1
+
+==> tmd-29-#-ext-#-tables.text <==
+ A   195.66   23243.3    -280.3       0.0       0.0    -280.3
+
+==> tmd-30-#-ext-#-tables.text <==
+ A   196.58   24115.1    -288.1       0.0       0.0    -288.1
+
+==> tmd-31-#-ext-#-tables.text <==
+ A   197.48   25020.0    -296.0       0.0       0.0    -296.0
+
+==> tmd-32-#-ext-#-tables.text <==
+ A   198.35   25952.7    -315.9       0.0       0.0    -315.9
+
+==> tmd-33-#-ext-#-tables.text <==
+ A   199.21   26905.4    -323.8       0.0       0.0    -323.8
+
+==> tmd-34-#-ext-#-tables.text <==
+ A   200.03   27878.9    -331.7       0.0       0.0    -331.7
+
+==> tmd-35-#-ext-#-tables.text <==
+ A   200.83   28883.0    -339.7       0.0       0.0    -339.7
+```
+
+And the ten-year change in aggregate federal income tax liability can
+be tabulated this way:
+
+```
+% tail -1 tmd-??-#-ext-#-tables.text | awk '$1~/A/{n++;c+=$4}END{print n,c}'
+10 -3017.2
+```
+
+
+## 2. TCJA extension with the nontaxable social security benefits revision
+
+There is some discussion of exempting all social security benefits
+from federal income taxation.  Here is a JSON file that implements
+that reform:
+
+```
+% cat no_ssben_tax.json 
+{
+    "SS_percentage1": {"2026": 0.0},
+    "SS_percentage2": {"2026": 0.0}
+}
+```
+
+The marginal effect of adding that reform on to the TCJA-extension can be
+estimated in this 2026 run:
+
+```
+% tc ../tmd.csv 2026 --baseline ext.json --reform ext.json+no_ssben_tax.json --exact --tables 
+Read input data for 2021; input data were extrapolated to 2026
+Write tabular output to file tmd-26-ext-ext+no_ssben_tax-#-tables.text
+Execution time is 33.4 seconds
+
+% tail -1 tmd-26-ext-ext+no_ssben_tax-#-tables.text
+ A   192.41   20828.3    -110.6       0.0       0.0    -110.6
+```
+
+So, this reform reduces federal income tax liability by $110.6 billion in
+2026.
+
+
+## 3. TCJA extension with the higher elderly/disabled standard deduction revision
+
+Next we find a reform that approximates the `no_ssben_tax` reform
+analyzed in the previous section.  Trying higher values for the
+`STD_Aged` parameter, we quickly find that $31,500 for all filing
+statuses produces a reasonable approximation of the effects of the
+`no_ssben_tax` reform.
+
+```
+% cat higher_aged_std.json 
+{
+    "STD_Aged": {"2026": [31500, 31500, 31500, 31500, 31500]}
+}
+
+% tc ../tmd.csv 2026 --baseline ext.json --reform ext.json+higher_aged_std.json --exact --tables
+Read input data for 2021; input data were extrapolated to 2026
+Write tabular output to file tmd-26-ext-ext+higher_aged_std-#-tables.text
+Execution time is 34.0 seconds
+
+% diff tmd-26-ext-ext+higher_aged_std-#-tables.text tmd-26-ext-ext+no_ssben_tax-#-tables.text | tail -18
+22,29c22,29
+<  3    19.24     629.1      -0.3       0.0       0.0      -0.3
+<  4    19.24     876.9      -1.9       0.0       0.0      -1.9
+<  5    19.24    1173.0      -6.8       0.0       0.0      -6.8
+<  6    19.25    1581.6     -13.3       0.0       0.0     -13.3
+<  7    19.24    2191.6     -25.6       0.0       0.0     -25.6
+<  8    19.24    3238.1     -33.2       0.0       0.0     -33.2
+<  9    19.24   10787.1     -29.5       0.0       0.0     -29.5
+<  A   192.41   20828.3    -110.9       0.0       0.0    -110.9
+---
+>  3    19.24     629.1      -0.1       0.0       0.0      -0.1
+>  4    19.24     876.9      -1.0       0.0       0.0      -1.0
+>  5    19.24    1173.0      -4.8       0.0       0.0      -4.8
+>  6    19.25    1581.6     -11.8       0.0       0.0     -11.8
+>  7    19.24    2191.6     -21.3       0.0       0.0     -21.3
+>  8    19.24    3238.1     -29.9       0.0       0.0     -29.9
+>  9    19.24   10787.1     -41.5       0.0       0.0     -41.5
+>  A   192.41   20828.3    -110.6       0.0       0.0    -110.6
+```
+
+
+## 4. TCJA extension with the higher elderly/disabled standard deduction revision and the new top tax bracket enhancement
+
+In this last example, we look at how much of the extra cost of the
+`higher_aged_std` reform can be paid for by adding a new top income
+tax bracket to the TCJA-extension reform.
+
+```
+(taxcalc-dev) Tax-Calculator% cat new_top_bracket.json
+{
+    "II_brk7": {"2026": [2.5e6, 5.0e6, 2.5e6, 4.2e6, 5.0e6]},
+    "II_rt8": {"2026": 0.396},
+    "PT_brk7": {"2026": [2.5e6, 5.0e6, 2.5e6, 4.2e6, 5.0e6]},
+    "PT_rt8": {"2026": 0.396}
+}
+
+% tc ../tmd.csv 2026 --baseline ext.json+higher_aged_std.json --reform ext.json+higher_aged_std.json+new_top_bracket.json --exact --tables --graphs
+Read input data for 2021; input data were extrapolated to 2026
+Write tabular output to file tmd-26-ext+higher_aged_std-ext+higher_aged_std+new_top_bracket-#-tables.text
+Write graphical output to file tmd-26-ext+higher_aged_std-ext+higher_aged_std+new_top_bracket-#-pch.html
+Write graphical output to file tmd-26-ext+higher_aged_std-ext+higher_aged_std+new_top_bracket-#-atr.html
+Write graphical output to file tmd-26-ext+higher_aged_std-ext+higher_aged_std+new_top_bracket-#-mtr.html
+Execution time is 40.9 seconds
+
+tail -14 tmd-26-ext+higher_aged_std-ext+higher_aged_std+new_top_bracket-#-tables.text
+Weighted Tax Differences by Baseline Expanded-Income Decile
+    Returns    ExpInc    IncTax    PayTax     LSTax    AllTax
+       (#m)      ($b)      ($b)      ($b)      ($b)      ($b)
+ 0    19.24    -274.9       0.1       0.0       0.0       0.1
+ 1    19.24     210.9       0.0       0.0       0.0       0.0
+ 2    19.24     414.9       0.0       0.0       0.0       0.0
+ 3    19.24     629.1       0.0       0.0       0.0       0.0
+ 4    19.24     876.9       0.0       0.0       0.0       0.0
+ 5    19.24    1173.0       0.0       0.0       0.0       0.0
+ 6    19.25    1581.6       0.0       0.0       0.0       0.0
+ 7    19.24    2191.6       0.0       0.0       0.0       0.0
+ 8    19.24    3238.1       0.0       0.0       0.0       0.0
+ 9    19.24   10787.1      15.8       0.0       0.0      15.8
+ A   192.41   20828.3      15.8       0.0       0.0      15.8
+```
+
+So, the new top bracket (with a 39.6% marginal tax rate) raises
+aggregate federal income tax liability by enough to pay for the TCJA
+revision that approximates making social security benefits tax-free
+and produces an additional $15.8 billion (in 2026) that could be used
+to pay for other revisions.
+
+While those with the highest incomes do pay more tax, the reduction in
+their after-tax expanded income is quite small as can be seen in one
+of the standard graphs:
+`tmd-26-ext+higher_aged_std-ext+higher_aged_std+new_top_bracket-#-pch.html`.
+This graph shows that the top one percent of the income distribution
+experiences a decline in after-tax income of about 0.36 percent (or
+less than four dollars per thousand dollars).
+
+Here are the ten-year results for this run:
+
+```
+% tc ../tmd.csv 2026 --numyears 10 --baseline ext.json+higher_aged_std.json --reform ext.json+higher_aged_std.json+new_top_bracket.json --exact --tables
+Read input data for 2021; input data were extrapolated to 2026
+Write tabular output to file tmd-26-ext+higher_aged_std-ext+higher_aged_std+new_top_bracket-#-tables.text
+Advance input data and  policy to 2027
+Write tabular output to file tmd-27-ext+higher_aged_std-ext+higher_aged_std+new_top_bracket-#-tables.text
+Advance input data and  policy to 2028
+Write tabular output to file tmd-28-ext+higher_aged_std-ext+higher_aged_std+new_top_bracket-#-tables.text
+Advance input data and  policy to 2029
+Write tabular output to file tmd-29-ext+higher_aged_std-ext+higher_aged_std+new_top_bracket-#-tables.text
+Advance input data and  policy to 2030
+Write tabular output to file tmd-30-ext+higher_aged_std-ext+higher_aged_std+new_top_bracket-#-tables.text
+Advance input data and  policy to 2031
+Write tabular output to file tmd-31-ext+higher_aged_std-ext+higher_aged_std+new_top_bracket-#-tables.text
+Advance input data and  policy to 2032
+Write tabular output to file tmd-32-ext+higher_aged_std-ext+higher_aged_std+new_top_bracket-#-tables.text
+Advance input data and  policy to 2033
+Write tabular output to file tmd-33-ext+higher_aged_std-ext+higher_aged_std+new_top_bracket-#-tables.text
+Advance input data and  policy to 2034
+Write tabular output to file tmd-34-ext+higher_aged_std-ext+higher_aged_std+new_top_bracket-#-tables.text
+Advance input data and  policy to 2035
+Write tabular output to file tmd-35-ext+higher_aged_std-ext+higher_aged_std+new_top_bracket-#-tables.text
+Execution time is 58.2 seconds
+
+% tail -1 tmd-??-ext+higher_aged_std-ext+higher_aged_std+new_top_bracket-#-tables.text | awk '$1~/A/{n++;c+=$4}END{print n,c}'
+10 187.9
+```
+
+So, there is nearly $188 billion left to pay for other revisions to
+the basic TCJA extension.
+
+
+## How is the `ext.json` file generated?
+
+The short answer is by using the
+[`extend_tcja.py`](https://github.com/PSLmodels/Tax-Calculator/blob/master/extend_tcja.py) script.
+
+Reading the `extend_tcja.py` script will provide details on how the
+values in the `ext.json` file are generated.
+
+It is important to bear in mind that the `extend_tcja.py` script will
+generate a different `ext.json` file whenever the CBO economic
+projection (incorporated in the Tax-Calculator `growfactors.csv` file)
+changes or whenever new historical values of policy parameters are
+added to the `policy_current_law.json` file thereby changing the
+`Policy.LAST_KNOWN_YEAR`.
+
+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-4.6.1 → taxcalc-4.6.2}/environment.yml

@@ -19,5 +19,4 @@ dependencies:
 - pip
 - pip:
     - jupyter-book
-    - "marshmallow>=3.22, <4.0"  # TODO: drop this after ParamTools is fixed
-    - "paramtools>=0.19.0"       # TODO: bump version after ParamTools is fixed
+    - "paramtools>=0.20.0"

{taxcalc-4.6.1 → taxcalc-4.6.2}/setup.py

@@ -7,7 +7,7 @@ from setuptools import setup
 with open("README.md", "r", encoding="utf-8") as f:
     longdesc = f.read()
 
-VERSION = "4.6.1"
+VERSION = "4.6.2"
 
 config = {
     "description": "Tax-Calculator",
@@ -25,7 +25,7 @@ config = {
         "pandas>=2.2",
         "bokeh>=2.4",
         "numba",
-        "paramtools>=0.19.0",
+        "paramtools>=0.20.0",
     ],
     "classifiers": [
         "Development Status :: 4 - Beta",

{taxcalc-4.6.1 → taxcalc-4.6.2}/taxcalc/__init__.py

@@ -14,6 +14,6 @@ from taxcalc.taxcalcio import *
 from taxcalc.utils import *
 from taxcalc.cli import *
 
-__version__ = '4.6.1'
+__version__ = '4.6.2'
 __min_python3_version__ = 10
 __max_python3_version__ = 12

{taxcalc-4.6.1 → taxcalc-4.6.2}/taxcalc/calcfunctions.py

@@ -3190,7 +3190,7 @@ 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_is_refundable, CTC_include17,
+                  CTC_is_refundable, CTC_include17, CTC_c,
                   age_head, age_spouse, MARS, nu18,
                   ptax_was, c03260, e09800, c59660, e11200,
                   c11070):
@@ -3251,7 +3251,7 @@ def AdditionalCTC(codtc_limited, ACTC_c, n24, earned, ACTC_Income_thd,
             childnum = n24 + max(0, nu18 - tu18 - su18 - n24)
         else:
             childnum = n24
-        line4 = ACTC_c * childnum
+        line4 = min(ACTC_c, CTC_c) * childnum
     c11070 = 0.  # line15
     if line3 > 0. and line4 > 0.:
         line5 = min(line3, line4)

{taxcalc-4.6.1 → taxcalc-4.6.2}/taxcalc/policy_current_law.json

@@ -21819,7 +21819,7 @@
         "validators": {
             "range": {
                 "min": 0,
-                "max": "CTC_c"
+                "max": 9e+99
             }
         },
         "compatible_data": {

{taxcalc-4.6.1 → taxcalc-4.6.2}/taxcalc/reforms/ext.json

@@ -34,8 +34,6 @@
     "CTC_c": {"2026": 2000.00},
     "ACTC_c": {"2026": 1776.67},
     "ACTC_c-indexed": {"2026": true},
-    "ACTC_c": {"2032": 2000.00},
-    "ACTC_c-indexed": {"2032": false},
     "ODC_c": {"2026": 500.00},
     "CTC_ps": {"2026": [200000.0, 400000.0, 200000.0, 200000.0, 400000.0]},
     "ACTC_Income_thd": {"2026": 2500.00},

{taxcalc-4.6.1 → taxcalc-4.6.2}/taxcalc/taxcalcio.py

@@ -18,7 +18,7 @@ from taxcalc.consumption import Consumption
 from taxcalc.growdiff import GrowDiff
 from taxcalc.growfactors import GrowFactors
 from taxcalc.calculator import Calculator
-from taxcalc.utils import (delete_file, write_graph_file,
+from taxcalc.utils import (json_to_dict, delete_file, write_graph_file,
                            add_quantile_table_row_variable,
                            unweighted_sum, weighted_sum)
 
@@ -133,7 +133,17 @@ class TaxCalcIO():
                     msg = f'{fname} does not end in .json'
                     self.errmsg += f'ERROR: BASELINE file name {msg}\n'
                 # check existence of BASELINE file
-                if not os.path.isfile(bas):
+                if os.path.isfile(bas):
+                    # check validity of JSON text
+                    with open(bas, 'r', encoding='utf-8') as jfile:
+                        json_text = jfile.read()
+                        try:
+                            _ = json_to_dict(json_text)
+                        except ValueError as valerr:  # pragma: no cover
+                            msg = f'{bas} contains invalid JSON'
+                            self.errmsg += f'ERROR: BASELINE file {msg}\n'
+                            self.errmsg += f'{valerr}'
+                else:
                     msg = f'{bas} could not be found'
                     self.errmsg += f'ERROR: BASELINE file {msg}\n'
                 # add fname to list of basnames used in output file names
@@ -167,7 +177,17 @@ class TaxCalcIO():
                     msg = f'{fname} does not end in .json'
                     self.errmsg += f'ERROR: REFORM file name {msg}\n'
                 # check existence of REFORM file
-                if not os.path.isfile(rfm):
+                if os.path.isfile(rfm):
+                    # check validity of JSON text
+                    with open(rfm, 'r', encoding='utf-8') as jfile:
+                        json_text = jfile.read()
+                        try:
+                            _ = json_to_dict(json_text)
+                        except ValueError as valerr:  # pragma: no cover
+                            msg = f'{rfm} contains invalid JSON'
+                            self.errmsg += f'ERROR: REFORM file {msg}\n'
+                            self.errmsg += f'{valerr}'
+                else:
                     msg = f'{rfm} could not be found'
                     self.errmsg += f'ERROR: REFORM file {msg}\n'
                 # add fname to list of refnames used in output file names

{taxcalc-4.6.1 → taxcalc-4.6.2}/taxcalc/tests/test_4package.py

@@ -68,7 +68,6 @@ def test_for_consistency(tests_path):
         'coverage',
         "pip",
         "jupyter-book",
-        "marshmallow>=3.22, <4.0",  # TODO: drop this after ParamTools is fixed
         "setuptools"
     ])
     # read conda.recipe/meta.yaml requirements

{taxcalc-4.6.1 → taxcalc-4.6.2}/taxcalc/tests/test_policy.py

@@ -811,19 +811,6 @@ def test_get_index_rate():
     assert pol.wage_growth_rates() == pol._wage_growth_rates
 
 
-def test_reform_with_bad_ctc_levels():
-    """
-    Implement a reform with _ACTC > _CTC_c values.
-    """
-    pol = Policy()
-    child_credit_reform = {
-        'CTC_c': {2020: 2200},
-        'ACTC_c': {2020: 2500}
-    }
-    with pytest.raises(pt.ValidationError):
-        pol.implement_reform(child_credit_reform)
-
-
 def test_reform_with_removed_parameter(monkeypatch):
     """
     Try to use removed parameter in a reform.

{taxcalc-4.6.1 → taxcalc-4.6.2}/taxcalc/tests/test_reforms.py

@@ -386,4 +386,4 @@ def test_ext_reform(tests_path):
     iitax_ext = calc_ext.array('iitax')
     rdiff = iitax_ext - iitax_end
     weighted_sum_rdiff = (rdiff * calc_end.array('s006')).sum() * 1.0e-9
-    assert np.allclose([weighted_sum_rdiff], [-205.769], rtol=0.0, atol=0.01)
+    assert np.allclose([weighted_sum_rdiff], [-214.393], rtol=0.0, atol=0.01)

{taxcalc-4.6.1 → taxcalc-4.6.2}/taxcalc/tests/test_taxcalcio.py

@@ -153,6 +153,24 @@ def fixture_errorreformfile():
             pass  # sometimes we can't remove a generated temporary file
 
 
+@pytest.fixture(scope='session', name='ereformfile')
+def fixture_ereformfile():
+    """
+    Temporary reform file with .json extension.
+    """
+    contents = '{"II_em": {"2022": 1000},}'
+    with tempfile.NamedTemporaryFile(
+            suffix='.json', mode='a', delete=False
+    ) as rfile:
+        rfile.write(contents)
+    yield rfile
+    if os.path.isfile(rfile.name):
+        try:
+            os.remove(rfile.name)
+        except OSError:
+            pass  # sometimes we can't remove a generated temporary file
+
+
 @pytest.fixture(scope='session', name='errorassumpfile')
 def fixture_errorassumpfile():
     """
@@ -249,6 +267,7 @@ def fixture_assumpfile2():
      'no-dot-json-filename'),
     ([], [], [], [],),
     ('no-exist.csv', 'no-exist.json', 'no-exist.json', 'no-exist.json'),
+    ('cps.csv', 'ereformfile', 'ereformfile', 'no-exist.json'),
 ])
 def test_ctor_errors(input_data, baseline, reform, assump):
     """