Merge pull request #808 from hdoupe/update_tc_0150

Upgrade to Tax-Calculator 0.15.0
ospc-org · Jan 24, 2018 · 2e64827 · 2e64827
2 parents eafbae8 + 55982b2
commit 2e64827
Show file tree

Hide file tree

Showing 36 changed files with 904 additions and 1,050 deletions.
diff --git a/conda-requirements.txt b/conda-requirements.txt
@@ -1,8 +1,8 @@
 nomkl
-taxcalc==0.14.2
+taxcalc==0.15.1
 btax==0.1.9
-numba==0.33.0
-pandas
+numba>=0.33.0
+pandas>=0.22.0
 gevent
 pillow
 pyparsing

diff --git a/deploy/fab/dropq_environment.yml b/deploy/fab/dropq_environment.yml
@@ -1,7 +1,7 @@
 name: aei_dropq
 dependencies:
 - python<=2.7.14,>=2.7.12
-- pandas>=0.20.1
+- pandas>=0.22.0
 - flask
 - greenlet
 - xlrd
@@ -20,3 +20,4 @@ dependencies:
 channels:
   - ospc
   - defaults
+  - conda-forge
diff --git a/tcja_post.py b/tcja_post.py