Skip to content

Commit 52cbcb3

Browse files
committed
Change fallback version to CANNOT_BUILD_WITHOUT_GIT_DIR
1 parent 915951c commit 52cbcb3

File tree

2 files changed

+15
-15
lines changed

2 files changed

+15
-15
lines changed

pyproject_toml_builder.py

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -26,11 +26,11 @@
2626

2727
from find_packages import iterate_dirnames
2828

29-
BUILDER_SECTION_NAME = "wipac:cicd_setup_builder"
30-
GENERATED_STR = f"generated by {BUILDER_SECTION_NAME}"
3129
REAMDE_BADGES_START_DELIMITER = "<!--- Top of README Badges (automated) --->"
3230
REAMDE_BADGES_END_DELIMITER = "<!--- End of README Badges (automated) --->"
3331

32+
SCM_FALLBACK_VERSION = "CANNOT_BUILD_WITHOUT_GIT_DIR"
33+
3434
LOGGER = logging.getLogger("setup-builder")
3535

3636
TOMLDocumentTypeHint = Any # TOMLDocument & mypy aren't friendly, so it's either this or a million 'ignore' comments
@@ -498,11 +498,11 @@ def __init__(
498498
toml_dict["tool"]["setuptools_scm"] = {}
499499
self._inline_dont_change_this_comment(toml_dict["tool"]["setuptools_scm"])
500500
# Loud sentinel if SCM/tags are missing
501-
toml_dict["tool"]["setuptools_scm"]["fallback_version"] = "UNTAGGED"
501+
toml_dict["tool"]["setuptools_scm"]["fallback_version"] = SCM_FALLBACK_VERSION
502502
comment = (
503-
" # only used when SCM metadata is completely unavailable (e.g., no '.git/'). "
504-
"NOTE: in shallow clones without git tags, setuptools-scm will still infer a "
505-
"commit-based version (like '0.1.dev1+g79c9b4b'); this value will NOT be used in that case."
503+
" # used when SCM metadata is missing (no '.git/') "
504+
"if '.git/' exists but does not contain tags, a "
505+
"commit-based version (like '0.1.dev1+g79c9b4b') will be used instead."
506506
)
507507
toml_dict["tool"]["setuptools_scm"]["fallback_version"].trivia.comment = comment
508508

tests/test_pyproject_toml_builder.py

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -275,7 +275,7 @@ def test_00_minimum_input(directory: Path, requests_mock: Any) -> None:
275275
**NO_PYPI_VANILLA_PROJECT_KEYVALS_OUT, # the true minimum is more vanilla than vanilla)
276276
},
277277
"tool": {
278-
"setuptools_scm": {"fallback_version": "UNTAGGED"},
278+
"setuptools_scm": {"fallback_version": "CANNOT_BUILD_WITHOUT_GIT_DIR"},
279279
"setuptools": {
280280
"package-data": {"*": ["py.typed"]},
281281
"packages": {"find": {"exclude": EXCLUDE_DIRS, "namespaces": False}},
@@ -332,7 +332,7 @@ def test_01_minimum_input_w_pypi(directory: Path, requests_mock: Any) -> None:
332332
**PYPI_URLS_KEYVALS,
333333
},
334334
"tool": {
335-
"setuptools_scm": {"fallback_version": "UNTAGGED"},
335+
"setuptools_scm": {"fallback_version": "CANNOT_BUILD_WITHOUT_GIT_DIR"},
336336
"setuptools": {
337337
"package-data": {"*": ["py.typed"]},
338338
"packages": {"find": {"exclude": EXCLUDE_DIRS, "namespaces": False}},
@@ -409,7 +409,7 @@ def test_10_keywords(directory: Path, requests_mock: Any) -> None:
409409
**PYPI_URLS_KEYVALS,
410410
},
411411
"tool": {
412-
"setuptools_scm": {"fallback_version": "UNTAGGED"},
412+
"setuptools_scm": {"fallback_version": "CANNOT_BUILD_WITHOUT_GIT_DIR"},
413413
"setuptools": {
414414
"package-data": {"*": ["py.typed"]},
415415
"packages": {"find": {"exclude": EXCLUDE_DIRS, "namespaces": False}},
@@ -483,7 +483,7 @@ def test_20_python_max(directory: Path, requests_mock: Any) -> None:
483483
**PYPI_URLS_KEYVALS,
484484
},
485485
"tool": {
486-
"setuptools_scm": {"fallback_version": "UNTAGGED"},
486+
"setuptools_scm": {"fallback_version": "CANNOT_BUILD_WITHOUT_GIT_DIR"},
487487
"setuptools": {
488488
"package-data": {"*": ["py.typed"]},
489489
"packages": {"find": {"exclude": EXCLUDE_DIRS, "namespaces": False}},
@@ -557,7 +557,7 @@ def test_30_package_dirs__single(directory: Path, requests_mock: Any) -> None:
557557
**PYPI_URLS_KEYVALS,
558558
},
559559
"tool": {
560-
"setuptools_scm": {"fallback_version": "UNTAGGED"},
560+
"setuptools_scm": {"fallback_version": "CANNOT_BUILD_WITHOUT_GIT_DIR"},
561561
"setuptools": {
562562
"package-data": {"*": ["py.typed"]},
563563
"packages": {
@@ -634,7 +634,7 @@ def test_34_package_dirs__multi_autoname__no_pypi(
634634
],
635635
},
636636
"tool": {
637-
"setuptools_scm": {"fallback_version": "UNTAGGED"},
637+
"setuptools_scm": {"fallback_version": "CANNOT_BUILD_WITHOUT_GIT_DIR"},
638638
"setuptools": {
639639
"package-data": {"*": ["py.typed"]},
640640
"packages": {
@@ -725,7 +725,7 @@ def test_35_package_dirs__multi(directory: Path, requests_mock: Any) -> None:
725725
**PYPI_URLS_KEYVALS,
726726
},
727727
"tool": {
728-
"setuptools_scm": {"fallback_version": "UNTAGGED"},
728+
"setuptools_scm": {"fallback_version": "CANNOT_BUILD_WITHOUT_GIT_DIR"},
729729
"setuptools": {
730730
"package-data": {"*": ["py.typed"]},
731731
"packages": {
@@ -882,7 +882,7 @@ def test_40_extra_stuff(directory: Path, requests_mock: Any) -> None:
882882
**PYPI_URLS_KEYVALS,
883883
},
884884
"tool": {
885-
"setuptools_scm": {"fallback_version": "UNTAGGED"},
885+
"setuptools_scm": {"fallback_version": "CANNOT_BUILD_WITHOUT_GIT_DIR"},
886886
"setuptools": {
887887
"package-data": {"*": ["py.typed"]},
888888
"packages": {"find": {"exclude": EXCLUDE_DIRS, "namespaces": False}},
@@ -1017,7 +1017,7 @@ def test_80_auto_mypy_option(directory: Path, requests_mock: Any) -> None:
10171017
},
10181018
},
10191019
"tool": {
1020-
"setuptools_scm": {"fallback_version": "UNTAGGED"},
1020+
"setuptools_scm": {"fallback_version": "CANNOT_BUILD_WITHOUT_GIT_DIR"},
10211021
"setuptools": {
10221022
"package-data": {"*": ["py.typed"]},
10231023
"packages": {"find": {"exclude": EXCLUDE_DIRS, "namespaces": False}},

0 commit comments

Comments
 (0)