Deploying to gh-pages from @ 66754a7 🚀

_modules/taxcalc/policy.html

@@ -445,7 +445,7 @@ <h1>Source code for taxcalc.policy</h1><div class="highlight"><pre>
         <span class="s1">&#39;DependentCredit_before_CTC&#39;</span><span class="p">:</span> <span class="s1">&#39;is a removed parameter name&#39;</span><span class="p">,</span>
         <span class="s1">&#39;FilerCredit_c&#39;</span><span class="p">:</span> <span class="s1">&#39;is a removed parameter name&#39;</span><span class="p">,</span>
         <span class="s1">&#39;ALD_InvInc_ec_base_RyanBrady&#39;</span><span class="p">:</span> <span class="s1">&#39;is a removed parameter name&#39;</span><span class="p">,</span>
-        <span class="c1"># TODO: following parameter renamed in PR 2292 merged on 2019-04-15</span>
+        <span class="c1"># following parameter renamed in PR 2292 merged on 2019-04-15</span>
         <span class="s2">&quot;cpi_offset&quot;</span><span class="p">:</span> <span class="p">(</span>
             <span class="s2">&quot;was renamed parameter_indexing_CPI_offset. &quot;</span>
             <span class="s2">&quot;See documentation for change in usage.&quot;</span>
@@ -454,7 +454,7 @@ <h1>Source code for taxcalc.policy</h1><div class="highlight"><pre>
             <span class="s2">&quot;was renamed parameter_indexing_CPI_offset. &quot;</span>
             <span class="s2">&quot;See documentation for change in usage.&quot;</span>
         <span class="p">),</span>
-        <span class="c1"># TODO: following parameters renamed in PR 2345 merged on 2019-06-24</span>
+        <span class="c1"># following parameters renamed in PR 2345 merged on 2019-06-24</span>
         <span class="s1">&#39;PT_excl_rt&#39;</span><span class="p">:</span>
         <span class="s1">&#39;was renamed PT_qbid_rt in release 2.4.0&#39;</span><span class="p">,</span>
         <span class="s1">&#39;PT_excl_wagelim_thd&#39;</span><span class="p">:</span>
@@ -494,17 +494,18 @@ <h1>Source code for taxcalc.policy</h1><div class="highlight"><pre>
                         <span class="n">Policy</span><span class="o">.</span><span class="n">WAGE_INDEXED_PARAMS</span><span class="p">,</span> <span class="o">**</span><span class="n">kwargs</span><span class="p">)</span>
 
     <span class="nd">@staticmethod</span>
-    <span class="k">def</span> <span class="nf">tmd_constructor</span><span class="p">(</span><span class="n">growfactors_path</span><span class="p">):</span>  <span class="c1"># pragma: no cover</span>
+    <span class="k">def</span> <span class="nf">tmd_constructor</span><span class="p">(</span><span class="n">growfactors</span><span class="p">:</span> <span class="n">Path</span> <span class="o">|</span> <span class="n">GrowFactors</span><span class="p">):</span>  <span class="c1"># pragma: no cover</span>
 <span class="w">        </span><span class="sd">&quot;&quot;&quot;</span>
 <span class="sd">        Static method returns a Policy object instantiated with TMD</span>
 <span class="sd">        input data.  This convenience method works in a analogous way</span>
 <span class="sd">        to Policy(), which returns a Policy object instantiated with</span>
 <span class="sd">        non-TMD input data.</span>
 <span class="sd">        &quot;&quot;&quot;</span>
-        <span class="k">assert</span> <span class="nb">isinstance</span><span class="p">(</span><span class="n">growfactors_path</span><span class="p">,</span> <span class="n">Path</span><span class="p">)</span>
-        <span class="n">gf_filename</span> <span class="o">=</span> <span class="nb">str</span><span class="p">(</span><span class="n">growfactors_path</span><span class="p">)</span>
-        <span class="n">tmd_growfactors</span> <span class="o">=</span> <span class="n">GrowFactors</span><span class="p">(</span><span class="n">growfactors_filename</span><span class="o">=</span><span class="n">gf_filename</span><span class="p">)</span>
-        <span class="k">return</span> <span class="n">Policy</span><span class="p">(</span><span class="n">gfactors</span><span class="o">=</span><span class="n">tmd_growfactors</span><span class="p">)</span>
+        <span class="k">if</span> <span class="nb">isinstance</span><span class="p">(</span><span class="n">growfactors</span><span class="p">,</span> <span class="n">Path</span><span class="p">):</span>
+            <span class="n">growfactors</span> <span class="o">=</span> <span class="n">GrowFactors</span><span class="p">(</span><span class="n">growfactors_filename</span><span class="o">=</span><span class="nb">str</span><span class="p">(</span><span class="n">growfactors</span><span class="p">))</span>
+        <span class="k">else</span><span class="p">:</span>
+            <span class="k">assert</span> <span class="nb">isinstance</span><span class="p">(</span><span class="n">growfactors</span><span class="p">,</span> <span class="n">GrowFactors</span><span class="p">)</span>
+        <span class="k">return</span> <span class="n">Policy</span><span class="p">(</span><span class="n">gfactors</span><span class="o">=</span><span class="n">growfactors</span><span class="p">)</span>
 
 <div class="viewcode-block" id="Policy.read_json_reform">
 <a class="viewcode-back" href="../../api/policy.html#taxcalc.policy.Policy.read_json_reform">[docs]</a>

_modules/taxcalc/records.html

@@ -630,7 +630,7 @@ <h1>Source code for taxcalc.records</h1><div class="highlight"><pre>
     <span class="k">def</span> <span class="nf">tmd_constructor</span><span class="p">(</span>
             <span class="n">data_path</span><span class="p">:</span> <span class="n">Path</span><span class="p">,</span>
             <span class="n">weights_path</span><span class="p">:</span> <span class="n">Path</span><span class="p">,</span>
-            <span class="n">growfactors_path</span><span class="p">:</span> <span class="n">Path</span><span class="p">,</span>
+            <span class="n">growfactors</span><span class="p">:</span> <span class="n">Path</span> <span class="o">|</span> <span class="n">GrowFactors</span><span class="p">,</span>
             <span class="n">exact_calculations</span><span class="o">=</span><span class="kc">False</span><span class="p">,</span>
     <span class="p">):</span>  <span class="c1"># pragma: no cover</span>
 <span class="w">        </span><span class="sd">&quot;&quot;&quot;</span>
@@ -645,12 +645,15 @@ <h1>Source code for taxcalc.records</h1><div class="highlight"><pre>
 <span class="sd">        &quot;&quot;&quot;</span>
         <span class="k">assert</span> <span class="nb">isinstance</span><span class="p">(</span><span class="n">data_path</span><span class="p">,</span> <span class="n">Path</span><span class="p">)</span>
         <span class="k">assert</span> <span class="nb">isinstance</span><span class="p">(</span><span class="n">weights_path</span><span class="p">,</span> <span class="n">Path</span><span class="p">)</span>
-        <span class="k">assert</span> <span class="nb">isinstance</span><span class="p">(</span><span class="n">growfactors_path</span><span class="p">,</span> <span class="n">Path</span><span class="p">)</span>
+        <span class="k">if</span> <span class="nb">isinstance</span><span class="p">(</span><span class="n">growfactors</span><span class="p">,</span> <span class="n">Path</span><span class="p">):</span>
+            <span class="n">growfactors</span> <span class="o">=</span> <span class="n">GrowFactors</span><span class="p">(</span><span class="n">growfactors_filename</span><span class="o">=</span><span class="nb">str</span><span class="p">(</span><span class="n">growfactors</span><span class="p">))</span>
+        <span class="k">else</span><span class="p">:</span>
+            <span class="k">assert</span> <span class="nb">isinstance</span><span class="p">(</span><span class="n">growfactors</span><span class="p">,</span> <span class="n">GrowFactors</span><span class="p">)</span>
         <span class="k">return</span> <span class="n">Records</span><span class="p">(</span>
             <span class="n">data</span><span class="o">=</span><span class="n">pd</span><span class="o">.</span><span class="n">read_csv</span><span class="p">(</span><span class="n">data_path</span><span class="p">),</span>
             <span class="n">start_year</span><span class="o">=</span><span class="n">Records</span><span class="o">.</span><span class="n">TMDCSV_YEAR</span><span class="p">,</span>
             <span class="n">weights</span><span class="o">=</span><span class="n">pd</span><span class="o">.</span><span class="n">read_csv</span><span class="p">(</span><span class="n">weights_path</span><span class="p">),</span>
-            <span class="n">gfactors</span><span class="o">=</span><span class="n">GrowFactors</span><span class="p">(</span><span class="n">growfactors_filename</span><span class="o">=</span><span class="nb">str</span><span class="p">(</span><span class="n">growfactors_path</span><span class="p">)),</span>
+            <span class="n">gfactors</span><span class="o">=</span><span class="n">growfactors</span><span class="p">,</span>
             <span class="n">adjust_ratios</span><span class="o">=</span><span class="kc">None</span><span class="p">,</span>
             <span class="n">exact_calculations</span><span class="o">=</span><span class="n">exact_calculations</span><span class="p">,</span>
             <span class="n">weights_scale</span><span class="o">=</span><span class="mf">1.0</span><span class="p">,</span>

recipes/recipe00.html

@@ -680,7 +680,7 @@ <h2>Plotting<a class="headerlink" href="#plotting" title="Link to this heading">
     </style>
     <div>
         <a href="https://bokeh.org" target="_blank" class="bk-notebook-logo"></a>
-        <span id="d6f7b837-df5f-49d0-83c8-50760d343064">Loading BokehJS ...</span>
+        <span id="c66b8d29-0b19-47dd-b9cd-63851afa63df">Loading BokehJS ...</span>
     </div>
 </div><script type="application/javascript">'use strict';
 (function(root) {
@@ -845,7 +845,7 @@ <h2>Plotting<a class="headerlink" href="#plotting" title="Link to this heading">
      "</div>"}};
 
   function display_loaded(error = null) {
-    const el = document.getElementById("d6f7b837-df5f-49d0-83c8-50760d343064");
+    const el = document.getElementById("c66b8d29-0b19-47dd-b9cd-63851afa63df");
     if (el != null) {
       const html = (() => {
         if (typeof root.Bokeh === "undefined") {
@@ -979,7 +979,7 @@ <h2>Plotting<a class="headerlink" href="#plotting" title="Link to this heading">
       console.log("Bokeh: BokehJS failed to load within specified timeout.");
       root._bokeh_failed_load = true;
     } else if (force !== true) {
-      const cell = $(document.getElementById("d6f7b837-df5f-49d0-83c8-50760d343064")).parents('.cell').data().cell;
+      const cell = $(document.getElementById("c66b8d29-0b19-47dd-b9cd-63851afa63df")).parents('.cell').data().cell;
       cell.output_area.append_execute_result(NB_LOAD_WARNING)
     }
   }

recipes/recipe04.html

@@ -610,7 +610,7 @@ <h1>Recipe 4: Estimating Differential Reform Response<a class="headerlink" href=
 ALL               	 204.484	   3.811	    1.19
 </pre></div>
 </div>
-<div class="output stderr highlight-myst-ansi notranslate"><div class="highlight"><pre><span></span>/tmp/ipykernel_2020/3804893807.py:46: FutureWarning: The default of observed=False is deprecated and will be changed to True in a future version of pandas. Pass observed=False to retain current behavior or observed=True to adopt the future default and silence this warning.
+<div class="output stderr highlight-myst-ansi notranslate"><div class="highlight"><pre><span></span>/tmp/ipykernel_2045/3804893807.py:46: FutureWarning: The default of observed=False is deprecated and will be changed to True in a future version of pandas. Pass observed=False to retain current behavior or observed=True to adopt the future default and silence this warning.
   gbydf = vdf.groupby(&#39;table_row&#39;, as_index=False)
 </pre></div>
 </div>