Merge pull request #66 from pycompression/pypydynamic

Make sure conda pypy installations should work.

Author: rhpvorderman

.github/workflows/ci.yml

@@ -100,7 +100,6 @@ jobs:
 
   test-arch:
     if: startsWith(github.ref, 'refs/tags') || github.ref == 'refs/heads/develop' || github.ref == 'refs/heads/main'
-    name: Test on ${{ matrix.distro }} ${{ matrix.arch }}
     runs-on: "ubuntu-latest"
     needs: lint
     strategy:
@@ -136,6 +135,10 @@ jobs:
     strategy:
       matrix:
         os: ["ubuntu-latest", "macos-latest", "windows-latest"]
+        python_version: ["python"]
+        include:
+          - os: "ubuntu-latest"
+            python_version: "pypy"
     steps:
       - uses: actions/[email protected]
         with:
@@ -145,12 +148,12 @@ jobs:
         with:
           channels: conda-forge,defaults
       - name: Install requirements (universal)
-        run: conda install isa-l python tox
+        run: conda install isa-l ${{ matrix.python_version}} tox
       - name: Set MSVC developer prompt
         uses: ilammy/[email protected]
         if: runner.os == 'Windows'
       - name: Run tests (dynamic link)
-        run: tox -e py3
+        run: tox
         env:
           PYTHON_ISAL_LINK_DYNAMIC: True
 

setup.py

@@ -62,6 +62,7 @@ def build_extension(self, ext):
             for prefix in possible_prefixes:
                 if Path(prefix, "include", "isa-l").exists():
                     ext.include_dirs = [os.path.join(prefix, "include")]
+                    ext.library_dirs = [os.path.join(prefix, "lib")]
                     break   # Only one include directory is needed.
                 # On windows include is in Library apparently
                 elif Path(prefix, "Library", "include", "isa-l").exists():

tox.ini

@@ -10,8 +10,9 @@ passenv=
 commands =
     # Create HTML coverage report for humans and xml coverage report for external services.
     coverage run --source=isal -m py.test tests
-    coverage html
-    coverage xml
+    # Ignore errors during report generation. Pypy does not generate proper coverage reports.
+    coverage html -i
+    coverage xml -i
 
 [testenv:coverage]
 # Separate test environment for cython coverage.