From 2153cd912d54b3bf29a7f77c41999b25bc27fcfe Mon Sep 17 00:00:00 2001
From: Steven Silvester <steven.silvester@ieee.org>
Date: Wed, 15 May 2024 09:58:04 -0500
Subject: [PATCH 1/3] PYTHON-4448 Drop MacOS 10.14 from Builds (#1640)

---
 .evergreen/config.yml | 28 ++++++----------------------
 1 file changed, 6 insertions(+), 22 deletions(-)

diff --git a/.evergreen/config.yml b/.evergreen/config.yml
index ecad70c41..783f98d63 100644
--- a/.evergreen/config.yml
+++ b/.evergreen/config.yml
@@ -1095,7 +1095,7 @@ tasks:
                genhtml --version || true
                valgrind --version || true
 
-    - name: "release-mac-1100"
+    - name: "release-mac"
       tags: ["release_tag"]
       run_on: macos-1100
       commands:
@@ -1121,15 +1121,6 @@ tasks:
               VERSION: "3.8"
         - func: "upload release"
 
-    - name: "release-mac-1014"
-      tags: ["release_tag"]
-      run_on: macos-1014
-      commands:
-        - func: "build release"
-          vars:
-              VERSION: "3.8"
-        - func: "upload release"
-
     - name: "release-windows"
       tags: ["release_tag"]
       run_on: windows-64-vsMulti-small
@@ -2202,13 +2193,6 @@ axes:
   - id: platform
     display_name: OS
     values:
-      - id: macos-1014
-        display_name: "macOS 10.14"
-        run_on: macos-1014
-        variables:
-          skip_EC2_auth_test: true
-          skip_ECS_auth_test: true
-          skip_web_identity_auth_test: true
       - id: macos-1100
         display_name: "macOS 11.00"
         run_on: macos-1100
@@ -2619,12 +2603,12 @@ buildvariants:
     platform:
       # MacOS introduced SSL support with MongoDB >= 3.2.
       # Older server versions (2.6, 3.0) are supported without SSL.
-      - macos-1014
+      - macos-1100
     auth: "*"
     ssl: "*"
   exclude_spec:
     # No point testing with SSL without auth.
-    - platform: macos-1014
+    - platform: macos-1100
       auth: "noauth"
       ssl: "ssl"
   display_name: "${platform} ${auth} ${ssl}"
@@ -2733,7 +2717,7 @@ buildvariants:
 
 - matrix_name: "tests-pyopenssl-macOS"
   matrix_spec:
-    platform: macos-1014
+    platform: macos-1100
     auth: "auth"
     ssl: "ssl"
     pyopenssl: "*"
@@ -3067,7 +3051,7 @@ buildvariants:
 
 - matrix_name: "ocsp-test-macos"
   matrix_spec:
-    platform: macos-1014
+    platform: macos-1100
     mongodb-version: ["4.4", "5.0", "6.0", "7.0", "8.0", "latest"]
     auth: "noauth"
     ssl: "ssl"
@@ -3115,7 +3099,7 @@ buildvariants:
 
 - matrix_name: "aws-auth-test-mac"
   matrix_spec:
-    platform: [macos-1014]
+    platform: [macos-1100]
   display_name: "MONGODB-AWS Auth ${platform} ${python-version-mac}"
   tasks:
     - name: "aws-auth-test-4.4"

From e45ca51e8bf370aad2100937c842f57e720f9990 Mon Sep 17 00:00:00 2001
From: Steven Silvester <steven.silvester@ieee.org>
Date: Wed, 15 May 2024 09:59:40 -0500
Subject: [PATCH 2/3] PYTHON-4447 Use 8.0 for local OIDC server (#1639)

---
 .evergreen/config.yml | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/.evergreen/config.yml b/.evergreen/config.yml
index 783f98d63..f8b34384f 100644
--- a/.evergreen/config.yml
+++ b/.evergreen/config.yml
@@ -989,7 +989,7 @@ task_groups:
     setup_group_can_fail_task: true
     setup_group_timeout_secs: 1800
     tasks:
-      - oidc-auth-test-azure-latest
+      - oidc-auth-test-azure
 
   - name: testgcpoidc_task_group
     setup_group:
@@ -1013,7 +1013,7 @@ task_groups:
     setup_group_can_fail_task: true
     setup_group_timeout_secs: 1800
     tasks:
-      - oidc-auth-test-gcp-latest
+      - oidc-auth-test-gcp
 
   - name: testoidc_task_group
     setup_group:
@@ -1026,6 +1026,9 @@ task_groups:
         params:
           binary: bash
           include_expansions_in_env: ["AWS_ACCESS_KEY_ID", "AWS_SECRET_ACCESS_KEY", "AWS_SESSION_TOKEN"]
+          env:
+            # PYTHON-4447
+            MONGODB_VERSION: "8.0"
           args:
             - ${DRIVERS_TOOLS}/.evergreen/auth_oidc/setup.sh
     teardown_task:
@@ -1037,7 +1040,7 @@ task_groups:
     setup_group_can_fail_task: true
     setup_group_timeout_secs: 1800
     tasks:
-      - oidc-auth-test-latest
+      - oidc-auth-test
 
   - name: test_aws_lambda_task_group
     setup_group:
@@ -2006,13 +2009,14 @@ tasks:
         - func: "run load-balancer"
         - func: "run tests"
 
-    - name: "oidc-auth-test-latest"
+    - name: "oidc-auth-test"
       commands:
       - func: "run oidc auth test with test credentials"
 
-    - name: "oidc-auth-test-azure-latest"
+    - name: "oidc-auth-test-azure"
       commands:
       - command: shell.exec
+        type: test
         params:
           shell: bash
           script: |-
@@ -2026,9 +2030,10 @@ tasks:
             export AZUREOIDC_TEST_CMD="OIDC_ENV=azure ./.evergreen/run-mongodb-oidc-test.sh"
             bash $DRIVERS_TOOLS/.evergreen/auth_oidc/azure/run-driver-test.sh
 
-    - name: "oidc-auth-test-gcp-latest"
+    - name: "oidc-auth-test-gcp"
       commands:
       - command: shell.exec
+        type: test
         params:
           shell: bash
           script: |-

From 49466f9f67d2709d471fdf9529c2d84464d7944d Mon Sep 17 00:00:00 2001
From: col <80430051+broadstack-au@users.noreply.github.com>
Date: Thu, 16 May 2024 01:03:40 +1000
Subject: [PATCH 3/3] PYTHON-4449 Ensure resume options aren't combined during
 automatic retry (#1641)

---
 pymongo/change_stream.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/pymongo/change_stream.py b/pymongo/change_stream.py
index dc2f6bf2c..300bd88e9 100644
--- a/pymongo/change_stream.py
+++ b/pymongo/change_stream.py
@@ -179,8 +179,7 @@ class ChangeStream(Generic[_DocumentType]):
                 options["startAfter"] = resume_token
             else:
                 options["resumeAfter"] = resume_token
-
-        if self._start_at_operation_time is not None:
+        elif self._start_at_operation_time is not None:
             options["startAtOperationTime"] = self._start_at_operation_time
 
         if self._show_expanded_events: