fix debian files

to work again (hopefully).

Also:
 - few minor tweaks for py3
 - added psi facility
 - split secop-gui into separate package, so secop-core doesn't need QT

Change-Id: I457d3c9c60c78feb40e15c2fb153ce0d3491d1e8
Reviewed-on: https://forge.frm2.tum.de/review/c/sine2020/secop/playground/+/21327
Tested-by: JenkinsCodeReview <bjoern_pedersen@frm2.tum.de>
Tested-by: Enrico Faulhaber <enrico.faulhaber@frm2.tum.de>
Reviewed-by: Enrico Faulhaber <enrico.faulhaber@frm2.tum.de>
This commit is contained in:
Enrico Faulhaber
2019-09-26 16:04:35 +02:00
parent 9fce31c4f3
commit 8e619a67d4
15 changed files with 193 additions and 47 deletions

View File

@ -1,7 +1,6 @@
# -*- coding: utf-8 -*-
# *****************************************************************************
# MLZ library of Tango servers
# Copyright (c) 2015-2017 by the authors, see LICENSE
# Copyright (c) 2015-2019 by the authors, see LICENSE
#
# This program is free software; you can redistribute it and/or modify it under
# the terms of the GNU General Public License as published by the Free Software
@ -20,6 +19,8 @@
# Module authors:
# Douglas Creager <dcreager@dcreager.net>
# This file is placed into the public domain.
# fixes for PEP440 by:
# Enrico Faulhaber <enrico.faulhaber@frm2.tum.de>
#
# *****************************************************************************
@ -40,7 +41,12 @@ def get_git_version(abbrev=4, cwd=None):
'describe', '--abbrev=%d' % abbrev],
stdout=PIPE, stderr=PIPE)
stdout, _stderr = p.communicate()
return stdout.strip().decode('utf-8', 'ignore')
version = stdout.strip().decode('utf-8', 'ignore')
# mangle version to comply with pep440
if version.count('-'):
version, patchcount, githash = version.split('-')
version += '.post%s+%s' %(patchcount, githash)
return version
except Exception:
return None