File remove_unittest2.patch of Package python-h5py

Overview Repositories Revisions Requests Users Attributes Meta

File remove_unittest2.patch of Package python-h5py (Revision c75608215550dcf11a46ef8657c43a22)

Currently displaying revision c75608215550dcf11a46ef8657c43a22 , Show latest

--- a/h5py/tests/common.py
+++ b/h5py/tests/common.py
@@ -20,13 +20,7 @@ from six import unichr
 import numpy as np
 import h5py
 
-if sys.version_info[0] == 2:
-    try:
-        import unittest2 as ut
-    except ImportError:
-        raise ImportError( "unittest2 is required to run tests with Python 2")
-else:
-    import unittest as ut
+import unittest as ut
 
 
 # Check if non-ascii filenames are supported
--- a/tox.ini
+++ b/tox.ini
@@ -6,7 +6,7 @@ envlist = {py26,py27,py33,py34,py35,py36
 
 [testenv]
 deps =
-    py{26,27}-test: unittest2
+    py26-test: unittest2
     deps: cython>=0.23
     py{27,34,35,36}-deps: numpy>=1.7
     py26-deps: numpy>=1.7,<1.11
--- a/h5py/tests/old/test_h5t.py
+++ b/h5py/tests/old/test_h5t.py
@@ -10,6 +10,7 @@
 from __future__ import absolute_import
 
 import sys
+import unittest
 
 import numpy as np
 from six import PY2, text_type
@@ -211,6 +212,7 @@ class TestTypeFloatID(TestCase):
 
 
 class TestDeprecation(TestCase):
+    @unittest.skipIf(PY2, "Py2 unittest doesn't support assertWarnsRegex")
     def test_deprecation_available_ftypes(self):
         warning_message = ("Do not use available_ftypes, this is not part of "
             "the public API of h5py. See "

Places

File remove_unittest2.patch of Package python-h5py (Revision c75608215550dcf11a46ef8657c43a22)

Places