Fix some warnings with modern pytest

Author: FrancescAlted

numexpr/tests/test_numexpr.py

@@ -296,7 +296,7 @@ def test_str_contains_long_needle(self):
         b = b'a' * 40
         res = evaluate('contains(a, b)')
         assert_equal(res, True)
-        
+
     def test_where_scalar_bool(self):
         a = True
         b = array([1, 2])
@@ -318,7 +318,7 @@ def test_refcount(self):
 
     def test_locals_clears_globals(self):
         # Check for issue #313, whereby clearing f_locals also clear f_globals
-        # if in the top-frame. This cannot be done inside `unittest` as it is always 
+        # if in the top-frame. This cannot be done inside `unittest` as it is always
         # executing code in a child frame.
         script = r';'.join([
                 r"import numexpr as ne",
@@ -334,7 +334,7 @@ def test_locals_clears_globals(self):
             ])
         # Raises CalledProcessError on a non-normal exit
         check = subprocess.check_call([sys.executable, '-c', script])
-        # Ideally this test should also be done against ipython but it's not 
+        # Ideally this test should also be done against ipython but it's not
         # a requirement.
 
 
@@ -521,7 +521,7 @@ def test_sanitize(self):
                 self.fail()
 
             # Forbid colon for lambda funcs
-            try: 
+            try:
                 evaluate('lambda x: x')
             except ValueError:
                 pass
@@ -585,7 +585,7 @@ def test_sanitize(self):
             x = np.array(['a', 'b'], dtype=bytes)
             evaluate("x == 'b:'")
 
-        
+
     def test_no_sanitize(self):
         try: # Errors on compile() after eval()
             evaluate('import os;', sanitize=False)
@@ -605,7 +605,7 @@ def test_no_sanitize(self):
     def test_disassemble(self):
         assert_equal(disassemble(NumExpr(
             "where(m, a, -1)", [('m', bool), ('a', float)])),
-            [[b'where_fbff', b'r0', b'r1[m]', b'r2[a]', b'c3[-1.0]'], 
+            [[b'where_fbff', b'r0', b'r1[m]', b'r2[a]', b'c3[-1.0]'],
              [b'noop', None, None, None]])
 
     def test_constant_deduplication(self):
@@ -624,18 +624,18 @@ def test_f32_constant(self):
         assert_equal(ConstantNode(numpy.float32(1)).astKind, "float")
         assert_equal(ConstantNode(numpy.float32("nan")).astKind, "float")
         assert_equal(ConstantNode(numpy.float32(3)).value.dtype, numpy.dtype("float32"))
-        assert_array_equal(NumExpr(ConstantNode(numpy.float32(1))).run(), 
+        assert_array_equal(NumExpr(ConstantNode(numpy.float32(1))).run(),
                            numpy.array(1, dtype="float32"))
 
     def test_unaligned_singleton(self):
-        # Test for issue #397 whether singletons outputs assigned to consts must be 
+        # Test for issue #397 whether singletons outputs assigned to consts must be
         # aligned or not.
         a = np.empty(5, dtype=np.uint8)[1:].view(np.int32)
         evaluate('3', out=a)
         assert_equal(a, 3)
 
     def test_negative_mod(self):
-        # Test for issue #413, modulus of negative integers. C modulus is 
+        # Test for issue #413, modulus of negative integers. C modulus is
         # actually remainder op, and hence different from Python modulus.
         a = np.array([-500, -135, 0, 0, 135, 500], dtype=np.int32)
         n = np.array([-360, -360, -360, 360, 360, 360], dtype=np.int32)
@@ -650,11 +650,11 @@ def test_negative_mod(self):
     def test_negative_power_scalar(self):
         # Test for issue #428, where the power is negative and the base is an
         # integer. This was running afoul in the precomputation in `expressions.py:pow_op()`
-        base = np.array([-2, -1, 0, 1, 2, 3], dtype=np.int32)
+        base = np.array([-2, -1, 1, 2, 3], dtype=np.int32)
         out_i = evaluate('base ** -1.0')
         assert_equal(out_i, np.power(base, -1.0))
 
-        base = np.array([-2, -1, 0, 1, 2, 3], dtype=np.int64)
+        base = np.array([-2, -1, 1, 2, 3], dtype=np.int64)
         out_l = evaluate('base ** -1.0')
         assert_equal(out_l, np.power(base, -1.0))
 
@@ -878,11 +878,10 @@ def method():
                                     expr == '(a+1) ** -1'):
                             continue
 
-                        m = make_test_method(a, a2, b, c, d, e, x,
-                                             expr, test_scalar, dtype,
-                                             optimization, exact,
-                                             section_name)
-                        yield m
+                        make_test_method(a, a2, b, c, d, e, x,
+                                         expr, test_scalar, dtype,
+                                         optimization, exact,
+                                         section_name)
 
 
 class test_int64(TestCase):
@@ -1120,7 +1119,7 @@ def _environment(key, value):
 # Test cases for the threading configuration
 class test_threading_config(TestCase):
     def test_max_threads_unset(self):
-        # Has to be done in a subprocess as `importlib.reload` doesn't let us 
+        # Has to be done in a subprocess as `importlib.reload` doesn't let us
         # re-initialize the threadpool
         script = '\n'.join([
                 "import os",
@@ -1132,7 +1131,7 @@ def test_max_threads_unset(self):
         subprocess.check_call([sys.executable, '-c', script])
 
     def test_max_threads_set(self):
-        # Has to be done in a subprocess as `importlib.reload` doesn't let us 
+        # Has to be done in a subprocess as `importlib.reload` doesn't let us
         # re-initialize the threadpool
         script = '\n'.join([
                 "import os",
@@ -1247,7 +1246,7 @@ def print_versions():
     (sysname, nodename, release, os_version, machine, processor) = platform.uname()
     print('Platform:          %s-%s-%s' % (sys.platform, machine, os_version))
     try:
-        # cpuinfo doesn't work on OSX well it seems, so protect these outputs 
+        # cpuinfo doesn't work on OSX well it seems, so protect these outputs
         # with a try block
         cpu_info = cpu.info[0]
         print('CPU vendor:        %s' % cpu_info.get('VendorIdentifier', ''))