Merge branch 'major/3.0' into ivana/major/drop-3.6

Author: sentrivana

scripts/populate_tox/config.py

@@ -395,6 +395,7 @@
                 "hypercorn<0.15.0",
             ],
             "py3.8": ["taskgroup==0.0.0a4"],
+            "py3.7": ["importlib_metadata"],
         },
         "num_versions": 2,
     },

scripts/populate_tox/package_dependencies.jsonl

@@ -1213,6 +1213,12 @@ def parse_args() -> argparse.Namespace:
         default=[],
         help="Integrations to skip version updates for.",
     )
+    parser.add_argument(
+        "--only-update",
+        nargs="*",
+        default=[],
+        help="Only update versions for these integrations (all others will be skipped).",
+    )
     return parser.parse_args()
 
 
@@ -1275,6 +1281,11 @@ def main() -> dict[str, list]:
             }
 
     args = parse_args()
+    if args.skip_version_update and args.only_update:
+        print("--skip-version-update and --only-update are mutually exclusive.")
+        sys.exit(1)
+
+    only_update = set(args.only_update)
     skip_version_updates = set(args.skip_version_update)
 
     # Process packages
@@ -1290,7 +1301,10 @@ def main() -> dict[str, list]:
             package, extra = _get_package_name(integration)
 
             test_releases = None
-            if integration in skip_version_updates:
+            skip = integration in skip_version_updates or (
+                only_update and integration not in only_update
+            )
+            if skip:
                 test_releases = get_existing_releases_to_test(integration)
             else:
                 test_releases = get_releases_to_test(integration, package)

scripts/populate_tox/populate_tox.py

@@ -13,6 +13,14 @@
 )
 from sentry_sdk._types import SENSITIVE_DATA_SUBSTITUTE
 from sentry_sdk.integrations.logging import LoggingIntegration
+from sentry_sdk.utils import parse_version
+
+try:
+    from importlib.metadata import version
+except ImportError:
+    from importlib_metadata import version
+
+QUART_VERSION = parse_version(version("quart"))
 
 
 def quart_app_factory():
@@ -397,16 +405,26 @@ async def error_handler(err):
 
     client = app.test_client()
 
-    with pytest.raises(ZeroDivisionError):
+    if QUART_VERSION >= (0, 21, 0):
+        # Exception propagation behavior changed in 0.21.0
         await client.get("/")
 
-    event1, event2 = events
+        (event,) = events
 
-    (exception,) = event1["exception"]["values"]
-    assert exception["type"] == "ValueError"
+        (exception,) = event["exception"]["values"]
+        assert exception["type"] == "ValueError"
 
-    exception = event2["exception"]["values"][-1]
-    assert exception["type"] == "ZeroDivisionError"
+    else:
+        with pytest.raises(ZeroDivisionError):
+            await client.get("/")
+
+        event1, event2 = events
+
+        (exception,) = event1["exception"]["values"]
+        assert exception["type"] == "ValueError"
+
+        exception = event2["exception"]["values"][-1]
+        assert exception["type"] == "ZeroDivisionError"
 
 
 @pytest.mark.asyncio