From 9a67a57b2c9c854441a03f99567366e72211777e Mon Sep 17 00:00:00 2001
From: Vastin <3690049+vastin@users.noreply.github.com>
Date: Mon, 4 Mar 2024 17:19:22 +0000
Subject: [PATCH 1/2] Release commit for v2.13.0

---
 CHANGELOG.rst           | 10 ++++++++++
 aws_xray_sdk/version.py |  2 +-
 docs/conf.py            |  4 ++--
 3 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index bd8a9712..f5d5a74e 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -5,6 +5,16 @@ CHANGELOG
 Unreleased
 ==========
 
+2.13.0
+==========
+* bugfix: Fix passing multiple values in testenv.passenv in tox.ini `https://github.com/aws/aws-xray-sdk-python/pull/399`
+* improvement: Pin flask < 3.x for flask sqlalchemy tests `https://github.com/aws/aws-xray-sdk-python/pull/412`
+* improvement: Bump werkzeug from 2.2.3 to 3.0.1 in /sample-apps/flask `https://github.com/aws/aws-xray-sdk-python/pull/413`
+* improvement: Enable testing on Python 3.12 `https://github.com/aws/aws-xray-sdk-python/pull/400`
+* bugfix: Fix typo in docs `https://github.com/aws/aws-xray-sdk-python/pull/419`
+* bugfix: Fix sqlalchemy_core patch errors for unencoded special characters in db url `https://github.com/aws/aws-xray-sdk-python/pull/418`
+* bugfix: Fix EB platform version for integration test `https://github.com/aws/aws-xray-sdk-python/pull/420`
+
 2.12.1
 ==========
 * bugfix: set_trace_entity() in lambda adds segment to thread `PR409 https://github.com/aws/aws-xray-sdk-python/pull/409`
diff --git a/aws_xray_sdk/version.py b/aws_xray_sdk/version.py
index 24061c37..8ef56164 100644
--- a/aws_xray_sdk/version.py
+++ b/aws_xray_sdk/version.py
@@ -1 +1 @@
-VERSION = '2.12.1'
+VERSION = '2.13.0'
diff --git a/docs/conf.py b/docs/conf.py
index 692ae0ca..cff4885e 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -62,9 +62,9 @@
 # built documents.
 #
 # The short X.Y version.
-version = u'2.12.1'
+version = u'2.13.0'
 # The full version, including alpha/beta/rc tags.
-release = u'2.12.1'
+release = u'2.13.0'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

From d41fd9f95c2ccb27da2f00167ea0ded72edfa511 Mon Sep 17 00:00:00 2001
From: Vastin <3690049+vastin@users.noreply.github.com>
Date: Mon, 4 Mar 2024 18:24:58 +0000
Subject: [PATCH 2/2] address review feedback

---
 CHANGELOG.rst | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index f5d5a74e..c6457126 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -10,8 +10,7 @@ Unreleased
 * bugfix: Fix passing multiple values in testenv.passenv in tox.ini `https://github.com/aws/aws-xray-sdk-python/pull/399`
 * improvement: Pin flask < 3.x for flask sqlalchemy tests `https://github.com/aws/aws-xray-sdk-python/pull/412`
 * improvement: Bump werkzeug from 2.2.3 to 3.0.1 in /sample-apps/flask `https://github.com/aws/aws-xray-sdk-python/pull/413`
-* improvement: Enable testing on Python 3.12 `https://github.com/aws/aws-xray-sdk-python/pull/400`
-* bugfix: Fix typo in docs `https://github.com/aws/aws-xray-sdk-python/pull/419`
+* improvement: Fix typo in docs `https://github.com/aws/aws-xray-sdk-python/pull/419`
 * bugfix: Fix sqlalchemy_core patch errors for unencoded special characters in db url `https://github.com/aws/aws-xray-sdk-python/pull/418`
 * bugfix: Fix EB platform version for integration test `https://github.com/aws/aws-xray-sdk-python/pull/420`