Merge pull request #864 from taurus-org/release-4.5.1

Release Jan19

.bumpversion.cfg

@@ -3,7 +3,7 @@ commit = True
 message = Bump version {current_version} to {new_version}
 tag = False
 tag_name = {new_version}
-current_version = 4.5.0
+current_version = 4.5.1
 parse = (?P<major>\d+)\.(?P<minor>\d+)\.(?P<patch>\d+)(\-(?P<release>[a-z]+))?
 serialize = 
 	{major}.{minor}.{patch}-{release}

.travis.yml

@@ -25,6 +25,7 @@ env:
 matrix:
     allow_failures:
         - env: DOCKER_IMG=cpascual/taurus-test:debian-jessie
+        - env: DOCKER_IMG=cpascual/taurus-test:debian-stretch-py3
         - env: DOCKER_IMG=cpascual/taurus-test:debian-buster
 
 before_install:

CHANGELOG.md

@@ -7,6 +7,16 @@ Note: changes in the [support-3.x] branch (which was split from
 the master branch after [3.7.1] and maintained in parallel to the 
 develop branch) won't be reflected in this file.
 
+## [4.5.1] - 2019-02-??
+
+Together with [4.5.0], they cover the [Jan19 milestone](https://github.com/taurus-org/taurus/milestone/12)
+
+### Fixed
+- redundant units shown in TaurusForm write widget (#860)
+- deprecation warning in tauruspanel
+- infinite recursion issue in TangoDevice
+- Other (#855)
+
 ## [4.5.0] - 2019-01-29
 
 This is a special release for meeting the deadline of debian buster
@@ -54,6 +64,7 @@ freeze (debian 10).
     - `taurus.external.qt.QtCore.to_qvariant` 
 
 ## [4.4.0] - 2018-07-26
+[Jul18 milestone](https://github.com/taurus-org/taurus/milestone/11)
 
 ### Deprecated
 - pint, enum, unittest and argparse submodules of taurus.external (#723)
@@ -402,6 +413,7 @@ and several other places](https://sf.net/p/tauruslib/tickets/milestone/Jul15/)
 [TEP14]: http://www.taurus-scada.org/tep/?TEP14.md
 [TEP15]: http://www.taurus-scada.org/tep/?TEP15.md
 [Unreleased]: https://github.com/taurus-org/taurus/tree/develop
+[4.5.1]: https://github.com/taurus-org/taurus/tree/release-4.5.1
 [4.5.0]: https://github.com/taurus-org/taurus/tree/release-4.5.0
 [4.4.0]: https://github.com/taurus-org/taurus/tree/4.4.0
 [4.3.1]: https://github.com/taurus-org/taurus/tree/4.3.1

doc/makeman

@@ -50,6 +50,8 @@ for f in `ls`
   V=`./$f --version 2>/dev/null |egrep -o '[0-9]+.[0-9]+(.[0-9])?'`
   echo help2man -N -o "$DOCDIR/man/$f.1" --version-string=$V ./$f
   help2man -N -o "$DOCDIR/man/$f.1" --version-string=$V ./$f
+  # scripts are installed with 755 permissions, but manpages should be 644
+  chmod 644 "$DOCDIR/man/$f.1"
   done
 
 cd $DOCDIR

doc/man/taurusconfigbrowser.1

@@ -1,7 +1,7 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.47.4.
-.TH TAURUSCONFIGBROWSER "1" "July 2018" "taurusconfigbrowser 4.4.0" "User Commands"
+.TH TAURUSCONFIGBROWSER "1" "February 2019" "taurusconfigbrowser 4.5.1" "User Commands"
 .SH NAME
-taurusconfigbrowser \- manual page for taurusconfigbrowser 4.4.0
+taurusconfigbrowser \- manual page for taurusconfigbrowser 4.5.1
 .SH SYNOPSIS
 .B taurusconfigbrowser
 [\fI\,options\/\fR] [\fI\,INIFILENAME\/\fR]

doc/man/tauruscurve.1

@@ -1,7 +1,7 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.47.4.
-.TH TAURUSCURVE "1" "July 2018" "tauruscurve 4.4.0" "User Commands"
+.TH TAURUSCURVE "1" "February 2019" "tauruscurve 4.5.1" "User Commands"
 .SH NAME
-tauruscurve \- manual page for tauruscurve 4.4.0
+tauruscurve \- manual page for tauruscurve 4.5.1
 .SH SYNOPSIS
 .B tauruscurve
 [\fI\,options\/\fR] [\fI\,<model1> \/\fR[\fI\,<model2>\/\fR] ...]

doc/man/taurusdemo.1

@@ -1,5 +1,5 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.47.4.
-.TH TAURUSDEMO "1" "July 2018" "taurusdemo 1.0" "User Commands"
+.TH TAURUSDEMO "1" "February 2019" "taurusdemo 1.0" "User Commands"
 .SH NAME
 taurusdemo \- manual page for taurusdemo 1.0
 .SH SYNOPSIS

doc/man/taurusdesigner.1

@@ -1,7 +1,7 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.47.4.
-.TH TAURUSDESIGNER "1" "July 2018" "taurusdesigner 4.4.0" "User Commands"
+.TH TAURUSDESIGNER "1" "February 2019" "taurusdesigner 4.5.1" "User Commands"
 .SH NAME
-taurusdesigner \- manual page for taurusdesigner 4.4.0
+taurusdesigner \- manual page for taurusdesigner 4.5.1
 .SH SYNOPSIS
 .B taurusdesigner
 [\fI\,options\/\fR] \fI\,<ui file(s)>\/\fR

doc/man/taurusdevicepanel.1

@@ -1,7 +1,7 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.47.4.
-.TH TAURUSDEVICEPANEL "1" "July 2018" "taurusdevicepanel 4.4.0" "User Commands"
+.TH TAURUSDEVICEPANEL "1" "February 2019" "taurusdevicepanel 4.5.1" "User Commands"
 .SH NAME
-taurusdevicepanel \- manual page for taurusdevicepanel 4.4.0
+taurusdevicepanel \- manual page for taurusdevicepanel 4.5.1
 .SH SYNOPSIS
 .B taurusdevicepanel
 [\fI\,options\/\fR] [\fI\,devname \/\fR[\fI\,attrs\/\fR]]

doc/man/taurusform.1

@@ -1,7 +1,7 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.47.4.
-.TH TAURUSFORM "1" "July 2018" "taurusform 4.4.0" "User Commands"
+.TH TAURUSFORM "1" "February 2019" "taurusform 4.5.1" "User Commands"
 .SH NAME
-taurusform \- manual page for taurusform 4.4.0
+taurusform \- manual page for taurusform 4.5.1
 .SH SYNOPSIS
 .B taurusform
 [\fI\,options\/\fR] [\fI\,model1 \/\fR[\fI\,model2 \/\fR...]]

doc/man/taurusgui.1

@@ -1,7 +1,7 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.47.4.
-.TH TAURUSGUI "1" "July 2018" "taurusgui 4.4.0" "User Commands"
+.TH TAURUSGUI "1" "February 2019" "taurusgui 4.5.1" "User Commands"
 .SH NAME
-taurusgui \- manual page for taurusgui 4.4.0
+taurusgui \- manual page for taurusgui 4.5.1
 .SH SYNOPSIS
 .B taurusgui
 [\fI\,options\/\fR] \fI\,confname\/\fR

doc/man/taurusiconcatalog.1

@@ -1,7 +1,7 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.47.4.
-.TH TAURUSICONCATALOG "1" "July 2018" "taurusiconcatalog 4.4.0" "User Commands"
+.TH TAURUSICONCATALOG "1" "February 2019" "taurusiconcatalog 4.5.1" "User Commands"
 .SH NAME
-taurusiconcatalog \- manual page for taurusiconcatalog 4.4.0
+taurusiconcatalog \- manual page for taurusiconcatalog 4.5.1
 .SH SYNOPSIS
 .B taurusiconcatalog
 [\fI\,options\/\fR]

doc/man/taurusimage.1

@@ -1,7 +1,7 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.47.4.
-.TH TAURUSIMAGE "1" "July 2018" "taurusimage 4.4.0" "User Commands"
+.TH TAURUSIMAGE "1" "February 2019" "taurusimage 4.5.1" "User Commands"
 .SH NAME
-taurusimage \- manual page for taurusimage 4.4.0
+taurusimage \- manual page for taurusimage 4.5.1
 .SH SYNOPSIS
 .B taurusimage
 [\fI\,options\/\fR] \fI\,<model>\/\fR

doc/man/tauruspanel.1

@@ -1,7 +1,7 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.47.4.
-.TH TAURUSPANEL "1" "July 2018" "tauruspanel 4.4.0" "User Commands"
+.TH TAURUSPANEL "1" "February 2019" "tauruspanel 4.5.1" "User Commands"
 .SH NAME
-tauruspanel \- manual page for tauruspanel 4.4.0
+tauruspanel \- manual page for tauruspanel 4.5.1
 .SH SYNOPSIS
 .B tauruspanel
 [\fI\,options\/\fR] [\fI\,devname\/\fR]

doc/man/taurusplot.1

@@ -1,7 +1,7 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.47.4.
-.TH TAURUSPLOT "1" "July 2018" "taurusplot 4.4.0" "User Commands"
+.TH TAURUSPLOT "1" "February 2019" "taurusplot 4.5.1" "User Commands"
 .SH NAME
-taurusplot \- manual page for taurusplot 4.4.0
+taurusplot \- manual page for taurusplot 4.5.1
 .SH SYNOPSIS
 .B taurusplot
 [\fI\,options\/\fR] [\fI\,<model1> \/\fR[\fI\,<model2>\/\fR] ...]

doc/man/taurustestsuite.1

@@ -1,7 +1,7 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.47.4.
-.TH TAURUSTESTSUITE "1" "July 2018" "taurustestsuite 4.4.0" "User Commands"
+.TH TAURUSTESTSUITE "1" "February 2019" "taurustestsuite 4.5.1" "User Commands"
 .SH NAME
-taurustestsuite \- manual page for taurustestsuite 4.4.0
+taurustestsuite \- manual page for taurustestsuite 4.5.1
 .SH DESCRIPTION
 usage: taurustestsuite [\-h] [\-\-skip\-gui\-tests] [\-e EXCLUDE_PATTERN]
 .IP

doc/man/taurustrend.1

@@ -1,7 +1,7 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.47.4.
-.TH TAURUSTREND "1" "July 2018" "taurustrend 4.4.0" "User Commands"
+.TH TAURUSTREND "1" "February 2019" "taurustrend 4.5.1" "User Commands"
 .SH NAME
-taurustrend \- manual page for taurustrend 4.4.0
+taurustrend \- manual page for taurustrend 4.5.1
 .SH SYNOPSIS
 .B taurustrend
 [\fI\,options\/\fR] [\fI\,<model1> \/\fR[\fI\,<model2>\/\fR] ...]

doc/man/taurustrend1d.1

@@ -1,7 +1,7 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.47.4.
-.TH TAURUSTREND1D "1" "July 2018" "taurustrend1d 4.4.0" "User Commands"
+.TH TAURUSTREND1D "1" "February 2019" "taurustrend1d 4.5.1" "User Commands"
 .SH NAME
-taurustrend1d \- manual page for taurustrend1d 4.4.0
+taurustrend1d \- manual page for taurustrend1d 4.5.1
 .SH SYNOPSIS
 .B taurustrend1d
 [\fI\,options\/\fR] \fI\,<model>\/\fR

doc/man/taurustrend2d.1

@@ -1,7 +1,7 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.47.4.
-.TH TAURUSTREND2D "1" "July 2018" "taurustrend2d 4.4.0" "User Commands"
+.TH TAURUSTREND2D "1" "February 2019" "taurustrend2d 4.5.1" "User Commands"
 .SH NAME
-taurustrend2d \- manual page for taurustrend2d 4.4.0
+taurustrend2d \- manual page for taurustrend2d 4.5.1
 .SH SYNOPSIS
 .B taurustrend2d
 [\fI\,options\/\fR] \fI\,<model>\/\fR

lib/taurus/core/release.py

@@ -47,7 +47,7 @@
 
 # we use semantic versioning (http://semver.org/) and we update it using the
 # bumpversion script (https://github.com/peritus/bumpversion)
-version = '4.5.0'
+version = '4.5.1'
 
 # generate version_info and revision (**deprecated** since version 4.0.2-dev).
 if '-' in version:

lib/taurus/core/tango/tangodevice.py

@@ -75,7 +75,7 @@ def __init__(self, name='', **kw):
     # This way we can call for example read_attribute on an object of this
     # class
     def __getattr__(self, name):
-        if self._deviceObj is not None:
+        if name != "_deviceObj" and self._deviceObj is not None:
             return getattr(self._deviceObj, name)
         cls_name = self.__class__.__name__
         raise AttributeError("'%s' has no attribute '%s'" % (cls_name, name))

lib/taurus/qt/qtgui/container/taurusmainwindow.py

@@ -641,8 +641,10 @@ def loadSettings(self, settings=None, group=None, ignoreGeometry=False, factoryS
             ba = settings.value("TaurusConfig") or Qt.QByteArray()
             self.applyQConfig(ba)
         except Exception as e:
-            msg = 'Problem loading configuration from "%s". Some settings may not be restored.\n Details: %s' % (
-                str(settings.fileName()), repr(e))
+            msg = ('Problem loading configuration from "{}". '
+                   + 'Some settings may not be restored.\n'
+                   + ' Reason: {}'
+                   ).format(str(settings.fileName()), e)
             self.error(msg)
             Qt.QMessageBox.warning(
                 self, 'Error Loading settings', msg, Qt.QMessageBox.Ok)

lib/taurus/qt/qtgui/panel/taurusdevicepanel.py

@@ -505,12 +505,12 @@ def filterNonExported(obj):
 
 @UILoadable(with_ui='_ui')
 class TaurusDevPanel(TaurusMainWindow):
-    '''
+    """
     TaurusDevPanel is a Taurus Application inspired in Jive and Atk Panel.
 
     It Provides a Device selector and several dockWidgets for interacting and
     displaying information from the selected device.
-    '''
+    """
 
     def __init__(self, parent=None, designMode=False):
         TaurusMainWindow.__init__(self, parent, designMode=designMode)
@@ -528,12 +528,6 @@ def __init__(self, parent=None, designMode=False):
         # self.deviceTree.insertFilter(filterNonExported)
         self.setCentralWidget(self.deviceTree)
 
-        # needed because of a limitation in when using the useParentModel
-        # property from designer and taurus parents are not the same as Qt
-        # Parents
-        self._ui.taurusAttrForm.recheckTaurusParent()
-        self._ui.taurusCommandsForm.recheckTaurusParent()
-
         # register subwidgets for configuration purposes
         # self.registerConfigDelegate(self.taurusAttrForm)
         # self.registerConfigDelegate(self.deviceTree)
@@ -551,15 +545,15 @@ def __init__(self, parent=None, designMode=False):
             self.splashScreen().finish(self)
 
     def createActions(self):
-        '''create actions '''
+        """create actions"""
         # View Menu
         self.showAttrAction = self.viewMenu.addAction(
             self._ui.attrDW.toggleViewAction())
         self.showCommandsAction = self.viewMenu.addAction(
             self._ui.commandsDW.toggleViewAction())
 
     def setTangoHost(self, host):
-        '''extended from :class:setTangoHost'''
+        """extended from :class:setTangoHost"""
         TaurusMainWindow.setTangoHost(self, host)
         self.deviceTree.setModel(host)
         # self.deviceTree.insertFilter(filterNonExported)
@@ -586,6 +580,7 @@ def onDeviceSelected(self, devinfo):
         self.setDevice(devname)
 
     def setDevice(self, devname):
+        """set the device to be shown by the commands and attr forms"""
         # try to connect with the device
         self.setModel(devname)
         dev = self.getModelObj()
@@ -605,6 +600,12 @@ def setDevice(self, devname):
             Qt.QMessageBox.warning(self, "Device unreachable", msg)
             self.setModel('')
 
+    def setModel(self, name):
+        """Reimplemented to delegate model to the commands and attrs forms"""
+        TaurusMainWindow.setModel(self, name)
+        self._ui.taurusAttrForm.setModel(name)
+        self._ui.taurusCommandsForm.setModel(name)
+
     @classmethod
     def getQtDesignerPluginInfo(cls):
         ret = TaurusMainWindow.getQtDesignerPluginInfo()

lib/taurus/qt/qtgui/panel/taurusvalue.py

@@ -204,6 +204,15 @@ class CenteredLed(TaurusLed):
     DefaultAlignment = Qt.Qt.AlignHCenter | Qt.Qt.AlignVCenter
 
 
+class UnitLessLineEdit(TaurusValueLineEdit):
+    """A customised TaurusValueLineEdit that always shows the magnitude"""
+    def setModel(self, model):
+        if model is None or model == '':
+            return TaurusValueLineEdit.setModel(self, None)
+        return TaurusValueLineEdit.setModel(self, model + "#wvalue.magnitude")
+
+
+
 class DefaultUnitsWidget(TaurusLabel):
 
     FORMAT = "{}"
@@ -587,20 +596,20 @@ def getDefaultWriteWidgetClass(self, returnAll=False):
         modelobj = self.getModelObj()
         if modelobj is None:
             if returnAll:
-                return [TaurusValueLineEdit]
+                return [UnitLessLineEdit]
             else:
-                return TaurusValueLineEdit
+                return UnitLessLineEdit
         modelType = modelobj.getType()
         if modelobj.data_format == DataFormat._0D:
             if modelType == DataType.Boolean:
                 result = [DefaultTaurusValueCheckBox, TaurusValueLineEdit]
             else:
-                result = [TaurusValueLineEdit,
+                result = [UnitLessLineEdit,
                           TaurusValueSpinBox, TaurusWheelEdit]
         elif modelobj.data_format == DataFormat._1D:
             if modelType in (DataType.Float, DataType.Integer):
                 result = [TaurusArrayEditorButton,
-                          TaurusValuesTableButton_W, TaurusValueLineEdit]
+                          TaurusValuesTableButton_W, UnitLessLineEdit]
             else:
                 result = [TaurusValuesTableButton_W, TaurusValueLineEdit]
         elif modelobj.data_format == DataFormat._2D:

lib/taurus/qt/qtgui/panel/test/test_taurusvalue.py

@@ -36,9 +36,7 @@
 
 @insertTest(helper_name="texts",
             model="tango:" + DEV_NAME + "/double_scalar",
-            expected=("double_scalar", "1.23", "0.00 mm", "mm"),
-            # expected=("double_scalar", "1.23", "0.0", "mm"),
-            # TODO: change taurusvalue's line edit to hide units
+            expected=("double_scalar", "1.23", "0.00", "mm")
             )
 class TaurusValueTest(TangoSchemeTestLauncher, BaseWidgetTestCase,
                       unittest.TestCase):

lib/taurus/qt/qtgui/panel/ui/TaurusDevPanel.ui

@@ -32,7 +32,7 @@
      <item>
       <widget class="TaurusAttrForm" name="taurusAttrForm" native="true">
        <property name="useParentModel" stdset="0">
-        <bool>true</bool>
+        <bool>false</bool>
        </property>
       </widget>
      </item>
@@ -54,7 +54,7 @@
      <item>
       <widget class="TaurusCommandsForm" name="taurusCommandsForm" native="true">
        <property name="useParentModel" stdset="0">
-        <bool>true</bool>
+        <bool>false</bool>
        </property>
       </widget>
      </item>