pact-python-ffi 0.5.12.0__tar.gz → 0.5.12.1__tar.gz

{pact_python_ffi-0.5.12.0 → pact_python_ffi-0.5.12.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: pact-python-ffi
-Version: 0.5.12.0
+Version: 0.5.12.1
 Summary: Python bindings for the Pact FFI library
 Project-URL: Bug Tracker, https://github.com/pact-foundation/pact-python/issues
 Project-URL: Changelog, https://github.com/pact-foundation/pact-python/blob/main/pact-python-ffi/CHANGELOG.md
@@ -28,6 +28,7 @@ Classifier: Programming Language :: Python :: 3.14
 Classifier: Programming Language :: Python :: 3.15
 Classifier: Topic :: Software Development :: Testing
 Requires-Python: >=3.11
+Requires-Dist: cffi>=2.1.1; python_version >= '3.15'
 Requires-Dist: cffi~=2.0
 Description-Content-Type: text/markdown
 

{pact_python_ffi-0.5.12.0 → pact_python_ffi-0.5.12.1}/hatch_build.py

@@ -12,6 +12,7 @@ import os
 import shutil
 import subprocess
 import sys
+import sysconfig
 import tarfile
 import tempfile
 import urllib.request
@@ -30,6 +31,21 @@ PKG_DIR = Path(__file__).parent.resolve() / "src" / "pact_ffi"
 PACT_RELEASE_URL = "https://github.com/pact-foundation/pact-reference/releases/download/pact_ffi-v{version}"
 
 
+def _stable_abi() -> str:
+    """
+    Determine the stable ABI targeted by the current interpreter.
+
+    CFFI compiles against `abi3t` on free-threaded CPython 3.15+ and against
+    `abi3` otherwise. Free-threaded interpreters do not load `abi3` extensions.
+
+    Returns:
+        Either `abi3` or `abi3t`.
+    """
+    if sysconfig.get_config_var("Py_GIL_DISABLED"):
+        return "abi3t"
+    return "abi3"
+
+
 class UnsupportedPlatformError(RuntimeError):
     """
     Custom error raised when the current platform is not supported.
@@ -199,12 +215,12 @@ class PactBuildHook(BuildHookInterface[Any]):
         # Compile the FFI extension
         extension = self._compile(lib, header)
 
-        # Copy into the package directory, using the ABI3 marking for broad
-        # compatibility.
+        # Copy into the package directory, using the stable ABI marking for
+        # broad compatibility.
         # NOTE: Windows does _not_ use the version infixation
         name = extension.name.split(".")[0]
         suffix = extension.suffix
-        infix = ".abi3" if os.name != "nt" else ""
+        infix = f".{_stable_abi()}" if os.name != "nt" else ""
         extension_dest = f"{name}{infix}{suffix}"
         shutil.copy(extension, PKG_DIR / extension_dest)
 
@@ -474,13 +490,17 @@ class PactBuildHook(BuildHookInterface[Any]):
         """
         Infer the tag for the current build.
 
-        The bindings are built to target ABI3, which is compatible with multiple
-        Python versions. As a result, we generate `py{version}-abi3-{platform}`
-        tags for the wheels.
+        The bindings are built to target the stable ABI, which is compatible
+        with multiple Python versions. As a result, we generate
+        `cp{version}-abi3-{platform}` tags for the wheels.
 
         While the ABI3 interface was introduced in Python 3.2, we target the
         earliest supported version of Python in the Python wrapper.
 
+        A free-threaded build targets `abi3t`, which requires Python 3.15. Its
+        wheel takes the `cp{version}-abi3.abi3t-{platform}` tag, as the
+        extension also loads on GIL-enabled builds.
+
         Returns:
             The tag for the current build.
         """
@@ -501,4 +521,5 @@ class PactBuildHook(BuildHookInterface[Any]):
             else:
                 raise UnsupportedPlatformError(platform)
 
-        return f"cp{python_version}-abi3-{platform}"
+        abi = "abi3.abi3t" if _stable_abi() == "abi3t" else "abi3"
+        return f"cp{python_version}-{abi}-{platform}"

{pact_python_ffi-0.5.12.0 → pact_python_ffi-0.5.12.1}/pact_ffi/__init__.py

@@ -90,6 +90,7 @@ from __future__ import annotations
 import inspect
 import json
 import logging
+import threading
 import typing
 import warnings
 from collections.abc import Callable
@@ -2522,8 +2523,10 @@ def logger_apply() -> int:
 
 
 # The CFFI callback must outlive the registration, as the Pact library holds a
-# raw function pointer to it.
+# raw function pointer to it. The lock keeps the registered callback and the
+# stored reference in step when several threads register at once.
 _log_callback: Callable[..., None] | None = None
+_log_callback_lock = threading.Lock()
 
 
 def register_log_callback(callback: LogCallback | None) -> None:
@@ -2556,8 +2559,9 @@ def register_log_callback(callback: LogCallback | None) -> None:
     global _log_callback  # noqa: PLW0603
 
     if callback is None:
-        lib.pactffi_register_log_callback(ffi.NULL)
-        _log_callback = None
+        with _log_callback_lock:
+            lib.pactffi_register_log_callback(ffi.NULL)
+            _log_callback = None
         return
 
     def _decode(ptr: cffi.FFI.CData) -> str:
@@ -2580,8 +2584,9 @@ def register_log_callback(callback: LogCallback | None) -> None:
         )
 
     new_callback = ffi.callback("LogCallback", _callback)
-    lib.pactffi_register_log_callback(new_callback)
-    _log_callback = new_callback
+    with _log_callback_lock:
+        lib.pactffi_register_log_callback(new_callback)
+        _log_callback = new_callback
 
 
 def set_log_callback_level(level_filter: LevelFilter | str) -> None:
@@ -8028,8 +8033,10 @@ def set_test_run_id(test_run_id: str | None) -> None:
 
 
 # The CFFI callback must outlive the registration, as the Pact library holds a
-# raw function pointer to it.
+# raw function pointer to it. The lock keeps the registered callback and the
+# stored reference in step when several threads register at once.
 _plugin_log_callback: Callable[..., None] | None = None
+_plugin_log_callback_lock = threading.Lock()
 
 
 def register_plugin_log_callback(callback: PluginLogCallback | None) -> None:
@@ -8056,8 +8063,9 @@ def register_plugin_log_callback(callback: PluginLogCallback | None) -> None:
     global _plugin_log_callback  # noqa: PLW0603
 
     if callback is None:
-        lib.pactffi_register_plugin_log_callback(ffi.NULL)
-        _plugin_log_callback = None
+        with _plugin_log_callback_lock:
+            lib.pactffi_register_plugin_log_callback(ffi.NULL)
+            _plugin_log_callback = None
         return
 
     def _decode(ptr: cffi.FFI.CData) -> str:
@@ -8083,8 +8091,9 @@ def register_plugin_log_callback(callback: PluginLogCallback | None) -> None:
         "void(*)(const char *, const char *, const char *, const char *, const char *)",
         _callback,
     )
-    lib.pactffi_register_plugin_log_callback(new_callback)
-    _plugin_log_callback = new_callback
+    with _plugin_log_callback_lock:
+        lib.pactffi_register_plugin_log_callback(new_callback)
+        _plugin_log_callback = new_callback
 
 
 def get_plugin_logs(plugin_instance_id: str) -> list[dict[str, Any]]:

{pact_python_ffi-0.5.12.0 → pact_python_ffi-0.5.12.1}/pact_ffi/__version__.py

@@ -1,5 +1,5 @@
 # Generated at build time from the project version. Do not edit.
-__version__ = version = '0.5.12.0'
+__version__ = version = '0.5.12.1'
 __version_tuple__ = version_tuple = tuple(
     int(part) if part.isdigit() else part for part in __version__.split(".")
 )

{pact_python_ffi-0.5.12.0 → pact_python_ffi-0.5.12.1}/pyproject.toml

@@ -2,7 +2,7 @@
 
 [project]
 name = "pact-python-ffi"
-version = "0.5.12.0"
+version = "0.5.12.1"
 description = "Python bindings for the Pact FFI library"
 readme = "README.md"
 license = "MIT"
@@ -31,7 +31,11 @@ classifiers = [
 
 requires-python = ">=3.11"
 
-dependencies = ["cffi~=2.0"]
+dependencies = [
+  # Earlier releases do not support Python 3.15.
+  "cffi>=2.1.1 ; python_version >= '3.15'",
+  "cffi~=2.0",
+]
 
   [project.urls]
   "Bug Tracker" = "https://github.com/pact-foundation/pact-python/issues"
@@ -41,12 +45,12 @@ dependencies = ["cffi~=2.0"]
   "Repository" = "https://github.com/pact-foundation/pact-python"
 
 [dependency-groups]
-dev = ["ruff==0.17.1", { include-group = "test" }, { include-group = "types" }]
+dev = ["ruff==0.17.2", { include-group = "test" }, { include-group = "types" }]
 test = ["pytest~=9.0", "pytest-cov~=7.0"]
 types = ["mypy==2.4.0"]
 
 [build-system]
-requires = ["cffi", "hatchling", "packaging", "setuptools"]
+requires = ["cffi>=2.1.1", "hatchling", "packaging", "setuptools"]
 build-backend = "hatchling.build"
 
 [tool]
@@ -68,6 +72,10 @@ build-backend = "hatchling.build"
     pact-ffi = ["/src/pact_ffi"]
     tests = ["/tests"]
 
+    [tool.coverage.run]
+    # Tests which apply a process-wide logger run in a separate interpreter.
+    patch = ["subprocess"]
+
     [tool.coverage.report]
     exclude_lines = [
       "@(abc\\.)?abstractmethod",  # Ignore abstract methods
@@ -116,7 +124,7 @@ __version_tuple__ = version_tuple = tuple(
       dependency-groups = ["test"]
 
         [[tool.hatch.envs.test.matrix]]
-        python = ["3.11", "3.12", "3.13", "3.14", "3.15"]
+        python = ["3.11", "3.12", "3.13", "3.14", "3.15", "3.15t"]
 
   ## PyTest Configuration
   [tool.pytest]