Merge branch 'develop' into docs/prev1_propose_refactor

.github/workflows/ci.yml

@@ -125,7 +125,7 @@ jobs:
         - name: Install surmise
           if: matrix.os != 'macos-latest' && steps.cache.outputs.cache-hit != 'true'
           run: |
-            pip install --upgrade git+https://github.com/surmising/surmise.git@develop
+            pip install --upgrade git+https://github.com/bandframework/surmise.git@develop
 
         - name: Build ytopt and dependencies
           if: matrix.python-version != '3.11' && matrix.os != 'windows-latest' && matrix.os != 'macos-latest'

docs/examples/surmise.rst

@@ -5,7 +5,7 @@ Required: Surmise_
 
 Note that currently the github fork https://github.com/mosesyhc/surmise should be used::
 
-    python -m pip install --upgrade git+https://github.com/mosesyhc/surmise.git
+    pip install --upgrade git+https://github.com/bandframework/surmise.git@develop
 
 The :doc:`Borehole Calibration tutorial<../tutorials/calib_cancel_tutorial>` uses this generator as an example of the capability to cancel pending simulations.
 

libensemble/manager.py

@@ -272,11 +272,12 @@ def _kill_workers(self) -> None:
     def _save_every_k(self, fname: str, count: int, k: int) -> None:
         """Saves history every kth step"""
         count = k * (count // k)
-        filename = fname.format(self.date_start, count)
+        date_start = self.date_start
         if platform.system() == "Windows":
-            filename = filename.replace(":", "-")  # ":" is invalid in windows filenames
+            date_start = date_start.replace(":", "-")  # ":" is invalid in windows filenames
+        filename = fname.format(date_start, count)
         if not os.path.isfile(filename) and count > 0:
-            for old_file in glob.glob(fname.format(self.date_start, "*")):
+            for old_file in glob.glob(fname.format(date_start, "*")):
                 os.remove(old_file)
             np.save(filename, self.hist.H)