Skip to content

Commit

Permalink
Merge pull request #2353 from martinholmer/2-4-2
Browse files Browse the repository at this point in the history 
Update documentation for release 2.4.2
  • Loading branch information
@martinholmer
martinholmer authored Jun 27, 2019
2 parents 8241fc1 + 7cf5a22 commit 7244e91
Show file tree
Hide file tree
Showing 11 changed files with 47 additions and 20 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.2 on 2019-06-28
--------------------------------------

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

- Add farm income to qualified business income


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

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-28 Release 2.4.2
------------------------
(last merged pull request is
[#2352](https://github.com/PSLmodels/Tax-Calculator/pull/2352))

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

**API Changes**
- None

**New Features**
- None

**Bug Fixes**
- Add farm income to qualified business income
[[#2352](https://github.com/PSLmodels/Tax-Calculator/pull/2352)
by Martin Holmer]


2019-06-26 Release 2.4.1
------------------------
(last merged pull request is
Expand Down
2 changes: 1 addition & 1 deletion RELEASING.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ RELEASING TAX-CALCULATOR CONDA PACKAGES
--> cd docs ; ./uguide_results.sh ; .fix. ; python make_uguide.py
--> specify release in index.htmx ; python make_tc_pages.py
--> specify release X.Y.Z in index.htmx ; python make_tc_pages.py
--> cd .. ; make clean [to remove taxcalc package]
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-26-release-241" target="_blank">
2.4.1 (2019-06-26)
<a href="https://github.com/PSLmodels/Tax-Calculator/blob/master/RELEASES.md#2019-06-28-release-242" target="_blank">
2.4.2 (2019-06-28)
</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-26-release-241" target="_blank">
2.4.1 (2019-06-26)
<a href="https://github.com/PSLmodels/Tax-Calculator/blob/master/RELEASES.md#2019-06-28-release-242" target="_blank">
2.4.2 (2019-06-28)
</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.
10 changes: 5 additions & 5 deletions docs/uguide.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -562,9 +562,9 @@ <h4 id="cli-init-analysis">2e. Initiate Reform Analysis</h4>
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
8 17.19 2821.3 177.0 263.2 0.0 440.2
9 17.19 6369.3 1025.5 476.3 0.0 1501.8
A 171.93 17325.2 1333.8 1436.2 0.0 2770.0

Weighted Tax Differences by Baseline Expanded-Income Decile
Returns ExpInc IncTax PayTax LSTax AllTax
Expand All @@ -578,8 +578,8 @@ <h4 id="cli-init-analysis">2e. Initiate Reform Analysis</h4>
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
9 17.19 6369.3 -87.0 0.0 0.0 -87.0
A 171.93 17325.2 -282.4 0.0 0.0 -282.4
</pre></p>

<p>
Expand Down
10 changes: 5 additions & 5 deletions docs/uguide.htmx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -561,9 +561,9 @@ Weighted Tax Reform Totals by Baseline Expanded-Income Decile
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
8 17.19 2821.3 177.0 263.2 0.0 440.2
9 17.19 6369.3 1025.5 476.3 0.0 1501.8
A 171.93 17325.2 1333.8 1436.2 0.0 2770.0

Weighted Tax Differences by Baseline Expanded-Income Decile
Returns ExpInc IncTax PayTax LSTax AllTax
Expand All @@ -577,8 +577,8 @@ Weighted Tax Differences by Baseline Expanded-Income Decile
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
9 17.19 6369.3 -87.0 0.0 0.0 -87.0
A 171.93 17325.2 -282.4 0.0 0.0 -282.4
</pre></p>

<p>
Expand Down
10 changes: 5 additions & 5 deletions docs/uguide.res
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@ Weighted Tax Reform Totals by Baseline Expanded-Income Decile
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
8 17.19 2821.3 177.0 263.2 0.0 440.2
9 17.19 6369.3 1025.5 476.3 0.0 1501.8
A 171.93 17325.2 1333.8 1436.2 0.0 2770.0

Weighted Tax Differences by Baseline Expanded-Income Decile
Returns ExpInc IncTax PayTax LSTax AllTax
Expand All @@ -27,8 +27,8 @@ Weighted Tax Differences by Baseline Expanded-Income Decile
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
9 17.19 6369.3 -87.0 0.0 0.0 -87.0
A 171.93 17325.2 -282.4 0.0 0.0 -282.4
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 7244e91

Please sign in to comment.