From 83856994855600d720d5f00c777d7290dffd11da Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 1 Sep 2026 22:30:08 +0000 Subject: [PATCH 1/2] Bump click from 8.4.2 to 8.5.0 Bumps [click](https://github.com/pallets/click) from 8.4.2 to 8.5.0. - [Release notes](https://github.com/pallets/click/releases) - [Changelog](https://github.com/pallets/click/blob/main/CHANGES.md) - [Commits](https://github.com/pallets/click/compare/8.4.2...8.5.0) --- updated-dependencies: - dependency-name: click dependency-version: 8.5.0 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index ec5f2c7c..89918085 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -32,7 +32,7 @@ dynamic = [ ] dependencies = [ "beartype==0.22.9", - "click==8.4.2", + "click==8.5.0", "pyyaml==6.0.3", "vws-python==2026.8.26", ] From c8d9f581cf8079b6ecf08c8beaed54ae51b633f0 Mon Sep 17 00:00:00 2001 From: Adam Dangoor Date: Wed, 2 Sep 2026 00:25:57 +0100 Subject: [PATCH 2/2] Support Click 8.5 --- pyproject.toml | 2 +- src/vws_cli/commands.py | 3 +- src/vws_cli/model_target.py | 3 +- src/vws_cli/query.py | 3 +- src/vws_cli/vumark.py | 3 +- uv.lock | 65 ++++++++++++++++++------------------- 6 files changed, 40 insertions(+), 39 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index 89918085..aff58395 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -41,7 +41,7 @@ optional-dependencies.dev = [ "check-manifest==0.51", "deptry==0.25.1", "doc8==2.0.0", - "doccmd==2026.8.16", + "doccmd==2026.9.1", "freezegun==1.5.5", "furo==2025.12.19", "hadolint-bin==2.15.1; sys_platform!='win32'", diff --git a/src/vws_cli/commands.py b/src/vws_cli/commands.py index 4445a389..b705daf9 100644 --- a/src/vws_cli/commands.py +++ b/src/vws_cli/commands.py @@ -48,6 +48,7 @@ def _handle_vws_exceptions() -> Generator[None]: """Show error messages and catch exceptions from ``VWS-Python``.""" error_message = "" + error_stream = sys.stderr try: yield @@ -62,7 +63,7 @@ def _handle_vws_exceptions() -> Generator[None]: else: return - click.echo(message=error_message, err=True) + click.echo(message=error_message, file=error_stream) sys.exit(1) diff --git a/src/vws_cli/model_target.py b/src/vws_cli/model_target.py index 53b1ac69..e278c716 100644 --- a/src/vws_cli/model_target.py +++ b/src/vws_cli/model_target.py @@ -72,6 +72,7 @@ def _handle_model_target_exceptions() -> Generator[None]: """Show error messages and catch exceptions from ``VWS-Python``.""" error_message = "" + error_stream = sys.stderr try: yield @@ -85,7 +86,7 @@ def _handle_model_target_exceptions() -> Generator[None]: else: return - click.echo(message=error_message, err=True) + click.echo(message=error_message, file=error_stream) sys.exit(1) diff --git a/src/vws_cli/query.py b/src/vws_cli/query.py index fd1b3e51..7e24c09f 100644 --- a/src/vws_cli/query.py +++ b/src/vws_cli/query.py @@ -68,6 +68,7 @@ def _get_cloud_reco_error_message(exc: Exception) -> str: @contextlib.contextmanager def _handle_vwq_exceptions() -> Generator[None]: """Show error messages and catch exceptions from ``VWS-Python``.""" + error_stream = sys.stderr try: yield except (CloudRecoError, RequestEntityTooLargeError, ServerError) as exc: @@ -75,7 +76,7 @@ def _handle_vwq_exceptions() -> Generator[None]: else: return - click.echo(message=error_message, err=True) + click.echo(message=error_message, file=error_stream) sys.exit(1) diff --git a/src/vws_cli/vumark.py b/src/vws_cli/vumark.py index 8fadb8f1..1f6634bd 100644 --- a/src/vws_cli/vumark.py +++ b/src/vws_cli/vumark.py @@ -54,6 +54,7 @@ class VuMarkFormatChoice(StrEnum): def _handle_vumark_exceptions() -> Generator[None]: """Show error messages and catch exceptions from ``VWS-Python``.""" error_message = "" + error_stream = sys.stderr try: yield @@ -78,7 +79,7 @@ def _handle_vumark_exceptions() -> Generator[None]: else: return - click.echo(message=error_message, err=True) + click.echo(message=error_message, file=error_stream) sys.exit(1) diff --git a/uv.lock b/uv.lock index 79031655..7a1e09b2 100644 --- a/uv.lock +++ b/uv.lock @@ -233,14 +233,11 @@ wheels = [ [[package]] name = "click" -version = "8.4.2" +version = "8.5.0" source = { registry = "https://pypi.org/simple" } -dependencies = [ - { name = "colorama", marker = "sys_platform == 'win32'" }, -] -sdist = { url = "https://files.pythonhosted.org/packages/76/d4/81420972a676e8ffea40450d8c8c92943e7218a78fe9b64359836cc9876b/click-8.4.2.tar.gz", hash = "sha256:9a6cea6e60b17ebe0a44c5cc636d94f09bd66142c1cd7d8b4cd731c4917a15f6", size = 338000, upload-time = "2026-06-24T17:45:15.148Z" } +sdist = { url = "https://files.pythonhosted.org/packages/c7/0e/7fa0ef50764b67090eca4114772a2abf8b6148198475e54c660b97caeee6/click-8.5.0.tar.gz", hash = "sha256:ba0d2089de75ea0310e2dde03160e6ca10009947fb95a182f9b54021bb272e34", size = 382235, upload-time = "2026-08-26T13:33:14.56Z" } wheels = [ - { url = "https://files.pythonhosted.org/packages/fb/e2/79c688af8b210d232694e31e59da9f6ec747bae31c3f5946e4e9b98860d5/click-8.4.2-py3-none-any.whl", hash = "sha256:e6f9f66136c816745b9d65817da91d61d957fb16e02e4dcd0552553c5a197b76", size = 119243, upload-time = "2026-06-24T17:45:13.73Z" }, + { url = "https://files.pythonhosted.org/packages/58/50/6c0d534c5f134586a8e1ba4e330569e32f057e33372ae556463212fb4cd3/click-8.5.0-py3-none-any.whl", hash = "sha256:255bc9599cf7748b4b1a446ccc735421bd08a2ae529a8b88597d3de5664ee360", size = 125251, upload-time = "2026-08-26T13:33:12.928Z" }, ] [[package]] @@ -370,7 +367,7 @@ wheels = [ [[package]] name = "doccmd" -version = "2026.8.16" +version = "2026.9.1" source = { registry = "https://pypi.org/simple" } dependencies = [ { name = "beartype" }, @@ -383,9 +380,9 @@ dependencies = [ { name = "sybil" }, { name = "sybil-extras" }, ] -sdist = { url = "https://files.pythonhosted.org/packages/0d/ef/fe25cf809b3e43c4b60c741f0ee157f292cde1b194f8898c0910260d26fe/doccmd-2026.8.16.tar.gz", hash = "sha256:d05f03a3d93336deb50c7b0597d17a87c7120523bed3832e603e1951a0f174d6", size = 197087, upload-time = "2026-08-16T09:17:35.693Z" } +sdist = { url = "https://files.pythonhosted.org/packages/f2/c0/7545fc5f023d7973cca8b59583e83a2f81e736be44cba0f25a36e535f929/doccmd-2026.9.1.tar.gz", hash = "sha256:2fb30f4a59b0881dfa43257c4d2aad3d9fa09c6f4403b5aa70b5cf7910adf81e", size = 207835, upload-time = "2026-09-01T23:12:59.593Z" } wheels = [ - { url = "https://files.pythonhosted.org/packages/aa/27/2b3f5c0af2bdb77de73384b45b8368f3709b5b178d92dbd375db8e8593f3/doccmd-2026.8.16-py3-none-any.whl", hash = "sha256:40205dae37b112b233b25fb50f09b367b267f648d8a20ff95c1556d11ed53c75", size = 23645, upload-time = "2026-08-16T09:17:34.184Z" }, + { url = "https://files.pythonhosted.org/packages/b7/c2/b244a59fda286121940942d4299aa7472cc8f060c56d396b08171902831d/doccmd-2026.9.1-py3-none-any.whl", hash = "sha256:7b351d2b42b6939b738a6da79b43a24a27bed7f1aaad3b1de6217db6caabf0b3", size = 23644, upload-time = "2026-09-01T23:12:57.866Z" }, ] [[package]] @@ -1944,7 +1941,7 @@ wheels = [ [[package]] name = "sybil-extras" -version = "2026.7.19" +version = "2026.8.16" source = { registry = "https://pypi.org/simple" } dependencies = [ { name = "beartype" }, @@ -1952,9 +1949,9 @@ dependencies = [ { name = "myst-parser" }, { name = "sybil" }, ] -sdist = { url = "https://files.pythonhosted.org/packages/96/3c/27b1055b5afb809f055c68ba5858a4a498757f54f90827e16918ce53f39d/sybil_extras-2026.7.19.tar.gz", hash = "sha256:4ee756a2da38287a957bde7edbf295951cdd65407ca4344a1726dfff3c1d64ba", size = 118325, upload-time = "2026-07-19T13:47:44.707Z" } +sdist = { url = "https://files.pythonhosted.org/packages/af/15/2a3b048a6d12e03641b5ce5df69eac13aa3b579542354adca78c0db66480/sybil_extras-2026.8.16.tar.gz", hash = "sha256:79c8dda5d2261b93d7885edbdfb534a0b6ebf3c4f8c8a53d400734a556fd402d", size = 119266, upload-time = "2026-08-16T09:17:42.801Z" } wheels = [ - { url = "https://files.pythonhosted.org/packages/60/1d/d09751fe1bc2d9029c5123ce4c5fb11ead2d09c8f227a8f4658ebe3e7afa/sybil_extras-2026.7.19-py3-none-any.whl", hash = "sha256:794cb004f1f8d2b7e32b7ca1af455972d382053c1c0d03ac2da8c4089616c9fb", size = 89540, upload-time = "2026-07-19T13:47:43.107Z" }, + { url = "https://files.pythonhosted.org/packages/43/fb/8f1ebdd721b12be7f1428f820c983f3cbe3ef3e39d9d78240db1b260e3bd/sybil_extras-2026.8.16-py3-none-any.whl", hash = "sha256:9dd08d8a2b24c643170f88bc4d9c15464fc4a3c2829d844d68c1f3f76c3597ce", size = 87648, upload-time = "2026-08-16T09:17:41.183Z" }, ] [[package]] @@ -2022,13 +2019,13 @@ resolution-markers = [ "python_full_version < '3.15' and sys_platform == 'darwin'", ] dependencies = [ - { name = "filelock", marker = "python_full_version < '3.15' and sys_platform == 'darwin'" }, - { name = "fsspec", marker = "python_full_version < '3.15' and sys_platform == 'darwin'" }, - { name = "jinja2", marker = "python_full_version < '3.15' and sys_platform == 'darwin'" }, - { name = "networkx", marker = "python_full_version < '3.15' and sys_platform == 'darwin'" }, - { name = "setuptools", marker = "python_full_version < '3.15' and sys_platform == 'darwin'" }, - { name = "sympy", marker = "python_full_version < '3.15' and sys_platform == 'darwin'" }, - { name = "typing-extensions", marker = "python_full_version < '3.15' and sys_platform == 'darwin'" }, + { name = "filelock" }, + { name = "fsspec" }, + { name = "jinja2" }, + { name = "networkx" }, + { name = "setuptools" }, + { name = "sympy" }, + { name = "typing-extensions" }, ] wheels = [ { url = "https://download-r2.pytorch.org/whl/cpu/torch-2.13.0-cp314-cp314-macosx_14_0_arm64.whl", hash = "sha256:d849b390e07d8d333ce8ecaf91b273c656c598379a19c9acf1318a883f6b391c", upload-time = "2026-07-08T12:26:28Z" }, @@ -2044,13 +2041,13 @@ resolution-markers = [ "python_full_version < '3.15' and sys_platform != 'darwin'", ] dependencies = [ - { name = "filelock", marker = "python_full_version >= '3.15' or sys_platform != 'darwin'" }, - { name = "fsspec", marker = "python_full_version >= '3.15' or sys_platform != 'darwin'" }, - { name = "jinja2", marker = "python_full_version >= '3.15' or sys_platform != 'darwin'" }, - { name = "networkx", marker = "python_full_version >= '3.15' or sys_platform != 'darwin'" }, - { name = "setuptools", marker = "python_full_version >= '3.15' or sys_platform != 'darwin'" }, - { name = "sympy", marker = "python_full_version >= '3.15' or sys_platform != 'darwin'" }, - { name = "typing-extensions", marker = "python_full_version >= '3.15' or sys_platform != 'darwin'" }, + { name = "filelock" }, + { name = "fsspec" }, + { name = "jinja2" }, + { name = "networkx" }, + { name = "setuptools" }, + { name = "sympy" }, + { name = "typing-extensions" }, ] wheels = [ { url = "https://download-r2.pytorch.org/whl/cpu/torch-2.13.0%2Bcpu-cp314-cp314-linux_s390x.whl", hash = "sha256:dec241fef3984c0d1edadd1f58708e218d4eae881ceef7bc10cf9964d41b68b9", upload-time = "2026-07-08T19:30:20Z" }, @@ -2075,9 +2072,9 @@ resolution-markers = [ "python_full_version < '3.15' and sys_platform == 'darwin'", ] dependencies = [ - { name = "numpy", marker = "python_full_version < '3.15' and sys_platform == 'darwin'" }, - { name = "pillow", marker = "python_full_version < '3.15' and sys_platform == 'darwin'" }, - { name = "torch", version = "2.13.0", source = { registry = "https://download.pytorch.org/whl/cpu" }, marker = "python_full_version < '3.15' and sys_platform == 'darwin'" }, + { name = "numpy" }, + { name = "pillow" }, + { name = "torch", version = "2.13.0", source = { registry = "https://download.pytorch.org/whl/cpu" } }, ] wheels = [ { url = "https://download-r2.pytorch.org/whl/cpu/torchvision-0.28.0-cp314-cp314-macosx_14_0_arm64.whl", hash = "sha256:3bd9dba55224a9db4a2d77f6feaa5651770d8c8e86d3d0ddb0fa6bec54c8712b", upload-time = "2026-07-08T12:26:40Z" }, @@ -2093,9 +2090,9 @@ resolution-markers = [ "python_full_version < '3.15' and sys_platform != 'darwin'", ] dependencies = [ - { name = "numpy", marker = "python_full_version >= '3.15' or sys_platform != 'darwin'" }, - { name = "pillow", marker = "python_full_version >= '3.15' or sys_platform != 'darwin'" }, - { name = "torch", version = "2.13.0+cpu", source = { registry = "https://download.pytorch.org/whl/cpu" }, marker = "python_full_version >= '3.15' or sys_platform != 'darwin'" }, + { name = "numpy" }, + { name = "pillow" }, + { name = "torch", version = "2.13.0+cpu", source = { registry = "https://download.pytorch.org/whl/cpu" } }, ] wheels = [ { url = "https://download-r2.pytorch.org/whl/cpu/torchvision-0.28.0%2Bcpu-cp314-cp314-manylinux_2_28_aarch64.whl", hash = "sha256:3a1a76c8decb1d7bbedd3588bccc90fb269944b7321a773db181735b42115422", upload-time = "2026-07-08T12:26:39Z" }, @@ -2330,10 +2327,10 @@ requires-dist = [ { name = "beartype", specifier = "==0.22.9" }, { name = "check-manifest", marker = "extra == 'dev'", specifier = "==0.51" }, { name = "check-wheel-contents", marker = "extra == 'release'", specifier = "==0.6.3" }, - { name = "click", specifier = "==8.4.2" }, + { name = "click", specifier = "==8.5.0" }, { name = "deptry", marker = "extra == 'dev'", specifier = "==0.25.1" }, { name = "doc8", marker = "extra == 'dev'", specifier = "==2.0.0" }, - { name = "doccmd", marker = "extra == 'dev'", specifier = "==2026.8.16" }, + { name = "doccmd", marker = "extra == 'dev'", specifier = "==2026.9.1" }, { name = "freezegun", marker = "extra == 'dev'", specifier = "==1.5.5" }, { name = "furo", marker = "extra == 'dev'", specifier = "==2025.12.19" }, { name = "hadolint-bin", marker = "sys_platform != 'win32' and extra == 'dev'", specifier = "==2.15.1" },