Skip to content

Commit

Permalink
Merge pull request #2349 from martinholmer/2-4-1
Browse files Browse the repository at this point in the history 
Update documentation for release 2.4.1
  • Loading branch information
@martinholmer
martinholmer authored Jun 26, 2019
2 parents 51ef36a + 67211fe commit 79637c1
Show file tree
Hide file tree
Showing 10 changed files with 82 additions and 55 deletions.
8 changes: 8 additions & 0 deletions CHANGES.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,14 @@ TAX-CALCULATOR CHANGE HISTORY
=============================


Changes in release 2.4.1 on 2019-06-26
--------------------------------------

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

- Add taxable-income cap to qualified business income deduction logic


Changes in release 2.4.0 on 2019-06-25
--------------------------------------

Expand Down
19 changes: 19 additions & 0 deletions RELEASES.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,25 @@ Go [here](https://github.com/PSLmodels/Tax-Calculator/pulls?q=is%3Apr+is%3Aclose
for a complete commit history.


2019-06-26 Release 2.4.1
------------------------
(last merged pull request is
[#2349](https://github.com/PSLmodels/Tax-Calculator/pull/2349))

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

**API Changes**
- None

**New Features**
- None

**Bug Fixes**
- Add taxable-income cap to qualified business income deduction logic
[[#2349](https://github.com/PSLmodels/Tax-Calculator/pull/2349)
by Martin Holmer]


2019-06-25 Release 2.4.0
------------------------
(last merged pull request is
Expand Down
Binary file modified docs/atr.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 2 additions & 2 deletions docs/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -98,8 +98,8 @@ <h3>What is Tax-Calculator?</h3>
<h3>Latest Release</h3>

<p>
<a href="https://github.com/PSLmodels/Tax-Calculator/blob/master/RELEASES.md#2019-06-25-release-240" target="_blank">
2.4.0 (2019-06-25)
<a href="https://github.com/PSLmodels/Tax-Calculator/blob/master/RELEASES.md#2019-06-26-release-241" target="_blank">
2.4.1 (2019-06-26)
</a>
</p>

Expand Down
4 changes: 2 additions & 2 deletions docs/index.htmx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -77,8 +77,8 @@
<h3>Latest Release</h3>

<p>
<a href="https://github.com/PSLmodels/Tax-Calculator/blob/master/RELEASES.md#2019-06-25-release-240" target="_blank">
2.4.0 (2019-06-25)
<a href="https://github.com/PSLmodels/Tax-Calculator/blob/master/RELEASES.md#2019-06-26-release-241" target="_blank">
2.4.1 (2019-06-26)
</a>
</p>

Expand Down
Binary file modified docs/mtr.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified docs/pch.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
34 changes: 17 additions & 17 deletions docs/uguide.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -555,31 +555,31 @@ <h4 id="cli-init-analysis">2e. Initiate Reform Analysis</h4>
Returns ExpInc IncTax PayTax LSTax AllTax
(#m) ($b) ($b) ($b) ($b) ($b)
0 17.19 195.6 -6.1 20.9 0.0 14.8
1 17.19 500.1 -8.0 44.1 0.0 36.1
2 17.19 664.2 -2.9 51.7 0.0 48.8
3 17.19 829.5 1.1 68.5 0.0 69.6
4 17.19 1030.5 7.6 86.7 0.0 94.3
5 17.19 1273.3 16.6 103.9 0.0 120.5
6 17.19 1596.8 40.5 137.6 0.0 178.1
7 17.19 2044.5 81.2 183.3 0.0 264.5
8 17.19 2821.3 176.9 263.2 0.0 440.1
9 17.19 6369.3 1026.0 476.3 0.0 1502.3
A 171.93 17325.2 1332.9 1436.2 0.0 2769.1
1 17.19 500.1 -7.9 44.1 0.0 36.2
2 17.19 664.2 -2.7 51.7 0.0 49.0
3 17.19 829.5 1.3 68.5 0.0 69.8
4 17.19 1030.5 7.8 86.7 0.0 94.5
5 17.19 1273.3 16.7 103.9 0.0 120.6
6 17.19 1596.8 40.7 137.6 0.0 178.4
7 17.19 2044.5 81.4 183.3 0.0 264.7
8 17.19 2821.3 177.1 263.2 0.0 440.3
9 17.19 6369.3 1026.1 476.3 0.0 1502.4
A 171.93 17325.2 1334.5 1436.2 0.0 2770.7

Weighted Tax Differences by Baseline Expanded-Income Decile
Returns ExpInc IncTax PayTax LSTax AllTax
(#m) ($b) ($b) ($b) ($b) ($b)
0 17.19 195.6 -1.7 0.0 0.0 -1.7
0 17.19 195.6 -1.8 0.0 0.0 -1.8
1 17.19 500.1 -7.0 0.0 0.0 -7.0
2 17.19 664.2 -8.3 0.0 0.0 -8.3
3 17.19 829.5 -10.9 0.0 0.0 -10.9
3 17.19 829.5 -11.0 0.0 0.0 -11.0
4 17.19 1030.5 -15.1 0.0 0.0 -15.1
5 17.19 1273.3 -21.4 0.0 0.0 -21.4
6 17.19 1596.8 -29.0 0.0 0.0 -29.0
7 17.19 2044.5 -39.0 0.0 0.0 -39.0
8 17.19 2821.3 -63.0 0.0 0.0 -63.0
9 17.19 6369.3 -87.4 0.0 0.0 -87.4
A 171.93 17325.2 -282.8 0.0 0.0 -282.8
6 17.19 1596.8 -28.9 0.0 0.0 -28.9
7 17.19 2044.5 -38.9 0.0 0.0 -38.9
8 17.19 2821.3 -62.9 0.0 0.0 -62.9
9 17.19 6369.3 -87.5 0.0 0.0 -87.5
A 171.93 17325.2 -282.9 0.0 0.0 -282.9
</pre></p>

<p>
Expand Down
34 changes: 17 additions & 17 deletions docs/uguide.htmx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -554,31 +554,31 @@ Weighted Tax Reform Totals by Baseline Expanded-Income Decile
Returns ExpInc IncTax PayTax LSTax AllTax
(#m) ($b) ($b) ($b) ($b) ($b)
0 17.19 195.6 -6.1 20.9 0.0 14.8
1 17.19 500.1 -8.0 44.1 0.0 36.1
2 17.19 664.2 -2.9 51.7 0.0 48.8
3 17.19 829.5 1.1 68.5 0.0 69.6
4 17.19 1030.5 7.6 86.7 0.0 94.3
5 17.19 1273.3 16.6 103.9 0.0 120.5
6 17.19 1596.8 40.5 137.6 0.0 178.1
7 17.19 2044.5 81.2 183.3 0.0 264.5
8 17.19 2821.3 176.9 263.2 0.0 440.1
9 17.19 6369.3 1026.0 476.3 0.0 1502.3
A 171.93 17325.2 1332.9 1436.2 0.0 2769.1
1 17.19 500.1 -7.9 44.1 0.0 36.2
2 17.19 664.2 -2.7 51.7 0.0 49.0
3 17.19 829.5 1.3 68.5 0.0 69.8
4 17.19 1030.5 7.8 86.7 0.0 94.5
5 17.19 1273.3 16.7 103.9 0.0 120.6
6 17.19 1596.8 40.7 137.6 0.0 178.4
7 17.19 2044.5 81.4 183.3 0.0 264.7
8 17.19 2821.3 177.1 263.2 0.0 440.3
9 17.19 6369.3 1026.1 476.3 0.0 1502.4
A 171.93 17325.2 1334.5 1436.2 0.0 2770.7

Weighted Tax Differences by Baseline Expanded-Income Decile
Returns ExpInc IncTax PayTax LSTax AllTax
(#m) ($b) ($b) ($b) ($b) ($b)
0 17.19 195.6 -1.7 0.0 0.0 -1.7
0 17.19 195.6 -1.8 0.0 0.0 -1.8
1 17.19 500.1 -7.0 0.0 0.0 -7.0
2 17.19 664.2 -8.3 0.0 0.0 -8.3
3 17.19 829.5 -10.9 0.0 0.0 -10.9
3 17.19 829.5 -11.0 0.0 0.0 -11.0
4 17.19 1030.5 -15.1 0.0 0.0 -15.1
5 17.19 1273.3 -21.4 0.0 0.0 -21.4
6 17.19 1596.8 -29.0 0.0 0.0 -29.0
7 17.19 2044.5 -39.0 0.0 0.0 -39.0
8 17.19 2821.3 -63.0 0.0 0.0 -63.0
9 17.19 6369.3 -87.4 0.0 0.0 -87.4
A 171.93 17325.2 -282.8 0.0 0.0 -282.8
6 17.19 1596.8 -28.9 0.0 0.0 -28.9
7 17.19 2044.5 -38.9 0.0 0.0 -38.9
8 17.19 2821.3 -62.9 0.0 0.0 -62.9
9 17.19 6369.3 -87.5 0.0 0.0 -87.5
A 171.93 17325.2 -282.9 0.0 0.0 -282.9
</pre></p>

<p>
Expand Down
34 changes: 17 additions & 17 deletions docs/uguide.res
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,31 +4,31 @@ Weighted Tax Reform Totals by Baseline Expanded-Income Decile
Returns ExpInc IncTax PayTax LSTax AllTax
(#m) ($b) ($b) ($b) ($b) ($b)
0 17.19 195.6 -6.1 20.9 0.0 14.8
1 17.19 500.1 -8.0 44.1 0.0 36.1
2 17.19 664.2 -2.9 51.7 0.0 48.8
3 17.19 829.5 1.1 68.5 0.0 69.6
4 17.19 1030.5 7.6 86.7 0.0 94.3
5 17.19 1273.3 16.6 103.9 0.0 120.5
6 17.19 1596.8 40.5 137.6 0.0 178.1
7 17.19 2044.5 81.2 183.3 0.0 264.5
8 17.19 2821.3 176.9 263.2 0.0 440.1
9 17.19 6369.3 1026.0 476.3 0.0 1502.3
A 171.93 17325.2 1332.9 1436.2 0.0 2769.1
1 17.19 500.1 -7.9 44.1 0.0 36.2
2 17.19 664.2 -2.7 51.7 0.0 49.0
3 17.19 829.5 1.3 68.5 0.0 69.8
4 17.19 1030.5 7.8 86.7 0.0 94.5
5 17.19 1273.3 16.7 103.9 0.0 120.6
6 17.19 1596.8 40.7 137.6 0.0 178.4
7 17.19 2044.5 81.4 183.3 0.0 264.7
8 17.19 2821.3 177.1 263.2 0.0 440.3
9 17.19 6369.3 1026.1 476.3 0.0 1502.4
A 171.93 17325.2 1334.5 1436.2 0.0 2770.7

Weighted Tax Differences by Baseline Expanded-Income Decile
Returns ExpInc IncTax PayTax LSTax AllTax
(#m) ($b) ($b) ($b) ($b) ($b)
0 17.19 195.6 -1.7 0.0 0.0 -1.7
0 17.19 195.6 -1.8 0.0 0.0 -1.8
1 17.19 500.1 -7.0 0.0 0.0 -7.0
2 17.19 664.2 -8.3 0.0 0.0 -8.3
3 17.19 829.5 -10.9 0.0 0.0 -10.9
3 17.19 829.5 -11.0 0.0 0.0 -11.0
4 17.19 1030.5 -15.1 0.0 0.0 -15.1
5 17.19 1273.3 -21.4 0.0 0.0 -21.4
6 17.19 1596.8 -29.0 0.0 0.0 -29.0
7 17.19 2044.5 -39.0 0.0 0.0 -39.0
8 17.19 2821.3 -63.0 0.0 0.0 -63.0
9 17.19 6369.3 -87.4 0.0 0.0 -87.4
A 171.93 17325.2 -282.8 0.0 0.0 -282.8
6 17.19 1596.8 -28.9 0.0 0.0 -28.9
7 17.19 2044.5 -38.9 0.0 0.0 -38.9
8 17.19 2821.3 -62.9 0.0 0.0 -62.9
9 17.19 6369.3 -87.5 0.0 0.0 -87.5
A 171.93 17325.2 -282.9 0.0 0.0 -282.9
create PNG graph output by hand
$ cat tab.sql | sqlite3 cps-16-#-#-#.db
unweighted count | weighted count (#m) of filing units
Expand Down

0 comments on commit 79637c1

Please sign in to comment.