From 0fe1e8036d95d8c8750bf1f5c3fb419ea70ccc0f Mon Sep 17 00:00:00 2001 From: Zanie Date: Fri, 20 Oct 2023 14:58:12 -0500 Subject: [PATCH 1/2] Show ruff version on test start --- tests/conftest.py | 29 +++++++++++++++++++++++++---- 1 file changed, 25 insertions(+), 4 deletions(-) diff --git a/tests/conftest.py b/tests/conftest.py index 8c998d5..6a6115b 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -1,14 +1,14 @@ from pathlib import Path import pytest +import subprocess from packaging.version import Version -from ruff_lsp.server import _find_ruff_binary, _get_global_defaults, uris +from ruff_lsp.server import _find_ruff_binary, _get_global_defaults, uris, Executable from ruff_lsp.settings import WorkspaceSettings -@pytest.fixture(scope="session") -def ruff_version() -> Version: +def _get_ruff_executable() -> Executable: # Use the ruff-lsp directory as the workspace workspace_path = str(Path(__file__).parent.parent) @@ -19,4 +19,25 @@ def ruff_version() -> Version: workspace=uris.from_fs_path(workspace_path), ) - return _find_ruff_binary(settings, version_requirement=None).version + return _find_ruff_binary(settings, version_requirement=None) + + +@pytest.fixture(scope="session") +def ruff_version() -> Version: + return _get_ruff_executable().version + + +def pytest_report_header(config): + """Add ruff version to pytest header.""" + executable = _get_ruff_executable() + + # Display the long version if the executable supports it + try: + output = subprocess.check_output([executable.path, "version"]).decode().strip() + except subprocess.CalledProcessError: + output = ( + subprocess.check_output([executable.path, "--version"]).decode().strip() + ) + + version = output.replace("ruff ", "") + return [f"ruff: {version}"] From 326f4871117a0673fefb5168109cdfafdcb692aa Mon Sep 17 00:00:00 2001 From: Zanie Date: Fri, 20 Oct 2023 15:08:12 -0500 Subject: [PATCH 2/2] Add -verison suffix --- tests/conftest.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/conftest.py b/tests/conftest.py index 6a6115b..4565478 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -1,10 +1,10 @@ +import subprocess from pathlib import Path import pytest -import subprocess from packaging.version import Version -from ruff_lsp.server import _find_ruff_binary, _get_global_defaults, uris, Executable +from ruff_lsp.server import Executable, _find_ruff_binary, _get_global_defaults, uris from ruff_lsp.settings import WorkspaceSettings @@ -40,4 +40,4 @@ def pytest_report_header(config): ) version = output.replace("ruff ", "") - return [f"ruff: {version}"] + return [f"ruff-version: {version}"]