File tree 3 files changed +14
-4
lines changed
3 files changed +14
-4
lines changed Original file line number Diff line number Diff line change 20
20
updateConda : no
21
21
packageSpecs : ' '
22
22
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
+
23
32
- script : |
24
33
ci\\incremental\\setup_conda_environment.cmd
25
34
displayName: 'Before Install'
Original file line number Diff line number Diff line change @@ -6,12 +6,12 @@ set -v -e
6
6
unamestr=` uname`
7
7
if [[ " $unamestr " == ' Linux' ]]; then
8
8
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
10
10
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
12
12
fi
13
13
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
15
15
else
16
16
echo Error
17
17
fi
Original file line number Diff line number Diff line change @@ -33,7 +33,8 @@ pip uninstall -y pandas
33
33
echo
34
34
echo " [no installed pandas]"
35
35
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 ; }
37
38
38
39
# # Install the compiler toolchain
39
40
# if [[ $(uname) == Linux ]]; then
You can’t perform that action at this time.
0 commit comments