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

Upgrade to Tax-Calculator 0.15.0 #808

Merged
merged 18 commits into from
Jan 24, 2018
Merged

Upgrade to Tax-Calculator 0.15.0 #808

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
37e2364
Upgrade to TC 0.15.0
Jan 18, 2018
133a81a
Rename PT_exclusion_rt to PT_excl_rt
Jan 18, 2018
34217f9
Rename PT_exclusion_wage_limit to PT_excl_wagelim_rt
Jan 18, 2018
94ef42a
Add PT_excl_wagelim_thd and PT_excl_wagelim_prt
Jan 18, 2018
faef7e9
Rename ALD_Alimony_hc to ALD_AlimonyPaid_hc
Jan 18, 2018
343d0a2
Add ALD_AlimonyReceived_hc
Jan 18, 2018
b149795
Add ALD_BusinessLosses
Jan 19, 2018
d84d42c
Rename UBI parameters
Jan 19, 2018
85b12f4
Update tests part 1
Jan 19, 2018
0adaf2e
Remove temporary tests
Jan 19, 2018
19d329d
Move test data to text files
Jan 19, 2018
d5b100c
Use fixtures instead of importing test data constants
Jan 22, 2018
2f290bf
Try to resolve pandas dependency issues
Jan 22, 2018
d1d57bf
Upgrade pandas and add conda-forge channel
Jan 22, 2018
9b35294
Update to tc 0.15.1
Jan 22, 2018
5959551
Update test data
Jan 22, 2018
4f3e9a6
Fix bug in default_data test exposed by tc 0.15.+
Jan 23, 2018
55982b2
Remove test_assumptions.py and test_reform.py and clean up
Jan 24, 2018
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
6 changes: 3 additions & 3 deletions conda-requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
3 changes: 2 additions & 1 deletion deploy/fab/dropq_environment.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -20,3 +20,4 @@ dependencies:
channels:
- ospc
- defaults
- conda-forge
161 changes: 0 additions & 161 deletions tcja_post.py
View file
Open in desktop

This file was deleted.

Loading