Skip to content

Feature: add option to omit tagging #341

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

Merged
danth merged 2 commits into from
Jun 8, 2021
Merged

Feature: add option to omit tagging #341

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7869874
chore: add tag commit option
jacksbox Jun 8, 2021
f615973
test: tag commit option
jacksbox Jun 8, 2021
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: 3 additions & 1 deletion semantic_release/cli.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -182,7 +182,8 @@ def bump_version(new_version, level_bump):
config.get("version_source") == "commit",
):
commit_new_version(new_version)
tag_new_version(new_version)
if config.get("version_source") == "tag" or config.get("tag_commit"):
tag_new_version(new_version)

logger.info(f"Bumping with a {level_bump} version to {new_version}")

Expand Down Expand Up @@ -377,6 +378,7 @@ def main(**kwargs):
"major_on_zero",
"upload_to_pypi",
"version_source",
"no_git_tag",
]:
obj[key] = config.get(key)
logger.debug(f"Main config: {obj}")
Expand Down
1 change: 1 addition & 0 deletions semantic_release/defaults.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,3 +23,4 @@ changelog_sections=feature,fix,breaking,documentation,performance,:boom:,:sparkl
changelog_file=CHANGELOG.md
changelog_placeholder=<!--next-version-placeholder-->
changelog_scope=true
tag_commit=true
1 change: 1 addition & 0 deletions semantic_release/settings.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@ def _config_from_ini(paths):
"remove_dist",
"upload_to_pypi",
"upload_to_release",
"tag_commit",
}

# Iterate through the sections so that default values are applied
Expand Down
33 changes: 31 additions & 2 deletions tests/test_cli.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,10 +96,9 @@ def test_version_by_tag_should_call_correct_functions(mocker):
mocker.patch(
"semantic_release.cli.config.get",
wrapped_config_get(
version_source="tag",
version_source="tag"
),
)
mocker.patch("semantic_release.cli.config.get", lambda *x, **y: False)
mock_set_new_version = mocker.patch("semantic_release.cli.set_new_version")
mock_tag_new_version = mocker.patch("semantic_release.cli.tag_new_version")
mock_new_version = mocker.patch(
Expand All @@ -120,6 +119,36 @@ def test_version_by_tag_should_call_correct_functions(mocker):
mock_set_new_version.assert_called_once_with("2.0.0")
mock_tag_new_version.assert_called_once_with("2.0.0")

def test_version_by_commit_without_tag_should_call_correct_functions(mocker):
mocker.patch(
"semantic_release.cli.config.get",
wrapped_config_get(
version_source="commit",
tag_commit=False
),
)
mock_set_new_version = mocker.patch("semantic_release.cli.set_new_version")
mock_tag_new_version = mocker.patch("semantic_release.cli.tag_new_version")
mock_commit_new_version = mocker.patch("semantic_release.cli.commit_new_version")
mock_new_version = mocker.patch(
"semantic_release.cli.get_new_version", return_value="2.0.0"
)
mock_evaluate_bump = mocker.patch(
"semantic_release.cli.evaluate_version_bump", return_value="major"
)
mock_current_version = mocker.patch(
"semantic_release.cli.get_current_version", return_value="1.2.3"
)

version()

mock_current_version.assert_called_once_with()
mock_evaluate_bump.assert_called_once_with("1.2.3", None)
mock_new_version.assert_called_once_with("1.2.3", "major")
mock_set_new_version.assert_called_once_with("2.0.0")
mock_commit_new_version.assert_called_once_with("2.0.0")
assert not mock_tag_new_version.called


def test_force_major(mocker, runner):
mock_version = mocker.patch("semantic_release.cli.version")
Expand Down