Merge branch 'main' into Improvement-catch-duplicate-values-when-determining-param-indices-in-metafunc-parametrize

Author: sadra-barikbin

.pre-commit-config.yaml

@@ -1,6 +1,6 @@
 repos:
 -   repo: https://github.com/psf/black
-    rev: 23.11.0
+    rev: 23.12.0
     hooks:
     -   id: black
         args: [--safe, --quiet]

src/_pytest/_io/pprint.py

@@ -64,9 +64,6 @@ def __init__(
         indent: int = 4,
         width: int = 80,
         depth: Optional[int] = None,
-        *,
-        sort_dicts: bool = True,
-        underscore_numbers: bool = False,
     ) -> None:
         """Handle pretty printing operations onto a stream using a set of
         configured parameters.
@@ -80,12 +77,7 @@ def __init__(
         depth
             The maximum depth to print out nested structures.
 
-        sort_dicts
-            If true, dict keys are sorted.
-
         """
-        indent = int(indent)
-        width = int(width)
         if indent < 0:
             raise ValueError("indent must be >= 0")
         if depth is not None and depth <= 0:
@@ -95,8 +87,6 @@ def __init__(
         self._depth = depth
         self._indent_per_level = indent
         self._width = width
-        self._sort_dicts = sort_dicts
-        self._underscore_numbers = underscore_numbers
 
     def pformat(self, object: Any) -> str:
         sio = _StringIO()
@@ -174,10 +164,7 @@ def _pprint_dict(
     ) -> None:
         write = stream.write
         write("{")
-        if self._sort_dicts:
-            items = sorted(object.items(), key=_safe_tuple)
-        else:
-            items = object.items()
+        items = sorted(object.items(), key=_safe_tuple)
         self._format_dict_items(items, stream, indent, allowance, context, level)
         write("}")
 
@@ -486,12 +473,7 @@ def _format_items(
         write("\n" + " " * indent)
 
     def _repr(self, object: Any, context: Set[int], level: int) -> str:
-        return self.format(object, context.copy(), self._depth, level)
-
-    def format(
-        self, object: Any, context: Set[int], maxlevels: Optional[int], level: int
-    ) -> str:
-        return self._safe_repr(object, context, maxlevels, level)
+        return self._safe_repr(object, context.copy(), self._depth, level)
 
     def _pprint_default_dict(
         self,
@@ -616,12 +598,6 @@ def _safe_repr(
 
         r = getattr(typ, "__repr__", None)
 
-        if issubclass(typ, int) and r is int.__repr__:
-            if self._underscore_numbers:
-                return f"{object:_d}"
-            else:
-                return repr(object)
-
         if issubclass(typ, dict) and r is dict.__repr__:
             if not object:
                 return "{}"
@@ -634,13 +610,9 @@ def _safe_repr(
             components: List[str] = []
             append = components.append
             level += 1
-            if self._sort_dicts:
-                items = sorted(object.items(), key=_safe_tuple)
-            else:
-                items = object.items()
-            for k, v in items:
-                krepr = self.format(k, context, maxlevels, level)
-                vrepr = self.format(v, context, maxlevels, level)
+            for k, v in sorted(object.items(), key=_safe_tuple):
+                krepr = self._safe_repr(k, context, maxlevels, level)
+                vrepr = self._safe_repr(v, context, maxlevels, level)
                 append(f"{krepr}: {vrepr}")
             context.remove(objid)
             return "{%s}" % ", ".join(components)
@@ -668,15 +640,17 @@ def _safe_repr(
             append = components.append
             level += 1
             for o in object:
-                orepr = self.format(o, context, maxlevels, level)
+                orepr = self._safe_repr(o, context, maxlevels, level)
                 append(orepr)
             context.remove(objid)
             return format % ", ".join(components)
 
         return repr(object)
 
 
-_builtin_scalars = frozenset({str, bytes, bytearray, float, complex, bool, type(None)})
+_builtin_scalars = frozenset(
+    {str, bytes, bytearray, float, complex, bool, type(None), int}
+)
 
 
 def _recursion(object: Any) -> str:

testing/plugins_integration/requirements.txt

@@ -1,4 +1,4 @@
-anyio[curio,trio]==4.1.0
+anyio[curio,trio]==4.2.0
 django==5.0
 pytest-asyncio==0.23.2
 pytest-bdd==7.0.1