Skip to content

Commit a34633f

Browse files
committed
skip pypy with encryption for now
1 parent d0de3ed commit a34633f

File tree

4 files changed

+6
-12
lines changed

4 files changed

+6
-12
lines changed

.evergreen/generated_configs/variants.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,7 @@ buildvariants:
167167
# Encryption tests
168168
- name: encryption-rhel8
169169
tasks:
170-
- name: .test-non-standard
170+
- name: .test-non-standard !.pypy
171171
- name: .test-min-deps
172172
display_name: Encryption RHEL8
173173
run_on:
@@ -198,7 +198,7 @@ buildvariants:
198198
tags: [encryption_tag]
199199
- name: encryption-crypt_shared-rhel8
200200
tasks:
201-
- name: .test-non-standard
201+
- name: .test-non-standard !.pypy
202202
- name: .test-min-deps
203203
display_name: Encryption crypt_shared RHEL8
204204
run_on:
@@ -232,7 +232,7 @@ buildvariants:
232232
tags: [encryption_tag]
233233
- name: encryption-pyopenssl-rhel8
234234
tasks:
235-
- name: .test-non-standard
235+
- name: .test-non-standard !.pypy
236236
display_name: Encryption PyOpenSSL RHEL8
237237
run_on:
238238
- rhel87-small

.evergreen/run-tests.sh

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,6 @@ cleanup_tests() {
3737
trap "cleanup_tests" SIGINT ERR
3838

3939
# Start the test runner.
40-
echo "Hello $UV_ARGS"
4140
uv run ${UV_ARGS} --reinstall-package pymongo .evergreen/scripts/run_tests.py "$@"
4241

4342
cleanup_tests

.evergreen/scripts/generate_config.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,8 @@ def get_encryption_expansions(encryption):
128128
):
129129
expansions = get_encryption_expansions(encryption)
130130
display_name = get_variant_name(encryption, host, **expansions)
131-
tasks = [".test-non-standard", ".test-min-deps"]
131+
# TODO: PYTHON-5612
132+
tasks = [".test-non-standard !.pypy", ".test-min-deps"]
132133
if host != "rhel8":
133134
tasks = [".test-non-standard !.pypy"]
134135
variant = create_variant(
@@ -147,7 +148,7 @@ def get_encryption_expansions(encryption):
147148
expansions = get_encryption_expansions(encryption)
148149
display_name = get_variant_name(encryption, host, **expansions)
149150
variant = create_variant(
150-
[".test-non-standard"],
151+
[".test-non-standard !.pypy"], # TODO: PYTHON-5612
151152
display_name,
152153
host=host,
153154
expansions=expansions,

.evergreen/scripts/setup_tests.py

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
import platform
77
import shutil
88
import stat
9-
import sys
109
import tarfile
1110
from pathlib import Path
1211
from urllib import request
@@ -464,11 +463,6 @@ def handle_test_env() -> None:
464463
TEST_ARGS = f"{TEST_ARGS} --cov"
465464
write_env("COVERAGE")
466465

467-
# TODO: remove as part of PYTHON-5561
468-
if test_name in ["encryption", "oscp"]:
469-
if sys.implementation.name.lower() == "pypy" and sys.version_info < (3, 11):
470-
UV_ARGS.append("--with cryptography<46")
471-
472466
if opts.green_framework:
473467
framework = opts.green_framework or os.environ["GREEN_FRAMEWORK"]
474468
UV_ARGS.append(f"--group {framework}")

0 commit comments

Comments
 (0)