From dc3f6639194835d15f3cacf1e9b6f5a12c96da1b Mon Sep 17 00:00:00 2001
From: Marc Garcia <garcia.marc@gmail.com>
Date: Fri, 14 Jun 2019 19:06:44 +0100
Subject: [PATCH 1/2] DOC: Remove travis doc build

---
 .travis.yml      |  8 -------
 ci/build_docs.sh | 56 ------------------------------------------------
 2 files changed, 64 deletions(-)
 delete mode 100755 ci/build_docs.sh

diff --git a/.travis.yml b/.travis.yml
index fd59544d9b3c6..8335a6ee92bef 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -48,17 +48,10 @@ matrix:
       env:
         - JOB="3.6, slow" ENV_FILE="ci/deps/travis-36-slow.yaml" PATTERN="slow"
 
-    # In allow_failures
-    - dist: trusty
-      env:
-        - 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="ci/deps/travis-36-doc.yaml" DOC=true
 
 before_install:
   - echo "before_install"
@@ -97,7 +90,6 @@ before_script:
 script:
   - echo "script start"
   - source activate pandas-dev
-  - ci/build_docs.sh
   - ci/run_tests.sh
 
 after_script:
diff --git a/ci/build_docs.sh b/ci/build_docs.sh
deleted file mode 100755
index bf22f0764144c..0000000000000
--- a/ci/build_docs.sh
+++ /dev/null
@@ -1,56 +0,0 @@
-#!/bin/bash
-
-set -e
-
-if [ "${TRAVIS_OS_NAME}" != "linux" ]; then
-   echo "not doing build_docs on non-linux"
-   exit 0
-fi
-
-cd "$TRAVIS_BUILD_DIR"/doc
-echo "inside $0"
-
-if [ "$DOC" ]; then
-
-    echo "Will build docs"
-
-    echo ###############################
-    echo # Log file for the doc build  #
-    echo ###############################
-
-    echo ./make.py
-    ./make.py
-
-    echo ########################
-    echo # Create and send docs #
-    echo ########################
-
-    echo "Only uploading docs when TRAVIS_PULL_REQUEST is 'false'"
-    echo "TRAVIS_PULL_REQUEST: ${TRAVIS_PULL_REQUEST}"
-
-    if [ "${TRAVIS_PULL_REQUEST}" == "false" ]; then
-        cd build/html
-        git config --global user.email "pandas-docs-bot@localhost.foo"
-        git config --global user.name "pandas-docs-bot"
-
-        # create the repo
-        git init
-
-        touch README
-        git add README
-        git commit -m "Initial commit" --allow-empty
-        git branch gh-pages
-        git checkout gh-pages
-        touch .nojekyll
-        git add --all .
-        git commit -m "Version" --allow-empty
-
-        git remote add origin "https://${PANDAS_GH_TOKEN}@github.com/pandas-dev/pandas-docs-travis.git"
-        git fetch origin
-        git remote -v
-
-        git push origin gh-pages -f
-    fi
-fi
-
-exit 0

From b0449243519e362d91c58a400161266afe9e1642 Mon Sep 17 00:00:00 2001
From: Marc Garcia <garcia.marc@gmail.com>
Date: Fri, 14 Jun 2019 19:09:08 +0100
Subject: [PATCH 2/2] Failing azure doc build if push fails

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

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index b40d46bdebe02..462ae1306b3dd 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -172,7 +172,6 @@ jobs:
       cd doc/build/html
       git remote add origin git@github.com:pandas-dev/pandas-dev.github.io.git
       git push -f origin master
-      exit 0  # FIXME this will leave the build green even if the step fails. To be removed when we are confident with this.
     displayName: 'Publish docs to GitHub pages'
     condition : |
       and(not(eq(variables['Build.Reason'], 'PullRequest')),