- fixed travis?

aprenoveau · May 18, 2018 · a6df37d · a6df37d
1 parent e19063a
commit a6df37d
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/requirements.txt b/requirements.txt
@@ -12,5 +12,3 @@ seaborn
 scikit_learn
 networkx==1.11
 Ipython
-pymc
-pyevtk
diff --git a/test/test_tutorials/test_ch2.py b/test/test_tutorials/test_ch2.py
@@ -24,7 +24,7 @@
 
 # Aux imports
 import numpy as np
-
+import pytest
 
 def test_ch2(theano_f):
     # Importing the data from csv files and settign extent and resolution
@@ -78,7 +78,7 @@ def test_ch2(theano_f):
 
 
     vertices, simplices = gp.get_surfaces(interp_data, lith_block[1], None, original_scale=False)
-
+    pyevtk = pytest.importorskip("pyevtk")
     gp.export_to_vtk(geo_data, path=os.path.dirname(__file__)+'/vtk_files', lith_block=lith_block[0], vertices=vertices, simplices=simplices)
 
     # gp.plot_surfaces_3D_real_time(interp_data, vertices, simplices, alpha=1)

diff --git a/test/test_tutorials/test_ch3.py b/test/test_tutorials/test_ch3.py
@@ -28,9 +28,11 @@
 
 #from ..conftest import theano_f
 input_path = os.path.dirname(__file__)+'/../../notebooks'
-
+import pytest
+pymc = pytest.importorskip("pymc")
 
 def test_ch3_a(theano_f):
+
     # set cube size and model extent
     cs = 50
     extent = (3000, 200, 2000)  # (x, y, z)
-Original file line number
+Diff line change
@@ Expand Up / @@ -12,5 +12,3 @@ seaborn @@
     scikit_learn
     networkx==1.11
     Ipython
-    pymc
-    pyevtk