Fixing CI for xopt/optimas generator tests

.github/workflows/basic.yml

@@ -75,8 +75,6 @@ jobs:
             pip install -r install/misc_feature_requirements.txt
             source install/install_ibcdfo.sh
             conda install numpy scipy
-            pip install git+https://github.com/xopt-org/xopt.git@generator_standard
-            pip install --no-deps optimas
 
         - name: Install mpi4py and MPI from conda
           run: |

.github/workflows/extra.yml

@@ -101,8 +101,9 @@ jobs:
             pip install -r install/misc_feature_requirements.txt
             source install/install_ibcdfo.sh
             conda install numpy scipy
-            pip install git+https://github.com/xopt-org/xopt.git@generator_standard
-            pip install --no-deps optimas
+            conda install -c conda-forge pytorch-cpu
+            pip install --upgrade-strategy=only-if-needed git+https://github.com/xopt-org/xopt.git@generator_standard
+            pip install --no-deps git+https://github.com/optimas-org/optimas.git@main
 
         - name: Remove test using octave, gpcam on Python 3.13
           if: matrix.python-version >= '3.13'

libensemble/tests/regression_tests/test_optimas_grid_sample.py

@@ -17,7 +17,7 @@
 # Do not change these lines - they are parsed by run-tests.sh
 # TESTSUITE_COMMS: mpi local
 # TESTSUITE_NPROCS: 4
-# TESTSUITE_EXTRA: false
+# TESTSUITE_EXTRA: true
 
 import numpy as np
 from gest_api.vocs import VOCS

libensemble/tests/regression_tests/test_xopt_EI.py

@@ -15,7 +15,7 @@
 # Do not change these lines - they are parsed by run-tests.sh
 # TESTSUITE_COMMS: mpi local
 # TESTSUITE_NPROCS: 4
-# TESTSUITE_EXTRA: false
+# TESTSUITE_EXTRA: true
 
 import numpy as np
 from gest_api.vocs import VOCS

libensemble/tests/regression_tests/test_xopt_EI_xopt_sim.py

@@ -15,7 +15,7 @@
 # Do not change these lines - they are parsed by run-tests.sh
 # TESTSUITE_COMMS: mpi local
 # TESTSUITE_NPROCS: 4
-# TESTSUITE_EXTRA: false
+# TESTSUITE_EXTRA: true
 
 import numpy as np
 from gest_api.vocs import VOCS

libensemble/tests/regression_tests/test_xopt_nelder_mead.py

@@ -13,7 +13,7 @@
 # Do not change these lines - they are parsed by run-tests.sh
 # TESTSUITE_COMMS: mpi local
 # TESTSUITE_NPROCS: 2
-# TESTSUITE_EXTRA: false
+# TESTSUITE_EXTRA: true
 
 import numpy as np
 from gest_api.vocs import VOCS

libensemble/tests/run_tests.py

@@ -26,7 +26,7 @@
 COV_REPORT = True
 
 # Regression test options
-REG_TEST_LIST = "test_*.py"
+REG_TEST_LIST = "test_xopt_*.py test_optimas_*.py"
 REG_TEST_OUTPUT_EXT = "std.out"
 REG_STOP_ON_FAILURE = False
 REG_LIST_TESTS_ONLY = False  # just shows all tests to be run.
@@ -367,7 +367,8 @@ def run_regression_tests(root_dir, python_exec, args, current_os):
     reg_test_files = []
     for dir_path in test_dirs:
         full_path = os.path.join(root_dir, dir_path)
-        reg_test_files.extend(glob.glob(os.path.join(full_path, reg_test_list)))
+        for pattern in reg_test_list.split():
+            reg_test_files.extend(glob.glob(os.path.join(full_path, pattern)))
 
     reg_test_files = sorted(reg_test_files)
     reg_pass = 0

pyproject.toml

@@ -95,7 +95,7 @@ python = ">=3.10,<3.14"
 pip = ">=24.3.1,<25"
 setuptools = ">=75.6.0,<76"
 numpy = ">=1.21,<3"
-pydantic = ">=2.11.7,<3"
+pydantic = ">=2.11.7,<2.12"
 pyyaml = ">=6.0,<7"
 tomli = ">=1.2.1,<3"
 psutil = ">=5.9.4,<7"