From cb593380ff802e7f70f0b32e9a9aed2e3038c6e1 Mon Sep 17 00:00:00 2001 From: Marc Garcia Date: Fri, 31 May 2019 13:29:33 +0100 Subject: [PATCH 01/12] WIP: Building documentation with azure --- azure-pipelines.yml | 53 ++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 52 insertions(+), 1 deletion(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 17eaee5458af8..8d6d02a7396d7 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 @@ -116,3 +116,54 @@ jobs: fi displayName: 'Running benchmarks' condition: true + +- job: 'Docs' + pool: + vmImage: ubuntu-16.04 + timeoutInMinutes: 90 + steps: + - script: | + echo '##vso[task.setvariable variable=CONDA_ENV]pandas-dev' + echo '##vso[task.setvariable variable=ENV_FILE]environment.yml' + displayName: 'Setting environment variables' + + - script: | + export PATH=$HOME/miniconda3/bin:$PATH + sudo apt-get install -y libc6-dev-i386 + ci/setup_env.sh + displayName: 'Setup environment and build pandas' + + - script: | + doc/make.py + displayName: 'Build documentation' + + - script: | + cd doc/build/html + git init + git touch .nojekyll + git add --all . + git config user.email "pandas-dev@python.org" + git config user.name "pandas-docs-bot" + git status # TODO just for debugging + git commit -m "pandas documentation in master" + displayName: 'Create git repo for docs build' + # TODO add same contition as next steps + + - task: InstallSSHKey@0 + inputs: + hostName: github.com + sshPublicKey: "###### ADD PUBLIC KEY HERE AND UPDATE PRIVATE TO PIPELINES #######" + sshKeySecureFile: pandas_docs_ssh_key + displayName: 'Install GitHub ssh deployment key' + condition : | + and(not(eq(variables['Build.Reason'], 'PullRequest')), + eq(variables['Build.SourceBranch'], 'refs/heads/master')) + + - script: | + cd doc/build/html + git remote add origin git@github.com:pandas-dev/pandas-dev-docs.git + git push origin master -f + displayName: 'Publish docs to GitHub pages' + condition : | + and(not(eq(variables['Build.Reason'], 'PullRequest')), + eq(variables['Build.SourceBranch'], 'refs/heads/master')) From 8288133deef0474ea39dfec6be3249b0db9901e0 Mon Sep 17 00:00:00 2001 From: Marc Garcia Date: Fri, 31 May 2019 13:56:56 +0100 Subject: [PATCH 02/12] Removing new docs job (pipelines is failing with what seems an unrelated error) --- azure-pipelines.yml | 51 --------------------------------------------- 1 file changed, 51 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 8d6d02a7396d7..85325c52e7e6d 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -116,54 +116,3 @@ jobs: fi displayName: 'Running benchmarks' condition: true - -- job: 'Docs' - pool: - vmImage: ubuntu-16.04 - timeoutInMinutes: 90 - steps: - - script: | - echo '##vso[task.setvariable variable=CONDA_ENV]pandas-dev' - echo '##vso[task.setvariable variable=ENV_FILE]environment.yml' - displayName: 'Setting environment variables' - - - script: | - export PATH=$HOME/miniconda3/bin:$PATH - sudo apt-get install -y libc6-dev-i386 - ci/setup_env.sh - displayName: 'Setup environment and build pandas' - - - script: | - doc/make.py - displayName: 'Build documentation' - - - script: | - cd doc/build/html - git init - git touch .nojekyll - git add --all . - git config user.email "pandas-dev@python.org" - git config user.name "pandas-docs-bot" - git status # TODO just for debugging - git commit -m "pandas documentation in master" - displayName: 'Create git repo for docs build' - # TODO add same contition as next steps - - - task: InstallSSHKey@0 - inputs: - hostName: github.com - sshPublicKey: "###### ADD PUBLIC KEY HERE AND UPDATE PRIVATE TO PIPELINES #######" - sshKeySecureFile: pandas_docs_ssh_key - displayName: 'Install GitHub ssh deployment key' - condition : | - and(not(eq(variables['Build.Reason'], 'PullRequest')), - eq(variables['Build.SourceBranch'], 'refs/heads/master')) - - - script: | - cd doc/build/html - git remote add origin git@github.com:pandas-dev/pandas-dev-docs.git - git push origin master -f - displayName: 'Publish docs to GitHub pages' - condition : | - and(not(eq(variables['Build.Reason'], 'PullRequest')), - eq(variables['Build.SourceBranch'], 'refs/heads/master')) From 542a71096b6b3513b42326758a9a0ff5dedf7400 Mon Sep 17 00:00:00 2001 From: Marc Garcia Date: Fri, 31 May 2019 14:00:46 +0100 Subject: [PATCH 03/12] Adding build of the docs but not publishing (debugging pipelines error) --- azure-pipelines.yml | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 85325c52e7e6d..11be1d33da7f1 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -116,3 +116,23 @@ jobs: fi displayName: 'Running benchmarks' condition: true + +- job: 'Docs' + pool: + vmImage: ubuntu-16.04 + timeoutInMinutes: 90 + steps: + - script: | + echo '##vso[task.setvariable variable=CONDA_ENV]pandas-dev' + echo '##vso[task.setvariable variable=ENV_FILE]environment.yml' + displayName: 'Setting environment variables' + + - script: | + export PATH=$HOME/miniconda3/bin:$PATH + sudo apt-get install -y libc6-dev-i386 + ci/setup_env.sh + displayName: 'Setup environment and build pandas' + + - script: | + doc/make.py + displayName: 'Build documentation' From b5d8e5e106c6878eb5582915237b6934acb1c9c5 Mon Sep 17 00:00:00 2001 From: Marc Garcia Date: Fri, 31 May 2019 14:35:05 +0100 Subject: [PATCH 04/12] Fixing bug (conda path missing when building docs) and adding step of creating the repo (debugging pipelines error) --- azure-pipelines.yml | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 11be1d33da7f1..428fb8bb444ee 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -134,5 +134,18 @@ jobs: displayName: 'Setup environment and build pandas' - script: | + export PATH=$HOME/miniconda3/bin:$PATH doc/make.py displayName: 'Build documentation' + + - script: | + cd doc/build/html + git init + git touch .nojekyll + git add --all . + git config user.email "pandas-dev@python.org" + git config user.name "pandas-docs-bot" + git status # TODO just for debugging + git commit -m "pandas documentation in master" + displayName: 'Create git repo for docs build' + # TODO add same contition as next steps From 76bf20b15175be55f07be87f062c38e670b32a6f Mon Sep 17 00:00:00 2001 From: Marc Garcia Date: Fri, 31 May 2019 15:01:04 +0100 Subject: [PATCH 05/12] FIxing bug (activating conda environment to build the docs) and adding step to push docs to github (debugging pipelines error) --- azure-pipelines.yml | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 428fb8bb444ee..d38273fb0bead 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -135,6 +135,7 @@ jobs: - script: | export PATH=$HOME/miniconda3/bin:$PATH + source activate pandas-dev doc/make.py displayName: 'Build documentation' @@ -149,3 +150,14 @@ jobs: git commit -m "pandas documentation in master" displayName: 'Create git repo for docs build' # TODO add same contition as next steps + + # TODO add step to install ssh key + + - script: | + cd doc/build/html + git remote add origin git@github.com:pandas-dev/pandas-dev-docs.git + git push origin master -f + displayName: 'Publish docs to GitHub pages' + condition : | + and(not(eq(variables['Build.Reason'], 'PullRequest')), + eq(variables['Build.SourceBranch'], 'refs/heads/master')) From 14c346fdcbbe236ccf98eb70bb71d74a11cf3f0c Mon Sep 17 00:00:00 2001 From: Marc Garcia Date: Fri, 31 May 2019 15:48:00 +0100 Subject: [PATCH 06/12] Fixing typo (touch .nojekyll) and restoring install ssh key step --- azure-pipelines.yml | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index d38273fb0bead..ed145227eb4bf 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -142,16 +142,24 @@ jobs: - script: | cd doc/build/html git init - git touch .nojekyll + touch .nojekyll git add --all . git config user.email "pandas-dev@python.org" git config user.name "pandas-docs-bot" - git status # TODO just for debugging git commit -m "pandas documentation in master" + git log # TODO only for debugging displayName: 'Create git repo for docs build' # TODO add same contition as next steps - # TODO add step to install ssh key + - task: InstallSSHKey@0 + inputs: + hostName: 'github.com' + sshPublicKey: "###### ADD PUBLIC KEY HERE AND UPDATE PRIVATE TO PIPELINES #######" + sshKeySecureFile: 'pandas_docs_ssh_key' + displayName: 'Install GitHub ssh deployment key' + condition : | + and(not(eq(variables['Build.Reason'], 'PullRequest')), + eq(variables['Build.SourceBranch'], 'refs/heads/master')) - script: | cd doc/build/html From 2a102e29d03b8daf1fe785152bf551751c5067b4 Mon Sep 17 00:00:00 2001 From: Marc Garcia Date: Fri, 31 May 2019 16:00:59 +0100 Subject: [PATCH 07/12] Adding actual ssh key data --- azure-pipelines.yml | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index ed145227eb4bf..5e55b0f06ab3e 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -147,15 +147,16 @@ jobs: git config user.email "pandas-dev@python.org" git config user.name "pandas-docs-bot" git commit -m "pandas documentation in master" - git log # TODO only for debugging displayName: 'Create git repo for docs build' - # TODO add same contition as next steps + condition : | + and(not(eq(variables['Build.Reason'], 'PullRequest')), + eq(variables['Build.SourceBranch'], 'refs/heads/master')) - task: InstallSSHKey@0 inputs: hostName: 'github.com' - sshPublicKey: "###### ADD PUBLIC KEY HERE AND UPDATE PRIVATE TO PIPELINES #######" - sshKeySecureFile: 'pandas_docs_ssh_key' + sshPublicKey: 'ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDHmz3l/EdqrgNxEUKkwDUuUcLv91unig03pYFGO/DMIgCmPdMG96zAgfnESd837Rm0wSSqylwSzkRJt5MV/TpFlcVifDLDQmUhqCeO8Z6dLl/oe35UKmyYICVwcvQTAaHNnYRpKC5IUlTh0JEtw9fGlnp1Ta7U1ENBLbKdpywczElhZu+hOQ892zqOj3CwA+U2329/d6cd7YnqIKoFN9DWT3kS5K6JE4IoBfQEVekIOs23bKjNLvPoOmi6CroAhu/K8j+NCWQjge5eJf2x/yTnIIP1PlEcXoHIr8io517posIx3TBup+CN8bNS1PpDW3jyD3ttl1uoBudjOQrobNnJeR6Rn67DRkG6IhSwr3BWj8alwUG5mTdZzwV5Pa9KZFdIiqX7NoDGg+itsR39QCn0thK8lGRNSR8KrWC1PSjecwelKBO7uQ7rnk/rkrZdBWR4oEA8YgNH8tirUw5WfOr5a0AIaJicKxGKNdMxZt+zmC+bS7F4YCOGIm9KHa43RrKhoGRhRf9fHHHKUPwFGqtWG4ykcUgoamDOURJyepesBAO3FiRE9rLU6ILbB3yEqqoekborHmAJD5vf7PWItW3Q/YQKuk3kkqRcKnexPyzyyq5lUgTi8CxxZdaASIOu294wjBhhdyHlXEkVTNJ9JKkj/obF+XiIIp0cBDsOXY9hDQ== pandas-dev@python.org' + sshKeySecureFile: 'pandas_docs_key' displayName: 'Install GitHub ssh deployment key' condition : | and(not(eq(variables['Build.Reason'], 'PullRequest')), From 87474d32647380cafc68876afd9a61b06cc6cd24 Mon Sep 17 00:00:00 2001 From: Marc Garcia Date: Fri, 31 May 2019 16:10:44 +0100 Subject: [PATCH 08/12] Temporary remove conditions for publishing the docs --- azure-pipelines.yml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 5e55b0f06ab3e..46108a1a9172f 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -148,9 +148,9 @@ jobs: git config user.name "pandas-docs-bot" git commit -m "pandas documentation in master" displayName: 'Create git repo for docs build' - condition : | - and(not(eq(variables['Build.Reason'], 'PullRequest')), - eq(variables['Build.SourceBranch'], 'refs/heads/master')) + #condition : | + # and(not(eq(variables['Build.Reason'], 'PullRequest')), + # eq(variables['Build.SourceBranch'], 'refs/heads/master')) - task: InstallSSHKey@0 inputs: @@ -158,15 +158,15 @@ jobs: sshPublicKey: 'ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDHmz3l/EdqrgNxEUKkwDUuUcLv91unig03pYFGO/DMIgCmPdMG96zAgfnESd837Rm0wSSqylwSzkRJt5MV/TpFlcVifDLDQmUhqCeO8Z6dLl/oe35UKmyYICVwcvQTAaHNnYRpKC5IUlTh0JEtw9fGlnp1Ta7U1ENBLbKdpywczElhZu+hOQ892zqOj3CwA+U2329/d6cd7YnqIKoFN9DWT3kS5K6JE4IoBfQEVekIOs23bKjNLvPoOmi6CroAhu/K8j+NCWQjge5eJf2x/yTnIIP1PlEcXoHIr8io517posIx3TBup+CN8bNS1PpDW3jyD3ttl1uoBudjOQrobNnJeR6Rn67DRkG6IhSwr3BWj8alwUG5mTdZzwV5Pa9KZFdIiqX7NoDGg+itsR39QCn0thK8lGRNSR8KrWC1PSjecwelKBO7uQ7rnk/rkrZdBWR4oEA8YgNH8tirUw5WfOr5a0AIaJicKxGKNdMxZt+zmC+bS7F4YCOGIm9KHa43RrKhoGRhRf9fHHHKUPwFGqtWG4ykcUgoamDOURJyepesBAO3FiRE9rLU6ILbB3yEqqoekborHmAJD5vf7PWItW3Q/YQKuk3kkqRcKnexPyzyyq5lUgTi8CxxZdaASIOu294wjBhhdyHlXEkVTNJ9JKkj/obF+XiIIp0cBDsOXY9hDQ== pandas-dev@python.org' sshKeySecureFile: 'pandas_docs_key' displayName: 'Install GitHub ssh deployment key' - condition : | - and(not(eq(variables['Build.Reason'], 'PullRequest')), - eq(variables['Build.SourceBranch'], 'refs/heads/master')) + #condition : | + # and(not(eq(variables['Build.Reason'], 'PullRequest')), + # eq(variables['Build.SourceBranch'], 'refs/heads/master')) - script: | cd doc/build/html git remote add origin git@github.com:pandas-dev/pandas-dev-docs.git git push origin master -f displayName: 'Publish docs to GitHub pages' - condition : | - and(not(eq(variables['Build.Reason'], 'PullRequest')), - eq(variables['Build.SourceBranch'], 'refs/heads/master')) + #condition : | + # and(not(eq(variables['Build.Reason'], 'PullRequest')), + # eq(variables['Build.SourceBranch'], 'refs/heads/master')) From 5def70f37844e202eb98bb46df4dbe2d935857db Mon Sep 17 00:00:00 2001 From: Marc Garcia Date: Fri, 31 May 2019 16:43:22 +0100 Subject: [PATCH 09/12] Restoring conditions, updated docs repo name pandas-dev-docs -> dev-docs, and adding better information on how the ssh keys work --- azure-pipelines.yml | 28 +++++++++++++++++----------- 1 file changed, 17 insertions(+), 11 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 46108a1a9172f..df0f77eef4da3 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -148,25 +148,31 @@ jobs: git config user.name "pandas-docs-bot" git commit -m "pandas documentation in master" displayName: 'Create git repo for docs build' - #condition : | - # and(not(eq(variables['Build.Reason'], 'PullRequest')), - # eq(variables['Build.SourceBranch'], 'refs/heads/master')) - + condition : | + and(not(eq(variables['Build.Reason'], 'PullRequest')), + eq(variables['Build.SourceBranch'], 'refs/heads/master')) + + # This task to work requires next steps: + # 1. Got to "Library > Secure files" in the azure-pipelines dashboard: https://dev.azure.com/pandas-dev/pandas/_library?itemType=SecureFiles + # 2. Click on "+ Secure file" + # 3. Upload the private key (the name of the file must match with the specified in "sshKeySecureFile" input below, "pandas_docs_key") + # 4. Click on file name after it is created, tick the box "Authorize for use in all pipelines" and save + # 5. The public key specified in "sshPublicKey" is the pair of the uploaded private key, and needs to be specified as a deploy key of the repo where the docs will be pushed: https://github.com/pandas-dev/dev-docs/settings/keys - task: InstallSSHKey@0 inputs: hostName: 'github.com' sshPublicKey: 'ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDHmz3l/EdqrgNxEUKkwDUuUcLv91unig03pYFGO/DMIgCmPdMG96zAgfnESd837Rm0wSSqylwSzkRJt5MV/TpFlcVifDLDQmUhqCeO8Z6dLl/oe35UKmyYICVwcvQTAaHNnYRpKC5IUlTh0JEtw9fGlnp1Ta7U1ENBLbKdpywczElhZu+hOQ892zqOj3CwA+U2329/d6cd7YnqIKoFN9DWT3kS5K6JE4IoBfQEVekIOs23bKjNLvPoOmi6CroAhu/K8j+NCWQjge5eJf2x/yTnIIP1PlEcXoHIr8io517posIx3TBup+CN8bNS1PpDW3jyD3ttl1uoBudjOQrobNnJeR6Rn67DRkG6IhSwr3BWj8alwUG5mTdZzwV5Pa9KZFdIiqX7NoDGg+itsR39QCn0thK8lGRNSR8KrWC1PSjecwelKBO7uQ7rnk/rkrZdBWR4oEA8YgNH8tirUw5WfOr5a0AIaJicKxGKNdMxZt+zmC+bS7F4YCOGIm9KHa43RrKhoGRhRf9fHHHKUPwFGqtWG4ykcUgoamDOURJyepesBAO3FiRE9rLU6ILbB3yEqqoekborHmAJD5vf7PWItW3Q/YQKuk3kkqRcKnexPyzyyq5lUgTi8CxxZdaASIOu294wjBhhdyHlXEkVTNJ9JKkj/obF+XiIIp0cBDsOXY9hDQ== pandas-dev@python.org' sshKeySecureFile: 'pandas_docs_key' displayName: 'Install GitHub ssh deployment key' - #condition : | - # and(not(eq(variables['Build.Reason'], 'PullRequest')), - # eq(variables['Build.SourceBranch'], 'refs/heads/master')) + condition : | + and(not(eq(variables['Build.Reason'], 'PullRequest')), + eq(variables['Build.SourceBranch'], 'refs/heads/master')) - script: | cd doc/build/html - git remote add origin git@github.com:pandas-dev/pandas-dev-docs.git + git remote add origin git@github.com:pandas-dev/dev-docs.git git push origin master -f displayName: 'Publish docs to GitHub pages' - #condition : | - # and(not(eq(variables['Build.Reason'], 'PullRequest')), - # eq(variables['Build.SourceBranch'], 'refs/heads/master')) + condition : | + and(not(eq(variables['Build.Reason'], 'PullRequest')), + eq(variables['Build.SourceBranch'], 'refs/heads/master')) From cfefc324225bb224b62b678ce620d4c42c0f1ac9 Mon Sep 17 00:00:00 2001 From: Marc Garcia Date: Fri, 31 May 2019 17:18:56 +0100 Subject: [PATCH 10/12] Updating target repo --- azure-pipelines.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index df0f77eef4da3..0c0ea2a0112f7 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -170,7 +170,7 @@ jobs: - script: | cd doc/build/html - git remote add origin git@github.com:pandas-dev/dev-docs.git + git remote add origin git@github.com:pandas-dev/pandas-dev.github.io.git git push origin master -f displayName: 'Publish docs to GitHub pages' condition : | From 186c4118ea1f724de81d8154e46eb6577b1d7238 Mon Sep 17 00:00:00 2001 From: Marc Garcia Date: Fri, 31 May 2019 17:28:32 +0100 Subject: [PATCH 11/12] Updating repo url in comment --- azure-pipelines.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 0c0ea2a0112f7..9f83917024049 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -157,7 +157,7 @@ jobs: # 2. Click on "+ Secure file" # 3. Upload the private key (the name of the file must match with the specified in "sshKeySecureFile" input below, "pandas_docs_key") # 4. Click on file name after it is created, tick the box "Authorize for use in all pipelines" and save - # 5. The public key specified in "sshPublicKey" is the pair of the uploaded private key, and needs to be specified as a deploy key of the repo where the docs will be pushed: https://github.com/pandas-dev/dev-docs/settings/keys + # 5. The public key specified in "sshPublicKey" is the pair of the uploaded private key, and needs to be specified as a deploy key of the repo where the docs will be pushed: https://github.com/pandas-dev/pandas-dev.github.io/settings/keys - task: InstallSSHKey@0 inputs: hostName: 'github.com' From 233b61ea901e1833e2da822e1e60f636640dbfde Mon Sep 17 00:00:00 2001 From: Marc Garcia Date: Fri, 31 May 2019 19:39:04 +0100 Subject: [PATCH 12/12] Using environment.yml in travis doc build --- .travis.yml | 4 ++-- ci/deps/travis-36-doc.yaml | 46 -------------------------------------- 2 files changed, 2 insertions(+), 48 deletions(-) delete mode 100644 ci/deps/travis-36-doc.yaml diff --git a/.travis.yml b/.travis.yml index ce8817133a477..90dd904e6cb1e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -51,14 +51,14 @@ matrix: # In allow_failures - dist: trusty env: - - JOB="3.6, doc" ENV_FILE="ci/deps/travis-36-doc.yaml" DOC=true + - JOB="3.6, doc" ENV_FILE="environment.yml" 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 + - JOB="3.6, doc" ENV_FILE="environment.yml" DOC=true before_install: - echo "before_install" diff --git a/ci/deps/travis-36-doc.yaml b/ci/deps/travis-36-doc.yaml deleted file mode 100644 index 9d6cbd82fdc05..0000000000000 --- a/ci/deps/travis-36-doc.yaml +++ /dev/null @@ -1,46 +0,0 @@ -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