From bd123abb2b5e5167476d20a09f69a0818d30e424 Mon Sep 17 00:00:00 2001
From: Joris Van den Bossche <jorisvandenbossche@gmail.com>
Date: Sun, 2 Jun 2019 17:30:28 +0200
Subject: [PATCH 1/2] Revert "CI/DOC: Building documentation with azure
 (#26591)"

This reverts commit 3628e1897bfcc548e2fccb020cd436a037da4f31.
---
 .travis.yml                |  4 ++--
 azure-pipelines.yml        |  2 +-
 ci/deps/travis-36-doc.yaml | 46 ++++++++++++++++++++++++++++++++++++++
 3 files changed, 49 insertions(+), 3 deletions(-)
 create mode 100644 ci/deps/travis-36-doc.yaml

diff --git a/.travis.yml b/.travis.yml
index 90dd904e6cb1e..ce8817133a477 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -51,14 +51,14 @@ matrix:
     # In allow_failures
     - dist: trusty
       env:
-        - JOB="3.6, doc" ENV_FILE="environment.yml" DOC=true
+        - JOB="3.6, doc" ENV_FILE="ci/deps/travis-36-doc.yaml" DOC=true
     allow_failures:
       - dist: trusty
         env:
           - JOB="3.6, slow" ENV_FILE="ci/deps/travis-36-slow.yaml" PATTERN="slow"
       - dist: trusty
         env:
-          - JOB="3.6, doc" ENV_FILE="environment.yml" DOC=true
+          - JOB="3.6, doc" ENV_FILE="ci/deps/travis-36-doc.yaml" DOC=true
 
 before_install:
   - echo "before_install"
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 85325c52e7e6d..17eaee5458af8 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -15,7 +15,7 @@ jobs:
     name: Windows
     vmImage: vs2017-win2016
 
-- job: 'Checks'
+- job: 'Checks_and_doc'
   pool:
     vmImage: ubuntu-16.04
   timeoutInMinutes: 90
diff --git a/ci/deps/travis-36-doc.yaml b/ci/deps/travis-36-doc.yaml
new file mode 100644
index 0000000000000..9d6cbd82fdc05
--- /dev/null
+++ b/ci/deps/travis-36-doc.yaml
@@ -0,0 +1,46 @@
+name: pandas-dev
+channels:
+  - defaults
+  - conda-forge
+dependencies:
+  - beautifulsoup4
+  - bottleneck
+  - cython>=0.28.2
+  - fastparquet>=0.2.1
+  - gitpython
+  - html5lib
+  - hypothesis>=3.58.0
+  - ipykernel
+  - ipython
+  - ipywidgets
+  - lxml
+  - matplotlib
+  - nbconvert>=5.4.1
+  - nbformat
+  - nbsphinx
+  - notebook>=5.7.5
+  - numexpr
+  - numpy
+  - numpydoc
+  - openpyxl
+  - pandoc
+  - pyarrow
+  - pyqt
+  - pytables
+  - python-dateutil
+  - python-snappy
+  - python=3.6.*
+  - pytz
+  - scipy
+  - seaborn
+  - sphinx
+  - sqlalchemy
+  - statsmodels
+  - xarray
+  - xlrd
+  - xlsxwriter
+  - xlwt
+  # universal
+  - pytest>=4.0.2
+  - pytest-xdist
+  - isort

From 5a76c7032a9dd9a1e509ebe227f44baf733ec650 Mon Sep 17 00:00:00 2001
From: Joris Van den Bossche <jorisvandenbossche@gmail.com>
Date: Sun, 2 Jun 2019 17:32:35 +0200
Subject: [PATCH 2/2] undo edit in azure-pipelines

---
 azure-pipelines.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 17eaee5458af8..85325c52e7e6d 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -15,7 +15,7 @@ jobs:
     name: Windows
     vmImage: vs2017-win2016
 
-- job: 'Checks_and_doc'
+- job: 'Checks'
   pool:
     vmImage: ubuntu-16.04
   timeoutInMinutes: 90