From d3e1fc15ba5ad2e491857299d936a744399966c2 Mon Sep 17 00:00:00 2001
From: Michael Gecht <gecht.m@gmail.com>
Date: Sun, 8 Apr 2018 15:20:07 +0200
Subject: [PATCH] Update version to 1.3.0

---
 CHANGELOG.rst           | 25 +++++++++++++++++++++++++
 changelog/29.feature    |  1 -
 changelog/42.feature    |  1 -
 changelog/46.bugfix     |  1 -
 changelog/46.misc       |  1 -
 changelog/49.feature    |  1 -
 changelog/54.bugfix     |  1 -
 mdbenchmark/__init__.py |  2 +-
 8 files changed, 26 insertions(+), 7 deletions(-)
 delete mode 100644 changelog/29.feature
 delete mode 100644 changelog/42.feature
 delete mode 100644 changelog/46.bugfix
 delete mode 100644 changelog/46.misc
 delete mode 100644 changelog/49.feature
 delete mode 100644 changelog/54.bugfix

diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index fb17846a..f3371a68 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -9,6 +9,31 @@ to update this file automatically for each release.
 
 .. towncrier release notes start
 
+MDBenchmark 1.3.0 (2018-04-08)
+==============================
+
+Features
+--------
+
+- Add functionality to perform benchmarks with NAMD. (#29)
+- Consolidated internal API to output messages to the console. (#42)
+- Module name is now validated against available modules on host. Can be
+  skipped with `--skip-validation`. (#49)
+
+
+Bugfixes
+--------
+
+- The option ``--min-nodes`` needs to be bigger than ``--max-nodes``. (#46)
+- Fixed edge-case in input filename parsing. (#54)
+
+
+Misc
+----
+
+- Fixed display of the number of benchmarks to-be generated. (#46)
+
+
 MDBenchmark 1.2.0 (2018-02-19)
 ==============================
 
diff --git a/changelog/29.feature b/changelog/29.feature
deleted file mode 100644
index 89021ed2..00000000
--- a/changelog/29.feature
+++ /dev/null
@@ -1 +0,0 @@
-Add functionality to perform benchmarks with NAMD.
\ No newline at end of file
diff --git a/changelog/42.feature b/changelog/42.feature
deleted file mode 100644
index 16e72360..00000000
--- a/changelog/42.feature
+++ /dev/null
@@ -1 +0,0 @@
-Consolidated internal API to output messages to the console.
\ No newline at end of file
diff --git a/changelog/46.bugfix b/changelog/46.bugfix
deleted file mode 100644
index 0b8f1ea9..00000000
--- a/changelog/46.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-The option ``--min-nodes`` needs to be bigger than ``--max-nodes``.
\ No newline at end of file
diff --git a/changelog/46.misc b/changelog/46.misc
deleted file mode 100644
index 1c422721..00000000
--- a/changelog/46.misc
+++ /dev/null
@@ -1 +0,0 @@
-Fixed display of the number of benchmarks to-be generated.
\ No newline at end of file
diff --git a/changelog/49.feature b/changelog/49.feature
deleted file mode 100644
index 562e31fe..00000000
--- a/changelog/49.feature
+++ /dev/null
@@ -1 +0,0 @@
-Module name is now validated against available modules on host. Can be skipped with `--skip-validation`.
\ No newline at end of file
diff --git a/changelog/54.bugfix b/changelog/54.bugfix
deleted file mode 100644
index 774bcbde..00000000
--- a/changelog/54.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fixed edge-case in input filename parsing.
\ No newline at end of file
diff --git a/mdbenchmark/__init__.py b/mdbenchmark/__init__.py
index 905f52c7..6458dd69 100644
--- a/mdbenchmark/__init__.py
+++ b/mdbenchmark/__init__.py
@@ -29,4 +29,4 @@
 
     from . import analyze, generate, submit
 
-    __version__ = '1.2.0'
+    __version__ = '1.3.0'