From 6cbe3020aad47254f8718a4108256b93def3a1ad Mon Sep 17 00:00:00 2001 From: Eric Larson Date: Tue, 24 Jan 2023 13:54:14 -0500 Subject: [PATCH] MAINT: Fix CIs for sphinx 6 --- .github/workflows/test.yml | 6 ++++++ requirements/doc.txt | 3 ++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index eb7fa3ee..7d7e1d4d 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -1,5 +1,9 @@ name: numpydoc tests +concurrency: + group: ${{ github.workflow }}-${{ github.event.number }}-${{ github.event.ref }} + cancel-in-progress: true + on: push: branches: [main] @@ -55,6 +59,7 @@ jobs: run: | sudo apt-get update sudo apt install texlive texlive-latex-extra latexmk dvipng + pip install "sphinx<6" - name: Build documentation run: | @@ -106,6 +111,7 @@ jobs: run: | sudo apt-get update sudo apt install texlive texlive-latex-extra latexmk dvipng + pip install "sphinx<6" - name: Build documentation run: | diff --git a/requirements/doc.txt b/requirements/doc.txt index 643fc9a9..dfc68f92 100644 --- a/requirements/doc.txt +++ b/requirements/doc.txt @@ -1,4 +1,5 @@ numpy>=1.21 matplotlib>=3.5 pydata-sphinx-theme>=0.11 -sphinx>=5.2 +# TODO: Remove <6 here and in actions when pydata-sphinx-theme handles sphinx 6 +sphinx>=5.2,<6