Merge pull request #352 from jdebacker/tc321

Updates for Tax-Calculator 3.2.1
PSLmodels · Sep 11, 2021 · c9f42d1 · c9f42d1
2 parents a01d132 + b3bd344
commit c9f42d1
Show file tree

Hide file tree

Showing 14 changed files with 1,394 additions and 1,384 deletions.
diff --git a/ccc/default_parameters.json b/ccc/default_parameters.json
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/ccc/tests/test_calculator.py b/ccc/tests/test_calculator.py
@@ -303,7 +303,7 @@ def test_p_param_return_value():
     dp = DepreciationParams()
     calc1 = Calculator(p, dp, assets)
     obj = calc1.p_param('tau_int')
-    assert np.allclose(obj, np.array([0.31774924]))
+    assert np.allclose(obj, np.array([0.31126241200353805]))
 
 
 def test_p_param_set_value():

diff --git a/ccc/tests/test_parameters.py b/ccc/tests/test_parameters.py
@@ -91,7 +91,7 @@ def test_update_bad_revision1():
     first_line = spec.errors['profit_rate'][0]
     print(first_line)
     expected_first_line =\
-        'profit_rate[year=2021] 1.2 > max 1.0 '
+        'profit_rate[year=2022] 1.2 > max 1.0 '
     assert first_line == expected_first_line
 
 

diff --git a/ccc/utils.py b/ccc/utils.py
@@ -7,7 +7,7 @@
 import pandas as pd
 
 # Default year for model runs
-DEFAULT_START_YEAR = 2021
+DEFAULT_START_YEAR = 2022
 
 # Year of asset data
 ASSET_DATA_CSV_YEAR = 2013
@@ -16,7 +16,7 @@
 RECORDS_START_YEAR = 2011
 
 # Latest year TaxData extrapolates to
-TC_LAST_YEAR = 2030
+TC_LAST_YEAR = 2031
 
 
 def to_str(x):

diff --git a/cs-config/cs_config/tests/test_functions.py b/cs-config/cs_config/tests/test_functions.py
@@ -42,15 +42,15 @@ class TestFunctions1(CoreTestFunctions):
         "Business Tax Parameters": {
             "CIT_rate": [
                 {
-                    "year": 2021,
+                    "year": 2022,
                     "value": 0.25
                 }
             ]
         },
         "Individual and Payroll Tax Parameters": {
             "FICA_ss_trt": [
                 {
-                    "year": 2021,
+                    "year": 2022,
                     "value": 0.14
                 }
             ]

diff --git a/docs/book/_toc.yml b/docs/book/_toc.yml
@@ -1,42 +1,27 @@
-- file: content/intro
-  numbered: false
-
-- part: CCC Example
+format: jb-book
+root: content/intro
+parts:
+- caption: CCC Example
   chapters:
   - file: content/examples/PSL_demo
-
-- part: Web Application
+- caption: Web Application
   chapters:
   - file: content/webapp
-
-- part: Contributing to CCC
+- caption: Contributing to CCC
   chapters:
   - file: content/contributing/contributor_guide
-
-- part: CCC API
+- caption: CCC API
   chapters:
   - file: content/api/public_api
-    sections:
-      - file: content/api/calcfunctions
-      - file: content/api/calculator
-      - file: content/api/data
-      - file: content/api/get_taxcalc_rates
-      - file: content/api/parameters
-      - file: content/api/paramfunctions
-      - file: content/api/utils
-
-- part: CCC Guide
+- caption: CCC Guide
   chapters:
   - file: content/CCC_guide
-
-- part: About
+- caption: About
   chapters:
   - file: content/license
-
-- part: References
+- caption: References
   chapters:
   - file: content/references
-
-- part: Citations of CCC
+- caption: Citations of CCC
   chapters:
   - file: content/citations
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