Merge branch 'master' into webb/populate-tox/transitive-dependencies

Author: alexander-alderman-webb

CHANGELOG.md

@@ -1,5 +1,20 @@
 # Changelog
 
+## 2.61.1
+
+### Internal Changes 🔧
+
+#### Rq
+
+- Pin `fakeredis<2.36.0` in tests by @alexander-alderman-webb in [#6454](https://github.com/getsentry/sentry-python/pull/6454)
+- Unpin `redis` and `fakeredis` for tests by @alexander-alderman-webb in [#6443](https://github.com/getsentry/sentry-python/pull/6443)
+
+#### Other
+
+- (aiohttp) Unfurl spans explicitly instead of using pop() by @sentrivana in [#6435](https://github.com/getsentry/sentry-python/pull/6435)
+- (tox) Migrate from pip to uv via tox-uv by @sentry-junior in [#6390](https://github.com/getsentry/sentry-python/pull/6390)
+- Pin redis<8 for rq by @sl0thentr0py in [#6438](https://github.com/getsentry/sentry-python/pull/6438)
+
 ## 2.61.0
 
 ### New Features ✨

docs/conf.py

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

scripts/populate_tox/config.py

@@ -35,8 +35,10 @@
     "arq": {
         "package": "arq",
         "deps": {
-            "*": ["async-timeout", "pytest-asyncio", "fakeredis>=2.2.0,<2.8"],
+            "*": ["async-timeout", "pytest-asyncio", "fakeredis"],
             "<=0.23": ["pydantic<2"],
+            # https://github.com/cunla/fakeredis-py/issues/490
+            "py3.6,py3.7,py3.8": ["fakeredis<2.36.0"],
         },
         "num_versions": 2,
     },

sentry_sdk/consts.py

@@ -1745,4 +1745,4 @@ def _get_default_options() -> "dict[str, Any]":
 del _get_default_options
 
 
-VERSION = "2.61.0"
+VERSION = "2.61.1"

setup.py

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

tox.ini

@@ -8716,8 +8716,9 @@ deps =
     arq-latest: arq==0.28.0
     arq: async-timeout
     arq: pytest-asyncio
-    arq: fakeredis>=2.2.0,<2.8
+    arq: fakeredis
     arq-v0.23: pydantic<2
+    {py3.6,py3.7,py3.8}-arq: fakeredis<2.36.0
 
     beam-v2.14.0: apache-beam==2.14.0