Fixed precommit errors and tests

snowflakedb · Dec 5, 2024 · 30cb861 · 30cb861
1 parent 26b98ce
commit 30cb861
Show file tree

Hide file tree

Showing 8 changed files with 20 additions and 34 deletions.
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -12,7 +12,7 @@ repos:
         exclude: src/snowflake/cli/_app/dev/pycharm_remote_debug.py
       - id: check-ast
   - repo: https://github.com/charliermarsh/ruff-pre-commit
-    rev: "v0.1.7"
+    rev: "v0.8.2"
     hooks:
       - id: ruff
         args: [--fix, --exclude, "**/tests_common/,**/tests_integration/"]
@@ -25,6 +25,10 @@ repos:
     hooks:
       - id: mypy
         additional_dependencies: [types-pkg-resources==0.1.3, types-all==1.0.0]
+        exclude: >
+          (?x)
+          ^tests/test_data/projects/.*|
+          ^tests_integration/test_data/projects/.*
   - repo: https://github.com/codespell-project/codespell
     rev: v2.2.4
     hooks:

diff --git a/tests/nativeapp/test_artifacts.py b/tests/nativeapp/test_artifacts.py
@@ -19,6 +19,7 @@
 import pytest
 from click import ClickException
 from snowflake.cli._plugins.nativeapp.artifacts import (
+    VersionInfo,
     build_bundle,
     find_events_definitions_in_manifest_file,
     find_version_info_in_manifest_file,
@@ -29,7 +30,6 @@
     NotInDeployRootError,
     SourceNotFoundError,
     TooManyFilesError,
-    VersionInfo,
 )
 from snowflake.cli.api.project.definition import load_project
 from snowflake.cli.api.project.schemas.entities.common import PathMapping

diff --git a/tests/snowpark/test_function.py b/tests/snowpark/test_function.py
@@ -18,12 +18,12 @@
 from unittest import mock
 
 import pytest
+
 from snowflake.cli._plugins.snowpark.package_utils import (
     DownloadUnavailablePackagesResult,
 )
 from snowflake.cli.api.errno import DOES_NOT_EXIST_OR_NOT_AUTHORIZED
 from snowflake.connector import ProgrammingError
-
 from tests_common import IS_WINDOWS
 
 if IS_WINDOWS:

diff --git a/tests/streamlit/test_artifacts.py b/tests/streamlit/test_artifacts.py
@@ -112,7 +112,7 @@
 @mock.patch("snowflake.cli._plugins.snowpark.commands.StageManager.put")
 @mock.patch(
     "snowflake.cli._plugins.connection.util.get_ui_parameters",
-    return_value={UIParameter.NA_ENABLE_REGIONLESS_REDIRECT: "false"},
+    return_value={UIParameter.NA_ENABLE_REGIONLESS_REDIRECT: False},
 )
 def test_deploy_with_artifacts(
     mock_param,
@@ -252,7 +252,7 @@ def test_deploy_with_artifacts(
 @mock.patch("snowflake.cli._plugins.snowpark.commands.StageManager.put")
 @mock.patch(
     "snowflake.cli._plugins.connection.util.get_ui_parameters",
-    return_value={UIParameter.NA_ENABLE_REGIONLESS_REDIRECT: "false"},
+    return_value={UIParameter.NA_ENABLE_REGIONLESS_REDIRECT: False},
 )
 def test_deploy_with_artifacts_from_other_directory(
     mock_param,

diff --git a/tests/streamlit/test_commands.py b/tests/streamlit/test_commands.py
@@ -920,35 +920,6 @@ def test_deploy_streamlit_main_and_pages_files_experimental_replace(
     ]
 
 
-@pytest.mark.parametrize(
-    "project_name,opts",
-    [
-        ("example_streamlit", {"streamlit": {"pages_dir": "foo.bar"}}),
-        ("example_streamlit", {"streamlit": {"env_file": "foo.bar"}}),
-        (
-            "example_streamlit_v2",
-            {"entities": {"test_streamlit": {"pages_dir": "foo.bar"}}},
-        ),
-        (
-            "example_streamlit_v2",
-            {"entities": {"test_streamlit": {"artifacts": ["foo.bar"]}}},
-        ),
-    ],
-)
-@mock.patch("snowflake.connector.connect")
-def test_deploy_streamlit_nonexisting_file(
-    mock_connector, runner, mock_ctx, snapshot, project_directory, opts, project_name
-):
-    ctx = mock_ctx()
-    mock_connector.return_value = ctx
-
-    with project_directory(project_name, merge_project_definition=opts):
-        result = runner.invoke(["streamlit", "deploy"])
-
-        assert result.exit_code == 1
-        assert result.output == snapshot
-
-
 @mock.patch("snowflake.connector.connect")
 def test_share_streamlit(mock_connector, runner, mock_ctx):
     ctx = mock_ctx()

diff --git a/tests/test_data/projects/streamlit_templated_v1/streamlit_app.py b/tests/test_data/projects/streamlit_templated_v1/streamlit_app.py
@@ -0,0 +1,5 @@
+from common.hello import say_hello
+
+import streamlit as st
+
+st.title(f"Example streamlit app. {say_hello()}")
diff --git a/tests/testing_utils/fixtures.py b/tests/testing_utils/fixtures.py
@@ -473,5 +473,8 @@ def enable_snowpark_glob_support_feature_flag():
     with mock.patch(
         f"snowflake.cli.api.feature_flags.FeatureFlag.ENABLE_SNOWPARK_GLOB_SUPPORT.is_enabled",
         return_value=True,
+    ), mock.patch(
+        f"snowflake.cli.api.feature_flags.FeatureFlag.ENABLE_SNOWPARK_GLOB_SUPPORT.is_disabled",
+        return_value=False,
     ):
         yield
diff --git a/tests_integration/conftest.py b/tests_integration/conftest.py
@@ -266,5 +266,8 @@ def enable_snowpark_glob_support_feature_flag():
     with mock.patch(
         f"snowflake.cli.api.feature_flags.FeatureFlag.ENABLE_SNOWPARK_GLOB_SUPPORT.is_enabled",
         return_value=True,
+    ), mock.patch(
+        f"snowflake.cli.api.feature_flags.FeatureFlag.ENABLE_SNOWPARK_GLOB_SUPPORT.is_disabled",
+        return_value=False,
     ):
         yield