From 8311aa9fa00574144e4ffd7c6488c4483e116f1a Mon Sep 17 00:00:00 2001
From: pulpbot <pulp-infra@redhat.com>
Date: Thu, 15 Feb 2024 11:41:49 +0000
Subject: [PATCH] Release 2.15.5

---
 .bumpversion.cfg               |  2 +-
 CHANGES.rst                    | 15 +++++++++++++++
 CHANGES/1485.removal           |  3 ---
 docs/conf.py                   |  4 ++--
 pulp_container/app/__init__.py |  2 +-
 setup.py                       |  2 +-
 6 files changed, 20 insertions(+), 8 deletions(-)
 delete mode 100644 CHANGES/1485.removal

diff --git a/.bumpversion.cfg b/.bumpversion.cfg
index 2f6fad85e..8e87ccab4 100644
--- a/.bumpversion.cfg
+++ b/.bumpversion.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 2.15.5.dev
+current_version = 2.15.5
 commit = False
 tag = False
 parse = (?P<major>\d+)\.(?P<minor>\d+)\.(?P<patch>\d+)(\.(?P<release>[a-z]+))?
diff --git a/CHANGES.rst b/CHANGES.rst
index 08067e881..b73427d05 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -13,6 +13,21 @@ Changelog
 
 .. towncrier release notes start
 
+2.15.5 (2024-02-15)
+===================
+
+Deprecations and Removals
+-------------------------
+
+- Removed the optional "kid" parameter stored inside the signatures' payload generated during
+  docker manifest v2 schema 1 conversion. This change also removes the ``ecdsa`` dependency,
+  which is vulnerable to Minevra timing attacks.
+  `#1485 <https://github.com/pulp/pulp_container/issues/1485>`__
+
+
+----
+
+
 2.15.4 (2024-01-15)
 ===================
 
diff --git a/CHANGES/1485.removal b/CHANGES/1485.removal
deleted file mode 100644
index d0ee06c73..000000000
--- a/CHANGES/1485.removal
+++ /dev/null
@@ -1,3 +0,0 @@
-Removed the optional "kid" parameter stored inside the signatures' payload generated during
-docker manifest v2 schema 1 conversion. This change also removes the ``ecdsa`` dependency,
-which is vulnerable to Minevra timing attacks.
diff --git a/docs/conf.py b/docs/conf.py
index 98fa08642..dc13a785a 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -57,9 +57,9 @@
 # built documents.
 #
 # The short X.Y version.
-version = "2.15.5.dev"
+version = "2.15.5"
 # The full version, including alpha/beta/rc tags.
-release = "2.15.5.dev"
+release = "2.15.5"
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
diff --git a/pulp_container/app/__init__.py b/pulp_container/app/__init__.py
index b9094ee0f..0fbe6e10c 100644
--- a/pulp_container/app/__init__.py
+++ b/pulp_container/app/__init__.py
@@ -6,5 +6,5 @@ class PulpContainerPluginAppConfig(PulpPluginAppConfig):
 
     name = "pulp_container.app"
     label = "container"
-    version = "2.15.5.dev"
+    version = "2.15.5"
     python_package_name = "pulp-container"
diff --git a/setup.py b/setup.py
index 654e2cffc..545e02ae3 100755
--- a/setup.py
+++ b/setup.py
@@ -10,7 +10,7 @@
 
 setup(
     name="pulp-container",
-    version="2.15.5.dev",
+    version="2.15.5",
     description="Container plugin for the Pulp Project",
     long_description=long_description,
     license="GPLv2+",