This is an automated email from the ASF dual-hosted git repository.
wesm pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/arrow.git
The following commit(s) were added to refs/heads/master by this push:
new d851295 ARROW-3231: [Python] Sphinx's autodoc_default_flags is now
deprecated
d851295 is described below
commit d8512950edf09cccd7915d2c4b02f920258288a3
Author: Krisztián Szűcs <[email protected]>
AuthorDate: Fri Sep 14 14:54:34 2018 -0400
ARROW-3231: [Python] Sphinx's autodoc_default_flags is now deprecated
Hopefully resolves the recent CI failures.
Author: Krisztián Szűcs <[email protected]>
Author: Wes McKinney <[email protected]>
Closes #2554 from kszucs/ARROW-3231 and squashes the following commits:
1e40b018f <Wes McKinney> flake
dacead259 <Krisztián Szűcs> pin sphinx's version
a2f4e3599 <Krisztián Szűcs> support older sphinx versions
0a46fd18b <Krisztián Szűcs> switch to autodoc_default_options
---
ci/travis_script_python.sh | 2 +-
python/doc/source/conf.py | 8 ++++++--
2 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/ci/travis_script_python.sh b/ci/travis_script_python.sh
index 8238dbd..e0b2392 100755
--- a/ci/travis_script_python.sh
+++ b/ci/travis_script_python.sh
@@ -64,7 +64,7 @@ if [ "$ARROW_TRAVIS_PYTHON_DOCS" == "1" ] && [
"$PYTHON_VERSION" == "3.6" ]; the
conda install -y -q \
ipython \
numpydoc \
- sphinx \
+ sphinx=1.7.9 \
sphinx_bootstrap_theme
fi
diff --git a/python/doc/source/conf.py b/python/doc/source/conf.py
index 6fe05d3..6a7336e 100644
--- a/python/doc/source/conf.py
+++ b/python/doc/source/conf.py
@@ -63,8 +63,12 @@ extensions = [
]
# Show members for classes in .. autosummary
-autodoc_default_flags = ['members', 'undoc-members', 'show-inheritance',
- 'inherited-members']
+autodoc_default_flags = [
+ 'members',
+ 'undoc-members',
+ 'show-inheritance',
+ 'inherited-members'
+]
# ipython directive options
ipython_mplbackend = ''
