From e69c9963c520ee5cd225fee66be168b02e66a8dd Mon Sep 17 00:00:00 2001
From: pulpbot <pulp-infra@redhat.com>
Date: Fri, 25 Oct 2024 07:12:34 +0000
Subject: [PATCH] Release 2.21.1

---
 .bumpversion.cfg               |  2 +-
 CHANGES.md                     | 12 ++++++++++++
 CHANGES/+fix-any-type.bugfix   |  2 --
 CHANGES/1703.bugfix            |  2 --
 docs/conf.py                   |  4 ++--
 pulp_container/app/__init__.py |  2 +-
 setup.py                       |  2 +-
 7 files changed, 17 insertions(+), 9 deletions(-)
 delete mode 100644 CHANGES/+fix-any-type.bugfix
 delete mode 100644 CHANGES/1703.bugfix

diff --git a/.bumpversion.cfg b/.bumpversion.cfg
index 1cd9943cc..a245fb838 100644
--- a/.bumpversion.cfg
+++ b/.bumpversion.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 2.21.1.dev
+current_version = 2.21.1
 commit = False
 tag = False
 parse = (?P<major>\d+)\.(?P<minor>\d+)\.(?P<patch>\d+)(\.(?P<release>[a-z]+))?
diff --git a/CHANGES.md b/CHANGES.md
index 0d65d8993..4a565efab 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -8,6 +8,18 @@
 
 [//]: # (towncrier release notes start)
 
+## 2.21.1 (2024-10-25) {: #2.21.1 }
+
+#### Bugfixes {: #2.21.1-bugfix }
+
+- Fixed an issue causing an HTTP 500 error when a GET request for a non-existing
+  blob was made to a distribution with only a `repository_version` set.
+  [#1703](https://github.com/pulp/pulp_container/issues/1703)
+- Fixed the JSONField specification so it doesn't break ruby bindings.
+  See context [here](https://github.com/pulp/pulp_rpm/issues/3639).
+
+---
+
 ## 2.21.0 (2024-07-19) {: #2.21.0 }
 
 
diff --git a/CHANGES/+fix-any-type.bugfix b/CHANGES/+fix-any-type.bugfix
deleted file mode 100644
index 89ea25f51..000000000
--- a/CHANGES/+fix-any-type.bugfix
+++ /dev/null
@@ -1,2 +0,0 @@
-Fixed the JSONField specification so it doesn't break ruby bindings.
-See context [here](https://github.com/pulp/pulp_rpm/issues/3639).
diff --git a/CHANGES/1703.bugfix b/CHANGES/1703.bugfix
deleted file mode 100644
index 231a3c156..000000000
--- a/CHANGES/1703.bugfix
+++ /dev/null
@@ -1,2 +0,0 @@
-Fixed an issue causing an HTTP 500 error when a GET request for a non-existing
-blob was made to a distribution with only a `repository_version` set.
diff --git a/docs/conf.py b/docs/conf.py
index 4608ea0a6..f736fa800 100755
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -73,9 +73,9 @@
 # built documents.
 #
 # The short X.Y version.
-version = "2.21.1.dev"
+version = "2.21.1"
 # The full version, including alpha/beta/rc tags.
-release = "2.21.1.dev"
+release = "2.21.1"
 
 # 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 526ff7b40..48a129091 100644
--- a/pulp_container/app/__init__.py
+++ b/pulp_container/app/__init__.py
@@ -6,7 +6,7 @@ class PulpContainerPluginAppConfig(PulpPluginAppConfig):
 
     name = "pulp_container.app"
     label = "container"
-    version = "2.21.1.dev"
+    version = "2.21.1"
     python_package_name = "pulp-container"
 
     def ready(self):
diff --git a/setup.py b/setup.py
index ce5e6eeef..eedec2ff9 100755
--- a/setup.py
+++ b/setup.py
@@ -10,7 +10,7 @@
 
 setup(
     name="pulp-container",
-    version="2.21.1.dev",
+    version="2.21.1",
     description="Container plugin for the Pulp Project",
     long_description=long_description,
     license="GPLv2+",