misc: simplify version discovery (#8531)
No more handwritten version number in wcs/__init__.py, no more support for qommon as it was once used in Authentic, no more support for subversion.
This commit is contained in:
parent
2af85d24c8
commit
ffd3200c06
3
setup.py
3
setup.py
|
@ -98,8 +98,7 @@ def get_version():
|
|||
version = result.split()[0][1:]
|
||||
version = version.replace('-', '.')
|
||||
return version
|
||||
from wcs import __version__ as version
|
||||
return version
|
||||
return '0'
|
||||
|
||||
|
||||
cmdclass = {
|
||||
|
|
|
@ -18,8 +18,6 @@ import sys
|
|||
import os
|
||||
sys.path.insert(0, os.path.dirname(__file__))
|
||||
|
||||
__version__ = '1.14'
|
||||
|
||||
import qommon
|
||||
|
||||
import qommon.form
|
||||
|
|
|
@ -39,5 +39,3 @@ if lasso:
|
|||
if self.this is None:
|
||||
raise lasso.Error('Error creating Provider')
|
||||
lasso.Provider = Provider
|
||||
|
||||
__version__ = "$Rev$"
|
||||
|
|
|
@ -25,29 +25,16 @@ def _find_vc_version():
|
|||
'''Find current version of the source code'''
|
||||
import os.path
|
||||
import subprocess
|
||||
import qommon
|
||||
|
||||
base = os.path.abspath(os.path.join(os.path.dirname(__file__), '..', '..'))
|
||||
package = None
|
||||
if os.path.exists(os.path.join(base, 'qommon')):
|
||||
package = os.path.basename(base)
|
||||
# Special treatment for authentic as qommon is not in the application
|
||||
# module but in a subdirectory named 'external'
|
||||
if package == 'external':
|
||||
base = os.path.abspath(os.path.join(base, '..'))
|
||||
package = os.path.basename(base)
|
||||
if os.path.exists(os.path.join(base, '..', 'setup.py')):
|
||||
srcdir = os.path.join(base, '..')
|
||||
else:
|
||||
srcdir = None
|
||||
|
||||
# get qommon version
|
||||
qversion = qommon.__version__.split()
|
||||
if len(qversion) > 1:
|
||||
qversion = "qommon svn-%s" % qversion[1]
|
||||
else:
|
||||
qversion = ""
|
||||
|
||||
# not run from source directory
|
||||
if not srcdir:
|
||||
# but have a qommon container
|
||||
|
@ -73,24 +60,7 @@ def _find_vc_version():
|
|||
except:
|
||||
version = None
|
||||
|
||||
# svn ?
|
||||
if os.path.exists(os.path.join(srcdir, '.svn')):
|
||||
try:
|
||||
process = subprocess.Popen(['svn', 'info'], env={'LANG': 'C'},
|
||||
stdout=subprocess.PIPE, cwd=srcdir)
|
||||
output = process.communicate()[0]
|
||||
# 4th line, second token
|
||||
rev = output.splitlines()[4].split()[1]
|
||||
url = "https://labs.libre-entreprise.org/scm/viewvc.php?view=rev&root=%s&revision=%s" % (package, rev)
|
||||
if version:
|
||||
revision = htmltext('%s %s <a href="%s">svn-%s</a> %s') % (package, version, url, rev, qversion)
|
||||
else:
|
||||
revision = htmltext('%s <a href="%s">svn-%s</a> %s') % (package, url, rev, qversion)
|
||||
except OSError:
|
||||
pass
|
||||
except IndexError:
|
||||
pass
|
||||
elif os.path.exists(os.path.join(srcdir,'.git')):
|
||||
if os.path.exists(os.path.join(srcdir,'.git')):
|
||||
try:
|
||||
process = subprocess.Popen(['git', 'log', '--pretty=oneline', '-1'],
|
||||
stdout=subprocess.PIPE, cwd=srcdir)
|
||||
|
@ -102,9 +72,11 @@ def _find_vc_version():
|
|||
branch = starred_line.split()[1]
|
||||
url = "https://repos.entrouvert.org/%s.git/commit/?id=%s" % (package,rev)
|
||||
if version:
|
||||
revision = htmltext('%s %s <a href="%s">git %s\'s branch rev:%s</a> %s') % (package, version, url, branch, rev[:8], qversion)
|
||||
revision = htmltext('%s %s <a href="%s">git %s\'s branch rev:%s</a>') % (
|
||||
package, version, url, branch, rev[:8])
|
||||
else:
|
||||
revision = htmltext('%s <a href="%s">git %s\'s branch rev:%s</a> %s') % (package, url, branch, rev[:8], qversion)
|
||||
revision = htmltext('%s <a href="%s">git %s\'s branch rev:%s</a>') % (
|
||||
package, url, branch, rev[:8])
|
||||
except OSError:
|
||||
pass
|
||||
else:
|
||||
|
|
Loading…
Reference in New Issue