Skip to content

Commit 5506c02

Browse files
Merge branch 'main' into helmeleegy-SNOW-1620315
2 parents 0ddb36f + 0fc87b3 commit 5506c02

File tree

5 files changed

+16
-12
lines changed

5 files changed

+16
-12
lines changed

setup.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -209,7 +209,7 @@ def run(self):
209209
"plotly<6.0.0", # Snowpark pandas 3rd party library testing
210210
# TODO(SNOW-1938831): Test snowflake-ml-python on python 3.12 once
211211
# snowflake-ml-python is available on python 3.12.
212-
"snowflake-ml-python; python_version<'3.12'",
212+
"snowflake-ml-python>=1.8.0; python_version<'3.12'",
213213
],
214214
"localtest": [
215215
"pandas",

src/snowflake/snowpark/_internal/telemetry.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,6 @@ class TelemetryField(Enum):
125125
"select_expr": 1,
126126
"drop": 1,
127127
"agg": 2,
128-
"distinct": 2,
129128
"with_column": 1,
130129
"with_columns": 1,
131130
"with_column_renamed": 1,

src/snowflake/snowpark/dataframe.py

Lines changed: 14 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2397,14 +2397,20 @@ def distinct(
23972397
resource_usage=resource_usage_collector.get_resource_usage(),
23982398
)
23992399
else:
2400-
df = self.group_by(
2401-
[
2402-
self.col(quote_name(f.name), _emit_ast=False)
2403-
for f in self.schema.fields
2404-
],
2405-
_emit_ast=False,
2406-
).agg(_emit_ast=False)
2407-
adjust_api_subcalls(df, "DataFrame.distinct[group_by]", len_subcalls=2)
2400+
with ResourceUsageCollector() as resource_usage_collector:
2401+
df = self.group_by(
2402+
[
2403+
self.col(quote_name(f.name), _emit_ast=False)
2404+
for f in self.schema.fields
2405+
],
2406+
_emit_ast=False,
2407+
).agg(_emit_ast=False)
2408+
adjust_api_subcalls(
2409+
df,
2410+
"DataFrame.distinct[group_by]",
2411+
len_subcalls=2,
2412+
resource_usage=resource_usage_collector.get_resource_usage(),
2413+
)
24082414

24092415
if _emit_ast:
24102416
df._ast_id = stmt.uid

src/snowflake/snowpark/modin/plugin/compiler/snowflake_query_compiler.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19259,7 +19259,6 @@ def unstack(
1925919259
self._raise_not_implemented_error_for_timedelta()
1926019260

1926119261
level = [level]
19262-
1926319262
index_names = self.get_index_names()
1926419263

1926519264
# Check to see if we have a MultiIndex, if we do, make sure we remove

src/snowflake/snowpark/modin/plugin/docstrings/series.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3645,7 +3645,7 @@ def to_string():
36453645
--------
36463646
>>> ser = pd.Series([1, 2, 3]).to_string()
36473647
>>> ser
3648-
'0 1\n1 2\n2 3'
3648+
'0 1\\n1 2\\n2 3'
36493649
"""
36503650

36513651
def to_timestamp():

0 commit comments

Comments
 (0)