numpy version for travis and fix test on vtk files

Author: mtezzele

.travis.yml

@@ -61,7 +61,7 @@ install:
     - echo $LD_LIBRARY_PATH
     - echo $DYLD_LIBRARY_PATH
     - echo $PATH
-    - conda install numpy scipy matplotlib vtk nose setuptools coveralls
+    - conda install "numpy>=1.12" scipy matplotlib vtk nose setuptools coveralls
     - if [[ "$TOXENV" == "py27" ]]; then
         conda install --yes -c conda-forge -c dlr-sc -c pythonocc -c oce pythonocc-core=0.17 python=2.7;
       else

tests/test_ffdparams.py

@@ -328,7 +328,6 @@ def test_write_parameters(self):
         outfilename = 'tests/test_datasets/parameters_sphere_out.prm'
         outfilename_expected = 'tests/test_datasets/parameters_sphere_out_true.prm'
         params.write_parameters(outfilename)
-
         self.assertTrue(filecmp.cmp(outfilename, outfilename_expected))
         os.remove(outfilename)
 
@@ -339,7 +338,8 @@ def test_save_points(self):
         outfilename = 'tests/test_datasets/box_test_sphere_out.vtk'
         outfilename_expected = 'tests/test_datasets/box_test_sphere.vtk'
         params.save_points(outfilename, False)
-        self.assertTrue(filecmp.cmp(outfilename, outfilename_expected))
+        with open(outfilename, 'r') as out, open(outfilename_expected, 'r') as exp:
+            self.assertTrue(out.readlines()[1:] == exp.readlines()[1:])
         os.remove(outfilename)
 
     def test_save_points_deformed(self):
@@ -349,7 +349,8 @@ def test_save_points_deformed(self):
         outfilename = 'tests/test_datasets/box_test_sphere_deformed_out.vtk'
         outfilename_expected = 'tests/test_datasets/box_test_sphere_deformed.vtk'
         params.save_points(outfilename, True)
-        self.assertTrue(filecmp.cmp(outfilename, outfilename_expected))
+        with open(outfilename, 'r') as out, open(outfilename_expected, 'r') as exp:
+            self.assertTrue(out.readlines()[1:] == exp.readlines()[1:])
         os.remove(outfilename)
 
     def test_print(self):

tests/test_rbfparams.py

@@ -76,7 +76,8 @@ def test_save_points(self):
         outfilename = 'tests/test_datasets/box_test_cube_out.vtk'
         outfilename_expected = 'tests/test_datasets/box_test_cube.vtk'
         params.save_points(outfilename, False)
-        self.assertTrue(filecmp.cmp(outfilename, outfilename_expected))
+        with open(outfilename, 'r') as out, open(outfilename_expected, 'r') as exp:
+            self.assertTrue(out.readlines()[1:] == exp.readlines()[1:])
         os.remove(outfilename)
 
     def test_save_points_deformed(self):
@@ -86,7 +87,8 @@ def test_save_points_deformed(self):
         outfilename = 'tests/test_datasets/box_test_cube_deformed_out.vtk'
         outfilename_expected = 'tests/test_datasets/box_test_cube_deformed.vtk'
         params.save_points(outfilename, True)
-        self.assertTrue(filecmp.cmp(outfilename, outfilename_expected))
+        with open(outfilename, 'r') as out, open(outfilename_expected, 'r') as exp:
+            self.assertTrue(out.readlines()[1:] == exp.readlines()[1:])
         os.remove(outfilename)
 
     def test_write_parameters_failing_filename_type(self):

tests/test_stlhandler.py

@@ -120,7 +120,8 @@ def test_stl_write_comparison(self):
         outfilename_expected = 'tests/test_datasets/test_sphere_out_true.stl'
 
         stl_handler.write(mesh_points, outfilename)
-        self.assertTrue(filecmp.cmp(outfilename, outfilename_expected))
+        with open(outfilename, 'r') as out, open(outfilename_expected, 'r') as exp:
+            self.assertTrue(out.readlines()[1:] == exp.readlines()[1:])
         self.addCleanup(os.remove, outfilename)
 
     def test_stl_write_binary_from_binary(self):
@@ -178,7 +179,8 @@ def test_stl_write_ascii_from_binary(self):
         outfilename_expected = 'tests/test_datasets/test_sphere_out_true.stl'
 
         stl_handler.write(mesh_points, outfilename, write_bin=False)
-        self.assertTrue(filecmp.cmp(outfilename, outfilename_expected))
+        with open(outfilename, 'r') as out, open(outfilename_expected, 'r') as exp:
+            self.assertTrue(out.readlines()[1:] == exp.readlines()[1:])
         self.addCleanup(os.remove, outfilename)
 
     def test_stl_plot_save_fig(self):