Skip to content

Commit 6a80a24

Browse files
committed
Add git_hash to dump_file function in addition to version
1 parent 8ac404a commit 6a80a24

File tree

2 files changed

+11
-5
lines changed

2 files changed

+11
-5
lines changed

src/setuptools_scm/_integration/dump_version.py

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
# file generated by setuptools-scm
1717
# don't change, don't track in version control
1818
19-
__all__ = ["__version__", "__version_tuple__", "version", "version_tuple"]
19+
__all__ = ["__version__", "__version_tuple__", "version", "version_tuple", "__sha__", "sha"]
2020
2121
TYPE_CHECKING = False
2222
if TYPE_CHECKING:
@@ -31,9 +31,13 @@
3131
__version__: str
3232
__version_tuple__: VERSION_TUPLE
3333
version_tuple: VERSION_TUPLE
34+
sha: str
35+
__sha__: str
3436
3537
__version__ = version = {version!r}
3638
__version_tuple__ = version_tuple = {version_tuple!r}
39+
40+
__sha__ = sha = {scm_version.node!r}
3741
""",
3842
".txt": "{version}",
3943
}

testing/test_basic_api.py

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
template = """\
2424
__version__ = version = {version!r}
2525
__version_tuple__ = version_tuple = {version_tuple!r}
26-
__sha__ = {scm_version.node!r}
26+
__sha__ = sha = {scm_version.node!r}
2727
"""
2828

2929

@@ -184,9 +184,11 @@ def read(name: str) -> str:
184184
scm_version = meta("1.0", distance=42, config=c)
185185
dump_version(tmp_path, version, "first.py", scm_version=scm_version)
186186
lines = read("first.py").splitlines()
187-
assert lines[-2:] == [
187+
assert lines[-4:] == [
188188
"__version__ = version = '1.0.dev42'",
189189
"__version_tuple__ = version_tuple = (1, 0, 'dev42')",
190+
"",
191+
"__sha__ = sha = None"
190192
]
191193

192194
version = "1.0.1+g4ac9d2c"
@@ -197,7 +199,7 @@ def read(name: str) -> str:
197199
lines = read("second.py").splitlines()
198200
assert "__version__ = version = '1.0.1+g4ac9d2c'" in lines
199201
assert "__version_tuple__ = version_tuple = (1, 0, 1, 'g4ac9d2c')" in lines
200-
assert "__sha__ = 'g4ac9d2c'" in lines
202+
assert "__sha__ = sha = 'g4ac9d2c'" in lines
201203

202204
version = "1.2.3.dev18+gb366d8b.d20210415"
203205
scm_version = meta(
@@ -212,7 +214,7 @@ def read(name: str) -> str:
212214
"__version_tuple__ = version_tuple = (1, 2, 3, 'dev18', 'gb366d8b.d20210415')"
213215
in lines
214216
)
215-
assert "__sha__ = 'gb366d8b'" in lines
217+
assert "__sha__ = sha = 'gb366d8b'" in lines
216218

217219
import ast
218220

0 commit comments

Comments
 (0)