diff --git a/robotidy/version.py b/robotidy/version.py index b80decf2..dfdbb7a0 100644 --- a/robotidy/version.py +++ b/robotidy/version.py @@ -1 +1 @@ -__version__ = "4.17.0" +__version__ = "4.18.0" diff --git a/setup.py b/setup.py index a01cd62b..411076f1 100644 --- a/setup.py +++ b/setup.py @@ -42,7 +42,7 @@ python_requires=">=3.8", install_requires=[ "robotframework>=4.0", - "click==8.1.*", + "click>=8.1", "colorama>=0.4.3", "pathspec>=0.9.0", "tomli>=2.0", diff --git a/tests/atest/__init__.py b/tests/atest/__init__.py index a37ce9ce..4c87019d 100644 --- a/tests/atest/__init__.py +++ b/tests/atest/__init__.py @@ -6,7 +6,6 @@ from pathlib import Path import pytest -from click.testing import CliRunner from packaging import version from packaging.specifiers import SpecifierSet from rich.console import Console @@ -14,6 +13,7 @@ from robotidy.cli import cli from robotidy.utils.misc import decorate_diff_with_color +from tests.utils import cli_runner VERSION_MATRIX = {"ReplaceReturns": 5, "InlineIf": 5, "ReplaceBreakContinue": 5, "Translate": 6, "ReplaceWithVAR": 7} ROBOT_VERSION = version.parse(RF_VERSION) @@ -75,7 +75,7 @@ def run_tidy( ): if not self.enabled_in_version(target_version): pytest.skip(f"Test enabled only for RF {target_version}") - runner = CliRunner(mix_stderr=False) + runner = cli_runner() output_path = str(self.TRANSFORMERS_DIR / "actual" / source) arguments = ["--output", output_path] if not_modified: @@ -117,7 +117,7 @@ class MultipleConfigsTest: ROOT_DIR = Path(__file__).parent / "configuration_files" def run_tidy(self, tmpdir, args: list[str] | None = None, exit_code: int = 0, not_modified: bool = False): - runner = CliRunner(mix_stderr=False) + runner = cli_runner() temporary_dir = tmpdir / self.TEST_DIR shutil.copytree(self.ROOT_DIR / self.TEST_DIR / "source", temporary_dir) arguments = [] diff --git a/tests/e2e/test_transform_stability.py b/tests/e2e/test_transform_stability.py index 08397bc5..10efc1b8 100644 --- a/tests/e2e/test_transform_stability.py +++ b/tests/e2e/test_transform_stability.py @@ -5,11 +5,11 @@ from pathlib import Path import pytest -from click.testing import CliRunner from robotidy.cli import cli from robotidy.transformers import TransformConfigMap, load_transformers from robotidy.utils.misc import ROBOT_VERSION +from tests.utils import cli_runner RERUN_NEEDED_4 = { "RenameKeywords": {"run_keywords": 2, "disablers": 2}, @@ -78,7 +78,7 @@ def run_tidy(cmd, enable_disabled: bool): if enable_disabled: cmd = get_enable_disabled_config() + cmd - runner = CliRunner(mix_stderr=False) + runner = cli_runner() return runner.invoke(cli, cmd) diff --git a/tests/utest/utils.py b/tests/utest/utils.py index dd7ee5c8..b9f75b3c 100644 --- a/tests/utest/utils.py +++ b/tests/utest/utils.py @@ -2,9 +2,8 @@ from pathlib import Path -from click.testing import CliRunner - from robotidy.cli import cli +from tests.utils import cli_runner def run_tidy( @@ -14,7 +13,7 @@ def run_tidy( std_in: str | None = None, overwrite_input: bool = False, ): - runner = CliRunner(mix_stderr=False) + runner = cli_runner() arguments = args if args is not None else [] if not overwrite_input: if output: diff --git a/tests/utils.py b/tests/utils.py new file mode 100644 index 00000000..181975bd --- /dev/null +++ b/tests/utils.py @@ -0,0 +1,8 @@ +from click.testing import CliRunner + + +def cli_runner(): + try: + return CliRunner(mix_stderr=False) + except TypeError: + return CliRunner()