more updates

Author: blink1073

.github/workflows/dist.yml

@@ -54,7 +54,7 @@ jobs:
       - uses: actions/setup-python@v5
         with:
           cache: 'pip'
-          python-version: "3.10"
+          python-version: "3.11"  # cibuildwheel 3 requires 3.11+, and provides its own python for wheel building
           cache-dependency-path: 'pyproject.toml'
           allow-prereleases: true
 
@@ -69,24 +69,16 @@ jobs:
           platforms: all
 
       - name: Install cibuildwheel
-        # Note: the default manylinux is manylinux2014
+        # Note: the default manylinux is manylinux_2_28
         run: |
           python -m pip install -U pip
-          python -m pip install "cibuildwheel>=2.20,<3"
+          python -m pip install "cibuildwheel>=3.1.1,<4"
 
       - name: Build wheels
         env:
           CIBW_BUILD: ${{ matrix.buildplat[2] }}
         run: python -m cibuildwheel --output-dir wheelhouse
 
-      - name: Build manylinux1 wheels
-        if: ${{ matrix.buildplat[1] == 'manylinux_x86_64' || matrix.buildplat[1] == 'manylinux_i686' }}
-        env:
-          CIBW_MANYLINUX_X86_64_IMAGE: manylinux1
-          CIBW_MANYLINUX_I686_IMAGE: manylinux1
-          CIBW_BUILD: "cp310-${{ matrix.buildplat[1] }} cp310-${{ matrix.buildplat[1] }}"
-        run: python -m cibuildwheel --output-dir wheelhouse
-
       - name: Assert all versions in wheelhouse
         if: ${{ ! startsWith(matrix.buildplat[1], 'macos') }}
         run: |

.github/workflows/test-python.yml

@@ -146,7 +146,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python: ["3.10", "3.14"]
+        python: ["3.10", "3.13"]
     steps:
       - uses: actions/checkout@v4
         with:

gridfs/asynchronous/grid_file.py

@@ -46,7 +46,6 @@
 from pymongo.asynchronous.collection import AsyncCollection
 from pymongo.asynchronous.cursor import AsyncCursor
 from pymongo.asynchronous.database import AsyncDatabase
-from pymongo.asynchronous.helpers import anext
 from pymongo.common import validate_string
 from pymongo.errors import (
     BulkWriteError,

gridfs/synchronous/grid_file.py

@@ -57,7 +57,6 @@
 from pymongo.synchronous.collection import Collection
 from pymongo.synchronous.cursor import Cursor
 from pymongo.synchronous.database import Database
-from pymongo.synchronous.helpers import next
 
 _IS_SYNC = True
 

pymongo/asynchronous/cursor.py

@@ -37,7 +37,6 @@
 from bson.code import Code
 from bson.son import SON
 from pymongo import _csot, helpers_shared
-from pymongo.asynchronous.helpers import anext
 from pymongo.collation import validate_collation_or_none
 from pymongo.common import (
     validate_is_document_type,

pymongo/asynchronous/helpers.py

@@ -16,9 +16,7 @@
 from __future__ import annotations
 
 import asyncio
-import builtins
 import socket
-import sys
 from typing import (
     Any,
     Callable,
@@ -86,17 +84,3 @@ async def _getaddrinfo(
         return await loop.getaddrinfo(host, port, **kwargs)  # type: ignore[return-value]
     else:
         return socket.getaddrinfo(host, port, **kwargs)
-
-
-if sys.version_info >= (3, 10):
-    anext = builtins.anext
-    aiter = builtins.aiter
-else:
-
-    async def anext(cls: Any) -> Any:
-        """Compatibility function until we drop 3.9 support: https://docs.python.org/3/library/functions.html#anext."""
-        return await cls.__anext__()
-
-    def aiter(cls: Any) -> Any:
-        """Compatibility function until we drop 3.9 support: https://docs.python.org/3/library/functions.html#anext."""
-        return cls.__aiter__()

pymongo/synchronous/cursor.py

@@ -55,7 +55,6 @@
     _RawBatchQuery,
 )
 from pymongo.response import PinnedResponse
-from pymongo.synchronous.helpers import next
 from pymongo.typings import _Address, _CollationIn, _DocumentOut, _DocumentType
 from pymongo.write_concern import validate_boolean
 

pymongo/synchronous/helpers.py

@@ -16,9 +16,7 @@
 from __future__ import annotations
 
 import asyncio
-import builtins
 import socket
-import sys
 from typing import (
     Any,
     Callable,
@@ -86,17 +84,3 @@ def _getaddrinfo(
         return loop.getaddrinfo(host, port, **kwargs)  # type: ignore[return-value]
     else:
         return socket.getaddrinfo(host, port, **kwargs)
-
-
-if sys.version_info >= (3, 10):
-    next = builtins.next
-    iter = builtins.iter
-else:
-
-    def next(cls: Any) -> Any:
-        """Compatibility function until we drop 3.9 support: https://docs.python.org/3/library/functions.html#next."""
-        return cls.__next__()
-
-    def iter(cls: Any) -> Any:
-        """Compatibility function until we drop 3.9 support: https://docs.python.org/3/library/functions.html#next."""
-        return cls.__iter__()

test/asynchronous/test_change_stream.py

@@ -48,7 +48,6 @@
 from bson.raw_bson import DEFAULT_RAW_BSON_OPTIONS, RawBSONDocument
 from pymongo import AsyncMongoClient
 from pymongo.asynchronous.command_cursor import AsyncCommandCursor
-from pymongo.asynchronous.helpers import anext
 from pymongo.errors import (
     InvalidOperation,
     OperationFailure,

test/asynchronous/test_client.py

@@ -92,7 +92,6 @@
 from pymongo.asynchronous.command_cursor import AsyncCommandCursor
 from pymongo.asynchronous.cursor import AsyncCursor, CursorType
 from pymongo.asynchronous.database import AsyncDatabase
-from pymongo.asynchronous.helpers import anext
 from pymongo.asynchronous.mongo_client import AsyncMongoClient
 from pymongo.asynchronous.pool import (
     AsyncConnection,