Merge remote-tracking branch 'upstream/main' into python314

Author: tobiasdiez

.github/workflows/ci.yml

@@ -21,8 +21,8 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: ['macos-13', 'macos-latest', 'ubuntu-latest', 'windows-latest']
-        python-version: ['3.12', '3.13', '3.14.0-rc.3']
+        os: ['macos-14', 'macos-latest', 'ubuntu-latest', 'windows-latest']
+        python-version: ['3.11', '3.12', '3.13', '3.14']
     steps:
     - name: Set up the repository
       uses: actions/checkout@v4

.github/workflows/dist.yml

@@ -35,7 +35,7 @@ jobs:
           - ubuntu-24.04-arm
           - windows-latest
           - windows-11-arm
-          - macos-13
+          - macos-14
           - macos-latest
     steps:
       - uses: actions/checkout@v4

README.rst

@@ -23,7 +23,7 @@ Requirements
 ------------
 
 - Python >= 3.12
-- Cython >= 0.28
+- Cython >= 3.1
 - Sphinx >= 1.6 (for building the documentation)
 
 Links

pyproject.toml

@@ -1,5 +1,5 @@
 [build-system]
-requires = ["meson-python", "cython>=0.28"]
+requires = ["meson-python", "cython>=3.1"]
 build-backend = "mesonpy"
 
 [project]

src/conftest.py

@@ -31,6 +31,7 @@ def pytest_collect_file(
             _, module_name = resolve_pkg_root_and_module_name(file_path)
             module = importlib.import_module(module_name)
             # delete __test__ injected by cython, to avoid duplicate tests
-            del module.__test__
+            if hasattr(module, '__test__'):
+                del module.__test__
             return DoctestModule.from_parent(parent, path=file_path)
     return None

src/cysignals/alarm.pyx

@@ -1,3 +1,4 @@
+# cython: freethreading_compatible = True
 """
 Fine-grained alarm function
 """

src/cysignals/implementation.c

@@ -120,7 +120,7 @@ static void setup_cysignals_handlers(void);
 static void cysigs_interrupt_handler(int sig);
 static void cysigs_signal_handler(int sig);
 
-static void do_raise_exception(int sig);
+static void _do_raise_exception(int sig);
 static void sigdie(int sig, const char* s);
 
 #define BACKTRACELEN 1024
@@ -392,11 +392,10 @@ static void cysigs_interrupt_handler(int sig)
     {
         if (!cysigs.block_sigint && !custom_signal_is_blocked())
         {
-            /* Raise an exception so Python can see it */
-            do_raise_exception(sig);
-
+            /* Jump back to sig_on() (the first one if there is a stack).
+             * The signal number is encoded in the return value of sigsetjmp.
+             * Do NOT call Python code from signal handler! */
 #if !_WIN32
-            /* Jump back to sig_on() (the first one if there is a stack) */
             siglongjmp(trampoline, sig);
 #endif
         }
@@ -449,10 +448,10 @@ static void cysigs_signal_handler(int sig)
         }
 #endif
 
-        /* Raise an exception so Python can see it */
-        do_raise_exception(sig);
+        /* Jump back to sig_on() (the first one if there is a stack).
+         * The signal number is encoded in the return value of sigsetjmp.
+         * Do NOT call Python code from signal handler! */
     #if !_WIN32
-        /* Jump back to sig_on() (the first one if there is a stack) */
         siglongjmp(trampoline, sig);
     #endif
     }
@@ -554,15 +553,15 @@ static void setup_trampoline(void)
 
 
 /* This calls sig_raise_exception() to actually raise the exception. */
-static void do_raise_exception(int sig)
+static void _do_raise_exception(int sig)
 {
 #if ENABLE_DEBUG_CYSIGNALS
     struct timespec raisetime;
     if (cysigs.debug_level >= 2) {
         get_monotonic_time(&raisetime);
         long delta_ms = (raisetime.tv_sec - sigtime.tv_sec)*1000L + (raisetime.tv_nsec - sigtime.tv_nsec)/1000000L;
         PyGILState_STATE gilstate = PyGILState_Ensure();
-        print_stderr("do_raise_exception(sig=");
+        print_stderr("_do_raise_exception(sig=");
         print_stderr_long(sig);
         print_stderr(")\nPyErr_Occurred() = ");
         print_stderr_ptr(PyErr_Occurred());
@@ -588,7 +587,7 @@ static void _sig_on_interrupt_received(void)
     sigprocmask(SIG_BLOCK, &sigmask_with_sigint, &oldset);
 #endif
 
-    do_raise_exception(cysigs.interrupt_received);
+    _do_raise_exception(cysigs.interrupt_received);
     cysigs.sig_on_count = 0;
     cysigs.interrupt_received = 0;
     custom_set_pending_signal(0);

src/cysignals/macros.h

@@ -143,12 +143,22 @@ static inline int _sig_on_prejmp(const char* message, CYTHON_UNUSED const char*
 /*
  * Process the return value of cysetjmp().
  * Return 0 if there was an exception, 1 otherwise.
+ *
+ * This function propagates the signal number naturally via jmpret
+ * (the return value from sigsetjmp/cylongjmp), which is always nonzero
+ * when a signal occurs. This avoids using global state and eliminates
+ * potential desynchronization between the jump return value and any
+ * stored signal number.
  */
 static inline int _sig_on_postjmp(int jmpret)
 {
     if (unlikely(jmpret > 0))
     {
-        /* An exception occurred */
+        /* A signal occurred and we jumped back via longjmp.
+         * jmpret contains the signal number that was passed to siglongjmp.
+         * Now we're back in a safe context (not in signal handler),
+         * so it's safe to call Python code to raise the exception. */
+        _do_raise_exception(jmpret);
         _sig_on_recover();
         return 0;
     }

src/cysignals/pselect.pyx

@@ -1,3 +1,4 @@
+# cython: freethreading_compatible = True
 """
 Interface to the ``pselect()`` and ``sigprocmask()`` system calls
 =================================================================
@@ -33,13 +34,31 @@ We wait for a child created using the ``subprocess`` module::
     >>> p.poll()  # p should be finished
     0
 
-Now using the ``multiprocessing`` module::
+Now using the ``multiprocessing`` module with ANY start method::
 
     >>> from cysignals.pselect import PSelecter
-    >>> from multiprocessing import *
-    >>> import time
+    >>> from multiprocessing import get_context
+    >>> import time, sys
+    >>> # Works with any start method - uses process sentinel
+    >>> ctx = get_context()  # Uses default (forkserver on 3.14+, fork on older)
+    >>> with PSelecter() as sel:
+    ...     p = ctx.Process(target=time.sleep, args=(1,))
+    ...     p.start()
+    ...     # Monitor process.sentinel instead of SIGCHLD
+    ...     r, w, x, t = sel.pselect(rlist=[p.sentinel], timeout=2)
+    ...     p.is_alive()  # p should be finished
+    False
+
+For SIGCHLD-based monitoring (requires 'fork' on Python 3.14+)::
+
+    >>> import signal
+    >>> def dummy_handler(sig, frame):
+    ...     pass
+    >>> _ = signal.signal(signal.SIGCHLD, dummy_handler)
+    >>> # Use 'fork' method for SIGCHLD to work properly
+    >>> ctx = get_context('fork') if sys.version_info >= (3, 14) else get_context()
     >>> with PSelecter([signal.SIGCHLD]) as sel:
-    ...     p = Process(target=time.sleep, args=(1,))
+    ...     p = ctx.Process(target=time.sleep, args=(1,))
     ...     p.start()
     ...     _ = sel.sleep()
     ...     p.is_alive()  # p should be finished
@@ -289,12 +308,14 @@ cdef class PSelecter:
 
         Start a process which will cause a ``SIGCHLD`` signal::
 
-            >>> import time
-            >>> from multiprocessing import *
+            >>> import time, sys
+            >>> from multiprocessing import get_context
             >>> from cysignals.pselect import PSelecter, interruptible_sleep
+            >>> # For SIGCHLD, must use 'fork' on Python 3.14+
+            >>> ctx = get_context('fork') if sys.version_info >= (3, 14) else get_context()
             >>> w = PSelecter([signal.SIGCHLD])
             >>> with w:
-            ...     p = Process(target=time.sleep, args=(0.25,))
+            ...     p = ctx.Process(target=time.sleep, args=(0.25,))
             ...     t0 = time.time()
             ...     p.start()
 

src/cysignals/pysignals.pyx

@@ -1,3 +1,4 @@
+# cython: freethreading_compatible = True
 r"""
 Python interface to signal handlers
 ===================================