Merge pull request #2982 from martinholmer/6-3-0

Prepare release 6.3.0

Author: jdebacker

README.md

@@ -8,8 +8,8 @@
 Tax-Calculator
 ==============
 
-Tax-Calculator is an open-source microsimulation model for analysis of
-USA federal income and payroll taxes.
+Tax-Calculator is an open-source microsimulation model for conventional
+analysis of USA federal income and payroll taxes.
 
 We are seeking contributors and maintainers.  If you are interested in
 joining the project as a contributor or maintainer, open a new

docs/about/releases.md

@@ -5,6 +5,24 @@ Go
 for a complete commit history.
 
 
+2025-12-08 Release 6.3.0
+------------------------
+(last merged pull request is
+[#2981](https://github.com/PSLmodels/Tax-Calculator/pull/2981))
+
+**This is an enhancement release.**
+
+**API Changes**
+
+**New Features**
+- Add `--behavior` option to CLI that provides behavioral response
+  capabilities like those in Tax-Brain
+  [[#2981](https://github.com/PSLmodels/Tax-Calculator/pull/2981) by
+  Martin Holmer]
+
+**Bug Fixes**
+
+
 2025-11-19 Release 6.2.1
 ------------------------
 (last merged pull request is

docs/index.md

@@ -50,7 +50,7 @@ cross-model validation work with NBER's TAXSIM-35 model is described
 
 ## Latest release
 
-{doc}`6.2.1 (2025-11-19) <about/releases>`
+{doc}`6.3.0 (2025-12-08) <about/releases>`
 
 If you are already using Tax-Calculator, upgrade using the following command:
 ```

setup.py

@@ -7,7 +7,7 @@
 with open("README.md", "r", encoding="utf-8") as f:
     longdesc = f.read()
 
-VERSION = "6.2.1"
+VERSION = "6.3.0"
 
 config = {
     "description": "Tax-Calculator",

taxcalc.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: taxcalc
-Version: 6.2.1
+Version: 6.3.0
 Summary: Tax-Calculator
 Home-page: https://github.com/PSLmodels/Tax-Calculator
 Download-URL: https://github.com/PSLmodels/Tax-Calculator
@@ -43,8 +43,8 @@ Dynamic: summary
 Tax-Calculator
 ==============
 
-Tax-Calculator is an open-source microsimulation model for analysis of
-USA federal income and payroll taxes.
+Tax-Calculator is an open-source microsimulation model for conventional
+analysis of USA federal income and payroll taxes.
 
 We are seeking contributors and maintainers.  If you are interested in
 joining the project as a contributor or maintainer, open a new

taxcalc/__init__.py

@@ -14,6 +14,6 @@
 from taxcalc.utils import *
 from taxcalc.cli import *
 
-__version__ = '6.2.1a'
+__version__ = '6.3.0'
 __min_python3_version__ = 11
 __max_python3_version__ = 13

taxcalc/cli/behavioral_responses_tests/tests.sh

@@ -41,7 +41,7 @@ if [ $? -ne 0 ]; then
     echo Differences between run30-35.tables run30-35.tables-expect
 fi
 tc cps.csv 2028 --numyears 8 --behavior br1.json --runid 31 \
-   --reform ref.json --exact --tables --silent
+   --reform ref.json --exact --tables --graphs --silent
 cmp run31-35.tables run30-35.tables
 if [ $? -ne 0 ]; then
     ERRORS=1
@@ -50,4 +50,5 @@ fi
 
 if [ $ERRORS -eq 0 ]; then
     rm -f run??-??.tables
+    rm -f run31-??-???.html
 fi

taxcalc/cli/tc.py

@@ -377,7 +377,7 @@ def cli_tc_main():
     '1|131.88\n'
     '2|28879.00\n'
 )
-TEST_DUMPDB_FILENAME = f'test-{str(TEST_TAXYEAR)[2:]}-#-#-#.dumpdb'
+TEST_DUMPDB_FILENAME = f'test-{str(TEST_TAXYEAR)[2:]}-#-#-#-#.dumpdb'
 TEST_SQLITE_QUERY = """
 SELECT
   RECID           AS id,

taxcalc/taxcalcio.py

@@ -657,20 +657,35 @@ def analyze(
                 self.calc_bas, self.calc_ref,
                 self.behvdict, dump=True,
             )
-            # move returned dump dataframe values back into calc objects
+            # copy returned dump dataframe values back into calc objects
+            int_variables = self.recs_bas.INTEGER_VARS
             vnames = list(br_dump_bas.columns)
             for mtr_vname in ['mtr_ptax', 'mtr_itax', 'mtr_combined']:
                 if mtr_vname in vnames:
                     vnames.remove(mtr_vname)
             for vname in vnames:
-                self.calc_bas.array(vname, br_dump_bas[vname].to_numpy())
+                if vname in int_variables:
+                    vdtype = np.int32
+                else:
+                    vdtype = np.float64
+                self.calc_bas.array(
+                    vname,
+                    br_dump_bas[vname].to_numpy(dtype=vdtype, copy=True)
+                )
             del br_dump_bas
             vnames = list(br_dump_ref.columns)
             for mtr_vname in ['mtr_ptax', 'mtr_itax', 'mtr_combined']:
                 if mtr_vname in vnames:
                     vnames.remove(mtr_vname)
             for vname in vnames:
-                self.calc_ref.array(vname, br_dump_ref[vname].to_numpy())
+                if vname in int_variables:
+                    vdtype = np.int32
+                else:
+                    vdtype = np.float64
+                self.calc_ref.array(
+                    vname,
+                    br_dump_ref[vname].to_numpy(dtype=vdtype, copy=True)
+                )
             del br_dump_ref
         else:  # if assuming no behavioral responses
             self.calc_bas.calc_all()