Revert "Merge branch 'master' of github.com:mongodb/mongo-python-driver into DRIVERS-3218"

This reverts commit c1fe2e3, reversing
changes made to f51e8a5.

Author: blink1073

.evergreen/remove-unimplemented-tests.sh

@@ -3,6 +3,11 @@ PYMONGO=$(dirname "$(cd "$(dirname "$0")" || exit; pwd)")
 
 rm $PYMONGO/test/transactions/legacy/errors-client.json  # PYTHON-1894
 rm $PYMONGO/test/connection_monitoring/wait-queue-fairness.json  # PYTHON-1873
+rm $PYMONGO/test/client-side-encryption/spec/unified/fle2v2-BypassQueryAnalysis.json  # PYTHON-5143
+rm $PYMONGO/test/client-side-encryption/spec/unified/fle2v2-EncryptedFields-vs-EncryptedFieldsMap.json  # PYTHON-5143
+rm $PYMONGO/test/client-side-encryption/spec/unified/localSchema.json  # PYTHON-5143
+rm $PYMONGO/test/client-side-encryption/spec/unified/maxWireVersion.json  # PYTHON-5143
+rm $PYMONGO/test/unified-test-format/valid-pass/poc-queryable-encryption.json  # PYTHON-5143
 rm $PYMONGO/test/discovery_and_monitoring/unified/pool-clear-application-error.json  # PYTHON-4918
 rm $PYMONGO/test/discovery_and_monitoring/unified/pool-clear-checkout-error.json  # PYTHON-4918
 rm $PYMONGO/test/discovery_and_monitoring/unified/pool-clear-min-pool-size-error.json  # PYTHON-4918

.evergreen/run-mongodb-oidc-test.sh

@@ -8,7 +8,7 @@ if [ ${OIDC_ENV} == "k8s" ]; then
     SUB_TEST_NAME=$K8S_VARIANT-remote
 else
     SUB_TEST_NAME=$OIDC_ENV-remote
-    sudo apt-get install -y python3-dev build-essential
+    apt-get install -y python3-dev build-essential
 fi
 
 bash ./.evergreen/just.sh setup-tests auth_oidc $SUB_TEST_NAME

.evergreen/run-tests.sh

@@ -26,9 +26,12 @@ else
 fi
 
 # List the packages.
-uv sync ${UV_ARGS} --reinstall --quiet
+uv sync ${UV_ARGS} --reinstall
 uv pip list
 
+# Ensure we go back to base environment after the test.
+trap "uv sync" EXIT HUP
+
 # Start the test runner.
 uv run ${UV_ARGS} .evergreen/scripts/run_tests.py "$@"
 

.github/workflows/codeql.yml

@@ -38,15 +38,15 @@ jobs:
           build-mode: none
     steps:
     - name: Checkout repository
-      uses: actions/checkout@v5
+      uses: actions/checkout@v4
       with:
         ref: ${{ inputs.ref }}
         persist-credentials: false
     - uses: actions/setup-python@v5
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
-      uses: github/codeql-action/init@3c3833e0f8c1c83d449a7478aa59c036a9165498 # v3
+      uses: github/codeql-action/init@51f77329afa6477de8c49fc9c7046c15b9a4e79d # v3
       with:
         languages: ${{ matrix.language }}
         build-mode: ${{ matrix.build-mode }}
@@ -63,6 +63,6 @@ jobs:
         pip install -e .
 
     - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@3c3833e0f8c1c83d449a7478aa59c036a9165498 # v3
+      uses: github/codeql-action/analyze@51f77329afa6477de8c49fc9c7046c15b9a4e79d # v3
       with:
         category: "/language:${{matrix.language}}"

.github/workflows/dist.yml

@@ -45,7 +45,7 @@ jobs:
 
     steps:
       - name: Checkout pymongo
-        uses: actions/checkout@v5
+        uses: actions/checkout@v4
         with:
           fetch-depth: 0
           persist-credentials: false
@@ -108,7 +108,7 @@ jobs:
     name: Make SDist
     runs-on: macos-13
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v4
         with:
           fetch-depth: 0
           persist-credentials: false

.github/workflows/test-python.yml

@@ -19,16 +19,16 @@ jobs:
   static:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v4
         with:
           persist-credentials: false
+      - name: Install just
+        uses: extractions/setup-just@e33e0265a09d6d736e2ee1e0eb685ef1de4669ff # v3
       - name: Install uv
-        uses: astral-sh/setup-uv@4959332f0f014c5280e7eac8b70c90cb574c9f9b # v5
+        uses: astral-sh/setup-uv@e92bafb6253dcd438e0484186d7669ea7a8ca1cc # v5
         with:
           enable-cache: true
           python-version: "3.9"
-      - name: Install just
-        run: uv tool install rust-just
       - name: Install Python dependencies
         run: |
           just install
@@ -61,11 +61,11 @@ jobs:
 
     name: CPython ${{ matrix.python-version }}-${{ matrix.os }}
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v4
         with:
           persist-credentials: false
       - name: Install uv
-        uses: astral-sh/setup-uv@4959332f0f014c5280e7eac8b70c90cb574c9f9b # v5
+        uses: astral-sh/setup-uv@e92bafb6253dcd438e0484186d7669ea7a8ca1cc # v5
         with:
           enable-cache: true
           python-version: ${{ matrix.python-version }}
@@ -80,16 +80,16 @@ jobs:
     runs-on: ubuntu-latest
     name: DocTest
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v4
         with:
           persist-credentials: false
+      - name: Install just
+        uses: extractions/setup-just@e33e0265a09d6d736e2ee1e0eb685ef1de4669ff # v3
       - name: Install uv
-        uses: astral-sh/setup-uv@4959332f0f014c5280e7eac8b70c90cb574c9f9b # v5
+        uses: astral-sh/setup-uv@e92bafb6253dcd438e0484186d7669ea7a8ca1cc # v5
         with:
           enable-cache: true
           python-version: "3.9"
-      - name: Install just
-        run: uv tool install rust-just
       - id: setup-mongodb
         uses: mongodb-labs/drivers-evergreen-tools@master
         with:
@@ -105,16 +105,16 @@ jobs:
     name: Docs Checks
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v4
         with:
           persist-credentials: false
       - name: Install uv
-        uses: astral-sh/setup-uv@4959332f0f014c5280e7eac8b70c90cb574c9f9b # v5
+        uses: astral-sh/setup-uv@e92bafb6253dcd438e0484186d7669ea7a8ca1cc # v5
         with:
           enable-cache: true
           python-version: "3.9"
       - name: Install just
-        run: uv tool install rust-just
+        uses: extractions/setup-just@e33e0265a09d6d736e2ee1e0eb685ef1de4669ff # v3
       - name: Install dependencies
         run: just install
       - name: Build docs
@@ -124,16 +124,16 @@ jobs:
     name: Link Check
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v4
         with:
           persist-credentials: false
       - name: Install uv
-        uses: astral-sh/setup-uv@4959332f0f014c5280e7eac8b70c90cb574c9f9b # v5
+        uses: astral-sh/setup-uv@e92bafb6253dcd438e0484186d7669ea7a8ca1cc # v5
         with:
           enable-cache: true
           python-version: "3.9"
       - name: Install just
-        run: uv tool install rust-just
+        uses: extractions/setup-just@e33e0265a09d6d736e2ee1e0eb685ef1de4669ff # v3
       - name: Install dependencies
         run: just install
       - name: Build docs
@@ -146,16 +146,16 @@ jobs:
       matrix:
         python: ["3.9", "3.11"]
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v4
         with:
           persist-credentials: false
       - name: Install uv
-        uses: astral-sh/setup-uv@4959332f0f014c5280e7eac8b70c90cb574c9f9b # v5
+        uses: astral-sh/setup-uv@e92bafb6253dcd438e0484186d7669ea7a8ca1cc # v5
         with:
           enable-cache: true
           python-version: "${{matrix.python}}"
       - name: Install just
-        run: uv tool install rust-just
+        uses: extractions/setup-just@e33e0265a09d6d736e2ee1e0eb685ef1de4669ff # v3
       - name: Install dependencies
         run: |
           just install
@@ -167,7 +167,7 @@ jobs:
     runs-on: ubuntu-latest
     name: "Make an sdist"
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v4
         with:
           persist-credentials: false
       - uses: actions/setup-python@v5
@@ -225,11 +225,11 @@ jobs:
       runs-on: ubuntu-latest
       name: Test using minimum dependencies and supported Python
       steps:
-        - uses: actions/checkout@v5
+        - uses: actions/checkout@v4
           with:
             persist-credentials: false
         - name: Install uv
-          uses: astral-sh/setup-uv@4959332f0f014c5280e7eac8b70c90cb574c9f9b # v5
+          uses: astral-sh/setup-uv@e92bafb6253dcd438e0484186d7669ea7a8ca1cc # v5
           with:
             python-version: '3.9'
         - id: setup-mongodb
@@ -251,11 +251,11 @@ jobs:
       runs-on: ubuntu-latest
       name: Test async's minimum dependencies and Python
       steps:
-        - uses: actions/checkout@v5
+        - uses: actions/checkout@v4
           with:
             persist-credentials: false
         - name: Install uv
-          uses: astral-sh/setup-uv@4959332f0f014c5280e7eac8b70c90cb574c9f9b # v5
+          uses: astral-sh/setup-uv@e92bafb6253dcd438e0484186d7669ea7a8ca1cc # v5
           with:
             python-version: '3.9'
         - id: setup-mongodb

.github/workflows/zizmor.yml

@@ -14,8 +14,8 @@ jobs:
       security-events: write
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v5
+        uses: actions/checkout@v4
         with:
           persist-credentials: false
       - name: Run zizmor 🌈
-        uses: zizmorcore/zizmor-action@7f2abfff7488a44086dba64ed2f5a9b431508079
+        uses: zizmorcore/zizmor-action@383d31df2eb66a2f42db98c9654bdc73231f3e3a

bson/decimal128.py

@@ -20,11 +20,8 @@
 
 import decimal
 import struct
-from decimal import Decimal
 from typing import Any, Sequence, Tuple, Type, Union
 
-from bson.codec_options import TypeDecoder, TypeEncoder
-
 _PACK_64 = struct.Struct("<Q").pack
 _UNPACK_64 = struct.Struct("<Q").unpack
 
@@ -61,42 +58,6 @@
 _VALUE_OPTIONS = Union[decimal.Decimal, float, str, Tuple[int, Sequence[int], int]]
 
 
-class DecimalEncoder(TypeEncoder):
-    """Converts Python :class:`decimal.Decimal` to BSON :class:`Decimal128`.
-
-    For example::
-        opts = CodecOptions(type_registry=TypeRegistry([DecimalEncoder()]))
-        bson.encode({"d": decimal.Decimal('1.0')}, codec_options=opts)
-
-    .. versionadded:: 4.15
-    """
-
-    @property
-    def python_type(self) -> Type[Decimal]:
-        return Decimal
-
-    def transform_python(self, value: Any) -> Decimal128:
-        return Decimal128(value)
-
-
-class DecimalDecoder(TypeDecoder):
-    """Converts BSON :class:`Decimal128` to Python :class:`decimal.Decimal`.
-
-    For example::
-        opts = CodecOptions(type_registry=TypeRegistry([DecimalDecoder()]))
-        bson.decode(data, codec_options=opts)
-
-    .. versionadded:: 4.15
-    """
-
-    @property
-    def bson_type(self) -> Type[Decimal128]:
-        return Decimal128
-
-    def transform_bson(self, value: Any) -> decimal.Decimal:
-        return value.to_decimal()
-
-
 def create_decimal128_context() -> decimal.Context:
     """Returns an instance of :class:`decimal.Context` appropriate
     for working with IEEE-754 128-bit decimal floating point values.

doc/changelog.rst

@@ -1,27 +1,5 @@
 Changelog
 =========
-Changes in Version 4.15.0 (XXXX/XX/XX)
---------------------------------------
-PyMongo 4.15 brings a number of changes including:
-
-- Added :class:`bson.decimal128.DecimalEncoder` and :class:`bson.decimal128.DecimalDecoder`
-  to support encoding and decoding of BSON Decimal128 values to decimal.Decimal values using the TypeRegistry API.
-
-Changes in Version 4.14.1 (2025/08/19)
---------------------------------------
-
-Version 4.14.1 is a bug fix release.
-
- - Fixed a bug in ``MongoClient.append_metadata()`` and ``AsyncMongoClient.append_metadata()``
-   that allowed duplicate ``DriverInfo.name`` to be appended to the metadata.
-
-Issues Resolved
-...............
-
-See the `PyMongo 4.14.1 release notes in JIRA`_ for the list of resolved issues
-in this release.
-
-.. _PyMongo 4.14.1 release notes in JIRA: https://jira.mongodb.org/secure/ReleaseNote.jspa?projectId=10004&version=45256
 
 Changes in Version 4.14.0 (2025/08/06)
 --------------------------------------
@@ -56,14 +34,6 @@ PyMongo 4.14 brings a number of changes including:
 - Changed :meth:`~pymongo.uri_parser.parse_uri`'s ``options`` return value to be
   type ``dict`` instead of ``_CaseInsensitiveDictionary``.
 
-Issues Resolved
-...............
-
-See the `PyMongo 4.14 release notes in JIRA`_ for the list of resolved issues
-in this release.
-
-.. _PyMongo 4.14 release notes in JIRA: https://jira.mongodb.org/secure/ReleaseNote.jspa?projectId=10004&version=43041
-
 Changes in Version 4.13.2 (2025/06/17)
 --------------------------------------