From bf3fa4f72d6469f1aadd430e6072c623af75d3e4 Mon Sep 17 00:00:00 2001 From: "martin.holmer@gmail.com" Date: Wed, 18 Dec 2024 15:40:51 -0500 Subject: [PATCH 1/2] Specify version 4.4.0 --- docs/about/releases.md | 18 ++++++++++++++++-- docs/index.md | 2 +- setup.py | 2 +- taxcalc/__init__.py | 2 +- 4 files changed, 19 insertions(+), 5 deletions(-) diff --git a/docs/about/releases.md b/docs/about/releases.md index bae8689e2..90c4e282e 100644 --- a/docs/about/releases.md +++ b/docs/about/releases.md @@ -4,6 +4,20 @@ Go [here](https://github.com/PSLmodels/Tax-Calculator/pulls?q=is%3Apr+is%3Aclose for a complete commit history. +2024-12-19 Release 4.4.0 +------------------------ +(last merged pull request is +[#2856](https://github.com/PSLmodels/Tax-Calculator/pull/2856)) + +**This is an enhancement release.** + +**API Changes** + +**New Features** +- Make a Policy object's last budget year be flexible +[[#2856](https://github.com/PSLmodels/Tax-Calculator/pull/2856) by Jason DeBacker with minor assistance from Martin Holmer] + + 2024-12-16 Release 4.3.5 ------------------------ (last merged pull request is @@ -23,8 +37,8 @@ for a complete commit history. **Bug Fixes** - Fix several broken documentation links -[[#2847](https://github.com/PSLmodels/Tax-Calculator/pull/2847) by Martin Holmer] and -[[#2849](https://github.com/PSLmodels/Tax-Calculator/pull/2849) by Martin Holmer] +[[#2847](https://github.com/PSLmodels/Tax-Calculator/pull/2847) by Martin Holmer and +[#2849](https://github.com/PSLmodels/Tax-Calculator/pull/2849) by Martin Holmer] - Remove incorrect use of GrowFactors() in Policy and Parameters classes [[#2852](https://github.com/PSLmodels/Tax-Calculator/pull/2852) by Martin Holmer] diff --git a/docs/index.md b/docs/index.md index 97b6fa88e..978cd6427 100644 --- a/docs/index.md +++ b/docs/index.md @@ -57,7 +57,7 @@ The cross-model validation work with NBER's TAXSIM-27 model is described ## Latest release -{doc}`4.3.5 (2024-12-16) ` +{doc}`4.4.0 (2024-12-19) ` If you are already using Tax-Calculator, upgrade using the following command: diff --git a/setup.py b/setup.py index 002ba7542..5543adbcb 100644 --- a/setup.py +++ b/setup.py @@ -3,7 +3,7 @@ with open("README.md") as f: longdesc = f.read() -version = "4.3.5" +version = "4.4.0" config = { "description": "Tax Calculator", diff --git a/taxcalc/__init__.py b/taxcalc/__init__.py index 9d09a31c6..56fbc769a 100644 --- a/taxcalc/__init__.py +++ b/taxcalc/__init__.py @@ -14,6 +14,6 @@ from taxcalc.utils import * from taxcalc.cli import * -__version__ = '4.3.5a' +__version__ = '4.4.0' __min_python3_version__ = 10 __max_python3_version__ = 12 From 06edff52e99704c2bcae41ff5f5e21a4abb12fb2 Mon Sep 17 00:00:00 2001 From: "martin.holmer@gmail.com" Date: Wed, 18 Dec 2024 15:56:08 -0500 Subject: [PATCH 2/2] Update non-substantive comment in taxcalc/reforms/ext.json --- docs/contributing/RELEASING.md | 10 ++++------ taxcalc.egg-info/PKG-INFO | 2 +- taxcalc/reforms/ext.json | 2 +- 3 files changed, 6 insertions(+), 8 deletions(-) diff --git a/docs/contributing/RELEASING.md b/docs/contributing/RELEASING.md index 8f6c3cf9d..15b808796 100755 --- a/docs/contributing/RELEASING.md +++ b/docs/contributing/RELEASING.md @@ -8,12 +8,11 @@ release. Create new `taxcalc` packages ============================= ``` +--> merge master branch into X-Y-Z branch --> on branch X-Y-Z, edit docs/about/releases.md to finalize X.Y.Z info ---> specify release X.Y.Z in setup.py and taxcalc/__init__.py - ---> merge master branch into X-Y-Z branch +--> specify release X.Y.Z in setup.py and taxcalc/__init__.py and docs/index.md --> run `python update_pcl.py` [to update policy_current_law.json if needed] @@ -29,8 +28,6 @@ Create new `taxcalc` packages --> cd taxcalc/validation ; ./tests_35.sh ; .fix. ; cd ../.. ---> specify release X.Y.Z in docs/index.md - --> make clean [to remove taxcalc package] --> commit X-Y-Z branch and push to origin @@ -42,7 +39,8 @@ Create new `taxcalc` packages --> create release X.Y.Z on GitHub using master branch --> Create new package on Conda-Forge for release X.Y.Z - --> open a PR to github.com/conda-forge/taxcalc-feedstock where you change the `recipe/meta.yaml` file by updating (1) the version number to X.Y.Z and (2) the checksum to reflect the checksum for the tarball for release X.Y.Z in the Tax-Calculator GitHub repo + +--> open a PR to github.com/conda-forge/taxcalc-feedstock where you change the `recipe/meta.yaml` file by updating (1) the version number to X.Y.Z and (2) the checksum to reflect the checksum for the tarball for release X.Y.Z in the Tax-Calculator GitHub repo ====> ADD NEW DEPENDENCY OR UPDATE MINIMUM REQUIRED VERSION <==== diff --git a/taxcalc.egg-info/PKG-INFO b/taxcalc.egg-info/PKG-INFO index 38364fb1a..ad273b718 100644 --- a/taxcalc.egg-info/PKG-INFO +++ b/taxcalc.egg-info/PKG-INFO @@ -1,6 +1,6 @@ Metadata-Version: 2.1 Name: taxcalc -Version: 4.3.5 +Version: 4.4.0 Summary: taxcalc Home-page: https://github.com/PSLmodels/Tax-Calculator Download-URL: https://github.com/PSLmodels/Tax-Calculator diff --git a/taxcalc/reforms/ext.json b/taxcalc/reforms/ext.json index 1a72b182c..d8b68931f 100644 --- a/taxcalc/reforms/ext.json +++ b/taxcalc/reforms/ext.json @@ -1,5 +1,5 @@ // REFORM TO EXTEND TEMPORARY TCJA PROVISIONS BEYOND 2025 -// USING TAX-CALCULATOR 4.3.5 +// USING TAX-CALCULATOR 4.4.0 // WITH 2025-to-2026 INDEXING FACTOR = 1.024900 // AND 2028-to-2029 INDEXING FACTOR = 1.021800 {