Merge branch 'release/2.0.0rc6' into sentry-sdk-2.0

Author: getsentry-bot

CHANGELOG.md

@@ -1,5 +1,19 @@
 # Changelog
 
+## 2.0.0rc6
+
+### Various fixes & improvements
+
+- Restore original behavior by always creating a span (#3005) by @antonpirker
+- Merge baggage headers (incoming and new created ones) (#3001) by @antonpirker
+- Fix duplicate baggage headers in Celery integration introduced in SDK 2.0 (#2993) by @antonpirker
+- Make it work with old and new newrelic versions (#2999) by @antonpirker
+- docs: Update migration guide wording (#2987) by @colin-sentry
+- docs: Tweak migration guide (#2979) by @colin-sentry
+- Small updates to migration guide (#2911) by @colin-sentry
+- Update CHANGELOG.md (51a906c1) by @sentrivana
+- release: 1.45.0 (7570e39a) by @getsentry-bot
+
 ## 2.0.0rc5
 
 ## New Features

docs/conf.py

@@ -28,7 +28,7 @@
 copyright = "2019-{}, Sentry Team and Contributors".format(datetime.now().year)
 author = "Sentry Team and Contributors"
 
-release = "2.0.0rc5"
+release = "2.0.0rc6"
 version = ".".join(release.split(".")[:2])  # The short X.Y version.
 
 

sentry_sdk/consts.py

@@ -345,4 +345,4 @@ def _get_default_options():
 del _get_default_options
 
 
-VERSION = "2.0.0rc5"
+VERSION = "2.0.0rc6"

setup.py

@@ -21,7 +21,7 @@ def get_file_text(file_name):
 
 setup(
     name="sentry-sdk",
-    version="2.0.0rc5",
+    version="2.0.0rc6",
     author="Sentry Team and Contributors",
     author_email="hello@sentry.io",
     url="https://github.com/getsentry/sentry-python",