From 8ca426106fc6de07929bc7773935e3b33cbb49c1 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 13 Jan 2025 10:37:53 +0000 Subject: [PATCH 1/4] Bump ruff from 0.8.6 to 0.9.1 Bumps [ruff](https://github.com/astral-sh/ruff) from 0.8.6 to 0.9.1. - [Release notes](https://github.com/astral-sh/ruff/releases) - [Changelog](https://github.com/astral-sh/ruff/blob/main/CHANGELOG.md) - [Commits](https://github.com/astral-sh/ruff/compare/0.8.6...0.9.1) --- updated-dependencies: - dependency-name: ruff 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 7808e35f..6644e66c 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -62,7 +62,7 @@ optional-dependencies.dev = [ "pytest==8.3.4", "pytest-cov==6.0.0", "pyyaml==6.0.2", - "ruff==0.8.6", + "ruff==0.9.1", # We add shellcheck-py not only for shell scripts and shell code blocks, # but also because having it installed means that ``actionlint-py`` will # use it to lint shell commands in GitHub workflow files. From e8b9c02a0f7bfe474475a7c28ac6565d0b26cfb7 Mon Sep 17 00:00:00 2001 From: Adam Dangoor Date: Mon, 13 Jan 2025 19:49:07 +0000 Subject: [PATCH 2/4] Stop shadowing Python builtin "types" --- CHANGELOG.rst | 8 ++------ docs/source/api-reference.rst | 2 +- src/vws/exceptions/base_exceptions.py | 2 +- src/vws/exceptions/custom_exceptions.py | 2 +- src/vws/query.py | 2 +- src/vws/{vws.py => response.py} | 2 +- 6 files changed, 7 insertions(+), 11 deletions(-) rename src/vws/{vws.py => response.py} (99%) diff --git a/CHANGELOG.rst b/CHANGELOG.rst index b18bc5e4..346066c8 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -4,16 +4,12 @@ Changelog Next ---- -2024.09.21 ------------- - -2024.09.04.1 ------------- +* Move ``Response`` from ``vws.response`` to ``vws.response``. 2024.09.04 ------------ -* Move ``Response`` from ``vws.exceptions.response`` to ``vws.types``. +* Move ``Response`` from ``vws.exceptions.response`` to ``vws.response``. * Add ``raw`` field to ``Response``. 2024.09.03 diff --git a/docs/source/api-reference.rst b/docs/source/api-reference.rst index 5b702755..01bba09b 100644 --- a/docs/source/api-reference.rst +++ b/docs/source/api-reference.rst @@ -13,6 +13,6 @@ API Reference :undoc-members: :members: -.. automodule:: vws.types +.. automodule:: vws.response :undoc-members: :members: diff --git a/src/vws/exceptions/base_exceptions.py b/src/vws/exceptions/base_exceptions.py index b0888f93..943323bf 100644 --- a/src/vws/exceptions/base_exceptions.py +++ b/src/vws/exceptions/base_exceptions.py @@ -5,7 +5,7 @@ from beartype import beartype -from vws.types import Response +from vws.response import Response @beartype diff --git a/src/vws/exceptions/custom_exceptions.py b/src/vws/exceptions/custom_exceptions.py index f05d59b4..11d47a67 100644 --- a/src/vws/exceptions/custom_exceptions.py +++ b/src/vws/exceptions/custom_exceptions.py @@ -6,7 +6,7 @@ from beartype import beartype -from vws.types import Response +from vws.response import Response @beartype diff --git a/src/vws/query.py b/src/vws/query.py index 84144691..96122aa1 100644 --- a/src/vws/query.py +++ b/src/vws/query.py @@ -27,7 +27,7 @@ ) from vws.include_target_data import CloudRecoIncludeTargetData from vws.reports import QueryResult, TargetData -from vws.types import Response +from vws.response import Response _ImageType = io.BytesIO | BinaryIO diff --git a/src/vws/vws.py b/src/vws/response.py similarity index 99% rename from src/vws/vws.py rename to src/vws/response.py index f101a7ec..f8776657 100644 --- a/src/vws/vws.py +++ b/src/vws/response.py @@ -46,7 +46,7 @@ TargetStatuses, TargetSummaryReport, ) -from vws.types import Response +from vws.response import Response _ImageType = io.BytesIO | BinaryIO From 91d7fffa311e9e0ea6ec18fb6799c2a5e588dd27 Mon Sep 17 00:00:00 2001 From: Adam Dangoor Date: Mon, 13 Jan 2025 19:51:53 +0000 Subject: [PATCH 3/4] Revert "Stop shadowing Python builtin "types"" This reverts commit e8b9c02a0f7bfe474475a7c28ac6565d0b26cfb7. --- CHANGELOG.rst | 8 ++++++-- docs/source/api-reference.rst | 2 +- src/vws/exceptions/base_exceptions.py | 2 +- src/vws/exceptions/custom_exceptions.py | 2 +- src/vws/query.py | 2 +- src/vws/{response.py => vws.py} | 2 +- 6 files changed, 11 insertions(+), 7 deletions(-) rename src/vws/{response.py => vws.py} (99%) diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 346066c8..b18bc5e4 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -4,12 +4,16 @@ Changelog Next ---- -* Move ``Response`` from ``vws.response`` to ``vws.response``. +2024.09.21 +------------ + +2024.09.04.1 +------------ 2024.09.04 ------------ -* Move ``Response`` from ``vws.exceptions.response`` to ``vws.response``. +* Move ``Response`` from ``vws.exceptions.response`` to ``vws.types``. * Add ``raw`` field to ``Response``. 2024.09.03 diff --git a/docs/source/api-reference.rst b/docs/source/api-reference.rst index 01bba09b..5b702755 100644 --- a/docs/source/api-reference.rst +++ b/docs/source/api-reference.rst @@ -13,6 +13,6 @@ API Reference :undoc-members: :members: -.. automodule:: vws.response +.. automodule:: vws.types :undoc-members: :members: diff --git a/src/vws/exceptions/base_exceptions.py b/src/vws/exceptions/base_exceptions.py index 943323bf..b0888f93 100644 --- a/src/vws/exceptions/base_exceptions.py +++ b/src/vws/exceptions/base_exceptions.py @@ -5,7 +5,7 @@ from beartype import beartype -from vws.response import Response +from vws.types import Response @beartype diff --git a/src/vws/exceptions/custom_exceptions.py b/src/vws/exceptions/custom_exceptions.py index 11d47a67..f05d59b4 100644 --- a/src/vws/exceptions/custom_exceptions.py +++ b/src/vws/exceptions/custom_exceptions.py @@ -6,7 +6,7 @@ from beartype import beartype -from vws.response import Response +from vws.types import Response @beartype diff --git a/src/vws/query.py b/src/vws/query.py index 96122aa1..84144691 100644 --- a/src/vws/query.py +++ b/src/vws/query.py @@ -27,7 +27,7 @@ ) from vws.include_target_data import CloudRecoIncludeTargetData from vws.reports import QueryResult, TargetData -from vws.response import Response +from vws.types import Response _ImageType = io.BytesIO | BinaryIO diff --git a/src/vws/response.py b/src/vws/vws.py similarity index 99% rename from src/vws/response.py rename to src/vws/vws.py index f8776657..f101a7ec 100644 --- a/src/vws/response.py +++ b/src/vws/vws.py @@ -46,7 +46,7 @@ TargetStatuses, TargetSummaryReport, ) -from vws.response import Response +from vws.types import Response _ImageType = io.BytesIO | BinaryIO From cfa9a065ee95cff51de806d33113612b58cf7769 Mon Sep 17 00:00:00 2001 From: Adam Dangoor Date: Mon, 13 Jan 2025 19:52:24 +0000 Subject: [PATCH 4/4] Stop shadowing Python builtin "types" --- docs/source/api-reference.rst | 2 +- src/vws/exceptions/base_exceptions.py | 2 +- src/vws/exceptions/custom_exceptions.py | 2 +- src/vws/query.py | 2 +- src/vws/{types.py => response.py} | 0 src/vws/vws.py | 2 +- 6 files changed, 5 insertions(+), 5 deletions(-) rename src/vws/{types.py => response.py} (100%) diff --git a/docs/source/api-reference.rst b/docs/source/api-reference.rst index 5b702755..01bba09b 100644 --- a/docs/source/api-reference.rst +++ b/docs/source/api-reference.rst @@ -13,6 +13,6 @@ API Reference :undoc-members: :members: -.. automodule:: vws.types +.. automodule:: vws.response :undoc-members: :members: diff --git a/src/vws/exceptions/base_exceptions.py b/src/vws/exceptions/base_exceptions.py index b0888f93..943323bf 100644 --- a/src/vws/exceptions/base_exceptions.py +++ b/src/vws/exceptions/base_exceptions.py @@ -5,7 +5,7 @@ from beartype import beartype -from vws.types import Response +from vws.response import Response @beartype diff --git a/src/vws/exceptions/custom_exceptions.py b/src/vws/exceptions/custom_exceptions.py index f05d59b4..11d47a67 100644 --- a/src/vws/exceptions/custom_exceptions.py +++ b/src/vws/exceptions/custom_exceptions.py @@ -6,7 +6,7 @@ from beartype import beartype -from vws.types import Response +from vws.response import Response @beartype diff --git a/src/vws/query.py b/src/vws/query.py index 84144691..96122aa1 100644 --- a/src/vws/query.py +++ b/src/vws/query.py @@ -27,7 +27,7 @@ ) from vws.include_target_data import CloudRecoIncludeTargetData from vws.reports import QueryResult, TargetData -from vws.types import Response +from vws.response import Response _ImageType = io.BytesIO | BinaryIO diff --git a/src/vws/types.py b/src/vws/response.py similarity index 100% rename from src/vws/types.py rename to src/vws/response.py diff --git a/src/vws/vws.py b/src/vws/vws.py index f101a7ec..f8776657 100644 --- a/src/vws/vws.py +++ b/src/vws/vws.py @@ -46,7 +46,7 @@ TargetStatuses, TargetSummaryReport, ) -from vws.types import Response +from vws.response import Response _ImageType = io.BytesIO | BinaryIO