diff --git a/setup.py b/setup.py index e764e9ff..94f5d6af 100644 --- a/setup.py +++ b/setup.py @@ -2,7 +2,7 @@ setup( name="tmd", - version="0.3.0", + version="0.4.0", packages=find_packages(), python_requires=">=3.10,<3.13", install_requires=[ diff --git a/tmd/areas/create_area_weights.py b/tmd/areas/create_area_weights.py index c6d62088..a6e14e0f 100644 --- a/tmd/areas/create_area_weights.py +++ b/tmd/areas/create_area_weights.py @@ -147,8 +147,8 @@ def valid_area(area: str): all_ok = False # check state congressional district number if appropriate if len(area) == 4: - # assume CDs are based on 2020 Census (that is, 118th Congress) - max_cdn = state_info[scode][2020] + # assume CDs are based on 2010 Census (that is, 117th Congress) + max_cdn = state_info[scode][2010] if max_cdn <= 1: sys.stderr.write( f": use area '{s_c}' for this one-district state\n" diff --git a/tmd/examination/results4.md b/tmd/examination/results4.md index 5b5acfa1..fe2b4ec8 100644 --- a/tmd/examination/results4.md +++ b/tmd/examination/results4.md @@ -1,7 +1,7 @@ Phase 4+ National Data Examination Results ========================================== -**RESULTS AS OF 2024-09-21** +**RESULTS AS OF 2024-10-04** This project is developing a new dataset for use by income and payroll tax microsimulation models. The project is progressing in several @@ -19,7 +19,7 @@ For more on the source of the federal agency estimates and on how the model-plus-dataset estimates are generated, see the [examination methods](./methods.md) document. The model used to generate the following Phase 4 estimates is [Tax-Calculator -4.2.2](https://github.com/PSLmodels/Tax-Calculator/blob/master/docs/about/releases.md)). +4.3.0](https://github.com/PSLmodels/Tax-Calculator/blob/master/docs/about/releases.md)).
@@ -28,7 +28,7 @@ following Phase 4 estimates is [Tax-Calculator | CY23 Amount | CY26 Amount | Estimate Source | | ---: | ---: | :--- | | 1580.0 | 1829.9 | CBO | -| 1591.7 | 1847.0 | Tax-Calculator + phase 4 dataset | +| 1595.0 | 1851.4 | Tax-Calculator + phase 4 dataset |
@@ -37,7 +37,7 @@ following Phase 4 estimates is [Tax-Calculator | CY23 Amount | CY26 Amount | Estimate Source | | ---: | ---: | :--- | | 2512.3 | 2849.4 | CBO | -| 2505.3 | 3140.8 | Tax-Calculator + phase 4 dataset | +| 2507.0 | 3161.2 | Tax-Calculator + phase 4 dataset |
@@ -47,7 +47,7 @@ following Phase 4 estimates is [Tax-Calculator | ---: | ---: | :--- | | 122.1 | 57.6 | JCT (assumes less than 100% participation) | | 108.6 | 55.7 | TSY (probably assumes less than 100% participation) | -| 130.1 | 44.7 | Tax-Calculator + phase 4 dataset (100% participation) | +| 130.2 | 44.7 | Tax-Calculator + phase 4 dataset (100% participation) |
@@ -57,7 +57,7 @@ following Phase 4 estimates is [Tax-Calculator | ---: | ---: | :--- | | 71.9 | 78.0 | JCT (assumes less than 100% participation) | | 63.6 | 71.2 | TSY (probably assumes less than 100% participation) | -| 69.8 | 78.0 | Tax-Calculator + phase 4 dataset (100% participation) | +| 69.6 | 77.8 | Tax-Calculator + phase 4 dataset (100% participation) |
@@ -67,7 +67,7 @@ following Phase 4 estimates is [Tax-Calculator | ---: | ---: | :--- | | 45.9 | 56.4 | JCT | | 31.4 | 38.4 | TSY | -| 35.7 | 47.6 | Tax-Calculator + phase 4 dataset | +| 35.9 | 47.7 | Tax-Calculator + phase 4 dataset |
@@ -77,7 +77,7 @@ following Phase 4 estimates is [Tax-Calculator | ---: | ---: | :--- | | -56.5 | -53.8 | JCT | | ---- | ---- | TSY | -| -54.0 | -52.3 | Tax-Calculator + phase 4 dataset | +| -54.0 | -53.8 | Tax-Calculator + phase 4 dataset |
@@ -87,7 +87,7 @@ following Phase 4 estimates is [Tax-Calculator | ---: | ---: | :--- | | 259.3 | 239.8 | JCT | | 153.9 | 182.4 | TSY | -| 220.9 | 218.4 | Tax-Calculator + phase 4 dataset | +| 220.9 | 224.7 | Tax-Calculator + phase 4 dataset |
@@ -107,5 +107,4 @@ following Phase 4 estimates is [Tax-Calculator | ---: | ---: | :--- | | 21.2 | 151.3 | JCT | | 26.5 | 149.0 | TSY | -| 21.1 | 164.8 | Tax-Calculator + phase 4 dataset | - +| 21.2 | 165.4 | Tax-Calculator + phase 4 dataset |