Add cffi.VerificationError to caught exceptions in ffi_build version …

…checks
flacjacket · Jan 28, 2024 · b38b6ce · b38b6ce
1 parent d3f62f2
commit b38b6ce
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -252,7 +252,9 @@ jobs:
         with:
           python-version: ${{ matrix.python-version }}
       - name: Install wheel
-        run: pip install pywlroots-*.whl
+        run: |
+          pip install pywlroots-*.whl
+          pip install setuptools
       - name: Check installation
         shell: python
         run: |

diff --git a/wlroots/ffi_build.py b/wlroots/ffi_build.py
@@ -34,7 +34,7 @@ def load_wlroots_version():
 
     try:
         lib = ffi.verify("#include <wlr/version.h>")
-    except (PermissionError, OSError):
+    except (PermissionError, OSError, VerificationError):
         lib = importlib.import_module("wlroots").lib
 
     return f"{lib.WLR_VERSION_MAJOR}.{lib.WLR_VERSION_MINOR}.{lib.WLR_VERSION_MICRO}"  # type: ignore[attr-defined]