Nest _webp under webp

anibali · Mar 17, 2024 · 47fa281 · 47fa281
1 parent f79f8c3
commit 47fa281
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/.github/workflows/build_and_test.yml b/.github/workflows/build_and_test.yml
@@ -46,7 +46,7 @@ jobs:
       - name: Test with pytest
         run: |
           python -m pip install pytest==7.2.1
-          pytest tests/
+          pytest --import-mode=importlib tests/
 
   build-wheels:
     name: Build ${{ matrix.cibw_build }} wheels
@@ -146,7 +146,7 @@ jobs:
           CIBW_ENVIRONMENT: PYWEBP_COMPILE_TARGET=${{ matrix.compile_target }}
           CIBW_PROJECT_REQUIRES_PYTHON: '>=3.8'
           CIBW_TEST_REQUIRES: pytest
-          CIBW_TEST_COMMAND: pytest {package}/tests
+          CIBW_TEST_COMMAND: pytest --import-mode=importlib {package}/tests
       - name: abi3audit
         run: |
           pip install abi3audit &&

diff --git a/webp/__init__.py b/webp/__init__.py
@@ -4,7 +4,7 @@
 from PIL import Image
 from typing import Any, Generator, List, Optional, Tuple
 
-from _webp import ffi, lib
+from webp._webp import ffi, lib
 
 class WebPPreset(Enum):
     DEFAULT: int = lib.WEBP_PRESET_DEFAULT  # Default

diff --git a/webp_build/builder.py b/webp_build/builder.py
@@ -149,7 +149,7 @@ def create_ffibuilder():
     # Specify C sources to be built by CFFI
     ffibuilder = FFI()
     ffibuilder.set_source(
-        '_webp',
+        'webp._webp',
         read_text(webp_build, 'source.c'),
         extra_objects=cffi_settings['extra_objects'],
         extra_compile_args=cffi_settings['extra_compile_args'],