Merge branch 'main' into mchok-metric-spans-instrument-nade-cmds

snowflakedb · Nov 20, 2024 · 2fbdcb6 · 2fbdcb6
2 parents c618da6 + 7c312b8
commit 2fbdcb6
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 10 deletions.
diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
@@ -41,4 +41,4 @@ jobs:
         run: hatch run test-cov
       - name: Run performance tests
         run: hatch run performance:test
-      - uses: codecov/codecov-action@b9fd7d16f6d7d1b5d2bec1a2887e65ceed900238
+      - uses: codecov/codecov-action@5c47607acb93fed5485fdbf7232e8a31425f672a
diff --git a/RELEASE-NOTES.md b/RELEASE-NOTES.md
@@ -21,8 +21,6 @@
 ## New additions
 
 ## Fixes and improvements
-* Fix Windows permissions error on files created by CLI when owner is a part of custom group with granted
-  default permissions.
 
 
 # v3.2.0
@@ -53,6 +51,8 @@
   Removed incorrect copying of connections from `connections.toml` to `config.toml`.
 * Fixes `snow connection generate-jwt` to work with keys with no passphrase.
 * The privilege to create a schema or stage is no longer required to run `snow app version create` if the schema and stage already exist.
+* Fix Windows permissions error on files created by CLI when owner is a part of custom group with granted
+  default permissions.
 
 # v3.1.0
 

diff --git a/pyproject.toml b/pyproject.toml
@@ -32,7 +32,7 @@ dependencies = [
   "rich==13.9.4",
   "requests==2.32.3",
   "requirements-parser==0.11.0",
-  "setuptools==75.3.0",
+  "setuptools==75.5.0",
   'snowflake.core==0.12.1; python_version < "3.12"',
   "snowflake-connector-python[secure-local-storage]==3.12.3",
   'snowflake-snowpark-python>=1.15.0;python_version < "3.12"',
@@ -57,13 +57,13 @@ classifiers = [
 
 [project.optional-dependencies]
 development = [
-  "coverage==7.6.4",
+  "coverage==7.6.7",
   "pre-commit>=3.5.0",
   "pytest==8.3.3",
   "pytest-randomly==3.16.0",
   "syrupy==4.7.2",
   "factory-boy==3.3.1",
-  "Faker==30.8.2",
+  "Faker==33.0.0",
 ]
 packaging = ["pyinstaller~=6.10"]
 

diff --git a/snyk/requirements.txt b/snyk/requirements.txt
@@ -5,7 +5,7 @@ packaging
 rich==13.9.4
 requests==2.32.3
 requirements-parser==0.11.0
-setuptools==75.3.0
+setuptools==75.5.0
 snowflake.core==0.12.1; python_version < "3.12"
 snowflake-connector-python[secure-local-storage]==3.12.3
 snowflake-snowpark-python>=1.15.0;python_version < "3.12"
@@ -15,10 +15,10 @@ urllib3>=1.24.3,<2.3
 GitPython==3.1.43
 pip
 pydantic==2.9.2
-coverage==7.6.4
+coverage==7.6.7
 pre-commit>=3.5.0
 pytest==8.3.3
 pytest-randomly==3.16.0
 syrupy==4.7.2
 factory-boy==3.3.1
-Faker==30.8.2
+Faker==33.0.0
diff --git a/src/snowflake/cli/_app/dev/docs/templates/usage.rst.jinja2 b/src/snowflake/cli/_app/dev/docs/templates/usage.rst.jinja2
@@ -48,7 +48,7 @@ Options
         {%- if param.type.name != "choice" %}{{ ' {' }}{% else %} {% endif %}{{ param.make_metavar() }}{% if param.type.name != "choice" %}{{ '}' }}
         {%- endif %}
     {%- endif %}`
-{% if param.help %}{{ "  " + param.help | replace("\n", " ") }}{% if param.help[-1] != '.' %}.{% endif %}{% if param.default is not none %} Default: {{ param.default }}.{% endif %}{% else %}  TBD{% endif %}
+{% if param.help %}{{ "  " + param.help | replace("\n", " ") }}{% if param.help[-1] != '.' %}.{% endif %}{% if param.default is not none and param.default != "" %} Default: {{ param.default }}.{% endif %}{% else %}  TBD{% endif %}
 {% endfor -%}
 {% else %}