Skip to content

Commit

Permalink
Merge in recent changes on master branch
Browse files Browse the repository at this point in the history
  • Loading branch information
martinholmer committed Nov 13, 2024
2 parents 2e4591a + 1facce4 commit 9cda879
Show file tree
Hide file tree
Showing 16 changed files with 1,523 additions and 93 deletions.
5 changes: 4 additions & 1 deletion .github/workflows/build_and_test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,11 +30,13 @@ jobs:
pip install -e . --user
pip install pytest-cov --user
pip install pytest-pycodestyle --user
- name: Test
shell: bash -l {0}
working-directory: ./
run: |
pytest -m 'not requires_pufcsv and not pre_release and not local' --cov=./ --cov-report=xml
- name: Upload coverage to Codecov
if: matrix.os == 'ubuntu-latest' && contains(github.repository, 'PSLmodels/Tax-Calculator')
uses: codecov/codecov-action@v4
Expand All @@ -43,5 +45,6 @@ jobs:
file: ./coverage.xml
flags: unittests
name: codecov-umbrella
fail_ci_if_error: true
#fail_ci_if_error: true
fail_ci_if_error: false
verbose: true
20 changes: 20 additions & 0 deletions docs/about/releases.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,26 @@ Go [here](https://github.com/PSLmodels/Tax-Calculator/pulls?q=is%3Apr+is%3Aclose
for a complete commit history.


2024-11-08 Release 4.3.2
------------------------
(last merged pull request is
[#2834](https://github.com/PSLmodels/Tax-Calculator/pull/2834))

**This is a bug-fix release.**

**API Changes**

**New Features**
- Add Policy.tmd_constructor() static method for convenience when using Python API
[[#2834](https://github.com/PSLmodels/Tax-Calculator/pull/2834) by Martin Holmer]

**Bug Fixes**
- Fix handling of tmd_growfactors.csv file
[[#2832](https://github.com/PSLmodels/Tax-Calculator/pull/2832) by Martin Holmer]
- Fix `tc` reform documentation output
[[#2833](https://github.com/PSLmodels/Tax-Calculator/pull/2833) by Martin Holmer]


2024-10-28 Release 4.3.1
------------------------
(last merged pull request is
Expand Down
2 changes: 1 addition & 1 deletion docs/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ The cross-model validation work with NBER's TAXSIM-27 model is described

## Latest release

{doc}`4.3.1 (2024-10-28) <about/releases>`
{doc}`4.3.2 (2024-11-08) <about/releases>`

If you are already using Tax-Calculator, upgrade using the following command:

Expand Down
4 changes: 2 additions & 2 deletions docs/usage/data.md
Original file line number Diff line number Diff line change
Expand Up @@ -69,8 +69,8 @@ available only to Tax-Calculator users who have purchased their own
version of the 2015 IRS-SOI PUF. For those users, those three files
are avaiable from the tax-microdata repository. These three tmd files
can be used with the Tax-Calculator Python API (using the
`Records.tmd_constructor()` static method) or with the Tax-Calculator
CLI tool, `tc`.
`Records.tmd_constructor()` and `Policy.tmd_constructor()`static methods)
or with the Tax-Calculator CLI tool, `tc`.

## Using other data with Tax-Calculator

Expand Down
15 changes: 2 additions & 13 deletions docs/usage/tcja_after_2025.md
Original file line number Diff line number Diff line change
Expand Up @@ -86,23 +86,12 @@ To analyze your reform relative to a reform that extends all TCJA
temporary provisions beyond 2025, you would execute this command:

```
tc z.csv 2026 --exact --tables --baseline ext.json --reform x.json
tc z.csv 2026 --exact --tables --baseline ext.json --reform ext.json+x.json
```

The tables would be in the `z-26-ext-x-#-tab.text` output file
The tables would be in the `z-26-ext-ext+x-#-tab.text` output file
generated by this `tc` run.

Also, remember that you can simulate a _compound reform_ using the
following syntax:

```
tc z.csv 2026 --exact --tables --baseline ext.json --reform x.json+y.json
```

where `y.json` contains a reform with additional provisions not
included in your `x.json` reform file. The resulting table output
would be in a file named `z-26-ext-x+y-#-tab.text`.

And finally, you might consider creating a reform file called
`end.json` that contains just the two characters `{}`. This is a null
reform, which is equivalent to current-law policy, that could be used
Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
with open("README.md") as f:
longdesc = f.read()

version = "4.3.1"
version = "4.3.2"

config = {
"description": "Tax Calculator",
Expand Down
2 changes: 1 addition & 1 deletion taxcalc.egg-info/PKG-INFO
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Metadata-Version: 2.1
Name: taxcalc
Version: 4.3.1
Version: 4.3.2
Summary: taxcalc
Home-page: https://github.com/PSLmodels/Tax-Calculator
Download-URL: https://github.com/PSLmodels/Tax-Calculator
Expand Down
2 changes: 1 addition & 1 deletion taxcalc/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,6 @@
from taxcalc.utils import *
from taxcalc.cli import *

__version__ = '4.3.1b'
__version__ = '4.3.2'
__min_python3_version__ = 10
__max_python3_version__ = 12
2 changes: 1 addition & 1 deletion taxcalc/policy.py
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ class instance: Policy
DEFAULTS_FILE_NAME = 'policy_current_law.json'
DEFAULTS_FILE_PATH = os.path.abspath(os.path.dirname(__file__))
JSON_START_YEAR = 2013 # remains the same unless earlier data added
LAST_KNOWN_YEAR = 2024 # last year for which indexed param vals are known
LAST_KNOWN_YEAR = 2025 # last year for which indexed param vals are known
# should increase LAST_KNOWN_YEAR by one every calendar year
LAST_BUDGET_YEAR = 2074 # last extrapolation year
# should increase LAST_BUDGET_YEAR by one every calendar year
Expand Down
Loading

0 comments on commit 9cda879

Please sign in to comment.