Merge branch 'master' into ssl_optimizations

Author: tarasko

.github/workflows/release.yml

@@ -37,9 +37,9 @@ jobs:
         mkdir -p dist/
         echo "${VERSION}" > dist/VERSION
 
-    - uses: actions/upload-artifact@a8a3f3ad30e3422c9c7b888a15615d19a852ae32  # v3.1.3
+    - uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02  # v4.6.2
       with:
-        name: dist
+        name: dist-version
         path: dist/
 
   build-sdist:
@@ -55,7 +55,7 @@ jobs:
         fetch-depth: 50
         submodules: true
 
-    - uses: actions/setup-python@65d7f2d534ac1bc67fcd62888c5f4f3d2cb2b236  # v4.7.1
+    - uses: actions/setup-python@e797f83bcb11b83ae66e0230d6156d7c80228e7c  # v6.0.0
       with:
         python-version: 3.x
 
@@ -64,9 +64,9 @@ jobs:
         python -m pip install --upgrade setuptools wheel pip
         python setup.py sdist
 
-    - uses: actions/upload-artifact@a8a3f3ad30e3422c9c7b888a15615d19a852ae32  # v3.1.3
+    - uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02  # v4.6.2
       with:
-        name: dist
+        name: dist-sdist
         path: dist/*.tar.*
 
   build-wheels:
@@ -75,20 +75,28 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [ubuntu-latest, macos-latest]
-        cibw_python:
-        - "cp38-*"
-        - "cp39-*"
-        - "cp310-*"
-        - "cp311-*"
-        - "cp312-*"
-        - "cp313-*"
+        os: [ubuntu-latest, macos-latest, ubuntu-22.04-arm]
+        python:
+        - "cp38"
+        - "cp39"
+        - "cp310"
+        - "cp311"
+        - "cp312"
+        - "cp313"
+        - "cp314"
+        - "cp314t"
         cibw_arch: ["x86_64", "aarch64", "universal2"]
         exclude:
           - os: ubuntu-latest
             cibw_arch: universal2
+          - os: ubuntu-latest
+            cibw_arch: aarch64
           - os: macos-latest
             cibw_arch: aarch64
+          - os: ubuntu-22.04-arm
+            cibw_arch: x86_64
+          - os: ubuntu-22.04-arm
+            cibw_arch: universal2
 
     defaults:
       run:
@@ -103,27 +111,21 @@ jobs:
         fetch-depth: 50
         submodules: true
 
-    - name: Set up QEMU
-      if: matrix.os == 'ubuntu-latest' && matrix.cibw_arch == 'aarch64'
-      uses: docker/setup-qemu-action@68827325e0b33c7199eb31dd4e31fbe9023e06e3  # v3.0.0
-      with:
-        platforms: arm64
-
     - name: Install macOS deps
       if: startsWith(matrix.os, 'macos')
       run: |
         brew install gnu-sed libtool autoconf automake
 
-    - uses: pypa/cibuildwheel@bd033a44476646b606efccdd5eed92d5ea1d77ad  # v2.20.0
+    - uses: pypa/cibuildwheel@7c619efba910c04005a835b110b057fc28fd6e93  # v3.2.0
       env:
         CIBW_BUILD_VERBOSITY: 1
-        CIBW_BUILD: ${{ matrix.cibw_python }}
+        CIBW_BUILD: ${{ matrix.python }}-*
         CIBW_ARCHS: ${{ matrix.cibw_arch }}
         CIBW_TEST_SKIP: "*universal2:arm64"
 
-    - uses: actions/upload-artifact@a8a3f3ad30e3422c9c7b888a15615d19a852ae32  # v3.1.3
+    - uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02  # v4.6.2
       with:
-        name: dist
+        name: dist-wheels-${{ matrix.os }}-${{ matrix.python }}-${{ matrix.cibw_arch }}
         path: wheelhouse/*.whl
 
   publish:
@@ -136,9 +138,10 @@ jobs:
         fetch-depth: 5
         submodules: false
 
-    - uses: actions/download-artifact@9bc31d5ccc31df68ecc42ccf4149144866c47d8a  # v3.0.2
+    - uses: actions/download-artifact@634f93cb2916e3fdff6788551b99b062d0335ce0  # v5.0.0
       with:
-        name: dist
+        pattern: dist-*
+        merge-multiple: true
         path: dist/
 
     - name: Extract Release Version
@@ -172,7 +175,7 @@ jobs:
         ls -al dist/
 
     - name: Upload to PyPI
-      uses: pypa/gh-action-pypi-publish@b7f401de30cb6434a1e19f805ff006643653240e  # v1.8.10
+      uses: pypa/gh-action-pypi-publish@ed0c53931b1dc9bd32cbe73a98c7f6766f8a527e  # v1.13.0
       with:
         user: __token__
         password: ${{ secrets.PYPI_TOKEN }}

.github/workflows/tests.yml

@@ -22,6 +22,8 @@ jobs:
         - "3.11"
         - "3.12"
         - "3.13"
+        - "3.14"
+        - "3.14t"
         os: [ubuntu-latest, macos-latest]
 
     env:
@@ -44,7 +46,7 @@ jobs:
           __version__\s*=\s*(?:['"])([[:PEP440:]])(?:['"])
 
     - name: Set up Python ${{ matrix.python-version }}
-      uses: actions/setup-python@65d7f2d534ac1bc67fcd62888c5f4f3d2cb2b236  # v4.7.1
+      uses: actions/setup-python@e797f83bcb11b83ae66e0230d6156d7c80228e7c  # v6.0.0
       if: steps.release.outputs.version == 0
       with:
         python-version: ${{ matrix.python-version }}
@@ -57,8 +59,6 @@ jobs:
 
     - name: Install Python Deps
       if: steps.release.outputs.version == 0
-      env:
-        PIP_PRE: ${{ matrix.python-version == '3.13' && '1' || '0' }}
       run: |
         pip install -e .[test,dev]
 

pyproject.toml

@@ -2,7 +2,7 @@
 name = "uvloop"
 description = "Fast implementation of asyncio event loop on top of libuv"
 authors = [{name = "Yury Selivanov", email = "yury@magic.io"}]
-requires-python = '>=3.8.0'
+requires-python = '>=3.8.1'
 readme = "README.rst"
 license = {text = "MIT License"}
 dynamic = ["version"]
@@ -38,10 +38,10 @@ test = [
     # their combination breaks too often
     # (example breakage: https://gitlab.com/pycqa/flake8/issues/427)
     'aiohttp>=3.10.5',
-    'flake8~=5.0',
+    'flake8~=6.1',
     'psutil',
-    'pycodestyle~=2.9.0',
-    'pyOpenSSL~=23.0.0',
+    'pycodestyle~=2.11.0',
+    'pyOpenSSL~=25.3.0',
     'mypy>=0.800',
 ]
 dev = [
@@ -58,7 +58,7 @@ docs = [
 requires = [
     "setuptools>=60",
     "wheel",
-    "Cython~=3.0",
+    "Cython~=3.1",
 ]
 build-backend = "setuptools.build_meta"
 

tests/test_base.py

@@ -4,6 +4,7 @@
 import os
 import random
 import sys
+import subprocess
 import threading
 import time
 import uvloop
@@ -576,9 +577,14 @@ def get_name(self):
         async def coro():
             pass
 
-        factory = lambda loop, coro, **kwargs: MyTask(
-            coro, loop=loop, **kwargs
-        )
+        def factory(loop, coro, **kwargs):
+            task = MyTask(coro, loop=loop, **kwargs)
+            # Python moved the responsibility to set the name to the Task
+            # class constructor, so MyTask.set_name is never called by
+            # Python's create_task.  Compensate for that here.
+            if self.is_asyncio_loop() and "name" in kwargs:
+                task.set_name(kwargs["name"])
+            return task
 
         self.assertIsNone(self.loop.get_task_factory())
         task = self.loop.create_task(coro(), name="mytask")
@@ -730,6 +736,69 @@ def scheduler():
         thread.join()
         self.assertEqual(counter[0], ITERATIONS)
 
+    def test_freethreading(self):
+        if not hasattr(sys, "_is_gil_enabled"):
+            raise unittest.SkipTest("No sys._is_gil_enabled()")
+        if os.cpu_count() < 2:
+            raise unittest.SkipTest("Flaky on single CPU machines")
+        prog = """\
+import asyncio
+import os
+import sys
+import threading
+import time
+
+
+counter = 0
+
+
+def job(barrier):
+    global counter
+    barrier.wait()
+    start_time = time.monotonic()
+    rv = 0
+    while time.monotonic() - start_time < 1:
+        for _i in range(10**4):
+            counter += 1
+            rv += 1
+    return rv
+
+
+async def main():
+    if sys._is_gil_enabled():
+        print("{impl} turned on GIL")
+        return False
+    loop = asyncio.get_running_loop()
+    n_jobs = os.cpu_count()
+    barrier = threading.Barrier(n_jobs)
+    fs = [loop.run_in_executor(None, job, barrier) for _ in range(n_jobs)]
+    result = sum(await asyncio.gather(*fs))
+    if counter == result:
+        print("Expected race condition did not happen")
+        return False
+    return True
+
+
+if __name__ == "__main__":
+    if sys._is_gil_enabled():
+        print("Not running with GIL disabled")
+        sys.exit(2)
+
+    import {impl}
+
+    if not {impl}.run(main()):
+        sys.exit(1)
+"""
+        result = subprocess.run(
+            [sys.executable, '-c', prog.format(impl=self.implementation)],
+            stdout=subprocess.PIPE,
+            text=True,
+        )
+        if result.returncode == 2:
+            raise unittest.SkipTest(result.stdout.strip())
+        elif result.returncode != 0:
+            self.fail(result.stdout.strip())
+
 
 class TestBaseUV(_TestBase, UVTestCase):
 

tests/test_dns.py

@@ -10,9 +10,11 @@ def patched_getaddrinfo(*args, **kwargs):
     # flag AI_CANONNAME, even if `host` is an IP
     rv = []
     result = socket.getaddrinfo(*args, **kwargs)
+    first = True
     for af, sk, proto, canon_name, addr in result:
         if kwargs.get('flags', 0) & socket.AI_CANONNAME:
-            if not canon_name:
+            if not canon_name and first:
+                first = False
                 canon_name = args[0]
                 if not isinstance(canon_name, str):
                     canon_name = canon_name.decode('ascii')
@@ -24,7 +26,7 @@ def patched_getaddrinfo(*args, **kwargs):
 
 class BaseTestDNS:
 
-    def _test_getaddrinfo(self, *args, _patch=False, **kwargs):
+    def _test_getaddrinfo(self, *args, _patch=False, _sorted=False, **kwargs):
         err = None
         try:
             if _patch:
@@ -50,7 +52,18 @@ def _test_getaddrinfo(self, *args, _patch=False, **kwargs):
             if err is not None:
                 raise err
 
-            self.assertEqual(a1, a2)
+            if _sorted:
+                if kwargs.get('flags', 0) & socket.AI_CANONNAME and a1 and a2:
+                    # The API doesn't guarantee the ai_canonname value if
+                    # multiple results are returned, but both implementations
+                    # must return the same value for the first result.
+                    self.assertEqual(a1[0][3], a2[0][3])
+                    a1 = [(af, sk, pr, addr) for af, sk, pr, _, addr in a1]
+                    a2 = [(af, sk, pr, addr) for af, sk, pr, _, addr in a2]
+
+                self.assertEqual(sorted(a1), sorted(a2))
+            else:
+                self.assertEqual(a1, a2)
 
     def _test_getnameinfo(self, *args, **kwargs):
         err = None
@@ -77,11 +90,13 @@ def _test_getnameinfo(self, *args, **kwargs):
             self.assertEqual(a1, a2)
 
     def test_getaddrinfo_1(self):
-        self._test_getaddrinfo('example.com', 80)
-        self._test_getaddrinfo('example.com', 80, type=socket.SOCK_STREAM)
+        self._test_getaddrinfo('example.com', 80, _sorted=True)
+        self._test_getaddrinfo('example.com', 80, type=socket.SOCK_STREAM,
+                               _sorted=True)
 
     def test_getaddrinfo_2(self):
-        self._test_getaddrinfo('example.com', 80, flags=socket.AI_CANONNAME)
+        self._test_getaddrinfo('example.com', 80, flags=socket.AI_CANONNAME,
+                               _sorted=True)
 
     def test_getaddrinfo_3(self):
         self._test_getaddrinfo('a' + '1' * 50 + '.wat', 800)
@@ -92,12 +107,14 @@ def test_getaddrinfo_4(self):
                                family=-1)
 
     def test_getaddrinfo_5(self):
-        self._test_getaddrinfo('example.com', '80')
-        self._test_getaddrinfo('example.com', '80', type=socket.SOCK_STREAM)
+        self._test_getaddrinfo('example.com', '80', _sorted=True)
+        self._test_getaddrinfo('example.com', '80', type=socket.SOCK_STREAM,
+                               _sorted=True)
 
     def test_getaddrinfo_6(self):
-        self._test_getaddrinfo(b'example.com', b'80')
-        self._test_getaddrinfo(b'example.com', b'80', type=socket.SOCK_STREAM)
+        self._test_getaddrinfo(b'example.com', b'80', _sorted=True)
+        self._test_getaddrinfo(b'example.com', b'80', type=socket.SOCK_STREAM,
+                               _sorted=True)
 
     def test_getaddrinfo_7(self):
         self._test_getaddrinfo(None, 0)
@@ -116,8 +133,9 @@ def test_getaddrinfo_10(self):
         self._test_getaddrinfo(None, None, type=socket.SOCK_STREAM)
 
     def test_getaddrinfo_11(self):
-        self._test_getaddrinfo(b'example.com', '80')
-        self._test_getaddrinfo(b'example.com', '80', type=socket.SOCK_STREAM)
+        self._test_getaddrinfo(b'example.com', '80', _sorted=True)
+        self._test_getaddrinfo(b'example.com', '80', type=socket.SOCK_STREAM,
+                               _sorted=True)
 
     def test_getaddrinfo_12(self):
         # musl always returns ai_canonname but we don't
@@ -199,6 +217,10 @@ def test_getaddrinfo_22(self):
         self._test_getaddrinfo(payload, 80)
         self._test_getaddrinfo(payload, 80, type=socket.SOCK_STREAM)
 
+    def test_getaddrinfo_broadcast(self):
+        self._test_getaddrinfo('<broadcast>', 80)
+        self._test_getaddrinfo('<broadcast>', 80, type=socket.SOCK_STREAM)
+
     ######
 
     def test_getnameinfo_1(self):

tests/test_process.py

@@ -685,6 +685,12 @@ async def cancel_make_transport():
             self.loop.run_until_complete(cancel_make_transport())
 
     def test_cancel_post_init(self):
+        if sys.version_info >= (3, 13) and self.implementation == 'asyncio':
+            # https://github.com/python/cpython/issues/103847#issuecomment-3736561321
+            # This test started to flake on CPython 3.13 and later,
+            # so we skip it for asyncio tests until the issue is resolved.
+            self.skipTest('flaky test on CPython 3.13+')
+
         async def cancel_make_transport():
             coro = self.loop.subprocess_exec(asyncio.SubprocessProtocol,
                                              *self.PROGRAM_BLOCKED)