Skip to content

Commit b43ed8b

Browse files
committed
clean up tasks
1 parent 6513aa0 commit b43ed8b

File tree

2 files changed

+17
-16
lines changed

2 files changed

+17
-16
lines changed

.evergreen/generated_configs/tasks.yml

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -777,26 +777,22 @@ tasks:
777777
VERSION: latest
778778
- func: run tests
779779
tags: [compression, latest]
780-
- name: test-compression-latest-python3.9-no-c
781-
commands:
782-
- func: run server
783-
vars:
784-
VERSION: latest
785-
- func: run tests
786-
tags: [compression, latest]
787780
- name: test-compression-latest-python3.13-no-c
788781
commands:
789782
- func: run server
790783
vars:
791784
VERSION: latest
792785
- func: run tests
786+
vars:
787+
NO_EXT: "1"
793788
tags: [compression, latest]
794789
- name: test-compression-latest-python3.13
795790
commands:
796791
- func: run server
797792
vars:
798793
VERSION: latest
799794
- func: run tests
795+
vars: {}
800796
tags: [compression, latest]
801797
- name: test-compression-latest-pypy3.10
802798
commands:

.evergreen/scripts/generate_config.py

Lines changed: 14 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -851,19 +851,24 @@ def create_compression_tasks():
851851
test_func = FunctionCall(func="run tests")
852852
tasks.append(EvgTask(name=name, tags=tags, commands=[server_func, test_func]))
853853

854-
# Test latest with other variants.
855-
for python, c_ext in product([*MIN_MAX_PYTHON, PYPYS[-1]], C_EXTS):
856-
version = "latest"
857-
tags = ["compression", version]
854+
# Test latest with max python, with and without c exts.
855+
version = "latest"
856+
tags = ["compression", "latest"]
857+
for c_ext in C_EXTS:
858+
python = CPYTHONS[-1]
858859
expansions = dict()
859-
if python in [CPYTHONS[0], PYPYS[-1]] and c_ext == C_EXTS[1]:
860-
continue
861-
if python != PYPYS[-1]:
862-
handle_c_ext(c_ext, expansions)
860+
handle_c_ext(c_ext, expansions)
863861
name = get_task_name("test-compression", python=python, version=version, **expansions)
864862
server_func = FunctionCall(func="run server", vars=dict(VERSION=version))
865-
test_func = FunctionCall(func="run tests")
863+
test_func = FunctionCall(func="run tests", vars=expansions)
866864
tasks.append(EvgTask(name=name, tags=tags, commands=[server_func, test_func]))
865+
866+
# Test on latest with pypy.
867+
python = PYPYS[-1]
868+
name = get_task_name("test-compression", python=python, version=version)
869+
server_func = FunctionCall(func="run server", vars=dict(VERSION=version))
870+
test_func = FunctionCall(func="run tests")
871+
tasks.append(EvgTask(name=name, tags=tags, commands=[server_func, test_func]))
867872
return tasks
868873

869874

0 commit comments

Comments
 (0)