Skip to content

Commit

Permalink
Merge branch 'main' into SNOW-1846319-add-feature-flag-for-spcs-snow-…
Browse files Browse the repository at this point in the history
…cli-log-streaming
  • Loading branch information
sfc-gh-ashen authored Dec 6, 2024
2 parents 789da88 + 4e0c73c commit 4735b7b
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ dependencies = [
"setuptools==75.6.0",
'snowflake.core==1.0.2; python_version < "3.12"',
"snowflake-connector-python[secure-local-storage]==3.12.3",
'snowflake-snowpark-python>=1.15.0;python_version < "3.12"',
'snowflake-snowpark-python>=1.15.0,<1.26.0;python_version < "3.12"',
"tomlkit==0.13.2",
"typer==0.12.5",
"urllib3>=1.24.3,<2.3",
Expand Down
2 changes: 1 addition & 1 deletion snyk/requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ requirements-parser==0.11.0
setuptools==75.6.0
snowflake.core==1.0.2; python_version < "3.12"
snowflake-connector-python[secure-local-storage]==3.12.3
snowflake-snowpark-python>=1.15.0;python_version < "3.12"
snowflake-snowpark-python>=1.15.0,<1.26.0;python_version < "3.12"
tomlkit==0.13.2
typer==0.12.5
urllib3>=1.24.3,<2.3
Expand Down
2 changes: 1 addition & 1 deletion tests_e2e/conftest.py
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,7 @@ def _install_snowcli_with_external_plugin(
)

# Required by snowpark example tests
_pip_install(python, "snowflake-snowpark-python")
_pip_install(python, "snowflake-snowpark-python[pandas]==1.25.0")


def _python_path(venv_path: Path) -> Path:
Expand Down

0 comments on commit 4735b7b

Please sign in to comment.