Skip to content

Commit 8869e47

Browse files
committed
Fixups
* VC 9.0 for 2.7 * exit 0 in mac build
1 parent 3a8fadb commit 8869e47

File tree

3 files changed

+14
-4
lines changed

3 files changed

+14
-4
lines changed

ci/azure/windows-py27.yml

+9
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,15 @@ jobs:
2020
updateConda: no
2121
packageSpecs: ''
2222

23+
# Need to install VC 9.0 only for Python 2.7
24+
# Once we understand how to do tasks conditional on build matrix variables
25+
# we could merge this into azure-windows.yml
26+
- powershell: |
27+
$wc = New-Object net.webclient
28+
$wc.Downloadfile("https://download.microsoft.com/download/7/9/6/796EF2E4-801B-4FC4-AB28-B59FBF6D907B/VCForPython27.msi", "VCForPython27.msi")
29+
Start-Process "VCForPython27.msi" /qn -Wait
30+
displayName: 'Install VC 9.0'
31+
2332
- script: |
2433
ci\\incremental\\setup_conda_environment.cmd
2534
displayName: 'Before Install'

ci/incremental/install_miniconda.sh

+3-3
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,12 @@ set -v -e
66
unamestr=`uname`
77
if [[ "$unamestr" == 'Linux' ]]; then
88
if [[ "$BITS32" == "yes" ]]; then
9-
wget https://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86.sh -O miniconda.sh
9+
wget -q https://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86.sh -O miniconda.sh
1010
else
11-
wget https://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86_64.sh -O miniconda.sh
11+
wget -q https://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86_64.sh -O miniconda.sh
1212
fi
1313
elif [[ "$unamestr" == 'Darwin' ]]; then
14-
wget https://repo.continuum.io/miniconda/Miniconda3-latest-MacOSX-x86_64.sh -O miniconda.sh
14+
wget -q https://repo.continuum.io/miniconda/Miniconda3-latest-MacOSX-x86_64.sh -O miniconda.sh
1515
else
1616
echo Error
1717
fi

ci/incremental/setup_conda_environment.sh

+2-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,8 @@ pip uninstall -y pandas
3333
echo
3434
echo "[no installed pandas]"
3535
conda list pandas
36-
pip list --format columns |grep pandas
36+
# Add the grep -v grep so that exit with 0
37+
pip list --format columns | grep pandas | {grep -v grep || true; }
3738

3839
# # Install the compiler toolchain
3940
# if [[ $(uname) == Linux ]]; then

0 commit comments

Comments
 (0)