From d14d1f59c3cd7ce5e65fea4aeadf6146f4a3db88 Mon Sep 17 00:00:00 2001
From: Michael Gecht <gecht.m@gmail.com>
Date: Mon, 19 Feb 2018 18:15:54 +0100
Subject: [PATCH] Release 1.2.0

---
 CHANGELOG.rst           | 15 +++++++++++----
 changelog/32.feature    |  1 -
 changelog/35.bugfix     |  1 -
 mdbenchmark/__init__.py |  2 +-
 4 files changed, 12 insertions(+), 7 deletions(-)
 delete mode 100644 changelog/32.feature
 delete mode 100644 changelog/35.bugfix

diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index 19e1bb7a..a176e222 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -2,21 +2,27 @@
  MDBenchmark CHANGELOG
 =======================
 
-Do not edit this file directly! 
+Do not edit this file directly!
 
 MDBenchmark uses `towncrier <https://github.com/hawkowl/towncrier>`_
 to update this file automatically for each release.
 
 .. towncrier release notes start
 
-MDBenchmark 1.1.2 (2018-02-01)
+MDBenchmark 1.2.0 (2018-02-19)
 ==============================
 
+Features
+--------
+
+- GROMACS .tpr files can now be referenced with and without the file extension. (#32)
+
+
 Bugfixes
 --------
 
-- fixed crash during analyze, if some simulations have not started/finished yet
-  (#26)
+- fixed crash during analyze, if some simulations have not started/finished yet (#26)
+- Suppress FutureWarning caused by ``h5py``. (#35)
 
 
 MDBenchmark 1.1.1 (2018-01-20)
@@ -26,6 +32,7 @@ Misc
 ----
 - show benchmark png on pypi
 
+
 MDBenchmark 1.1.0 (2018-01-19)
 ==============================
 
diff --git a/changelog/32.feature b/changelog/32.feature
deleted file mode 100644
index 61bfcd19..00000000
--- a/changelog/32.feature
+++ /dev/null
@@ -1 +0,0 @@
-GROMACS .tpr files can now be referenced with and without the file extension.
\ No newline at end of file
diff --git a/changelog/35.bugfix b/changelog/35.bugfix
deleted file mode 100644
index c77b1ab6..00000000
--- a/changelog/35.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Suppress FutureWarning caused by ``h5py``.
\ No newline at end of file
diff --git a/mdbenchmark/__init__.py b/mdbenchmark/__init__.py
index cdbccd57..905f52c7 100644
--- a/mdbenchmark/__init__.py
+++ b/mdbenchmark/__init__.py
@@ -29,4 +29,4 @@
 
     from . import analyze, generate, submit
 
-    __version__ = '1.1.1'
+    __version__ = '1.2.0'