Skip to content

Commit

Permalink
Merge branch 'main' into SNOW-1843819-relax-snowpark-python-cloudpick…
Browse files Browse the repository at this point in the history
…le-dependency
  • Loading branch information
sfc-gh-aling authored Dec 4, 2024
2 parents c6376b0 + dc83b57 commit fbf8811
Show file tree
Hide file tree
Showing 5 changed files with 6 additions and 2 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@

#### Dependency Updates

- Added a runtime dependency on `python-dateutil`.

### Snowpark pandas API Updates

Expand Down
1 change: 1 addition & 0 deletions recipe/meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ requirements:
- pyyaml
# Snowpark IR
- protobuf >=3.20,<6
- python-dateutil
- tzlocal

test:
Expand Down
1 change: 1 addition & 0 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@
"cloudpickle>=1.6.0,<=2.2.1,!=2.1.0,!=2.2.0",
# `protoc` < 3.20 is not able to generate protobuf code compatible with protobuf >= 3.20.
"protobuf>=3.20, <6", # Snowpark IR
"python-dateutil", # Snowpark IR
"tzlocal", # Snowpark IR
]
REQUIRED_PYTHON_VERSION = ">=3.8, <3.12"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7955,7 +7955,8 @@ def _apply_with_udtf_and_dynamic_pivot_along_axis_1(
partition_expression = (
snowpark_round(
col(row_position_snowflake_quoted_identifier)
/ pandas_lit(partition_size)
/ pandas_lit(partition_size),
_emit_ast=self._modin_frame.ordered_dataframe.session.ast_enabled,
)
).as_(partition_identifier)
udtf_dataframe = new_internal_df.ordered_dataframe.select(
Expand Down
2 changes: 1 addition & 1 deletion tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ setenv =
# This configures the extra dependency required by modin test
modin: SNOWFLAKE_PYTEST_MODIN_DEPS = [modin-development]
modin_pandas_version: SNOWFLAKE_PYTEST_PANDAS_DEPS = pandas=={env:MODIN_PANDAS_PATCH_VERSION}
SNOW_1314507_WORKAROUND_RERUN_FLAGS = --reruns 5 --reruns-delay 1 --only-rerun "Insufficient resource during interleaved execution."
SNOW_1314507_WORKAROUND_RERUN_FLAGS = --reruns 5 --reruns-delay 5 --only-rerun "Insufficient resource during interleaved execution."
MODIN_PYTEST_CMD = pytest {env:SNOWFLAKE_PYTEST_VERBOSITY:} {env:SNOWFLAKE_PYTEST_PARALLELISM:} {env:SNOWFLAKE_PYTEST_COV_CMD} --ignore=tests/resources
MODIN_PYTEST_DAILY_CMD = pytest {env:SNOWFLAKE_PYTEST_VERBOSITY:} {env:SNOWFLAKE_PYTEST_DAILY_PARALLELISM:} {env:SNOWFLAKE_PYTEST_COV_CMD} --ignore=tests/resources
MODIN_PYTEST_NO_COV_CMD = pytest {env:SNOWFLAKE_PYTEST_VERBOSITY:} {env:SNOWFLAKE_PYTEST_PARALLELISM:} --ignore=tests/resources
Expand Down

0 comments on commit fbf8811

Please sign in to comment.