From 9a63c1f5e64f6f10c6f7241fd4a208f0934b3d65 Mon Sep 17 00:00:00 2001 From: zreszela Date: Thu, 10 Jun 2021 18:18:49 +0200 Subject: [PATCH] docs: update CHANGELOG and "What's new?" --- CHANGELOG.md | 11 +++++++++++ doc/source/news.rst | 15 +++++++++++++++ 2 files changed, 26 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6cb2ee1b9..fdbd485b9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,16 @@ All notable changes to this project will be documented in this file. This project adheres to [Semantic Versioning](http://semver.org/). This file follows the formats and conventions from [keepachangelog.com] +## [3.1.1] 2021-06-11 + +### Fixed + +* Allow to stop/abort macro executing other hooked macros (#1603, #1608) + +### Deprecated + +* `MacroExecutor.clearRunningMacro()` in favor of `MacroExecutor.clearMacroStack()` (#1608) + ## [3.1.0] 2021-05-17 ### Added @@ -1047,6 +1057,7 @@ Main improvements since sardana 1.5.0 (aka Jan15): [keepachangelog.com]: http://keepachangelog.com +[3.1.1]: https://github.com/sardana-org/sardana/compare/3.1.1...3.1.0 [3.1.0]: https://github.com/sardana-org/sardana/compare/3.1.0...3.0.3 [3.0.3]: https://github.com/sardana-org/sardana/compare/3.0.3...2.8.6 [2.8.6]: https://github.com/sardana-org/sardana/compare/2.8.6...2.8.5 diff --git a/doc/source/news.rst b/doc/source/news.rst index 97bef3f18..58733af9d 100644 --- a/doc/source/news.rst +++ b/doc/source/news.rst @@ -6,6 +6,21 @@ Below you will find the most relevant news that brings the Sardana releases. For a complete list of changes consult the Sardana `CHANGELOG.md \ `_ file. +**************************** +What's new in Sardana 3.1.1? +**************************** + +Date: 2021-06-11 + +Type: hotfix release + +Fixed +===== + +- Correctly handle stop/abort of macros e.g. ``Ctrl+c`` in Spock in case + the macro was executing another hooked macros e.g. a scan executing a general + hook. + ************************** What's new in Sardana 3.1? **************************