From 870c3a517083c2634dc69bd714073e53ac7b8a74 Mon Sep 17 00:00:00 2001 From: Will Ayd Date: Mon, 13 May 2019 22:32:55 -0700 Subject: [PATCH 1/4] Removed deprecated Azure task --- ci/azure/windows.yml | 5 ----- 1 file changed, 5 deletions(-) diff --git a/ci/azure/windows.yml b/ci/azure/windows.yml index 1e3390a7f8d9b..17c0e6855e64f 100644 --- a/ci/azure/windows.yml +++ b/ci/azure/windows.yml @@ -17,11 +17,6 @@ jobs: CONDA_PY: "37" steps: - - task: CondaEnvironment@1 - inputs: - updateConda: no - packageSpecs: '' - - script: | ci\\incremental\\setup_conda_environment.cmd displayName: 'Before Install' From a7a1dfe30fa0df90a0f6fb4332b2a43af087b2d0 Mon Sep 17 00:00:00 2001 From: Will Ayd Date: Tue, 14 May 2019 18:22:16 -0700 Subject: [PATCH 2/4] Added step to add conda to path --- ci/azure/windows.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ci/azure/windows.yml b/ci/azure/windows.yml index 17c0e6855e64f..9e0fe5e799e13 100644 --- a/ci/azure/windows.yml +++ b/ci/azure/windows.yml @@ -17,6 +17,8 @@ jobs: CONDA_PY: "37" steps: + - powershell: Write-Host "##vso[task.prependpath]$env:CONDA\Scripts" + displayName: Add conda to PATH - script: | ci\\incremental\\setup_conda_environment.cmd displayName: 'Before Install' From 2fc5d478641831f6f4f8c3cff3adf995ed561704 Mon Sep 17 00:00:00 2001 From: Will Ayd Date: Tue, 14 May 2019 19:55:40 -0700 Subject: [PATCH 3/4] Leverage CI to create conda environment --- ci/azure/windows.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/ci/azure/windows.yml b/ci/azure/windows.yml index 9e0fe5e799e13..86d445e343777 100644 --- a/ci/azure/windows.yml +++ b/ci/azure/windows.yml @@ -19,9 +19,8 @@ jobs: steps: - powershell: Write-Host "##vso[task.prependpath]$env:CONDA\Scripts" displayName: Add conda to PATH - - script: | - ci\\incremental\\setup_conda_environment.cmd - displayName: 'Before Install' + - script: conda env create --file ci\\deps\\azure-windows-$(CONDA_PY).yaml + displayName: Create anaconda environment - script: | call activate pandas-dev ci\\incremental\\build.cmd From 975797341605c3924a79470c477356aec28776bb Mon Sep 17 00:00:00 2001 From: Will Ayd Date: Tue, 14 May 2019 19:56:02 -0700 Subject: [PATCH 4/4] Removed cmd file to build conda environment --- ci/incremental/setup_conda_environment.cmd | 23 ---------------------- 1 file changed, 23 deletions(-) delete mode 100644 ci/incremental/setup_conda_environment.cmd diff --git a/ci/incremental/setup_conda_environment.cmd b/ci/incremental/setup_conda_environment.cmd deleted file mode 100644 index db7de503e41b6..0000000000000 --- a/ci/incremental/setup_conda_environment.cmd +++ /dev/null @@ -1,23 +0,0 @@ -@rem https://github.com/numba/numba/blob/master/buildscripts/incremental/setup_conda_environment.cmd -@rem The cmd /C hack circumvents a regression where conda installs a conda.bat -@rem script in non-root environments. -set CONDA_INSTALL=cmd /C conda install -q -y -set PIP_INSTALL=pip install -q - -@echo on - -@rem Deactivate any environment -call deactivate -@rem Display root environment (for debugging) -conda list -@rem Clean up any left-over from a previous build -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 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 - -if %errorlevel% neq 0 exit /b %errorlevel%