Skip to content

Commit

Permalink
Revert "FIX python-lz4 version comparison (joblib#847)"
Browse files Browse the repository at this point in the history
This reverts commit efe896a.
  • Loading branch information
ogrisel committed Dec 10, 2019
1 parent 6914e06 commit a4c5aa4
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 8 deletions.
4 changes: 2 additions & 2 deletions conftest.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
from pkg_resources import parse_version
from distutils.version import LooseVersion

import pytest
from _pytest.doctest import DoctestItem
Expand All @@ -25,7 +25,7 @@ def pytest_collection_modifyitems(config, items):
# numpy changed the str/repr formatting of numpy arrays in 1.14.
# We want to run doctests only for numpy >= 1.14.
import numpy as np
if parse_version(np.__version__) >= parse_version('1.14'):
if LooseVersion(np.__version__) >= LooseVersion('1.14'):
skip_doctests = False
except ImportError:
pass
Expand Down
4 changes: 2 additions & 2 deletions joblib/backports.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
import ctypes
import sys

from pkg_resources import parse_version
from distutils.version import LooseVersion

try:
import numpy as np
Expand All @@ -21,7 +21,7 @@ def make_memmap(filename, dtype='uint8', mode='r+', offset=0,
"""
mm = np.memmap(filename, dtype=dtype, mode=mode, offset=offset,
shape=shape, order=order)
if parse_version(np.__version__) < parse_version('1.13'):
if LooseVersion(np.__version__) < '1.13':
mm.offset = offset
return mm
except ImportError:
Expand Down
6 changes: 2 additions & 4 deletions joblib/compressor.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
import sys
import io
import zlib
from pkg_resources import parse_version
from distutils.version import LooseVersion

from ._compat import _basestring, PY3_OR_LATER

Expand Down Expand Up @@ -226,9 +226,7 @@ def _check_versions(self):
raise ValueError('lz4 compression is only available with '
'python3+.')

if lz4 is None or (
parse_version(lz4.__version__) < parse_version('0.19')
):
if lz4 is None or LooseVersion(lz4.__version__) < LooseVersion('0.19'):
raise ValueError(LZ4_NOT_INSTALLED_ERROR)

def compressor_file(self, fileobj, compresslevel=None):
Expand Down

0 comments on commit a4c5aa4

Please sign in to comment.