Compatibility with Python 3.4
This change allows compilation under python 3.4. In addition: - spec file added for pyinstaller with required hidden imports - changed default pathes for compiled exe file - added requirements for ppms under windows compilation Change-Id: I63d805a984d6a2c045df527303f46c8440994aad Reviewed-on: https://forge.frm2.tum.de/review/c/sine2020/secop/playground/+/22170 Reviewed-by: Enrico Faulhaber <enrico.faulhaber@frm2.tum.de> Reviewed-by: Markus Zolliker <markus.zolliker@psi.ch> Reviewed-by: Petr Cermak <cermak@mag.mff.cuni.cz> Tested-by: JenkinsCodeReview <bjoern_pedersen@frm2.tum.de> Tested-by: Petr Cermak <cermak@mag.mff.cuni.cz>
This commit is contained in:
@ -30,11 +30,3 @@ from secop.params import Parameter, Command, Override
|
||||
from secop.metaclass import Done
|
||||
from secop.iohandler import IOHandler, IOHandlerBase
|
||||
from secop.stringio import StringIO, HasIodev
|
||||
|
||||
|
||||
try:
|
||||
import sip
|
||||
sip.setapi('QString', 2)
|
||||
sip.setapi('QVariant', 2)
|
||||
except ImportError:
|
||||
pass
|
||||
|
@ -42,12 +42,21 @@ CONFIG = {
|
||||
'logdir': os.path.join(repodir, 'log'),
|
||||
'confdir': os.path.join(repodir, 'cfg'),
|
||||
'basedir': repodir,
|
||||
} if os.path.exists(os.path.join(repodir, '.git')) else {
|
||||
'piddir': '/var/run/secop',
|
||||
'logdir': '/var/log',
|
||||
'confdir': '/etc/secop',
|
||||
'basedir': repodir,
|
||||
}
|
||||
if path.splitext(sys.executable)[1] == ".exe":
|
||||
CONFIG = {
|
||||
'piddir': './',
|
||||
'logdir': './log',
|
||||
'confdir': './',
|
||||
'basedir': path.dirname(sys.executable),
|
||||
}
|
||||
elif not os.path.exists(os.path.join(repodir, '.git')):
|
||||
CONFIG = {
|
||||
'piddir': '/var/run/secop',
|
||||
'logdir': '/var/log',
|
||||
'confdir': '/etc/secop',
|
||||
'basedir': repodir,
|
||||
}
|
||||
|
||||
|
||||
unset_value = object()
|
||||
|
@ -162,7 +162,9 @@ class Parameter(Accessible):
|
||||
|
||||
def getProperties(self):
|
||||
"""get also properties of datatype"""
|
||||
return {**super().getProperties(), **self.datatype.getProperties()}
|
||||
superProp = super().getProperties().copy()
|
||||
superProp.update(self.datatype.getProperties())
|
||||
return superProp
|
||||
|
||||
def setProperty(self, key, value):
|
||||
"""set also properties of datatype"""
|
||||
|
Reference in New Issue
Block a user