Skip to content

Commit 384c9b3

Browse files
fmaussionshoyer
authored andcommitted
Use LooseVersion for bottleneck checks (#1235)
1 parent 6ccbdfd commit 384c9b3

File tree

3 files changed

+6
-6
lines changed

3 files changed

+6
-6
lines changed

xarray/core/ops.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
import inspect
77
import operator
88
import warnings
9-
from distutils.version import StrictVersion
9+
from distutils.version import LooseVersion
1010

1111
import numpy as np
1212
import pandas as pd
@@ -525,7 +525,7 @@ def inject_bottleneck_rolling_methods(cls):
525525

526526
# bottleneck rolling methods
527527
if has_bottleneck:
528-
if StrictVersion(bn.__version__) < StrictVersion('1.0'):
528+
if LooseVersion(bn.__version__) < LooseVersion('1.0'):
529529
return
530530

531531
for bn_name, method_name in BOTTLENECK_ROLLING_METHODS.items():

xarray/core/rolling.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
from __future__ import print_function
44
import numpy as np
55
import warnings
6-
from distutils.version import StrictVersion
6+
from distutils.version import LooseVersion
77

88
from .pycompat import OrderedDict, zip
99
from .common import ImplementsRollingArrayReduce, full_like
@@ -51,7 +51,7 @@ def __init__(self, obj, min_periods=None, center=False, **windows):
5151
"""
5252

5353
if (has_bottleneck and
54-
(StrictVersion(bn.__version__) < StrictVersion('1.0'))):
54+
(LooseVersion(bn.__version__) < LooseVersion('1.0'))):
5555
warnings.warn('xarray requires bottleneck version of 1.0 or '
5656
'greater for rolling operations. Rolling '
5757
'aggregation methods will use numpy instead'

xarray/tests/__init__.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
from __future__ import print_function
44
import warnings
55
from contextlib import contextmanager
6-
from distutils.version import StrictVersion
6+
from distutils.version import LooseVersion
77

88
import numpy as np
99
from numpy.testing import assert_array_equal
@@ -70,7 +70,7 @@
7070

7171
try:
7272
import bottleneck
73-
if StrictVersion(bottleneck.__version__) < StrictVersion('1.0'):
73+
if LooseVersion(bottleneck.__version__) < LooseVersion('1.0'):
7474
raise ImportError('Fall back to numpy')
7575
has_bottleneck = True
7676
except ImportError:

0 commit comments

Comments
 (0)