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:
cermak
2020-01-14 09:28:53 +01:00
committed by Markus Zolliker
parent 859bf5e1a2
commit 8466a159fe
6 changed files with 63 additions and 14 deletions

View File

@@ -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"""