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

Update yaml to include paramtools #270

Merged
merged 6 commits into from
Jun 28, 2019
Merged

Update yaml to include paramtools #270

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
e4b2a1d
update yaml to include paramtools
jdebacker Jun 28, 2019
c5eada4
specify more recent paramtools
jdebacker Jun 28, 2019
98b1a4b
remove dup
jdebacker Jun 28, 2019
ef57b53
versions in env
jdebacker Jun 28, 2019
59c4001
update default params and env to be consistent with TC 2.4.2
jdebacker Jun 28, 2019
76dda46
update test results for TC 2.4
jdebacker Jun 28, 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
14 changes: 7 additions & 7 deletions ccc/default_parameters.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -965,7 +965,7 @@
},
{
"year": 2019,
"value": 0.20114185
"value": 0.20128342
},
{
"year": 2020,
Expand Down Expand Up @@ -1035,7 +1035,7 @@
},
{
"year": 2019,
"value": 0.18973438
"value": 0.18975272
},
{
"year": 2020,
Expand Down Expand Up @@ -1105,7 +1105,7 @@
},
{
"year": 2019,
"value": 0.31369886
"value": 0.3138916
},
{
"year": 2020,
Expand Down Expand Up @@ -1175,7 +1175,7 @@
},
{
"year": 2019,
"value": 0.29392906
"value": 0.2939649
},
{
"year": 2020,
Expand Down Expand Up @@ -1245,7 +1245,7 @@
},
{
"year": 2019,
"value": 0.19055012
"value": 0.19058666
},
{
"year": 2020,
Expand Down Expand Up @@ -1333,7 +1333,7 @@
},
{
"year": 2019,
"value": 0.21970871
"value": 0.21974035
},
{
"year": 2020,
Expand Down Expand Up @@ -1403,7 +1403,7 @@
},
{
"year": 2019,
"value": 0.0443736
"value": 0.04435847
},
{
"year": 2020,
Expand Down
2 changes: 1 addition & 1 deletion ccc/tests/run_ccc_asset_output.json
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion ccc/tests/run_ccc_industry_output.json
View file
Open in desktop

Large diffs are not rendered by default.

6 changes: 4 additions & 2 deletions conda.recipe/meta.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,16 @@ source:
requirements:
build:
- python
- "taxcalc>=2.1.0"
- "taxcalc>=2.4.2"
- "paramtools>=0.7.1"
- setuptools
- xlrd

run:
- python
- "taxcalc>=2.1.0"
- "taxcalc>=2.4.0"
- setuptools
- "paramtools>=0.7.1"
- xlrd

about:
Expand Down
4 changes: 2 additions & 2 deletions environment.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,8 @@ channels:
- conda-forge
dependencies:
- python
- taxcalc
- "taxcalc>=2.4.2"
- "paramtools>=0.7.1"
- setuptools
- pip
- xlrd
Expand All @@ -14,4 +15,3 @@ dependencies:
- pycodestyle
- pylint
- coverage
- paramtools
456 changes: 228 additions & 228 deletions example_output/baseline_byasset_expected.csv
View file
Open in desktop

Large diffs are not rendered by default.

308 changes: 154 additions & 154 deletions example_output/baseline_byindustry_expected.csv
View file
Open in desktop

Large diffs are not rendered by default.

384 changes: 192 additions & 192 deletions example_output/changed_byasset_expected.csv
View file
Open in desktop

Large diffs are not rendered by default.

302 changes: 151 additions & 151 deletions example_output/changed_byindustry_expected.csv
View file
Open in desktop

Large diffs are not rendered by default.

456 changes: 228 additions & 228 deletions example_output/reform_byasset_expected.csv
View file
Open in desktop

Large diffs are not rendered by default.

308 changes: 154 additions & 154 deletions example_output/reform_byindustry_expected.csv
View file
Open in desktop

Large diffs are not rendered by default.