mirror of
https://github.com/tahoe-lafs/tahoe-lafs.git
synced 2024-12-19 04:57:54 +00:00
setup.py: set distribution.metadata.version from _version.py if we couldn't find it from git.
This simplifies reporting when we don't have the version. Also print the normalized version. refs #2340 Signed-off-by: Daira Hopwood <daira@jacaranda.org>
This commit is contained in:
parent
b43447003e
commit
2eeb8ee6f5
14
setup.py
14
setup.py
@ -351,13 +351,19 @@ class UpdateVersion(Command):
|
||||
def finalize_options(self):
|
||||
pass
|
||||
def run(self):
|
||||
global version
|
||||
verstr = version
|
||||
if os.path.isdir(os.path.join(basedir, ".git")):
|
||||
verstr = self.try_from_git()
|
||||
else:
|
||||
print("no version-control data found, leaving _version.py alone")
|
||||
return
|
||||
|
||||
if verstr:
|
||||
self.distribution.metadata.version = verstr
|
||||
else:
|
||||
print("""\
|
||||
********************************************************************
|
||||
Warning: no version information found. This may cause tests to fail.
|
||||
********************************************************************
|
||||
""")
|
||||
|
||||
def try_from_git(self):
|
||||
versions = versions_from_git("allmydata-tahoe-")
|
||||
@ -371,7 +377,7 @@ class UpdateVersion(Command):
|
||||
"branch": versions["branch"],
|
||||
})
|
||||
f.close()
|
||||
print("git-version: wrote '%s' into '%s'" % (versions["version"], VERSION_PY_FILENAME))
|
||||
print("Wrote normalized version %r into '%s'" % (versions["normalized"], VERSION_PY_FILENAME))
|
||||
|
||||
return versions.get("normalized", None)
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user