Skip to content

Commit d84a522

Browse files
authored
Merge branch 'main' into shuowei-fix-compiler-syntax-guards
2 parents 50d8aed + af49ca2 commit d84a522

File tree

3 files changed

+13
-6
lines changed

3 files changed

+13
-6
lines changed

bigframes/operations/ai.py

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -612,8 +612,11 @@ def sim_join(
612612
>>> df1 = bpd.DataFrame({'animal': ['monkey', 'spider']})
613613
>>> df2 = bpd.DataFrame({'animal': ['scorpion', 'baboon']})
614614
615-
>>> df1.ai.sim_join(df2, left_on='animal', right_on='animal', model=model, top_k=1)
616-
animal animal_1
615+
>>> res = df1.ai.sim_join(df2, left_on='animal', right_on='animal', model=model, top_k=1)
616+
>>> print("---"); print(res) # doctest: +ELLIPSIS
617+
---
618+
...
619+
animal animal_1
617620
0 monkey baboon
618621
1 spider scorpion
619622
<BLANKLINE>

bigframes/session/__init__.py

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -664,9 +664,11 @@ def read_gbq_query(
664664
... WHERE year = 2016
665665
... GROUP BY pitcherFirstName, pitcherLastName
666666
... ''', index_col="rowindex")
667-
>>> df.head(2)
667+
>>> print("START_OF_OUTPUT"); df.head(2) # doctest: +ELLIPSIS,+NORMALIZE_WHITESPACE
668+
START_OF_OUTPUT
669+
...
668670
pitcherFirstName pitcherLastName averagePitchSpeed
669-
rowindex
671+
...
670672
1 Albertin Chapman 96.514113
671673
2 Zachary Britton 94.591039
672674
<BLANKLINE>

third_party/bigframes_vendored/pandas/io/gbq.py

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -86,9 +86,11 @@ def read_gbq(
8686
... WHERE year = 2016
8787
... GROUP BY pitcherFirstName, pitcherLastName
8888
... ''', index_col="rowindex")
89-
>>> df.head(2)
89+
>>> print("START_OF_OUTPUT"); df.head(2) # doctest: +ELLIPSIS,+NORMALIZE_WHITESPACE
90+
START_OF_OUTPUT
91+
...
9092
pitcherFirstName pitcherLastName averagePitchSpeed
91-
rowindex
93+
...
9294
1 Albertin Chapman 96.514113
9395
2 Zachary Britton 94.591039
9496
<BLANKLINE>

0 commit comments

Comments
 (0)