diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index d4a6135..5021b26 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -31,9 +31,7 @@ jobs: python setup.py install - name: Test run: | - python blosc/test.py - env: - PYTHONPATH: '.' + python -m blosc.test test-aarch64: name: "Build and test on aarch64" diff --git a/README.rst b/README.rst index eaa5eb4..4c571d2 100644 --- a/README.rst +++ b/README.rst @@ -134,9 +134,7 @@ running the doctests in ``blosc/test.py``: .. code-block:: console - $ PYTHONPATH=. (or "set PYTHONPATH=." on Win) - $ export PYTHONPATH=. (not needed on Win) - $ python blosc/test.py (add -v for verbose mode) + $ python -m blosc.test (add -v for verbose mode) Or alternatively, you can use the third-party ``nosetests`` script: diff --git a/blosc/test.py b/blosc/test.py index 9a38a0b..c763cc8 100644 --- a/blosc/test.py +++ b/blosc/test.py @@ -3,7 +3,7 @@ import sys import gc import os -import _version +from ._version import LooseVersion import ctypes import blosc import unittest @@ -52,7 +52,7 @@ def test_all_filters(self): s = b'0123456789'*100 filters = [blosc.NOSHUFFLE, blosc.SHUFFLE] # BITFILTER only works properly from 1.8.0 on - if _version.LooseVersion(blosc.blosclib_version) >= _version.LooseVersion("1.8.0"): + if LooseVersion(blosc.blosclib_version) >= LooseVersion("1.8.0"): filters.append(blosc.BITSHUFFLE) for filter_ in filters: c = blosc.compress(s, typesize=1, shuffle=filter_) diff --git a/blosc/toplevel.py b/blosc/toplevel.py index 392614d..69b8f75 100644 --- a/blosc/toplevel.py +++ b/blosc/toplevel.py @@ -8,7 +8,7 @@ import os import sys -import _version +from ._version import LooseVersion try: import cPickle as pickle except ImportError: @@ -344,7 +344,7 @@ def _check_shuffle(shuffle): raise ValueError("shuffle can only be one of NOSHUFFLE, SHUFFLE" " and BITSHUFFLE.") if (shuffle == blosc.BITSHUFFLE and - _version.LooseVersion(blosc.blosclib_version) < _version.LooseVersion("1.8.0")): + LooseVersion(blosc.blosclib_version) < LooseVersion("1.8.0")): raise ValueError("You need C-Blosc 1.8.0 or higher for using" " BITSHUFFLE.") diff --git a/doc/install.rst b/doc/install.rst index 4cae7f2..dc0971f 100644 --- a/doc/install.rst +++ b/doc/install.rst @@ -110,9 +110,7 @@ running the doctests in ``blosc/test.py``: .. code-block:: console - $ PYTHONPATH=. (or "set PYTHONPATH=." on Win) - $ export PYTHONPATH=. (not needed on Win) - $ python blosc/test.py (add -v for verbose mode) + $ python -m blosc.test (add -v for verbose mode) Or alternatively, you can use the third-party ``nosetests`` script to run both the doctests and the test suite: