Skip to content

fix: workspace member with fixed version #1715

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

fix: workspace member with fixed version #1715

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
24 changes: 13 additions & 11 deletions commitizen/providers/cargo_provider.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
from pathlib import Path

import tomlkit
from tomlkit.items import Table

from commitizen.providers.base_provider import TomlProvider

Expand Down Expand Up @@ -41,11 +42,11 @@ def get(self, document: tomlkit.TOMLDocument) -> str:

def set(self, document: tomlkit.TOMLDocument, version: str) -> None:
try:
document["workspace"]["package"]["version"] = version # type: ignore[index]
document["package"]["version"] = version # type: ignore[index]
return
except tomlkit.exceptions.NonExistentKey:
...
document["package"]["version"] = version # type: ignore[index]
document["workspace"]["package"]["version"] = version # type: ignore[index]

def set_version(self, version: str) -> None:
super().set_version(version)
Expand All @@ -69,22 +70,23 @@ def set_lock_version(self, version: str) -> None:
excluded_workspace_members = cargo_toml_content.get("workspace", {}).get(
"exclude", []
)
members_inheriting = []
members_inheriting: list[str] = []

for member in workspace_members:
for path in glob.glob(member, recursive=True):
if matches_exclude(path, excluded_workspace_members):
continue
cargo_file = Path(path) / "Cargo.toml"
cargo_toml_content = tomlkit.parse(cargo_file.read_text())
try:
version_workspace = cargo_toml_content["package"]["version"][ # type: ignore[index]
"workspace"
]
if version_workspace is True:
package_name = cargo_toml_content["package"]["name"] # type: ignore[index]
members_inheriting.append(package_name)
except tomlkit.exceptions.NonExistentKey:

package_version = cargo_toml_content["package"]["version"] # type: ignore[index]
if (
isinstance(package_version, Table)
and package_version["workspace"] is True
):
package_name = cargo_toml_content["package"]["name"]
members_inheriting.append(package_name)
else:
continue

for i, package in enumerate(packages):
Expand Down
2 changes: 1 addition & 1 deletion tests/providers/test_cargo_provider.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
"content": """\
[package]
name = "member2"
version.workspace = "1.1.1"
version = "1.1.1"
""",
},
{
Expand Down