Skip to content

Support click 8.2.0 #3016

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
k0x2e wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Support click 8.2.0 #3016

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ description = "Snowflake CLI"
readme = "README.md"
dependencies = [
# Actual project dependencies, from which we generate [project.dependencies] section serving as a lockfile for PyPi
"click==8.1.8",
"click==8.2.0",
"GitPython==3.1.44",
"PyYAML==6.0.2",
"id==1.5.0",
Expand Down
2 changes: 1 addition & 1 deletion tests/__snapshots__/test_docs_generation_output.ambr
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,7 +162,7 @@
:samp:`--secondary-roles {TEXT}`
Secondary roles mode applied when the session starts. Supported values are `ALL` and `NONE`; pass `NONE` to run the session only with the primary role.

:samp:`--format [TABLE|JSON|JSON_EXT|CSV]`
:samp:`--format [table|json|json_ext|csv]`
Specifies the output format. Default: TABLE.

:samp:`--verbose, -v`
Expand Down
650 changes: 313 additions & 337 deletions tests/__snapshots__/test_help_messages.ambr
View file
Open in desktop

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions tests/api/commands/__snapshots__/test_flags.ambr
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
Usage: root stage list-files [OPTIONS] STAGE_NAME
Try 'root stage list-files --help' for help.
+- Error ----------------------------------------------------------------------+
| Invalid value for '--format': 'invalid_format' is not one of 'TABLE', |
| 'JSON', 'JSON_EXT', 'CSV'. |
| Invalid value for '--format' (env var: 'None'): 'invalid_format' is not one |
| of 'table', 'json', 'json_ext', 'csv'. |
+------------------------------------------------------------------------------+

'''
Expand Down
12 changes: 6 additions & 6 deletions tests/api/commands/__snapshots__/test_snow_typer.ambr
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,8 +111,8 @@
| role. |
+------------------------------------------------------------------------------+
+- Global configuration -------------------------------------------------------+
| --format [TABLE|JSON|JSON_EXT| Specifies the output |
| CSV] format. |
| --format [table|json|json_ext| Specifies the output |
| csv] format. |
| [default: TABLE] |
| --verbose -v Displays log entries |
| for log levels info |
Expand Down Expand Up @@ -153,8 +153,8 @@
| --help -h Show this message and exit. |
+------------------------------------------------------------------------------+
+- Global configuration -------------------------------------------------------+
| --format [TABLE|JSON|JSON_EXT| Specifies the output |
| CSV] format. |
| --format [table|json|json_ext| Specifies the output |
| csv] format. |
| [default: TABLE] |
| --verbose -v Displays log entries |
| for log levels info |
Expand Down Expand Up @@ -217,8 +217,8 @@
| --help -h Show this message and exit. |
+------------------------------------------------------------------------------+
+- Global configuration -------------------------------------------------------+
| --format [TABLE|JSON|JSON_EXT| Specifies the output |
| CSV] format. |
| --format [table|json|json_ext| Specifies the output |
| csv] format. |
| [default: TABLE] |
| --verbose -v Displays log entries |
| for log levels info |
Expand Down
4 changes: 2 additions & 2 deletions tests/dbt/test_dbt_commands.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -360,7 +360,7 @@ def test_deploy_with_invalid_dbt_version_fails(
)

assert result.exit_code == 2, result.output
assert "Invalid version format '1.9'" in result.output
assert "Invalid version format" in result.output
mock_deploy.assert_not_called()

def test_deploy_with_patch_version_passes_to_manager(
Expand Down Expand Up @@ -674,7 +674,7 @@ def test_dbt_execute_with_invalid_dbt_version_fails(self, mock_connect, runner):
)

assert result.exit_code == 2, result.output
assert "Invalid version format '1.2.3.beta'" in result.output
assert "Invalid version format" in result.output

def test_dbt_execute_with_patch_version(self, mock_connect, mock_cursor, runner):
cursor = mock_cursor(
Expand Down
4 changes: 2 additions & 2 deletions tests/output/__snapshots__/test_silent_output.ambr
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,8 +116,8 @@
| role. |
+------------------------------------------------------------------------------+
+- Global configuration -------------------------------------------------------+
| --format [TABLE|JSON|JSON_EXT| Specifies the output |
| CSV] format. |
| --format [table|json|json_ext| Specifies the output |
| csv] format. |
| [default: TABLE] |
| --verbose -v Displays log entries |
| for log levels info |
Expand Down
5 changes: 1 addition & 4 deletions tests/stage/test_stage.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -752,10 +752,7 @@ def test_stage_create_encryption(mock_execute, runner, mock_cursor):
["stage", "create", '"stage name"', "--encryption", "incorrect_encryption"]
)
assert result.exit_code == 2, result.output
assert (
"Invalid value for '--encryption': 'incorrect_encryption' is not one of"
in result.output
)
assert "'incorrect_encryption'" in result.output
assert "'SNOWFLAKE_FULL', 'SNOWFLAKE_SSE'." in result.output


Expand Down
4 changes: 2 additions & 2 deletions tests/test_connection.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -164,7 +164,7 @@ def test_port_has_cannot_be_string(runner):
],
)
assert result.exit_code == 2, result.output
assert "'portValue' is not a valid integer" in result.output
assert "'portValue'" in result.output


def test_port_has_cannot_be_float(runner):
Expand All @@ -185,7 +185,7 @@ def test_port_has_cannot_be_float(runner):
],
)
assert result.exit_code == 2, result.output
assert "'123.45' is not a valid integer. " in result.output
assert "'123.45'" in result.output


@pytest.mark.parametrize(
Expand Down
9 changes: 6 additions & 3 deletions tests/test_help_messages.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,10 @@ def test_help_messages_no_help_flag(runner, snapshot, command):
Check help messages against the snapshot
"""
result = runner.invoke(command)
assert result.exit_code == 0
# Root command uses invoke_without_command=True (exits 0); sub-groups use no_args_is_help=True
# which click 8.2+ exits with code 2 instead of 0
expected_exit_code = 0 if not command else 2
assert result.exit_code == expected_exit_code
assert result.output == snapshot


Expand Down Expand Up @@ -123,7 +126,7 @@ def test_cortex_help_messages_for_312(runner):
)
def test_cortex_help_messages_for_312_no_help_flag(runner):
result = runner.invoke(["cortex"])
assert result.exit_code == 0
assert result.exit_code == 2 # click 8.2+ returns 2 when help shown via no_args_is_help
assert SNOW_CORTEX_HELP in result.output
assert SNOW_CORTEX_COMPLETE in result.output
assert SNOW_CORTEX_SEARCH not in result.output
Expand All @@ -147,7 +150,7 @@ def test_cortex_help_messages_for_311_and_less(runner):
)
def test_cortex_help_messages_for_311_and_less_no_help_flag(runner):
result = runner.invoke(["cortex"])
assert result.exit_code == 0
assert result.exit_code == 2 # click 8.2+ returns 2 when help shown via no_args_is_help
assert SNOW_CORTEX_HELP in result.output
assert SNOW_CORTEX_COMPLETE in result.output
assert SNOW_CORTEX_SEARCH in result.output