chore: bump to scim2-client 0.8.0

Author: azmeuk

doc/changelog.rst

@@ -1,6 +1,33 @@
 Changelog
 =========
 
+[Unreleased]
+------------
+
+Added
+^^^^^
+- The ``httpx2`` packaging extra, pulling ``scim2-client[httpx2]``.
+
+Changed
+^^^^^^^
+- scim2-client 0.8.0 is now the minimum supported version.
+- The :attr:`~scim2_tester.CheckResult.data` of a failed check holds the server response
+  instead of the request payload, as scim2-client 0.8 attaches the response to the
+  exceptions it raises.
+
+Deprecated
+^^^^^^^^^^
+- The ``httpx`` packaging extra, in favor of the ``httpx2`` extra. Will be removed
+  when scim2-client drops its own ``httpx`` extra.
+
+Fixed
+^^^^^
+- Checks performing one request per attribute, such as the PATCH ones, report one result
+  per attribute again when the server answers a SCIM error, instead of a single result
+  for the whole check.
+- ``check_server`` no longer registers the debugging data of a failed discovery check
+  as the resource types, the schemas or the service provider configuration of the client.
+
 [0.2.8] - 2026-04-02
 --------------------
 

doc/tutorial.rst

@@ -22,8 +22,8 @@ and pass it to the :meth:`~scim2_tester.check_server` method:
 
 .. code-block:: python
 
-    from httpx import Client
-    from scim2_client.engines.httpx import SyncSCIMClient
+    from httpx2 import Client
+    from scim2_client.engines.httpx2 import SyncSCIMClient
     from scim2_tester import check_server
 
     httpx_client = Client(

pyproject.toml

@@ -19,16 +19,15 @@ classifiers = [
     "Programming Language :: Python :: 3.13",
     "Programming Language :: Python :: 3.14",
     "Programming Language :: Python :: Implementation :: CPython",
-    "License :: OSI Approved :: Apache Software License",
     "Environment :: Web Environment",
     "Programming Language :: Python",
     "Operating System :: OS Independent",
 ]
 
 requires-python = ">= 3.10"
 dependencies = [
-    "scim2-client>=0.7.0",
-    "scim2-models>=0.6.1",
+    "scim2-client>=0.8.0",
+    "scim2-models>=0.7.0",
 ]
 
 [project.urls]
@@ -41,8 +40,13 @@ funding = "https://github.com/sponsors/python-scim"
 module-root = ""
 
 [project.optional-dependencies]
+httpx2 = [
+    "scim2-client[httpx2]>=0.8.0",
+]
+
+# Deprecated, will be removed in 0.9.
 httpx = [
-    "scim2-client[httpx]>=0.7.4",
+    "scim2-client[httpx]>=0.8.0",
 ]
 
 [dependency-groups]
@@ -134,13 +138,14 @@ env_list = [
     "py312",
     "py313",
     "py314",
+    "legacy",
     "minversions",
     "doc",
     "coverage",
 ]
 
 [tool.tox.env_run_base]
-extras = ["httpx"]
+extras = ["httpx2"]
 runner = "uv-venv-lock-runner"
 dependency_groups = ["dev"]
 commands = [
@@ -153,6 +158,9 @@ commands = [
     ["prek", "run", "--all-files", "--show-diff-on-failure"],
 ]
 
+[tool.tox.env.legacy]
+extras = ["httpx"]
+
 [tool.tox.env.minversions]
 base_python = ["python3.10"]
 runner = "uv-venv-runner"

scim2_tester/checker.py

@@ -1,4 +1,6 @@
-from scim2_client.engines.httpx import SyncSCIMClient
+from typing import Any
+
+from scim2_client.engines.httpx2 import SyncSCIMClient
 
 from scim2_tester.checkers import random_url
 from scim2_tester.checkers import resource_type_tests
@@ -11,6 +13,16 @@
 from scim2_tester.utils import Status
 
 
+def _discovered_objects(results: list[CheckResult]) -> Any:
+    """Extract the objects a discovery endpoint exposed.
+
+    Discovery orchestrators run the check querying the whole collection first,
+    so its result comes first. The data of the other statuses describes why the
+    check failed and must not be mistaken for discovered objects.
+    """
+    return results[0].data if results[0].status == Status.SUCCESS else None
+
+
 def check_server(
     client: SyncSCIMClient,
     raise_exceptions: bool = False,
@@ -72,29 +84,23 @@ def check_server(
     context = CheckContext(client, conf)
     results = []
 
-    result_spc_list = service_provider_config_endpoint(context)
-    results.extend(result_spc_list)
-    result_spc = result_spc_list[0]  # Get the first (and only) result
-    if result_spc.status != Status.SKIPPED and not client.service_provider_config:
-        client.service_provider_config = result_spc.data
+    results_spc = service_provider_config_endpoint(context)
+    results.extend(results_spc)
+    if not client.service_provider_config:
+        client.service_provider_config = _discovered_objects(results_spc)
 
     results_resource_types = _resource_types_endpoint(context)
     results.extend(results_resource_types)
     if not client.resource_types:
-        for rt_result in results_resource_types:
-            if rt_result.status != Status.SKIPPED and rt_result.data:
-                client.resource_types = rt_result.data
-                break
+        client.resource_types = _discovered_objects(results_resource_types)
 
     results_schemas = _schemas_endpoint(context)
     results.extend(results_schemas)
-    if not client.resource_models:
-        for schema_result in results_schemas:
-            if schema_result.status != Status.SKIPPED and schema_result.data:
-                client.resource_models = client.build_resource_models(
-                    client.resource_types or [], schema_result.data or []
-                )
-                break
+    schemas = _discovered_objects(results_schemas)
+    if not client.resource_models and schemas:
+        client.resource_models = client.build_resource_models(
+            client.resource_types or [], schemas
+        )
 
     if (
         not client.service_provider_config

scim2_tester/checkers/_discovery_utils.py

@@ -1,6 +1,7 @@
 """Utility functions for discovery endpoint testing."""
 
-from scim2_client import SCIMClientError
+from scim2_client import SCIMClientException
+from scim2_models import SCIMException
 
 from ..utils import CheckContext
 from ..utils import CheckResult
@@ -53,7 +54,7 @@ def _test_discovery_endpoint_methods(
                         data=response,
                     )
                 )
-        except SCIMClientError as e:
+        except (SCIMClientException, SCIMException) as e:
             results.append(
                 check_result(
                     context,

scim2_tester/checkers/patch_add.py

@@ -2,12 +2,13 @@
 
 from typing import Any
 
-from scim2_client import SCIMClientError
+from scim2_client import SCIMClientException
 from scim2_models import Mutability
 from scim2_models import PatchOp
 from scim2_models import PatchOperation
 from scim2_models import Required
 from scim2_models import Resource
+from scim2_models import SCIMException
 from scim2_models.path import Path
 
 from ..filling import generate_random_value
@@ -99,11 +100,11 @@ def check_add_attribute(
 
         try:
             modify_result = context.client.modify(
-                resource_model=type(base_resource),
+                resource=type(base_resource),
                 id=base_resource.id,
                 patch_op=patch_op,
             )
-        except SCIMClientError as exc:
+        except (SCIMClientException, SCIMException) as exc:
             results.append(
                 check_result(
                     context,
@@ -148,7 +149,7 @@ def check_add_attribute(
                 type(base_resource),
                 base_resource.id,
             )
-        except SCIMClientError as exc:
+        except (SCIMClientException, SCIMException) as exc:
             results.append(
                 check_result(
                     context,

scim2_tester/checkers/patch_remove.py

@@ -2,12 +2,13 @@
 
 from typing import Any
 
-from scim2_client import SCIMClientError
+from scim2_client import SCIMClientException
 from scim2_models import Mutability
 from scim2_models import PatchOp
 from scim2_models import PatchOperation
 from scim2_models import Required
 from scim2_models import Resource
+from scim2_models import SCIMException
 from scim2_models.path import Path
 
 from ..utils import CheckContext
@@ -95,11 +96,11 @@ def check_remove_attribute(
 
         try:
             modify_result = context.client.modify(
-                resource_model=type(full_resource),
+                resource=type(full_resource),
                 id=full_resource.id,
                 patch_op=remove_op,
             )
-        except SCIMClientError as exc:
+        except (SCIMClientException, SCIMException) as exc:
             results.append(
                 check_result(
                     context,
@@ -141,7 +142,7 @@ def check_remove_attribute(
                 type(full_resource),
                 full_resource.id,
             )
-        except SCIMClientError as exc:
+        except (SCIMClientException, SCIMException) as exc:
             results.append(
                 check_result(
                     context,

scim2_tester/checkers/patch_replace.py

@@ -2,11 +2,12 @@
 
 from typing import Any
 
-from scim2_client import SCIMClientError
+from scim2_client import SCIMClientException
 from scim2_models import Mutability
 from scim2_models import PatchOp
 from scim2_models import PatchOperation
 from scim2_models import Resource
+from scim2_models import SCIMException
 from scim2_models.path import Path
 
 from ..filling import generate_random_value
@@ -93,11 +94,11 @@ def check_replace_attribute(
 
         try:
             modify_result = context.client.modify(
-                resource_model=type(base_resource),
+                resource=type(base_resource),
                 id=base_resource.id,
                 patch_op=patch_op,
             )
-        except SCIMClientError as exc:
+        except (SCIMClientException, SCIMException) as exc:
             results.append(
                 check_result(
                     context,
@@ -142,7 +143,7 @@ def check_replace_attribute(
                 type(base_resource),
                 base_resource.id,
             )
-        except SCIMClientError as exc:
+        except (SCIMClientException, SCIMException) as exc:
             results.append(
                 check_result(
                     context,

scim2_tester/checkers/resource_types.py

@@ -1,9 +1,10 @@
 import uuid
 
-from scim2_client import SCIMClientError
+from scim2_client import SCIMClientException
 from scim2_models import Error
 from scim2_models import ResourceType
 from scim2_models import Schema
+from scim2_models import SCIMException
 
 from ..utils import CheckContext
 from ..utils import CheckResult
@@ -116,7 +117,7 @@ def resource_types_schema_validation(
                     data=schema_response,
                 )
             )
-        except SCIMClientError as e:
+        except (SCIMClientException, SCIMException) as e:
             results.append(
                 check_result(
                     context,

scim2_tester/checkers/schemas.py

@@ -1,8 +1,9 @@
 import uuid
 
-from scim2_client import SCIMClientError
+from scim2_client import SCIMClientException
 from scim2_models import Error
 from scim2_models import Schema
+from scim2_models import SCIMException
 
 from ..utils import CheckContext
 from ..utils import CheckResult
@@ -195,7 +196,7 @@ def access_schema_by_id(
                         data=response,
                     )
                 )
-            except SCIMClientError as e:
+            except (SCIMClientException, SCIMException) as e:
                 results.append(
                     check_result(
                         context,