Skip to content

fix incorrect import of blosc._version #278

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
FrancescAlted merged 3 commits into from
Jul 15, 2022
Merged

fix incorrect import of blosc._version #278

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
15afb41
Revert "Fix error in tests introduced by #270 (#277)"
graingert Jul 15, 2022
49a5971
fix incorrect import of blosc._version
graingert Jul 15, 2022
f4c621a
Update .github/workflows/build.yml
graingert Jul 15, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 1 addition & 3 deletions .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
4 changes: 1 addition & 3 deletions README.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:

Expand Down
4 changes: 2 additions & 2 deletions blosc/test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
import sys
import gc
import os
import _version
from ._version import LooseVersion
import ctypes
import blosc
import unittest
Expand Down Expand Up @@ -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_)
Expand Down
4 changes: 2 additions & 2 deletions blosc/toplevel.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

import os
import sys
import _version
Copy link
Contributor Author

@graingert graingert Jul 15, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This module doesn't exist when the package is installed

from ._version import LooseVersion
try:
import cPickle as pickle
except ImportError:
Expand Down Expand Up @@ -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.")

Expand Down
4 changes: 1 addition & 3 deletions doc/install.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down