From cf68b334661c963c620b2a3a5c2d93cad4b1dccd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20P=C3=A9ters?= Date: Tue, 6 Oct 2015 23:02:17 +0200 Subject: [PATCH] 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. --- setup.py | 3 +-- wcs/__init__.py | 2 -- wcs/qommon/__init__.py | 2 -- wcs/qommon/admin/menu.py | 38 +++++--------------------------------- 4 files changed, 6 insertions(+), 39 deletions(-) diff --git a/setup.py b/setup.py index 169ba24..343eab5 100644 --- a/setup.py +++ b/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 = { diff --git a/wcs/__init__.py b/wcs/__init__.py index 587475a..40887c3 100644 --- a/wcs/__init__.py +++ b/wcs/__init__.py @@ -18,8 +18,6 @@ import sys import os sys.path.insert(0, os.path.dirname(__file__)) -__version__ = '1.14' - import qommon import qommon.form diff --git a/wcs/qommon/__init__.py b/wcs/qommon/__init__.py index 3fcd6b9..130eea1 100644 --- a/wcs/qommon/__init__.py +++ b/wcs/qommon/__init__.py @@ -39,5 +39,3 @@ if lasso: if self.this is None: raise lasso.Error('Error creating Provider') lasso.Provider = Provider - -__version__ = "$Rev$" diff --git a/wcs/qommon/admin/menu.py b/wcs/qommon/admin/menu.py index ff22914..0a2098c 100644 --- a/wcs/qommon/admin/menu.py +++ b/wcs/qommon/admin/menu.py @@ -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 svn-%s %s') % (package, version, url, rev, qversion) - else: - revision = htmltext('%s svn-%s %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 git %s\'s branch rev:%s %s') % (package, version, url, branch, rev[:8], qversion) + revision = htmltext('%s %s git %s\'s branch rev:%s') % ( + package, version, url, branch, rev[:8]) else: - revision = htmltext('%s git %s\'s branch rev:%s %s') % (package, url, branch, rev[:8], qversion) + revision = htmltext('%s git %s\'s branch rev:%s') % ( + package, url, branch, rev[:8]) except OSError: pass else: -- 2.6.1