Merge pull request #2338 from martinholmer/2-3-0

Update RELEASES/CHANGES info for release 2.3.0
PSLmodels · Jun 8, 2019 · ab32802 · ab32802
2 parents 9e66030 + a9e1686
commit ab32802
Show file tree

Hide file tree

Showing 6 changed files with 64 additions and 8 deletions.
diff --git a/CHANGES.md b/CHANGES.md
@@ -2,6 +2,16 @@ TAX-CALCULATOR CHANGE HISTORY
 =============================
 
 
+Changes in release 2.3.0 on 2019-06-08
+--------------------------------------
+
+**This is an enhancement release.**
+
+- Redo validation tests using newest version of TAXSIM-27
+
+- Simplify Records class internal logic by adding generic Data class
+
+
 Changes in release 2.2.0 on 2019-05-20
 --------------------------------------
 

diff --git a/RELEASES.md b/RELEASES.md
@@ -4,6 +4,28 @@ Go [here](https://github.com/PSLmodels/Tax-Calculator/pulls?q=is%3Apr+is%3Aclose
 for a complete commit history.
 
 
+2019-06-08 Release 2.3.0
+------------------------
+(last merged pull request is
+[#2337](https://github.com/PSLmodels/Tax-Calculator/pull/2337))
+
+**This is an enhancement release.**
+
+**API Changes**
+- None
+
+**New Features**
+- Redo validation tests using newest version of TAXSIM-27
+  [[#2336](https://github.com/PSLmodels/Tax-Calculator/pull/2336)
+  by Martin Holmer with assistance from Dan Feenberg]
+- Simplify Records class internal logic by adding generic Data class
+  [[#2337](https://github.com/PSLmodels/Tax-Calculator/pull/2337)
+  by Martin Holmer based on ideas from Cody Kallen]
+
+**Bug Fixes**
+- None
+
+
 2019-05-20 Release 2.2.0
 ------------------------
 (last merged pull request is

diff --git a/docs/index.html b/docs/index.html
@@ -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-05-20-release-220" target="_blank">
-    2.2.0 (2019-05-20)
+  <a href="https://github.com/PSLmodels/Tax-Calculator/blob/master/RELEASES.md#2019-06-08-release-230" target="_blank">
+    2.3.0 (2019-06-08)
   </a>    
 </p>
 

diff --git a/docs/index.htmx b/docs/index.htmx
@@ -77,8 +77,8 @@
 <h3>Latest Release</h3>
 
 <p>
-  <a href="https://github.com/PSLmodels/Tax-Calculator/blob/master/RELEASES.md#2019-05-20-release-220" target="_blank">
-    2.2.0 (2019-05-20)
+  <a href="https://github.com/PSLmodels/Tax-Calculator/blob/master/RELEASES.md#2019-06-08-release-230" target="_blank">
+    2.3.0 (2019-06-08)
   </a>    
 </p>
 

diff --git a/docs/tc_overview.html b/docs/tc_overview.html
@@ -150,7 +150,7 @@ <h4>Quick Summary</h4>
 <h4>Complete Story</h4>
 
 <p>
-Tax-Calculator contains seven basic classes, and a collection of
+Tax-Calculator contains eight basic classes, and a collection of
 global utility functions, that together provide the full range of
 Tax-Calculator capabilities.  Here is a description of their role in
 Tax-Calculator and a link to each the detailed documentation and
@@ -162,11 +162,23 @@ <h4>Complete Story</h4>
 <ul>
 
   <li><p>
-    <b>Records</b> &rarr; Contains attributes of each filing unit.<br />
+    <b>Data</b> &rarr; Contains basic logic for manipulating
+    cross-sectional data that need to have growth factors and sample
+    weights to age the data to years after the data start year.<br />
+    Documentation and source code are in
+    <a href="https://github.com/PSLmodels/Tax-Calculator/blob/master/taxcalc/data.py"
+       target="_blank">data.py</a>.
+  </p></li>
+
+  <ul>
+  <li><p>
+    <b>Records</b> &rarr; Derived from <b>Data</b> and contains attributes
+    of each tax filing unit.<br />
     Documentation and source code are in
     <a href="https://github.com/PSLmodels/Tax-Calculator/blob/master/taxcalc/records.py"
        target="_blank">records.py</a>.
   </p></li>
+  </ul>
 
   <li><p>
     <b>GrowFactors</b> &rarr; Contains CBO-derived baseline annual

diff --git a/docs/tc_overview.htmx b/docs/tc_overview.htmx
@@ -129,7 +129,7 @@
 <h4>Complete Story</h4>
 
 <p>
-Tax-Calculator contains seven basic classes, and a collection of
+Tax-Calculator contains eight basic classes, and a collection of
 global utility functions, that together provide the full range of
 Tax-Calculator capabilities.  Here is a description of their role in
 Tax-Calculator and a link to each the detailed documentation and
@@ -141,11 +141,23 @@ source code for each class and all its methods.
 <ul>
 
   <li><p>
-    <b>Records</b> &rarr; Contains attributes of each filing unit.<br />
+    <b>Data</b> &rarr; Contains basic logic for manipulating
+    cross-sectional data that need to have growth factors and sample
+    weights to age the data to years after the data start year.<br />
+    Documentation and source code are in
+    <a href="https://github.com/PSLmodels/Tax-Calculator/blob/master/taxcalc/data.py"
+       target="_blank">data.py</a>.
+  </p></li>
+
+  <ul>
+  <li><p>
+    <b>Records</b> &rarr; Derived from <b>Data</b> and contains attributes
+    of each tax filing unit.<br />
     Documentation and source code are in
     <a href="https://github.com/PSLmodels/Tax-Calculator/blob/master/taxcalc/records.py"
        target="_blank">records.py</a>.
   </p></li>
+  </ul>
 
   <li><p>
     <b>GrowFactors</b> &rarr; Contains CBO-derived baseline annual