diff --git a/.github/workflows/benchmarks.yml b/.github/workflows/benchmarks.yml index f55cc9e..a2cc56c 100644 --- a/.github/workflows/benchmarks.yml +++ b/.github/workflows/benchmarks.yml @@ -3,7 +3,7 @@ name: Benchmarks on: push: branches: - - "main" + - 'main' pull_request: workflow_dispatch: diff --git a/.github/workflows/tests_and_coverage.yml b/.github/workflows/tests_and_coverage.yml index b8b8bac..685a3f8 100644 --- a/.github/workflows/tests_and_coverage.yml +++ b/.github/workflows/tests_and_coverage.yml @@ -44,7 +44,7 @@ jobs: - name: Run tests and show the branch coverage on the command line shell: bash run: | - pth_file="$(python -c 'import sysconfig; print(sysconfig.get_path("purelib"))')/suby_coverage_process_startup.pth" + pth_file="$(python -c 'import sysconfig; print(sysconfig.get_path("purelib"))')/coverage_process_startup.pth" printf "import os; os.getenv('COVERAGE_PROCESS_START') and __import__('coverage').process_startup()\n" > "$pth_file" coverage erase COVERAGE_PROCESS_START="$PWD/pyproject.toml" coverage run -m pytest -n auto --cache-clear --assert=plain diff --git a/pyproject.toml b/pyproject.toml index 952b6fa..b7da870 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,24 +1,24 @@ [build-system] -requires = ["flit_core==3.12.0"] -build-backend = "flit_core.buildapi" +requires = ['flit_core==3.12.0'] +build-backend = 'flit_core.buildapi' [project] -name = "suby" -version = "0.0.10" +name = 'suby' +version = '0.0.11' authors = [ - { name="Evgeniy Blinov", email="zheni-b@yandex.ru" }, + { name='Evgeniy Blinov', email='zheni-b@yandex.ru' }, ] description = 'Slightly simplified subprocesses' -readme = "README.md" -requires-python = ">=3.8" +readme = 'README.md' +requires-python = '>=3.8' dependencies = [ 'emptylog>=0.0.12', - 'cantok>=0.0.36', + 'cantok>=0.0.38', 'microbenchmark>=0.0.3', - 'sigmatch>=0.0.9', + 'sigmatch>=0.0.10', ] classifiers = [ - "Operating System :: OS Independent", + 'Operating System :: OS Independent', 'Operating System :: MacOS :: MacOS X', 'Operating System :: Microsoft :: Windows', 'Operating System :: POSIX', @@ -46,26 +46,28 @@ keywords = [ ] [tool.mutmut] -paths_to_mutate=["suby"] +paths_to_mutate=['suby'] [tool.coverage.run] branch = true parallel = true -plugins = ["coverage_pyver_pragma"] -source = ["suby"] +plugins = ['coverage_pyver_pragma'] +source = ['suby'] [tool.pytest.ini_options] -addopts = "-m 'not slow'" +addopts = '-m "not slow"' markers = [ - "slow: tests that create isolated environments, install dependencies, or otherwise take noticeably longer", + 'slow: tests that create isolated environments, install dependencies, or otherwise take noticeably longer', ] -norecursedirs = ["build", "mutants"] -testpaths = ["tests/documentation", "tests/typing", "tests/units"] +norecursedirs = ['build', 'mutants'] +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"] -format.quote-style = "single" +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 +lint.isort.force-single-line = false +format.quote-style = 'single' [project.urls] 'Source' = 'https://github.com/mutating/suby' 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 diff --git a/tests/units/test_process_waiting.py b/tests/units/test_process_waiting.py index b07c650..8489892 100644 --- a/tests/units/test_process_waiting.py +++ b/tests/units/test_process_waiting.py @@ -15,10 +15,7 @@ from cantok import ConditionToken, SimpleToken, TimeoutCancellationError from suby import process_waiting, run -from suby.process_waiting import ( - has_event_driven_wait, - wait_for_process_exit, -) +from suby.process_waiting import has_event_driven_wait, wait_for_process_exit from suby.subprocess_result import SubprocessResult _run_module = importlib.import_module('suby.run')