Merge branch 'main' into overintegration-for-wadg

inducer · Jul 24, 2024 · 8f6946d · 8f6946d
2 parents 56e7291 + 23fbc05
commit 8f6946d
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 10 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -79,11 +79,6 @@ jobs:
                 echo "- matplotlib" >> .test-conda-env-py3.yml
                 curl -L -O https://gitlab.tiker.net/inducer/ci-support/raw/main/ci-support.sh
 
-                # Work around regression introduced in
-                # https://github.com/sphinx-doc/sphinx/pull/11645
-                # see also https://github.com/sphinx-doc/sphinx/issues/11662
-                export CI_SUPPORT_SPHINX_VERSION_SPECIFIER="<7.2.5"
-
                 . ci-support.sh
                 build_py_project_in_conda_env
                 build_docs

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -93,11 +93,6 @@ Python 3 Conda Examples:
 
 Documentation:
   script: |
-    # Work around regression introduced in
-    # https://github.com/sphinx-doc/sphinx/pull/11645
-    # see also https://github.com/sphinx-doc/sphinx/issues/11662
-    export CI_SUPPORT_SPHINX_VERSION_SPECIFIER="<7.2.5"
-
     EXTRA_INSTALL="pybind11 numpy matplotlib"
     curl -L -O https://gitlab.tiker.net/inducer/ci-support/raw/main/build-docs.sh
     . ./build-docs.sh