Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

release 2-6-0 #2379

Merged
merged 3 commits into from
Oct 31, 2019
Merged

release 2-6-0 #2379

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
cf185d6
release 2-6-0
Oct 31, 2019
7586a02
Merge remote-tracking branch 'upstream/master' into 2-6-0
Oct 31, 2019
d975d22
update 2-6-0 for reverted pr
Oct 31, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions CHANGES.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,13 @@
TAX-CALCULATOR CHANGE HISTORY
=============================

Changes in release 2.6.0 on 2019-10-31
--------------------------------------

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

- Add an additional version of recipe04 from the Tax-Calculator cookbook that shows how to use the Python Data Analysis Library (pandas) in applying different response elasticities to different earnings groups.


Changes in release 2.5.0 on 2019-08-06
--------------------------------------
Expand Down
17 changes: 17 additions & 0 deletions RELEASES.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,23 @@ Go [here](https://github.com/PSLmodels/Tax-Calculator/pulls?q=is%3Apr+is%3Aclose
for a complete commit history.


2019-10-31 Release 2.6.0
------------------------
(last merged pull request is
[#2379](https://github.com/PSLmodels/Tax-Calculator/pull/2379))

**This is an enhancement release.**

**API Changes**
- None

**New Features**
- Add a version of recipe04 for Pandas users [[#2373](https://github.com/PSLmodels/Tax-Calculator/pull/2373)
by Max Ghenis]

**Bug Fixes**
- None

2019-08-06 Release 2.5.0
------------------------
(last merged pull request is
Expand Down
4 changes: 2 additions & 2 deletions docs/index.html
View file
Open in desktop
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-08-06-release-250" target="_blank">
2.5.0 (2019-08-06)
<a href="https://github.com/PSLmodels/Tax-Calculator/blob/master/RELEASES.md#2019-10-31-release-260" target="_blank">
2.6.0 (2019-10-31)
</a>
</p>

Expand Down
4 changes: 2 additions & 2 deletions docs/index.htmx
View file
Open in desktop
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-08-06-release-250" target="_blank">
2.5.0 (2019-08-06)
<a href="https://github.com/PSLmodels/Tax-Calculator/blob/master/RELEASES.md#2019-10-31-release-260" target="_blank">
2.6.0 (2019-10-31)
</a>
</p>

Expand Down
2 changes: 1 addition & 1 deletion docs/tc_history.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<!DOCTYPE html>
<!-- *** NEVER EDIT THIS FILE BY HAND *** -->
<!-- *** INSTEAD EDIT /Users/mrh/work/PSL/Tax-Calculator/docs/tc_history.htmx FILE *** -->
<!-- *** INSTEAD EDIT /Users/matthewjensen/Projects/Tax-Calculator/docs/tc_history.htmx FILE *** -->
<html>
<head>
<meta name="viewport" content="width=device-width, initial-scale=1.0">
Expand Down
2 changes: 1 addition & 1 deletion docs/tc_license.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<!DOCTYPE html>
<!-- *** NEVER EDIT THIS FILE BY HAND *** -->
<!-- *** INSTEAD EDIT /Users/mrh/work/PSL/Tax-Calculator/docs/tc_license.htmx FILE *** -->
<!-- *** INSTEAD EDIT /Users/matthewjensen/Projects/Tax-Calculator/docs/tc_license.htmx FILE *** -->
<html>
<head>
<meta name="viewport" content="width=device-width, initial-scale=1.0">
Expand Down
2 changes: 1 addition & 1 deletion docs/tc_overview.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<!DOCTYPE html>
<!-- *** NEVER EDIT THIS FILE BY HAND *** -->
<!-- *** INSTEAD EDIT /Users/mrh/work/PSL/Tax-Calculator/docs/tc_overview.htmx FILE *** -->
<!-- *** INSTEAD EDIT /Users/matthewjensen/Projects/Tax-Calculator/docs/tc_overview.htmx FILE *** -->
<html>
<head>
<meta name="viewport" content="width=device-width, initial-scale=1.0">
Expand Down
2 changes: 1 addition & 1 deletion docs/tc_roadmap.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<!DOCTYPE html>
<!-- *** NEVER EDIT THIS FILE BY HAND *** -->
<!-- *** INSTEAD EDIT /Users/mrh/work/PSL/Tax-Calculator/docs/tc_roadmap.htmx FILE *** -->
<!-- *** INSTEAD EDIT /Users/matthewjensen/Projects/Tax-Calculator/docs/tc_roadmap.htmx FILE *** -->
<html>
<head>
<meta name="viewport" content="width=device-width, initial-scale=1.0">
Expand Down
2 changes: 1 addition & 1 deletion docs/tc_starting.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<!DOCTYPE html>
<!-- *** NEVER EDIT THIS FILE BY HAND *** -->
<!-- *** INSTEAD EDIT /Users/mrh/work/PSL/Tax-Calculator/docs/tc_starting.htmx FILE *** -->
<!-- *** INSTEAD EDIT /Users/matthewjensen/Projects/Tax-Calculator/docs/tc_starting.htmx FILE *** -->
<html>
<head>
<meta name="viewport" content="width=device-width, initial-scale=1.0">
Expand Down
4 changes: 2 additions & 2 deletions docs/uguide.html
View file
Open in desktop

Large diffs are not rendered by default.