Skip to content

Commit eb61fc0

Browse files
shuoweilshuoweil
committed
fix failed testcase
1 parent 736929a commit eb61fc0

File tree

3 files changed

+72
-67
lines changed

3 files changed

+72
-67
lines changed

‎bigframes/core/indexes/base.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -378,7 +378,7 @@ def __repr__(self) -> __builtins__.str:
378378
max_results = opts.max_rows
379379
# anywdiget mode uses the same display logic as the "deferred" mode
380380
# for faster execution
381-
if opts.repr_mode in ("deferred", "anywidget"):
381+
if opts.repr_mode == "deferred":
382382
_, dry_run_query_job = self._block._compute_dry_run()
383383
return formatter.repr_query_job(dry_run_query_job)
384384

‎notebooks/dataframes/anywidget_mode.ipynb‎

Lines changed: 64 additions & 64 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@
6969
},
7070
{
7171
"cell_type": "code",
72-
"execution_count": null,
72+
"execution_count": 4,
7373
"id": "f289d250",
7474
"metadata": {},
7575
"outputs": [
@@ -104,16 +104,16 @@
104104
"output_type": "stream",
105105
"text": [
106106
"state gender year name number\n",
107-
" AL F 1910 Cora 61\n",
108-
" AL F 1910 Anna 74\n",
109-
" AR F 1910 Willie 132\n",
110-
" CO F 1910 Anna 42\n",
111-
" FL F 1910 Louise 70\n",
112-
" GA F 1910 Catherine 57\n",
113-
" IL F 1910 Jessie 43\n",
114-
" IN F 1910 Anna 100\n",
115-
" IN F 1910 Pauline 77\n",
116-
" IN F 1910 Beulah 39\n",
107+
" AL F 1910 Hazel 51\n",
108+
" AL F 1910 Lucy 76\n",
109+
" AR F 1910 Nellie 39\n",
110+
" AR F 1910 Lena 40\n",
111+
" CO F 1910 Thelma 36\n",
112+
" CO F 1910 Ruth 68\n",
113+
" CT F 1910 Elizabeth 86\n",
114+
" DC F 1910 Mary 80\n",
115+
" FL F 1910 Annie 101\n",
116+
" FL F 1910 Alma 39\n",
117117
"...\n",
118118
"\n",
119119
"[5552452 rows x 5 columns]\n"
@@ -218,79 +218,79 @@
218218
" <td>AL</td>\n",
219219
" <td>F</td>\n",
220220
" <td>1910</td>\n",
221-
" <td>Cora</td>\n",
222-
" <td>61</td>\n",
221+
" <td>Hazel</td>\n",
222+
" <td>51</td>\n",
223223
" </tr>\n",
224224
" <tr>\n",
225225
" <th>1</th>\n",
226226
" <td>AL</td>\n",
227227
" <td>F</td>\n",
228228
" <td>1910</td>\n",
229-
" <td>Anna</td>\n",
230-
" <td>74</td>\n",
229+
" <td>Lucy</td>\n",
230+
" <td>76</td>\n",
231231
" </tr>\n",
232232
" <tr>\n",
233233
" <th>2</th>\n",
234234
" <td>AR</td>\n",
235235
" <td>F</td>\n",
236236
" <td>1910</td>\n",
237-
" <td>Willie</td>\n",
238-
" <td>132</td>\n",
237+
" <td>Nellie</td>\n",
238+
" <td>39</td>\n",
239239
" </tr>\n",
240240
" <tr>\n",
241241
" <th>3</th>\n",
242-
" <td>CO</td>\n",
242+
" <td>AR</td>\n",
243243
" <td>F</td>\n",
244244
" <td>1910</td>\n",
245-
" <td>Anna</td>\n",
246-
" <td>42</td>\n",
245+
" <td>Lena</td>\n",
246+
" <td>40</td>\n",
247247
" </tr>\n",
248248
" <tr>\n",
249249
" <th>4</th>\n",
250-
" <td>FL</td>\n",
250+
" <td>CO</td>\n",
251251
" <td>F</td>\n",
252252
" <td>1910</td>\n",
253-
" <td>Louise</td>\n",
254-
" <td>70</td>\n",
253+
" <td>Thelma</td>\n",
254+
" <td>36</td>\n",
255255
" </tr>\n",
256256
" <tr>\n",
257257
" <th>5</th>\n",
258-
" <td>GA</td>\n",
258+
" <td>CO</td>\n",
259259
" <td>F</td>\n",
260260
" <td>1910</td>\n",
261-
" <td>Catherine</td>\n",
262-
" <td>57</td>\n",
261+
" <td>Ruth</td>\n",
262+
" <td>68</td>\n",
263263
" </tr>\n",
264264
" <tr>\n",
265265
" <th>6</th>\n",
266-
" <td>IL</td>\n",
266+
" <td>CT</td>\n",
267267
" <td>F</td>\n",
268268
" <td>1910</td>\n",
269-
" <td>Jessie</td>\n",
270-
" <td>43</td>\n",
269+
" <td>Elizabeth</td>\n",
270+
" <td>86</td>\n",
271271
" </tr>\n",
272272
" <tr>\n",
273273
" <th>7</th>\n",
274-
" <td>IN</td>\n",
274+
" <td>DC</td>\n",
275275
" <td>F</td>\n",
276276
" <td>1910</td>\n",
277-
" <td>Anna</td>\n",
278-
" <td>100</td>\n",
277+
" <td>Mary</td>\n",
278+
" <td>80</td>\n",
279279
" </tr>\n",
280280
" <tr>\n",
281281
" <th>8</th>\n",
282-
" <td>IN</td>\n",
282+
" <td>FL</td>\n",
283283
" <td>F</td>\n",
284284
" <td>1910</td>\n",
285-
" <td>Pauline</td>\n",
286-
" <td>77</td>\n",
285+
" <td>Annie</td>\n",
286+
" <td>101</td>\n",
287287
" </tr>\n",
288288
" <tr>\n",
289289
" <th>9</th>\n",
290-
" <td>IN</td>\n",
290+
" <td>FL</td>\n",
291291
" <td>F</td>\n",
292292
" <td>1910</td>\n",
293-
" <td>Beulah</td>\n",
293+
" <td>Alma</td>\n",
294294
" <td>39</td>\n",
295295
" </tr>\n",
296296
" </tbody>\n",
@@ -559,7 +559,7 @@
559559
{
560560
"data": {
561561
"application/vnd.jupyter.widget-view+json": {
562-
"model_id": "fe0abfd9a9bd4ee8aac06a95631d7f7b",
562+
"model_id": "54007f0106044ce49520b92a4662192f",
563563
"version_major": 2,
564564
"version_minor": 1
565565
},
@@ -625,16 +625,16 @@
625625
" <td>EU</td>\n",
626626
" <td>DE</td>\n",
627627
" <td>03.10.2018</td>\n",
628-
" <td>H01L 21/20</td>\n",
628+
" <td>H05B 6/12</td>\n",
629629
" <td>&lt;NA&gt;</td>\n",
630-
" <td>18166536.5</td>\n",
631-
" <td>16.02.2016</td>\n",
630+
" <td>18165514.3</td>\n",
631+
" <td>03.04.2018</td>\n",
632+
" <td>30.03.2017</td>\n",
632633
" <td>&lt;NA&gt;</td>\n",
633-
" <td>Scheider, Sascha et al</td>\n",
634-
" <td>EV Group E. Thallner GmbH</td>\n",
635-
" <td>Kurz, Florian</td>\n",
636-
" <td>VORRICHTUNG ZUM BONDEN VON SUBSTRATEN</td>\n",
637-
" <td>EP 3 382 744 A1</td>\n",
634+
" <td>BSH Hausgeräte GmbH</td>\n",
635+
" <td>Acero Acero, Jesus</td>\n",
636+
" <td>VORRICHTUNG ZUR INDUKTIVEN ENERGIE√úBERTRAGUNG</td>\n",
637+
" <td>EP 3 383 141 A2</td>\n",
638638
" </tr>\n",
639639
" <tr>\n",
640640
" <th>2</th>\n",
@@ -661,16 +661,16 @@
661661
" <td>EU</td>\n",
662662
" <td>DE</td>\n",
663663
" <td>03.10.2018</td>\n",
664-
" <td>A01K 31/00</td>\n",
664+
" <td>H01L 21/20</td>\n",
665665
" <td>&lt;NA&gt;</td>\n",
666-
" <td>18171005.4</td>\n",
667-
" <td>05.02.2015</td>\n",
668-
" <td>05.02.2014</td>\n",
669-
" <td>Stork Bamberger Patentanwälte</td>\n",
670-
" <td>Linco Food Systems A/S</td>\n",
671-
" <td>Thrane, Uffe</td>\n",
672-
" <td>MASTHÄHNCHENCONTAINER ALS BESTANDTEIL EINER E...</td>\n",
673-
" <td>EP 3 381 276 A1</td>\n",
666+
" <td>18166536.5</td>\n",
667+
" <td>16.02.2016</td>\n",
668+
" <td>&lt;NA&gt;</td>\n",
669+
" <td>Scheider, Sascha et al</td>\n",
670+
" <td>EV Group E. Thallner GmbH</td>\n",
671+
" <td>Kurz, Florian</td>\n",
672+
" <td>VORRICHTUNG ZUM BONDEN VON SUBSTRATEN</td>\n",
673+
" <td>EP 3 382 744 A1</td>\n",
674674
" </tr>\n",
675675
" <tr>\n",
676676
" <th>4</th>\n",
@@ -679,16 +679,16 @@
679679
" <td>EU</td>\n",
680680
" <td>DE</td>\n",
681681
" <td>03.10.2018</td>\n",
682-
" <td>H05B 6/12</td>\n",
683-
" <td>&lt;NA&gt;</td>\n",
684-
" <td>18165514.3</td>\n",
685-
" <td>03.04.2018</td>\n",
686-
" <td>30.03.2017</td>\n",
682+
" <td>A01K 31/00</td>\n",
687683
" <td>&lt;NA&gt;</td>\n",
688-
" <td>BSH Hausgeräte GmbH</td>\n",
689-
" <td>Acero Acero, Jesus</td>\n",
690-
" <td>VORRICHTUNG ZUR INDUKTIVEN ENERGIE√úBERTRAGUNG</td>\n",
691-
" <td>EP 3 383 141 A2</td>\n",
684+
" <td>18171005.4</td>\n",
685+
" <td>05.02.2015</td>\n",
686+
" <td>05.02.2014</td>\n",
687+
" <td>Stork Bamberger Patentanwälte</td>\n",
688+
" <td>Linco Food Systems A/S</td>\n",
689+
" <td>Thrane, Uffe</td>\n",
690+
" <td>MASTHÄHNCHENCONTAINER ALS BESTANDTEIL EINER E...</td>\n",
691+
" <td>EP 3 381 276 A1</td>\n",
692692
" </tr>\n",
693693
" </tbody>\n",
694694
"</table>\n",

‎tests/system/small/test_progress_bar.py‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -153,12 +153,17 @@ def test_repr_anywidget_dataframe(penguins_df_default_index: bf.dataframe.DataFr
153153
pytest.importorskip("anywidget")
154154
with bf.option_context("display.repr_mode", "anywidget"):
155155
actual_repr = repr(penguins_df_default_index)
156-
assert EXPECTED_DRY_RUN_MESSAGE in actual_repr
156+
assert "species" in actual_repr
157+
assert "island" in actual_repr
158+
assert "[344 rows x 7 columns]" in actual_repr
157159

158160

159161
def test_repr_anywidget_index(penguins_df_default_index: bf.dataframe.DataFrame):
160162
pytest.importorskip("anywidget")
161163
with bf.option_context("display.repr_mode", "anywidget"):
162164
index = penguins_df_default_index.index
163165
actual_repr = repr(index)
164-
assert EXPECTED_DRY_RUN_MESSAGE in actual_repr
166+
# In non-interactive environments, should still get a useful summary.
167+
assert "Index" in actual_repr
168+
assert "0, 1, 2, 3, 4" in actual_repr
169+
assert "dtype='Int64'" in actual_repr

0 commit comments

Comments
 (0)