From 8f63e8b7007a55770927c5a664f3d4206ee56f37 Mon Sep 17 00:00:00 2001
From: Harri Hirvonsalo <harri.hirvonsalo@csc.fi>
Date: Fri, 18 Dec 2020 12:10:35 +0200
Subject: [PATCH] Release 2.1.6

Signed-off-by: Harri Hirvonsalo <harri.hirvonsalo@csc.fi>
---
 AUTHORS.rst                                   |  4 +-
 CHANGELOG.rst                                 | 19 ++++++++++
 .../upgrades/upgrade_2_1_5_to_2_1_6.py        | 38 +++++++++++++++++++
 b2share/version.py                            |  2 +-
 4 files changed, 61 insertions(+), 2 deletions(-)
 create mode 100644 b2share/modules/upgrade/upgrades/upgrade_2_1_5_to_2_1_6.py

diff --git a/AUTHORS.rst b/AUTHORS.rst
index f0d60ec7c7..f81acb03c9 100644
--- a/AUTHORS.rst
+++ b/AUTHORS.rst
@@ -28,12 +28,14 @@ Authors
 - Dennis Blommesteijn (SURFsara)
 - Dinos Kousidis (CERN)
 - Emanuel Dima (EKUT)
-- Hans van Piggelen (SURFsara)
+- Hans van Piggelen (SURF)
 - Harri Hirvonsalo (CSC)
+- Harry Kodden (SURF)
 - Hilary Hanahoe (TRUST)
 - Huw Morris (STFC)
 - Ilja Livenson (KTH)
 - Janne Karjalainen (CSC)
+- Jussi Steenari (CSC)
 - Klára Pešková (CUNI)
 - Kristian Niininen (CSC)
 - Lassi Lehtinen (CSC)
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index ab6597ff78..58ecd49d0b 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -1,6 +1,25 @@
 B2Share changelog
 *****************
 
+2.1.6 (December 2020)
+===========================
+
+Minor update. Changes since v2.1.5 include:
+
+- Improve B2NOTE integration
+- Python version used in Dockerfile updated to 3.6
+
+
+2.1.5 (November 2020)
+===========================
+
+Minor update. Changes since v2.1.4 include:
+
+- Fix metadata boolean field handling
+- Updated B2NOTE integration
+- Updated dependencies
+
+
 2.1.4 (March 2020)
 ===========================
 
diff --git a/b2share/modules/upgrade/upgrades/upgrade_2_1_5_to_2_1_6.py b/b2share/modules/upgrade/upgrades/upgrade_2_1_5_to_2_1_6.py
new file mode 100644
index 0000000000..1c24d1a760
--- /dev/null
+++ b/b2share/modules/upgrade/upgrades/upgrade_2_1_5_to_2_1_6.py
@@ -0,0 +1,38 @@
+# -*- coding: utf-8 -*-
+#
+# This file is part of EUDAT B2Share.
+# Copyright (C) 2018 CERN.
+#
+# B2Share is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License as
+# published by the Free Software Foundation; either version 2 of the
+# License, or (at your option) any later version.
+#
+# B2Share is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with B2Share; if not, write to the Free Software Foundation, Inc.,
+# 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
+#
+# In applying this license, CERN does not
+# waive the privileges and immunities granted to it by virtue of its status
+# as an Intergovernmental Organization or submit itself to any jurisdiction.
+
+"""Upgrade recipe migrating B2SHARE from version 2.1.5 to 2.1.6."""
+
+
+from __future__ import absolute_import, print_function
+
+import pkg_resources
+
+from ..api import UpgradeRecipe
+
+
+migrate_2_1_5_to_2_1_6 = UpgradeRecipe('2.1.5', '2.1.6')
+
+# No changes to Elasticsearch mappings
+
+# There are no changes to the db schema, so no other updates are necessary
diff --git a/b2share/version.py b/b2share/version.py
index 7e760e8451..636f6fd79e 100644
--- a/b2share/version.py
+++ b/b2share/version.py
@@ -21,4 +21,4 @@
 """Version number."""
 
 
-__version__ = "2.1.5"
+__version__ = "2.1.6"