Merge branch 'bugfix/ensemble_libE_specs_attrs_passthrough' into refactor/user_function_handling_modules

Author: jlnav

.github/workflows/basic.yml

@@ -167,4 +167,4 @@ jobs:
         runs-on: ubuntu-latest
         steps:
         - uses: actions/checkout@v4
-        - uses: crate-ci/typos@v1.18.2
+        - uses: crate-ci/typos@v1.19.0

.github/workflows/extra.yml

@@ -250,4 +250,4 @@ jobs:
         runs-on: ubuntu-latest
         steps:
         - uses: actions/checkout@v4
-        - uses: crate-ci/typos@v1.18.2
+        - uses: crate-ci/typos@v1.19.0

install/misc_feature_requirements.txt

@@ -1 +1 @@
-globus-compute-sdk==2.13.0
+globus-compute-sdk==2.14.0

install/testing_requirements.txt

@@ -1,9 +1,9 @@
 flake8==7.0.0
 coverage==7.3.1
-pytest==8.0.1
+pytest==8.1.1
 pytest-cov==4.1.0
-pytest-timeout==2.2.0
+pytest-timeout==2.3.1
 mock==5.1.0
-python-dateutil==2.8.2
+python-dateutil==2.9.0.post0
 anyio==4.3.0
 matplotlib==3.8.3

libensemble/ensemble.py

@@ -326,8 +326,14 @@ def libE_specs(self, new_specs):
             return
 
         # Cast new libE_specs temporarily to dict
-        if not isinstance(new_specs, dict):
-            new_specs = specs_dump(new_specs, by_alias=True, exclude_none=True, exclude_defaults=True)
+        if not isinstance(new_specs, dict):  # exclude_defaults should only be enabled with Pydantic v2
+            platform_specs_set = False
+            if new_specs.platform_specs != {}:  # bugginess across Pydantic versions for recursively casting to dict
+                platform_specs_set = True
+                platform_specs = new_specs.platform_specs
+            new_specs = specs_dump(new_specs, exclude_none=True, exclude_defaults=True)
+            if platform_specs_set:
+                new_specs["platform_specs"] = specs_dump(platform_specs, exclude_none=True)
 
         # Unset "comms" if we already have a libE_specs that contains that field, that came from parse_args
         if new_specs.get("comms") and hasattr(self._libE_specs, "comms") and self.parsed: