Skip to content
This repository has been archived by the owner on Nov 3, 2021. It is now read-only.

Commit

Permalink
docs: update CHANGELOG and "What's new?"
Browse files Browse the repository at this point in the history
  • Loading branch information
reszelaz committed Jun 10, 2021
1 parent ae76357 commit 9a63c1f
Show file tree
Hide file tree
Showing 2 changed files with 26 additions and 0 deletions.
11 changes: 11 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
15 changes: 15 additions & 0 deletions doc/source/news.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
<https://github.com/sardana-org/sardana/blob/develop/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?
**************************
Expand Down

0 comments on commit 9a63c1f

Please sign in to comment.