Merge dea4fdf into 5d02aa6

zarr-developers · Jun 2, 2020 · 7c5654f · 7c5654f
2 parents 5d02aa6 + dea4fdf
commit 7c5654f
Show file tree

Hide file tree

Showing 58 changed files with 583 additions and 361 deletions.
diff --git a/.github/workflows/ci-osx.yaml b/.github/workflows/ci-osx.yaml
@@ -30,4 +30,4 @@ jobs:
         run: python -m pip list
 
       - name: Run tests
-        run: pytest -v --pyargs numcodecs
+        run: pytest -v --pyargs numcodecs
diff --git a/c-blosc b/c-blosc
diff --git a/docs/index.rst b/docs/index.rst
@@ -60,6 +60,7 @@ Contents
     registry
     blosc
     lz4
+    zfpy
     zstd
     zlib
     gzip

diff --git a/docs/release.rst b/docs/release.rst
@@ -3,6 +3,8 @@ Release notes
 
 Upcoming Release
 ----------------
+* The :class:`numcodecs.zfpy.ZFPY` codec is now supported on Python 3.8 if
+  `zfpy==0.5.5 <https://pypi.org/project/zfpy/>`_ is installed
 
 * Remove LegacyJSON codec.
   By :user:`James Bourbeau  <jrbourbeau>`, :issue:`226`.

diff --git a/docs/zfpy.rst b/docs/zfpy.rst
@@ -0,0 +1,11 @@
+ZFPY
+====
+.. automodule:: numcodecs.zfpy
+
+.. autoclass:: ZFPY
+
+    .. autoattribute:: codec_id
+    .. automethod:: encode
+    .. automethod:: decode
+    .. automethod:: get_config
+    .. automethod:: from_config
diff --git a/fixture/zfpy/array.00.npy b/fixture/zfpy/array.00.npy
diff --git a/fixture/zfpy/array.01.npy b/fixture/zfpy/array.01.npy
diff --git a/fixture/zfpy/array.02.npy b/fixture/zfpy/array.02.npy
diff --git a/fixture/zfpy/array.03.npy b/fixture/zfpy/array.03.npy
diff --git a/fixture/zfpy/array.04.npy b/fixture/zfpy/array.04.npy
diff --git a/fixture/zfpy/array.05.npy b/fixture/zfpy/array.05.npy
diff --git a/fixture/zfpy/array.06.npy b/fixture/zfpy/array.06.npy
diff --git a/fixture/zfpy/array.07.npy b/fixture/zfpy/array.07.npy
diff --git a/fixture/zfpy/codec.00/config.json b/fixture/zfpy/codec.00/config.json
@@ -0,0 +1,10 @@
+{
+    "compression_kwargs": {
+        "rate": -1
+    },
+    "id": "zfpy",
+    "mode": 2,
+    "precision": -1,
+    "rate": -1,
+    "tolerance": -1
+}
diff --git a/fixture/zfpy/codec.00/encoded.00.dat b/fixture/zfpy/codec.00/encoded.00.dat
diff --git a/fixture/zfpy/codec.00/encoded.01.dat b/fixture/zfpy/codec.00/encoded.01.dat
diff --git a/fixture/zfpy/codec.00/encoded.02.dat b/fixture/zfpy/codec.00/encoded.02.dat
diff --git a/fixture/zfpy/codec.00/encoded.03.dat b/fixture/zfpy/codec.00/encoded.03.dat
diff --git a/fixture/zfpy/codec.00/encoded.04.dat b/fixture/zfpy/codec.00/encoded.04.dat
diff --git a/fixture/zfpy/codec.00/encoded.05.dat b/fixture/zfpy/codec.00/encoded.05.dat
diff --git a/fixture/zfpy/codec.00/encoded.06.dat b/fixture/zfpy/codec.00/encoded.06.dat
diff --git a/fixture/zfpy/codec.00/encoded.07.dat b/fixture/zfpy/codec.00/encoded.07.dat
diff --git a/fixture/zfpy/codec.01/config.json b/fixture/zfpy/codec.01/config.json
@@ -0,0 +1,10 @@
+{
+    "compression_kwargs": {
+        "tolerance": -1
+    },
+    "id": "zfpy",
+    "mode": 4,
+    "precision": -1,
+    "rate": -1,
+    "tolerance": -1
+}
diff --git a/fixture/zfpy/codec.01/encoded.00.dat b/fixture/zfpy/codec.01/encoded.00.dat
diff --git a/fixture/zfpy/codec.01/encoded.01.dat b/fixture/zfpy/codec.01/encoded.01.dat
diff --git a/fixture/zfpy/codec.01/encoded.02.dat b/fixture/zfpy/codec.01/encoded.02.dat
diff --git a/fixture/zfpy/codec.01/encoded.03.dat b/fixture/zfpy/codec.01/encoded.03.dat
diff --git a/fixture/zfpy/codec.01/encoded.04.dat b/fixture/zfpy/codec.01/encoded.04.dat
diff --git a/fixture/zfpy/codec.01/encoded.05.dat b/fixture/zfpy/codec.01/encoded.05.dat
diff --git a/fixture/zfpy/codec.01/encoded.06.dat b/fixture/zfpy/codec.01/encoded.06.dat
diff --git a/fixture/zfpy/codec.01/encoded.07.dat b/fixture/zfpy/codec.01/encoded.07.dat
diff --git a/fixture/zfpy/codec.02/config.json b/fixture/zfpy/codec.02/config.json
@@ -0,0 +1,10 @@
+{
+    "compression_kwargs": {
+        "tolerance": -1
+    },
+    "id": "zfpy",
+    "mode": 4,
+    "precision": -1,
+    "rate": -1,
+    "tolerance": -1
+}
diff --git a/fixture/zfpy/codec.02/encoded.00.dat b/fixture/zfpy/codec.02/encoded.00.dat
diff --git a/fixture/zfpy/codec.02/encoded.01.dat b/fixture/zfpy/codec.02/encoded.01.dat
diff --git a/fixture/zfpy/codec.02/encoded.02.dat b/fixture/zfpy/codec.02/encoded.02.dat
diff --git a/fixture/zfpy/codec.02/encoded.03.dat b/fixture/zfpy/codec.02/encoded.03.dat
diff --git a/fixture/zfpy/codec.02/encoded.04.dat b/fixture/zfpy/codec.02/encoded.04.dat
diff --git a/fixture/zfpy/codec.02/encoded.05.dat b/fixture/zfpy/codec.02/encoded.05.dat
diff --git a/fixture/zfpy/codec.02/encoded.06.dat b/fixture/zfpy/codec.02/encoded.06.dat
diff --git a/fixture/zfpy/codec.02/encoded.07.dat b/fixture/zfpy/codec.02/encoded.07.dat
diff --git a/fixture/zfpy/codec.03/config.json b/fixture/zfpy/codec.03/config.json
@@ -0,0 +1,10 @@
+{
+    "compression_kwargs": {
+        "precision": -1
+    },
+    "id": "zfpy",
+    "mode": 3,
+    "precision": -1,
+    "rate": -1,
+    "tolerance": -1
+}
diff --git a/fixture/zfpy/codec.03/encoded.00.dat b/fixture/zfpy/codec.03/encoded.00.dat
diff --git a/fixture/zfpy/codec.03/encoded.01.dat b/fixture/zfpy/codec.03/encoded.01.dat
diff --git a/fixture/zfpy/codec.03/encoded.02.dat b/fixture/zfpy/codec.03/encoded.02.dat
diff --git a/fixture/zfpy/codec.03/encoded.03.dat b/fixture/zfpy/codec.03/encoded.03.dat
diff --git a/fixture/zfpy/codec.03/encoded.04.dat b/fixture/zfpy/codec.03/encoded.04.dat
diff --git a/fixture/zfpy/codec.03/encoded.05.dat b/fixture/zfpy/codec.03/encoded.05.dat
diff --git a/fixture/zfpy/codec.03/encoded.06.dat b/fixture/zfpy/codec.03/encoded.06.dat
diff --git a/fixture/zfpy/codec.03/encoded.07.dat b/fixture/zfpy/codec.03/encoded.07.dat
diff --git a/numcodecs/__init__.py b/numcodecs/__init__.py
@@ -3,7 +3,7 @@
 transformation codecs for use in data storage and communication
 applications. These include:
 
-* Compression codecs, e.g., Zlib, BZ2, LZMA and Blosc.
+* Compression codecs, e.g., Zlib, BZ2, LZMA, ZFPY and Blosc.
 * Pre-compression filters, e.g., Delta, Quantize, FixedScaleOffset,
   PackBits, Categorize.
 * Integrity checks, e.g., CRC32, Adler32.
@@ -16,7 +16,6 @@
 <https://github.com/alimanfoo/numcodecs/issues>`_.
 
 """
-
 import multiprocessing
 import atexit
 
@@ -68,6 +67,12 @@
 except ImportError:  # pragma: no cover
     pass
 
+try:
+    from numcodecs.zfpy import ZFPY
+    register_codec(ZFPY)
+except ImportError:  # pragma: no cover
+    pass
+
 from numcodecs.astype import AsType
 register_codec(AsType)