Merge branch 'major/3.0' into webb/openai-agents/remove-transactions

Author: alexander-alderman-webb

.github/workflows/test-integrations-network.yml

@@ -41,10 +41,10 @@ jobs:
         run: |
           set -x # print commands that are executed
           ./scripts/runtox.sh "py${{ matrix.python-version }}-grpc"
-      - name: Test httpx
+      - name: Test httpx0
         run: |
           set -x # print commands that are executed
-          ./scripts/runtox.sh "py${{ matrix.python-version }}-httpx"
+          ./scripts/runtox.sh "py${{ matrix.python-version }}-httpx0"
       - name: Test httpx2
         run: |
           set -x # print commands that are executed

pyproject.toml

@@ -77,6 +77,8 @@ typing = [
     "anthropic>=1.2.0",
     "google-genai>=2.21.0",
     "openai>=3.7.0",
+    "tiktoken>=0.14.0",
+    "aiohttp>=3.14.3",
 ]
 test = [
     "dataclasses ; python_full_version < '3.7'",

scripts/populate_tox/README.md

@@ -146,7 +146,7 @@ a Python version older than 3.9 if the HTTPX version is 0.28 or higher, you can
 say:
 
 ```python
-"httpx": {
+"httpx0": {
     "python": {
         # run the test suite for httpx v0.28+ on Python 3.9+ only
         ">=0.28": ">=3.9",

scripts/populate_tox/config.py

@@ -196,8 +196,9 @@
             ],
         },
     },
-    "httpx": {
+    "httpx0": {
         "package": "httpx",
+        "integration_name": "httpx",
         "deps": {
             "*": ["anyio>=3,<5", "pytest-asyncio"],
             "<0.24": ["anyio<4"],

scripts/split_tox_gh_actions/split_tox_gh_actions.py

@@ -127,7 +127,7 @@
     ],
     "Network": [
         "grpc",
-        "httpx",
+        "httpx0",
         "httpx2",
         "pyreqwest",
         "requests",

sentry_sdk/integrations/aiohttp.py

@@ -261,7 +261,7 @@ async def sentry_app_handle(
 
                         return response
 
-        Application._handle = sentry_app_handle
+        Application._handle = sentry_app_handle  # type: ignore[method-assign]
 
         old_urldispatcher_resolve = UrlDispatcher.resolve
 
@@ -301,7 +301,7 @@ async def sentry_urldispatcher_resolve(
 
             return rv
 
-        UrlDispatcher.resolve = sentry_urldispatcher_resolve
+        UrlDispatcher.resolve = sentry_urldispatcher_resolve  # type: ignore[method-assign]
 
         old_client_session_init = ClientSession.__init__
 
@@ -314,7 +314,7 @@ def init(*args: "Any", **kwargs: "Any") -> None:
             kwargs["trace_configs"] = client_trace_configs
             return old_client_session_init(*args, **kwargs)
 
-        ClientSession.__init__ = init
+        ClientSession.__init__ = init  # type: ignore[method-assign]
 
 
 def create_trace_config() -> "TraceConfig":