From 7183ad1b8bd8a726ae2134ed17791d09f0651e71 Mon Sep 17 00:00:00 2001 From: Joris Van den Bossche Date: Tue, 11 Jun 2019 13:53:30 +0200 Subject: [PATCH 1/4] DOC: pin sphinx to 1.8.5 --- ci/deps/travis-36-doc.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/deps/travis-36-doc.yaml b/ci/deps/travis-36-doc.yaml index a3c9f27f72d7e..51b13e124ed3a 100644 --- a/ci/deps/travis-36-doc.yaml +++ b/ci/deps/travis-36-doc.yaml @@ -34,7 +34,7 @@ dependencies: - scipy - seaborn # recursion error with sphinx 2.1.0. https://github.com/pandas-dev/pandas/issues/26723 - - sphinx==2.0.1 + - sphinx==1.8.5 - sqlalchemy - statsmodels - xarray From 124504f57ff0d030e4c60e56c36c5130687f01cc Mon Sep 17 00:00:00 2001 From: Joris Van den Bossche Date: Wed, 12 Jun 2019 09:22:15 +0200 Subject: [PATCH 2/4] update pin in environment.yml + comment --- ci/deps/travis-36-doc.yaml | 2 +- environment.yml | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/ci/deps/travis-36-doc.yaml b/ci/deps/travis-36-doc.yaml index 51b13e124ed3a..0049eeb53e852 100644 --- a/ci/deps/travis-36-doc.yaml +++ b/ci/deps/travis-36-doc.yaml @@ -33,7 +33,7 @@ dependencies: - pytz - scipy - seaborn - # recursion error with sphinx 2.1.0. https://github.com/pandas-dev/pandas/issues/26723 + # some styling is broken with sphinx >= 2 (https://github.com/pandas-dev/pandas/issues/26058) - sphinx==1.8.5 - sqlalchemy - statsmodels diff --git a/environment.yml b/environment.yml index 897fd34ebb803..f8fb0ecd80af9 100644 --- a/environment.yml +++ b/environment.yml @@ -26,7 +26,8 @@ dependencies: # documentation - gitpython # obtain contributors from git for whatsnew - - sphinx + # some styling is broken with sphinx >= 2 (https://github.com/pandas-dev/pandas/issues/26058) + - sphinx==1.8.5 - numpydoc>=0.9.0 # documentation (jupyter notebooks) From aa6d583eb9537cddc32c7b832d25e25ee2ad33dc Mon Sep 17 00:00:00 2001 From: Joris Van den Bossche Date: Wed, 12 Jun 2019 15:33:12 +0200 Subject: [PATCH 3/4] use single = and generate requirements.txt --- environment.yml | 2 +- requirements-dev.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/environment.yml b/environment.yml index f8fb0ecd80af9..200aa0428f1e1 100644 --- a/environment.yml +++ b/environment.yml @@ -27,7 +27,7 @@ dependencies: # documentation - gitpython # obtain contributors from git for whatsnew # some styling is broken with sphinx >= 2 (https://github.com/pandas-dev/pandas/issues/26058) - - sphinx==1.8.5 + - sphinx=1.8.5 - numpydoc>=0.9.0 # documentation (jupyter notebooks) diff --git a/requirements-dev.txt b/requirements-dev.txt index f5309df5aa6ce..46e857f2e9e0f 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -11,7 +11,7 @@ isort mypy pycodestyle gitpython -sphinx +sphinx==1.8.5 numpydoc>=0.9.0 nbconvert>=5.4.1 nbsphinx From d79c80d386385149c2cf5de8aee417a32bba41b8 Mon Sep 17 00:00:00 2001 From: Joris Van den Bossche Date: Wed, 12 Jun 2019 16:00:15 +0200 Subject: [PATCH 4/4] single = --- ci/deps/travis-36-doc.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/deps/travis-36-doc.yaml b/ci/deps/travis-36-doc.yaml index 0049eeb53e852..9419543e601e2 100644 --- a/ci/deps/travis-36-doc.yaml +++ b/ci/deps/travis-36-doc.yaml @@ -34,7 +34,7 @@ dependencies: - scipy - seaborn # some styling is broken with sphinx >= 2 (https://github.com/pandas-dev/pandas/issues/26058) - - sphinx==1.8.5 + - sphinx=1.8.5 - sqlalchemy - statsmodels - xarray