rebuild and recheck

Author: JohnMount

build/lib/data_algebra/cdata.py

@@ -286,8 +286,9 @@ def rowrecs_to_blocks(
                 dcol = ctemp[vk][i]
                 if dcol in donor_cols:
                     nvals = numpy.asarray(dtemp[dcol])
-                    if len(nvals) > 0:
-                        res.loc[want, vk] = nvals
+                    if len(nvals) < 1:
+                        nvals = [None] * numpy.sum(want)
+                    res.loc[want, vk] = nvals
     # see about promoting composite columns to numeric
     for vk in set(value_keys):
         converted = local_data_model.to_numeric(res[vk], errors="coerce")

coverage.txt

@@ -95,7 +95,7 @@ data_algebra/SQLite.py                    66      8    88%
 data_algebra/SparkSQL.py                  68     43    37%
 data_algebra/__init__.py                   6      0   100%
 data_algebra/arrow.py                    170     36    79%
-data_algebra/cdata.py                    330     72    78%
+data_algebra/cdata.py                    331     72    78%
 data_algebra/connected_components.py      22      0   100%
 data_algebra/data_model.py               128     22    83%
 data_algebra/data_ops.py                1149    192    83%
@@ -116,7 +116,7 @@ data_algebra/python3_lark.py               1      0   100%
 data_algebra/test_util.py                194     37    81%
 data_algebra/util.py                      78      6    92%
 ----------------------------------------------------------
-TOTAL                                   4829    896    81%
+TOTAL                                   4830    896    81%
 
 
-============================= 205 passed in 15.21s =============================
+============================= 205 passed in 15.74s =============================

dist/data_algebra-0.7.7-py3-none-any.whl

@@ -414,8 +414,9 @@ <h1 class="modulename">
                 <span class="n">dcol</span> <span class="o">=</span> <span class="n">ctemp</span><span class="p">[</span><span class="n">vk</span><span class="p">][</span><span class="n">i</span><span class="p">]</span>
                 <span class="k">if</span> <span class="n">dcol</span> <span class="ow">in</span> <span class="n">donor_cols</span><span class="p">:</span>
                     <span class="n">nvals</span> <span class="o">=</span> <span class="n">numpy</span><span class="o">.</span><span class="n">asarray</span><span class="p">(</span><span class="n">dtemp</span><span class="p">[</span><span class="n">dcol</span><span class="p">])</span>
-                    <span class="k">if</span> <span class="nb">len</span><span class="p">(</span><span class="n">nvals</span><span class="p">)</span> <span class="o">&gt;</span> <span class="mi">0</span><span class="p">:</span>
-                        <span class="n">res</span><span class="o">.</span><span class="n">loc</span><span class="p">[</span><span class="n">want</span><span class="p">,</span> <span class="n">vk</span><span class="p">]</span> <span class="o">=</span> <span class="n">nvals</span>
+                    <span class="k">if</span> <span class="nb">len</span><span class="p">(</span><span class="n">nvals</span><span class="p">)</span> <span class="o">&lt;</span> <span class="mi">1</span><span class="p">:</span>
+                        <span class="n">nvals</span> <span class="o">=</span> <span class="p">[</span><span class="kc">None</span><span class="p">]</span> <span class="o">*</span> <span class="n">numpy</span><span class="o">.</span><span class="n">sum</span><span class="p">(</span><span class="n">want</span><span class="p">)</span>
+                    <span class="n">res</span><span class="o">.</span><span class="n">loc</span><span class="p">[</span><span class="n">want</span><span class="p">,</span> <span class="n">vk</span><span class="p">]</span> <span class="o">=</span> <span class="n">nvals</span>
     <span class="c1"># see about promoting composite columns to numeric</span>
     <span class="k">for</span> <span class="n">vk</span> <span class="ow">in</span> <span class="nb">set</span><span class="p">(</span><span class="n">value_keys</span><span class="p">):</span>
         <span class="n">converted</span> <span class="o">=</span> <span class="n">local_data_model</span><span class="o">.</span><span class="n">to_numeric</span><span class="p">(</span><span class="n">res</span><span class="p">[</span><span class="n">vk</span><span class="p">],</span> <span class="n">errors</span><span class="o">=</span><span class="s2">&quot;coerce&quot;</span><span class="p">)</span>
@@ -1316,8 +1317,9 @@ <h1 class="modulename">
                 <span class="n">dcol</span> <span class="o">=</span> <span class="n">ctemp</span><span class="p">[</span><span class="n">vk</span><span class="p">][</span><span class="n">i</span><span class="p">]</span>
                 <span class="k">if</span> <span class="n">dcol</span> <span class="ow">in</span> <span class="n">donor_cols</span><span class="p">:</span>
                     <span class="n">nvals</span> <span class="o">=</span> <span class="n">numpy</span><span class="o">.</span><span class="n">asarray</span><span class="p">(</span><span class="n">dtemp</span><span class="p">[</span><span class="n">dcol</span><span class="p">])</span>
-                    <span class="k">if</span> <span class="nb">len</span><span class="p">(</span><span class="n">nvals</span><span class="p">)</span> <span class="o">&gt;</span> <span class="mi">0</span><span class="p">:</span>
-                        <span class="n">res</span><span class="o">.</span><span class="n">loc</span><span class="p">[</span><span class="n">want</span><span class="p">,</span> <span class="n">vk</span><span class="p">]</span> <span class="o">=</span> <span class="n">nvals</span>
+                    <span class="k">if</span> <span class="nb">len</span><span class="p">(</span><span class="n">nvals</span><span class="p">)</span> <span class="o">&lt;</span> <span class="mi">1</span><span class="p">:</span>
+                        <span class="n">nvals</span> <span class="o">=</span> <span class="p">[</span><span class="kc">None</span><span class="p">]</span> <span class="o">*</span> <span class="n">numpy</span><span class="o">.</span><span class="n">sum</span><span class="p">(</span><span class="n">want</span><span class="p">)</span>
+                    <span class="n">res</span><span class="o">.</span><span class="n">loc</span><span class="p">[</span><span class="n">want</span><span class="p">,</span> <span class="n">vk</span><span class="p">]</span> <span class="o">=</span> <span class="n">nvals</span>
     <span class="c1"># see about promoting composite columns to numeric</span>
     <span class="k">for</span> <span class="n">vk</span> <span class="ow">in</span> <span class="nb">set</span><span class="p">(</span><span class="n">value_keys</span><span class="p">):</span>
         <span class="n">converted</span> <span class="o">=</span> <span class="n">local_data_model</span><span class="o">.</span><span class="n">to_numeric</span><span class="p">(</span><span class="n">res</span><span class="p">[</span><span class="n">vk</span><span class="p">],</span> <span class="n">errors</span><span class="o">=</span><span class="s2">&quot;coerce&quot;</span><span class="p">)</span>