Merge branch 'refs/heads/server-side-snowpark' into vbudati/SNOW-1491306

-df-first-sample-random-split # Conflicts: # src/snowflake/snowpark/_internal/proto/ast_pb2.py
snowflakedb · Jun 28, 2024 · 46477d1 · 46477d1
2 parents d63b752 + f513ea9
commit 46477d1
Show file tree

Hide file tree

Showing 3 changed files with 582 additions and 584 deletions.
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -1,4 +1,4 @@
-exclude: '^(.*egg.info.*|.*/parameters.py|docs/).*$'
+exclude: '^(.*egg.info.*|.*/parameters.py|.*/_vendored|docs/).*$'
 default_language_version:
     python: python3.9
 repos:
@@ -83,7 +83,7 @@ repos:
           # prints are allowed in test files
           - --per-file-ignores=tests/*.py:T201
           # Ignore errors for protobuf generated file
-          - --exclude=src/snowflake/snowpark/_internal/proto/ast_pb2.py
+          - --exclude=src/_vendored,src/snowflake/snowpark/_internal/proto/ast_pb2.py
     # Use mypy for static type checking.
 -   repo: https://github.com/pre-commit/mirrors-mypy
     rev: 'v0.991'

diff --git a/src/snowflake/snowpark/_internal/proto/ast_pb2.py b/src/snowflake/snowpark/_internal/proto/ast_pb2.py
diff --git a/tests/ast/test_ast_driver.py b/tests/ast/test_ast_driver.py
@@ -23,7 +23,9 @@ class TestCase:
 
 def parse_file(file):
     """Parses a test case file."""
-    with open(file, "r", encoding="utf-8") as f:
+    # TODO(oplaton): Auto-formatters keep simplifying open(file, "r", ...) to drop the mode.
+    # Find a way to keep it as is.
+    with open(file, encoding="utf-8") as f:
         src = f.readlines()
 
     try: