PSLmodels / Tax-Brain

Tax-Brain is an integrator model for PSL tax models
http://taxbrain.pslmodels.org/
MIT License
9 stars 14 forks source link

Updates for recent releases of Bokeh and Tax-Calculator #113

Closed Peter-Metz closed 4 years ago

Peter-Metz commented 4 years ago

Make changes to code and tests to bring Tax-Brain up to date with Bokeh 2.0.0 and Tax-Calculator 2.9.0.

@hdoupe do we need to do anything to bump the last budget year to 2030? Seems like we're getting the year from Tax-Calc, which makes me think we might be good.

class TaxBrain:

    FIRST_BUDGET_YEAR = tc.Policy.JSON_START_YEAR
    LAST_BUDGET_YEAR = tc.Policy.LAST_BUDGET_YEAR

Anything else I'm missing on the C/S side?

cc @andersonfrailey

Peter-Metz commented 4 years ago

The only test that is still failing locally is in test_report.py and seems to be unrelated to this PR or the Tax-Brain web app

hdoupe commented 4 years ago

@Peter-Metz I think you just need to update the years here: https://github.com/PSLmodels/Tax-Brain/blob/master/cs-config/cs_config/helpers.py#L58-L60

Peter-Metz commented 4 years ago

Thanks @hdoupe. Once this is merged, we'll have to issue a new release, right?

hdoupe commented 4 years ago

Thanks @hdoupe. Once this is merged, we'll have to issue a new release, right?

Yep.

hdoupe commented 4 years ago

@Peter-Metz I hit an error when testing this locally. I just opened a PR on your branch with the fix: https://github.com/Peter-Metz/Tax-Brain/pull/1

Peter-Metz commented 4 years ago

Thanks @hdoupe for that PR. Good to merge on your end?

hdoupe commented 4 years ago

Thanks @hdoupe for that PR. Good to merge on your end?

Yep, tests pass locally!

hdoupe commented 4 years ago

@Peter-Metz I think I have a solution for the bokeh problem. I'll have that up in about half an hour.

hdoupe commented 4 years ago

@Peter-Metz The fix is live. We don't need the bokeh<2.0.0 pin anymore.

hdoupe commented 4 years ago

Tests passing for you locally @Peter-Metz ?

Peter-Metz commented 4 years ago

yessir @hdoupe