From 8abc77e868dfc9e2cfdc2d09779074814f8829fe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=95=D0=B2=D0=B3=D0=B5=D0=BD=D0=B8=D0=B9=20=D0=91=D0=BB?= =?UTF-8?q?=D0=B8=D0=BD=D0=BE=D0=B2?= Date: Wed, 27 May 2026 15:50:59 +0300 Subject: [PATCH 1/4] Enable isort combine-as-imports in ruff config --- pyproject.toml | 1 + 1 file changed, 1 insertion(+) diff --git a/pyproject.toml b/pyproject.toml index 952b6fa..783599f 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -65,6 +65,7 @@ testpaths = ["tests/documentation", "tests/typing", "tests/units"] [tool.ruff] lint.ignore = ['E501', 'E712', 'PTH123', 'PTH118', 'PLR2004', 'PTH107', 'SIM105', 'SIM102', 'RET503', 'PLR0912', 'C901', 'E731', 'F821'] lint.select = ["ERA001", "YTT", "ASYNC", "BLE", "B", "A", "COM", "INP", "PIE", "T20", "PT", "RSE", "RET", "SIM", "SLOT", "TID252", "ARG", "PTH", "I", "C90", "N", "E", "W", "D201", "D202", "D419", "F", "PL", "PLE", "PLR", "PLW", "RUF", "TRY201", "TRY400", "TRY401"] +lint.isort.combine-as-imports = true format.quote-style = "single" [project.urls] From 29e66e1adacff4d105376437dd6739653a919585 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=95=D0=B2=D0=B3=D0=B5=D0=BD=D0=B8=D0=B9=20=D0=91=D0=BB?= =?UTF-8?q?=D0=B8=D0=BD=D0=BE=D0=B2?= Date: Wed, 27 May 2026 15:51:24 +0300 Subject: [PATCH 2/4] Fix error import order and add missing aliases in suby modules --- suby/__init__.py | 10 +++++----- suby/errors.py | 6 ++++-- suby/run.py | 4 ++-- tests/typing/test_typing_run.py | 2 -- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/suby/__init__.py b/suby/__init__.py index c4cf99b..9f5b8e2 100644 --- a/suby/__init__.py +++ b/suby/__init__.py @@ -1,10 +1,10 @@ -from suby.errors import ConditionCancellationError as ConditionCancellationError from suby.errors import ( + ConditionCancellationError as ConditionCancellationError, EnvironmentVariablesConflict as EnvironmentVariablesConflict, + RunningCommandError as RunningCommandError, + TimeoutCancellationError as TimeoutCancellationError, + WrongCommandError as WrongCommandError, + WrongDirectoryError as WrongDirectoryError, ) -from suby.errors import RunningCommandError as RunningCommandError -from suby.errors import TimeoutCancellationError as TimeoutCancellationError -from suby.errors import WrongCommandError as WrongCommandError -from suby.errors import WrongDirectoryError as WrongDirectoryError from suby.run import run as run from suby.subprocess_result import SubprocessResult as SubprocessResult diff --git a/suby/errors.py b/suby/errors.py index 12e3f01..840682a 100644 --- a/suby/errors.py +++ b/suby/errors.py @@ -1,5 +1,7 @@ -from cantok import ConditionCancellationError as CantokConditionCancellationError -from cantok import TimeoutCancellationError as CantokTimeoutCancellationError +from cantok import ( + ConditionCancellationError as CantokConditionCancellationError, + TimeoutCancellationError as CantokTimeoutCancellationError, +) from suby.subprocess_result import SubprocessResult diff --git a/suby/run.py b/suby/run.py index 659a58e..cc7a60b 100644 --- a/suby/run.py +++ b/suby/run.py @@ -36,11 +36,11 @@ from cantok import ( AbstractToken, CancellationError, + ConditionCancellationError as CantokConditionCancellationError, DefaultToken, + TimeoutCancellationError as CantokTimeoutCancellationError, TimeoutToken, ) -from cantok import ConditionCancellationError as CantokConditionCancellationError -from cantok import TimeoutCancellationError as CantokTimeoutCancellationError from emptylog import EmptyLogger, LoggerProtocol from sigmatch import PossibleCallMatcher, SignatureMismatchError diff --git a/tests/typing/test_typing_run.py b/tests/typing/test_typing_run.py index 39c4227..e450fed 100644 --- a/tests/typing/test_typing_run.py +++ b/tests/typing/test_typing_run.py @@ -18,8 +18,6 @@ ) from suby.errors import ( EnvironmentVariablesConflict as ModuleEnvironmentVariablesConflict, -) -from suby.errors import ( WrongDirectoryError as ModuleWrongDirectoryError, ) from suby.subprocess_result import SubprocessResult From 9de0eaa0b0d9212207b968a2d0b1a996ca7a87e3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=95=D0=B2=D0=B3=D0=B5=D0=BD=D0=B8=D0=B9=20=D0=91=D0=BB?= =?UTF-8?q?=D0=B8=D0=BD=D0=BE=D0=B2?= Date: Wed, 27 May 2026 15:52:03 +0300 Subject: [PATCH 3/4] Bumped version to 0.0.11 --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 783599f..720b29e 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -4,7 +4,7 @@ build-backend = "flit_core.buildapi" [project] name = "suby" -version = "0.0.10" +version = "0.0.11" authors = [ { name="Evgeniy Blinov", email="zheni-b@yandex.ru" }, ] From e68ca665edef2271035d3c244f067d4faa75fa80 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=95=D0=B2=D0=B3=D0=B5=D0=BD=D0=B8=D0=B9=20=D0=91=D0=BB?= =?UTF-8?q?=D0=B8=D0=BD=D0=BE=D0=B2?= Date: Wed, 27 May 2026 15:52:32 +0300 Subject: [PATCH 4/4] Update sigmatch dependency to version 0.0.10 --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 720b29e..f563055 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -15,7 +15,7 @@ dependencies = [ 'emptylog>=0.0.12', 'cantok>=0.0.36', 'microbenchmark>=0.0.3', - 'sigmatch>=0.0.9', + 'sigmatch>=0.0.10', ] classifiers = [ "Operating System :: OS Independent",