Merge branch 'main' into main

zingale · web-flow · commit 4d90e4ac382c · 2026-07-24T11:15:38.000-04:00
diff --git a/.github/workflows/codespell.yml b/.github/workflows/codespell.yml
@@ -13,10 +13,10 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@v7
 
       - name: Setup Python
-        uses: actions/setup-python@v6
+        uses: actions/setup-python@v7
         with:
           python-version: '3.14'
           cache: "pip"
diff --git a/.github/workflows/docs-test.yml b/.github/workflows/docs-test.yml
@@ -13,14 +13,14 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@v7
 
       - name: Install pandoc and doxygen
         run: |
           sudo apt install pandoc doxygen
 
       - name: Setup Python
-        uses: actions/setup-python@v6
+        uses: actions/setup-python@v7
         with:
           python-version: '3.14'
           cache: "pip"
diff --git a/.github/workflows/flake8.yml b/.github/workflows/flake8.yml
@@ -15,10 +15,10 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@v7
 
       - name: Install Python
-        uses: actions/setup-python@v6
+        uses: actions/setup-python@v7
         with:
           python-version: '3.14'
           cache: "pip"
diff --git a/.github/workflows/gh-pages.yml b/.github/workflows/gh-pages.yml
@@ -9,14 +9,16 @@ jobs:
   deploy:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@v7
+        with:
+          fetch-depth: 0
 
       - name: Install pandoc and doxygen
         run: |
           sudo apt install pandoc doxygen
 
       - name: Setup Python
-        uses: actions/setup-python@v6
+        uses: actions/setup-python@v7
         with:
           python-version: '3.14'
           cache: "pip"
diff --git a/.github/workflows/isort.yml b/.github/workflows/isort.yml
@@ -15,10 +15,10 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@v7
 
       - name: Install Python
-        uses: actions/setup-python@v6
+        uses: actions/setup-python@v7
         with:
           python-version: '3.14'
           cache: "pip"
diff --git a/.github/workflows/pylint.yml b/.github/workflows/pylint.yml
@@ -15,10 +15,10 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@v7
 
       - name: Install Python
-        uses: actions/setup-python@v6
+        uses: actions/setup-python@v7
         with:
           python-version: '3.14'
           cache: "pip"
diff --git a/.github/workflows/pytest-mac.yml b/.github/workflows/pytest-mac.yml
@@ -19,10 +19,10 @@ jobs:
         python-version: ["3.12", "3.13"]
 
     steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@v7
 
       - name: Install Python ${{ matrix.python-version }}
-        uses: actions/setup-python@v6
+        uses: actions/setup-python@v7
         with:
           python-version: ${{ matrix.python-version }}
           cache: "pip"
diff --git a/.github/workflows/pytest.yml b/.github/workflows/pytest.yml
@@ -19,10 +19,10 @@ jobs:
         python-version: ["3.12", "3.13", "3.14"]
 
     steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@v7
 
       - name: Install Python ${{ matrix.python-version }}
-        uses: actions/setup-python@v6
+        uses: actions/setup-python@v7
         with:
           python-version: ${{ matrix.python-version }}
           allow-prereleases: true
diff --git a/.github/workflows/regtest.yml b/.github/workflows/regtest.yml
@@ -19,10 +19,10 @@ jobs:
         python-version: ["3.12", "3.13", "3.14"]
 
     steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@v7
 
       - name: Install Python ${{ matrix.python-version }}
-        uses: actions/setup-python@v6
+        uses: actions/setup-python@v7
         with:
           python-version: ${{ matrix.python-version }}
           allow-prereleases: true
diff --git a/docs/source/conf.py b/docs/source/conf.py
@@ -157,7 +157,8 @@
         "text": f"pyro {version}",
         "image_light": "logo.gif",
         "image_dark": "logo.gif",
-    }
+    },
+    "disable_search": True,
 }
 
 # Add any paths that contain custom static files (such as style sheets) here,
diff --git a/pyro/incompressible/simulation.py b/pyro/incompressible/simulation.py
@@ -427,7 +427,7 @@ def dovis(self):
             0.5*(u.ip(1) - u.ip(-1))/myg.dx + \
             0.5*(v.jp(1) - v.jp(-1))/myg.dy
 
-        _, axes = plt.subplots(nrows=2, ncols=2, num=1)
+        _, axes = plt.subplots(nrows=2, ncols=2, num=1, clear=True)
         plt.subplots_adjust(hspace=0.25)
 
         fields = [u, v, vort, divU]
diff --git a/pyro/lm_atm/simulation.py b/pyro/lm_atm/simulation.py
@@ -643,7 +643,7 @@ def dovis(self):
 
         vort.v()[:, :] = dv - du
 
-        _, axes = plt.subplots(nrows=2, ncols=2, num=1)
+        _, axes = plt.subplots(nrows=2, ncols=2, num=1, clear=True)
         plt.subplots_adjust(hspace=0.25)
 
         fields = [rho, magvel, vort, rhoprime]
diff --git a/requirements.txt b/requirements.txt
@@ -10,7 +10,7 @@ pytest-cov>=2.6.0
 
 flake8>=3.5.0
 
-sphinx<8.2.0
+sphinx
 sphinx_book_theme
 sphinxcontrib-bibtex
 sphinx-math-dollar

Original file line number	Diff line number	Diff line change
`@@ -157,7 +157,8 @@`
`157`	`157`	`"text": f"pyro {version}",`
`158`	`158`	`"image_light": "logo.gif",`
`159`	`159`	`"image_dark": "logo.gif",`
`160`		`- }`
	`160`	`+ },`
	`161`	`+ "disable_search": True,`
`161`	`162`	`}`
`162`	`163`
`163`	`164`	`# Add any paths that contain custom static files (such as style sheets) here,`