From 5f44015f9fd9dc340fe025b72c428fb6aa8b97dd Mon Sep 17 00:00:00 2001 From: Dave Dykstra <2129743+DrDaveD@users.noreply.github.com> Date: Tue, 4 Feb 2025 14:35:29 -0600 Subject: [PATCH] also update docutils in publish action Signed-off-by: Dave Dykstra <2129743+DrDaveD@users.noreply.github.com> --- .github/workflows/publish.yml | 9 ++++----- .github/workflows/pull_request.yml | 5 +++-- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 97aecf3..7a4c291 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -38,11 +38,10 @@ jobs: - name: Install Sphinx run: | - # docutils==0.16 is a temporary downgrade to fix bullet list rendering - # see https://stackoverflow.com/questions/67542699/readthedocs-sphinx-not-rendering-bullet-list-from-rst-file - # Once fixed, it can be removed from the list because it is - # otherwise an implied dependency - pip install --user --upgrade --upgrade-strategy eager docutils==0.16 setuptools sphinx sphinx-rtd-theme restructuredtext_lint pygments m2r2 + # docutils<0.21 is a temporary downgrade to fix a compiling issue + # see https://github.com/CrossNox/m2r2/issues/68 + # Note any change here also has to go into pull_request.yml + pip install --user --upgrade --upgrade-strategy eager "docutils<0.21" setuptools sphinx sphinx-rtd-theme restructuredtext_lint pygments m2r2 - name: Build web documentation run: | diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml index 5336f37..dcc3b36 100644 --- a/.github/workflows/pull_request.yml +++ b/.github/workflows/pull_request.yml @@ -34,10 +34,11 @@ jobs: - name: Install Sphinx run: | + pip install --user rstcheck # docutils<0.21 is a temporary downgrade to fix a compiling issue # see https://github.com/CrossNox/m2r2/issues/68 - # requiring docutils version <0.21 - pip install --user --upgrade --upgrade-strategy eager "docutils<0.21" setuptools sphinx sphinx-rtd-theme restructuredtext_lint rstcheck pygments m2r2 + # Note any change here also has to go into publish.yml + pip install --user --upgrade --upgrade-strategy eager "docutils<0.21" setuptools sphinx sphinx-rtd-theme restructuredtext_lint pygments m2r2 - name: Lint rst run: |