From 031f7250689f745edcad2ce8fc1178a4380eee6b Mon Sep 17 00:00:00 2001 From: Joris Van den Bossche Date: Tue, 13 Feb 2018 22:51:13 +0100 Subject: [PATCH 1/6] DOC/BLD: unpin sphinx to use sphinx 1.7 --- ci/requirements-3.6_DOC.run | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/requirements-3.6_DOC.run b/ci/requirements-3.6_DOC.run index 6c45e3371e9cf..084f38ce17eb2 100644 --- a/ci/requirements-3.6_DOC.run +++ b/ci/requirements-3.6_DOC.run @@ -1,7 +1,7 @@ ipython ipykernel ipywidgets -sphinx=1.5* +sphinx nbconvert nbformat notebook From 0a6be971755dd529293d0a717c087d1ec354a9a4 Mon Sep 17 00:00:00 2001 From: Joris Van den Bossche Date: Sun, 18 Feb 2018 18:42:09 +0100 Subject: [PATCH 2/6] install from conda-forge instead --- ci/requirements-3.6_DOC.run | 1 - ci/requirements-3.6_DOC.sh | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/ci/requirements-3.6_DOC.run b/ci/requirements-3.6_DOC.run index 084f38ce17eb2..9d71cf4de1b0a 100644 --- a/ci/requirements-3.6_DOC.run +++ b/ci/requirements-3.6_DOC.run @@ -1,7 +1,6 @@ ipython ipykernel ipywidgets -sphinx nbconvert nbformat notebook diff --git a/ci/requirements-3.6_DOC.sh b/ci/requirements-3.6_DOC.sh index aec0f62148622..29c3feab4a69d 100644 --- a/ci/requirements-3.6_DOC.sh +++ b/ci/requirements-3.6_DOC.sh @@ -6,6 +6,6 @@ echo "[install DOC_BUILD deps]" pip install pandas-gbq -conda install -n pandas -c conda-forge feather-format pyarrow nbsphinx pandoc fastparquet +conda install -n pandas -c conda-forge sphinx feather-format pyarrow nbsphinx pandoc fastparquet conda install -n pandas -c r r rpy2 --yes From 9550bbd6c914908b6599650a8754e0bf4dd08047 Mon Sep 17 00:00:00 2001 From: Joris Van den Bossche Date: Sun, 18 Feb 2018 18:46:49 +0100 Subject: [PATCH 3/6] remove unused Directive import --- doc/sphinxext/numpydoc/numpydoc.py | 1 - 1 file changed, 1 deletion(-) diff --git a/doc/sphinxext/numpydoc/numpydoc.py b/doc/sphinxext/numpydoc/numpydoc.py index 2bc2d1e91ed3f..4861aa90edce1 100755 --- a/doc/sphinxext/numpydoc/numpydoc.py +++ b/doc/sphinxext/numpydoc/numpydoc.py @@ -26,7 +26,6 @@ raise RuntimeError("Sphinx 1.0.1 or newer is required") from .docscrape_sphinx import get_doc_object, SphinxDocString -from sphinx.util.compat import Directive if sys.version_info[0] >= 3: sixu = lambda s: s From b06990e9e0cea2a2e021d9d08af7bbc2d379a674 Mon Sep 17 00:00:00 2001 From: Joris Van den Bossche Date: Sun, 18 Feb 2018 22:22:20 +0100 Subject: [PATCH 4/6] fix sphinx import in ipython sphinxext --- doc/sphinxext/ipython_sphinxext/ipython_directive.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/sphinxext/ipython_sphinxext/ipython_directive.py b/doc/sphinxext/ipython_sphinxext/ipython_directive.py index 5616d732eb1c6..5fe8fd23c6beb 100644 --- a/doc/sphinxext/ipython_sphinxext/ipython_directive.py +++ b/doc/sphinxext/ipython_sphinxext/ipython_directive.py @@ -124,7 +124,7 @@ import sphinx from docutils.parsers.rst import directives from docutils import nodes -from sphinx.util.compat import Directive +from docutils.parsers.rst import Directive # Our own try: From cb1ae20c9f4dde9cdac3c9ebc8777a16157306bf Mon Sep 17 00:00:00 2001 From: Joris Van den Bossche Date: Sun, 18 Feb 2018 22:23:50 +0100 Subject: [PATCH 5/6] remove sphinx pin in requirements_dev.txt --- ci/requirements_dev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/requirements_dev.txt b/ci/requirements_dev.txt index a474658fa2922..82f8de277c57b 100644 --- a/ci/requirements_dev.txt +++ b/ci/requirements_dev.txt @@ -7,4 +7,4 @@ pytest>=3.1 python-dateutil>=2.5.0 pytz setuptools>=3.3 -sphinx=1.5* +sphinx From 482e31d65db3de5028d32e5e1c70eef822adb1f8 Mon Sep 17 00:00:00 2001 From: Joris Van den Bossche Date: Sun, 25 Feb 2018 23:38:36 +0100 Subject: [PATCH 6/6] undo getting sphinx from conda-forge --- ci/requirements-3.6_DOC.run | 1 + ci/requirements-3.6_DOC.sh | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/ci/requirements-3.6_DOC.run b/ci/requirements-3.6_DOC.run index 9d71cf4de1b0a..084f38ce17eb2 100644 --- a/ci/requirements-3.6_DOC.run +++ b/ci/requirements-3.6_DOC.run @@ -1,6 +1,7 @@ ipython ipykernel ipywidgets +sphinx nbconvert nbformat notebook diff --git a/ci/requirements-3.6_DOC.sh b/ci/requirements-3.6_DOC.sh index 29c3feab4a69d..aec0f62148622 100644 --- a/ci/requirements-3.6_DOC.sh +++ b/ci/requirements-3.6_DOC.sh @@ -6,6 +6,6 @@ echo "[install DOC_BUILD deps]" pip install pandas-gbq -conda install -n pandas -c conda-forge sphinx feather-format pyarrow nbsphinx pandoc fastparquet +conda install -n pandas -c conda-forge feather-format pyarrow nbsphinx pandoc fastparquet conda install -n pandas -c r r rpy2 --yes