Skip to content

Commit 88a1094

Browse files
Merge branch 'refs/heads/main' into feature/aherrera/SNOW-2432059-StringAndBinary-part1
2 parents 374a223 + e5f2d99 commit 88a1094

File tree

16 files changed

+372
-446
lines changed

16 files changed

+372
-446
lines changed

CHANGELOG.md

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
#### New Features
88

99
- Added a new function `service` in `snowflake.snowpark.functions` that allows users to create a callable representing a Snowpark Container Services (SPCS) service.
10-
- Added a new function `group_by_all()` to the `DataFrame` class.
1110
- Added `connection_parameters` parameter to `DataFrameReader.dbapi()` (PuPr) method to allow passing keyword arguments to the `create_connection` callable.
1211
- Added support for `Session.begin_transaction`, `Session.commit` and `Session.rollback`.
1312
- Added support for the following functions in `functions.py`:
@@ -81,6 +80,7 @@
8180
- Fixed a bug that `DataFrameReader.dbapi` (PuPr) is not compatible with oracledb 3.4.0.
8281
- Fixed a bug where `modin` would unintentionally be imported during session initialization in some scenarios.
8382
- Fixed a bug where `session.udf|udtf|udaf|sproc.register` failed when an extra session argument was passed. These methods do not expect a session argument; please remove it if provided.
83+
- Fixed a bug in `DataFrameGroupBuy.agg` where func is a list of tuples used to set the names of the output columns.
8484

8585
#### Improvements
8686

@@ -141,6 +141,7 @@
141141
- `sort_values`
142142
- `loc` (setting columns)
143143
- `to_datetime`
144+
- `rename`
144145
- `drop`
145146
- `invert`
146147
- `duplicated`
@@ -165,6 +166,8 @@
165166
- `groupby.median`
166167
- `groupby.std`
167168
- `groupby.var`
169+
- `groupby.nunique`
170+
- `groupby.size`
168171
- `drop_duplicates`
169172
- Reuse row count from the relaxed query compiler in `get_axis_len`.
170173

docs/source/snowpark/dataframe.rst

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,6 @@ DataFrame
5757
DataFrame.flatten
5858
DataFrame.groupBy
5959
DataFrame.group_by
60-
DataFrame.group_by_all
6160
DataFrame.group_by_grouping_sets
6261
DataFrame.intersect
6362
DataFrame.join

setup.py

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,10 @@
6868
"lxml", # used in XML reader unit tests
6969
]
7070
MODIN_DEVELOPMENT_REQUIREMENTS = [
71-
"scipy", # Snowpark pandas 3rd party library testing
71+
# Snowpark pandas 3rd party library testing. Cap the scipy version because
72+
# Snowflake cannot find newer versions of scipy for python 3.11+. See
73+
# SNOW-2452791.
74+
"scipy<=1.16.0",
7275
"statsmodels", # Snowpark pandas 3rd party library testing
7376
"scikit-learn", # Snowpark pandas 3rd party library testing
7477
# plotly version restricted due to foreseen change in query counts in version 6.0.0+

src/snowflake/snowpark/_internal/analyzer/analyzer.py

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,6 @@
9191
from snowflake.snowpark._internal.analyzer.grouping_set import (
9292
GroupingSet,
9393
GroupingSetsExpression,
94-
GroupByAll,
9594
)
9695
from snowflake.snowpark._internal.analyzer.select_statement import (
9796
Selectable,
@@ -347,8 +346,6 @@ def analyze(
347346
)
348347

349348
if isinstance(expr, GroupingSet):
350-
if isinstance(expr, GroupByAll):
351-
return "ALL"
352349
return self.grouping_extractor(expr, df_aliased_col_name_to_real_col_name)
353350

354351
if isinstance(expr, WindowExpression):

src/snowflake/snowpark/_internal/analyzer/grouping_set.py

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -40,10 +40,6 @@ class Rollup(GroupingSet):
4040
pass
4141

4242

43-
class GroupByAll(GroupingSet):
44-
pass
45-
46-
4743
class GroupingSetsExpression(Expression):
4844
def __init__(self, args: List[List[Expression]]) -> None:
4945
super().__init__()

0 commit comments

Comments
 (0)