Skip to content

Bump shrub.py to 3.6.0 and remove batchtime workarounds #1297

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Dec 9, 2024
Merged

Bump shrub.py to 3.6.0 and remove batchtime workarounds #1297

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
82cbd50
Bump shrub.py version to 3.6.0
eramongodb Nov 18, 2024
5eef401
uv: sync lockfile
eramongodb Dec 9, 2024
4b1e294
Remove workarounds for lack of task batchtime
eramongodb Dec 9, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions .evergreen/config_generator/components/compile_only.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
from config_generator.components.funcs.setup import Setup

from config_generator.etc.distros import find_large_distro, make_distro_str
from config_generator.etc.utils import TaskRef

from shrub.v3.evg_build_variant import BuildVariant, DisplayTask
from shrub.v3.evg_task import EvgTask, EvgTaskRef
Expand Down Expand Up @@ -105,8 +104,8 @@ def variants():

# PowerPC and zSeries are limited resources.
tasks = [
TaskRef(name=f'.{TAG} .rhel81-power8', batchtime=one_day),
TaskRef(name=f'.{TAG} .rhel83-zseries', batchtime=one_day),
EvgTaskRef(name=f'.{TAG} .rhel81-power8', batchtime=one_day),
EvgTaskRef(name=f'.{TAG} .rhel83-zseries', batchtime=one_day),
EvgTaskRef(name=f'.{TAG} !.rhel81-power8 !.rhel83-zseries'),
]

Expand Down
5 changes: 2 additions & 3 deletions .evergreen/config_generator/components/integration.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
from config_generator.components.funcs.test import Test

from config_generator.etc.distros import compiler_to_vars, find_large_distro, make_distro_str
from config_generator.etc.utils import TaskRef

from shrub.v3.evg_build_variant import BuildVariant, DisplayTask
from shrub.v3.evg_command import KeyValueParam, expansions_update
Expand Down Expand Up @@ -209,8 +208,8 @@ def variants():

# PowerPC and zSeries are limited resources.
tasks = [
TaskRef(name=f'.{TAG} .rhel81-power8', batchtime=one_day),
TaskRef(name=f'.{TAG} .rhel83-zseries', batchtime=one_day),
EvgTaskRef(name=f'.{TAG} .rhel81-power8', batchtime=one_day),
EvgTaskRef(name=f'.{TAG} .rhel83-zseries', batchtime=one_day),
EvgTaskRef(name=f'.{TAG} !.rhel81-power8 !.rhel83-zseries'),
]

Expand Down
11 changes: 0 additions & 11 deletions .evergreen/config_generator/etc/utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,17 +16,6 @@
T = TypeVar('T')


# Equivalent to EvgTaskRef but defines additional properties.
class TaskRef(EvgTaskRef):
"""
An evergreen task reference model that also includes additional properties.

(The shrub.py model is missing some properties)
"""

batchtime: int | None = None


# Automatically formats the provided script and invokes it in Bash.
def bash_exec(
script,
Expand Down
2 changes: 1 addition & 1 deletion pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ dev = [
# .evergreen/config_generator/generate.py
"packaging>=14.0",
"pydantic>=2.7",
"shrub-py>=3.4.0",
"shrub-py>=3.6.0",

# etc/make_release.py (requires python<3.12)
"click>=6.0",
Expand Down
8 changes: 4 additions & 4 deletions uv.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.