]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
admin/doc-requirements: bump sphinx to 4.4.0
authorKefu Chai <tchaikov@gmail.com>
Sat, 5 Mar 2022 17:44:30 +0000 (01:44 +0800)
committerLaura Flores <lflores@redhat.com>
Wed, 20 Apr 2022 15:10:38 +0000 (10:10 -0500)
bump sphinx to latest stable. to address following build failure

ERROR: sphinx-autodoc-typehints 1.17.0 has requirement Sphinx>=4, but you'll have sphinx 3.5.4 which is incompatible.
ERROR: sphinx-substitution-extensions 2022.2.16 has requirement sphinx>=4.0.0, but you'll have sphinx 3.5.4 which is incompatible.

also bump bump sphinx-rtd-theme, otherwise we'd have following
build failure:

ERROR: sphinx-rtd-theme 0.5.2 has requirement docutils<0.17, but you'll have docutils 0.17.1 which is incompatible.

Signed-off-by: Kefu Chai <tchaikov@gmail.com>
(cherry picked from commit 0a5fab53b3804be5ef1377a2f35006b8df857d39)

 Conflicts:
admin/doc-requirements.txt
- `sphinx_rtd_theme` was not present in Octopus

admin/doc-requirements.txt

index 1aaac3fd96f67c17d0b1b2276b0961a0f2814793..45c03af9ed421482e87babf9326d6e89044c2ce7 100644 (file)
@@ -1,4 +1,4 @@
-Sphinx == 3.5.4
+Sphinx == 4.4.0
 git+https://github.com/ceph/sphinx-ditaa.git@py3#egg=sphinx-ditaa
 breathe >= 4.20.0
 pyyaml >= 5.1.2