Merge pull request #259 from cpcloud/py3-h5py

Py33 also fails for h5py 2.5.0
blaze · Jul 7, 2015 · 900380d · 900380d
2 parents f72bf5b + a37ec16
commit 900380d
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/odo/backends/tests/test_h5py.py b/odo/backends/tests/test_h5py.py
@@ -78,15 +78,15 @@ def test_discover():
         assert str(discover(f)) == str(discover({'data': x}))
 
 
-two_point_five_and_windows_py34 = \
+two_point_five_and_windows_py3 = \
     pytest.mark.skipif(sys.platform == 'win32' and
                        h5py.__version__ == LooseVersion('2.5.0') and
-                       sys.version_info[:2] == (3, 4),
+                       sys.version_info[0] == 3,
                        reason=('h5py 2.5.0 issue with varlen string types: '
                                'https://github.com/h5py/h5py/issues/593'))
 
 
-@two_point_five_and_windows_py34
+@two_point_five_and_windows_py3
 def test_discover_on_data_with_object_in_record_name():
     data = np.array([(u'a', 1), (u'b', 2)], dtype=[('lrg_object',
                                                     unicode_dtype),
@@ -221,7 +221,7 @@ def test_resource_with_variable_length():
             r.file.close()
 
 
-@two_point_five_and_windows_py34
+@two_point_five_and_windows_py3
 def test_resource_with_option_types():
     with tmpfile('.hdf5') as fn:
         ds = datashape.dshape('4 * {name: ?string, amount: ?int32}')
@@ -250,7 +250,7 @@ def test_copy_with_into():
             dset.file.close()
 
 
-@two_point_five_and_windows_py34
+@two_point_five_and_windows_py3
 def test_varlen_dtypes():
     y = np.array([('Alice', 100), ('Bob', 200)],
                 dtype=[('name', 'O'), ('amount', 'i4')])