diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 4da1caee070..5151ec8fc21 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -55,8 +55,8 @@ jobs: - name: Install python dependencies run: poetry install --with=test,coverage,lint - - name: Lint with ruff . - run: poetry run ruff . + - name: Lint with ruff check . + run: poetry run ruff check . - name: Format with ruff run: poetry run ruff format . --check diff --git a/CHANGES b/CHANGES index 9b13649e354..238061135f6 100644 --- a/CHANGES +++ b/CHANGES @@ -19,6 +19,12 @@ $ pipx install --suffix=@next 'tmuxp' --pip-args '\--pre' --force +### Development + +- ruff 0.2.2 -> 0.3.0 (#913) + + Related formattings. Update CI to use `ruff check .` instead of `ruff .`. + ## tmuxp 1.39.0 (2024-02-17) _Maintenance only, no bug fixes or new features_ diff --git a/docs/_ext/aafig.py b/docs/_ext/aafig.py index ad48660ef2e..35e3cbcdde4 100644 --- a/docs/_ext/aafig.py +++ b/docs/_ext/aafig.py @@ -11,6 +11,7 @@ :author: Leandro Lucarella :license: BOLA, see LICENSE for details """ + import logging import posixpath import typing as t diff --git a/docs/conf.py b/docs/conf.py index 25783a032fe..3926d58067f 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -1,5 +1,6 @@ # flake8: NOQA: E501 """Sphinx documentation configuration for tmuxp.""" + import contextlib import inspect import pathlib diff --git a/poetry.lock b/poetry.lock index 583c0c5dcbc..b324f14976b 100644 --- a/poetry.lock +++ b/poetry.lock @@ -750,13 +750,13 @@ windows-terminal = ["colorama (>=0.4.6)"] [[package]] name = "pytest" -version = "8.0.1" +version = "8.0.2" description = "pytest: simple powerful testing with Python" optional = false python-versions = ">=3.8" files = [ - {file = "pytest-8.0.1-py3-none-any.whl", hash = "sha256:3e4f16fe1c0a9dc9d9389161c127c3edc5d810c38d6793042fb81d9f48a59fca"}, - {file = "pytest-8.0.1.tar.gz", hash = "sha256:267f6563751877d772019b13aacbe4e860d73fe8f651f28112e9ac37de7513ae"}, + {file = "pytest-8.0.2-py3-none-any.whl", hash = "sha256:edfaaef32ce5172d5466b5127b42e0d6d35ebbe4453f0e3505d96afd93f6b096"}, + {file = "pytest-8.0.2.tar.gz", hash = "sha256:d4051d623a2e0b7e51960ba963193b09ce6daeb9759a451844a21e4ddedfc1bd"}, ] [package.dependencies] @@ -928,28 +928,28 @@ use-chardet-on-py3 = ["chardet (>=3.0.2,<6)"] [[package]] name = "ruff" -version = "0.2.2" +version = "0.3.0" description = "An extremely fast Python linter and code formatter, written in Rust." optional = false python-versions = ">=3.7" files = [ - {file = "ruff-0.2.2-py3-none-macosx_10_12_x86_64.macosx_11_0_arm64.macosx_10_12_universal2.whl", hash = "sha256:0a9efb032855ffb3c21f6405751d5e147b0c6b631e3ca3f6b20f917572b97eb6"}, - {file = "ruff-0.2.2-py3-none-macosx_10_12_x86_64.whl", hash = "sha256:d450b7fbff85913f866a5384d8912710936e2b96da74541c82c1b458472ddb39"}, - {file = "ruff-0.2.2-py3-none-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:ecd46e3106850a5c26aee114e562c329f9a1fbe9e4821b008c4404f64ff9ce73"}, - {file = "ruff-0.2.2-py3-none-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:5e22676a5b875bd72acd3d11d5fa9075d3a5f53b877fe7b4793e4673499318ba"}, - {file = "ruff-0.2.2-py3-none-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:1695700d1e25a99d28f7a1636d85bafcc5030bba9d0578c0781ba1790dbcf51c"}, - {file = "ruff-0.2.2-py3-none-manylinux_2_17_ppc64.manylinux2014_ppc64.whl", hash = "sha256:b0c232af3d0bd8f521806223723456ffebf8e323bd1e4e82b0befb20ba18388e"}, - {file = "ruff-0.2.2-py3-none-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:f63d96494eeec2fc70d909393bcd76c69f35334cdbd9e20d089fb3f0640216ca"}, - {file = "ruff-0.2.2-py3-none-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:6a61ea0ff048e06de273b2e45bd72629f470f5da8f71daf09fe481278b175001"}, - {file = "ruff-0.2.2-py3-none-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:5e1439c8f407e4f356470e54cdecdca1bd5439a0673792dbe34a2b0a551a2fe3"}, - {file = "ruff-0.2.2-py3-none-musllinux_1_2_aarch64.whl", hash = "sha256:940de32dc8853eba0f67f7198b3e79bc6ba95c2edbfdfac2144c8235114d6726"}, - {file = "ruff-0.2.2-py3-none-musllinux_1_2_armv7l.whl", hash = "sha256:0c126da55c38dd917621552ab430213bdb3273bb10ddb67bc4b761989210eb6e"}, - {file = "ruff-0.2.2-py3-none-musllinux_1_2_i686.whl", hash = "sha256:3b65494f7e4bed2e74110dac1f0d17dc8e1f42faaa784e7c58a98e335ec83d7e"}, - {file = "ruff-0.2.2-py3-none-musllinux_1_2_x86_64.whl", hash = "sha256:1ec49be4fe6ddac0503833f3ed8930528e26d1e60ad35c2446da372d16651ce9"}, - {file = "ruff-0.2.2-py3-none-win32.whl", hash = "sha256:d920499b576f6c68295bc04e7b17b6544d9d05f196bb3aac4358792ef6f34325"}, - {file = "ruff-0.2.2-py3-none-win_amd64.whl", hash = "sha256:cc9a91ae137d687f43a44c900e5d95e9617cb37d4c989e462980ba27039d239d"}, - {file = "ruff-0.2.2-py3-none-win_arm64.whl", hash = "sha256:c9d15fc41e6054bfc7200478720570078f0b41c9ae4f010bcc16bd6f4d1aacdd"}, - {file = "ruff-0.2.2.tar.gz", hash = "sha256:e62ed7f36b3068a30ba39193a14274cd706bc486fad521276458022f7bccb31d"}, + {file = "ruff-0.3.0-py3-none-macosx_10_12_x86_64.macosx_11_0_arm64.macosx_10_12_universal2.whl", hash = "sha256:7deb528029bacf845bdbb3dbb2927d8ef9b4356a5e731b10eef171e3f0a85944"}, + {file = "ruff-0.3.0-py3-none-macosx_10_12_x86_64.whl", hash = "sha256:e1e0d4381ca88fb2b73ea0766008e703f33f460295de658f5467f6f229658c19"}, + {file = "ruff-0.3.0-py3-none-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:2f7dbba46e2827dfcb0f0cc55fba8e96ba7c8700e0a866eb8cef7d1d66c25dcb"}, + {file = "ruff-0.3.0-py3-none-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:23dbb808e2f1d68eeadd5f655485e235c102ac6f12ad31505804edced2a5ae77"}, + {file = "ruff-0.3.0-py3-none-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:3ef655c51f41d5fa879f98e40c90072b567c666a7114fa2d9fe004dffba00932"}, + {file = "ruff-0.3.0-py3-none-manylinux_2_17_ppc64.manylinux2014_ppc64.whl", hash = "sha256:d0d3d7ef3d4f06433d592e5f7d813314a34601e6c5be8481cccb7fa760aa243e"}, + {file = "ruff-0.3.0-py3-none-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:b08b356d06a792e49a12074b62222f9d4ea2a11dca9da9f68163b28c71bf1dd4"}, + {file = "ruff-0.3.0-py3-none-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:9343690f95710f8cf251bee1013bf43030072b9f8d012fbed6ad702ef70d360a"}, + {file = "ruff-0.3.0-py3-none-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:a1f3ed501a42f60f4dedb7805fa8d4534e78b4e196f536bac926f805f0743d49"}, + {file = "ruff-0.3.0-py3-none-musllinux_1_2_aarch64.whl", hash = "sha256:cc30a9053ff2f1ffb505a585797c23434d5f6c838bacfe206c0e6cf38c921a1e"}, + {file = "ruff-0.3.0-py3-none-musllinux_1_2_armv7l.whl", hash = "sha256:5da894a29ec018a8293d3d17c797e73b374773943e8369cfc50495573d396933"}, + {file = "ruff-0.3.0-py3-none-musllinux_1_2_i686.whl", hash = "sha256:755c22536d7f1889be25f2baf6fedd019d0c51d079e8417d4441159f3bcd30c2"}, + {file = "ruff-0.3.0-py3-none-musllinux_1_2_x86_64.whl", hash = "sha256:dd73fe7f4c28d317855da6a7bc4aa29a1500320818dd8f27df95f70a01b8171f"}, + {file = "ruff-0.3.0-py3-none-win32.whl", hash = "sha256:19eacceb4c9406f6c41af806418a26fdb23120dfe53583df76d1401c92b7c14b"}, + {file = "ruff-0.3.0-py3-none-win_amd64.whl", hash = "sha256:128265876c1d703e5f5e5a4543bd8be47c73a9ba223fd3989d4aa87dd06f312f"}, + {file = "ruff-0.3.0-py3-none-win_arm64.whl", hash = "sha256:e3a4a6d46aef0a84b74fcd201a4401ea9a6cd85614f6a9435f2d33dd8cefbf83"}, + {file = "ruff-0.3.0.tar.gz", hash = "sha256:0886184ba2618d815067cf43e005388967b67ab9c80df52b32ec1152ab49f53a"}, ] [[package]] @@ -1289,13 +1289,13 @@ files = [ [[package]] name = "types-docutils" -version = "0.20.0.20240201" +version = "0.20.0.20240227" description = "Typing stubs for docutils" optional = false python-versions = ">=3.8" files = [ - {file = "types-docutils-0.20.0.20240201.tar.gz", hash = "sha256:ba4bfd4ff6dd19640ba7ab5d93900393a65897880f3650997964a943f4e79a6b"}, - {file = "types_docutils-0.20.0.20240201-py3-none-any.whl", hash = "sha256:79d3bcef235f7c81a63f4f3dcf1d0b138985079bb32d02f5a7d266e1f9f361ba"}, + {file = "types-docutils-0.20.0.20240227.tar.gz", hash = "sha256:7f2dbb02356024b5db3efd9df26b236da050ad2eada89872e5284b4a394b7761"}, + {file = "types_docutils-0.20.0.20240227-py3-none-any.whl", hash = "sha256:51c139502ba0add871392cbc37200a3a64096e61eeb6396727443ba6d38ae579"}, ] [[package]] @@ -1311,13 +1311,13 @@ files = [ [[package]] name = "typing-extensions" -version = "4.9.0" +version = "4.10.0" description = "Backported and Experimental Type Hints for Python 3.8+" optional = false python-versions = ">=3.8" files = [ - {file = "typing_extensions-4.9.0-py3-none-any.whl", hash = "sha256:af72aea155e91adfc61c3ae9e0e342dbc0cba726d6cba4b6c72c1f34e47291cd"}, - {file = "typing_extensions-4.9.0.tar.gz", hash = "sha256:23478f88c37f27d76ac8aee6c905017a143b0b1b886c3c9f66bc2fd94f9f5783"}, + {file = "typing_extensions-4.10.0-py3-none-any.whl", hash = "sha256:69b1a937c3a517342112fb4c6df7e72fc39a38e7891a5730ed4985b5214b5475"}, + {file = "typing_extensions-4.10.0.tar.gz", hash = "sha256:b0abd7c89e8fb96f98db18d86106ff1d90ab692004eb746cf6eda2682f91b3cb"}, ] [[package]] diff --git a/src/tmuxp/__about__.py b/src/tmuxp/__about__.py index d20b98c993b..46ebcf3f603 100644 --- a/src/tmuxp/__about__.py +++ b/src/tmuxp/__about__.py @@ -1,4 +1,5 @@ """Metadata for tmuxp package.""" + __title__ = "tmuxp" __package_name__ = "tmuxp" __version__ = "1.39.0" diff --git a/src/tmuxp/__init__.py b/src/tmuxp/__init__.py index 1ff777e9679..a7d3e623e0f 100644 --- a/src/tmuxp/__init__.py +++ b/src/tmuxp/__init__.py @@ -4,6 +4,7 @@ :copyright: Copyright 2013- Tony Narlock. :license: MIT, see LICENSE for details """ + from . import cli, util from .__about__ import ( __author__, diff --git a/src/tmuxp/_internal/config_reader.py b/src/tmuxp/_internal/config_reader.py index 0367537be82..dd381f3731b 100644 --- a/src/tmuxp/_internal/config_reader.py +++ b/src/tmuxp/_internal/config_reader.py @@ -1,4 +1,5 @@ """Configuration parser for YAML and JSON files.""" + import json import pathlib import typing as t diff --git a/src/tmuxp/_internal/types.py b/src/tmuxp/_internal/types.py index f2f834a1404..42b55a82f72 100644 --- a/src/tmuxp/_internal/types.py +++ b/src/tmuxp/_internal/types.py @@ -9,6 +9,7 @@ ... from tmuxp._internal.types import PluginConfigSchema ... """ + import typing as t from typing_extensions import NotRequired, TypedDict diff --git a/src/tmuxp/cli/__init__.py b/src/tmuxp/cli/__init__.py index 4f770992045..e1a0646da5b 100644 --- a/src/tmuxp/cli/__init__.py +++ b/src/tmuxp/cli/__init__.py @@ -1,4 +1,5 @@ """CLI utilities for tmuxp.""" + import argparse import logging import os diff --git a/src/tmuxp/cli/convert.py b/src/tmuxp/cli/convert.py index 5ff5c3606af..8479087f64a 100644 --- a/src/tmuxp/cli/convert.py +++ b/src/tmuxp/cli/convert.py @@ -1,4 +1,5 @@ """CLI for ``tmuxp convert`` subcommand.""" + import argparse import os import pathlib diff --git a/src/tmuxp/cli/debug_info.py b/src/tmuxp/cli/debug_info.py index df9a0357b1a..a37f5f0104a 100644 --- a/src/tmuxp/cli/debug_info.py +++ b/src/tmuxp/cli/debug_info.py @@ -1,4 +1,5 @@ """CLI for ``tmuxp debug-info`` subcommand.""" + import argparse import os import pathlib diff --git a/src/tmuxp/cli/edit.py b/src/tmuxp/cli/edit.py index f18a63bef3f..52bdfaf00b0 100644 --- a/src/tmuxp/cli/edit.py +++ b/src/tmuxp/cli/edit.py @@ -1,4 +1,5 @@ """CLI for ``tmuxp edit`` subcommand.""" + import argparse import os import pathlib diff --git a/src/tmuxp/cli/freeze.py b/src/tmuxp/cli/freeze.py index df1df523543..cb4d31e754f 100644 --- a/src/tmuxp/cli/freeze.py +++ b/src/tmuxp/cli/freeze.py @@ -1,4 +1,5 @@ """CLI for ``tmuxp freeze`` subcommand.""" + import argparse import os import pathlib diff --git a/src/tmuxp/cli/import_config.py b/src/tmuxp/cli/import_config.py index 3204ac67f42..dec7f2e5262 100644 --- a/src/tmuxp/cli/import_config.py +++ b/src/tmuxp/cli/import_config.py @@ -1,4 +1,5 @@ """CLI for ``tmuxp shell`` subcommand.""" + import argparse import os import pathlib diff --git a/src/tmuxp/cli/load.py b/src/tmuxp/cli/load.py index e4b50077cc1..0e4b20eb007 100644 --- a/src/tmuxp/cli/load.py +++ b/src/tmuxp/cli/load.py @@ -1,4 +1,5 @@ """CLI for ``tmuxp load`` subcommand.""" + import argparse import importlib import logging diff --git a/src/tmuxp/cli/ls.py b/src/tmuxp/cli/ls.py index d76577741f4..e5c0defcdc5 100644 --- a/src/tmuxp/cli/ls.py +++ b/src/tmuxp/cli/ls.py @@ -1,4 +1,5 @@ """CLI for ``tmuxp ls`` subcommand.""" + import argparse import os import typing as t diff --git a/src/tmuxp/cli/shell.py b/src/tmuxp/cli/shell.py index 03e5c885f90..1d5e95cea4f 100644 --- a/src/tmuxp/cli/shell.py +++ b/src/tmuxp/cli/shell.py @@ -1,4 +1,5 @@ """CLI for ``tmuxp shell`` subcommand.""" + import argparse import os import pathlib diff --git a/src/tmuxp/cli/utils.py b/src/tmuxp/cli/utils.py index 62ab3e82314..c5b21194d62 100644 --- a/src/tmuxp/cli/utils.py +++ b/src/tmuxp/cli/utils.py @@ -1,4 +1,5 @@ """CLI utility helpers for tmuxp.""" + import logging import re import typing as t diff --git a/src/tmuxp/exc.py b/src/tmuxp/exc.py index 9f5330c4d30..118ba00bcd2 100644 --- a/src/tmuxp/exc.py +++ b/src/tmuxp/exc.py @@ -1,4 +1,5 @@ """Exceptions for tmuxp.""" + import typing as t from libtmux._internal.query_list import ObjectDoesNotExist diff --git a/src/tmuxp/log.py b/src/tmuxp/log.py index 52115e80731..5ee29c27378 100644 --- a/src/tmuxp/log.py +++ b/src/tmuxp/log.py @@ -1,5 +1,6 @@ #!/usr/bin/env python """Log utilities for tmuxp.""" + import logging import time import typing as t diff --git a/src/tmuxp/plugin.py b/src/tmuxp/plugin.py index 0ed791d8455..680a34172b7 100644 --- a/src/tmuxp/plugin.py +++ b/src/tmuxp/plugin.py @@ -1,4 +1,5 @@ """Plugin system for tmuxp.""" + import typing as t import libtmux diff --git a/src/tmuxp/shell.py b/src/tmuxp/shell.py index f4a931a643c..33e8657b474 100644 --- a/src/tmuxp/shell.py +++ b/src/tmuxp/shell.py @@ -1,4 +1,5 @@ """Utility and helper methods for tmuxp.""" + import logging import os import pathlib diff --git a/src/tmuxp/types.py b/src/tmuxp/types.py index 59d3a3aa681..6d05b258c02 100644 --- a/src/tmuxp/types.py +++ b/src/tmuxp/types.py @@ -6,6 +6,7 @@ .. _typeshed's: https://github.com/python/typeshed/blob/9687d5/stdlib/_typeshed/__init__.pyi#L98 """ # E501 + from os import PathLike from typing import Union diff --git a/src/tmuxp/util.py b/src/tmuxp/util.py index 4a07bc8450b..940d58db8f7 100644 --- a/src/tmuxp/util.py +++ b/src/tmuxp/util.py @@ -1,4 +1,5 @@ """Utility and helper methods for tmuxp.""" + import logging import os import pathlib diff --git a/src/tmuxp/workspace/builder.py b/src/tmuxp/workspace/builder.py index d7346b31d97..e3e9f4cc274 100644 --- a/src/tmuxp/workspace/builder.py +++ b/src/tmuxp/workspace/builder.py @@ -1,4 +1,5 @@ """Create a tmux workspace from a workspace :py:obj:`dict`.""" + import logging import time import typing as t diff --git a/src/tmuxp/workspace/constants.py b/src/tmuxp/workspace/constants.py index da825868703..48c2d18ba4c 100644 --- a/src/tmuxp/workspace/constants.py +++ b/src/tmuxp/workspace/constants.py @@ -1,2 +1,3 @@ """Constant variables for tmuxp workspace functionality.""" + VALID_WORKSPACE_DIR_FILE_EXTENSIONS = [".yaml", ".yml", ".json"] diff --git a/src/tmuxp/workspace/finders.py b/src/tmuxp/workspace/finders.py index 319edb603ed..290f2e4eaf6 100644 --- a/src/tmuxp/workspace/finders.py +++ b/src/tmuxp/workspace/finders.py @@ -1,4 +1,5 @@ """Workspace (configuration file) finders for tmuxp.""" + import logging import os import pathlib diff --git a/src/tmuxp/workspace/freezer.py b/src/tmuxp/workspace/freezer.py index e996ab6b4f0..0fb365802a1 100644 --- a/src/tmuxp/workspace/freezer.py +++ b/src/tmuxp/workspace/freezer.py @@ -1,4 +1,5 @@ """Tmux session freezing functionality for tmuxp.""" + import typing as t from libtmux.pane import Pane diff --git a/src/tmuxp/workspace/importers.py b/src/tmuxp/workspace/importers.py index d1a0d811659..9666546bc38 100644 --- a/src/tmuxp/workspace/importers.py +++ b/src/tmuxp/workspace/importers.py @@ -1,4 +1,5 @@ """Configuration import adapters to load teamocil, tmuxinator, etc. in tmuxp.""" + import typing as t diff --git a/src/tmuxp/workspace/loader.py b/src/tmuxp/workspace/loader.py index 19e8f1babb0..c9496b4a31b 100644 --- a/src/tmuxp/workspace/loader.py +++ b/src/tmuxp/workspace/loader.py @@ -1,4 +1,5 @@ """Workspace hydration and loading for tmuxp.""" + import logging import os import pathlib diff --git a/src/tmuxp/workspace/validation.py b/src/tmuxp/workspace/validation.py index a3b6a393b1d..e4c7bca5ce3 100644 --- a/src/tmuxp/workspace/validation.py +++ b/src/tmuxp/workspace/validation.py @@ -1,4 +1,5 @@ """Validation errors for tmuxp configuration files.""" + import typing as t from .. import exc diff --git a/tests/cli/test_cli.py b/tests/cli/test_cli.py index ac4ec3800d8..6e6cc5bd4e8 100644 --- a/tests/cli/test_cli.py +++ b/tests/cli/test_cli.py @@ -1,4 +1,5 @@ """CLI tests for tmuxp's core shell functionality.""" + import argparse import contextlib import pathlib diff --git a/tests/cli/test_convert.py b/tests/cli/test_convert.py index 3042d078333..4661ca99aef 100644 --- a/tests/cli/test_convert.py +++ b/tests/cli/test_convert.py @@ -1,4 +1,5 @@ """CLI tests for tmuxp convert.""" + import contextlib import io import json diff --git a/tests/cli/test_debug_info.py b/tests/cli/test_debug_info.py index daba2c69fba..8bebb3e9cf8 100644 --- a/tests/cli/test_debug_info.py +++ b/tests/cli/test_debug_info.py @@ -1,4 +1,5 @@ """CLI tests for tmuxp debuginfo.""" + import pathlib import pytest diff --git a/tests/cli/test_freeze.py b/tests/cli/test_freeze.py index 687ab900aa1..07d95f6b6b6 100644 --- a/tests/cli/test_freeze.py +++ b/tests/cli/test_freeze.py @@ -1,4 +1,5 @@ """Test workspace freezing functionality for tmuxp.""" + import contextlib import io import pathlib diff --git a/tests/cli/test_import.py b/tests/cli/test_import.py index ce418889e30..5723a79a8c2 100644 --- a/tests/cli/test_import.py +++ b/tests/cli/test_import.py @@ -1,4 +1,5 @@ """CLI tests for tmuxp import.""" + import contextlib import io import pathlib diff --git a/tests/cli/test_load.py b/tests/cli/test_load.py index 5e7d43256bb..9c3b22c7411 100644 --- a/tests/cli/test_load.py +++ b/tests/cli/test_load.py @@ -1,4 +1,5 @@ """CLI tests for tmuxp load.""" + import contextlib import io import pathlib diff --git a/tests/cli/test_ls.py b/tests/cli/test_ls.py index 7fdcf9ffde1..9532dd3f7cd 100644 --- a/tests/cli/test_ls.py +++ b/tests/cli/test_ls.py @@ -1,4 +1,5 @@ """CLI tests for tmuxp ls command.""" + import contextlib import pathlib diff --git a/tests/cli/test_shell.py b/tests/cli/test_shell.py index 18b726a5c5e..bbc08704c1e 100644 --- a/tests/cli/test_shell.py +++ b/tests/cli/test_shell.py @@ -1,4 +1,5 @@ """CLI tests for tmuxp shell.""" + import contextlib import io import pathlib diff --git a/tests/constants.py b/tests/constants.py index eff81eced5a..ff3cc8bd0f4 100644 --- a/tests/constants.py +++ b/tests/constants.py @@ -1,4 +1,5 @@ """Constant variables for tmuxp tests.""" + import pathlib TESTS_PATH = pathlib.Path(__file__).parent diff --git a/tests/fixtures/__init__.py b/tests/fixtures/__init__.py index 32c2ed61025..fd26c7acab8 100644 --- a/tests/fixtures/__init__.py +++ b/tests/fixtures/__init__.py @@ -1,2 +1,3 @@ """Fixture test data for tmuxp.""" + from . import utils diff --git a/tests/fixtures/import_teamocil/__init__.py b/tests/fixtures/import_teamocil/__init__.py index 5367bcbc497..cb19a6253be 100644 --- a/tests/fixtures/import_teamocil/__init__.py +++ b/tests/fixtures/import_teamocil/__init__.py @@ -1,2 +1,3 @@ """Teamocil data fixtures for import_teamocil tests.""" + from . import layouts, test1, test2, test3, test4 diff --git a/tests/fixtures/import_teamocil/layouts.py b/tests/fixtures/import_teamocil/layouts.py index 35e0cc5e3ed..cf114f4eceb 100644 --- a/tests/fixtures/import_teamocil/layouts.py +++ b/tests/fixtures/import_teamocil/layouts.py @@ -1,4 +1,5 @@ """Teamocil data fixtures for import_teamocil tests, for layout testing.""" + from .. import utils as test_utils teamocil_yaml_file = test_utils.get_workspace_file("import_teamocil/layouts.yaml") diff --git a/tests/fixtures/import_teamocil/test1.py b/tests/fixtures/import_teamocil/test1.py index a10a3c77a4e..e1ad1c03791 100644 --- a/tests/fixtures/import_teamocil/test1.py +++ b/tests/fixtures/import_teamocil/test1.py @@ -1,4 +1,5 @@ """Teamocil data fixtures for import_teamocil tests, 1st test.""" + from .. import utils as test_utils teamocil_yaml = test_utils.read_workspace_file("import_teamocil/test1.yaml") diff --git a/tests/fixtures/import_teamocil/test2.py b/tests/fixtures/import_teamocil/test2.py index 2100641c4fd..d6c259375d7 100644 --- a/tests/fixtures/import_teamocil/test2.py +++ b/tests/fixtures/import_teamocil/test2.py @@ -1,4 +1,5 @@ """Teamocil data fixtures for import_teamocil tests, 2nd test.""" + from .. import utils as test_utils teamocil_yaml = test_utils.read_workspace_file("import_teamocil/test2.yaml") diff --git a/tests/fixtures/import_teamocil/test3.py b/tests/fixtures/import_teamocil/test3.py index 468a4919821..13f56021dec 100644 --- a/tests/fixtures/import_teamocil/test3.py +++ b/tests/fixtures/import_teamocil/test3.py @@ -1,4 +1,5 @@ """Teamocil data fixtures for import_teamocil tests, 3rd test.""" + from .. import utils as test_utils teamocil_yaml = test_utils.read_workspace_file("import_teamocil/test3.yaml") diff --git a/tests/fixtures/import_teamocil/test4.py b/tests/fixtures/import_teamocil/test4.py index 9bb42841821..686d0f76473 100644 --- a/tests/fixtures/import_teamocil/test4.py +++ b/tests/fixtures/import_teamocil/test4.py @@ -1,4 +1,5 @@ """Teamocil data fixtures for import_teamocil tests, 4th test.""" + from .. import utils as test_utils teamocil_yaml = test_utils.read_workspace_file("import_teamocil/test4.yaml") diff --git a/tests/fixtures/import_tmuxinator/__init__.py b/tests/fixtures/import_tmuxinator/__init__.py index dc711b29b7b..1ff1cafde3c 100644 --- a/tests/fixtures/import_tmuxinator/__init__.py +++ b/tests/fixtures/import_tmuxinator/__init__.py @@ -1,2 +1,3 @@ """Tmuxinator data fixtures for import_tmuxinator tests.""" + from . import test1, test2, test3 diff --git a/tests/fixtures/import_tmuxinator/test1.py b/tests/fixtures/import_tmuxinator/test1.py index c9e3569d33d..96de3899604 100644 --- a/tests/fixtures/import_tmuxinator/test1.py +++ b/tests/fixtures/import_tmuxinator/test1.py @@ -1,4 +1,5 @@ """Tmuxinator data fixtures for import_tmuxinator tests, 1st dataset.""" + from .. import utils as test_utils tmuxinator_yaml = test_utils.read_workspace_file("import_tmuxinator/test1.yaml") diff --git a/tests/fixtures/import_tmuxinator/test2.py b/tests/fixtures/import_tmuxinator/test2.py index d07372f3ca8..48e95d7ee4d 100644 --- a/tests/fixtures/import_tmuxinator/test2.py +++ b/tests/fixtures/import_tmuxinator/test2.py @@ -1,4 +1,5 @@ """Tmuxinator data fixtures for import_tmuxinator tests, 2nd dataset.""" + from .. import utils as test_utils tmuxinator_yaml = test_utils.read_workspace_file("import_tmuxinator/test2.yaml") diff --git a/tests/fixtures/import_tmuxinator/test3.py b/tests/fixtures/import_tmuxinator/test3.py index aeca07b82c9..39c75d0ce73 100644 --- a/tests/fixtures/import_tmuxinator/test3.py +++ b/tests/fixtures/import_tmuxinator/test3.py @@ -1,4 +1,5 @@ """Tmuxinator data fixtures for import_tmuxinator tests, 3rd dataset.""" + from .. import utils as test_utils tmuxinator_yaml = test_utils.read_workspace_file("import_tmuxinator/test3.yaml") diff --git a/tests/fixtures/pluginsystem/__init__.py b/tests/fixtures/pluginsystem/__init__.py index 3e3bca44393..e4aa4bbf4dd 100644 --- a/tests/fixtures/pluginsystem/__init__.py +++ b/tests/fixtures/pluginsystem/__init__.py @@ -1 +1 @@ -""""Test data for tmuxp plugin system.""" +"""Test data for tmuxp plugin system.""" diff --git a/tests/fixtures/pluginsystem/partials/_types.py b/tests/fixtures/pluginsystem/partials/_types.py index 460c71375de..d275ad89825 100644 --- a/tests/fixtures/pluginsystem/partials/_types.py +++ b/tests/fixtures/pluginsystem/partials/_types.py @@ -9,6 +9,7 @@ ... from tmuxp.fixtures.pluginsystem.partials._types import PluginConfigSchema ... """ + import typing as t from typing_extensions import NotRequired, TypedDict diff --git a/tests/fixtures/pluginsystem/partials/all_pass.py b/tests/fixtures/pluginsystem/partials/all_pass.py index 19cbeb23f86..3f62ca291da 100644 --- a/tests/fixtures/pluginsystem/partials/all_pass.py +++ b/tests/fixtures/pluginsystem/partials/all_pass.py @@ -1,4 +1,5 @@ """Tmuxp test plugin with version constraints guaranteed to pass.""" + import typing as t from .test_plugin_helpers import MyTestTmuxpPlugin diff --git a/tests/fixtures/pluginsystem/partials/libtmux_version_fail.py b/tests/fixtures/pluginsystem/partials/libtmux_version_fail.py index b8a18466a5d..fa9f7b0362b 100644 --- a/tests/fixtures/pluginsystem/partials/libtmux_version_fail.py +++ b/tests/fixtures/pluginsystem/partials/libtmux_version_fail.py @@ -1,4 +1,5 @@ """Fixtures for tmuxp plugins for libtmux version exceptions.""" + import typing as t from .test_plugin_helpers import MyTestTmuxpPlugin diff --git a/tests/fixtures/pluginsystem/partials/test_plugin_helpers.py b/tests/fixtures/pluginsystem/partials/test_plugin_helpers.py index 935e029bfa6..5c27dce976e 100644 --- a/tests/fixtures/pluginsystem/partials/test_plugin_helpers.py +++ b/tests/fixtures/pluginsystem/partials/test_plugin_helpers.py @@ -1,4 +1,5 @@ """Tmuxp test plugin for asserting version constraints.""" + import typing as t from tmuxp.plugin import TmuxpPlugin diff --git a/tests/fixtures/pluginsystem/partials/tmux_version_fail.py b/tests/fixtures/pluginsystem/partials/tmux_version_fail.py index b30f3c40829..7868010ee91 100644 --- a/tests/fixtures/pluginsystem/partials/tmux_version_fail.py +++ b/tests/fixtures/pluginsystem/partials/tmux_version_fail.py @@ -1,4 +1,5 @@ """Fixtures for tmuxp plugins for tmux version exceptions.""" + import typing as t from .test_plugin_helpers import MyTestTmuxpPlugin diff --git a/tests/fixtures/pluginsystem/partials/tmuxp_version_fail.py b/tests/fixtures/pluginsystem/partials/tmuxp_version_fail.py index ed99d406b66..4ee7482474f 100644 --- a/tests/fixtures/pluginsystem/partials/tmuxp_version_fail.py +++ b/tests/fixtures/pluginsystem/partials/tmuxp_version_fail.py @@ -1,4 +1,5 @@ """Fixtures for tmuxp plugins for tmuxp version exceptions.""" + import typing as t from .test_plugin_helpers import MyTestTmuxpPlugin diff --git a/tests/fixtures/pluginsystem/plugins/tmuxp_test_plugin_awf/tmuxp_test_plugin_awf/plugin.py b/tests/fixtures/pluginsystem/plugins/tmuxp_test_plugin_awf/tmuxp_test_plugin_awf/plugin.py index e2a77e8c662..edab6ed6868 100644 --- a/tests/fixtures/pluginsystem/plugins/tmuxp_test_plugin_awf/tmuxp_test_plugin_awf/plugin.py +++ b/tests/fixtures/pluginsystem/plugins/tmuxp_test_plugin_awf/tmuxp_test_plugin_awf/plugin.py @@ -1,4 +1,5 @@ """Tmuxp example plugin for after_window_finished.""" + import typing as t from tmuxp.plugin import TmuxpPlugin diff --git a/tests/fixtures/pluginsystem/plugins/tmuxp_test_plugin_bs/tmuxp_test_plugin_bs/plugin.py b/tests/fixtures/pluginsystem/plugins/tmuxp_test_plugin_bs/tmuxp_test_plugin_bs/plugin.py index bfc7175a733..6da3e3ae2b4 100644 --- a/tests/fixtures/pluginsystem/plugins/tmuxp_test_plugin_bs/tmuxp_test_plugin_bs/plugin.py +++ b/tests/fixtures/pluginsystem/plugins/tmuxp_test_plugin_bs/tmuxp_test_plugin_bs/plugin.py @@ -1,4 +1,5 @@ """Tmux plugin that runs before_script, if it is declared in configuration.""" + import typing as t from tmuxp.plugin import TmuxpPlugin diff --git a/tests/fixtures/pluginsystem/plugins/tmuxp_test_plugin_bwb/tmuxp_test_plugin_bwb/plugin.py b/tests/fixtures/pluginsystem/plugins/tmuxp_test_plugin_bwb/tmuxp_test_plugin_bwb/plugin.py index cd2fb1e4f0e..fba2134e15d 100644 --- a/tests/fixtures/pluginsystem/plugins/tmuxp_test_plugin_bwb/tmuxp_test_plugin_bwb/plugin.py +++ b/tests/fixtures/pluginsystem/plugins/tmuxp_test_plugin_bwb/tmuxp_test_plugin_bwb/plugin.py @@ -1,4 +1,5 @@ """Tmuxp example plugin for before_worksplace_builder.""" + import typing as t from tmuxp.plugin import TmuxpPlugin diff --git a/tests/fixtures/pluginsystem/plugins/tmuxp_test_plugin_fail/tmuxp_test_plugin_fail/plugin.py b/tests/fixtures/pluginsystem/plugins/tmuxp_test_plugin_fail/tmuxp_test_plugin_fail/plugin.py index 454f1f5b05a..db0794abb65 100644 --- a/tests/fixtures/pluginsystem/plugins/tmuxp_test_plugin_fail/tmuxp_test_plugin_fail/plugin.py +++ b/tests/fixtures/pluginsystem/plugins/tmuxp_test_plugin_fail/tmuxp_test_plugin_fail/plugin.py @@ -1,4 +1,5 @@ """Tmuxp example plugin that fails on initialization.""" + import typing as t from tmuxp.plugin import TmuxpPlugin diff --git a/tests/fixtures/pluginsystem/plugins/tmuxp_test_plugin_owc/tmuxp_test_plugin_owc/plugin.py b/tests/fixtures/pluginsystem/plugins/tmuxp_test_plugin_owc/tmuxp_test_plugin_owc/plugin.py index add308db6ff..8c330a648c3 100644 --- a/tests/fixtures/pluginsystem/plugins/tmuxp_test_plugin_owc/tmuxp_test_plugin_owc/plugin.py +++ b/tests/fixtures/pluginsystem/plugins/tmuxp_test_plugin_owc/tmuxp_test_plugin_owc/plugin.py @@ -1,4 +1,5 @@ """Tmuxp example plugin for on_window_create.""" + import typing as t from tmuxp.plugin import TmuxpPlugin diff --git a/tests/fixtures/pluginsystem/plugins/tmuxp_test_plugin_r/tmuxp_test_plugin_r/plugin.py b/tests/fixtures/pluginsystem/plugins/tmuxp_test_plugin_r/tmuxp_test_plugin_r/plugin.py index b206c5da701..373e9e9580f 100644 --- a/tests/fixtures/pluginsystem/plugins/tmuxp_test_plugin_r/tmuxp_test_plugin_r/plugin.py +++ b/tests/fixtures/pluginsystem/plugins/tmuxp_test_plugin_r/tmuxp_test_plugin_r/plugin.py @@ -1,4 +1,5 @@ """Tmuxp example plugin for reattaching session.""" + import typing as t from tmuxp.plugin import TmuxpPlugin diff --git a/tests/fixtures/structures.py b/tests/fixtures/structures.py index cd236ad2184..4e6ca17c03f 100644 --- a/tests/fixtures/structures.py +++ b/tests/fixtures/structures.py @@ -1,4 +1,5 @@ """Typings / structures for tmuxp fixtures.""" + import dataclasses import typing as t diff --git a/tests/fixtures/utils.py b/tests/fixtures/utils.py index 955ebc6c569..3752089264f 100644 --- a/tests/fixtures/utils.py +++ b/tests/fixtures/utils.py @@ -1,4 +1,5 @@ """Utility functions for tmuxp fixtures.""" + import pathlib import typing as t diff --git a/tests/fixtures/workspace/__init__.py b/tests/fixtures/workspace/__init__.py index 632b47fbeb9..e80a60fabdf 100644 --- a/tests/fixtures/workspace/__init__.py +++ b/tests/fixtures/workspace/__init__.py @@ -1,4 +1,5 @@ """Workspace data fixtures for tmuxp tests.""" + from . import ( expand1, expand2, diff --git a/tests/fixtures/workspace/expand1.py b/tests/fixtures/workspace/expand1.py index 187111d86e0..75db0e7f487 100644 --- a/tests/fixtures/workspace/expand1.py +++ b/tests/fixtures/workspace/expand1.py @@ -1,4 +1,5 @@ """Examples of expansion of tmuxp configurations from shorthand style.""" + import pathlib import typing as t diff --git a/tests/fixtures/workspace/expand2.py b/tests/fixtures/workspace/expand2.py index 0d0fd6b7cf7..c1a5d25d38d 100644 --- a/tests/fixtures/workspace/expand2.py +++ b/tests/fixtures/workspace/expand2.py @@ -1,4 +1,5 @@ """YAML examples of expansion of tmuxp configurations from shorthand style.""" + import pathlib from .. import utils as test_utils diff --git a/tests/fixtures/workspace/expand_blank.py b/tests/fixtures/workspace/expand_blank.py index d1fbd2e5504..a9bbc70e516 100644 --- a/tests/fixtures/workspace/expand_blank.py +++ b/tests/fixtures/workspace/expand_blank.py @@ -1,4 +1,5 @@ """Expected expanded configuration for empty workspace panes.""" + expected = { "session_name": "Blank pane test", "windows": [ diff --git a/tests/fixtures/workspace/sample_workspace.py b/tests/fixtures/workspace/sample_workspace.py index f796e8bd035..e3bf60347bf 100644 --- a/tests/fixtures/workspace/sample_workspace.py +++ b/tests/fixtures/workspace/sample_workspace.py @@ -1,4 +1,5 @@ """Example workspace fixture for tmuxp WorkspaceBuilder.""" + sample_workspace_dict = { "session_name": "sample workspace", "start_directory": "~", diff --git a/tests/fixtures/workspace/shell_command_before.py b/tests/fixtures/workspace/shell_command_before.py index e98a51839e6..a0f80510c5d 100644 --- a/tests/fixtures/workspace/shell_command_before.py +++ b/tests/fixtures/workspace/shell_command_before.py @@ -1,4 +1,5 @@ """Test fixture for tmuxp to demonstrate shell_command_before.""" + import pathlib import typing as t diff --git a/tests/fixtures/workspace/shell_command_before_session.py b/tests/fixtures/workspace/shell_command_before_session.py index 615ec45b493..9dccd9f930d 100644 --- a/tests/fixtures/workspace/shell_command_before_session.py +++ b/tests/fixtures/workspace/shell_command_before_session.py @@ -1,4 +1,5 @@ """Tests shell_command_before configuration.""" + from .. import utils as test_utils before = test_utils.read_workspace_file("workspace/shell_command_before_session.yaml") diff --git a/tests/fixtures/workspace/trickle.py b/tests/fixtures/workspace/trickle.py index 68fa31a9df6..afb138081ea 100644 --- a/tests/fixtures/workspace/trickle.py +++ b/tests/fixtures/workspace/trickle.py @@ -1,4 +1,5 @@ """Test data for tmuxp workspace fixture to demo object tree inheritance.""" + before = { # shell_command_before is string in some areas "session_name": "sample workspace", "start_directory": "/var", diff --git a/tests/test_plugin.py b/tests/test_plugin.py index 023ee332189..8bd3fc77d51 100644 --- a/tests/test_plugin.py +++ b/tests/test_plugin.py @@ -1,4 +1,5 @@ """Tests for tmuxp plugin API.""" + import pytest from tmuxp.exc import TmuxpPluginException diff --git a/tests/test_shell.py b/tests/test_shell.py index 4fe574d4287..c8cf67b8f94 100644 --- a/tests/test_shell.py +++ b/tests/test_shell.py @@ -1,4 +1,5 @@ """Tests for tmuxp shell module.""" + from tmuxp import shell diff --git a/tests/test_util.py b/tests/test_util.py index d8a24527ad9..8884734813b 100644 --- a/tests/test_util.py +++ b/tests/test_util.py @@ -1,4 +1,5 @@ """Tests for tmuxp's utility functions.""" + import pytest from libtmux.server import Server diff --git a/tests/tests/test_helpers.py b/tests/tests/test_helpers.py index 22b04d87b1b..1b9658ba816 100644 --- a/tests/tests/test_helpers.py +++ b/tests/tests/test_helpers.py @@ -1,4 +1,5 @@ """Tests for tmuxp's helper and utility functions.""" + import pytest from libtmux.server import Server from libtmux.test import get_test_session_name, temp_session diff --git a/tests/workspace/conftest.py b/tests/workspace/conftest.py index 444c5e37401..11af35f89f4 100644 --- a/tests/workspace/conftest.py +++ b/tests/workspace/conftest.py @@ -1,4 +1,5 @@ """Pytest configuration for tmuxp workspace tests.""" + import types import pytest diff --git a/tests/workspace/test_builder.py b/tests/workspace/test_builder.py index dc94ffcfc93..875861f0f9b 100644 --- a/tests/workspace/test_builder.py +++ b/tests/workspace/test_builder.py @@ -1,4 +1,5 @@ """Test for tmuxp workspace builder.""" + import functools import os import pathlib diff --git a/tests/workspace/test_config.py b/tests/workspace/test_config.py index 71e4f8e8c26..222a85d7144 100644 --- a/tests/workspace/test_config.py +++ b/tests/workspace/test_config.py @@ -1,4 +1,5 @@ """Test for tmuxp configuration import, inlining, expanding and export.""" + import pathlib import typing as t diff --git a/tests/workspace/test_finder.py b/tests/workspace/test_finder.py index 29de22288c4..0bf3de9ae6f 100644 --- a/tests/workspace/test_finder.py +++ b/tests/workspace/test_finder.py @@ -1,4 +1,5 @@ """Test config file searching for tmuxp.""" + import argparse import pathlib import typing as t diff --git a/tests/workspace/test_freezer.py b/tests/workspace/test_freezer.py index 9a1e897f5ff..22088003764 100644 --- a/tests/workspace/test_freezer.py +++ b/tests/workspace/test_freezer.py @@ -1,4 +1,5 @@ """Tests tmux session freezing functionality for tmuxp.""" + import pathlib import time import typing diff --git a/tests/workspace/test_import_teamocil.py b/tests/workspace/test_import_teamocil.py index f945130bb4a..3d9dc830d07 100644 --- a/tests/workspace/test_import_teamocil.py +++ b/tests/workspace/test_import_teamocil.py @@ -1,4 +1,5 @@ """Test for tmuxp teamocil configuration.""" + import typing as t import pytest diff --git a/tests/workspace/test_import_tmuxinator.py b/tests/workspace/test_import_tmuxinator.py index b7052fc1677..81703b28d29 100644 --- a/tests/workspace/test_import_tmuxinator.py +++ b/tests/workspace/test_import_tmuxinator.py @@ -1,4 +1,5 @@ """Test for tmuxp tmuxinator configuration.""" + import typing as t import pytest