Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion pytest_arraydiff/plugin.py
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@
import shutil
import tempfile
import warnings
from distutils.version import StrictVersion

import six
from six.moves.urllib.request import urlopen
Expand Down Expand Up @@ -212,7 +213,11 @@ def __init__(self, config, reference_dir=None, generate_dir=None, default_format

def pytest_runtest_setup(self, item):

compare = item.keywords.get('array_compare')
if StrictVersion(pytest.__version__) < StrictVersion("3.6"):
compare = item.get_marker('array_compare')
else:
compare = item.get_closest_marker('array_compare')


if compare is None:
return
Expand Down