Skip to content

Commit 2611abc

Browse files
Merge branch 'main' into feature/aherrera/SNOW-2443512
2 parents 4cc6351 + b254146 commit 2611abc

File tree

4 files changed

+8
-4
lines changed

4 files changed

+8
-4
lines changed

CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,10 @@
2525

2626
- Improved `DataFrameReader` to return columns in deterministic order when using `INFER_SCHEMA`.
2727

28+
#### Dependency Updates
29+
30+
- Added a dependency on `protobuf<6.34` (was `<6.32`).
31+
2832
### Snowpark pandas API Updates
2933

3034
#### New Features

recipe/meta.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ requirements:
6262
- libffi <=3.4.4
6363
- pyyaml
6464
# Snowpark IR
65-
- protobuf >=3.20,<6.32
65+
- protobuf >=3.20,<6.34
6666
- python-dateutil
6767
- tzlocal
6868
run_constrained:

setup.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
"pyyaml",
2929
"cloudpickle>=1.6.0,<=3.1.1,!=2.1.0,!=2.2.0",
3030
# `protoc` < 3.20 is not able to generate protobuf code compatible with protobuf >= 3.20.
31-
"protobuf>=3.20, <6.32", # Snowpark IR
31+
"protobuf>=3.20, <6.34", # Snowpark IR
3232
"python-dateutil", # Snowpark IR
3333
"tzlocal", # Snowpark IR
3434
]

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")

0 commit comments

Comments
 (0)