predefine a few common pytest.skipif clauses

Author: gdementen

larray/tests/common.py

@@ -1,10 +1,17 @@
 from __future__ import absolute_import, division, print_function
 
 import os
+import sys
+
 import pytest
 import datetime as dt
 import numpy as np
 import pandas as pd
+try:
+    import xlwings as xw
+except ImportError:
+    xw = None
+
 from larray import LArray, isnan, aslarray, Metadata
 
 
@@ -124,3 +131,9 @@ def meta():
     return Metadata([('title', title), ('description', description), ('author', author),
                      ('location', location), ('office_number', office_number),
                      ('score', score), ('date', date)])
+
+
+needs_xlwings = pytest.mark.skipif(xw is None, reason="xlwings is required for this test")
+needs_python35 = pytest.mark.skipif(sys.version_info < (3, 5), reason="Python 3.5 is required for this test")
+needs_python36 = pytest.mark.skipif(sys.version_info < (3, 6), reason="Python 3.6 is required for this test")
+needs_python37 = pytest.mark.skipif(sys.version_info < (3, 7), reason="Python 3.7 is required for this test")

larray/tests/test_array.py

@@ -14,10 +14,10 @@
     xw = None
 
 from larray.tests.common import (inputpath, assert_array_equal, assert_array_nan_equal, assert_larray_equiv,
-                                 tmp_path, meta)
+                                 tmp_path, meta, needs_xlwings, needs_python35, needs_python36, needs_python37)
 from larray import (LArray, Axis, LGroup, union, zeros, zeros_like, ndtest, empty, ones, eye, diag, stack,
                     clip, exp, where, X, mean, isnan, round, read_hdf, read_csv, read_eurostat, read_excel,
-                    from_lists, from_string, open_excel, from_frame, sequence, nan, nan_equal, IGroup)
+                    from_lists, from_string, open_excel, from_frame, sequence, nan, IGroup)
 from larray.inout.pandas import from_series
 from larray.core.axis import _to_ticks, _to_key
 from larray.util.misc import StringIO, LHDFStore
@@ -3013,7 +3013,7 @@ def test_read_eurostat():
                        [3722, 3395, 3347])
 
 
-@pytest.mark.skipif(xw is None, reason="xlwings is not available")
+@needs_xlwings
 def test_read_excel_xlwings():
     arr = read_excel(inputpath('test.xlsx'), '1d')
     assert_array_equal(arr, io_1d)
@@ -3807,7 +3807,7 @@ def test_to_excel_xlsxwriter(tmpdir):
     a3[group].to_excel(fpath, group, engine='xlsxwriter')
 
 
-@pytest.mark.skipif(xw is None, reason="xlwings is not available")
+@needs_xlwings
 def test_to_excel_xlwings(tmpdir):
     fpath = tmp_path(tmpdir, 'test_to_excel_xlwings.xlsx')
 
@@ -3915,11 +3915,11 @@ def test_as_table():
                    ['a2', 2]]
 
 
-@pytest.mark.skipif(xw is None, reason="xlwings is not available")
+@needs_xlwings
 def test_open_excel(tmpdir):
     # 1) Create new file
     # ==================
-    fpath = inputpath('should_not_extist.xlsx')
+    fpath = inputpath('should_not_exist.xlsx')
     # overwrite_file must be set to True to create a new file
     with pytest.raises(ValueError):
         open_excel(fpath)
@@ -4239,7 +4239,7 @@ def test_diag():
     assert d.i[1] == 1.0
 
 
-@pytest.mark.skipif(sys.version_info < (3, 5), reason="@ unavailable (Python < 3.5)")
+@needs_python35
 def test_matmul():
     # 2D / anonymous axes
     a1 = ndtest([Axis(3), Axis(3)])
@@ -4398,7 +4398,7 @@ def test_matmul():
     assert_array_equal(arr2d.__matmul__(arr4d), res)
 
 
-@pytest.mark.skipif(sys.version_info < (3, 5), reason="@ unavailable (Python < 3.5)")
+@needs_python35
 def test_rmatmul():
     a1 = eye(3) * 2
     a2 = ndtest([Axis(3), Axis(3)])

larray/tests/test_excel.py

@@ -5,16 +5,12 @@
 import pytest
 import numpy as np
 
-try:
-    import xlwings as xw
-except ImportError:
-    xw = None
-
+from larray.tests.common import needs_xlwings
 from larray import ndtest, larray_equal, open_excel, aslarray, Axis
 from larray.inout import xw_excel
 
 
-@pytest.mark.skipif(xw is None, reason="xlwings is not available")
+@needs_xlwings
 class TestWorkbook(object):
     def test_open_excel(self):
         # not using context manager because we call .quit manually
@@ -106,7 +102,7 @@ def test_rename(self):
             assert wb.sheet_names() == ['renamed']
 
 
-@pytest.mark.skipif(xw is None, reason="xlwings is not available")
+@needs_xlwings
 class TestSheet(object):
     def test_get_and_set_item(self):
         arr = ndtest((2, 3))
@@ -170,7 +166,7 @@ def test_repr(self):
             assert re.match('<larray.inout.xw_excel.Sheet \[Book\d+\]Sheet1>', repr(sheet))
 
 
-@pytest.mark.skipif(xw is None, reason="xlwings is not available")
+@needs_xlwings
 class TestRange(object):
     def test_scalar_convert(self):
         with open_excel(visible=False) as wb:

larray/tests/test_session.py

@@ -7,16 +7,11 @@
 import pandas as pd
 import pytest
 
-from larray.tests.common import assert_array_nan_equal, inputpath, tmp_path, meta
+from larray.tests.common import assert_array_nan_equal, inputpath, tmp_path, meta, needs_xlwings
 from larray import (Session, Axis, LArray, Group, isnan, zeros_like, ndtest, ones_like,
-                    local_arrays, global_arrays, arrays, nan)
+                    local_arrays, global_arrays, arrays)
 from larray.util.misc import pickle
 
-try:
-    import xlwings as xw
-except ImportError:
-    xw = None
-
 
 def equal(o1, o2):
     if isinstance(o1, LArray) or isinstance(o2, LArray):
@@ -222,7 +217,7 @@ def test_xlsx_pandas_io(tmpdir, session, meta):
     assert s.meta == meta
 
 
-@pytest.mark.skipif(xw is None, reason="xlwings is not available")
+@needs_xlwings
 def test_xlsx_xlwings_io(tmpdir, session, meta):
     fpath = tmp_path(tmpdir, 'test_session_xw.xlsx')
     session.meta = meta