cleanup

Author: blink1073

.evergreen/generated_configs/tasks.yml

@@ -87,7 +87,7 @@ tasks:
           SUB_TEST_NAME: web-identity
           PYTHON_VERSION: "3.14"
     tags: [auth-aws, auth-aws-web-identity]
-  - name: test-auth-aws-rapid-web-identity-session-name-python3.14-min-deps
+  - name: test-auth-aws-rapid-web-identity-session-name-python3.9-min-deps
     commands:
       - func: run server
         vars:
@@ -99,7 +99,7 @@ tasks:
           TEST_NAME: auth_aws
           SUB_TEST_NAME: web-identity
           AWS_ROLE_SESSION_NAME: test
-          PYTHON_VERSION: "3.14"
+          PYTHON_VERSION: "3.9"
           TEST_MIN_DEPS: true
     tags: [auth-aws, auth-aws-web-identity]
   - name: test-auth-aws-latest-ecs-python3.9
@@ -2714,47 +2714,48 @@ tasks:
       - python-3.9
       - sharded_cluster-auth-ssl
       - async
-  - name: test-server-version-python3.9-async-min-deps-auth-ssl-sharded-cluster-cov
+  - name: test-server-version-pypy3.10-async-auth-ssl-sharded-cluster
     commands:
       - func: run server
         vars:
           AUTH: auth
           SSL: ssl
           TOPOLOGY: sharded_cluster
-          COVERAGE: "1"
       - func: run tests
         vars:
           AUTH: auth
           SSL: ssl
           TOPOLOGY: sharded_cluster
-          COVERAGE: "1"
-          PYTHON_VERSION: "3.9"
+          PYTHON_VERSION: pypy3.10
           TEST_NAME: default_async
-          TEST_MIN_DEPS: "1"
     tags:
       - server-version
-      - python-3.9
+      - python-pypy3.10
       - sharded_cluster-auth-ssl
       - async
-  - name: test-server-version-pypy3.10-async-auth-ssl-sharded-cluster
+  - name: test-server-version-python3.9-min-deps-auth-ssl-sharded-cluster-cov
     commands:
       - func: run server
         vars:
           AUTH: auth
           SSL: ssl
           TOPOLOGY: sharded_cluster
+          COVERAGE: "1"
       - func: run tests
         vars:
           AUTH: auth
           SSL: ssl
           TOPOLOGY: sharded_cluster
-          PYTHON_VERSION: pypy3.10
-          TEST_NAME: default_async
+          COVERAGE: "1"
+          PYTHON_VERSION: "3.9"
+          TEST_NAME: default_aync
+          TEST_MIN_DEPS: "1"
     tags:
       - server-version
-      - python-pypy3.10
+      - python-3.9
       - sharded_cluster-auth-ssl
-      - async
+      - aync
+      - pr
   - name: test-server-version-python3.10-sync-auth-ssl-sharded-cluster-cov
     commands:
       - func: run server
@@ -3975,7 +3976,7 @@ tasks:
       - sharded_cluster-auth-ssl
       - async
       - pr
-  - name: test-standard-latest-python3.9-async-min-deps-auth-ssl-sharded-cluster
+  - name: test-standard-latest-python3.9-sync-min-deps-auth-ssl-sharded-cluster
     commands:
       - func: run server
         vars:
@@ -3990,14 +3991,14 @@ tasks:
           TOPOLOGY: sharded_cluster
           VERSION: latest
           PYTHON_VERSION: "3.9"
-          TEST_NAME: default_async
+          TEST_NAME: default_sync
           TEST_MIN_DEPS: "1"
     tags:
       - test-standard
       - server-latest
       - python-3.9
       - sharded_cluster-auth-ssl
-      - async
+      - sync
   - name: test-standard-latest-python3.10-async-noauth-nossl-standalone
     commands:
       - func: run server

.evergreen/scripts/generate_config.py

@@ -546,7 +546,8 @@ def create_server_version_tasks():
 
     # Add two tasks for min dependencies.
     task_combos.add(("standalone", "noauth", "nossl", "sync", CPYTHONS[0], True))
-    task_combos.add(("sharded_cluster", "auth", "ssl", "async", CPYTHONS[0], True))
+    # TODO: When we drop Python 3.9 support we should test with async.
+    task_combos.add(("sharded_cluster", "auth", "ssl", "aync", CPYTHONS[0], True))
 
     # Assemble the tasks.
     seen = set()
@@ -655,7 +656,8 @@ def create_standard_tasks():
         task_combos.add((version, topology, python, sync, pr, False))
     # Add two tasks for min dependencies.
     task_combos.add((ALL_VERSIONS[0], "standalone", CPYTHONS[0], "sync", False, True))
-    task_combos.add((ALL_VERSIONS[-1], "sharded_cluster", CPYTHONS[0], "async", False, True))
+    # TODO: When we drop Python 3.9 support we should test with async.
+    task_combos.add((ALL_VERSIONS[-1], "sharded_cluster", CPYTHONS[0], "sync", False, True))
 
     for version, topology, python, sync, pr, test_min_deps in sorted(task_combos):
         auth, ssl = get_standard_auth_ssl(topology)
@@ -759,6 +761,7 @@ def create_aws_tasks():
 
         if test_type == "web-identity":
             tags = [*base_tags, "auth-aws-web-identity"]
+            python = CPYTHONS[0]  # noqa: PLW2901
             name = get_task_name(
                 f"{base_name}-web-identity-session-name", python=python, test_min_deps=True
             )

requirements/ocsp.txt

@@ -6,7 +6,7 @@
 # store and just use certifi on macOS.
 # https://www.pyopenssl.org/en/stable/api/ssl.html#OpenSSL.SSL.Context.set_default_verify_paths
 certifi>=2022.5.18.1;os.name=='nt' or sys_platform=='darwin'
-pyopenssl>=17.2.0
+pyopenssl>=22.0
 requests>2.23,<3.0.0
 cryptography>=2.5
 service_identity>=18.1.0