Skip to content

fix: regex patterns for dependency version handling in TOML #840

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
mdqst wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix: regex patterns for dependency version handling in TOML #840

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
8 changes: 4 additions & 4 deletions python/scripts/utils/dependency_version.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ def read_dependency_version(file_path: str, dependency_name: str) -> str:
with open(file_path, "r") as file:
content = file.read()

pattern = rf'^\s+"{dependency_name}>=([0-9]+\.[0-9]+\.[0-9]+),.*$'
pattern = rf'^\s*{re.escape(dependency_name)}\s*=\s*">=([0-9]+\.[0-9]+\.[0-9]+),.*"$'

for line in content.split("\n"):
match = re.match(pattern, line)
Expand All @@ -29,8 +29,8 @@ def write_dependency_version(file_path: str, dependency_name: str, version: str)
contents = file.read()

min_version, max_version = calculate_dependency_range(version)
pattern = rf'"{dependency_name}>=([0-9]+\.[0-9]+\.[0-9]+),<[^"]+"'
replacement = f'"{dependency_name}{min_version},{max_version}"'
pattern = rf'{re.escape(dependency_name)}\s*=\s*">=([0-9]+\.[0-9]+\.[0-9]+),<[^"]+"'
replacement = f'{dependency_name} = "{min_version},{max_version}"'

updated_content = re.sub(pattern, replacement, contents, flags=re.MULTILINE)

Expand Down Expand Up @@ -111,4 +111,4 @@ def write_dependency_version_legacy(file_path: str, dependency_name: str, versio
raise ValueError(f"Could not update legacy dependency {dependency_name} in {file_path}")

with open(file_path, "w") as file:
file.write("\n".join(new_lines))
file.write("\n".join(new_lines))
Loading