Merge branch 'master' into py312

Author: musicinmybrain

CHANGELOG.rst

@@ -5,6 +5,11 @@ CHANGELOG
 Unreleased
 ==========
 
+2.12.1
+==========
+* bugfix: set_trace_entity() in lambda adds segment to thread `PR409 https://github.com/aws/aws-xray-sdk-python/pull/409`
+* bugfix: Cleanup after drop of support for Python `PR387 https://github.com/aws/aws-xray-sdk-python/pull/387`
+
 2.12.0
 ==========
 * improvement: Default Context Missing Strategy set to Log Error `PR372 https://github.com/aws/aws-xray-sdk-python/pull/372`

aws_xray_sdk/version.py

@@ -1 +1 @@
-VERSION = '2.12.0'
+VERSION = '2.12.1'

docs/conf.py

@@ -62,9 +62,9 @@
 # built documents.
 #
 # The short X.Y version.
-version = u'2.12.0'
+version = u'2.12.1'
 # The full version, including alpha/beta/rc tags.
-release = u'2.12.0'
+release = u'2.12.1'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

sample-apps/flask/requirements.txt

@@ -5,7 +5,7 @@ Flask
 idna
 requests
 urllib3
-Werkzeug==2.2.3
+Werkzeug==3.0.1
 flask-sqlalchemy==2.5.1
 SQLAlchemy==1.4
 aws_xray_sdk==2.6.0

tox.ini

@@ -43,7 +43,7 @@ envlist =
     py{37,38,39,310,311,312}-ext-sqlite3
 
 [testenv]
-passenv = TOXENV CI CODECOV_*
+passenv = TOXENV,CI,CODECOV_*
 
 deps =
     ; Testing packages
@@ -77,7 +77,7 @@ deps =
 
     ext-flask: flask >= 0.10
 
-    ext-flask_sqlalchemy: flask >= 0.10
+    ext-flask_sqlalchemy: flask >= 0.10,<3.0.0
     ext-flask_sqlalchemy: Flask-SQLAlchemy <= 2.5.1
     ext-flask_sqlalchemy: sqlalchemy >=1.0.0,<2.0.0