Merge pull request #543 from reszelaz/hotfix-2.3.1

Hotfix 2.3.1
sardana-org · Aug 11, 2017 · ac1e9a6 · ac1e9a6
2 parents a10d2b4 + 1386d6f
commit ac1e9a6
Show file tree

Hide file tree

Showing 14 changed files with 33 additions and 25 deletions.
diff --git 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.3.0
+current_version = 2.3.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
@@ -9,7 +9,14 @@ This file follows the formats and conventions from [keepachangelog.com]
 ### Added
 - ...
 
-## [2.3.0] - 2017-08-04
+## [2.3.1] - 2017-08-11
+For a full log of commits between versions run (in your git repo):
+`git log 2.3.0..2.3.1`
+
+### Fixed
+- Appveyor build for Python 2.7 64 bits
+
+## [2.3.0] - 2017-08-11
 For a full log of commits between versions run (in your git repo):
 `git log 2.2.3..2.3.0`
 
@@ -262,7 +269,8 @@ Main improvements since sardana 1.5.0 (aka Jan15):
 
 
 [keepachangelog.com]: http://keepachangelog.com
-[Unreleased]: https://github.com/sardana-org/sardana/compare/2.3.0...HEAD
+[Unreleased]: https://github.com/sardana-org/sardana/compare/2.3.1...HEAD
+[2.3.1]: https://github.com/sardana-org/sardana/compare/2.3.0...2.3.1
 [2.3.0]: https://github.com/sardana-org/sardana/compare/2.2.3...2.3.0
 [2.2.3]: https://github.com/sardana-org/sardana/compare/2.2.2...2.2.3
 [2.2.2]: https://github.com/sardana-org/sardana/compare/2.2.1...2.2.2

diff --git a/ci/appveyor.yml b/ci/appveyor.yml
@@ -8,7 +8,7 @@ environment:
 
     matrix:
         # Python 2.7 (64)
-        - PYTHON_DIR: "C:\\Python27_32"
+        - PYTHON_DIR: "C:\\Python27-x64"
           PYTHON_VERSION: "2.7"
           PYTHON_ARCH: "64"
           CONDA_PY: "27"

diff --git 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.4.
-.TH MACROSERVER "1" "August 2017" "MacroServer 2.3.0" "User Commands"
+.TH MACROSERVER "1" "August 2017" "MacroServer 2.3.1" "User Commands"
 .SH NAME
-MacroServer \- manual page for MacroServer 2.3.0
+MacroServer \- manual page for MacroServer 2.3.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
@@ -1,7 +1,7 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.47.4.
-.TH POOL "1" "August 2017" "Pool 2.3.0" "User Commands"
+.TH POOL "1" "August 2017" "Pool 2.3.1" "User Commands"
 .SH NAME
-Pool \- manual page for Pool 2.3.0
+Pool \- manual page for Pool 2.3.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
@@ -1,7 +1,7 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.47.4.
-.TH SARDANA "1" "August 2017" "Sardana 2.3.0" "User Commands"
+.TH SARDANA "1" "August 2017" "Sardana 2.3.1" "User Commands"
 .SH NAME
-Sardana \- manual page for Sardana 2.3.0
+Sardana \- manual page for Sardana 2.3.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
@@ -1,7 +1,7 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.47.4.
-.TH DIFFRACTOMETERALIGNMENT "1" "August 2017" "diffractometeralignment 2.3.0" "User Commands"
+.TH DIFFRACTOMETERALIGNMENT "1" "August 2017" "diffractometeralignment 2.3.1" "User Commands"
 .SH NAME
-diffractometeralignment \- manual page for diffractometeralignment 2.3.0
+diffractometeralignment \- manual page for diffractometeralignment 2.3.1
 .SH SYNOPSIS
 .B diffractometeralignment
 \fI\,<model> \/\fR[\fI\,door_name\/\fR]

diff --git 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.4.
-.TH HKLSCAN "1" "August 2017" "hklscan 2.3.0" "User Commands"
+.TH HKLSCAN "1" "August 2017" "hklscan 2.3.1" "User Commands"
 .SH NAME
-hklscan \- manual page for hklscan 2.3.0
+hklscan \- manual page for hklscan 2.3.1
 .SH SYNOPSIS
 .B hklscan
 \fI\,<model> \/\fR[\fI\,door_name\/\fR]

diff --git 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.4.
-.TH MACROEXECUTOR "1" "August 2017" "macroexecutor 2.3.0" "User Commands"
+.TH MACROEXECUTOR "1" "August 2017" "macroexecutor 2.3.1" "User Commands"
 .SH NAME
-macroexecutor \- manual page for macroexecutor 2.3.0
+macroexecutor \- manual page for macroexecutor 2.3.1
 .SH SYNOPSIS
 .B macroexecutor
 [\fI\,options\/\fR]

diff --git 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.4.
-.TH SARDANATESTSUITE "1" "August 2017" "sardanatestsuite 2.3.0" "User Commands"
+.TH SARDANATESTSUITE "1" "August 2017" "sardanatestsuite 2.3.1" "User Commands"
 .SH NAME
-sardanatestsuite \- manual page for sardanatestsuite 2.3.0
+sardanatestsuite \- manual page for sardanatestsuite 2.3.1
 .SH DESCRIPTION
 usage: sardanatestsuite [\-h] [\-e EXCLUDE_PATTERN] [\-\-version]
 .PP

diff --git 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.4.
-.TH SEQUENCER "1" "August 2017" "sequencer 2.3.0" "User Commands"
+.TH SEQUENCER "1" "August 2017" "sequencer 2.3.1" "User Commands"
 .SH NAME
-sequencer \- manual page for sequencer 2.3.0
+sequencer \- manual page for sequencer 2.3.1
 .SH SYNOPSIS
 .B sequencer
 [\fI\,options\/\fR]

diff --git 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.4.
-.TH SPOCK "1" "August 2017" "spock 2.3.0" "User Commands"
+.TH SPOCK "1" "August 2017" "spock 2.3.1" "User Commands"
 .SH NAME
-spock \- manual page for spock 2.3.0
+spock \- manual page for spock 2.3.1
 .SH DESCRIPTION
 =========
 .IP

diff --git 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.4.
-.TH UBMATRIX "1" "August 2017" "ubmatrix 2.3.0" "User Commands"
+.TH UBMATRIX "1" "August 2017" "ubmatrix 2.3.1" "User Commands"
 .SH NAME
-ubmatrix \- manual page for ubmatrix 2.3.0
+ubmatrix \- manual page for ubmatrix 2.3.1
 .SH SYNOPSIS
 .B ubmatrix
 \fI\,<model>\/\fR

diff --git a/src/sardana/release.py b/src/sardana/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 = '2.3.0'
+version = '2.3.1'
 
 # generate version_info and revision (**deprecated** since v 2.1.2--alpha).
 if '-' in version: