mirror of
https://github.com/tahoe-lafs/tahoe-lafs.git
synced 2025-01-03 03:36:44 +00:00
setup.py: stop putting pyutil.version_class/etc in _version.py
allmydata.__version__ can just be a string, it doesn't need to be an instance of some fancy NormalizedVersion class. Everything inside Tahoe uses str(__version__) anyways. Also add .dev0 when a git tree is dirty. Closes #1466
This commit is contained in:
parent
7d5ca407a1
commit
dd2e7a1127
21
setup.py
21
setup.py
@ -268,6 +268,15 @@ class MakeExecutable(Command):
|
|||||||
raise
|
raise
|
||||||
|
|
||||||
|
|
||||||
|
DARCS_VERSION_BODY = '''
|
||||||
|
# This _version.py is generated from darcs metadata by the tahoe setup.py
|
||||||
|
# and the "darcsver" package.
|
||||||
|
|
||||||
|
__pkgname__ = "%(pkgname)s"
|
||||||
|
verstr = "%(pkgversion)s"
|
||||||
|
__version__ = verstr
|
||||||
|
'''
|
||||||
|
|
||||||
GIT_VERSION_BODY = '''
|
GIT_VERSION_BODY = '''
|
||||||
# This _version.py is generated from git metadata by the tahoe setup.py.
|
# This _version.py is generated from git metadata by the tahoe setup.py.
|
||||||
|
|
||||||
@ -275,13 +284,7 @@ __pkgname__ = "%(pkgname)s"
|
|||||||
real_version = "%(version)s"
|
real_version = "%(version)s"
|
||||||
full_version = "%(full)s"
|
full_version = "%(full)s"
|
||||||
verstr = "%(normalized)s"
|
verstr = "%(normalized)s"
|
||||||
try:
|
__version__ = verstr
|
||||||
from pyutil.version_class import Version as pyutil_Version
|
|
||||||
__version__ = pyutil_Version(verstr)
|
|
||||||
except (ImportError, ValueError):
|
|
||||||
# Maybe there is no pyutil installed.
|
|
||||||
from distutils.version import LooseVersion as distutils_Version
|
|
||||||
__version__ = distutils_Version(verstr)
|
|
||||||
'''
|
'''
|
||||||
|
|
||||||
def run_command(args, cwd=None, verbose=False):
|
def run_command(args, cwd=None, verbose=False):
|
||||||
@ -349,6 +352,7 @@ def versions_from_git(tag_prefix, verbose=False):
|
|||||||
full = stdout.strip()
|
full = stdout.strip()
|
||||||
if version.endswith("-dirty"):
|
if version.endswith("-dirty"):
|
||||||
full += "-dirty"
|
full += "-dirty"
|
||||||
|
normalized_version += ".dev0"
|
||||||
return {"version": version, "normalized": normalized_version, "full": full}
|
return {"version": version, "normalized": normalized_version, "full": full}
|
||||||
|
|
||||||
|
|
||||||
@ -376,7 +380,8 @@ class UpdateVersion(Command):
|
|||||||
from darcsver.darcsvermodule import update
|
from darcsver.darcsvermodule import update
|
||||||
(rc, verstr) = update(pkgname=self.distribution.get_name(),
|
(rc, verstr) = update(pkgname=self.distribution.get_name(),
|
||||||
verfilename=self.distribution.versionfiles,
|
verfilename=self.distribution.versionfiles,
|
||||||
revision_number=True)
|
revision_number=True,
|
||||||
|
version_body=DARCS_VERSION_BODY)
|
||||||
if rc == 0:
|
if rc == 0:
|
||||||
return verstr
|
return verstr
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user