From 15afb41b8bb664f70c308fa244bd1ecee364f1c5 Mon Sep 17 00:00:00 2001 From: Thomas Grainger Date: Fri, 15 Jul 2022 13:15:01 +0100 Subject: [PATCH 1/3] Revert "Fix error in tests introduced by #270 (#277)" This reverts commit f9b77b9152e4f30a697656195859b93f7ab009ba. --- blosc/test.py | 4 ++-- blosc/toplevel.py | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) 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.") From 49a5971364ac965d869a210ee2f891dede6ee95b Mon Sep 17 00:00:00 2001 From: Thomas Grainger Date: Fri, 15 Jul 2022 13:17:19 +0100 Subject: [PATCH 2/3] fix incorrect import of blosc._version --- .github/workflows/build.yml | 2 +- README.rst | 4 +--- doc/install.rst | 4 +--- 3 files changed, 3 insertions(+), 7 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index d4a6135..1da99fa 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -31,7 +31,7 @@ jobs: python setup.py install - name: Test run: | - python blosc/test.py + python -m blosc.test env: PYTHONPATH: '.' 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/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: From f4c621af084abd5e6a8fd62338a8eeed5b14f469 Mon Sep 17 00:00:00 2001 From: Thomas Grainger Date: Fri, 15 Jul 2022 13:19:15 +0100 Subject: [PATCH 3/3] Update .github/workflows/build.yml --- .github/workflows/build.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 1da99fa..5021b26 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -32,8 +32,6 @@ jobs: - name: Test run: | python -m blosc.test - env: - PYTHONPATH: '.' test-aarch64: name: "Build and test on aarch64"