Skip to content

ParamTools #494

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

Merged
rickecon merged 17 commits into from
Sep 19, 2019
Merged

ParamTools #494

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
67a3eb5
import paramtools
jdebacker Sep 12, 2019
885095a
update parameters json for paramtools
jdebacker Sep 15, 2019
c183ba5
add dimensions for time path varying parameters
jdebacker Sep 16, 2019
b52695b
Specifications reads in paramtools formatted parameters
jdebacker Sep 16, 2019
bc0b2b2
remove unused code after using paramtools.parameters
jdebacker Sep 16, 2019
2105dad
update test of parameters for paramtools
jdebacker Sep 16, 2019
2d5c94f
update dims for time paths
jdebacker Sep 16, 2019
1e1d95c
fix json input test
jdebacker Sep 16, 2019
25d609e
update env
jdebacker Sep 16, 2019
145d0ad
make S, T, J intergers not arrays
jdebacker Sep 18, 2019
4119763
save params with cloudpickle
jdebacker Sep 18, 2019
1bccf86
delete comment
jdebacker Sep 18, 2019
84710aa
don't compare runtime in test of tax func estimate output
jdebacker Sep 18, 2019
5010f1f
remove parametersbase as no longer used
jdebacker Sep 19, 2019
477710b
Removed import parametersbase line from __init__.py
rickecon Sep 19, 2019
1197711
Merge pull request #12 from rickecon/jdebacker-paramtools
jdebacker Sep 19, 2019
3967c91
remove other references to parametersbase
jdebacker Sep 19, 2019
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
11 changes: 6 additions & 5 deletions conda.recipe/meta.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,19 +9,21 @@ requirements:
build:
- python
- "taxcalc>=2.4.2"
- "paramtools>=0.7.1"
- setuptools
- scipy
- "scipy>=0.18.1"
- matplotlib
- dask
- "dask>=0.20.0"
- mkl

run:
- python
- "taxcalc>=2.4.2"
- "paramtools>=0.7.1"
- setuptools
- scipy
- "scipy>=0.18.1"
- matplotlib
- dask
- "dask>=0.20.0"
- mkl

about:
Expand All @@ -47,7 +49,6 @@ test:
- ogusa.parameter_plots
- ogusa.parameter_tables
- ogusa.parameters
- ogusa.parametersbase
- ogusa.postprocess
- ogusa.tax
- ogusa.txfunc
Expand Down
18 changes: 0 additions & 18 deletions docs/source/parametersbase.rst
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion docs/source/public_api.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@ There is also a link to the source code for each documented member.
parameter_plots
parameter_tables
parameters
parametersbase
postprocess
tax
txfunc
Expand Down
7 changes: 4 additions & 3 deletions environment.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,11 @@ dependencies:
- python
- setuptools
- mkl
- scipy>=0.18.1
- "scipy>=0.18.1"
- matplotlib
- taxcalc>=2.4.2
- dask>=0.20.0
- "taxcalc>=2.4.2"
- "dask>=0.20.0"
- "paramtools>=0.7.1"
- pytest
- pytest-pep8
- pytest-xdist
Expand Down
1 change: 0 additions & 1 deletion ogusa/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@
from ogusa.parameter_plots import *
from ogusa.parameter_tables import *
from ogusa.parameters import *
from ogusa.parametersbase import *
from ogusa.postprocess import *
from ogusa.tax import *
from ogusa.txfunc import *
Expand Down
Loading