Skip to content

Commit c84a99c

Browse files
Merge branch 'main' into helmeleegy-fix-replicate-local-env-doctest
2 parents ac25093 + d2b50f5 commit c84a99c

File tree

2 files changed

+10
-10
lines changed

2 files changed

+10
-10
lines changed

src/snowflake/snowpark/functions.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11749,7 +11749,7 @@ def regr_avgy(y: ColumnOrName, x: ColumnOrName, _emit_ast: bool = True) -> Colum
1174911749
Example::
1175011750

1175111751
>>> df = session.create_dataframe([[10, 11], [20, 22], [25, None], [30, 35]], schema=["v", "v2"])
11752-
>>> df = df.group_by("v").agg(regr_avgy(df["v"], df["v2"]).alias("regr_avgy"))
11752+
>>> df = df.group_by("v").agg(regr_avgy(df["v"], df["v2"]).alias("regr_avgy")).sort("v")
1175311753
>>> df.collect()
1175411754
[Row(V=10, REGR_AVGY=10.0), Row(V=20, REGR_AVGY=20.0), Row(V=25, REGR_AVGY=None), Row(V=30, REGR_AVGY=30.0)]
1175511755
"""
@@ -11838,7 +11838,7 @@ def regr_sxx(y: ColumnOrName, x: ColumnOrName, _emit_ast: bool = True) -> Column
1183811838
Example::
1183911839

1184011840
>>> df = session.create_dataframe([[10, 11], [20, 22], [25, None], [30, 35]], schema=["v", "v2"])
11841-
>>> df.group_by("v").agg(regr_sxx(col("v"), col("v2")).alias("regr_sxx")).collect()
11841+
>>> df.group_by("v").agg(regr_sxx(col("v"), col("v2")).alias("regr_sxx")).sort("v").collect()
1184211842
[Row(V=10, REGR_SXX=0.0), Row(V=20, REGR_SXX=0.0), Row(V=25, REGR_SXX=None), Row(V=30, REGR_SXX=0.0)]
1184311843
"""
1184411844
y_col = _to_col_if_str(y, "regr_sxx")

src/snowflake/snowpark/session.py

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1794,17 +1794,17 @@ def replicate_local_environment(
17941794
17951795
Example::
17961796
1797-
>>> import sys # doctest: +SKIP
1797+
>>> import sys
17981798
>>> from snowflake.snowpark.functions import udf # doctest: +SKIP
1799-
>>> import numpy # doctest: +SKIP
1800-
>>> import pandas # doctest: +SKIP
1799+
>>> import numpy
1800+
>>> import pandas
18011801
>>> # test_requirements.txt contains "numpy" and "pandas"
1802-
>>> session.custom_package_usage_config = {"enabled": True, "force_push": True} # Recommended configuration # doctest: +SKIP
1802+
>>> session.custom_package_usage_config = {"enabled": True, "force_push": True} # Recommended configuration
18031803
>>> session.replicate_local_environment(ignore_packages={"snowflake-snowpark-python", "snowflake-connector-python", "urllib3", "tzdata", "numpy"}, relax=True) # doctest: +SKIP
1804-
>>> @udf # doctest: +SKIP
1805-
... def get_package_name_udf() -> list: # doctest: +SKIP
1806-
... return [numpy.__name__, pandas.__name__] # doctest: +SKIP
1807-
>>> if sys.version_info <= (3, 11): # doctest: +SKIP
1804+
>>> @udf
1805+
... def get_package_name_udf() -> list:
1806+
... return [numpy.__name__, pandas.__name__]
1807+
>>> if sys.version_info <= (3, 11):
18081808
... session.sql(f"select {get_package_name_udf.name}()").to_df("col1").show() # doctest: +SKIP
18091809
--------------
18101810
|"COL1" |

0 commit comments

Comments
 (0)