Skip to content

Commit 68c69ee

Browse files
committed
Updated version check use check_version() from labscript_utils.
1 parent 96eee03 commit 68c69ee

File tree

1 file changed

+7
-5
lines changed

1 file changed

+7
-5
lines changed

__init__.py

+7-5
Original file line numberDiff line numberDiff line change
@@ -30,11 +30,13 @@
3030

3131
__version__ = '2.0.0'
3232

33-
# Known version incompatabilities
34-
from distutils.version import StrictVersion
35-
from labscript_utils import VersionException
36-
if StrictVersion(pandas.__version__) >= StrictVersion('0.17.0'):
37-
raise VersionException('lyse version %s is incompatible with pandas %s. Please downgrade pandas to 0.16.2.' % (__version__, pandas.__version__))
33+
try:
34+
from labscript_utils import check_version
35+
except ImportError:
36+
raise ImportError('Require labscript_utils > 2.1.0')
37+
38+
# allow pandas v0.15.0 to v0.16.x inclusive
39+
check_version('pandas', '0.15.0', '0.17')
3840

3941
# If running stand-alone, and not from within lyse, the below two variables
4042
# will be as follows. Otherwise lyse will override them with spinning_top =

0 commit comments

Comments
 (0)