From bcfe7619cbaba48f82488f9bba121fe38c80f972 Mon Sep 17 00:00:00 2001 From: jbrockmendel Date: Sat, 21 Dec 2019 13:21:21 -0800 Subject: [PATCH 1/2] CI: transition powershell-> bash --- ci/azure/windows.yml | 9 +++++---- ci/incremental/build.cmd | 9 --------- 2 files changed, 5 insertions(+), 13 deletions(-) delete mode 100644 ci/incremental/build.cmd diff --git a/ci/azure/windows.yml b/ci/azure/windows.yml index 86807b4010988..a548fe092ca68 100644 --- a/ci/azure/windows.yml +++ b/ci/azure/windows.yml @@ -19,9 +19,9 @@ jobs: PATTERN: "not slow and not network" steps: - - powershell: | - Write-Host "##vso[task.prependpath]$env:CONDA\Scripts" - Write-Host "##vso[task.prependpath]$HOME/miniconda3/bin" + - script: | + echo '##vso[task.prependpath]$env:CONDA\Scripts' + echo '##vso[task.prependpath]$HOME/miniconda3/bin' displayName: 'Add conda to PATH' - script: conda update -q -n base conda displayName: 'Update conda' @@ -31,7 +31,8 @@ jobs: - bash: | source activate pandas-dev conda list - ci\\incremental\\build.cmd + python setup.py build_ext -q -i + python -m pip install --no-build-isolation -e . displayName: 'Build' - bash: | source activate pandas-dev diff --git a/ci/incremental/build.cmd b/ci/incremental/build.cmd deleted file mode 100644 index b61b59e287299..0000000000000 --- a/ci/incremental/build.cmd +++ /dev/null @@ -1,9 +0,0 @@ -@rem https://github.com/numba/numba/blob/master/buildscripts/incremental/build.cmd - -@rem Build extensions -python setup.py build_ext -q -i - -@rem Install pandas -python -m pip install --no-build-isolation -e . - -if %errorlevel% neq 0 exit /b %errorlevel% From 16ddc17f3eefdef2f10b07b43e173a815322a3d7 Mon Sep 17 00:00:00 2001 From: jbrockmendel Date: Sun, 22 Dec 2019 14:12:57 -0800 Subject: [PATCH 2/2] revert bit that broke --- ci/azure/windows.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ci/azure/windows.yml b/ci/azure/windows.yml index a548fe092ca68..536c2fdbf1353 100644 --- a/ci/azure/windows.yml +++ b/ci/azure/windows.yml @@ -19,9 +19,9 @@ jobs: PATTERN: "not slow and not network" steps: - - script: | - echo '##vso[task.prependpath]$env:CONDA\Scripts' - echo '##vso[task.prependpath]$HOME/miniconda3/bin' + - powershell: | + Write-Host "##vso[task.prependpath]$env:CONDA\Scripts" + Write-Host "##vso[task.prependpath]$HOME/miniconda3/bin" displayName: 'Add conda to PATH' - script: conda update -q -n base conda displayName: 'Update conda'