Skip to content

Commit

Permalink
fix conflicts
Browse files Browse the repository at this point in the history
  • Loading branch information
jdebacker committed Sep 29, 2023
2 parents 56187f1 + a01f6f2 commit 71aae8c
Show file tree
Hide file tree
Showing 105 changed files with 10,949 additions and 3,174 deletions.
3 changes: 3 additions & 0 deletions .github/FUNDING.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
# These are supported funding model platforms

open_collective: psl
28 changes: 14 additions & 14 deletions .github/workflows/build_and_test.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: Build Package and Test Source Code [Python 3.6, 3.7, 3.8, 3.9]
name: Build Package and Test Source Code [Python 3.7, 3.8, 3.9, 3.10]

on: [push, pull_request]

Expand All @@ -8,7 +8,7 @@ jobs:
strategy:
matrix:
os: [ubuntu-latest, windows-latest]
python-version: [3.6, 3.7, 3.8, 3.9]
python-version: [3.7, 3.8, 3.9, '3.10']

steps:
- name: Checkout
Expand All @@ -27,20 +27,20 @@ jobs:
- name: Build
shell: bash -l {0}
run: |
pip install -e .
pip install pytest-cov
pip install pytest-pycodestyle
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
# uses: codecov/codecov-action@v1
# 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
- name: Upload coverage to Codecov
uses: codecov/codecov-action@v3
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
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ clean:

.PHONY=package
package:
@pbrelease Tax-Calculator taxcalc 9.9.9 --local
@pip install -e .

define pytest-setup
rm -f taxcalc/tests/reforms_actual_init
Expand Down Expand Up @@ -69,7 +69,7 @@ pytest-all:
define tctest-cleanup
rm -f test.csv
rm -f test-18-*
conda uninstall taxcalc --yes --quiet 2>&1 > /dev/null
pip uninstall taxcalc --yes --quiet 2>&1 > /dev/null
endef

.PHONY=tctest
Expand Down
2 changes: 1 addition & 1 deletion PSL_catalog.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
"end_header": null,
"source": null,
"type": "html",
"data": "<ul><li>Martin Holmer</li><ul><li>email: first and last names separated by a period at gmail dot com</li><li>phone: 526-0406 prefaced by area code two zero two</li></ul><li>Matt Jensen</li></ul>"
"data": "<ul><li>Jason DeBacker</li><li>Henry Doupe</li><li>Anderson Frailey</li><li>Matt Jensen</li></ul>"
},
"user_documentation": {
"start_header": null,
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ Tax-Calculator
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,
contact [email protected] or jump right in.
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.

Complete documentation is available
[here](https://PSLmodels.github.io/Tax-Calculator/).
8 changes: 6 additions & 2 deletions conda.recipe/meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,21 +11,25 @@ requirements:
- python
- "numpy>=1.14"
- "pandas>=1.2.0"
- "bokeh>=1.4.0"
- "bokeh>=1.4.0, <3.0.0"
- requests
- numba
- "paramtools>=0.18.0"
- behresp
- aiohttp
- curl

run:
- python
- "numpy>=1.14"
- "pandas>=1.2.0"
- "bokeh>=1.4.0"
- "bokeh>=1.4.0, <3.0.0"
- requests
- numba
- "paramtools>=0.18.0"
- behresp
- aiohttp
- curl

test:
commands:
Expand Down
6 changes: 6 additions & 0 deletions docs/_config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,12 @@ html:
use_edit_page_button: true
use_repository_button: true
use_issues_button: true
launch_buttons:
colab_url: "https://colab.research.google.com"
binderhub_url: "https://mybinder.org"
notebook_interface: "classic" # or "jupyterlab"
execute:
timeout: -1

#######################################################################################
# Advanced and power-user settings
Expand Down
106 changes: 55 additions & 51 deletions docs/_toc.yml
Original file line number Diff line number Diff line change
@@ -1,57 +1,61 @@
- file: index
- part: Usage
sections:
format: jb-book
root: index
parts:
- caption: Usage
chapters:
- file: usage/starting
- file: usage/overview
- file: usage/data
- file: guide/index
sections:
- file: guide/python_interface
- file: guide/cli
- file: guide/policy_params
- file: guide/input_vars
- file: guide/output_vars
- file: guide/assumption_params
- file: guide/python_interface
- file: guide/cli
- file: guide/policy_params
- file: guide/input_vars
- file: guide/output_vars
- file: guide/assumption_params
- file: recipes/index
sections:
- file: recipes/recipe00
- file: recipes/recipe01
- file: recipes/recipe02
- file: recipes/recipe03
- file: recipes/recipe04
- file: recipes/recipe04_pandas
- file: recipes/recipe05
- file: recipes/recipe06
- part: About
sections:
- file: about/history
- file: about/roadmap
- file: about/releases
- file: about/changes
- file: about/upgrading
- file: about/license
- part: Contributing
sections:
- file: contributing/contributor_guide
- file: contributing/pr_workflow
- file: contributing/param_naming
- file: contributing/testing
- part: API
sections:
- file: api/public_api
sections:
- file: api/calcfunctions
- file: api/calculator
- file: api/consumption
- file: api/data
- file: api/decorators
- file: api/growdiff
- file: api/growfactors
- file: api/parameters
- file: api/policy
- file: api/records
- file: api/taxcalcio
- file: api/utils
- file: api/utilsprvt
- part: Tax-Calculator use cases
sections:
- file: use_cases
- file: recipes/recipe00
- file: recipes/recipe01
- file: recipes/recipe02
- file: recipes/recipe03
- file: recipes/recipe04
- file: recipes/recipe04_pandas
- file: recipes/recipe05
- file: recipes/recipe06
- caption: About
chapters:
- file: about/history
- file: about/roadmap
- file: about/releases
- file: about/changes
- file: about/upgrading
- file: about/license
- caption: Contributing
chapters:
- file: contributing/contributor_guide
- file: contributing/pr_workflow
- file: contributing/param_naming
- file: contributing/testing
- file: contributing/RELEASING
- caption: API
chapters:
- file: api/public_api
sections:
- file: api/calcfunctions
- file: api/calculator
- file: api/consumption
- file: api/data
- file: api/decorators
- file: api/growdiff
- file: api/growfactors
- file: api/parameters
- file: api/policy
- file: api/records
- file: api/taxcalcio
- file: api/utils
- file: api/utilsprvt
- caption: Tax-Calculator use cases
chapters:
- file: use_cases
88 changes: 88 additions & 0 deletions docs/about/releases.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,94 @@ Release history
Go [here](https://github.com/PSLmodels/Tax-Calculator/pulls?q=is%3Apr+is%3Aclosed)
for a complete commit history.

2023-06-20 Release 3.4.1
------------------------
(last merged pull request is
[#2686](https://github.com/PSLmodels/Tax-Calculator/pull/2686))

**This is an enhancement and bug-fix release.**

**API Changes**

**New Features**
- Update documentation of use cases [[#2686](https://github.com/PSLmodels/Tax-Calculator/pull/2686) by Jason Debacker]
- Update the last budget year to 2033 ~ also extend the projections to 2033 [[#2682](https://github.com/PSLmodels/Tax-Calculator/pull/2682) by Bodi Yang]

**Bug Fixes**
- Reweight PUF data for the year 2033, to fix the odd PUF weightings, PUF ratios and odd projections [[#2685](https://github.com/PSLmodels/Tax-Calculator/pull/2685) by Bodi Yang], with primary work in [[TaxData PR #429](https://github.com/PSLmodels/taxdata/pull/429)by Bodi Yang]
- Fix incorrect value for EITC_c in 2020 [[#2684](https://github.com/PSLmodels/Tax-Calculator/pull/2684) by Matt Jensen]


2023-05-05 Release 3.4.0
------------------------
(last merged pull request is
[#2677](https://github.com/PSLmodels/Tax-Calculator/pull/2677))

**This is an enhancement and bug-fix release.**

**API Changes**

**New Features**
- Tax-Calculator baseline update for CBO economic projections, published in May, "The Budget and Economic Outlook: 2023 to 2033" [[#2676](https://github.com/PSLmodels/Tax-Calculator/pull/2676) by Bodi Yang], with primary work in [[TaxData PR #421](https://github.com/PSLmodels/taxdata/pull/421)by Bodi Yang]

**Bug Fixes**
- Replacement of the deprecated Pandas `.append()` method in the model [[#2676](https://github.com/PSLmodels/Tax-Calculator/pull/2676) by Bodi Yang]
- Fix calculaton of 2021 child and other dependent credit [[#2677](https://github.com/PSLmodels/Tax-Calculator/pull/2677) by Matt Jensen]
- Fix exemption of UI from AGI for EITC in certain years [[#2675](https://github.com/PSLmodels/Tax-Calculator/pull/2675) by Jason Debacker]
- Fix incorrect value for max EITC in 2022 [[#2673](https://github.com/PSLmodels/Tax-Calculator/pull/2673) by Jason Debacker]

2022-12-16 Release 3.3.0
------------------------
(last merged pull request is
[#2662](https://github.com/PSLmodels/Tax-Calculator/pull/2662))

**This is an enhancement and bug-fix release.**

**API Changes**

**New Features**
- Tax-Calculator baseline update for CBO economic projections, published in May, "The Budget and Economic Outlook: 2022 to 2032" [[#2662](https://github.com/PSLmodels/Tax-Calculator/pull/2662) by Bodi Yang], with primary work in [[TaxData PR #412](https://github.com/PSLmodels/taxdata/pull/412)by Bodi Yang]
- Add parameters for threshold for self-employment income exempt from SECA taxes [[#2659](https://github.com/PSLmodels/Tax-Calculator/pull/2659) by Jason Debacker]
- Update calculation of child number when CTC_include17 [[#2644](https://github.com/PSLmodels/Tax-Calculator/pull/2644) by Matt Jensen]
- Add Python 3.10 to test matrix [[#2646](https://github.com/PSLmodels/Tax-Calculator/pull/2646) by Jason Debacker]
- Inflation adjustment of the year 2020, 2021, 2022, for IRS tax forms and tax law inflation adjustments documents [[#2633](https://github.com/PSLmodels/Tax-Calculator/pull/2633) by Bodi Yang]

**Bug Fixes**
- Fix Parameter error parsing in taxcalcio module [[#2625](https://github.com/PSLmodels/Tax-Calculator/pull/2625/commits) by Hank Doupe]

2021-08-06 Release 3.2.1
------------------------
(last merged pull request is
[#2615](https://github.com/PSLmodels/Tax-Calculator/pull/2615))

**This is bug-fix release.**

**API Changes**

**New Features**

**Bug Fixes**
Correct an error in the value of the `CTC_new_c_under6_bonus` for the year 2021. [[#2609](https://github.com/PSLmodels/Tax-Calculator/pull/2609) by Jason DeBacker]


2021-07-17 Release 3.2.0
------------------------
(last merged pull request is
[#2604](https://github.com/PSLmodels/Tax-Calculator/pull/2604))

**This is an enhancement and bug-fix release.**

**API Changes**

**New Features**
- Updates the current law baseline to include the CARES Act (#2586), the the Consolidated Appropriations Act of 2021, and the American Rescue Plan Act, (PRs #2573 and #2588), and the Consolidated Appropriations Act of 2021 (PR #2593) as well as updates to EITC parameters (PR #2593). This ends a transition period for users to model these changes as reforms to the former baseline. [[#2586](https://github.com/PSLmodels/tax-calculator/pull/2586), [#2593](https://github.com/PSLmodels/tax-calculator/pull/2593), [#2573](https://github.com/PSLmodels/tax-calculator/pull/2573), [#2588](https://github.com/PSLmodels/tax-calculator/pull/2588), [#2593](https://github.com/PSLmodels/tax-calculator/pull/2593) with contributions from Angela Shoulders, Cody Kallen, Matt Jensen, and Jason DeBacker]
- Updates growfactors and weights for the PUF and CPS data to reflect updates to `taxdata`, including new CBO forecasts. [[#2599](https://github.com/PSLmodels/tax-calculator/pull/2599) by Anderson Frailey]
- Add profiling to testing [[#2570](https://github.com/PSLmodels/tax-calculator/pull/2570), [#2577](https://github.com/PSLmodels/tax-calculator/pull/2577), [#2587](https://github.com/PSLmodels/tax-calculator/pull/2587) by Jacob Chuslo]
- Allow for non-taxed UI eligibility. [[#2579](https://github.com/PSLmodels/tax-calculator/pull/2579) by Max Ghenis]
- Additional unit tests for `calcfunctions.py`. [[#2572](https://github.com/PSLmodels/tax-calculator/pull/2572) by Angela Shoulders]

**Bug Fixes**


2021-03-01 Release 3.1.0
------------------------
Expand Down
Loading

0 comments on commit 71aae8c

Please sign in to comment.