Merge branch 'main' into stable-xpickle

Author: StanFromIreland

master/custom/builders.py

@@ -1,7 +1,7 @@
 from custom.factories import (
     UnixBuild,
     UnixPerfBuild,
-    UnixXPickleBuild,
+    UnixOddballsBuild,
     RHEL8Build,
     CentOS9Build,
     FedoraStableBuild,
@@ -93,8 +93,8 @@
     ("AMD64 Windows Server 2022 NoGIL", "itamaro-win64-srv-22-aws", Windows64NoGilBuild),
     ("AMD64 Windows PGO NoGIL", "itamaro-win64-srv-22-aws", Windows64PGONoGilBuild),
 
-    # test_xpickle
-    ("aarch64 Ubuntu test_xpickle", "stan-aarch64-ubuntu", UnixXPickleBuild),
+    # Tests that require the 'tzdata' and 'xpickle' resources
+    ("aarch64 Ubuntu Oddballs", "stan-aarch64-ubuntu", UnixOddballsBuild),
 ]
 
 

master/custom/factories.py

@@ -290,10 +290,11 @@ class UnixBigmemBuild(UnixBuild):
     factory_tags = ["bigmem"]
 
 
-class UnixXPickleBuild(UnixBuild):
-    buildersuffix = ".xpickle"
-    testFlags = ["-uxpickle", "test_xpickle"]
-    factory_tags = ["xpickle"]
+class UnixOddballsBuild(UnixBuild):
+    buildersuffix = ".oddballs"
+    testFlags = ["-u", "xpickle,tzdata",
+                 "test_xpickle", "test_zoneinfo", "test_datetime"]
+    factory_tags = ["xpickle", "tzdata"]
 
 
 class NonDebugUnixBuild(UnixBuild):