bodiyang · bodiyang · May 28, 2024 · Jan 30, 2024 · Jan 30, 2024 · Jan 30, 2024
diff --git a/.github/workflows/build_and_test.yml b/.github/workflows/build_and_test.yml
@@ -1,4 +1,4 @@
-name: Build Package and Test Source Code [Python 3.7, 3.8, 3.9, 3.10]
+name: Build Package and Test Source Code [Python 3.9, 3.10, 3.11]
 
 on: [push, pull_request]
 
@@ -8,7 +8,7 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest, windows-latest]
-        python-version: [3.7, 3.8, 3.9, '3.10']
+        python-version: [3.9, '3.10', '3.11']
 
     steps:
       - name: Checkout
@@ -34,13 +34,14 @@ jobs:
         shell: bash -l {0}
         working-directory: ./
         run: |
-          pytest -m 'not requires_pufcsv and not pre_release and not local' --cov=./ --cov-report=xml
+          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
-        uses: codecov/codecov-action@v3
+        if: matrix.os == 'ubuntu-latest'
+        uses: codecov/codecov-action@v4
         with:
           token: ${{ secrets.CODECOV_TOKEN }} # not required for public repos
           file: ./coverage.xml
           flags: unittests
           name: codecov-umbrella
           fail_ci_if_error: true
-          verbose: true
+          verbose: true
diff --git a/.github/workflows/build_new_test_benchmark.yml b/.github/workflows/build_new_test_benchmark.yml
diff --git a/.github/workflows/check_jupyterbook.yml b/.github/workflows/check_jupyterbook.yml
@@ -15,7 +15,7 @@ jobs:
         with:
           activate-environment: taxcalc-dev
           environment-file: environment.yml
-          python-version: 3.8
+          python-version: 3.11
           auto-activate-base: false
 
       - name: Build # Build Jupyter Book

diff --git a/.github/workflows/deploy_jupyterbook.yml b/.github/workflows/deploy_jupyterbook.yml
@@ -1,7 +1,7 @@
 name: Build and Deploy Jupyter Book
 on:
   push:
-    branches:    
+    branches:
       - master
 jobs:
   build-and-deploy:
@@ -18,7 +18,7 @@ jobs:
         with:
           activate-environment: taxcalc-dev
           environment-file: environment.yml
-          python-version: 3.8
+          python-version: 3.11
           auto-activate-base: false
 
       - name: Build # Build Jupyter Book

diff --git a/.github/workflows/deploy_parameters_docs.yml b/.github/workflows/deploy_parameters_docs.yml
@@ -18,7 +18,7 @@ jobs:
         with:
           activate-environment: taxcalc-dev
           environment-file: environment.yml
-          python-version: 3.9
+          python-version: 3.11
           auto-activate-base: false
 
       - name: Build # Build Jupyter Book

diff --git a/.gitignore b/.gitignore
@@ -15,9 +15,13 @@ read-the-docs/_build/
 
 # IRS-SOI PUF data file
 puf.csv
+tmd.csv
 
 # Jupyter notebook checkpoints
 *.ipynb_checkpoints*
 
 # Built documentation
-docs/_build/
+docs/_build/
+
+# Validation files
+taxcalc/validation/taxsim35/actual_differences/
diff --git a/docs/about/license.md → LICENSE b/docs/about/license.md → LICENSE
diff --git a/MANIFEST.in b/MANIFEST.in
@@ -7,4 +7,4 @@ include taxcalc/policy_current_law.json
 include taxcalc/puf_weights.csv.gz
 include taxcalc/puf_ratios.csv
 include taxcalc/records_variables.json
-
+include taxcalc/tmd_weights.csv.gz
diff --git a/Makefile b/Makefile
@@ -32,7 +32,7 @@ help:
 clean:
 	@find . -name *pyc -exec rm {} \;
 	@find . -name *cache -maxdepth 1 -exec rm -r {} \;
-	@conda uninstall taxcalc --yes --quiet 2>&1 > /dev/null
+	@pip uninstall taxcalc --yes --quiet 2>&1 > /dev/null
 
 .PHONY=package
 package:
@@ -51,19 +51,19 @@ endef
 .PHONY=pytest-cps
 pytest-cps:
 	@$(pytest-setup)
-	@cd taxcalc ; pytest -n4 -m "not requires_pufcsv and not pre_release"
+	@cd taxcalc ; pytest -n4 --disable-warnings --durations=0 --durations-min=2 -m "not requires_pufcsv and not requires_tmdcsv and not pre_release"
 	@$(pytest-cleanup)
 
 .PHONY=pytest
 pytest:
 	@$(pytest-setup)
-	@cd taxcalc ; pytest -n4 -m "not pre_release"
+	@cd taxcalc ; pytest -n4 --disable-warnings --durations=0 --durations-min=2 -m "not pre_release"
 	@$(pytest-cleanup)
 
 .PHONY=pytest-all
 pytest-all:
 	@$(pytest-setup)
-	@cd taxcalc ; pytest -n4 -m ""
+	@cd taxcalc ; pytest -n4 --disable-warnings --durations=0 --durations-min=2 -m ""
 	@$(pytest-cleanup)
 
 define tctest-cleanup
@@ -103,7 +103,7 @@ define coverage-cleanup
 rm -f .coverage htmlcov/*
 endef
 
-COVMARK = "not requires_pufcsv and not pre_release"
+COVMARK = "not requires_pufcsv and not requires_tmdcsv and not pre_release"
 
 OS := $(shell uname -s)
 

diff --git a/PSL_catalog.json b/PSL_catalog.json
@@ -1,51 +1,29 @@
 {
-    "project_one_line": {
-        "start_header": null,
-        "end_header": null,
-        "source": null,
-        "type": "html",
-        "data": "<p>Tax-Calculator is an open-source microsimulation model for static analysis of USA federal income and payroll taxes.</p>"
-    },
-    "project_overview": {
-        "start_header": null,
-        "end_header": null,
-        "source": null,
-        "type": "html",
-        "data": "<a href=\"https://PSLmodels.github.io/Tax-Calculator/\">What is Tax-Calculator?</a>"
-    },
-    "core_maintainers": {
-        "start_header": null,
-        "end_header": null,
-        "source": null,
-        "type": "html",
-        "data": "<ul><li>Jason DeBacker</li><li>Henry Doupe</li><li>Anderson Frailey</li><li>Matt Jensen</li></ul>"
-    },
-    "user_documentation": {
-        "start_header": null,
-        "end_header": null,
-        "source": null,
-        "type": "html",
-        "data": "<a href=\"http://PSLmodels.github.io/Tax-Calculator/\"></a>"
-    },
-    "contributor_overview": {
-        "start_header": null,
-        "end_header": null,
-        "source": null,
-        "type": "html",
-        "data": "<a href=\"https://pslmodels.github.io/Tax-Calculator/contributing/contributor_guide.html\"></a>"
-    },
-    "user_changelog_recent": {
-        "start_header": null,
-        "end_header": null,
-        "source": null,
-        "type": "html",
-        "data": "<a href=\"https://pslmodels.github.io/Tax-Calculator/about/changes.html\"></a>"
-    },
-    "link_to_webapp": {
-        "start_header": null,
-        "end_header": null,
-        "source": null,
-        "type": null,
-        "data": null
+    "name": "Tax-Calculator",
+    "img": "",
+    "banner_title": "Tax-Calculator",
+    "banner_subtitle": "USA Federal Individual Income and Payroll Tax Microsimulation Model",
+    "detailed_description": "Tax-Calculator is an open-source microsimulation model for static analysis of USA federal income and payroll taxes.",
+    "policy_area": "Tax Microsimulation, Revenue Estimation, Distributional Analysis",
+    "geography": "United States",
+    "language": "Python",
+    "maintainers": [
+        {
+            "name": "Jason DeBacker",
+            "image": "https://github.com/jdebacker.png",
+            "link": "https://github.com/jdebacker"
+        },
+        {
+            "name": "Matthew Jensen",
+            "image": "https://avatars.githubusercontent.com/u/8301092?v=4",
+            "link": "https://github.com/MattHJensen/"
+        }
+    ],
+    "links": {
+      "code_repository": "https://github.com/PSLmodels/Tax-Calculator",
+      "user_documentation": "https://taxcalc.pslmodels.org/",
+      "contributor_documentation": "https://taxcalc.pslmodels.org/contributing/contributor_guide.html",
+      "webapp": "",
+      "recent_changes": "https://taxcalc.pslmodels.org/about/releases.html"
     }
 }
diff --git a/README.md b/README.md
@@ -1,7 +1,8 @@
-[![PSL cataloged](https://img.shields.io/badge/PSL-cataloged-a0a0a0.svg)](https://www.PSLmodels.org)
-[![Python 3.6+](https://img.shields.io/badge/python-3.6%2B-blue.svg)](https://www.python.org/downloads/release/python-360/)
-[![Build Status](https://travis-ci.org/PSLmodels/Tax-Calculator.svg?branch=master)](https://travis-ci.org/PSLmodels/Tax-Calculator)
-[![Codecov](https://codecov.io/gh/PSLmodels/Tax-Calculator/branch/master/graph/badge.svg)](https://codecov.io/gh/PSLmodels/Tax-Calculator)
+| | |
+| --- | --- |
+| 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/) [![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) |
 
 
 Tax-Calculator
@@ -11,7 +12,7 @@ Tax-Calculator is an open-source microsimulation model for static
 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 [issue](https://github.com/PSLmodels/Tax-Calculator/issues) and ping @MattHJensen or @jdebacker -- or just jump right in.
+open a new [issue](https://github.com/PSLmodels/Tax-Calculator/issues) and ping [@MattHJensen](https://github.com/MattHJensen/) or [@jdebacker](https://github.com/jdebacker/) -- or just jump right in.
 
 Complete documentation is available
 [here](https://PSLmodels.github.io/Tax-Calculator/).
diff --git a/codecov.yml b/codecov.yml
@@ -21,4 +21,5 @@ comment:
 
 ignore:
   - "setup.py"
-  - "new_json.py"
+  - "ppp.py"
+  - "extend_tcja.py"
diff --git a/conda.recipe/meta.yaml b/conda.recipe/meta.yaml
@@ -8,28 +8,26 @@ build:
 
 requirements:
   build:
-    - python
-    - "numpy>=1.14"
-    - "pandas>=1.2.0"
-    - "bokeh>=1.4.0, <3.0.0"
-    - requests
-    - numba
+    - "python>=3.9, <3.12"
+    - "numpy>=1.20"
+    - "pandas>=2.2"
+    - "bokeh>=2.4"
     - "paramtools>=0.18.0"
-    - behresp
-    - aiohttp
+    - numba
     - curl
+    - openpyxl
+    - behresp
 
   run:
-    - python
-    - "numpy>=1.14"
-    - "pandas>=1.2.0"
-    - "bokeh>=1.4.0, <3.0.0"
-    - requests
-    - numba
+    - "python>=3.9, <3.12"
+    - "numpy>=1.20"
+    - "pandas>=2.2"
+    - "bokeh>=2.4"
     - "paramtools>=0.18.0"
-    - behresp
-    - aiohttp
+    - numba
     - curl
+    - openpyxl
+    - behresp
 
 test:
   commands:

diff --git a/docs/_toc.yml b/docs/_toc.yml
@@ -24,14 +24,13 @@ parts:
     - file: recipes/recipe04_pandas
     - file: recipes/recipe05
     - file: recipes/recipe06
+  - file: usage/tcja_after_2025
 - caption: About
   chapters:
   - file: about/history
-  - file: about/roadmap
   - file: about/releases
-  - file: about/changes
-  - file: about/upgrading
-  - file: about/license
+  - file: about/roadmap
+  - file: about/LICENSE
 - caption: Contributing
   chapters:
   - file: contributing/contributor_guide

diff --git a/docs/about/LICENSE.md b/docs/about/LICENSE.md
@@ -0,0 +1,22 @@
+License
+=======
+
+The Tax-Calculator project is in the public domain within the United States.
+
+Additionally, we waive copyright and related rights in the work worldwide through the CC0 1.0 Universal public domain dedication.
+
+## CC0 1.0 Universal Summary
+
+The text below is a human-readable summary of the [Legal Code](https://creativecommons.org/publicdomain/zero/1.0/legalcode):
+
+_No Copyright_
+
+The person who associated a work with this deed has dedicated the work to the public domain by waiving all of his or her rights to the work worldwide under copyright law, including all related and neighboring rights, to the extent allowed by law.
+
+You can copy, modify, distribute and perform the work, even for commercial purposes, all without asking permission.
+
+_Other Information_
+
+In no way are the patent or trademark rights of any person affected by CC0, nor are the rights that other persons may have in the work or in how the work is used, such as publicity or privacy rights.
+
+Unless expressly stated otherwise, the person who associated a work with this deed makes no warranties about the work, and disclaims liability for all uses of the work, to the fullest extent permitted by applicable law. When using or citing the work, you should not imply endorsement by the author or the affirmer.