Merge remote-tracking branch 'upstream/release-debian10' into develop

14 files changed, 50 insertions, 38 deletions

diff --git a/.bumpversion.cfg b/.bumpversion.cfg
index 99e68d31..c362a0c2 100755
--- a/.bumpversion.cfg
+++ b/.bumpversion.cfg
@@ -3,7 +3,7 @@ commit = True
 message = Bump version {current_version} to {new_version}
 tag = False
 tag_name = {new_version}
-current_version = 2.5.1-alpha
+current_version = 2.6.1
 parse = (?P<major>\d+)\.(?P<minor>\d+)\.(?P<patch>\d+)(\-(?P<release>[a-z]+))?
 serialize = 
 	{major}.{minor}.{patch}-{release}
diff --git a/CHANGELOG.md b/CHANGELOG.md
index cf8ae175..f69e64e8 100755
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,17 @@ This file follows the formats and conventions from [keepachangelog.com]
 ## [Unreleased]
 
 ### Added
+
+## [2.6.1] 2019-02-04
+
+### Fixed
+- String parameter editor in macroexecutor and sequencer (#1030, #1031)
+- Documentation on differences between `Hookable.hooks` and `Hookable.appendHook`
+  (#962, #1013)
+
+## [2.6.0] 2019-01-31
+
+### Added
 - New acquisition and synchronization concepts (SEP18, #773):
   - Preparation of measurement group for a group of acquisitions is mandatory
     (`Prepare` Tango command and `prepare` core method; `NbStarts` Tango
@@ -83,7 +94,6 @@ This file follows the formats and conventions from [keepachangelog.com]
 - Unused class `sardana.taurus.qt.qtgui.extra_macroexecutor.dooroutput.DoorAttrListener`
 
 ### Removed
-
 - Support to Qt < 4.7.4 (#1006, #1009)
 
 ## [2.5.0] 2018-08-10
@@ -557,7 +567,9 @@ Main improvements since sardana 1.5.0 (aka Jan15):
 
 
 [keepachangelog.com]: http://keepachangelog.com
-[Unreleased]: https://github.com/sardana-org/sardana/compare/2.5.0...HEAD
+[Unreleased]: https://github.com/sardana-org/sardana/compare/2.6.1...HEAD
+[2.6.1]: https://github.com/sardana-org/sardana/compare/2.6.0...2.6.1
+[2.6.0]: https://github.com/sardana-org/sardana/compare/2.5.0...2.6.0
 [2.5.0]: https://github.com/sardana-org/sardana/compare/2.4.0...2.5.0
 [2.4.0]: https://github.com/sardana-org/sardana/compare/2.3.2...2.4.0
 [2.3.2]: https://github.com/sardana-org/sardana/compare/2.3.1...2.3.2
diff --git a/doc/man/MacroServer.1 b/doc/man/MacroServer.1
index 0bfce5cc..c2d22cfb 100644..100755
--- a/doc/man/MacroServer.1
+++ b/doc/man/MacroServer.1
@@ -1,7 +1,7 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.47.3.
-.TH MACROSERVER "1" "August 2018" "MacroServer 2.5.0" "User Commands"
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.47.4.
+.TH MACROSERVER "1" "February 2019" "MacroServer 2.6.1" "User Commands"
 .SH NAME
-MacroServer \- manual page for MacroServer 2.5.0
+MacroServer \- manual page for MacroServer 2.6.1
 .SH SYNOPSIS
 .B usage:
 \fI\,MacroServer instance_name \/\fR[\fI\,options\/\fR]
diff --git a/doc/man/Pool.1 b/doc/man/Pool.1
index fae5daa1..1ba8241f 100644..100755
--- a/doc/man/Pool.1
+++ b/doc/man/Pool.1
@@ -1,7 +1,7 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.47.3.
-.TH POOL "1" "August 2018" "Pool 2.5.0" "User Commands"
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.47.4.
+.TH POOL "1" "February 2019" "Pool 2.6.1" "User Commands"
 .SH NAME
-Pool \- manual page for Pool 2.5.0
+Pool \- manual page for Pool 2.6.1
 .SH SYNOPSIS
 .B usage:
 \fI\,Pool instance_name \/\fR[\fI\,options\/\fR]
diff --git a/doc/man/Sardana.1 b/doc/man/Sardana.1
index 9fa4ea1d..f540e0ca 100644..100755
--- a/doc/man/Sardana.1
+++ b/doc/man/Sardana.1
@@ -1,7 +1,7 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.47.3.
-.TH SARDANA "1" "August 2018" "Sardana 2.5.0" "User Commands"
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.47.4.
+.TH SARDANA "1" "February 2019" "Sardana 2.6.1" "User Commands"
 .SH NAME
-Sardana \- manual page for Sardana 2.5.0
+Sardana \- manual page for Sardana 2.6.1
 .SH SYNOPSIS
 .B usage:
 \fI\,Sardana instance_name \/\fR[\fI\,options\/\fR]
diff --git a/doc/man/diffractometeralignment.1 b/doc/man/diffractometeralignment.1
index 764cef0d..439a52fd 100644..100755
--- a/doc/man/diffractometeralignment.1
+++ b/doc/man/diffractometeralignment.1
@@ -1,7 +1,7 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.47.3.
-.TH DIFFRACTOMETERALIGNMENT "1" "August 2018" "diffractometeralignment 2.5.0" "User Commands"
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.47.4.
+.TH DIFFRACTOMETERALIGNMENT "1" "February 2019" "diffractometeralignment 2.6.1" "User Commands"
 .SH NAME
-diffractometeralignment \- manual page for diffractometeralignment 2.5.0
+diffractometeralignment \- manual page for diffractometeralignment 2.6.1
 .SH SYNOPSIS
 .B diffractometeralignment
 \fI\,<model> \/\fR[\fI\,door_name\/\fR]
diff --git a/doc/man/hklscan.1 b/doc/man/hklscan.1
index d1399936..dd019a39 100644..100755
--- a/doc/man/hklscan.1
+++ b/doc/man/hklscan.1
@@ -1,7 +1,7 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.47.3.
-.TH HKLSCAN "1" "August 2018" "hklscan 2.5.0" "User Commands"
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.47.4.
+.TH HKLSCAN "1" "February 2019" "hklscan 2.6.1" "User Commands"
 .SH NAME
-hklscan \- manual page for hklscan 2.5.0
+hklscan \- manual page for hklscan 2.6.1
 .SH SYNOPSIS
 .B hklscan
 \fI\,<model> \/\fR[\fI\,door_name\/\fR]
diff --git a/doc/man/macroexecutor.1 b/doc/man/macroexecutor.1
index 4e0a7522..b81b8d70 100644..100755
--- a/doc/man/macroexecutor.1
+++ b/doc/man/macroexecutor.1
@@ -1,7 +1,7 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.47.3.
-.TH MACROEXECUTOR "1" "August 2018" "macroexecutor 2.5.0" "User Commands"
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.47.4.
+.TH MACROEXECUTOR "1" "February 2019" "macroexecutor 2.6.1" "User Commands"
 .SH NAME
-macroexecutor \- manual page for macroexecutor 2.5.0
+macroexecutor \- manual page for macroexecutor 2.6.1
 .SH SYNOPSIS
 .B macroexecutor
 [\fI\,options\/\fR]
diff --git a/doc/man/sardanatestsuite.1 b/doc/man/sardanatestsuite.1
index 773d0832..5e202cf3 100644..100755
--- a/doc/man/sardanatestsuite.1
+++ b/doc/man/sardanatestsuite.1
@@ -1,7 +1,7 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.47.3.
-.TH SARDANATESTSUITE "1" "August 2018" "sardanatestsuite 2.5.0" "User Commands"
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.47.4.
+.TH SARDANATESTSUITE "1" "February 2019" "sardanatestsuite 2.6.1" "User Commands"
 .SH NAME
-sardanatestsuite \- manual page for sardanatestsuite 2.5.0
+sardanatestsuite \- manual page for sardanatestsuite 2.6.1
 .SH DESCRIPTION
 usage: sardanatestsuite [\-h] [\-e EXCLUDE_PATTERN] [\-\-version]
 .PP
diff --git a/doc/man/sequencer.1 b/doc/man/sequencer.1
index c8c454c4..02695780 100644..100755
--- a/doc/man/sequencer.1
+++ b/doc/man/sequencer.1
@@ -1,7 +1,7 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.47.3.
-.TH SEQUENCER "1" "August 2018" "sequencer 2.5.0" "User Commands"
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.47.4.
+.TH SEQUENCER "1" "February 2019" "sequencer 2.6.1" "User Commands"
 .SH NAME
-sequencer \- manual page for sequencer 2.5.0
+sequencer \- manual page for sequencer 2.6.1
 .SH SYNOPSIS
 .B sequencer
 [\fI\,options\/\fR]
diff --git a/doc/man/spock.1 b/doc/man/spock.1
index 5fec3284..f0966bce 100644..100755
--- a/doc/man/spock.1
+++ b/doc/man/spock.1
@@ -1,7 +1,7 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.47.3.
-.TH SPOCK "1" "August 2018" "spock 2.5.0" "User Commands"
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.47.4.
+.TH SPOCK "1" "February 2019" "spock 2.6.1" "User Commands"
 .SH NAME
-spock \- manual page for spock 2.5.0
+spock \- manual page for spock 2.6.1
 .SH DESCRIPTION
 =========
 .IP
@@ -248,14 +248,14 @@ The IPython profile to use.
 \fB\-\-pylab=\fR<CaselessStrEnum> (InteractiveShellApp.pylab)
 .IP
 Default: None
-Choices: [u'auto', u'agg', u'gtk', u'gtk3', u'inline', u'ipympl', u'nbagg', u'notebook', u'osx', u'pdf', u'ps', u'qt', u'qt4', u'qt5', u'svg', u'tk', u'widget', u'wx']
+Choices: [u'auto', u'gtk', u'gtk3', u'inline', u'nbagg', u'notebook', u'osx', u'qt', u'qt4', u'qt5', u'tk', u'wx']
 Pre\-load matplotlib and numpy for interactive use, selecting a particular
 matplotlib backend and loop integration.
 .PP
 \fB\-\-matplotlib=\fR<CaselessStrEnum> (InteractiveShellApp.matplotlib)
 .IP
 Default: None
-Choices: [u'auto', u'agg', u'gtk', u'gtk3', u'inline', u'ipympl', u'nbagg', u'notebook', u'osx', u'pdf', u'ps', u'qt', u'qt4', u'qt5', u'svg', u'tk', u'widget', u'wx']
+Choices: [u'auto', u'gtk', u'gtk3', u'inline', u'nbagg', u'notebook', u'osx', u'qt', u'qt4', u'qt5', u'tk', u'wx']
 Configure matplotlib for interactive use with the default matplotlib
 backend.
 .PP
diff --git a/doc/man/ubmatrix.1 b/doc/man/ubmatrix.1
index 0e0aafaa..b4af81bc 100644..100755
--- a/doc/man/ubmatrix.1
+++ b/doc/man/ubmatrix.1
@@ -1,7 +1,7 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.47.3.
-.TH UBMATRIX "1" "August 2018" "ubmatrix 2.5.0" "User Commands"
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.47.4.
+.TH UBMATRIX "1" "February 2019" "ubmatrix 2.6.1" "User Commands"
 .SH NAME
-ubmatrix \- manual page for ubmatrix 2.5.0
+ubmatrix \- manual page for ubmatrix 2.6.1
 .SH SYNOPSIS
 .B ubmatrix
 \fI\,<model>\/\fR
diff --git a/src/sardana/release.py b/src/sardana/release.py
index 118a97d4..f2804659 100644
--- a/src/sardana/release.py
+++ b/src/sardana/release.py
@@ -47,7 +47,7 @@ name = 'sardana'
 
 # we use semantic versioning (http://semver.org/) and we update it using the
 # bumpversion script (https://github.com/peritus/bumpversion)
-version = '2.5.1-alpha'
+version = '2.6.1'
 
 # generate version_info and revision (**deprecated** since v 2.1.2--alpha).
 if '-' in version:
diff --git a/src/sardana/taurus/qt/qtgui/extra_sardana/expdescription.py b/src/sardana/taurus/qt/qtgui/extra_sardana/expdescription.py
index 536c5ed1..9e1ecb29 100755
--- a/src/sardana/taurus/qt/qtgui/extra_sardana/expdescription.py
+++ b/src/sardana/taurus/qt/qtgui/extra_sardana/expdescription.py
@@ -245,11 +245,11 @@ class ExpDescriptionEditor(Qt.QWidget, TaurusBaseWidget):
         # TODO: Disable show scan button since scan plot have to be
         # adapted to support QT5
         # --------------------------------------------------------------------
-        from taurus.external.qt import PYQT4, QT_API
+        from taurus.external.qt import PYQT4, API
         if not PYQT4:
             self.debug('Show plots is only supported with PyQt4 for now')
             plotsButton = False
-            tooltip = "Show/Hide plots is not ready for %s" % QT_API
+            tooltip = "Show/Hide plots is not ready for %s" % API
         # --------------------------------------------------------------------
 
         icon = resource.getIcon(":/actions/view.svg")