Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions setup.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,7 @@ setuptools_scm.version_scheme =
guess-next-dev = setuptools_scm.version:guess_next_dev_version
post-release = setuptools_scm.version:postrelease_version
python-simplified-semver = setuptools_scm.version:simplified_semver_version
release-branch-semver = setuptools_scm.version:release_branch_semver_version

setuptools_scm.local_scheme =
node-and-date = setuptools_scm.version:get_local_node_and_date
Expand Down
12 changes: 11 additions & 1 deletion src/setuptools_scm/version.py
Original file line number Diff line number Diff line change
Expand Up @@ -267,7 +267,7 @@ def simplified_semver_version(version):
)


def release_branch_semver(version):
def release_branch_semver_version(version):
if version.exact:
return version.format_with("{tag}")
if version.branch is not None:
Expand All @@ -286,6 +286,16 @@ def release_branch_semver(version):
return version.format_next_version(guess_next_simple_semver, retain=SEMVER_MINOR)


def release_branch_semver(version):
warnings.warn(
"release_branch_semver is deprecated and will be removed in future. "
+ "Use release_branch_semver_version instead",
category=DeprecationWarning,
stacklevel=2,
)
return release_branch_semver_version(version)


def _format_local_with_time(version, time_format):

if version.exact or version.node is None:
Expand Down
4 changes: 2 additions & 2 deletions testing/test_version.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
from setuptools_scm.version import (
meta,
simplified_semver_version,
release_branch_semver,
release_branch_semver_version,
tags_to_versions,
)

Expand Down Expand Up @@ -80,7 +80,7 @@ def test_next_semver(version, expected_next):
],
)
def test_next_release_branch_semver(version, expected_next):
computed = release_branch_semver(version)
computed = release_branch_semver_version(version)
assert computed == expected_next


Expand Down