Merge pull request #270 from jdebacker/meta

Update yaml to include paramtools
PSLmodels · Jun 28, 2019 · 1e63559 · 1e63559
2 parents fcab4b7 + 76dda46
commit 1e63559
Show file tree

Hide file tree

Showing 11 changed files with 1,122 additions and 1,120 deletions.
diff --git a/ccc/default_parameters.json b/ccc/default_parameters.json
@@ -965,7 +965,7 @@
             },
             {
                 "year": 2019,
-                "value": 0.20114185
+                "value": 0.20128342
             },
             {
                 "year": 2020,
@@ -1035,7 +1035,7 @@
             },
             {
                 "year": 2019,
-                "value": 0.18973438
+                "value": 0.18975272
             },
             {
                 "year": 2020,
@@ -1105,7 +1105,7 @@
             },
             {
                 "year": 2019,
-                "value": 0.31369886
+                "value": 0.3138916
             },
             {
                 "year": 2020,
@@ -1175,7 +1175,7 @@
             },
             {
                 "year": 2019,
-                "value": 0.29392906
+                "value": 0.2939649
             },
             {
                 "year": 2020,
@@ -1245,7 +1245,7 @@
             },
             {
                 "year": 2019,
-                "value": 0.19055012
+                "value": 0.19058666
             },
             {
                 "year": 2020,
@@ -1333,7 +1333,7 @@
             },
             {
                 "year": 2019,
-                "value": 0.21970871
+                "value": 0.21974035
             },
             {
                 "year": 2020,
@@ -1403,7 +1403,7 @@
             },
             {
                 "year": 2019,
-                "value": 0.0443736
+                "value": 0.04435847
             },
             {
                 "year": 2020,

diff --git a/ccc/tests/run_ccc_asset_output.json b/ccc/tests/run_ccc_asset_output.json
diff --git a/ccc/tests/run_ccc_industry_output.json b/ccc/tests/run_ccc_industry_output.json
diff --git a/conda.recipe/meta.yaml b/conda.recipe/meta.yaml
@@ -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:

diff --git a/environment.yml b/environment.yml
@@ -4,7 +4,8 @@ channels:
 - conda-forge
 dependencies:
 - python
-- taxcalc
+- "taxcalc>=2.4.2"
+- "paramtools>=0.7.1"
 - setuptools
 - pip
 - xlrd
@@ -14,4 +15,3 @@ dependencies:
 - pycodestyle
 - pylint
 - coverage
-- paramtools
diff --git a/example_output/baseline_byasset_expected.csv b/example_output/baseline_byasset_expected.csv
diff --git a/example_output/baseline_byindustry_expected.csv b/example_output/baseline_byindustry_expected.csv
diff --git a/example_output/changed_byasset_expected.csv b/example_output/changed_byasset_expected.csv
diff --git a/example_output/changed_byindustry_expected.csv b/example_output/changed_byindustry_expected.csv
diff --git a/example_output/reform_byasset_expected.csv b/example_output/reform_byasset_expected.csv
diff --git a/example_output/reform_byindustry_expected.csv b/example_output/reform_byindustry_expected.csv