Skip to content

Commit f1e03f5

Browse files
committed
Check version_callback option before checking a tag presence
1 parent 519d676 commit f1e03f5

File tree

2 files changed

+8
-3
lines changed

2 files changed

+8
-3
lines changed

CHANGELOG.rst

+5
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,11 @@ Changelog
2222

2323
Remove all non-numeric symbols from version prefix, not just ``v``
2424

25+
.. change::
26+
:tags: core, feature
27+
28+
Check :ref:`version-callback-option` option before checking a tag presence
29+
2530
1.9
2631
----
2732

setuptools_git_versioning.py

+3-3
Original file line numberDiff line numberDiff line change
@@ -383,16 +383,16 @@ def version_from_git(
383383
if line.startswith("Version:"):
384384
return line[8:].strip()
385385

386-
from_file = False
387-
tag = get_tag(sort_by=sort_by)
388-
389386
if version_callback is not None:
390387
if version_file is not None:
391388
raise ValueError(
392389
"Either `version_file` or `version_callback` can be passed, but not both at the same time",
393390
)
394391
return get_version_from_callback(version_callback, package_name)
395392

393+
from_file = False
394+
tag = get_tag(sort_by=sort_by)
395+
396396
if tag is None:
397397
if version_file is None or not os.path.exists(version_file):
398398
return starting_version

0 commit comments

Comments
 (0)