pytest-codspeed 5.0.2__tar.gz → 5.0.3__tar.gz

{pytest_codspeed-5.0.2/src/pytest_codspeed.egg-info → pytest_codspeed-5.0.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pytest-codspeed
-Version: 5.0.2
+Version: 5.0.3
 Summary: Pytest plugin to create CodSpeed benchmarks
 Author-email: Arthur Pastel <arthur@codspeed.io>
 License: The MIT License (MIT)

{pytest_codspeed-5.0.2 → pytest_codspeed-5.0.3}/pyproject.toml

@@ -82,7 +82,7 @@ version = { attr = "pytest_codspeed.__version__" }
 
 
 [tool.bumpver]
-current_version = "5.0.2"
+current_version = "5.0.3"
 version_pattern = "MAJOR.MINOR.PATCH[-TAG[NUM]]"
 commit_message = "Release v{new_version} 🚀"
 tag_message = "Release v{new_version} 🚀"

{pytest_codspeed-5.0.2 → pytest_codspeed-5.0.3}/src/pytest_codspeed/__init__.py

@@ -1,6 +1,6 @@
-__version__ = "5.0.2"
+__version__ = "5.0.3"
 # We also have the semver version since __version__ is not semver compliant
-__semver_version__ = "5.0.2"
+__semver_version__ = "5.0.3"
 
 from .plugin import BenchmarkFixture
 

{pytest_codspeed-5.0.2 → pytest_codspeed-5.0.3}/src/pytest_codspeed/instruments/hooks/__init__.py

@@ -52,7 +52,7 @@ class InstrumentHooks:
 
         # Ignore libpython and python executable frames in callgrind so they
         # don't obfuscate the flamegraph.
-        callgrind_skip_python_runtime()
+        self._callgrind_skip_python_runtime()
 
     def __del__(self):
         # Don't manually deinit - let the capsule destructor handle it
@@ -228,46 +228,21 @@ class InstrumentHooks:
 
         self.write_environment()
 
-
-def callgrind_add_obj_skip(path: str) -> None:
-    """Tell callgrind to skip the given object file (and its realpath).
-
-    The actual Valgrind client-request trapdoor lives in the C extension; this
-    just resolves the realpath so callgrind's strcmp matches either form.
-    """
-    if not path or not os.path.exists(path):
-        return
-    try:
-        from . import dist_instrument_hooks  # type: ignore
-    except ImportError:
-        return
-
-    dist_instrument_hooks.callgrind_add_obj_skip(path.encode())
-
-    # The dynamic loader maps the realpath (e.g. libpython3.12.so.1.0), and
-    # callgrind stores that in obj_node->name. Skip both so the exact strcmp
-    # matches regardless of which path callgrind sees.
-    real = os.path.realpath(path)
-    if real != path:
-        dist_instrument_hooks.callgrind_add_obj_skip(real.encode())
-
-
-def callgrind_skip_python_runtime() -> None:
-    """Skip libpython and the python executable from callgrind measurement."""
-    ldlibrary = sysconfig.get_config_var("LDLIBRARY")
-    libdir = sysconfig.get_config_var("LIBDIR")
-    libpython = next(
-        (
-            p
-            for p in (
-                os.path.join(libdir, ldlibrary) if ldlibrary and libdir else None,
-                os.path.join(sys.prefix, "lib", ldlibrary) if ldlibrary else None,
-            )
-            if p and os.path.exists(p)
-        ),
-        None,
-    )
-    if libpython:
-        callgrind_add_obj_skip(libpython)
-
-    callgrind_add_obj_skip(sys.executable)
+    def _callgrind_skip_python_runtime(self) -> None:
+        """Skip libpython and the python executable from callgrind measurement."""
+        ldlibrary = sysconfig.get_config_var("LDLIBRARY")
+        libdir = sysconfig.get_config_var("LIBDIR")
+        libpython = next(
+            (
+                p
+                for p in (
+                    os.path.join(libdir, ldlibrary) if ldlibrary and libdir else None,
+                    os.path.join(sys.prefix, "lib", ldlibrary) if ldlibrary else None,
+                )
+                if p and os.path.exists(p)
+            ),
+            None,
+        )
+        if libpython:
+            self._module.callgrind_add_obj_skip(libpython.encode())
+        self._module.callgrind_add_obj_skip(sys.executable.encode())