Skip to content

Commit bcce5dd

Browse files
committed
Fixes issue #1070, Sphinx fails python 2.7
Fixes an issue where Sphinx fails with python < 3.5 because of an update to docutils to 0.18. Limited docutils for python 3.5. We also set some of the Sphinx limits from pywbem dev_requirements.txt.
1 parent 6b7c3f1 commit bcce5dd

File tree

3 files changed

+12
-1
lines changed

3 files changed

+12
-1
lines changed

dev-requirements.txt

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,13 @@ PyYAML>=5.2,<5.3; python_version == '3.4'
6363
PyYAML>=5.3.1; python_version > '3.4'
6464

6565
# Sphinx (no imports, invoked via sphinx-build script):
66-
Sphinx>=1.7.6
66+
# Keep in sync with rtd-requirements.txt
67+
# Sphinx 2.0.0 removed support for Python 2.7 and 3.4
68+
# Sphinx 4.0.0 breaks autodocsumm (pywbem issue #2697)
69+
Sphinx>=1.7.6,<2.0.0; python_version <= '3.4'
70+
Sphinx>=3.0.4,<4.0.0; python_version >= '3.5'
71+
# Issue #1070 docutils v=0.18/Sphinx < 1 incompatibility
72+
docutils<0.18; python_version <= '3.4'
6773
sphinx-git>=10.1.1
6874
GitPython>=2.1.1;
6975
sphinxcontrib-fulltoc>=1.2.0

docs/changes.rst

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,8 @@ Released: not yet
6363
* Fixed install error of wrapt 1.13.0 on Python 2.7 on Windows due to lack of
6464
MS Visual C++ 9.0 on GitHub Actions, by pinning it to <1.13.
6565

66+
* Fixed issue with Sphinx and python 2.7. (see issue 1070)
67+
6668
**Enhancements:**
6769

6870
* Added a 'pywbemlistener' command for running and managing WBEM listeners.

rtd-requirements.txt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,8 @@ ply>=3.10
66
PyYAML>=3.13
77
# M2Crypto>=0.30.1 # we cannot install M2Crypto because RTD does not have Swig
88
Sphinx>=1.7.6
9+
Sphinx>=3.0.4,<4.0.0; python_version >= '3.5'
10+
# Issue #1070 docutils v=0.18/Sphinx < 1 incompatibility
11+
docutils<0.18; python_version <= '3.4'
912
sphinx-git>=10.1.1
1013
sphinxcontrib-fulltoc>=1.2.0

0 commit comments

Comments
 (0)