Skip to content

fix: handle VCS checkout CPython versions with trailing '+' in config #579

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
reginaldalfret wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix: handle VCS checkout CPython versions with trailing '+' in config #579

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/fixit/config.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@
import platform
import sys
from contextlib import contextmanager, ExitStack

from pathlib import Path
from types import ModuleType
from typing import (
Expand All @@ -35,6 +34,7 @@
from .format import FORMAT_STYLES
from .ftypes import (
Config,
current_python_version,
is_collection,
is_sequence,
Options,
Expand Down Expand Up @@ -415,7 +415,7 @@ def merge_configs(
enable_rules: Set[QualifiedRule] = {QualifiedRule("fixit.rules")}
disable_rules: Set[QualifiedRule] = set()
rule_options: RuleOptionsTable = {}
target_python_version: Optional[Version] = Version(platform.python_version())
target_python_version: Optional[Version] = current_python_version()
target_formatter: Optional[str] = None
output_format: OutputFormat = OutputFormat.fixit
output_template: str = ""
Expand Down
14 changes: 11 additions & 3 deletions src/fixit/ftypes.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -206,6 +206,16 @@ class LSPOptions:
debounce_interval: float = 0.5


def current_python_version() -> Version:
"""
Return the running Python version as a packaging Version object.

Strips any trailing '+' from VCS checkout builds (e.g. '3.13.15+')
to ensure compatibility with PEP 440 version parsing.
"""
return Version(platform.python_version().rstrip("+"))


@dataclass
class Config:
"""
Expand All @@ -226,9 +236,7 @@ class Config:
options: RuleOptionsTable = field(default_factory=dict)

# filtering criteria
python_version: Optional[Version] = field(
default_factory=lambda: Version(platform.python_version())
)
python_version: Optional[Version] = field(default_factory=current_python_version)
tags: Tags = field(default_factory=Tags)

# post-run processing
Expand Down
12 changes: 12 additions & 0 deletions src/fixit/tests/config.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
from textwrap import dedent
from typing import List, Sequence, Tuple, Type
from unittest import TestCase
from unittest.mock import patch

from click.testing import CliRunner

Expand Down Expand Up @@ -351,6 +352,17 @@ def test_merge_configs(self) -> None:
actual = config.merge_configs(target, raw_configs)
self.assertEqual(expected, actual)

def test_merge_configs_vcs_python_version(self) -> None:
target = self.tdp / "foo.py"
with patch("platform.python_version", return_value="3.13.15+"):
cfg = config.merge_configs(target, [])
self.assertEqual(cfg.python_version, Version("3.13.15"))

def test_config_default_vcs_python_version(self) -> None:
with patch("platform.python_version", return_value="3.13.15+"):
cfg = Config()
self.assertEqual(cfg.python_version, Version("3.13.15"))

def test_generate_config(self) -> None:
for name, path, root, options, expected in (
(
Expand Down