From 135ddd5ffef0aee606cfc2072e21f05f12e02a21 Mon Sep 17 00:00:00 2001 From: Will Ayd Date: Mon, 13 May 2019 21:29:41 -0700 Subject: [PATCH 1/3] Prefixed batch script commands with call --- ci/deps/azure-windows-37.yaml | 2 ++ ci/incremental/setup_conda_environment.cmd | 10 ++++------ 2 files changed, 6 insertions(+), 6 deletions(-) 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 diff --git a/ci/incremental/setup_conda_environment.cmd b/ci/incremental/setup_conda_environment.cmd index db7de503e41b6..182d1a741c6ef 100644 --- a/ci/incremental/setup_conda_environment.cmd +++ b/ci/incremental/setup_conda_environment.cmd @@ -9,15 +9,13 @@ set PIP_INSTALL=pip install -q @rem Deactivate any environment call deactivate @rem Display root environment (for debugging) -conda list +call conda list @rem Clean up any left-over from a previous build -conda remove --all -q -y -n pandas-dev +call conda remove --all -q -y -n pandas-dev @rem Scipy, CFFI, jinja2 and IPython are optional dependencies, but exercised in the test suite -conda env create --file=ci\deps\azure-windows-%CONDA_PY%.yaml +call conda env create --file=ci\deps\azure-windows-%CONDA_PY%.yaml call activate pandas-dev -@rem gh-26345: we need to separate this out so that Azure doesn't complain -conda install -c conda-forge gcsfs -conda list +call conda list if %errorlevel% neq 0 exit /b %errorlevel% From 34071f5a13b45c33ee70f28f82cee6dbd335e96a Mon Sep 17 00:00:00 2001 From: Will Ayd Date: Mon, 13 May 2019 21:37:35 -0700 Subject: [PATCH 2/3] Increased verbosity --- ci/incremental/setup_conda_environment.cmd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/incremental/setup_conda_environment.cmd b/ci/incremental/setup_conda_environment.cmd index 182d1a741c6ef..589e694cb02ef 100644 --- a/ci/incremental/setup_conda_environment.cmd +++ b/ci/incremental/setup_conda_environment.cmd @@ -13,7 +13,7 @@ call conda list @rem Clean up any left-over from a previous build call conda remove --all -q -y -n pandas-dev @rem Scipy, CFFI, jinja2 and IPython are optional dependencies, but exercised in the test suite -call conda env create --file=ci\deps\azure-windows-%CONDA_PY%.yaml +call conda env create -v --file=ci\deps\azure-windows-%CONDA_PY%.yaml call activate pandas-dev call conda list From 2da56d8d1268907fa216d25b9c9714cc32ebe42e Mon Sep 17 00:00:00 2001 From: Will Ayd Date: Mon, 13 May 2019 22:15:55 -0700 Subject: [PATCH 3/3] Added conda update --- ci/incremental/setup_conda_environment.cmd | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/ci/incremental/setup_conda_environment.cmd b/ci/incremental/setup_conda_environment.cmd index 589e694cb02ef..63ac815ce0ebc 100644 --- a/ci/incremental/setup_conda_environment.cmd +++ b/ci/incremental/setup_conda_environment.cmd @@ -12,8 +12,10 @@ call deactivate call conda list @rem Clean up any left-over from a previous build call conda remove --all -q -y -n pandas-dev +@rem Upgrade conda +call conda update conda @rem Scipy, CFFI, jinja2 and IPython are optional dependencies, but exercised in the test suite -call conda env create -v --file=ci\deps\azure-windows-%CONDA_PY%.yaml +call conda env create --file=ci\deps\azure-windows-%CONDA_PY%.yaml call activate pandas-dev call conda list