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

Author: eramongodb

.evergreen/config_generator/components/compile_only.py

@@ -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
@@ -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'),
     ]
 

.evergreen/config_generator/components/integration.py

@@ -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
@@ -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'),
     ]
 

.evergreen/config_generator/etc/utils.py

@@ -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,

pyproject.toml

@@ -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",