Merge pull request #2095 from minrk/314

test on CPython 3.14-pre

Author: minrk

.github/workflows/test.yml

@@ -25,14 +25,12 @@ concurrency:
 
 env:
   FORCE_COLOR: "1"
-  # only affects Windows, but easiest to set here for now
-  SETUPTOOLS_ENABLE_FEATURES: "legacy-editable"
 
 jobs:
   test:
     runs-on: ${{ matrix.os }}
     timeout-minutes: 20
-    continue-on-error: ${{ matrix.zmq == 'head' }}
+    continue-on-error: ${{ matrix.zmq == 'head' || matrix.python == '3.14' }}
 
     env:
       MACOSX_DEPLOYMENT_TARGET: "13.7"
@@ -44,10 +42,6 @@ jobs:
           - os: macos-13
             python: "3.8"
 
-          - os: macos-14
-            python: "3.12"
-            zmq: bundled
-
           - os: macos-14
             python: "3.13"
             zmq: bundled
@@ -70,7 +64,6 @@ jobs:
 
           - os: ubuntu-22.04
             python: "3.9"
-            tornado: head
 
           - os: ubuntu-22.04
             python: "3.10"
@@ -81,6 +74,7 @@ jobs:
 
           - os: ubuntu-24.04
             python: "3.12"
+            tornado: head
 
           - os: ubuntu-24.04
             python: "3.13"
@@ -93,6 +87,13 @@ jobs:
             python: "3.13"
             free_threading: free_threading
 
+          - os: ubuntu-24.04
+            python: "3.14"
+
+          - os: ubuntu-24.04
+            python: "3.14"
+            free_threading: free_threading
+
           - os: windows-2022
             python: "3.8"
             arch: x86
@@ -110,43 +111,26 @@ jobs:
 
       - name: setup python
         uses: actions/setup-python@v5
-        if: ${{ !matrix.free_threading }}
         with:
           python-version: ${{ matrix.python }}
           architecture: ${{ matrix.arch || 'x64' }}
           # allows us to use '3.12' and get '-dev' while we wait
           allow-prereleases: true
+          freethreaded: ${{ matrix.free_threading == 'free_threading' }}
+          check-latest: ${{ matrix.python == '3.14' }}
           cache: pip
 
-      - name: setup python (free threading)
-        if: ${{ matrix.free_threading }}
-        uses: mamba-org/setup-micromamba@v2
-        with:
-          environment-name: nogil
-          condarc: |
-            channels:
-              - ad-testing/label/py313_nogil
-              - defaults
-          create-args: >-
-            python=${{ matrix.python-version }}
-            pip
-
-      - name: activate python (free threading)
+      - name: setup free threading
         if: ${{ matrix.free_threading }}
-        # light activate, just add env to path
-        # run this in micromamba-shell
-        # so we don't have to for the rest
         run: |
-          echo $PATH
-          echo "PATH=$PATH" >> "$GITHUB_ENV"
           echo "PYTHON_GIL=0" >> "$GITHUB_ENV"
           # need prerelease Cython until 3.1 is out
           echo "PIP_PRE=1" >> "$GITHUB_ENV"
           echo "PIP_EXTRA_INDEX_URL=https://pypi.anaconda.org/scientific-python-nightly-wheels/simple" >> "$GITHUB_ENV"
-        shell: micromamba-shell {0}
+          echo "EXTRA_PIP=--no-binary coverage" >> "$GITHUB_ENV"
 
       - name: setup coverage
-        if: startsWith(matrix.python, 'pypy') || startsWith(matrix.python, '3.12')
+        if: startsWith(matrix.python, 'pypy') || startsWith(matrix.python, '3.14')
         run: |
           grep -v plugins .coveragerc > .coveragerc-save
           mv .coveragerc-save .coveragerc
@@ -159,7 +143,7 @@ jobs:
       - name: install dependencies
         run: |
           pip install --upgrade pip wheel
-          pip install -r test-requirements.txt
+          pip install ${EXTRA_PIP:-} -r test-requirements.txt
 
       - name: remove tornado
         if: matrix.tornado == 'none'

tests/test_message.py

@@ -4,7 +4,6 @@
 
 import copy
 import gc
-import sys
 
 try:
     from sys import getrefcount
@@ -18,6 +17,7 @@
 import pytest
 
 import zmq
+from zmq.utils.garbage import gc as zmq_gc
 from zmq_test_utils import PYPY, BaseZMQTestCase, SkipTest, skip_cpython_cffi, skip_pypy
 
 # some useful constants:
@@ -30,40 +30,52 @@
     view_rc = grc(x) - rc0
 
 
-def await_gc(obj, rc):
-    """wait for refcount on an object to drop to an expected value
+def await_gc(gc_key):
+    """wait for zmq garbage collection
 
     Necessary because of the zero-copy gc thread,
     which can take some time to receive its DECREF message.
     """
-    # count refs for this function
-    if sys.version_info < (3, 11):
-        my_refs = 2
-    else:
-        my_refs = 1
-    for i in range(50):
-        # rc + 2 because of the refs in this function
-        if grc(obj) <= rc + my_refs:
+    deadline = time.monotonic() + 3
+    gc.collect()
+    while time.monotonic() < deadline:
+        if gc_key in zmq_gc.refs:
+            time.sleep(0.05)
+        else:
+            gc.collect()
             return
-        time.sleep(0.05)
+    raise TimeoutError("gc not collected")
 
 
 class TestFrame(BaseZMQTestCase):
+    def setUp(self):
+        super().setUp()
+        # make sure we are starting clean
+        assert not zmq_gc.refs
+
     def tearDown(self):
         super().tearDown()
         for i in range(3):
             gc.collect()
 
+        deadline = time.monotonic() + 3
+        while zmq_gc.refs and time.monotonic() < deadline:
+            time.sleep(0.05)
+
+        # make sure we left no refs
+        assert not zmq_gc.refs
+
     @skip_pypy
     def test_above_30(self):
         """Message above 30 bytes are never copied by 0MQ."""
         for i in range(5, 16):  # 32, 64,..., 65536
             s = (2**i) * x
             rc = grc(s)
             m = zmq.Frame(s, copy=False)
+            _gc_ref = next(iter(zmq_gc.refs))
             assert grc(s) == rc + 2
             del m
-            await_gc(s, rc)
+            await_gc(_gc_ref)
             assert grc(s) == rc
             del s
 
@@ -116,6 +128,7 @@ def test_lifecycle1(self):
             s = (2**i) * x
             rc = rc_0 = grc(s)
             m = zmq.Frame(s, copy=False)
+            _gc_ref = next(iter(zmq_gc.refs))
             rc += 2
             assert grc(s) == rc
             m2 = copy.copy(m)
@@ -137,7 +150,7 @@ def test_lifecycle1(self):
             assert grc(s) == rc
             del m
             rc -= 2
-            await_gc(s, rc)
+            await_gc(_gc_ref)
             assert grc(s) == rc
             assert rc == rc_0
             del s
@@ -149,6 +162,7 @@ def test_lifecycle2(self):
             s = (2**i) * x
             rc = rc_0 = grc(s)
             m = zmq.Frame(s, copy=False)
+            _gc_ref = next(iter(zmq_gc.refs))
             rc += 2
             assert grc(s) == rc
             m2 = copy.copy(m)
@@ -169,7 +183,7 @@ def test_lifecycle2(self):
             assert grc(s) == rc
             del m2
             rc -= 2
-            await_gc(s, rc)
+            await_gc(_gc_ref)
             assert grc(s) == rc
             assert rc == rc_0
             del s