build(deps): drop Python 3.9, bump httpx/pytest-httpx, adapt async mocker

Raise the runtime floor to Python 3.10 (verified on 3.10 and 3.12) and
modernize the HTTP toolchain:

  - python >=3.10,<4 (drop 3.9 from deps and CI matrix)
  - httpx >=0.28, pytest-httpx >=0.35, inflect >=7
  - dev: pytest >=8,<9, pytest-asyncio >=0.24,<2, pytest-cov <7

pytest-httpx >=0.35 (which pulls httpx 0.28) is the only path to httpx
0.28, and it forces the pytest/pytest-asyncio bumps transitively. Its
0.31+ API changes break the async mocker, so adapt it:

  - HTTPXMock now requires _HTTPXMockOptions; construct it with
    assert_all_requests_were_expected=False and
    can_send_already_matched_responses=True to preserve the previous
    behaviour (one registered response answers retried requests).
  - reset() no longer performs assertions; call _assert_options()
    explicitly, gated by success, to keep failing on unrequested mocks.
  - match_content now serializes JSON with compact separators to match
    httpx 0.28's compact request-body serialization.

Mark test_execute_error_with_reason (native httpx_mock fixture, retries
on 500) with the matching httpx_mock options. All 399 tests pass.

Author: pcaro

.github/workflows/build.yml

@@ -14,7 +14,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: ['3.9', '3.10', '3.11', '3.12']
+        python-version: ['3.10', '3.11', '3.12']
     steps:
     - name: Checkout
       uses: actions/checkout@v3

connect/client/testing/fluent.py

@@ -10,6 +10,7 @@
 import responses
 from pytest import MonkeyPatch
 from pytest_httpx import HTTPXMock
+from pytest_httpx._options import _HTTPXMockOptions
 from responses import matchers
 
 from connect.client.fluent import _ConnectClientBase
@@ -165,7 +166,15 @@ def _get_namespace_class(self):
 
 
 _monkeypatch = MonkeyPatch()
-_async_mocker = HTTPXMock()
+# Preserve the pre-0.31 pytest-httpx behaviour our mocker relies on: a single
+# registered response answers repeated (retried) requests, and unmatched
+# requests don't fail teardown by themselves.
+_async_mocker = HTTPXMock(
+    _HTTPXMockOptions(
+        assert_all_requests_were_expected=False,
+        can_send_already_matched_responses=True,
+    ),
+)
 
 
 class AsyncConnectClientMocker(ConnectClientMocker):
@@ -194,8 +203,14 @@ async def mocked_handle_async_request(
         )
 
     def reset(self, success=True):
-        _async_mocker.reset(success)
-        _monkeypatch.undo()
+        try:
+            if success:
+                # pytest-httpx>=0.31 no longer asserts on reset(); do it explicitly
+                # so unrequested mocks / unexpected requests still fail the test.
+                _async_mocker._assert_options()
+        finally:
+            _async_mocker.reset()
+            _monkeypatch.undo()
 
     def mock(
         self,
@@ -222,7 +237,12 @@ def mock(
 
         if match_body:
             if isinstance(match_body, (dict, list, tuple)):
-                kwargs['match_content'] = json.dumps(match_body).encode('utf-8')
+                # httpx>=0.28 serializes JSON request bodies compactly, so match
+                # the same separators or match_content won't compare equal.
+                kwargs['match_content'] = json.dumps(
+                    match_body,
+                    separators=(',', ':'),
+                ).encode('utf-8')
             else:
                 kwargs['match_content'] = match_body
 

poetry.lock

@@ -17,7 +17,6 @@ classifiers = [
     "Environment :: Console",
     "Operating System :: OS Independent",
     "Intended Audience :: Developers",
-    "Programming Language :: Python :: 3.9",
     "Programming Language :: Python :: 3.10",
     "Programming Language :: Python :: 3.11",
     "Programming Language :: Python :: 3.12",
@@ -35,20 +34,20 @@ keywords = [
 ]
 
 [tool.poetry.dependencies]
-python = ">=3.9,<4"
+python = ">=3.10,<4"
 connect-markdown-renderer = "^3"
 PyYAML = ">=5.3.1"
 requests = ">=2.23"
-inflect = ">=4.1"
-httpx = ">=0.23"
+inflect = ">=7"
+httpx = ">=0.28"
 asgiref = "^3.3.4"
 responses = ">=0.14.0,<1"
-pytest-httpx = ">=0.27,<0.30"
+pytest-httpx = ">=0.35"
 
 [tool.poetry.group.test.dependencies]
 black = "23.*"
-pytest = ">=6.1.2,<8"
-pytest-cov = ">=2.10.1,<5"
+pytest = ">=8,<9"
+pytest-cov = ">=2.10.1,<7"
 pytest-mock = "^3.10"
 coverage = {extras = ["toml"], version = ">=5.3,<7"}
 flake8 = ">=6"
@@ -62,7 +61,7 @@ flake8-isort = "^6.0"
 flake8-broken-line = ">=1.0"
 flake8-pyproject = "^1.2.3"
 isort = "^5.10"
-pytest-asyncio = "^0.15.1"
+pytest-asyncio = ">=0.24,<2"
 
 [tool.poetry.group.docs.dependencies]
 mkdocs = "^1.3.1"

pyproject.toml

@@ -348,6 +348,10 @@ async def test_execute_uparseable_connect_error(httpx_mock):
 
 
 @pytest.mark.asyncio
+@pytest.mark.httpx_mock(
+    assert_all_requests_were_expected=False,
+    can_send_already_matched_responses=True,
+)
 @pytest.mark.parametrize('encoding', ('utf-8', 'iso-8859-1'))
 async def test_execute_error_with_reason(httpx_mock, encoding):
     httpx_mock.add_response(