Merge branch 'hotfix-4.3.1'

Hotfix for sardana 2.4

.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.3.0
+current_version = 4.3.1
 parse = (?P<major>\d+)\.(?P<minor>\d+)\.(?P<patch>\d+)(\-(?P<release>[a-z]+))?
 serialize = 
 	{major}.{minor}.{patch}-{release}

CHANGELOG.md

@@ -7,7 +7,17 @@ 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.3.1] - 2018-03-14
+A hotfix release needed for sardana 2.4
+
+### Fixed 
+- duplicated "tango://" prefix in panels created from Pool for sardana>=2.4
+- avoid problems if channel dimension info is set to None by sardana (#722)
+
+
 ## [4.3.0] - 2018-03-01
+[Jan18 milestone](https://github.com/taurus-org/taurus/milestone/10)
+
 ### Deprecated
 - taurus.core.tango.search
 - TaurusMainWindow's "Change Tango Host" action (#379)
@@ -59,12 +69,14 @@ develop branch) won't be reflected in this file.
 - taurus.qt.qtgui.panel.taurusfilterpanel
 
 ## [4.1.1] - 2017-07-21
+Hotfix release needed just for PyPI
 
 ### Fixed
 - Issue with PyPI metadata (hotfix 4.1.1)
 
 
 ## [4.1.0] - 2017-07-21
+[Jul17 milestone](https://github.com/taurus-org/taurus/milestone/9)
 
 ### Added
 - Formatting API in TaurusBaseComponent (#444)
@@ -297,6 +309,7 @@ and several other places](https://sf.net/p/tauruslib/tickets/milestone/Jul15/)
 [TEP3]: http://www.taurus-scada.org/tep/?TEP3.md
 [TEP14]: http://www.taurus-scada.org/tep/?TEP14.md
 [Unreleased]: https://github.com/taurus-org/taurus/tree/develop
+[4.3.1]: https://github.com/taurus-org/taurus/tree/4.3.1
 [4.3.0]: https://github.com/taurus-org/taurus/tree/4.3.0
 [4.1.1]: https://github.com/taurus-org/taurus/tree/4.1.1
 [4.1.0]: https://github.com/taurus-org/taurus/tree/4.1.0

doc/man/taurusconfigbrowser.1

@@ -1,7 +1,7 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.47.4.
-.TH TAURUSCONFIGEDITOR "1" "February 2018" "taurusconfigeditor 4.3.0" "User Commands"
+.TH TAURUSCONFIGEDITOR "1" "March 2018" "taurusconfigeditor 4.3.1" "User Commands"
 .SH NAME
-taurusconfigeditor \- manual page for taurusconfigeditor 4.3.0
+taurusconfigeditor \- manual page for taurusconfigeditor 4.3.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 TAURUS "1" "February 2018" "Taurus Curve Dialog 4.3.0" "User Commands"
+.TH TAURUS "1" "March 2018" "Taurus Curve Dialog 4.3.1" "User Commands"
 .SH NAME
-Taurus \- manual page for Taurus Curve Dialog 4.3.0
+Taurus \- manual page for Taurus Curve Dialog 4.3.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" "February 2018" "taurusdemo 1.0" "User Commands"
+.TH TAURUSDEMO "1" "March 2018" "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" "February 2018" "taurusdesigner 4.3.0" "User Commands"
+.TH TAURUSDESIGNER "1" "March 2018" "taurusdesigner 4.3.1" "User Commands"
 .SH NAME
-taurusdesigner \- manual page for taurusdesigner 4.3.0
+taurusdesigner \- manual page for taurusdesigner 4.3.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" "February 2018" "TaurusDevicePanel 4.3.0" "User Commands"
+.TH TAURUSDEVICEPANEL "1" "March 2018" "TaurusDevicePanel 4.3.1" "User Commands"
 .SH NAME
-TaurusDevicePanel \- manual page for TaurusDevicePanel 4.3.0
+TaurusDevicePanel \- manual page for TaurusDevicePanel 4.3.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" "February 2018" "taurusform 4.3.0" "User Commands"
+.TH TAURUSFORM "1" "March 2018" "taurusform 4.3.1" "User Commands"
 .SH NAME
-taurusform \- manual page for taurusform 4.3.0
+taurusform \- manual page for taurusform 4.3.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" "February 2018" "taurusgui 4.3.0" "User Commands"
+.TH TAURUSGUI "1" "March 2018" "taurusgui 4.3.1" "User Commands"
 .SH NAME
-taurusgui \- manual page for taurusgui 4.3.0
+taurusgui \- manual page for taurusgui 4.3.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" "February 2018" "taurusiconcatalog 4.3.0" "User Commands"
+.TH TAURUSICONCATALOG "1" "March 2018" "taurusiconcatalog 4.3.1" "User Commands"
 .SH NAME
-taurusiconcatalog \- manual page for taurusiconcatalog 4.3.0
+taurusiconcatalog \- manual page for taurusiconcatalog 4.3.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 TAURUS "1" "February 2018" "Taurus Image Dialog 4.3.0" "User Commands"
+.TH TAURUS "1" "March 2018" "Taurus Image Dialog 4.3.1" "User Commands"
 .SH NAME
-Taurus \- manual page for Taurus Image Dialog 4.3.0
+Taurus \- manual page for Taurus Image Dialog 4.3.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" "February 2018" "tauruspanel 4.3.0" "User Commands"
+.TH TAURUSPANEL "1" "March 2018" "tauruspanel 4.3.1" "User Commands"
 .SH NAME
-tauruspanel \- manual page for tauruspanel 4.3.0
+tauruspanel \- manual page for tauruspanel 4.3.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" "February 2018" "taurusplot 4.3.0" "User Commands"
+.TH TAURUSPLOT "1" "March 2018" "taurusplot 4.3.1" "User Commands"
 .SH NAME
-taurusplot \- manual page for taurusplot 4.3.0
+taurusplot \- manual page for taurusplot 4.3.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" "February 2018" "taurustestsuite 4.3.0" "User Commands"
+.TH TAURUSTESTSUITE "1" "March 2018" "taurustestsuite 4.3.1" "User Commands"
 .SH NAME
-taurustestsuite \- manual page for taurustestsuite 4.3.0
+taurustestsuite \- manual page for taurustestsuite 4.3.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" "February 2018" "taurustrend 4.3.0" "User Commands"
+.TH TAURUSTREND "1" "March 2018" "taurustrend 4.3.1" "User Commands"
 .SH NAME
-taurustrend \- manual page for taurustrend 4.3.0
+taurustrend \- manual page for taurustrend 4.3.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 TAURUS "1" "February 2018" "Taurus Trend 4.3.0" "User Commands"
+.TH TAURUS "1" "March 2018" "Taurus Trend 4.3.1" "User Commands"
 .SH NAME
-Taurus \- manual page for Taurus Trend 4.3.0
+Taurus \- manual page for Taurus Trend 4.3.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 TAURUS "1" "February 2018" "Taurus Trend 2D 4.3.0" "User Commands"
+.TH TAURUS "1" "March 2018" "Taurus Trend 2D 4.3.1" "User Commands"
 .SH NAME
-Taurus \- manual page for Taurus Trend 2D 4.3.0
+Taurus \- manual page for Taurus Trend 2D 4.3.1
 .SH SYNOPSIS
 .B taurustrend2d
 [\fI\,options\/\fR] \fI\,<model>\/\fR

lib/taurus/core/release.py

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

lib/taurus/qt/qtgui/taurusgui/macrolistener.py

@@ -151,7 +151,7 @@ def onExpConfChanged(self, expconf):
             elif ptype == PlotType.Spectrum:
                 axes = tuple(chdata['plot_axes'])
                 # TODO: get default value from the channel.
-                ndim = chdata.get('ndim', 0)
+                ndim = chdata.get('ndim', 0) or 0
                 if ndim == 0:  # this is a trend
                     if axes in trends1d:
                         trends1d[axes].append(chname)

lib/taurus/qt/qtgui/taurusgui/taurusgui.py

@@ -906,7 +906,13 @@ def createInstrumentsFromPool(self, macroservername):
             instrument = elem.instrument
             if instrument:
                 i_name = instrument
-                e_name = "tango://%s" % elem.full_name
+                # -----------------------------------------------------------
+                # Support sardana v<2.4 (which used tango names instead of 
+                # taurus full names
+                e_name = elem.full_name
+                if not e_name.startswith("tango://"):
+                    e_name = "tango://%s" % e_name
+                # -----------------------------------------------------------
                 instrument_dict[i_name].model.append(e_name)
         # filter out empty panels
         ret = [instrument for instrument in instrument_dict.values()