From 1d0d6d4a716315c171333ff66e42db7dec0a3a53 Mon Sep 17 00:00:00 2001 From: Will Ayd Date: Wed, 15 May 2019 08:10:39 -0700 Subject: [PATCH 1/4] Added conda update step and re-added gcsfs --- ci/azure/windows.yml | 2 ++ ci/deps/azure-windows-37.yaml | 2 ++ 2 files changed, 4 insertions(+) diff --git a/ci/azure/windows.yml b/ci/azure/windows.yml index 86d445e343777..5a919b1c13e34 100644 --- a/ci/azure/windows.yml +++ b/ci/azure/windows.yml @@ -19,6 +19,8 @@ jobs: steps: - powershell: Write-Host "##vso[task.prependpath]$env:CONDA\Scripts" displayName: Add conda to PATH + - script: conda update -n base conda + displayName: Update conda - script: conda env create --file ci\\deps\\azure-windows-$(CONDA_PY).yaml displayName: Create anaconda environment - script: | diff --git a/ci/deps/azure-windows-37.yaml b/ci/deps/azure-windows-37.yaml index 66ab307eb3244..5384e794d442a 100644 --- a/ci/deps/azure-windows-37.yaml +++ b/ci/deps/azure-windows-37.yaml @@ -1,9 +1,11 @@ name: pandas-dev channels: - defaults + - conda-forge dependencies: - beautifulsoup4 - bottleneck + - gcsfs - html5lib - jinja2 - lxml From 0f2498c6ea8f87413c82a7d95e6bd6997d8048fe Mon Sep 17 00:00:00 2001 From: Will Ayd Date: Wed, 15 May 2019 10:28:55 -0700 Subject: [PATCH 2/4] Added -q flag and conda list --- ci/azure/windows.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/ci/azure/windows.yml b/ci/azure/windows.yml index 5a919b1c13e34..9f058a40acf36 100644 --- a/ci/azure/windows.yml +++ b/ci/azure/windows.yml @@ -19,12 +19,13 @@ jobs: steps: - powershell: Write-Host "##vso[task.prependpath]$env:CONDA\Scripts" displayName: Add conda to PATH - - script: conda update -n base conda + - script: conda update -n -q base conda displayName: Update conda - - script: conda env create --file ci\\deps\\azure-windows-$(CONDA_PY).yaml + - script: conda env create -q --file ci\\deps\\azure-windows-$(CONDA_PY).yaml displayName: Create anaconda environment - script: | call activate pandas-dev + conda list ci\\incremental\\build.cmd displayName: 'Build' - script: | From e3c9fd00317644ce55f59d39779c3b35a5ebd2be Mon Sep 17 00:00:00 2001 From: Will Ayd Date: Wed, 15 May 2019 10:45:54 -0700 Subject: [PATCH 3/4] Fixed command error --- ci/azure/windows.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/azure/windows.yml b/ci/azure/windows.yml index 9f058a40acf36..d9cd320ded747 100644 --- a/ci/azure/windows.yml +++ b/ci/azure/windows.yml @@ -19,7 +19,7 @@ jobs: steps: - powershell: Write-Host "##vso[task.prependpath]$env:CONDA\Scripts" displayName: Add conda to PATH - - script: conda update -n -q base conda + - script: conda update -q -n base conda displayName: Update conda - script: conda env create -q --file ci\\deps\\azure-windows-$(CONDA_PY).yaml displayName: Create anaconda environment From 8ea6aea812325d4ab95bc63d6e7777b6d3ddf65c Mon Sep 17 00:00:00 2001 From: Will Ayd Date: Wed, 15 May 2019 12:12:24 -0700 Subject: [PATCH 4/4] Prepend call to conda command --- ci/azure/windows.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/azure/windows.yml b/ci/azure/windows.yml index d9cd320ded747..eeb03a0b28130 100644 --- a/ci/azure/windows.yml +++ b/ci/azure/windows.yml @@ -25,7 +25,7 @@ jobs: displayName: Create anaconda environment - script: | call activate pandas-dev - conda list + call conda list ci\\incremental\\build.cmd displayName: 'Build' - script: |