From 89f88190a74a30e289c0a7725efa7e3c075814c1 Mon Sep 17 00:00:00 2001
From: Clement Verna <cverna@tutanota.com>
Date: Thu, 18 Jun 2020 13:56:40 +0200
Subject: [PATCH] Release 5.4.0

Signed-off-by: Clement Verna <cverna@tutanota.com>
---
 .mergify.yml                |  8 ++++++
 bodhi/__init__.py           |  2 +-
 docs/user/release_notes.rst | 51 +++++++++++++++++++++++++++++++++++++
 news/1794.bug               |  1 -
 news/4029.bug               |  1 -
 news/4032.bug               |  1 -
 news/4033.bug               |  1 -
 news/4044.bug               |  1 -
 news/PR4046.dev             |  1 -
 news/PR4052.dev             |  1 -
 news/summary.migration      |  3 ---
 setup.py                    |  2 +-
 12 files changed, 61 insertions(+), 12 deletions(-)
 delete mode 100644 news/1794.bug
 delete mode 100644 news/4029.bug
 delete mode 100644 news/4032.bug
 delete mode 100644 news/4033.bug
 delete mode 100644 news/4044.bug
 delete mode 100644 news/PR4046.dev
 delete mode 100644 news/PR4052.dev
 delete mode 100644 news/summary.migration

diff --git a/.mergify.yml b/.mergify.yml
index 9c6d3fb61b..27f12a3968 100644
--- a/.mergify.yml
+++ b/.mergify.yml
@@ -52,3 +52,11 @@ pull_request_rules:
   - label!=WIP
   - label=5.3-backports
   name: backport 5.3
+- actions:
+    backport:
+      branches:
+      - '5.4'
+  conditions:
+  - label!=WIP
+  - label=5.4-backports
+  name: backport 5.4
diff --git a/bodhi/__init__.py b/bodhi/__init__.py
index 29b3347d08..33e0840c37 100644
--- a/bodhi/__init__.py
+++ b/bodhi/__init__.py
@@ -17,7 +17,7 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 """Fedora's update manager."""
 
-__version__ = "5.3.0"
+__version__ = "5.4.0"
 
 # This is a regular expression used to match username mentions in comments.
 MENTION_RE = r'(?<!\S)(@\w+)'
diff --git a/docs/user/release_notes.rst b/docs/user/release_notes.rst
index 0e4d84758e..78c0d1cdc5 100644
--- a/docs/user/release_notes.rst
+++ b/docs/user/release_notes.rst
@@ -4,6 +4,57 @@ Release notes
 
 .. towncrier release notes start
 
+v5.4.0
+======
+This is a minor release.
+
+
+Server upgrade instructions
+^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+This release contains database migrations. To apply them, run::
+
+    $ sudo -u apache /usr/bin/alembic -c /etc/bodhi/alembic.ini upgrade head
+
+
+Summary of the migrations:
+
+* Migrate relationship between TestCase and Package to TestCase and Build. The migration script will take care of migrate existing data to the new relation.
+* The user_id column in comments table has been set to be not nullable.
+* The notes column in buildroot_overrides table has been converted to UnicodeText (from Unicode).
+
+Bug fixes
+^^^^^^^^^
+
+* Associate TestCase to Build instead of Package, allowing to remove old
+  testcases from updates (:issue:`1794`).
+* Replace koji krb_login with gssapi_login. (:issue:`4029`).
+* Making sure that builds of side tag update for normal releases are marked as
+  signed. (:issue:`4032`).
+* Handle Cornice 5.0 JSON error handling. (:issue:`4033`).
+* Cap buildroot overrides notes to a maximum of 2k characters and convert the
+  database field to UnicodeText (:issue:`4044`).
+
+Development improvements
+^^^^^^^^^^^^^^^^^^^^^^^^
+
+* The user_id field in the comments table has been made not nullable. Some
+  database joins have been tweaked to get better performance (:pr:`4046`).
+* Always use koji.multiCall for untag/unpush for better handle updates with a
+  lot of builds (:pr:`4052`).
+
+Contributors
+^^^^^^^^^^^^
+
+The following developers contributed to this release of Bodhi:
+
+* Clement Verna
+* Karma Dolkar
+* Mattia Verga
+* Miro Hrončok
+* Sebastian Wojciechowski
+
+
 v5.3.0
 ======
 This is a minor release.
diff --git a/news/1794.bug b/news/1794.bug
deleted file mode 100644
index 9c6f1164ad..0000000000
--- a/news/1794.bug
+++ /dev/null
@@ -1 +0,0 @@
-Associate TestCase to Build instead of Package, allowing to remove old testcases from updates
diff --git a/news/4029.bug b/news/4029.bug
deleted file mode 100644
index cfd3f4269b..0000000000
--- a/news/4029.bug
+++ /dev/null
@@ -1 +0,0 @@
-Replace koji krb_login with gssapi_login.
diff --git a/news/4032.bug b/news/4032.bug
deleted file mode 100644
index 3dae8ae51f..0000000000
--- a/news/4032.bug
+++ /dev/null
@@ -1 +0,0 @@
-Making sure that builds of side tag update for normal releases are marked as signed.
diff --git a/news/4033.bug b/news/4033.bug
deleted file mode 100644
index 29d8fcc36b..0000000000
--- a/news/4033.bug
+++ /dev/null
@@ -1 +0,0 @@
-Handle Cornice 5.0 JSON error handling.
diff --git a/news/4044.bug b/news/4044.bug
deleted file mode 100644
index cbd9d7488f..0000000000
--- a/news/4044.bug
+++ /dev/null
@@ -1 +0,0 @@
-Cap buildroot overrides notes to a maximum of 2k characters and convert the database field to UnicodeText
diff --git a/news/PR4046.dev b/news/PR4046.dev
deleted file mode 100644
index cb2f0ff01a..0000000000
--- a/news/PR4046.dev
+++ /dev/null
@@ -1 +0,0 @@
-The user_id field in the comments table has been made not nullable. Some database joins have been tweaked to get better performance
diff --git a/news/PR4052.dev b/news/PR4052.dev
deleted file mode 100644
index 4178b246d0..0000000000
--- a/news/PR4052.dev
+++ /dev/null
@@ -1 +0,0 @@
-Always use koji.multiCall for untag/unpush for better handle updates with a lot of builds
diff --git a/news/summary.migration b/news/summary.migration
deleted file mode 100644
index f7c451e3c5..0000000000
--- a/news/summary.migration
+++ /dev/null
@@ -1,3 +0,0 @@
-- Migrate relationship between TestCase and Package to TestCase and Build. The migration script will take care of migrate existing data to the new relation.
-- The user_id column in comments table has been set to be not nullable.
-- The notes column in buildroot_overrides table has been converted to UnicodeText (from Unicode).
diff --git a/setup.py b/setup.py
index df43d7fcaf..5e69912179 100644
--- a/setup.py
+++ b/setup.py
@@ -38,7 +38,7 @@ def get_requirements(requirements_file='requirements.txt'):
 
 here = os.path.abspath(os.path.dirname(__file__))
 README = open(os.path.join(here, 'README.rst')).read()
-VERSION = '5.3.0'
+VERSION = '5.4.0'
 
 
 # Possible options are at https://pypi.python.org/pypi?%3Aaction=list_classifiers