Resolve dependencies and build issues

-Temporary add importorskip around import onnx -bump up .yml matplotlib version
secti6n · Sep 5, 2018 · e3a1acf · e3a1acf
1 parent dc5e482
commit e3a1acf
Show file tree

Hide file tree

Showing 8 changed files with 9 additions and 8 deletions.
diff --git a/Scripts/install/linux/conda-linux-cntk-py27-environment.yml b/Scripts/install/linux/conda-linux-cntk-py27-environment.yml
@@ -8,7 +8,7 @@ dependencies:
 - h5py=2.6.0=np111py27_2
 - imageio=2.2.0=py27_0
 - jupyter=1.0.0=py27_3
-- matplotlib=1.5.3=np111py27_0
+- matplotlib=2.0.0=np111py27_0
 - mock=2.0.0=py27_0
 - numpy=1.11.2=py27_0
 - pandas=0.19.1=np111py27_0

diff --git a/Scripts/install/linux/conda-linux-cntk-py34-environment.yml b/Scripts/install/linux/conda-linux-cntk-py34-environment.yml
@@ -6,7 +6,7 @@ channels: !!python/tuple
 dependencies:
 - h5py=2.6.0=np111py34_2
 - jupyter=1.0.0=py34_3
-- matplotlib=1.5.3=np111py34_0
+- matplotlib=2.0.0=np111py34_0
 - numpy=1.11.2=py34_0
 - opencv=3.1.0=np111py34_1
 - pandas=0.19.1=np111py34_0

diff --git a/Scripts/install/linux/conda-linux-cntk-py35-environment.yml b/Scripts/install/linux/conda-linux-cntk-py35-environment.yml
@@ -7,7 +7,7 @@ dependencies:
 - h5py=2.6.0=np111py35_2
 - imageio=2.2.0=py35_0
 - jupyter=1.0.0=py35_3
-- matplotlib=1.5.3=np111py35_0
+- matplotlib=2.0.0=np111py35_0
 - numpy=1.11.2=py35_0
 - opencv=3.1.0=np111py35_1
 - pandas=0.19.1=np111py35_0

diff --git a/Scripts/install/windows/conda-windows-cntk-py27-environment.yml b/Scripts/install/windows/conda-windows-cntk-py27-environment.yml
@@ -8,7 +8,7 @@ dependencies:
 - h5py=2.6.0=np111py27_2
 - imageio=2.2.0=py27_0
 - jupyter=1.0.0=py27_3
-- matplotlib=1.5.3=np111py27_0
+- matplotlib=2.0.0=np111py27_0
 - mock=2.0.0=py27_0
 - numpy=1.11.2=py27_0
 - pandas=0.19.1=np111py27_0

diff --git a/Scripts/install/windows/conda-windows-cntk-py34-environment.yml b/Scripts/install/windows/conda-windows-cntk-py34-environment.yml
@@ -6,7 +6,7 @@ channels:
 dependencies:
 - h5py=2.6.0=np111py34_2
 - jupyter=1.0.0=py34_3
-- matplotlib=1.5.3=np111py34_0
+- matplotlib=2.0.0=np111py34_0
 - numpy=1.11.2=py34_0
 - pandas=0.19.1=np111py34_0
 - pandas-datareader=0.2.1=py34_0

diff --git a/Scripts/install/windows/conda-windows-cntk-py35-environment.yml b/Scripts/install/windows/conda-windows-cntk-py35-environment.yml
@@ -7,7 +7,7 @@ dependencies:
 - h5py=2.6.0=np111py35_2
 - imageio=2.2.0=py35_0
 - jupyter=1.0.0=py35_3
-- matplotlib=1.5.3=np111py35_0
+- matplotlib=2.0.0=np111py35_0
 - numpy=1.11.2=py35_0
 - pandas=0.19.1=np111py35_0
 - pandas-datareader=0.2.1=py35_0

diff --git a/bindings/python/cntk/tests/onnx_op_test.py b/bindings/python/cntk/tests/onnx_op_test.py
@@ -6,8 +6,8 @@
 import os
 import numpy as np
 import cntk as C
-import onnx
 import pytest
+onnx = pytest.importorskip("onnx")
 from copy import deepcopy
 from cntk.ops.tests.ops_test_utils import cntk_device
 from itertools import product

diff --git a/bindings/python/cntk/tests/onnx_test_helper.py b/bindings/python/cntk/tests/onnx_test_helper.py
@@ -6,7 +6,8 @@
 import os
 import numpy as np
 import cntk as C
-import onnx
+import pytest
+onnx = pytest.importorskip("onnx")
 
 # check whether the input data is a batch of sparse matrices 
 def is_list_of_sparse(data):