Skip to content

Commit 0c7e543

Browse files
committed
fix the travis python3.5 build issue
1 parent 7239b59 commit 0c7e543

File tree

1 file changed

+22
-18
lines changed

1 file changed

+22
-18
lines changed

scripts/build_win.cmd

Lines changed: 22 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -46,27 +46,31 @@ if DEFINED APPVEYOR (
4646
:: Add the required channels
4747
conda config --add channels conda-forge
4848
conda config --add channels willyd
49-
:: Update conda
50-
REM conda update conda -y
51-
:: avoid python automatically upgrade to higher version
52-
conda config --set auto_update_conda False
53-
:: Download other required packages
54-
if !PYTHON_VERSION! EQU 2 (
55-
conda install --yes cmake ninja numpy scipy protobuf==3.1.0 six scikit-image pyyaml pydotplus graphviz
56-
)
57-
if !PYTHON_VERSION! EQU 2.7 (
58-
conda install --yes cmake ninja numpy scipy protobuf==3.1.0 six scikit-image pyyaml pydotplus graphviz
59-
)
60-
if !PYTHON_VERSION! EQU 3 (
61-
conda install --yes cmake ninja numpy scipy protobuf==3.1.0 six scikit-image pyyaml pydotplus graphviz
62-
)
63-
if !PYTHON_VERSION! EQU 3.5 (
64-
conda install --yes cmake ninja numpy scipy protobuf==3.1.0 six scikit-image pyyaml pydotplus graphviz
65-
pip install six
66-
)
49+
6750
if !PYTHON_VERSION! EQU 3.6 (
51+
:: avoid conda automatically updating python to higher version
52+
conda config --set auto_update_conda False
6853
conda install --yes cmake ninja numpy scipy protobuf==3.7.1 six scikit-image pyyaml pydotplus graphviz
6954
)
55+
else (
56+
:: Update conda
57+
conda update conda -y
58+
59+
:: Download other required packages
60+
if !PYTHON_VERSION! EQU 2 (
61+
conda install --yes cmake ninja numpy scipy protobuf==3.1.0 six scikit-image pyyaml pydotplus graphviz
62+
)
63+
if !PYTHON_VERSION! EQU 2.7 (
64+
conda install --yes cmake ninja numpy scipy protobuf==3.1.0 six scikit-image pyyaml pydotplus graphviz
65+
)
66+
if !PYTHON_VERSION! EQU 3 (
67+
conda install --yes cmake ninja numpy scipy protobuf==3.1.0 six scikit-image pyyaml pydotplus graphviz
68+
)
69+
if !PYTHON_VERSION! EQU 3.5 (
70+
conda install --yes cmake ninja numpy scipy protobuf==3.1.0 six scikit-image pyyaml pydotplus graphviz
71+
pip install six
72+
)
73+
)
7074

7175
if ERRORLEVEL 1 (
7276
echo ERROR: Conda update or install failed

0 commit comments

Comments
 (0)