Merge pull request #64 from pycompression/pypy

Add pypy to supported versions.

Author: rhpvorderman

.github/workflows/ci.yml

@@ -57,10 +57,12 @@ jobs:
     strategy:
       matrix:
         python-version:
-          - 3.6
-          - 3.7
-          - 3.8
-          - 3.9
+          - "3.6"
+          - "3.7"
+          - "3.8"
+          - "3.9"
+          - "pypy-3.6"
+          - "pypy-3.7"
         os: ["ubuntu-latest"]
         include:
           - os: "macos-latest"
@@ -92,7 +94,7 @@ jobs:
         uses: ilammy/[email protected]
         if: runner.os == 'Windows'
       - name: Run tests
-        run: tox -e py3
+        run: tox
       - name: Upload coverage report
         uses: codecov/codecov-action@v1
 
@@ -154,13 +156,13 @@ jobs:
       - name: Build wheels
         run: cibuildwheel --output-dir dist
         env:
-          CIBW_BUILD: "cp3{6,7,8,9}-*"
           CIBW_SKIP: "*-win32 *-manylinux_i686"  # Skip 32 bit.
           CIBW_MANYLINUX_X86_64_IMAGE: "manylinux2014"
           # Fully test the build wheels again.
           CIBW_TEST_REQUIRES: "pytest"
           # Simple test that requires the project to be build correctly
-          CIBW_TEST_COMMAND: "pytest {project}/tests/test_igzip.py"
+          CIBW_TEST_COMMAND: >-
+            pytest {project}/tests/test_igzip.py {project}/tests/test_isal.py
       - name: Build sdist
         if: "runner.os == 'Linux'"
         run: python setup.py sdist

CHANGELOG.rst

@@ -7,6 +7,11 @@ Changelog
 .. This document is user facing. Please word the changes in such a way
 .. that users understand how the changes affect the new version.
 
+version 0.9.0-dev
+-----------------
++ Add support for pypy by adding pypy tests to the CI and setting up wheel
+  building support.
+
 version 0.8.1
 -----------------
 + Fix a bug where multi-member gzip files where read incorrectly due to an

src/isal/isal_zlib.pyx

@@ -99,10 +99,13 @@ DEFLATED = zlib.DEFLATED
 
 # Strategies
 Z_DEFAULT_STRATEGY=zlib.Z_DEFAULT_STRATEGY
-Z_RLE=zlib.Z_RLE 
 Z_HUFFMAN_ONLY=zlib.Z_HUFFMAN_ONLY
 Z_FILTERED=zlib.Z_FILTERED
-Z_FIXED=zlib.Z_FIXED
+# Following strategies not supported on all versions of zlib.
+if hasattr(zlib, "Z_RLE"):
+    Z_RLE = zlib.Z_RLE
+if hasattr(zlib, "Z_FIXED"):
+   Z_FIXED=zlib.Z_FIXED
 
 # Flush methods
 Z_NO_FLUSH=zlib.Z_NO_FLUSH

tests/test_isal.py

@@ -106,9 +106,9 @@ def test_compress_compressobj(data_size, level, wbits, memLevel):
                                         memLevel=memLevel)
     compressed = compressobj.compress(data) + compressobj.flush()
     if wbits in range(8, 16):
-        # In case a zlib header is used, determine the wbits automatically.
-        # For some reason it fails if wbits is set manually.
-        decompressed = zlib.decompress(compressed, wbits=0)
+        # TODO: Apparently the wbits level is not correctly implemented in
+        # ISA-L for the zlib stuff.
+        decompressed = zlib.decompress(compressed, wbits=15)
     else:
         decompressed = zlib.decompress(compressed, wbits=wbits)
     assert data == decompressed

tox.ini

@@ -1,7 +1,7 @@
 [tox]
 # Running plain tox will run the default environment (testenv) with the default
 # python3 interpreter of the user.
-envlist=py3
+envlist=testenv
 [testenv]
 deps=pytest
      coverage