]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commit
admin/build-doc: use python3 30665/head
authorKefu Chai <kchai@redhat.com>
Wed, 7 Aug 2019 09:46:13 +0000 (17:46 +0800)
committerNathan Cutler <ncutler@suse.com>
Tue, 1 Oct 2019 13:07:12 +0000 (15:07 +0200)
commit7bf20b587eee45391af6828a2d2414f8bd5c1a4c
treebcb4b0f406bf362aabdea7234732e2227090c164
parentd53684a6cba6943ffffb25891d2b5dd383373aca
admin/build-doc: use python3

to address https://github.com/sphinx-doc/sphinx/issues/3620, we need to
use sphinx with its fix at
https://github.com/sphinx-doc/sphinx/commit/e049f86b2de1cfdf8a74c88dc9593d047c85d5cb
in other words, we need to use sphinx v2.0.0 and up. but sphinx 2.0
requires python >= 3.5, so we have to use python3 for building the
documents.

in this change:

* doc-requirements.txt: install python3 packages on debian derivatives
* build-doc: install python3.6 packages from EPEL7, and use python3
  venv for using sphinx2
* doc-requirements.txt: bump up all python packages to latest
  stable.

Signed-off-by: Kefu Chai <kchai@redhat.com>
(cherry picked from commit ace8cb15a600daf5261c0ab349b43010a238a1d9)

Conflicts:
admin/doc-requirements.txt
admin/build-doc
admin/build-doc
admin/doc-requirements.txt
doc_deps.deb.txt