Skip to content

Commit e7d12ff

Browse files
NoahStappNoahStapp
authored
Merge branch 'master' into PYTHON-5248 
2 parents da12ed5 + 4ea0288 commit e7d12ff

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

71 files changed

+1637
-503
lines changed

‎.evergreen/generated_configs/tasks.yml

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -118,6 +118,7 @@ tasks:
118118
# Backport pr tests
119119
- name: backport-pr
120120
commands:
121+
- func: assume ec2 role
121122
- command: subprocess.exec
122123
params:
123124
binary: bash
@@ -3060,16 +3061,6 @@ tasks:
30603061
- sharded_cluster-auth-ssl
30613062
- sync
30623063

3063-
# Serverless tests
3064-
- name: test-serverless
3065-
commands:
3066-
- func: run tests
3067-
vars:
3068-
TEST_NAME: serverless
3069-
AUTH: auth
3070-
SSL: ssl
3071-
tags: [serverless]
3072-
30733064
# Standard tests
30743065
- name: test-standard-v4.2-python3.9-sync-noauth-nossl-standalone
30753066
commands:

‎.evergreen/generated_configs/variants.yml

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -579,26 +579,6 @@ buildvariants:
579579
- rhel87-small
580580
tags: [coverage_tag]
581581

582-
# Serverless tests
583-
- name: serverless-rhel8-python3.9
584-
tasks:
585-
- name: .serverless
586-
display_name: Serverless RHEL8 Python3.9
587-
run_on:
588-
- rhel87-small
589-
batchtime: 10080
590-
expansions:
591-
PYTHON_BINARY: /opt/python/3.9/bin/python3
592-
- name: serverless-rhel8-python3.13
593-
tasks:
594-
- name: .serverless
595-
display_name: Serverless RHEL8 Python3.13
596-
run_on:
597-
- rhel87-small
598-
batchtime: 10080
599-
expansions:
600-
PYTHON_BINARY: /opt/python/3.13/bin/python3
601-
602582
# Stable api tests
603583
- name: stable-api-require-v1-rhel8-auth
604584
tasks:

‎.evergreen/scripts/generate_config.py

Lines changed: 2 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -346,23 +346,6 @@ def create_disable_test_commands_variants():
346346
return [create_variant(tasks, display_name, host=host, python=python, expansions=expansions)]
347347

348348

349-
def create_serverless_variants():
350-
host = DEFAULT_HOST
351-
batchtime = BATCHTIME_WEEK
352-
tasks = [".serverless"]
353-
base_name = "Serverless"
354-
return [
355-
create_variant(
356-
tasks,
357-
get_variant_name(base_name, host, python=python),
358-
host=host,
359-
python=python,
360-
batchtime=batchtime,
361-
)
362-
for python in MIN_MAX_PYTHON
363-
]
364-
365-
366349
def create_oidc_auth_variants():
367350
variants = []
368351
for host_name in ["ubuntu22", "macos", "win64"]:
@@ -914,7 +897,8 @@ def create_backport_pr_tasks():
914897
"${github_commit}",
915898
]
916899
cmd = get_subprocess_exec(args=args)
917-
return [EvgTask(name=name, commands=[cmd], allowed_requesters=["commit"])]
900+
assume_func = FunctionCall(func="assume ec2 role")
901+
return [EvgTask(name=name, commands=[assume_func, cmd], allowed_requesters=["commit"])]
918902

919903

920904
def create_ocsp_tasks():
@@ -962,14 +946,6 @@ def create_free_threading_tasks():
962946
return [EvgTask(name=task_name, tags=tags, commands=[server_func, test_func])]
963947

964948

965-
def create_serverless_tasks():
966-
vars = dict(TEST_NAME="serverless", AUTH="auth", SSL="ssl")
967-
test_func = FunctionCall(func="run tests", vars=vars)
968-
tags = ["serverless"]
969-
task_name = "test-serverless"
970-
return [EvgTask(name=task_name, tags=tags, commands=[test_func])]
971-
972-
973949
##############
974950
# Functions
975951
##############

‎.evergreen/scripts/setup_tests.py

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -229,14 +229,6 @@ def handle_test_env() -> None:
229229
config = read_env(f"{DRIVERS_TOOLS}/.evergreen/atlas_data_lake/secrets-export.sh")
230230
DB_USER = config["ADL_USERNAME"]
231231
DB_PASSWORD = config["ADL_PASSWORD"]
232-
elif test_name == "serverless":
233-
run_command(f"bash {DRIVERS_TOOLS}/.evergreen/serverless/setup.sh")
234-
config = read_env(f"{DRIVERS_TOOLS}/.evergreen/serverless/secrets-export.sh")
235-
DB_USER = config["SERVERLESS_ATLAS_USER"]
236-
DB_PASSWORD = config["SERVERLESS_ATLAS_PASSWORD"]
237-
write_env("MONGODB_URI", config["SERVERLESS_URI"])
238-
write_env("SINGLE_MONGOS_LB_URI", config["SERVERLESS_URI"])
239-
write_env("MULTI_MONGOS_LB_URI", config["SERVERLESS_URI"])
240232
elif test_name == "auth_oidc":
241233
DB_USER = config["OIDC_ADMIN_USER"]
242234
DB_PASSWORD = config["OIDC_ADMIN_PWD"]

‎.evergreen/scripts/teardown_tests.py

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -36,10 +36,6 @@
3636
elif TEST_NAME == "ocsp":
3737
run_command(f"bash {DRIVERS_TOOLS}/.evergreen/ocsp/teardown.sh")
3838

39-
# Tear down serverless if applicable.
40-
elif TEST_NAME == "serverless":
41-
run_command(f"bash {DRIVERS_TOOLS}/.evergreen/serverless/teardown.sh")
42-
4339
# Tear down atlas cluster if applicable.
4440
if TEST_NAME in ["aws_lambda", "search_index"]:
4541
run_command(f"bash {DRIVERS_TOOLS}/.evergreen/atlas/teardown-atlas-cluster.sh")

‎.evergreen/scripts/utils.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,6 @@ class Distro:
4545
"mockupdb": "mockupdb",
4646
"ocsp": "ocsp",
4747
"perf": "perf",
48-
"serverless": "",
4948
}
5049

5150
# Tests that require a sub test suite.
@@ -60,7 +59,6 @@ class Distro:
6059
"aws_lambda",
6160
"data_lake",
6261
"mockupdb",
63-
"serverless",
6462
"ocsp",
6563
]
6664

‎.github/workflows/codeql.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ jobs:
4646

4747
# Initializes the CodeQL tools for scanning.
4848
- name: Initialize CodeQL
49-
uses: github/codeql-action/init@ff0a06e83cb2de871e5a09832bc6a81e7276941f # v3
49+
uses: github/codeql-action/init@ce28f5bb42b7a9f2c824e633a3f6ee835bab6858 # v3
5050
with:
5151
languages: ${{ matrix.language }}
5252
build-mode: ${{ matrix.build-mode }}
@@ -63,6 +63,6 @@ jobs:
6363
pip install -e .
6464
6565
- name: Perform CodeQL Analysis
66-
uses: github/codeql-action/analyze@ff0a06e83cb2de871e5a09832bc6a81e7276941f # v3
66+
uses: github/codeql-action/analyze@ce28f5bb42b7a9f2c824e633a3f6ee835bab6858 # v3
6767
with:
6868
category: "/language:${{matrix.language}}"

‎.github/workflows/create-release-branch.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,8 @@ jobs:
4343
aws_region_name: ${{ vars.AWS_REGION_NAME }}
4444
aws_secret_id: ${{ secrets.AWS_SECRET_ID }}
4545
artifactory_username: ${{ vars.ARTIFACTORY_USERNAME }}
46+
- name: Get hatch
47+
run: pip install hatch
4648
- uses: mongodb-labs/drivers-github-tools/create-branch@v2
4749
id: create-branch
4850
with:

‎.github/workflows/dist.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,8 @@ jobs:
3939
- [ubuntu-latest, "manylinux_ppc64le", "cp3*-manylinux_ppc64le"]
4040
- [ubuntu-latest, "manylinux_s390x", "cp3*-manylinux_s390x"]
4141
- [ubuntu-latest, "manylinux_i686", "cp3*-manylinux_i686"]
42-
- [windows-2019, "win_amd6", "cp3*-win_amd64"]
43-
- [windows-2019, "win32", "cp3*-win32"]
42+
- [windows-2022, "win_amd6", "cp3*-win_amd64"]
43+
- [windows-2022, "win32", "cp3*-win32"]
4444
- [macos-14, "macos", "cp*-macosx_*"]
4545

4646
steps:

‎.github/workflows/test-python.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525
- name: Install just
2626
uses: extractions/setup-just@e33e0265a09d6d736e2ee1e0eb685ef1de4669ff # v3
2727
- name: Install uv
28-
uses: astral-sh/setup-uv@6b9c6063abd6010835644d4c2e1bef4cf5cd0fca # v5
28+
uses: astral-sh/setup-uv@f0ec1fc3b38f5e7cd731bb6ce540c5af426746bb # v5
2929
with:
3030
enable-cache: true
3131
python-version: "3.9"
@@ -65,7 +65,7 @@ jobs:
6565
- name: Install just
6666
uses: extractions/setup-just@e33e0265a09d6d736e2ee1e0eb685ef1de4669ff # v3
6767
- name: Install uv
68-
uses: astral-sh/setup-uv@6b9c6063abd6010835644d4c2e1bef4cf5cd0fca # v5
68+
uses: astral-sh/setup-uv@f0ec1fc3b38f5e7cd731bb6ce540c5af426746bb # v5
6969
with:
7070
enable-cache: true
7171
python-version: ${{ matrix.python-version }}
@@ -88,7 +88,7 @@ jobs:
8888
- name: Install just
8989
uses: extractions/setup-just@e33e0265a09d6d736e2ee1e0eb685ef1de4669ff # v3
9090
- name: Install uv
91-
uses: astral-sh/setup-uv@6b9c6063abd6010835644d4c2e1bef4cf5cd0fca # v5
91+
uses: astral-sh/setup-uv@f0ec1fc3b38f5e7cd731bb6ce540c5af426746bb # v5
9292
with:
9393
enable-cache: true
9494
python-version: "3.9"
@@ -111,7 +111,7 @@ jobs:
111111
with:
112112
persist-credentials: false
113113
- name: Install uv
114-
uses: astral-sh/setup-uv@6b9c6063abd6010835644d4c2e1bef4cf5cd0fca # v5
114+
uses: astral-sh/setup-uv@f0ec1fc3b38f5e7cd731bb6ce540c5af426746bb # v5
115115
with:
116116
enable-cache: true
117117
python-version: "3.9"
@@ -130,7 +130,7 @@ jobs:
130130
with:
131131
persist-credentials: false
132132
- name: Install uv
133-
uses: astral-sh/setup-uv@6b9c6063abd6010835644d4c2e1bef4cf5cd0fca # v5
133+
uses: astral-sh/setup-uv@f0ec1fc3b38f5e7cd731bb6ce540c5af426746bb # v5
134134
with:
135135
enable-cache: true
136136
python-version: "3.9"
@@ -152,7 +152,7 @@ jobs:
152152
with:
153153
persist-credentials: false
154154
- name: Install uv
155-
uses: astral-sh/setup-uv@6b9c6063abd6010835644d4c2e1bef4cf5cd0fca # v5
155+
uses: astral-sh/setup-uv@f0ec1fc3b38f5e7cd731bb6ce540c5af426746bb # v5
156156
with:
157157
enable-cache: true
158158
python-version: "${{matrix.python}}"

0 commit comments

Comments
 (0)