Merge pull request #2369 from martinholmer/2-5-0

Update RELEASES/CHANGES info for upcoming release 2.5.0
PSLmodels · Aug 6, 2019 · 36fcb34 · 36fcb34
2 parents 14c310b + dccde5e
commit 36fcb34
Show file tree

Hide file tree

Showing 8 changed files with 47 additions and 12 deletions.
diff --git a/CHANGES.md b/CHANGES.md
@@ -2,6 +2,16 @@ TAX-CALCULATOR CHANGE HISTORY
 =============================
 
 
+Changes in release 2.5.0 on 2019-08-06
+--------------------------------------
+
+**This is an enhancement and bug-fix release.**
+
+- Add to the income tax a refundable payroll tax credit (RPTC) that can be used to emulate a payroll tax exemption
+
+- Allow reforms that specify a `CPI_offset` change in the same year as a tax policy parameter's indexing status is changed
+
+
 Changes in release 2.4.2 on 2019-06-28
 --------------------------------------
 

diff --git a/RELEASES.md b/RELEASES.md
@@ -4,6 +4,27 @@ Go [here](https://github.com/PSLmodels/Tax-Calculator/pulls?q=is%3Apr+is%3Aclose
 for a complete commit history.
 
 
+2019-08-06 Release 2.5.0
+------------------------
+(last merged pull request is
+[#2370](https://github.com/PSLmodels/Tax-Calculator/pull/2370))
+
+**This is an enhancement and bug-fix release.**
+
+**API Changes**
+- None
+
+**New Features**
+- Add to the income tax a refundable payroll tax credit (RPTC) that can be used to emulate a payroll tax exemption
+  [[#2366](https://github.com/PSLmodels/Tax-Calculator/pull/2366)
+  by Peter Metz, Matt Jensen and Martin Holmer]
+
+**Bug Fixes**
+- Allow reforms that specify a `CPI_offset` change in the same year as a tax policy parameter's indexing status is changed
+  [[#2364](https://github.com/PSLmodels/Tax-Calculator/pull/2364)
+  by Anderson Frailey]
+
+
 2019-06-28 Release 2.4.2
 ------------------------
 (last merged pull request is
@@ -330,12 +351,12 @@ incompatible with earlier releases.**
 - None
 
 **New Features**
-- Add new EITC policy parameter to aid in [validation work](https://github.com/PSLmodels/Tax-Calculator/blob/master/taxcalc/validation/taxsim27/README.md#validation-of-tax-calculator-against-internet-taxsim-version-27)
+- Add new EITC policy parameter to aid in [validation work](https://github.com/PSLmodels/Tax-Calculator/blob/master/taxcalc/validation/taxsim/README.md#validation-of-tax-calculator-against-internet-taxsim-version-27)
   [[#2164](https://github.com/PSLmodels/Tax-Calculator/pull/2164)
   by Martin Holmer]
 
 **Bug Fixes**
-- Fix obscure bug regarding rules for determining eligibility for the child AMT exemption that was discovered during [validation work](https://github.com/PSLmodels/Tax-Calculator/blob/master/taxcalc/validation/taxsim27/README.md#validation-of-tax-calculator-against-internet-taxsim-version-27)
+- Fix obscure bug regarding rules for determining eligibility for the child AMT exemption that was discovered during [validation work](https://github.com/PSLmodels/Tax-Calculator/blob/master/taxcalc/validation/taxsim/README.md#validation-of-tax-calculator-against-internet-taxsim-version-27)
   [[#2162](https://github.com/PSLmodels/Tax-Calculator/pull/2162)
   by Martin Holmer]
 
@@ -349,7 +370,7 @@ incompatible with earlier releases.**
 - None
 
 **New Features**
-- Revise taxcalc/validation/taxsim27 logic to work with new TAXSIM version 27
+- Revise taxcalc/validation/taxsim logic to work with new TAXSIM version 27
   [[#2140](https://github.com/PSLmodels/Tax-Calculator/pull/2140)
   by Martin Holmer]
 - Use `tc --dump` in validation work, which allows removal of `simtax.py` and its class and tests
@@ -1551,7 +1572,7 @@ incompatible with earlier releases.**
 [#1228](https://github.com/PSLmodels/Tax-Calculator/pull/1228))
 
 **API Changes**
-- Move simtax.py to taxcalc/validation/taxsim27 directory
+- Move simtax.py to taxcalc/validation/taxsim directory
   [[#1288](https://github.com/PSLmodels/Tax-Calculator/pull/1288)
   by Martin Holmer]
 

diff --git a/conda.recipe/meta.yaml b/conda.recipe/meta.yaml
@@ -9,15 +9,15 @@ build:
 requirements:
   build:
     - python
-    - "numpy>=1.13"
+    - "numpy>=1.14"
     - "pandas>=0.23"
     - "bokeh>=0.13"
     - requests
     - numba
 
   run:
     - python
-    - "numpy>=1.13"
+    - "numpy>=1.14"
     - "pandas>=0.23"
     - "bokeh>=0.13"
     - requests

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-06-28-release-242" target="_blank">
-    2.4.2 (2019-06-28)
+  <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>    
 </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-06-28-release-242" target="_blank">
-    2.4.2 (2019-06-28)
+  <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>    
 </p>
 

diff --git a/docs/uguide.html b/docs/uguide.html
diff --git a/environment.yml b/environment.yml
@@ -1,7 +1,7 @@
 name: taxcalc-dev
 dependencies:
 - python
-- "numpy>=1.13"
+- "numpy>=1.14"
 - "pandas>=0.23"
 - "bokeh>=0.13"
 - requests

diff --git a/taxcalc/validation/tests.sh b/taxcalc/validation/tests.sh
@@ -2,11 +2,13 @@
 # Executes validation TESTS by calling test.sh scripts in subdirectories.
 echo "STARTING WITH VALIDATION TESTS : `date`"
 # execute tests several at a time
+echo "In taxsim27 directory, executing test.sh using a17, b17, c17 data..."
 cd taxsim27
 ./test.sh a17 &
 ./test.sh b17 &
 ./test.sh c17 &
 wait
+echo "In taxsim27 directory, executing test.sh using a18, b18, c18 data..."
 ./test.sh a18 &
 ./test.sh b18 &
 ./test.sh c18 &