Bump version: 1.2.5 → 1.3.0. Changelog updated

zalando · Jun 29, 2018 · 6531326 · 6531326
1 parent c18a7cd
commit 6531326
Show file tree

Hide file tree

Showing 5 changed files with 27 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,14 @@
 # Change Log
 
+## [Unreleased](https://github.com/zalando/expan/tree/HEAD)
+
+[Full Changelog](https://github.com/zalando/expan/compare/v1.2.5...HEAD)
+
+**Merged pull requests:**
+
+- Ensure that outlier detection works if there is NaN in the data [\#225](https://github.com/zalando/expan/pull/225) ([aaron-mcdaid-zalando](https://github.com/aaron-mcdaid-zalando))
+- More powerful derived kpis [\#222](https://github.com/zalando/expan/pull/222) ([aaron-mcdaid-zalando](https://github.com/aaron-mcdaid-zalando))
+
 ## [v1.2.5](https://github.com/zalando/expan/tree/v1.2.5) (2018-06-22)
 [Full Changelog](https://github.com/zalando/expan/compare/v1.2.4...v1.2.5)
 

diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -1,6 +1,21 @@
 Change Log
 ==========
 
+`Unreleased <https://github.com/zalando/expan/tree/HEAD>`__
+-----------------------------------------------------------
+
+`Full
+Changelog <https://github.com/zalando/expan/compare/v1.2.5...HEAD>`__
+
+**Merged pull requests:**
+
+-  Ensure that outlier detection works if there is NaN in the data
+   `#225 <https://github.com/zalando/expan/pull/225>`__
+   (`aaron-mcdaid-zalando <https://github.com/aaron-mcdaid-zalando>`__)
+-  More powerful derived kpis
+   `#222 <https://github.com/zalando/expan/pull/222>`__
+   (`aaron-mcdaid-zalando <https://github.com/aaron-mcdaid-zalando>`__)
+
 `v1.2.5 <https://github.com/zalando/expan/tree/v1.2.5>`__ (2018-06-22)
 ----------------------------------------------------------------------
 

diff --git a/README.rst b/README.rst
@@ -45,7 +45,7 @@ imported and used from within other projects and from the command line.
 Documentation
 =============
 
-The latest stable version is 1.2.5. Please check out our `tutorial and documentation <http://expan.readthedocs.io/>`__.
+The latest stable version is 1.3.0. Please check out our `tutorial and documentation <http://expan.readthedocs.io/>`__.
 
 Installation
 ============

diff --git a/expan/core/version.py b/expan/core/version.py
@@ -1,6 +1,6 @@
 import subprocess
 
-__version__ = "1.2.5"
+__version__ = "1.3.0"
 
 
 def version_numbers():

diff --git a/setup.cfg b/setup.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 1.2.5
+current_version = 1.3.0
 commit = True
 tag = True