Merge pull request #2945 from Open-MSS/merge_stable_to_develop

Merge stable to develop

Author: ReimarBauer

.github/workflows/build_docs_gallery.yml

@@ -7,7 +7,7 @@ jobs:
   Test-MSS-docs:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v4
+    - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v4
     - uses: prefix-dev/setup-pixi@82d477f15f3a381dbcc8adc1206ce643fe110fb7 # v0.9.3
       with:
         pixi-version: latest

.github/workflows/lint.yml

@@ -17,7 +17,7 @@ jobs:
     runs-on: ubuntu-latest
     timeout-minutes: 10
     steps:
-    - uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v4
+    - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v4
     - uses: prefix-dev/setup-pixi@82d477f15f3a381dbcc8adc1206ce643fe110fb7 # v0.9.3
       with:
         pixi-version: latest
@@ -30,7 +30,7 @@ jobs:
     runs-on: ubuntu-latest
     timeout-minutes: 10
     steps:
-    - uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v4
+    - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v4
     - uses: prefix-dev/setup-pixi@82d477f15f3a381dbcc8adc1206ce643fe110fb7 # v0.9.3
       with:
         pixi-version: latest
@@ -43,7 +43,7 @@ jobs:
     runs-on: ubuntu-latest
     timeout-minutes: 10
     steps:
-    - uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v4
+    - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v4
     - name: Check for CRLF in the repository
       run: |
         files_with_crlf="$(git ls-files --eol | awk '$1 ~ "crlf"')"
@@ -54,7 +54,7 @@ jobs:
     runs-on: ubuntu-latest
     timeout-minutes: 10
     steps:
-    - uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v4
+    - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v4
     - name: Check for whitespace issues in the repository
       # The two example.txt files need to be excluded because whitespace at EOL is part
       # of their format and they fail to parse otherwise.
@@ -72,7 +72,7 @@ jobs:
   ensure-sha-pinned-actions:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v4
+      - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v4
       - name: Ensure SHA pinned actions
         uses: zgosalvez/github-actions-ensure-sha-pinned-actions@fc87bb5b5a97953d987372e74478de634726b3e5 # v3
         with:

.github/workflows/testing-all-oses.yml

@@ -18,9 +18,9 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: ["macos-13", "macos-14", "ubuntu-latest"]
+        os: ["macos-14", "macos-15", "ubuntu-latest"]
     steps:
-    - uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v4
+    - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v4
     - uses: prefix-dev/setup-pixi@82d477f15f3a381dbcc8adc1206ce643fe110fb7 # v0.9.3
       with:
         pixi-version: latest

.github/workflows/update-pixi-lockfile.yml

@@ -15,7 +15,7 @@ jobs:
       matrix:
         base_branch: ["develop", "stable"]
     steps:
-      - uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v4
+      - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v4
         with:
           ref: ${{ matrix.base_branch }}
       - name: Generate new lockfile
@@ -28,7 +28,7 @@ jobs:
           set -o pipefail
           pixi update --json | pixi exec pixi-diff-to-markdown >> diff.md
       - name: Create or update pull request
-        uses: peter-evans/create-pull-request@84ae59a2cdc2258d6fa0732dd66352dddae2a412 # v7
+        uses: peter-evans/create-pull-request@22a9089034f40e5a961c8808d113e2c98fb63676 # v7
         with:
           token: ${{ secrets.PAT }}
           branch: automation/update-pixi-lockfile/${{ matrix.base_branch }}

docs/conf.py

@@ -18,6 +18,7 @@
 import zipfile
 import shutil
 import importlib
+from pathlib import Path
 
 
 __version__ = importlib.metadata.version("open-mss")

pixi.lock

@@ -1,4 +1,4 @@
-[project]
+[workspace]
 name = "MSS"
 channels = ["conda-forge"]
 platforms = ["linux-64", "osx-64", "osx-arm64", "win-64"]
@@ -32,14 +32,15 @@ hdf4 = "*"
 isodate = "*"
 itsdangerous = "*"
 keyring = "*"
+libgfortran5 = ">=14"
 libtiff = "*"
 lxml = "*"
 markdown = "*"
 matplotlib = ">=3.5.3"
 metpy = "*"
 multidict = "*"
 netcdf4 = "*"
-numpy = ">=2"
+numpy = ">=2.2.4"
 owslib = ">=0.24"
 passlib = "*"
 pillow = "*"

pixi.toml

@@ -124,7 +124,7 @@ def test_milestone_url(self):
         with urlopen(self.window.milestone_url) as f:
             text = f.read().decode("utf-8")
         expected_version = __version__
-        pattern = rf'value="is:closed milestone:{re.escape(expected_version)} "'
+        pattern = rf'value="is:closed milestone:{re.escape(expected_version)}"'
         assert re.search(pattern, text), f"Expected milestone format not found: {expected_version}"
 
 

tests/_test_msui/test_msui.py

@@ -201,8 +201,15 @@ def _running_eventlet_server(app):
     process = ctx.Process(target=eventlet.wsgi.server, args=(socket, app), daemon=True)
     try:
         process.start()
+        start_time = time.time()
+        sleep_time = 0.01
         while not is_url_response_ok(urllib.parse.urljoin(url, "index")):
-            time.sleep(0.5)
+            if (time.time() - start_time) > 5:
+                raise RuntimeError(f"Server did not start within 5 seconds at {url}")
+            time.sleep(sleep_time)
+            sleep_time *= 2
+            if sleep_time > 1:
+                sleep_time = 1
         yield url
     finally:
         process.terminate()