Skip to content

Commit

Permalink
Fixups
Browse files Browse the repository at this point in the history
* VC 9.0 for 2.7
* exit 0 in mac build
  • Loading branch information
TomAugspurger committed Sep 19, 2018
1 parent 3a8fadb commit 8869e47
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 4 deletions.
9 changes: 9 additions & 0 deletions ci/azure/windows-py27.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,15 @@ jobs:
updateConda: no
packageSpecs: ''

# Need to install VC 9.0 only for Python 2.7
# Once we understand how to do tasks conditional on build matrix variables
# we could merge this into azure-windows.yml
- powershell: |
$wc = New-Object net.webclient
$wc.Downloadfile("https://download.microsoft.com/download/7/9/6/796EF2E4-801B-4FC4-AB28-B59FBF6D907B/VCForPython27.msi", "VCForPython27.msi")
Start-Process "VCForPython27.msi" /qn -Wait
displayName: 'Install VC 9.0'
- script: |
ci\\incremental\\setup_conda_environment.cmd
displayName: 'Before Install'
Expand Down
6 changes: 3 additions & 3 deletions ci/incremental/install_miniconda.sh
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,12 @@ set -v -e
unamestr=`uname`
if [[ "$unamestr" == 'Linux' ]]; then
if [[ "$BITS32" == "yes" ]]; then
wget https://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86.sh -O miniconda.sh
wget -q https://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86.sh -O miniconda.sh
else
wget https://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86_64.sh -O miniconda.sh
wget -q https://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86_64.sh -O miniconda.sh
fi
elif [[ "$unamestr" == 'Darwin' ]]; then
wget https://repo.continuum.io/miniconda/Miniconda3-latest-MacOSX-x86_64.sh -O miniconda.sh
wget -q https://repo.continuum.io/miniconda/Miniconda3-latest-MacOSX-x86_64.sh -O miniconda.sh
else
echo Error
fi
Expand Down
3 changes: 2 additions & 1 deletion ci/incremental/setup_conda_environment.sh
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,8 @@ pip uninstall -y pandas
echo
echo "[no installed pandas]"
conda list pandas
pip list --format columns |grep pandas
# Add the grep -v grep so that exit with 0
pip list --format columns | grep pandas | {grep -v grep || true; }

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

0 comments on commit 8869e47

Please sign in to comment.